💄Judge/Sign small improve

Author: rrrobo

public/javascripts/line_sign.2022.js

@@ -335,7 +335,7 @@ app.controller('ddController', ['$scope', '$uibModal', '$log', '$timeout', '$htt
     };
 
     $scope.nlPoints = function(){
-        return 15 * $scope.victimNL_S + 30 * $scope.victimNL_G - 5 * $scope.misidentNL_C;
+        return 15 * $scope.victimNL_S + 30 * $scope.victimNL_G;
     }
 
 

views/line_judge.pug

@@ -200,11 +200,11 @@ html(ng-app="ddApp")
                           .input-group-append
                             button.btn.btn-success(type='button', ng-click='increment($index,$last)')
                               i.fas.fa-plus(aria-hidden='true')
-                    hr(ng-show='!$last')
-                    div(ng-if="$index == EvacuationAreaLoPIndex && league != 'LineNL'", style="border: solid 3px #e74c3c;border-radius:calc(0.5rem - 1px);")
-                      h3.card-header(style="background-color: #e74c3c;color: #fff;border-radius:calc(0.2rem - 1px) calc(0.2rem - 1px) 0 0;margin-left:-1px;")  {{'line.judge.rescue' | translate}}
+                    
+                    div(ng-if="$index == EvacuationAreaLoPIndex && league != 'LineNL'", style="border: solid 4px #e74c3c;border-radius:calc(0.5rem - 1px);margin-top:15px;")
+                      h3.card-header(style="background-color: #e74c3c;color: #fff;border-radius:calc(0.2rem - 1px) calc(0.2rem - 1px) 0 0;")  {{'line.judge.rescue' | translate}}
                         span.badge.badge-danger {{evacuationLevel-1?'line.judge.high':'line.judge.low' | translate}}
-                      .row
+                      .row(style="padding:10px;")
                         .col-4(ng-click="addVictimTmp('L')")
                           span Max : {{maxLiveVictims}}
                           br
@@ -222,68 +222,70 @@ html(ng-app="ddApp")
                           .victim_btn(style='width:100%;position: relative;', ng-style="{'background-color': count_victim_list('K') + count_victim_tmp('K') >= 1?'#ccc':'#E1FFFE'}")
                             img.img-thumbnail(src='/images/rescuekit-1.png', height='60px', ng-if="kitLevel==1")
                             img.img-thumbnail(src='/images/rescuekit-2.png', height='60px', ng-if="kitLevel==2")
-                      table(border='1', style='width:100%; text-align: center; margin-top: 10px;', ng-repeat='j in range(6)', ng-if='victim_tmp.length > j*5')
-                        tbody
-                          tr
-                            td(ng-repeat='i in range(5)', ng-dblclick='delete_victim_tmp(j*5 + i)', ng-swipe-left='delete_victim_tmp(j*5 + i)')
-                              img(src='/images/liveVictim.png', width='30px', ng-if="victim_tmp[j*5 + i] == 'L'")
-                              img(src='/images/deadVictim.png', width='30px', ng-if="victim_tmp[j*5 + i] == 'D'")
-                              img(src='/images/rescuekit-1.png', width='30px', ng-if="victim_tmp[j*5 + i] == 'K' && kitLevel==1")
-                              img(src='/images/rescuekit-2.png', width='30px', ng-if="victim_tmp[j*5 + i] == 'K' && kitLevel==2")
-                              span(style='width:30px;', ng-hide='victim_tmp[j*5 + i]') ---
-                      div(style='margin-top:20px;', ng-show='victim_tmp[0]')
-                        button.btn.btn-warning(style='margin:0 10px 10px 0;', type='button', ng-click='victim_tmp_clear()')
-                          i.far.fa-trash-alt(aria-hidden='true')   Clear
-                        button.btn.btn-success(style='margin:0 10px 10px 0;', type='button', ng-click='victimRegist()')
-                          i.fas.fa-arrow-down(aria-hidden='true')   Register
-                      div(ng-show="victim_list.length > 0")
-                        hr
-                        h6 {{'line.judge.rescuedVictims' | translate}}
-                        span(style='font-size:9px;') {{'line.judge.rescuedVictimsMes' | translate}}
-                        table(border='1', style='width:100%; text-align: center; margin-top: 10px;', ng-repeat='j in range(6)', ng-if='victim_list.length > j*5 || j == 0')
-                          tbody
-                            tr
-                              th(style='text-align:center;', ng-repeat='i in range(5)') {{j*5 + i+1}}
-                            tr
-                              td(ng-repeat='i in range(5)', ng-style="{'background-color': victim_list[j*5 + i].effective?'#E1FFFE':'#ccc'}", ng-dblclick='delete_victim(j*5 + i)', ng-swipe-left='delete_victim(j*5 + i)')
-                                img(src='/images/liveVictim.png', width='30px', ng-if="victim_list[j*5 + i].type == 'L'")
-                                img(src='/images/deadVictim.png', width='30px', ng-if="victim_list[j*5 + i].type == 'D'")
-                                img(src='/images/rescuekit-1.png', width='30px', ng-if="victim_list[j*5 + i].type == 'K' && kitLevel==1")
-                                img(src='/images/rescuekit-2.png', width='30px', ng-if="victim_list[j*5 + i].type == 'K' && kitLevel==2")
-                                span(style='width:30px;', ng-hide='victim_list[j*5 + i]') ---
-                                br
-                                span(ng-show='victim_list[j*5 + i]')
-                                  | {{calc_victim_multipliers(victim_list[j*5 + i].type,victim_list[j*5 + i].effective)}}
-                div(ng-if="league == 'LineNL'", style="border: solid 3px #e74c3c;border-radius:calc(0.5rem - 1px);")
-                  h3.card-header(style="background-color: #e74c3c;color: #fff;border-radius:calc(0.2rem - 1px) calc(0.2rem - 1px) 0 0;margin-left:-1px;")  {{'line.judge.rescue' | translate}} (NL)
-                  .row(style="margin-top:20px;")
-                    div(style='width:40%;font-size:10px;', align='center')
-                      img(src='/images/blackVictim.png', height='40px')
-                    div(style='width:60%;position: relative;')
-                      .input-group.mb-3(style='width:100%; height:40px;position:absolute;margin: auto;top: calc(50% - 20px);')
-                        .input-group-prepend
-                          button.btn.btn-danger(type='button', ng-click='victimNL("S",-1)')
-                            i.fas.fa-minus(aria-hidden='true')
-                        div(style='background-color: #F2F2F2; width:40%; text-align: center;')
-                          span.count {{victimNL_S}}
-                        .input-group-append
-                          button.btn.btn-success(type='button', ng-click='victimNL("S",1)')
-                            i.fas.fa-plus(aria-hidden='true')
-                  .row(style="margin-top:20px;margin-bottom:20px;")
-                    div(style='width:40%;font-size:10px;', align='center')
-                      img(src='/images/greenVictim.png', height='40px')
-                    div(style='width:60%;position: relative;')
-                      .input-group.mb-3(style='width:100%; height:40px;position:absolute;margin: auto;top: calc(50% - 20px);')
-                        .input-group-prepend
-                          button.btn.btn-danger(type='button', ng-click='victimNL("G",-1)')
-                            i.fas.fa-minus(aria-hidden='true')
-                        div(style='background-color: #F2F2F2; width:40%; text-align: center;')
-                          span.count {{victimNL_G}}
-                        .input-group-append
-                          button.btn.btn-success(type='button', ng-click='victimNL("G",1)')
-                            i.fas.fa-plus(aria-hidden='true')
+                        .col-12
+                          table(border='1', style='width:100%; text-align: center; margin-top: 10px;', ng-repeat='j in range(6)', ng-if='victim_tmp.length > j*5')
+                            tbody
+                              tr
+                                td(ng-repeat='i in range(5)', ng-dblclick='delete_victim_tmp(j*5 + i)', ng-swipe-left='delete_victim_tmp(j*5 + i)')
+                                  img(src='/images/liveVictim.png', width='30px', ng-if="victim_tmp[j*5 + i] == 'L'")
+                                  img(src='/images/deadVictim.png', width='30px', ng-if="victim_tmp[j*5 + i] == 'D'")
+                                  img(src='/images/rescuekit-1.png', width='30px', ng-if="victim_tmp[j*5 + i] == 'K' && kitLevel==1")
+                                  img(src='/images/rescuekit-2.png', width='30px', ng-if="victim_tmp[j*5 + i] == 'K' && kitLevel==2")
+                                  span(style='width:30px;', ng-hide='victim_tmp[j*5 + i]') ---
+                          div(style='margin-top:20px;', ng-show='victim_tmp[0]')
+                            button.btn.btn-warning(style='margin:0 10px 10px 0;', type='button', ng-click='victim_tmp_clear()')
+                              i.far.fa-trash-alt(aria-hidden='true')   Clear
+                            button.btn.btn-success(style='margin:0 10px 10px 0;', type='button', ng-click='victimRegist()')
+                              i.fas.fa-arrow-down(aria-hidden='true')   Register
+                          div(ng-show="victim_list.length > 0")
+                            hr
+                            h6 {{'line.judge.rescuedVictims' | translate}}
+                            span(style='font-size:9px;') {{'line.judge.rescuedVictimsMes' | translate}}
+                            table(border='1', style='width:100%; text-align: center; margin-top: 10px;', ng-repeat='j in range(6)', ng-if='victim_list.length > j*5 || j == 0')
+                              tbody
+                                tr
+                                  th(style='text-align:center;', ng-repeat='i in range(5)') {{j*5 + i+1}}
+                                tr
+                                  td(ng-repeat='i in range(5)', ng-style="{'background-color': victim_list[j*5 + i].effective?'#E1FFFE':'#ccc'}", ng-dblclick='delete_victim(j*5 + i)', ng-swipe-left='delete_victim(j*5 + i)')
+                                    img(src='/images/liveVictim.png', width='30px', ng-if="victim_list[j*5 + i].type == 'L'")
+                                    img(src='/images/deadVictim.png', width='30px', ng-if="victim_list[j*5 + i].type == 'D'")
+                                    img(src='/images/rescuekit-1.png', width='30px', ng-if="victim_list[j*5 + i].type == 'K' && kitLevel==1")
+                                    img(src='/images/rescuekit-2.png', width='30px', ng-if="victim_list[j*5 + i].type == 'K' && kitLevel==2")
+                                    span(style='width:30px;', ng-hide='victim_list[j*5 + i]') ---
+                                    br
+                                    span(ng-show='victim_list[j*5 + i]')
+                                      | {{calc_victim_multipliers(victim_list[j*5 + i].type,victim_list[j*5 + i].effective)}}
+
+                    div(ng-if="$index == EvacuationAreaLoPIndex && league == 'LineNL'", style="border: solid 4px #e74c3c;border-radius:calc(0.5rem - 1px);margin-top:15px;")
+                      h3.card-header(style="background-color: #e74c3c;color: #fff;border-radius:calc(0.2rem - 1px) calc(0.2rem - 1px) 0 0;")  {{'line.judge.rescue' | translate}} (NL)
+                      .row(style="margin-top:20px;")
+                        div(style='width:40%;font-size:10px;', align='center')
+                          img(src='/images/blackVictim.png', height='40px')
+                        div(style='width:60%;position: relative;')
+                          .input-group.mb-3(style='width:100%; height:40px;position:absolute;margin: auto;top: calc(50% - 20px);')
+                            .input-group-prepend
+                              button.btn.btn-danger(type='button', ng-click='victimNL("S",-1)')
+                                i.fas.fa-minus(aria-hidden='true')
+                            div(style='background-color: #F2F2F2; width:40%; text-align: center;')
+                              span.count {{victimNL_S}}
+                            .input-group-append
+                              button.btn.btn-success(type='button', ng-click='victimNL("S",1)')
+                                i.fas.fa-plus(aria-hidden='true')
+                      .row(style="margin-top:20px;margin-bottom:20px;")
+                        div(style='width:40%;font-size:10px;', align='center')
+                          img(src='/images/greenVictim.png', height='40px')
+                        div(style='width:60%;position: relative;')
+                          .input-group.mb-3(style='width:100%; height:40px;position:absolute;margin: auto;top: calc(50% - 20px);')
+                            .input-group-prepend
+                              button.btn.btn-danger(type='button', ng-click='victimNL("G",-1)')
+                                i.fas.fa-minus(aria-hidden='true')
+                            div(style='background-color: #F2F2F2; width:40%; text-align: center;')
+                              span.count {{victimNL_G}}
+                            .input-group-append
+                              button.btn.btn-success(type='button', ng-click='victimNL("G",1)')
+                                i.fas.fa-plus(aria-hidden='true')
                       //hr
-                      //.row(style="margin-top:10px;padding-bottom:20px;")
+                      .row(style="margin-top:10px;padding-bottom:20px;")
                         div(style='width:40%;font-size:10px;', align='center')
                           img(src='/images/misidentNL.png', height='40px')
                         div(style='width:60%;position: relative;')
@@ -296,6 +298,7 @@ html(ng-app="ddApp")
                             .input-group-append
                               button.btn.btn-success(type='button', ng-click='misidentNL(1)')
                                 i.fas.fa-plus(aria-hidden='true')
+                    hr(ng-show='!$last')
 
                 h3.card-header
                   i.fas.fa-door-open(aria-hidden='true')

views/line_sign.pug

@@ -121,7 +121,7 @@ html(ng-app="ddApp")
       div(ng-if="league=='LineNL'")
         h2 {{'line.sign.rescue' | translate}} (NL)
         .row(style="display: flex;flex-wrap: wrap;")
-          .col-lg-8
+          .col-lg-6
             .alert.alert-info(style='margin-bottom:50px;text-align:center;', role='alert')
               .row
                 .col-5
@@ -144,18 +144,21 @@ html(ng-app="ddApp")
                       span(style='font-size:25px;') {{30 * victimNL_G}} {{'common.point' | translate}}
                 //.col-1
                   h1(style="text-align: center;line-height: 165px;") -
-                //.col-4
-                  .victim_btn(style='width:100%;position: relative; background-color: #E1FFFE;')
-                    img.img-thumbnail(src='/images/misidentNL.png', style="height:90px;")
-                    div(style="margin-top:10px;")
-                      span(style='font-size:1vw;color:#444;') 5 {{'common.point' | translate}} x 
-                        i.fas.fa-history.fa-2x  {{misidentNL_C}}
-                    span.badge.badge-warning(style='margin-top:10px;')
-                      span(style='font-size:25px;') {{5 * misidentNL_C}} {{'common.point' | translate}}
-          .col-lg-4
-            .alert.alert-primary(style='margin-bottom:50px;text-align:center;', role='alert')
-              h2 {{'line.sign.rescue' | translate}} {{'common.stotal' | translate}}
-              h1 {{nlPoints()}} {{'common.point' | translate}}
+                
+          .col-lg-6        
+                .alert.alert-primary(style='margin-bottom:50px;text-align:center;', role='alert')
+                  .row 
+                    .col-6
+                      h2 {{'line.sign.rescue' | translate}} {{'common.stotal' | translate}}
+                      h1 {{nlPoints()}} {{'common.point' | translate}}
+                    .col-6 
+                      .victim_btn(style='width:100%;position: relative; background-color: #E1FFFE;')
+                        img.img-thumbnail(src='/images/misidentNL.png', style="height:90px;")
+                        div(style="margin-top:10px;")
+                          span(style='font-size:1vw;color:#444;')
+                            i.fas.fa-history.fa-2x  {{misidentNL_C}}
+                        //span.badge.badge-warning(style='margin-top:10px;')
+                          span(style='font-size:25px;') {{5 * misidentNL_C}} {{'common.point' | translate}}
         hr
       h2 {{'line.sign.exitBonus' | translate}}
       .alert.alert-primary(style='margin-bottom:50px;text-align:center;', role='alert')

views/line_view.pug

@@ -159,7 +159,7 @@ html(ng-app="ddApp")
       div(ng-if="league=='LineNL'")
         h2 {{'line.sign.rescue' | translate}} (NL)
         .row(style="display: flex;flex-wrap: wrap;")
-          .col-lg-8
+          .col-lg-6
             .alert.alert-info(style='margin-bottom:50px;text-align:center;', role='alert')
               .row
                 .col-5
@@ -190,10 +190,20 @@ html(ng-app="ddApp")
                         i.fas.fa-history.fa-2x  {{misidentNL_C}}
                     span.badge.badge-warning(style='margin-top:10px;')
                       span(style='font-size:25px;') {{5 * misidentNL_C}} {{'common.point' | translate}}
-          .col-lg-4
+          .col-lg-6        
             .alert.alert-primary(style='margin-bottom:50px;text-align:center;', role='alert')
-              h2 {{'line.sign.rescue' | translate}} {{'common.stotal' | translate}}
-              h1 {{nlPoints()}} {{'common.point' | translate}}
+              .row 
+                .col-6
+                  h2 {{'line.sign.rescue' | translate}} {{'common.stotal' | translate}}
+                  h1 {{nlPoints()}} {{'common.point' | translate}}
+                .col-6 
+                  .victim_btn(style='width:100%;position: relative; background-color: #E1FFFE;')
+                    img.img-thumbnail(src='/images/misidentNL.png', style="height:90px;")
+                    div(style="margin-top:10px;")
+                      span(style='font-size:1vw;color:#444;')
+                        i.fas.fa-history.fa-2x  {{misidentNL_C}}
+                    //span.badge.badge-warning(style='margin-top:10px;')
+                      span(style='font-size:25px;') {{5 * misidentNL_C}} {{'common.point' | translate}}
         hr
       h2 {{'line.sign.exitBonus' | translate}}
       .alert.alert-primary(style='margin-bottom:50px;text-align:center;', role='alert')