Skip to content

Commit d9ad7da

Browse files
Sci-PhyChanduniverse
Sci-Phy
and
Chanduniverse
committed
Revert "Revert "fixed a lot of broken code""
This reverts commit 6d68eb9. This is getting out of hand so I just copied from a previous commit Co-Authored-By: chanduniverse <[email protected]>
1 parent 6b9efbe commit d9ad7da

22 files changed

+4254
-26
lines changed

‎analysis.html‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ <h2 class="mt0">Scouting Analysis</h2>
4141
<div class="description">
4242
<b class="big">Summary</b>
4343
<div class="ui">
44-
<div v-if="{_.round(_.mean(team.a_switch_cubes), 3)} < 1">
44+
<div v-if="(team.autonswitch = " no ") && (team.autonscale = "no ") && (team.autonvault = "no ")">
4545
<b>They don't place cubes in auton</b>
4646
</div>
47-
<div v-if="{_.round(_.mean(team.a_switch_cubes), 3)} < 1">
47+
<div v-if="(team.autonswitch = " yes ") && (team.autonscale = "no ") && (team.autonvault = "no ")">
4848
<b>They place cubes on the switch in auton</b>
4949
</div>
50-
<div v-if="{_.round(_.mean(team.a_scale_cubes), 3)} < 1">
50+
<div v-if="(team.autonswitch = " no ") && (team.autonscale = "yes ") && (team.autonvault = "no ")">
5151
<b>They place cubes on the scale in auton</b>
5252
</div>
53-
<div v-if="{_.round(_.mean(team.a_vault_cubes), 3)} < 1">
53+
<div v-if="(team.autonswitch = " no ") && (team.autonscale = "no ") && (team.autonvault = "yes ")">
5454
<b>They place cubes in the vault in auton</b>
5555
</div>
5656
<!--<div v-else>
@@ -64,22 +64,22 @@ <h2 class="mt0">Scouting Analysis</h2>
6464
<div>Auton High Goal Accuracy: <b>{{team.autonhigh}}%</b></div>
6565
<div>Auton Low Goal Accuracy: <b>{{team.autonlow}}%</b></div>
6666
</div>-->
67-
<div>Cubes Placed on Switch - Avg: <b>{{_.round(_.mean(team.switch_cubes), 3)}}</b> &nbsp; 1st Quartile: <b>{{_.round(ss.quantile(team.switch_cubes, .25), 3)}}</b> &nbsp; Median: <b>{{_.round(ss.quantile(team.switch_cubes, .5), 3)}}</b> &nbsp; 3rd Quartile: <b>{{_.round(ss.quantile(team.switch_cubes, .75), 3)}}</b> &nbsp; Min: <b>{{_.round(ss.min(team.switch_cubes, .25), 3)}}</b> &nbsp; Max: <b>{{_.round(ss.max(team.switch_cubes, .25), 3)}}</b>
67+
<div>Cubes Placed on Switch - Avg: <b>{{_.round(_.mean(team.switchcubesplaced), 3)}}</b> &nbsp; 1st Quartile: <b>{{_.round(ss.quantile(team.switchcubesplaced, .25), 3)}}</b> &nbsp; Median: <b>{{_.round(ss.quantile(team.switchcubesplaced, .5), 3)}}</b> &nbsp; 3rd Quartile: <b>{{_.round(ss.quantile(team.switchcubesplaced, .75), 3)}}</b> &nbsp; Min: <b>{{_.round(ss.min(team.switchcubesplaced, .25), 3)}}</b> &nbsp; Max: <b>{{_.round(ss.max(team.switchcubesplaced, .25), 3)}}</b>
6868
</div>
69-
<div>Cubes Placed on Scale - Avg: <b>{{_.round(_.mean(team.scale_cubes), 3)}}</b> &nbsp; 1st Quartile: <b>{{_.round(ss.quantile(team.scale_cubes, .25), 3)}}</b> &nbsp; Median: <b>{{_.round(ss.quantile(team.scale_cubes, .5), 3)}}</b> &nbsp; 3rd Quartile: <b>{{_.round(ss.quantile(team.scale_cubes, .75), 3)}}</b> &nbsp; Min: <b>{{_.round(ss.min(team.scale_cubes, .25), 3)}}</b> &nbsp; Max: <b>{{_.round(ss.max(team.scale_cubes, .25), 3)}}</b>
69+
<div>Cubes Placed on Scale - Avg: <b>{{_.round(_.mean(team.scalecubesplaced), 3)}}</b> &nbsp; 1st Quartile: <b>{{_.round(ss.quantile(team.scalecubesplaced, .25), 3)}}</b> &nbsp; Median: <b>{{_.round(ss.quantile(team.scalecubesplaced, .5), 3)}}</b> &nbsp; 3rd Quartile: <b>{{_.round(ss.quantile(team.scalecubesplaced, .75), 3)}}</b> &nbsp; Min: <b>{{_.round(ss.min(team.scalecubesplaced, .25), 3)}}</b> &nbsp; Max: <b>{{_.round(ss.max(team.scalecubesplaced, .25), 3)}}</b>
7070
</div>
71-
<div>Cubes Placed in Vault - Avg: <b>{{_.round(_.mean(team.vault_cubes), 3)}}</b> &nbsp; 1st Quartile: <b>{{_.round(ss.quantile(team.vault_cubes, .25), 3)}}</b> &nbsp; Median: <b>{{_.round(ss.quantile(team.vault_cubes, .5), 3)}}</b> &nbsp; 3rd Quartile: <b>{{_.round(ss.quantile(team.vault_cubes, .75), 3)}}</b> &nbsp; Min: <b>{{_.round(ss.min(team.vault_cubes, .25), 3)}}</b> &nbsp; Max: <b>{{_.round(ss.max(team.vault_cubes, .25), 3)}}</b>
71+
<div>Cubes Placed in Vault - Avg: <b>{{_.round(_.mean(team.vaultcubes), 3)}}</b> &nbsp; 1st Quartile: <b>{{_.round(ss.quantile(team.vaultcubes, .25), 3)}}</b> &nbsp; Median: <b>{{_.round(ss.quantile(team.vaultcubes, .5), 3)}}</b> &nbsp; 3rd Quartile: <b>{{_.round(ss.quantile(team.vaultcubes, .75), 3)}}</b> &nbsp; Min: <b>{{_.round(ss.min(team.vaultcubes, .25), 3)}}</b> &nbsp; Max: <b>{{_.round(ss.max(team.vaultcubes, .25), 3)}}</b>
7272
</div>
73-
<div>Avg Cubes Failed on Switch: <b>{_.round(_.mean(team.switch_cubes_failed), 3)}</b></div>
74-
<div>Avg Cubes Failed on Scale: <b>{_.round(_.mean(team.scale_cubes_failed), 3)}</b></div>
73+
<div>Avg Cubes Failed on Switch: <b>{{team.switchcubesfailed}}</b></div>
74+
<div>Avg Cubes Failed on Scale: <b>{{team.scalecubesfailed}}</b></div>
7575
<!--<div>Avg Gear Cycle Time: <b>{{team.cycletime}} seconds</b></div>-->
7676
</div>
7777
</div>
7878
<br>
7979
<div class="description">
8080
<b class="big">Robot Info</b>
8181
<div class="ui">
82-
<!--<div>Drive Type: <b>{{team.drivetype}} wheels</b></div> argh-->
82+
<div>Drive Type: <b>{{team.drivetype}} wheels</b></div>
8383
<div>
8484
Clean Matches:
8585
<matches :d="team.foul"></matches>
@@ -90,16 +90,16 @@ <h2 class="mt0">Scouting Analysis</h2>
9090
<div class="description">
9191
<b class="big">Auton</b>
9292
<div class="ui">
93-
<div v-if="{_.round(_.mean(team.a_switch_cubes), 3)} < 1 && {_.round(_.mean(team.a_scale_cubes), 3)} < 1 && {_.round(_.mean(team.a_vault_cubes), 3)} < 1">
93+
<div v-if="(team.autonswitch = " no ") && (team.autonscale = "no ") && (team.autonvault = "no ")">
9494
<b>They don't place cubes in auton</b>
9595
</div>
96-
<div v-if="{_.round(_.mean(team.a_switch_cubes), 3)} && {_.round(_.mean(team.a_scale_cubes), 3)} < 1 && {_.round(_.mean(team.a_vault_cubes), 3)} < 1">
96+
<div v-if="(team.autonswitch = " yes ") && (team.autonscale = "no ") && (team.autonvault = "no ")">
9797
<b>They place cubes on the switch in auton</b>
9898
</div>
99-
<div v-if="{_.round(_.mean(team.a_switch_cubes), 3)} < 1 && {_.round(_.mean(team.a_scale_cubes), 3)} > 0 && {_.round(_.mean(team.a_vault_cubes), 3)} < 1">
99+
<div v-if="(team.autonswitch = " no ") && (team.autonscale = "yes ") && (team.autonvault = "no ")">
100100
<b>They place cubes on the scale in auton</b>
101101
</div>
102-
<div v-if="{_.round(_.mean(team.a_switch_cubes), 3)} < 1 && {_.round(_.mean(team.a_scale_cubes), 3)} < 1 && {_.round(_.mean(team.a_vault_cubes), 3)} > 0">
102+
<div v-if="(team.autonswitch = " no ") && (team.autonscale = "no ") && (team.autonvault = "yes ")">
103103
<b>They place cubes in the vault in auton</b>
104104
</div>
105105
<!--<div v-else>
@@ -108,7 +108,7 @@ <h2 class="mt0">Scouting Analysis</h2>
108108
</div>-->
109109
<div>
110110
Moved/Crossed:
111-
<matches :d="team.a_movement"></matches>
111+
<matches :d="team.autonmovement"></matches>
112112
</div>
113113
<!--<div>Crossed:
114114
<matches :d="team.crossed"></matches>
@@ -118,25 +118,25 @@ <h2 class="mt0">Scouting Analysis</h2>
118118
</div>-->
119119
<div>
120120
Placed Cubes on Switch:
121-
<matches :d="team.a_switch_cubes"></matches>
121+
<matches :d="team.autonswitch"></matches>
122122
</div>
123123
<div>
124124
Placed Cubes on Scale:
125-
<matches :d="team.a_scale_cubes"></matches>
125+
<matches :d="team.autonscale"></matches>
126126
</div>
127127
<div>
128128
Placed Cubes in Vault:
129-
<matches :d="team.a_vault_cubes"></matches>
129+
<matches :d="team.autonvault"></matches>
130130
</div>
131131
</div>
132132
</div>
133133
<br>
134134
<div class="description">
135135
<b class="big">Telop</b>
136-
<div v-if="{_.round(_.mean(team.scale_cubes), 3)} < 1 {_.round(_.mean(team.scale_cubes_failed), 3)} < 1">
136+
<div v-if="(team.scalecubesplaced == 0) && (team.scalecubesfailed == 0)">
137137
<b>They don't attempt to place cubes on the scale</b>
138138
</div>
139-
<div v-if="{_.round(_.mean(team.a_vault_cubes), 3)} < 1 && {_.round(_.mean(team.scale_cubes_failed), 3)} > 0">
139+
<div v-if="(team.scalecubesplaced == 0) && (team.scalecubesfailed != 0)">
140140
<b>They try to place cubes on the scale but haven't</b>
141141
</div>
142142
<!--<div v-else>
@@ -149,19 +149,19 @@ <h2 class="mt0">Scouting Analysis</h2>
149149
</div>
150150
<!--<div>Gear Collection: <b>Ground: 45 (4 avg) | Station: 67 (5 avg)</b></div>-->
151151
<!--<div>Avg Gear Cycle Time: <b>{{team.cycletime}} seconds</b></div>-->
152-
<div>Avg Cubes Placed on Switch: <b>{{_.round(_.mean(team.switch_cubes), 3)}}</b></div>
153-
<div>Avg Cubes Placed on Scale: <b>{{_.round(_.mean(team.scale_cubes), 3)}}</b></div>
154-
<div>Avg Cubes Placed in Vault: <b>{{_.round(_.mean(team.vault_cubes), 3)}}</b></div>
155-
<div>Avg Cubes Failed to be Placed on Switch: <b>{_.round(_.mean(team.switch_cubes_failed), 3)}</b></div>
156-
<div>Avg Cubes Failed to be Placed on Scale: <b>{_.round(_.mean(team.scale_cubes_failed), 3)}</b></div>
152+
<div>Avg Cubes Placed on Switch: <b>{{_.round(_.mean(team.switchcubesplaced), 3)}}</b></div>
153+
<div>Avg Cubes Placed on Scale: <b>{{_.round(_.mean(team.scalecubesplaced), 3)}}</b></div>
154+
<div>Avg Cubes Placed in Vault: <b>{{_.round(_.mean(team.vaultcubes), 3)}}</b></div>
155+
<div>Avg Cubes Failed to be Placed on Switch: <b>{{team.switchcubesfailed}}</b></div>
156+
<div>Avg Cubes Failed to be Placed on Scale: <b>{{team.scalecubesfailed}}</b></div>
157157
<!--<div>Gear Stuck on Peg:
158158
<matches :d="team.stuck"></matches>
159159
</div>-->
160160
<div>
161161
Hanging:
162162
<matches :d="team.hang"></matches>
163163
</div>
164-
<div>Avg Time to Hang: <b>{{team.time_to_hang}} seconds</b></div>
164+
<div>Avg Time to Hang: <b>{{team.hangtime}} seconds</b></div>
165165
<!--<div>Driver Quality: <b>73%</b></div>-->
166166
</div>
167167
<br>

