Skip to content

Commit fb37dfc

Browse files
rrroborrrobo
committed
Added missing files
1 parent 9b322e5 commit fb37dfc

File tree

4 files changed

+139
-25
lines changed

4 files changed

+139
-25
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "rcj-scoring",
3-
"version": "25.0.0 beta.14",
3+
"version": "25.0.0",
44
"copyright": "2016-2025 RCJ-CMS Development Team",
55
"private": true,
66
"scripts": {

‎public/javascripts/manual/line_2025.js‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ app.controller('ddController', ['$scope', '$uibModal', '$log', '$timeout', '$htt
4747
"?populate=true").then(function (response) {
4848

4949
$scope.LoPs = response.data.LoPs;
50-
$scope.evacuationLevel = response.data.evacuationLevel;
51-
$scope.kitLevel = response.data.kitLevel;
5250
$scope.exitBonus = response.data.exitBonus;
5351
$scope.field = response.data.field.name;
5452
$scope.score = response.data.score;
@@ -327,8 +325,6 @@ app.controller('ddController', ['$scope', '$uibModal', '$log', '$timeout', '$htt
327325
if ($scope.count_victim_list("LIVE") + $scope.count_victim_tmp("LIVE") >= $scope.maxLiveVictims) return;
328326
} else if(type == "DEAD") {
329327
if ($scope.count_victim_list("DEAD") + $scope.count_victim_tmp("DEAD") >= $scope.maxDeadVictims) return;
330-
} else{ //Rescue Kit
331-
if ($scope.count_victim_list("KIT") + $scope.count_victim_tmp("KKIT") >= 1) return;
332328
}
333329
$scope.victim_tmp.push(type);
334330
};
@@ -342,9 +338,6 @@ app.controller('ddController', ['$scope', '$uibModal', '$log', '$timeout', '$htt
342338
} else if(victimType == "DEAD") {
343339
tmp.victimType = "DEAD";
344340
if ($scope.count_victim_list("DEAD") >= $scope.maxDeadVictims) return;
345-
} else { //Rescue Kit
346-
tmp.victimType = "KIT";
347-
if ($scope.count_victim_list("KIT") >= 1) return;
348341
}
349342
$scope.victim_list.push(tmp);
350343
};
@@ -369,8 +362,6 @@ app.controller('ddController', ['$scope', '$uibModal', '$log', '$timeout', '$htt
369362
live++;
370363
} else if (!victiml.indexOf("DEAD")) {
371364
dead++;
372-
} else{
373-
kit ++;
374365
}
375366
}
376367
for (let i = 0; i < live; i++) {
@@ -380,8 +371,6 @@ app.controller('ddController', ['$scope', '$uibModal', '$log', '$timeout', '$htt
380371
$scope.addVictim("DEAD", zoneType);
381372
}
382373

383-
if(kit) $scope.addVictim("KIT", zoneType);
384-
385374
$scope.victim_tmp_clear();
386375
};
387376

@@ -390,23 +379,10 @@ app.controller('ddController', ['$scope', '$uibModal', '$log', '$timeout', '$htt
390379
$scope.victim_tmp = [];
391380
};
392381

393-
$scope.changeLevel = function (n) {
394-
playSound(sClick);
395-
$scope.evacuationLevel = n;
396-
}
397-
398-
$scope.changeLevelK = function (n) {
399-
playSound(sClick);
400-
$scope.kitLevel = n;
401-
};
402-
403-
404382
$scope.send = function () {
405383
playSound(sClick);
406384
var run = {}
407385
run.LoPs = $scope.LoPs;
408-
run.evacuationLevel = $scope.evacuationLevel;
409-
run.kitLevel = $scope.kitLevel;
410386
run.exitBonus = $scope.exitBonus;
411387
run.rescueOrder = $scope.victim_list;
412388
run.showedUp = true;

‎views/signage/ranking/line_2025.pug‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
//- -*- tab-width: 2 -*-
2+
extends ../../includes/signage_layout
3+
4+
block vars
5+
- var ngAppDef = 'LineScore'
6+
7+
append scripts
8+
script.
9+
var competitionId = "#{id}"
10+
var leagueId = "#{leagueId}"
11+
script(src = '/components/datatables/media/js/jquery.dataTables.min.js')
12+
script(src = '/components/angular-datatables/demo/src/archives/dist/angular-datatables.min.js')
13+
script(src = '/javascripts/ranking/line_2025.js')
14+
15+
block content
16+
style.
17+
.ces{
18+
display: flex;
19+
justify-content: center; /*左右中央揃え*/
20+
align-items: center;
21+
}
22+
.row#rank
23+
.col-lg-12
24+
div(ng-repeat='team in ranking | limitTo: 3 track by $index' ng-show="showFrom == 0")
25+
.row(style="height:29vh")
26+
.col-9
27+
img(ng-src="/images/ranking/{{$index+1}}.png" style="height:29vh;float: left;")
28+
div(style="margin-left:35vh;")
29+
div(style="position:relative; top:3vh; font-size: 6vh;") {{team.team.teamCode}}
30+
div(style="position:relative; top:5vh; font-size:10vh; text-overflow: ellipsis;white-space: nowrap;") {{team.team.name}}
31+
.col-3
32+
ul.list-group(style="height:100%;font-size:4vh;")
33+
li.list-group-item(style="border:3px solid #636e72;padding:1vh;color:#d35400;overflow: hidden;text-overflow: clip;white-space: nowrap;")
34+
i.fas.fa-calculator.fa-fw &nbsp;{{team.finalScore}}
35+
li.list-group-item(style="border:3px solid #636e72;padding:1vh;border-top:0px;color:#0abde3")
36+
i.fas.fa-stopwatch.fa-fw &nbsp;{{("00"+team.gameSum.time.minutes).slice(-2)}}:{{("00"+team.gameSum.time.seconds).slice(-2)}}
37+
li.list-group-item(style="border:3px solid #636e72;padding:1vh;border-top:0px;color:#ee5253")
38+
i.fas.fa-ambulance.fa-fw(style="margin-right:10px;")
39+
.img-thumbnail(style="padding:0;display: inline-block;margin:1px;" ng-repeat="victim in team.gameSum.victims" ng-style="{backgroundColor: evacZoneColor(victim)}")
40+
div(style="display: flex; flex-direction: column;")
41+
img(ng-src='/images/{{victimImgPath(victim)}}', style="height:3vh")
42+
span(style="font-size:1vh; color: #000; text-align:center;") ×{{victim.count}}
43+
li.list-group-item(style="border:3px solid #636e72;padding:1vh;border-top:0px;color:#222f3e")
44+
i.fas.fa-step-forward.fa-fw &nbsp;{{team.gameSum.lops}}
45+
hr(color="#636e72" style="margin-top:1vh;margin-bottom:1vh;")
46+
.row(ng-hide="showFrom == 0" style="height:30vh;")
47+
.col-6(style="border-right:solid 1px #000;border-right:solid 1px #000;padding-bottom:20px;" ng-repeat="team in ranking | limitTo: 6:showFrom track by $index")
48+
.row.ces(style="margin-left:5px;margin-top:10px;height:30%;margin-bottom:3vh;")
49+
.col-2(style="text-align:center;font-size:6vh; border:solid 1px #000;") {{showFrom + $index + 1}}
50+
.col-10(style="font-size:6vh;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;")
51+
span(style="font-size:3vh;margin-right:10px;") {{team.team.teamCode}}
52+
span {{team.team.name}}
53+
.row
54+
.col-6
55+
ul.list-group(style="height:100%;font-size:4vh;")
56+
li.list-group-item(style="border:3px solid #636e72;padding:1vh;color:#d35400;overflow: hidden;text-overflow: clip;white-space: nowrap;")
57+
i.fas.fa-calculator.fa-fw &nbsp;{{team.finalScore}}
58+
li.list-group-item(style="border:3px solid #636e72;padding:1vh;border-top:0px;color:#0abde3")
59+
i.fas.fa-stopwatch.fa-fw &nbsp;{{("00"+team.gameSum.time.minutes).slice(-2)}}:{{("00"+team.gameSum.time.seconds).slice(-2)}}
60+
.col-6
61+
ul.list-group(style="height:100%;font-size:4vh;")
62+
li.list-group-item(style="border:3px solid #636e72;padding:1vh;color:#ee5253")
63+
i.fas.fa-ambulance.fa-fw(style="margin-right:10px;")
64+
.img-thumbnail(style="padding:0;display: inline-block;margin:1px;" ng-repeat="victim in team.gameSum.victims" ng-style="{backgroundColor: evacZoneColor(victim)}")
65+
div(style="display: flex; flex-direction: column;")
66+
img(ng-src='/images/{{victimImgPath(victim)}}', style="height:3vh")
67+
span(style="font-size:1vh; color: #000; text-align:center;") ×{{victim.count}}
68+
li.list-group-item(style="border:3px solid #636e72;padding:1vh;border-top:0px;color:#222f3e")
69+
i.fas.fa-step-forward.fa-fw &nbsp;{{team.gameSum.lops}}

‎views/signage/ranking/maze_2025.pug‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
//- -*- tab-width: 2 -*-
2+
extends ../../includes/signage_layout
3+
4+
block vars
5+
- var ngAppDef = 'MazeScore'
6+
7+
append scripts
8+
script.
9+
var competitionId = "#{id}"
10+
var leagueId = "#{leagueId}"
11+
script(src = '/components/datatables/media/js/jquery.dataTables.min.js')
12+
script(src = '/components/angular-datatables/demo/src/archives/dist/angular-datatables.min.js')
13+
script(src = '/javascripts/ranking/maze_2025.js')
14+
15+
block content
16+
style.
17+
.ces{
18+
display: flex;
19+
justify-content: center; /*左右中央揃え*/
20+
align-items: center;
21+
}
22+
.row#rank
23+
.col-lg-12
24+
div(ng-repeat='team in ranking | limitTo: 3 track by $index' ng-show="showFrom == 0")
25+
.row(style="height:29vh")
26+
.col-9
27+
img(ng-src="/images/ranking/{{$index+1}}.png" style="height:29vh;float: left;")
28+
div(style="margin-left:35vh;")
29+
div(style="position:relative; top:3vh; font-size: 6vh;") {{team.team.teamCode}}
30+
div(style="position:relative; top:5vh; font-size:10vh; text-overflow: ellipsis;white-space: nowrap;") {{team.team.name}}
31+
.col-3
32+
ul.list-group(style="height:100%;font-size:4vh;")
33+
li.list-group-item(style="border:3px solid #636e72;padding:1vh;color:#d35400;overflow: hidden;text-overflow: clip;white-space: nowrap;")
34+
i.fas.fa-calculator.fa-fw &nbsp;{{team.finalScore}}
35+
li.list-group-item(style="border:3px solid #636e72;padding:1vh;border-top:0px;color:#0abde3")
36+
i.fas.fa-stopwatch.fa-fw &nbsp;{{("00"+team.gameSum.time.minutes).slice(-2)}}:{{("00"+team.gameSum.time.seconds).slice(-2)}}
37+
li.list-group-item(style="border:3px solid #636e72;padding:1vh;border-top:0px;color:#ee5253")
38+
i.fas.fa-ambulance.fa-fw(style="margin-right:10px;")
39+
.img-thumbnail(style="padding:0;display: inline-block;margin:1px;" ng-repeat="victim in team.gameSum.victims" ng-style="{backgroundColor: evacZoneColor(victim)}")
40+
div(style="display: flex; flex-direction: column;")
41+
img(ng-src='/images/{{victim.type}}.png', style="height:3vh")
42+
span(style="font-size:1vh; color: #000; text-align:center;") ×{{victim.count}}
43+
li.list-group-item(style="border:3px solid #636e72;padding:1vh;border-top:0px;color:#222f3e")
44+
i.fas.fa-step-forward.fa-fw &nbsp;{{team.gameSum.lops}}
45+
hr(color="#636e72" style="margin-top:1vh;margin-bottom:1vh;")
46+
.row(ng-hide="showFrom == 0" style="height:30vh;")
47+
.col-6(style="border-right:solid 1px #000;border-right:solid 1px #000;padding-bottom:20px;" ng-repeat="team in ranking | limitTo: 6:showFrom track by $index")
48+
.row.ces(style="margin-left:5px;margin-top:10px;height:30%;margin-bottom:3vh;")
49+
.col-2(style="text-align:center;font-size:6vh; border:solid 1px #000;") {{showFrom + $index + 1}}
50+
.col-10(style="font-size:6vh;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;")
51+
span(style="font-size:3vh;margin-right:10px;") {{team.team.teamCode}}
52+
span {{team.team.name}}
53+
.row
54+
.col-6
55+
ul.list-group(style="height:100%;font-size:4vh;")
56+
li.list-group-item(style="border:3px solid #636e72;padding:1vh;color:#d35400;overflow: hidden;text-overflow: clip;white-space: nowrap;")
57+
i.fas.fa-calculator.fa-fw &nbsp;{{team.finalScore}}
58+
li.list-group-item(style="border:3px solid #636e72;padding:1vh;border-top:0px;color:#0abde3")
59+
i.fas.fa-stopwatch.fa-fw &nbsp;{{("00"+team.gameSum.time.minutes).slice(-2)}}:{{("00"+team.gameSum.time.seconds).slice(-2)}}
60+
.col-6
61+
ul.list-group(style="height:100%;font-size:4vh;")
62+
li.list-group-item(style="border:3px solid #636e72;padding:1vh;color:#ee5253")
63+
i.fas.fa-ambulance.fa-fw(style="margin-right:10px;")
64+
.img-thumbnail(style="padding:0;display: inline-block;margin:1px;" ng-repeat="victim in team.gameSum.victims" ng-style="{backgroundColor: evacZoneColor(victim)}")
65+
div(style="display: flex; flex-direction: column;")
66+
img(ng-src='/images/{{victim.type}}.png', style="height:3vh")
67+
span(style="font-size:1vh; color: #000; text-align:center;") ×{{victim.count}}
68+
li.list-group-item(style="border:3px solid #636e72;padding:1vh;border-top:0px;color:#222f3e")
69+
i.fas.fa-step-forward.fa-fw &nbsp;{{team.gameSum.lops}}

0 commit comments

Comments
 (0)