diff --git a/src/main/java/osm/surveyor/task/city/CitymeshRepository.java b/src/main/java/osm/surveyor/task/city/CitymeshRepository.java index 34f62db..a6043d4 100644 --- a/src/main/java/osm/surveyor/task/city/CitymeshRepository.java +++ b/src/main/java/osm/surveyor/task/city/CitymeshRepository.java @@ -13,6 +13,6 @@ List findByCitycode(String citycode); - @Query("SELECT m FROM Citymesh m WHERE m.username = :username OR m.validator = :username order by citycode,meshcode") + @Query("SELECT m FROM Citymesh m WHERE m.username = :username order by citycode,meshcode") List serchByUser(@Param("username")String username); } diff --git a/src/main/java/osm/surveyor/task/city/DataLoader.java b/src/main/java/osm/surveyor/task/city/DataLoader.java index 8b17e35..0052bcd 100644 --- a/src/main/java/osm/surveyor/task/city/DataLoader.java +++ b/src/main/java/osm/surveyor/task/city/DataLoader.java @@ -95,7 +95,6 @@ else { mesh.setStatus(task.getStatus()); mesh.setUsername(task.getUsername()); - mesh.setValidator(task.getValidator()); } meshRepository.save(mesh); } diff --git a/src/main/java/osm/surveyor/task/city/TaskController.java b/src/main/java/osm/surveyor/task/city/TaskController.java index 91c98d9..89e04a2 100644 --- a/src/main/java/osm/surveyor/task/city/TaskController.java +++ b/src/main/java/osm/surveyor/task/city/TaskController.java @@ -90,31 +90,26 @@ Operation operation = Operation.NOP; Status nextStatus = Status.PREPARATION; if (op.equals(Operation.RESERVE.toString())) { - model.addAttribute("command", "タスク予約"); + model.addAttribute("command", "編集者登録"); operation = Operation.RESERVE; - nextStatus = Status.RESERVED; + nextStatus = Status.EDITING; } else if (op.equals(Operation.CANCEL.toString())) { - model.addAttribute("command", "タスク予約取消"); + model.addAttribute("command", "編集取消"); operation = Operation.CANCEL; nextStatus = Status.ACCEPTING; } - else if (op.equals(Operation.DONE.toString())) { + else if (op.equals(Operation.OK.toString())) { model.addAttribute("command", "編集完了"); - operation = Operation.DONE; - nextStatus = Status.IMPORTED; + operation = Operation.OK; + nextStatus = Status.OK; next = "task_done"; } else if (op.equals(Operation.NG.toString())) { - model.addAttribute("command", "検証(NG)"); + model.addAttribute("command", "編集(NG)"); operation = Operation.NG; nextStatus = Status.ACCEPTING; } - else if (op.equals(Operation.OK.toString())) { - model.addAttribute("command", "検証(OK)"); - operation = Operation.OK; - nextStatus = Status.END; - } // ログイン名を取得 String loginName = ""; @@ -137,12 +132,6 @@ if (pre != null) { pre.setOperation(operation); pre.setStatus(nextStatus); - if (op.equals(Operation.OK.toString()) || op.equals(Operation.NG.toString())) { - pre.setValidator(loginName); - } - else { - pre.setUsername(loginName); - } model.addAttribute("task", pre); return next; } @@ -157,9 +146,6 @@ task.setMesh(mesh); task.setStatus(nextStatus); task.setUsername(loginName); - if (op.equals(Operation.OK.toString()) || op.equals(Operation.NG.toString())) { - task.setValidator(loginName); - } task.setOperation(operation); model.addAttribute("task", task); return next; @@ -285,14 +271,11 @@ else if (task.getOperation() == Operation.CANCEL) { model.addAttribute("command", "タスク予約取消"); } - else if (task.getOperation() == Operation.DONE) { + else if (task.getOperation() == Operation.OK) { model.addAttribute("command", "編集済み"); } else if (task.getOperation() == Operation.NG) { - model.addAttribute("command", "検証(NG)"); - } - else if (task.getOperation() == Operation.OK) { - model.addAttribute("command", "検証(OK)"); + model.addAttribute("command", "編集(NG)"); } model.addAttribute("citycode", task.getCitycode()); model.addAttribute("meshcode", task.getMeshcode()); @@ -302,7 +285,7 @@ } private String nextPage(Task task) { - if (task.getOperation() == Operation.DONE) { + if (task.getOperation() == Operation.OK) { return "task_done"; } return "task"; diff --git a/src/main/java/osm/surveyor/task/city/TaskService.java b/src/main/java/osm/surveyor/task/city/TaskService.java index 5cc9a1e..0056760 100644 --- a/src/main/java/osm/surveyor/task/city/TaskService.java +++ b/src/main/java/osm/surveyor/task/city/TaskService.java @@ -28,19 +28,16 @@ public void add(Task task, UserDetails user) { if (task.getOperation() == Operation.RESERVE) { - task.setStatus(Status.RESERVED); + task.setStatus(Status.EDITING); } else if (task.getOperation() == Operation.CANCEL) { task.setStatus(Status.ACCEPTING); } - else if (task.getOperation() == Operation.DONE) { - task.setStatus(Status.IMPORTED); - } else if (task.getOperation() == Operation.NG) { task.setStatus(Status.NG); } else if (task.getOperation() == Operation.OK) { - task.setStatus(Status.END); + task.setStatus(Status.OK); } else { NotAcceptableException e = new NotAcceptableException("未サポートのオペレーションです: "+ task.getOperation()); @@ -74,18 +71,18 @@ } } else if (task.getOperation() == Operation.CANCEL) { - if (ctask.getStatus() != Status.RESERVED) { - NotAcceptableException e = new NotAcceptableException("ステータスが予約中ではないため予約取消できませんでした : "+ task.getOperation()); + if (ctask.getStatus() != Status.EDITING) { + NotAcceptableException e = new NotAcceptableException("タスクが'編集中'ではないため'編集取消'できませんでした : "+ task.getOperation()); e.setTask(task); throw e; } if (!ctask.getUsername().equals(user.getUsername())) { - NotAcceptableException e = new NotAcceptableException("他のマッパーのタスク予約はCANCELできません"); + NotAcceptableException e = new NotAcceptableException("他のマッパーの'タスク'は'編集取消'できません"); e.setTask(task); throw e; } } - else if (task.getOperation() == Operation.DONE) { + else if (task.getOperation() == Operation.OK) { // タスク予約していなくてもインポートできる // 他のマッパーが予約していてもインポート可能 if (ctask.getStatus() == Status.PREPARATION) { @@ -93,11 +90,6 @@ e.setTask(task); throw e; } - if (ctask.getStatus() == Status.END) { - NotAcceptableException e = new NotAcceptableException("既にタスクが完了しているため登録できませんでした"); - e.setTask(task); - throw e; - } String changeset = task.getChangeSet(); if (changeset == null) { @@ -121,18 +113,7 @@ } } } - else if ((task.getOperation() == Operation.NG) || (task.getOperation() == Operation.OK)) { - if (ctask.getStatus() != Status.IMPORTED) { - NotAcceptableException e = new NotAcceptableException("編集されていないため検証できません"); - e.setTask(task); - throw e; - } - if (ctask.getUsername().equals(user.getUsername())) { - TaskException e = new TaskException("自己の編集を検証することはできません"); - e.setTask(task); - throw e; - } - + else if (task.getOperation() == Operation.NG) { String comment = task.getComment(); if (comment == null || comment.isEmpty()) { TaskException e = new TaskException("コメントが入力されていません"); @@ -147,7 +128,6 @@ task.setUpdateTime(new Date()); mesh.setStatus(task.getStatus()); mesh.setUsername(task.getUsername()); - mesh.setValidator(task.getValidator()); // データベースに格納 repository.save(task); diff --git a/src/main/java/osm/surveyor/task/city/model/Citymesh.java b/src/main/java/osm/surveyor/task/city/model/Citymesh.java index 896dfaf..6befc22 100644 --- a/src/main/java/osm/surveyor/task/city/model/Citymesh.java +++ b/src/main/java/osm/surveyor/task/city/model/Citymesh.java @@ -49,13 +49,8 @@ private Status status = Status.PREPARATION; /** - * インポート実行者 + * 編集者 */ private String username; - /** - * 検証者 - */ - private String validator; - } diff --git a/src/main/java/osm/surveyor/task/city/model/Operation.java b/src/main/java/osm/surveyor/task/city/model/Operation.java index f2d7327..9b4cb59 100644 --- a/src/main/java/osm/surveyor/task/city/model/Operation.java +++ b/src/main/java/osm/surveyor/task/city/model/Operation.java @@ -7,12 +7,9 @@ */ public enum Operation { NOP, // ノーオペ - RESERVE, // 担当登録 - CANCEL, // 編集中止 - DONE, // 編集完了 - VALID, // 検証 - NG, // (deprecated)検証済み - OK, // (deprecated)検証済み - END, // (deprecated)完了 + RESERVE, // 編集者登録 + CANCEL, // 編集取消 + NG, // 編集[NG] + OK, // 編集完了 VIEW // 参照 } diff --git a/src/main/java/osm/surveyor/task/city/model/Status.java b/src/main/java/osm/surveyor/task/city/model/Status.java index 6b5ae0c..46a57f0 100644 --- a/src/main/java/osm/surveyor/task/city/model/Status.java +++ b/src/main/java/osm/surveyor/task/city/model/Status.java @@ -3,8 +3,7 @@ public enum Status { PREPARATION, // preparation 準備中 "X" ACCEPTING, // Accepting 受付中 "1" - RESERVED, // 予約済み "2" - IMPORTED, // インポート済み "3" + EDITING, // 編集待ち "2" NG, // 検証(NG) "0" - END // 完了 "4" + OK // 完了 "4" } diff --git a/src/main/java/osm/surveyor/task/city/model/Task.java b/src/main/java/osm/surveyor/task/city/model/Task.java index c5560b7..e6ea582 100644 --- a/src/main/java/osm/surveyor/task/city/model/Task.java +++ b/src/main/java/osm/surveyor/task/city/model/Task.java @@ -49,16 +49,11 @@ private Status status = Status.PREPARATION; /** - * インポート実行者 + * 編集者 */ private String username; /** - * 検証者 - */ - private String validator; - - /** * 変更セットNo */ @NumberFormat @@ -93,11 +88,10 @@ c1 = outStr(c1, sb, "meshcode", this.getMeshcode()); c1 = outStr(c1, sb, "status", this.getStatus().toString()); c1 = outStr(c1, sb, "username", this.getUsername()); - c1 = outStr(c1, sb, "validator", this.getValidator()); c1 = outStr(c1, sb, "changeSet", this.getChangeSet()); c1 = outStr(c1, sb, "comment", this.getComment()); c1 = outStr(c1, sb, "operation", this.getOperation().toString()); - c1 = outStr(c1, sb, "updateTime", this.getUpdateTime().toString()); + c1 = outStr(c1, sb, "updateTime", (this.getUpdateTime() == null ? "" : this.getUpdateTime().toString())); sb.append("}"); return sb.toString(); } diff --git a/src/main/resources/i18n/messages_ja.properties b/src/main/resources/i18n/messages_ja.properties index 5a49b43..722d8a0 100644 --- a/src/main/resources/i18n/messages_ja.properties +++ b/src/main/resources/i18n/messages_ja.properties @@ -31,8 +31,7 @@ # operation download = ダウンロード return = 戻る -reserve = 担当登録 -cancel = 編集中止 -done = 編集完了 -NG = 検証(NG) -OK = 検証(OK) +reserve = 編集者登録 +cancel = 編集取消 +NG = 編集(NG) +OK = 編集完了 diff --git a/src/main/resources/templates/meshes.html b/src/main/resources/templates/meshes.html index f04e2e3..82247d1 100644 --- a/src/main/resources/templates/meshes.html +++ b/src/main/resources/templates/meshes.html @@ -51,7 +51,6 @@ version - @@ -62,7 +61,6 @@ - diff --git a/src/main/resources/templates/meshlist.html b/src/main/resources/templates/meshlist.html index 32f71cd..1a8db8a 100644 --- a/src/main/resources/templates/meshlist.html +++ b/src/main/resources/templates/meshlist.html @@ -37,7 +37,6 @@ version - @@ -49,7 +48,6 @@ - diff --git a/src/main/resources/templates/task.html b/src/main/resources/templates/task.html index 3c43a24..7059e14 100644 --- a/src/main/resources/templates/task.html +++ b/src/main/resources/templates/task.html @@ -67,11 +67,6 @@ - - - - - @@ -98,7 +93,6 @@ - diff --git a/src/main/resources/templates/task_done.html b/src/main/resources/templates/task_done.html index 8128162..136d999 100644 --- a/src/main/resources/templates/task_done.html +++ b/src/main/resources/templates/task_done.html @@ -67,11 +67,6 @@ - - - - - @@ -93,7 +88,6 @@ - diff --git a/src/main/resources/templates/tasks.html b/src/main/resources/templates/tasks.html index a15b44c..0025551 100644 --- a/src/main/resources/templates/tasks.html +++ b/src/main/resources/templates/tasks.html @@ -74,10 +74,6 @@ - - - - @@ -100,7 +96,6 @@ - @@ -111,7 +106,6 @@ -