fix : remove iquery.js
1 parent 53ef41b commit 22ee1e96110b06dd0eacf045f49f1efb601e595e
@haya4 haya4 authored on 6 Aug 2022
Showing 15 changed files
View
TaskStatus.png
View
10
TaskStatus.pu
[*] --> PREPARATION
PREPARATION --> ACCEPTING : DataLoad
ACCEPTING --> RESERVED : RESERVE(マッパー登録)
RESERVED --> IMPORTED : DONE(インポート済み)
IMPORTED -> verification : 検証者登録
verification --> END : [検証結果=OK]
ACCEPTING <-- verification : [検証結果=NG]
ACCEPTING <-- RESERVED : CANCEL(取消)
 
IMPORTED -> VERIFICATION : VALID(検証者登録)
VERIFICATION --> END : [検証結果=OK]
ACCEPTING <-- VERIFICATION : [検証結果=NG]
 
state "PREPARATION\n準備中" as PREPARATION {
}
 
View
24
src/main/java/osm/surveyor/task/city/DataLoader.java
import osm.surveyor.task.city.model.City;
import osm.surveyor.task.city.model.CityJson;
import osm.surveyor.task.city.model.Citymesh;
import osm.surveyor.task.city.model.Status;
import osm.surveyor.task.city.model.Task;
import osm.surveyor.task.util.Geojson;
import osm.surveyor.task.util.JsonFeature;
import osm.surveyor.task.util.JsonGeometryPoint;
import osm.surveyor.task.util.JsonProperties;
@Component
public class DataLoader implements CommandLineRunner {
private final CityRepository cityRepository;
private final CitymeshRepository meshRepository;
private final TaskService taskService;
@Override
public void run(String... args) throws Exception {
mesh.setVersion(prop.getVersion());
mesh.setPath(prop.getPath());
mesh.setPoint(geometryPoint.getCoordinates().toString());
mesh.setCity(city);
Status status = city.getStatus();
if (status != null) {
mesh.setStatus(status);
}
Task task = taskService.getTaskByMesh(city.getCitycode(), meshcode);
if (task == null) {
Status status = city.getStatus();
if (status != null) {
mesh.setStatus(status);
}
}
else {
mesh.setStatus(task.getStatus());
}
meshRepository.save(mesh);
}
}
}
View
src/main/java/osm/surveyor/task/city/TaskController.java
View
src/main/java/osm/surveyor/task/city/TaskService.java
View
src/main/java/osm/surveyor/task/city/model/Status.java
View
src/main/java/osm/surveyor/task/city/model/Task.java
View
src/main/resources/i18n/messages.properties
View
src/main/resources/i18n/messages_ja.properties
View
src/main/resources/static/custom/task.js
View
src/main/resources/static/js/jquery-2.1.1.min.js 100644 → 0
View
src/main/resources/static/js/usertables.js 100644 → 0
View
src/main/resources/templates/layout/layout.html
View
src/main/resources/templates/task.html
View
src/main/resources/templates/tasks.html