名称変更：「タスク予約」→「担当登録」など

Fork: 0

haya4 / task-bldg

Browse code 名称変更：「タスク予約」→「担当登録」など main master try v0.5.1 v0.4.1 v0.3.1 v0.2.2 v0.1.19 v0.1.18 v0.1.17 v0.1.16 v0.1.15 v0.1.14 v0.1.13 v0.0.9 v0.0.8 v0.0.6 security ...Upload
1 parent f71134b commit fbb59133dc510f6c036fac5d90b84613324d03ff haya4 authored on 12 Aug 2022

Patch

Unified Split

Showing 11 changed files

Ignore Space Show notes View TaskStatus.png

                Ignore Space
               Show notes
              View
            
          
          18 ■■■■■
          TaskStatus.pu
 state "NG" as NG #red {
}
 
state "予約済み" as RESERVED #yellow {
	RESERVED : 編集者
state "担当登録済み" as RESERVED #yellow {
	RESERVED : 担当者
}
 
state "インポート済み" as IMPORTED #lightgreen {
	IMPORTED : 編集者
	IMPORTED : 担当者
	IMPORTED : 変更セットNo
}
 
state "完了" as END #green {
	END : 編集者
	END : 担当者
	END : 変更セットNo
	END : 検証者
}
 
[*] --> PREPARATION
PREPARATION --> ACCEPTING
ACCEPTING --> RESERVED	: タスク予約
NG --> RESERVED	: タスク予約
ACCEPTING --> RESERVED	: 担当登録
NG --> RESERVED	: 担当登録
ACCEPTING --> IMPORTED	: 編集完了
NG --> IMPORTED	: 編集完了
RESERVED --> IMPORTED	: 編集完了
IMPORTED --> IMPORTED	: 編集完了
ACCEPTING <- RESERVED	: タスク予約取消
ACCEPTING <- RESERVED	: 担当取消
 
IMPORTED --> END	: 検証結果[OK]
NG <- IMPORTED		: 検証結果[NG]
IMPORTED --> END	: 検証[OK]
NG <- IMPORTED		: 検証[NG]
 
@enduml
 state "NG" as NG #red {
 }
+state "予約済み" as RESERVED #yellow {
+	RESERVED : 編集者
+state "担当登録済み" as RESERVED #yellow {
+	RESERVED : 担当者
 }
 state "インポート済み" as IMPORTED #lightgreen {
+	IMPORTED : 編集者
+	IMPORTED : 担当者
 	IMPORTED : 変更セットNo
 }
 state "完了" as END #green {
+	END : 編集者
+	END : 担当者
 	END : 変更セットNo
 	END : 検証者
 }
 [*] --> PREPARATION
 PREPARATION --> ACCEPTING
+ACCEPTING --> RESERVED	: タスク予約
+NG --> RESERVED	: タスク予約
+ACCEPTING --> RESERVED	: 担当登録
+NG --> RESERVED	: 担当登録
 ACCEPTING --> IMPORTED	: 編集完了
 NG --> IMPORTED	: 編集完了
 RESERVED --> IMPORTED	: 編集完了
 IMPORTED --> IMPORTED	: 編集完了
+ACCEPTING <- RESERVED	: タスク予約取消
+ACCEPTING <- RESERVED	: 担当取消
+IMPORTED --> END	: 検証結果[OK]
+NG <- IMPORTED		: 検証結果[NG]
+IMPORTED --> END	: 検証[OK]
+NG <- IMPORTED		: 検証[NG]
 @enduml

                Ignore Space
               Show notes
              View
            
          
          1 ■■■■■
          src/main/java/osm/surveyor/task/user/config/SecurityConfig.java
 import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
import lombok.RequiredArgsConstructor;
import osm.surveyor.task.util.Role;
 
@RequiredArgsConstructor
@Configuration
@EnableWebSecurity
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import lombok.RequiredArgsConstructor;
-import osm.surveyor.task.util.Role;
 @RequiredArgsConstructor
 @Configuration
 @EnableWebSecurity

                Ignore Space
               Show notes
              View
            
          
          1 ■■■■■
          src/main/resources/i18n/messages.properties
 meshcode = meshcode
operation = operation
username = mapper
changeSet = change set
editor = editor
validator = validator
status = status
citycode = city code
cityname = city name
 meshcode = meshcode
 operation = operation
 username = mapper
 changeSet = change set
+editor = editor
 validator = validator
 status = status
 citycode = city code
 cityname = city name

                Ignore Space
               Show notes
              View
            
          
          5 ■■■■■
          src/main/resources/i18n/messages_ja.properties
 folder = フォルダー
path = ファイル
updateTime = 更新日時
changeSet = 変更セット
editor = 担当者
validator = 検証者
comment = コメント
 
# operation
download = ダウンロード
return = 戻る
reserve = タスク予約
cancel = タスク予約取消
reserve = 担当登録
cancel = 担当取消
done = 編集完了
NG = 検証(NG)
OK = 検証(OK)
 folder = フォルダー
 path = ファイル
 updateTime = 更新日時
 changeSet = 変更セット
+editor = 担当者
 validator = 検証者
 comment = コメント
 # operation
 download = ダウンロード
 return = 戻る
+reserve = タスク予約
+cancel = タスク予約取消
+reserve = 担当登録
+cancel = 担当取消
 done = 編集完了
 NG = 検証(NG)
 OK = 検証(OK)

Ignore Space Show notes View src/main/resources/templates/meshes.html

Ignore Space Show notes View src/main/resources/templates/meshlist.html

Ignore Space Show notes View src/main/resources/templates/task.html

Ignore Space Show notes View src/main/resources/templates/task_done.html

Ignore Space Show notes View src/main/resources/templates/task_valid.html

Ignore Space Show notes View src/main/resources/templates/tasks.html

Show line notes below