Merge branch 'master' into feature/adapt-2024-rules

rrrobo · May 4, 2024 · fde8a20 · fde8a20
2 parents 205aac8 + f0933c5
commit fde8a20
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 34 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rcj-scoring",
-  "version": "24.0.0-beta.18",
+  "version": "24.0.0-beta.19",
   "copyright": "2016-2024 RCJ-CMS Development Team",
   "private": true,
   "scripts": {

diff --git a/routes/api/lineRuns.js b/routes/api/lineRuns.js
@@ -334,13 +334,12 @@ publicRouter.get('/:runid', async function (req, res, next) {
         });
       }
 
+      dbRun = dbRun.toObject();
       if (authResult == 2) {
         delete dbRun.comment;
         delete dbRun.sign;
       }
 
-      dbRun = dbRun.toObject();
-
       // return normalized value
       let rankingSettings = dbRun.competition.leagues.find(r => r.league == dbRun.team.league);
       if (!rankingSettings) {

diff --git a/routes/api/mazeRuns.js b/routes/api/mazeRuns.js
@@ -105,6 +105,7 @@ publicRouter.get('/competition/:competitionId', function (req, res, next) {
         err: err.message,
       });
     } else if (dbRuns) {
+      console.log("ABCD")
       // Hide map and field from public
       dbRuns.map(run => {
         switch(auth.authViewRun(req.user, run, ACCESSLEVELS.NONE + 1, run.competition.preparation)) {
@@ -316,13 +317,13 @@ publicRouter.get('/:runid', function (req, res, next) {
         msg: 'You have no authority to access this api!!',
       });
     }
+
+    dbRun = dbRun.toObject();
     if (authResult == 2) {
       delete dbRun.comment;
       delete dbRun.sign;
     }
 
-    dbRun = dbRun.toObject();
-
     // return normalized value
     let rankingSettings = dbRun.competition.leagues.find(r => r.league == dbRun.team.league);
     if (normalized && competitiondb.NORMALIZED_RANKING_MODE.includes(rankingSettings.mode)) {

diff --git a/routes/api/simRuns.js b/routes/api/simRuns.js
@@ -152,14 +152,14 @@ publicRouter.get('/:runid', async function (req, res, next) {
         ACCESSLEVELS.NONE + 1,
         dbRun.competition.preparation
       );
+
+      dbRun = dbRun.toObject();
       if (authResult == 0) return res.status(401).send();
       if (authResult == 2) {
         delete dbRun.comment;
         delete dbRun.sign;
       }
 
-      dbRun = dbRun.toObject();
-
       // return normalized value
       let rankingSettings = dbRun.competition.leagues.find(r => r.league == dbRun.team.league);
       if (normalized && competitiondb.NORMALIZED_RANKING_MODE.includes(rankingSettings.mode)) {

diff --git a/views/view/line_2024E.pug b/views/view/line_2024E.pug
@@ -88,31 +88,32 @@ html(ng-app="ddApp")
             .d-sm-none
               i.fas.fa-stopwatch.fa-2x(aria-hidden='true')
                 | : {{minutes}} {{'common.min' | translate}} {{seconds}} {{'common.sec' | translate}}
-      .row(style='margin:0 0 30 0;')
-        .col-md-12
-          #sign.card
-            h3.card-header
-              i.fas.fa-comment(aria-hidden='true')
-              |  {{'line.view.comment' | translate}}
-            .card-body
-              p.card-text.text-info
-                | {{'line.view.comment_e' | translate}}
-              .form-group
-                textarea.form-control(ng-model='comment', rows='3', disabled='')
-            h3.card-header
-              i.fas.fa-pencil-alt(aria-hidden='true')
-              |  {{'line.view.sign' | translate}}
-            .card-body
-              p.card-text.text-warning(translate='line.view.sign_e')
-              .sign-box.sign-box-cap
-                p.sign-box-title.sign-box-title-cap(translate='line.view.cap_sign')
-                img(ng-src='{{cap_sig}}', style='max-width: 100%;height: auto;')
-              hr
-              .sign-box.sign-box-ref
-                p.sign-box-title.sign-box-title-ref(translate='line.view.ref_sign')
-                img(ng-src='{{ref_sig}}', style='max-width: 100%;height: auto;')
-              hr
-              .sign-box.sign-box-ref
-                p.sign-box-title.sign-box-title-ref(translate='line.view.cref_sign')
-                img(ng-src='{{refas_sig}}', style='max-width: 100%;height: auto;')
+      if user
+        .row(style='margin:0 0 30 0;')
+          .col-md-12
+            #sign.card
+              h3.card-header
+                i.fas.fa-comment(aria-hidden='true')
+                |  {{'line.view.comment' | translate}}
+              .card-body
+                p.card-text.text-info
+                  | {{'line.view.comment_e' | translate}}
+                .form-group
+                  textarea.form-control(ng-model='comment', rows='3', disabled='')
+              h3.card-header
+                i.fas.fa-pencil-alt(aria-hidden='true')
+                |  {{'line.view.sign' | translate}}
+              .card-body
+                p.card-text.text-warning(translate='line.view.sign_e')
+                .sign-box.sign-box-cap
+                  p.sign-box-title.sign-box-title-cap(translate='line.view.cap_sign')
+                  img(ng-src='{{cap_sig}}', style='max-width: 100%;height: auto;')
+                hr
+                .sign-box.sign-box-ref
+                  p.sign-box-title.sign-box-title-ref(translate='line.view.ref_sign')
+                  img(ng-src='{{ref_sig}}', style='max-width: 100%;height: auto;')
+                hr
+                .sign-box.sign-box-ref
+                  p.sign-box-title.sign-box-title-ref(translate='line.view.cref_sign')
+                  img(ng-src='{{refas_sig}}', style='max-width: 100%;height: auto;')
     include ../includes/footer