‎backup.html‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
4+
<head>
5+
<meta charset="UTF-8">
6+
<title>Scouting Restore</title>
7+
<meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0,user-scalable=no">
8+
<meta name="apple-mobile-web-app-capable" content="yes">
9+
<meta name="mobile-web-app-capable" content="yes">
10+
<script src="lib/vue.js"></script>
11+
<script src="lib/vue-resource.min.js"></script>
12+
<script src="lib/sweetalert2.min.js"></script>
13+
<link rel="stylesheet" href="css/semantic.min.css">
14+
<link rel="stylesheet" href="css/sweetalert2.min.css">
15+
</head>
16+
17+
<body>
18+
<div id="app">
19+
<textarea v-model="data" cols="30" rows="10"></textarea>
20+
<button @click="submit">SUBMIT</button>
21+
</div>
22+
</body>
23+
<script type="text/javascript">
24+
var app = new Vue({
25+
el: '#app',
26+
data: {
27+
data: "",
28+
},
29+
methods: {
30+
submit: function() {
31+
this.$http.post('/', this.data).then((function() {
32+
swal('u did it')
33+
}), function() {
34+
swal("failed")
35+
});
36+
}
37+
},
38+
})
39+
</script>
40+
41+
</html>

‎css/fontawesome.css‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎css/grid.css‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
@media (min-width: 45em) {
2+
.row {
3+
display: table;
4+
width: 100%;
5+
table-layout: fixed;
6+
}
7+
.col,
8+
.cols {
9+
display: table-cell;
10+
}
11+
.one {
12+
width: 8.333333%;
13+
}
14+
.two {
15+
width: 16.666667%;
16+
}
17+
.three {
18+
width: 25%;
19+
}
20+
.four {
21+
width: 33.333333%;
22+
}
23+
.five {
24+
width: 41.666667%;
25+
}
26+
.six {
27+
width: 50%;
28+
}
29+
.seven {
30+
width: 58.333333%;
31+
}
32+
.eight {
33+
width: 66.666667%;
34+
}
35+
.nine {
36+
width: 75%;
37+
}
38+
.ten {
39+
width: 83.333333%;
40+
}
41+
.eleven {
42+
width: 91.666667%;
43+
}
44+
.row-padded {
45+
margin-left: -1rem;
46+
margin-right: -1rem;
47+
}
48+
.row-padded .row {
49+
border-spacing: 1rem 0;
50+
}
51+
}

‎css/semantic.min.css‎

Lines changed: 364 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)