Merge branch 'master' of https://github.com/rrrobo/rcj-rescue-scoring

Author: rrrobo

README-EN.md

@@ -2,7 +2,7 @@
 This is a scoring system used in RoboCupJunior's rescue line & maze competition.
 
 ## Supported rules
-* 2022 final rules published by International RoboCupJunior Rescue Technical Committee / [Line](https://junior.robocup.org/wp-content/uploads/2022Rules/2022_RescueLine_Rules_final01.pdf) / [Maze](https://junior.robocup.org/wp-content/uploads/2022Rules/2022_RescueMaze_Rules_final01.pdf)
+* 2023 final rules published by International RoboCupJunior Rescue Technical Committee / [Line](https://junior.robocup.org/wp-content/uploads/2023/05/RCJRescueLine2023Rules.pdf) / [Maze](https://junior.robocup.org/wp-content/uploads/2023/05/RCJRescueMaze2023Rules.pdf)
 * 2023 rules published by Japanese Regional Committee for entry leagues / [Line-Entry](https://drive.google.com/file/d/1IYhlUrF7h3xu1rkToTjPjyYoZ9viGTuY/view) / [Maze-Entry](https://drive.google.com/file/d/1uMUyGcmFgs-j8imhE3vgOHX1gyz4r_J8/view?usp=sharing)
 ## Demo
 The latest version is running. It is built using Docker image and working under OCI arm instance.
@@ -15,7 +15,7 @@ The latest version is running. It is built using Docker image and working under
 * RoboCup Junior 2017 Kanto (Japanese local competition)
 * RoboCup Junior Japan Open 2017 Gifu-Nakatsugawa (Japanese national competition)
 
-### 2017 rule
+### 2017 rules
 * RoboCup 2017 Nagoya Japan
 * NEST Robocon 2017
 * RoboCup Junior 2018 North-Saitama (Japanese local competition)
@@ -29,11 +29,11 @@ The latest version is running. It is built using Docker image and working under
 * RoboCup Junior 2018 Kansai (Japanese local competition)
 * RoboCup Junior Japan Open 2018 Wakayama (Japanese national competition)
 
-### 2018 rule
+### 2018 rules
 * RoboCup 2018 Montreal Canada
 * Kansai Summer Open Competition 2018
 
-### 2019 rule
+### 2019 rules
 * RoboCup Junior 2019 Tokai (Japanese local competition)
 * RoboCup Junior 2019 Saitama (Japanese local competition)
 * RoboCup Junior 2019 Hiroshima (Japanese local competition)
@@ -45,11 +45,23 @@ The latest version is running. It is built using Docker image and working under
 * RoboCup Junior 2020 Osaka-Central (Japanese local competition)
 * RoboCup Junior 2020 Kansai (Japanese local competition)
 
-### 2021 rule
+### 2021 rules
 * RoboCup Junior 2021 Tokai (Japanese local competition)
 * RoboCupJunior Japan 2021 Online (Japanese national competition)
 * RoboCup2021 WORLDWIDE
 
+### 2022 rules
+* RoboCup 2022 Bangkok Thailand
+
+### 2023 rules
+* RoboCup Junior 2023 Tokai (Japanese local competition)
+* RoboCup Junior 2023 Kansai (Japanese local competition)
+* RoboCup Junior 2023 Kanto (Japanese local competition)
+* RoboCup Junior 2023 Hiroshima (Japanese local competition)
+* RoboCup Junior Japan Open 2023 Nagoya (Japanese national competition)
+* Torneo Mexicano de Robótica 2023 (Mexican national competition)
+* RoboCup 2023 Bordeaux France
+
 ## Usage
 ### Using Docker（Recomended）
 Use the  [Official docker image](https://hub.docker.com/repository/docker/ryorobo/rcj-cms) is strongly recommended.  

README.md

@@ -11,21 +11,18 @@ Please refer to the [English version README](https://github.com/rrrobo/rcj-rescu
 これは，ロボカップジュニアレスキュー競技で用いられる大会管理システムです．  
 
 #### 対応ルール
-* International RoboCupJunior Rescue Technical Committee により発行された2022最終ルール / [Line](https://junior.robocup.org/wp-content/uploads/2022Rules/2022_RescueLine_Rules_final01.pdf) / [Maze](https://junior.robocup.org/wp-content/uploads/2022Rules/2022_RescueMaze_Rules_final01.pdf)
+* International RoboCupJunior Rescue Committee により発行された2023ルール / [Line](https://junior.robocup.org/wp-content/uploads/2023/05/RCJRescueLine2023Rules.pdf) / [Maze](https://junior.robocup.org/wp-content/uploads/2023/05/RCJRescueMaze2023Rules.pdf)
 * 日本のレスキュー技術委員会により発行されたレスキュー・ライン・エントリー2023ルール / [レスキュー・ライン・エントリー](https://drive.google.com/file/d/1IYhlUrF7h3xu1rkToTjPjyYoZ9viGTuY/view) / [レスキュー・メイズ・エントリー](https://drive.google.com/file/d/1uMUyGcmFgs-j8imhE3vgOHX1gyz4r_J8/view?usp=sharing)
-* *国際2023ルール(Draft)には、2022年12月末を目処に対応いたします。*
 --
 
 
 [大元のプロジェクト](https://github.com/TechnoX/rcj-rescue-scoring)からフォークして開発を進めています．
 主な変更点は以下の通りです．
 
-* Line競技において，ワールドリーグと日本リーグを追加
-* Line結果画面において，ワールドリーグと日本リーグの結果を横並びで表示
 * ユーザー管理機能を強化
 * マップの回転機能を追加
 * インタビュー機能を追加
-* 国際2022ルールに対応
+* 国際2023ルールに対応
 * ラインのタイルセットの在庫管理に対応
 * 大会データーのバックアップ/リストアに対応
 * トラブル発生時のハンドオーバーに対応
@@ -42,6 +39,7 @@ Please refer to the [English version README](https://github.com/rrrobo/rcj-rescu
 [https://osaka.rcj.cloud](https://osaka.rcj.cloud)
 
 ## 更新情報
+* [2023/06/04] 国際2023ルールに対応しました。
 * [2022/10/09] レスキュー・メイズ・エントリー 2023ルールに対応しました
 * [2022/09/17] レスキュー・ライン・エントリー 2023ルールに対応しました
 * [2021/10/02] 2022ルールに暫定対応しました．
@@ -98,6 +96,15 @@ Please refer to the [English version README](https://github.com/rrrobo/rcj-rescu
 ### 2022年ルール対応版
 * RoboCup 2022 Bangkok Thailand
 
+### 2023年ルール対応版
+* ロボカップジュニア2023 東海ブロック大会
+* ロボカップジュニア2023 関東ブロック大会
+* ロボカップジュニア2023 関西ブロック大会
+* ロボカップジュニア2023 広島ブロック大会
+* ロボカップジュニア ジャパンオープン2023 名古屋
+* Torneo Mexicano de Robótica 2023 (メキシコ)
+* RoboCup 2023 Bordeaux France
+
 ## 使用方法
 ### Dockerを利用（推奨）
 [公式Dockerイメージ](https://hub.docker.com/repository/docker/ryorobo/rcj-cms)を用意しています．本イメージからの利用を推奨します．  

app.js

@@ -65,6 +65,7 @@ async function bootstrap(){
     var homeRoute = require('./routes/home')
     var lineRoute = require('./routes/line')
     var mazeRoute = require('./routes/maze')
+    var simulationRoute = require('./routes/simulation')
     var loginRoute = require('./routes/login')
     var adminRoute = require('./routes/admin')
     var localesRoute = require('./routes/locales')
@@ -90,6 +91,7 @@ async function bootstrap(){
     var apiFieldsRoute = require('./routes/api/fields')
     var apiLineRunsRoute = require('./routes/api/lineRuns')
     var apiMazeRunsRoute = require('./routes/api/mazeRuns')
+    var apiSimulationRunsRoute = require('./routes/api/simRuns')
     var apiCompetitionsRoute = require('./routes/api/competitions')
     var apiUserRoute = require('./routes/api/users')
     var apiSignageRoute = require('./routes/api/signage')
@@ -102,6 +104,7 @@ async function bootstrap(){
     var apiReservationRoute = require('./routes/api/reservation')
     var apiCabinetRoute = require('./routes/api/cabinet')
     var apiSurveyRoute = require('./routes/api/survey')
+    var apiRankingRoute = require('./routes/api/ranking')
 
 
     //========================================================================
@@ -182,6 +185,7 @@ async function bootstrap(){
     app.use('/api/fields', [apiFieldsRoute.public, pass.ensureLoginApi, apiFieldsRoute.private, pass.ensureAdminApi, apiFieldsRoute.admin])
     app.use('/api/runs/line', [apiLineRunsRoute.public, pass.ensureLoginApi, apiLineRunsRoute.private, pass.ensureAdminApi, apiLineRunsRoute.admin])
     app.use('/api/runs/maze', [apiMazeRunsRoute.public, pass.ensureLoginApi, apiMazeRunsRoute.private, pass.ensureAdminApi, apiMazeRunsRoute.admin])
+    app.use('/api/runs/simulation', [apiSimulationRunsRoute.public, pass.ensureLoginApi, apiSimulationRunsRoute.private, pass.ensureAdminApi, apiSimulationRunsRoute.admin])
     app.use('/api/competitions', [apiCompetitionsRoute.public, pass.ensureLoginApi, apiCompetitionsRoute.private, pass.ensureAdminApi, apiCompetitionsRoute.admin])
     app.use('/api/users', [pass.ensureLoginApi, apiUserRoute.admin, pass.ensureSuperApi , apiUserRoute.super])
     app.use('/api/signage', [pass.ensureLoginApi, apiSignageRoute.private, pass.ensureAdminApi, apiSignageRoute.admin])
@@ -194,6 +198,7 @@ async function bootstrap(){
     app.use('/api/reservation', [apiReservationRoute.public, pass.ensureLoginApi, apiReservationRoute.private, pass.ensureAdminApi, apiReservationRoute.admin])
     app.use('/api/cabinet', [apiCabinetRoute.public, pass.ensureLoginApi, apiCabinetRoute.private, pass.ensureAdminApi, apiCabinetRoute.admin])
     app.use('/api/survey', [apiSurveyRoute.public, pass.ensureLoginApi, apiSurveyRoute.private, pass.ensureAdminApi, apiSurveyRoute.admin])
+    app.use('/api/ranking', [apiRankingRoute.public, pass.ensureLoginApi, apiRankingRoute.private, pass.ensureAdminApi, apiRankingRoute.admin])
     app.get('/api/ip', (request, response) => response.send(request.ip))
 
 
@@ -215,6 +220,7 @@ async function bootstrap(){
 
     app.use('/line', [lineRoute.public, pass.ensureAuthenticated, lineRoute.private, pass.ensureAdmin, lineRoute.admin])
     app.use('/maze', [mazeRoute.public, pass.ensureAuthenticated, mazeRoute.private, pass.ensureAdmin, mazeRoute.admin])
+    app.use('/simulation', [simulationRoute.public, pass.ensureAuthenticated, simulationRoute.private, pass.ensureAdmin, simulationRoute.admin])
     app.use('/signage', [pass.ensureAuthenticated, signageRoute.private, pass.ensureAdmin, signageRoute.admin])
     app.use('/admin', pass.ensureAdmin, adminRoute)
     bullAdapter.setBasePath('/admin/queues')

helper/authLevels.js

@@ -17,17 +17,17 @@ function authCompetition(user, competitionId, level) {
 }
 module.exports.authCompetition = authCompetition;
 
-function authViewRun(user, run, level) {
+function authViewRun(user, run, level, preparation = false) {
   let competitionId;
   if (run == null) {
     return 0;
   }
 
   if (user == null) {
-    if (run.sign.captain != '') {
+    if (run.sign.captain != '' || run.status == 6) {
+      if (preparation) return 0;
       return 2;
     }
-    if (run.status == 6) return 2;
     return 0;
   }
 
@@ -43,10 +43,10 @@ function authViewRun(user, run, level) {
   if (authCompetition(user, competitionId, level)) {
     return 1;
   }
-  if (run.sign.captain != '') {
+  if (run.sign.captain != '' || run.status == 6) {
+    if (preparation) return 0;
     return 2;
   }
-  if (run.status == 6) return 2;
   return 0;
 }
 module.exports.authViewRun = authViewRun;