Skip to content

Commit 8c610b9

Browse files
rrroborrrobo
committed
Fix score manual input bug
1 parent d642c68 commit 8c610b9

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

‎views/line_check.pug‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,20 +104,20 @@ html(ng-app="ddApp")
104104
th(style='text-align:center;', ng-repeat='i in range(4)') {{i+1}}
105105
tr
106106
td
107-
img(src='/images/evacZone/red_lv1.png', height='50px', ng-if="evacuationLevel == 1")
108-
img(src='/images/evacZone/red_lv2.png', height='50px', ng-if="evacuationLevel == 2")
107+
img(src='/images/evacZone/green_lv1.png', height='50px', ng-if="evacuationLevel == 1")
108+
img(src='/images/evacZone/green_lv2.png', height='50px', ng-if="evacuationLevel == 2")
109109
td(ng-repeat='i in range(4)', ng-dblclick='delete_victim(i)', ng-swipe-left='delete_victim(i)')
110-
div(ng-if="victim_list[i].zoneType == 'RED'")
110+
div(ng-if="victim_list[i].zoneType == 'GREEN'")
111111
img(src='/images/liveVictim.png', width='30px', ng-if="victim_list[i].victimType == 'LIVE'")
112112
img(src='/images/deadVictim.png', width='30px', ng-if="victim_list[i].victimType == 'DEAD'")
113113
img(src='/images/rescuekit-1.png', width='30px', ng-if="victim_list[i].victimType == 'KIT' && kitLevel==1")
114114
img(src='/images/rescuekit-2.png', width='30px', ng-if="victim_list[i].victimType == 'KIT' && kitLevel==2")
115115
tr
116116
td
117-
img(src='/images/evacZone/green_lv1.png', height='50px', ng-if="evacuationLevel == 1")
118-
img(src='/images/evacZone/green_lv2.png', height='50px', ng-if="evacuationLevel == 2")
117+
img(src='/images/evacZone/red_lv1.png', height='50px', ng-if="evacuationLevel == 1")
118+
img(src='/images/evacZone/red_lv2.png', height='50px', ng-if="evacuationLevel == 2")
119119
td(ng-repeat='i in range(4)', ng-dblclick='delete_victim(i)', ng-swipe-left='delete_victim(i)')
120-
div(ng-if="victim_list[i].zoneType == 'GREEN'")
120+
div(ng-if="victim_list[i].zoneType == 'RED'")
121121
img(src='/images/liveVictim.png', width='30px', ng-if="victim_list[i].victimType == 'LIVE'")
122122
img(src='/images/deadVictim.png', width='30px', ng-if="victim_list[i].victimType == 'DEAD'")
123123
img(src='/images/rescuekit-1.png', width='30px', ng-if="victim_list[i].victimType == 'KIT' && kitLevel==1")

‎views/line_input.pug‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,14 @@ html(ng-app="ddApp")
123123
td(rowspan="6")
124124
button.btn.btn-warning(type='button', ng-click='victim_tmp_clear()')
125125
i.far.fa-trash-alt(aria-hidden='true')
126-
.col-6(ng-if="victim_tmp.length > 0", style="margin-top:10px;")
127-
.evac_zone_btn_red(style='width:100%;position: relative;', ng-click='victimRegist("RED")')
128-
img.img-thumbnail(src='/images/evacZone/red_lv1_a.png', height='60px', ng-if="evacuationLevel == 1")
129-
img.img-thumbnail(src='/images/evacZone/red_lv2_a.png', height='60px', ng-if="evacuationLevel == 2")
130126
.col-6(ng-if="victim_tmp.length > 0", style="margin-top:10px;", ng-click='victimRegist("GREEN")')
131127
.evac_zone_btn_green(style='width:100%;position: relative;')
132128
img.img-thumbnail(src='/images/evacZone/green_lv1_a.png', height='60px', ng-if="evacuationLevel == 1")
133129
img.img-thumbnail(src='/images/evacZone/green_lv2_a.png', height='60px', ng-if="evacuationLevel == 2")
130+
.col-6(ng-if="victim_tmp.length > 0", style="margin-top:10px;")
131+
.evac_zone_btn_red(style='width:100%;position: relative;', ng-click='victimRegist("RED")')
132+
img.img-thumbnail(src='/images/evacZone/red_lv1_a.png', height='60px', ng-if="evacuationLevel == 1")
133+
img.img-thumbnail(src='/images/evacZone/red_lv2_a.png', height='60px', ng-if="evacuationLevel == 2")
134134
.col-12
135135
div(ng-show="victim_list.length > 0")
136136
hr
@@ -143,20 +143,20 @@ html(ng-app="ddApp")
143143
th(style='text-align:center;', ng-repeat='i in range(4)') {{i+1}}
144144
tr
145145
td
146-
img(src='/images/evacZone/red_lv1.png', height='50px', ng-if="evacuationLevel == 1")
147-
img(src='/images/evacZone/red_lv2.png', height='50px', ng-if="evacuationLevel == 2")
146+
img(src='/images/evacZone/green_lv1.png', height='50px', ng-if="evacuationLevel == 1")
147+
img(src='/images/evacZone/green_lv2.png', height='50px', ng-if="evacuationLevel == 2")
148148
td(ng-repeat='i in range(4)', ng-dblclick='delete_victim(i)', ng-swipe-left='delete_victim(i)')
149-
div(ng-if="victim_list[i].zoneType == 'RED'")
149+
div(ng-if="victim_list[i].zoneType == 'GREEN'")
150150
img(src='/images/liveVictim.png', width='30px', ng-if="victim_list[i].victimType == 'LIVE'")
151151
img(src='/images/deadVictim.png', width='30px', ng-if="victim_list[i].victimType == 'DEAD'")
152152
img(src='/images/rescuekit-1.png', width='30px', ng-if="victim_list[i].victimType == 'KIT' && kitLevel==1")
153153
img(src='/images/rescuekit-2.png', width='30px', ng-if="victim_list[i].victimType == 'KIT' && kitLevel==2")
154154
tr
155155
td
156-
img(src='/images/evacZone/green_lv1.png', height='50px', ng-if="evacuationLevel == 1")
157-
img(src='/images/evacZone/green_lv2.png', height='50px', ng-if="evacuationLevel == 2")
156+
img(src='/images/evacZone/red_lv1.png', height='50px', ng-if="evacuationLevel == 1")
157+
img(src='/images/evacZone/red_lv2.png', height='50px', ng-if="evacuationLevel == 2")
158158
td(ng-repeat='i in range(4)', ng-dblclick='delete_victim(i)', ng-swipe-left='delete_victim(i)')
159-
div(ng-if="victim_list[i].zoneType == 'GREEN'")
159+
div(ng-if="victim_list[i].zoneType == 'RED'")
160160
img(src='/images/liveVictim.png', width='30px', ng-if="victim_list[i].victimType == 'LIVE'")
161161
img(src='/images/deadVictim.png', width='30px', ng-if="victim_list[i].victimType == 'DEAD'")
162162
img(src='/images/rescuekit-1.png', width='30px', ng-if="victim_list[i].victimType == 'KIT' && kitLevel==1")

0 commit comments

Comments
 (0)