diff --git a/src/main/java/osm/surveyor/task/city/DataLoader.java b/src/main/java/osm/surveyor/task/city/DataLoader.java index 07e4d67..8b17e35 100644 --- a/src/main/java/osm/surveyor/task/city/DataLoader.java +++ b/src/main/java/osm/surveyor/task/city/DataLoader.java @@ -94,6 +94,8 @@ } 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 7ce017b..bc61f24 100644 --- a/src/main/java/osm/surveyor/task/city/TaskController.java +++ b/src/main/java/osm/surveyor/task/city/TaskController.java @@ -132,6 +132,7 @@ Task pre = service.getTaskByMesh(citycode, meshcode); if (pre != null) { pre.setOperation(operation); + pre.setStatus(nextStatus); if (op.equals(Operation.OK.toString()) || op.equals(Operation.NG.toString())) { pre.setValidator(loginName); } diff --git a/src/main/java/osm/surveyor/task/city/TaskService.java b/src/main/java/osm/surveyor/task/city/TaskService.java index dac7d67..f308c0c 100644 --- a/src/main/java/osm/surveyor/task/city/TaskService.java +++ b/src/main/java/osm/surveyor/task/city/TaskService.java @@ -37,7 +37,7 @@ task.setStatus(Status.IMPORTED); } else if (task.getOperation() == Operation.NG) { - task.setStatus(Status.ACCEPTING); + task.setStatus(Status.NG); } else if (task.getOperation() == Operation.OK) { task.setStatus(Status.END); @@ -67,8 +67,8 @@ throw e; } if (task.getOperation() == Operation.RESERVE) { - if (ctask.getStatus() != Status.ACCEPTING) { - NotAcceptableException e = new NotAcceptableException("ステータスがACCEPTIONGではないためタスク予約できませんでした : "+ task.getOperation()); + if ((ctask.getStatus() != Status.ACCEPTING) && (ctask.getStatus() != Status.NG)) { + NotAcceptableException e = new NotAcceptableException("予約受付中ではないためタスク予約できませんでした : "+ task.getOperation()); e.setTask(task); throw e; } @@ -121,7 +121,7 @@ } } } - else if ((task.getOperation() == Operation.NG) || (task.getOperation() == Operation.NG)) { + else if ((task.getOperation() == Operation.NG) || (task.getOperation() == Operation.OK)) { if (ctask.getStatus() != Status.IMPORTED) { NotAcceptableException e = new NotAcceptableException("編集されていないため検証できません"); e.setTask(task); @@ -146,6 +146,8 @@ 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 55f58e3..896dfaf 100644 --- a/src/main/java/osm/surveyor/task/city/model/Citymesh.java +++ b/src/main/java/osm/surveyor/task/city/model/Citymesh.java @@ -47,4 +47,15 @@ */ @Enumerated(EnumType.ORDINAL) private Status status = Status.PREPARATION; + + /** + * インポート実行者 + */ + private String username; + + /** + * 検証者 + */ + private String validator; + } 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 658c6d5..6b5ae0c 100644 --- a/src/main/java/osm/surveyor/task/city/model/Status.java +++ b/src/main/java/osm/surveyor/task/city/model/Status.java @@ -1,10 +1,10 @@ package osm.surveyor.task.city.model; public enum Status { - PREPARATION, // preparation 準備中 - ACCEPTING, // Accepting 受付中 - RESERVED, // 予約済み - IMPORTED, // インポート済み - VERIFICATION, // 検証者登録 - END // 完了 + PREPARATION, // preparation 準備中 "X" + ACCEPTING, // Accepting 受付中 "1" + RESERVED, // 予約済み "2" + IMPORTED, // インポート済み "3" + NG, // 検証(NG) "0" + END // 完了 "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 088181f..7b279b7 100644 --- a/src/main/java/osm/surveyor/task/city/model/Task.java +++ b/src/main/java/osm/surveyor/task/city/model/Task.java @@ -48,7 +48,7 @@ /** * インポート実行者 */ - private String username; // + private String username; /** * 検証者 diff --git a/src/main/resources/i18n/messages_ja.properties b/src/main/resources/i18n/messages_ja.properties index 80428c5..5e55307 100644 --- a/src/main/resources/i18n/messages_ja.properties +++ b/src/main/resources/i18n/messages_ja.properties @@ -8,7 +8,7 @@ typeMismatch.citycode = 5桁の数字が必須です typeMismatch.lat = 数字を入力してください typeMismatch.lng = 数字を入力してください -status = ステータス +status = 進捗 # status PREPARATION = 準備中 diff --git a/src/main/resources/static/img/ACCEPTING.png b/src/main/resources/static/img/ACCEPTING.png new file mode 100644 index 0000000..b9fa6c7 --- /dev/null +++ b/src/main/resources/static/img/ACCEPTING.png Binary files differ diff --git a/src/main/resources/static/img/END.png b/src/main/resources/static/img/END.png new file mode 100644 index 0000000..2138373 --- /dev/null +++ b/src/main/resources/static/img/END.png Binary files differ diff --git a/src/main/resources/static/img/IMPORTED.png b/src/main/resources/static/img/IMPORTED.png new file mode 100644 index 0000000..613b279 --- /dev/null +++ b/src/main/resources/static/img/IMPORTED.png Binary files differ diff --git a/src/main/resources/static/img/NG.png b/src/main/resources/static/img/NG.png new file mode 100644 index 0000000..15c3bd2 --- /dev/null +++ b/src/main/resources/static/img/NG.png Binary files differ diff --git a/src/main/resources/static/img/OK.png b/src/main/resources/static/img/OK.png new file mode 100644 index 0000000..2138373 --- /dev/null +++ b/src/main/resources/static/img/OK.png Binary files differ diff --git a/src/main/resources/static/img/PREPARATION.png b/src/main/resources/static/img/PREPARATION.png new file mode 100644 index 0000000..c8959a3 --- /dev/null +++ b/src/main/resources/static/img/PREPARATION.png Binary files differ diff --git a/src/main/resources/static/img/RESERVED.png b/src/main/resources/static/img/RESERVED.png new file mode 100644 index 0000000..335591b --- /dev/null +++ b/src/main/resources/static/img/RESERVED.png Binary files differ diff --git a/src/main/resources/templates/cities.html b/src/main/resources/templates/cities.html index 39a7bec..dd78372 100644 --- a/src/main/resources/templates/cities.html +++ b/src/main/resources/templates/cities.html @@ -61,7 +61,7 @@