diff --git a/.DS_Store b/.DS_Store index 2807789..46562c8 100644 --- a/.DS_Store +++ b/.DS_Store Binary files differ diff --git a/.DS_Store b/.DS_Store index 2807789..46562c8 100644 --- a/.DS_Store +++ b/.DS_Store Binary files differ diff --git a/api/ranking_trip.php b/api/ranking_trip.php index 97e4478..d62771b 100644 --- a/api/ranking_trip.php +++ b/api/ranking_trip.php @@ -4,7 +4,7 @@
-
+ @@ -19,7 +19,7 @@

Drive Trip


-
+
@@ -29,27 +29,96 @@ + + + + + + + + + + + + + + + + '' + order by 3 DESC,2"; $queryR1 = mysqli_query($connect, $q); while ($dataR1 = mysqli_fetch_array($queryR1)) { - + $suma = $dataR1["pregunta1"]+$dataR1["pregunta2"]+$dataR1["pregunta3"]+$dataR1["pregunta4"]+$dataR1["pregunta5"]+$dataR1["pregunta6"]+$dataR1["pregunta7"]+$dataR1["pregunta8"]+$dataR1["pregunta9"]+$dataR1["pregunta10"]+$dataR1["pregunta11"]+$dataR1["pregunta12"]+$dataR1["pregunta13"]+$dataR1["pregunta14"]+$dataR1["pregunta15"]; + $val = 100*$suma/15; + $bg_color = ""; + $color = ""; + if ($val < 30 ) { + $bg_color = "#d91e49"; + $color = "#000"; + } + if ($val >= 30 && $val < 70 ) { + $bg_color = "#ff8000"; + $color = "#000"; + } + if ($val >= 70 ) { + $bg_color = "#008f39"; + $color = "#fff"; + } + $val = number_format ( $val , 2 ); echo ' + + + + + + + + + + + + + + + + + '; $count++; @@ -71,7 +140,7 @@ Volver - + diff --git a/.DS_Store b/.DS_Store index 2807789..46562c8 100644 --- a/.DS_Store +++ b/.DS_Store Binary files differ diff --git a/api/ranking_trip.php b/api/ranking_trip.php index 97e4478..d62771b 100644 --- a/api/ranking_trip.php +++ b/api/ranking_trip.php @@ -4,7 +4,7 @@
-
+ @@ -19,7 +19,7 @@

Drive Trip


-
+
Equipo Puntaje TiempoProgresoP1P2P3P4P5P6P7P8P9P10P11P12P13P14P15
' . $count . ' ' . $dataR1["equipo"] . ' ' . round($dataR1["puntaje"]) . ' pts. ' . $dataR1["tiempo"] . ' +
+
'.$val.'%
+
+
' . ($dataR1["pregunta1"] == 1 ? '': '') . '' . ($dataR1["pregunta2"] == 1 ? '': '') . '' . ($dataR1["pregunta3"] == 1 ? '': '') . '' . ($dataR1["pregunta4"] == 1 ? '': '') . '' . ($dataR1["pregunta5"] == 1 ? '': '') . '' . ($dataR1["pregunta6"] == 1 ? '': '') . '' . ($dataR1["pregunta7"] == 1 ? '': '') . '' . ($dataR1["pregunta8"] == 1 ? '': '') . '' . ($dataR1["pregunta9"] == 1 ? '': '') . '' . ($dataR1["pregunta10"] == 1 ? '': '') . '' . ($dataR1["pregunta11"] == 1 ? '': '') . '' . ($dataR1["pregunta12"] == 1 ? '': '') . '' . ($dataR1["pregunta13"] == 1 ? '': '') . '' . ($dataR1["pregunta14"] == 1 ? '': '') . '' . ($dataR1["pregunta15"] == 1 ? '': '') . '
@@ -29,27 +29,96 @@ + + + + + + + + + + + + + + + + '' + order by 3 DESC,2"; $queryR1 = mysqli_query($connect, $q); while ($dataR1 = mysqli_fetch_array($queryR1)) { - + $suma = $dataR1["pregunta1"]+$dataR1["pregunta2"]+$dataR1["pregunta3"]+$dataR1["pregunta4"]+$dataR1["pregunta5"]+$dataR1["pregunta6"]+$dataR1["pregunta7"]+$dataR1["pregunta8"]+$dataR1["pregunta9"]+$dataR1["pregunta10"]+$dataR1["pregunta11"]+$dataR1["pregunta12"]+$dataR1["pregunta13"]+$dataR1["pregunta14"]+$dataR1["pregunta15"]; + $val = 100*$suma/15; + $bg_color = ""; + $color = ""; + if ($val < 30 ) { + $bg_color = "#d91e49"; + $color = "#000"; + } + if ($val >= 30 && $val < 70 ) { + $bg_color = "#ff8000"; + $color = "#000"; + } + if ($val >= 70 ) { + $bg_color = "#008f39"; + $color = "#fff"; + } + $val = number_format ( $val , 2 ); echo ' + + + + + + + + + + + + + + + + + '; $count++; @@ -71,7 +140,7 @@ Volver - + diff --git a/js/.DS_Store b/js/.DS_Store index acaa0ec..f22c63d 100644 --- a/js/.DS_Store +++ b/js/.DS_Store Binary files differ diff --git a/.DS_Store b/.DS_Store index 2807789..46562c8 100644 --- a/.DS_Store +++ b/.DS_Store Binary files differ diff --git a/api/ranking_trip.php b/api/ranking_trip.php index 97e4478..d62771b 100644 --- a/api/ranking_trip.php +++ b/api/ranking_trip.php @@ -4,7 +4,7 @@
-
+ @@ -19,7 +19,7 @@

Drive Trip


-
+
Equipo Puntaje TiempoProgresoP1P2P3P4P5P6P7P8P9P10P11P12P13P14P15
' . $count . ' ' . $dataR1["equipo"] . ' ' . round($dataR1["puntaje"]) . ' pts. ' . $dataR1["tiempo"] . ' +
+
'.$val.'%
+
+
' . ($dataR1["pregunta1"] == 1 ? '': '') . '' . ($dataR1["pregunta2"] == 1 ? '': '') . '' . ($dataR1["pregunta3"] == 1 ? '': '') . '' . ($dataR1["pregunta4"] == 1 ? '': '') . '' . ($dataR1["pregunta5"] == 1 ? '': '') . '' . ($dataR1["pregunta6"] == 1 ? '': '') . '' . ($dataR1["pregunta7"] == 1 ? '': '') . '' . ($dataR1["pregunta8"] == 1 ? '': '') . '' . ($dataR1["pregunta9"] == 1 ? '': '') . '' . ($dataR1["pregunta10"] == 1 ? '': '') . '' . ($dataR1["pregunta11"] == 1 ? '': '') . '' . ($dataR1["pregunta12"] == 1 ? '': '') . '' . ($dataR1["pregunta13"] == 1 ? '': '') . '' . ($dataR1["pregunta14"] == 1 ? '': '') . '' . ($dataR1["pregunta15"] == 1 ? '': '') . '
@@ -29,27 +29,96 @@ + + + + + + + + + + + + + + + + '' + order by 3 DESC,2"; $queryR1 = mysqli_query($connect, $q); while ($dataR1 = mysqli_fetch_array($queryR1)) { - + $suma = $dataR1["pregunta1"]+$dataR1["pregunta2"]+$dataR1["pregunta3"]+$dataR1["pregunta4"]+$dataR1["pregunta5"]+$dataR1["pregunta6"]+$dataR1["pregunta7"]+$dataR1["pregunta8"]+$dataR1["pregunta9"]+$dataR1["pregunta10"]+$dataR1["pregunta11"]+$dataR1["pregunta12"]+$dataR1["pregunta13"]+$dataR1["pregunta14"]+$dataR1["pregunta15"]; + $val = 100*$suma/15; + $bg_color = ""; + $color = ""; + if ($val < 30 ) { + $bg_color = "#d91e49"; + $color = "#000"; + } + if ($val >= 30 && $val < 70 ) { + $bg_color = "#ff8000"; + $color = "#000"; + } + if ($val >= 70 ) { + $bg_color = "#008f39"; + $color = "#fff"; + } + $val = number_format ( $val , 2 ); echo ' + + + + + + + + + + + + + + + + + '; $count++; @@ -71,7 +140,7 @@ Volver - + diff --git a/js/.DS_Store b/js/.DS_Store index acaa0ec..f22c63d 100644 --- a/js/.DS_Store +++ b/js/.DS_Store Binary files differ diff --git a/js/emoji/.DS_Store b/js/emoji/.DS_Store index fc3fe6c..540926f 100644 --- a/js/emoji/.DS_Store +++ b/js/emoji/.DS_Store Binary files differ diff --git a/.DS_Store b/.DS_Store index 2807789..46562c8 100644 --- a/.DS_Store +++ b/.DS_Store Binary files differ diff --git a/api/ranking_trip.php b/api/ranking_trip.php index 97e4478..d62771b 100644 --- a/api/ranking_trip.php +++ b/api/ranking_trip.php @@ -4,7 +4,7 @@
-
+ @@ -19,7 +19,7 @@

Drive Trip


-
+
Equipo Puntaje TiempoProgresoP1P2P3P4P5P6P7P8P9P10P11P12P13P14P15
' . $count . ' ' . $dataR1["equipo"] . ' ' . round($dataR1["puntaje"]) . ' pts. ' . $dataR1["tiempo"] . ' +
+
'.$val.'%
+
+
' . ($dataR1["pregunta1"] == 1 ? '': '') . '' . ($dataR1["pregunta2"] == 1 ? '': '') . '' . ($dataR1["pregunta3"] == 1 ? '': '') . '' . ($dataR1["pregunta4"] == 1 ? '': '') . '' . ($dataR1["pregunta5"] == 1 ? '': '') . '' . ($dataR1["pregunta6"] == 1 ? '': '') . '' . ($dataR1["pregunta7"] == 1 ? '': '') . '' . ($dataR1["pregunta8"] == 1 ? '': '') . '' . ($dataR1["pregunta9"] == 1 ? '': '') . '' . ($dataR1["pregunta10"] == 1 ? '': '') . '' . ($dataR1["pregunta11"] == 1 ? '': '') . '' . ($dataR1["pregunta12"] == 1 ? '': '') . '' . ($dataR1["pregunta13"] == 1 ? '': '') . '' . ($dataR1["pregunta14"] == 1 ? '': '') . '' . ($dataR1["pregunta15"] == 1 ? '': '') . '
@@ -29,27 +29,96 @@ + + + + + + + + + + + + + + + + '' + order by 3 DESC,2"; $queryR1 = mysqli_query($connect, $q); while ($dataR1 = mysqli_fetch_array($queryR1)) { - + $suma = $dataR1["pregunta1"]+$dataR1["pregunta2"]+$dataR1["pregunta3"]+$dataR1["pregunta4"]+$dataR1["pregunta5"]+$dataR1["pregunta6"]+$dataR1["pregunta7"]+$dataR1["pregunta8"]+$dataR1["pregunta9"]+$dataR1["pregunta10"]+$dataR1["pregunta11"]+$dataR1["pregunta12"]+$dataR1["pregunta13"]+$dataR1["pregunta14"]+$dataR1["pregunta15"]; + $val = 100*$suma/15; + $bg_color = ""; + $color = ""; + if ($val < 30 ) { + $bg_color = "#d91e49"; + $color = "#000"; + } + if ($val >= 30 && $val < 70 ) { + $bg_color = "#ff8000"; + $color = "#000"; + } + if ($val >= 70 ) { + $bg_color = "#008f39"; + $color = "#fff"; + } + $val = number_format ( $val , 2 ); echo ' + + + + + + + + + + + + + + + + + '; $count++; @@ -71,7 +140,7 @@ Volver - + diff --git a/js/.DS_Store b/js/.DS_Store index acaa0ec..f22c63d 100644 --- a/js/.DS_Store +++ b/js/.DS_Store Binary files differ diff --git a/js/emoji/.DS_Store b/js/emoji/.DS_Store index fc3fe6c..540926f 100644 --- a/js/emoji/.DS_Store +++ b/js/emoji/.DS_Store Binary files differ diff --git a/js/emoji/lib/css/emoji.css b/js/emoji/lib/css/emoji.css index 7d28e91..1813737 100644 --- a/js/emoji/lib/css/emoji.css +++ b/js/emoji/lib/css/emoji.css @@ -55,7 +55,7 @@ .emoji-picker-icon { cursor: pointer; position: absolute; - right: 10px; + right: 18px; top: 5px; font-size: 20px; opacity: 0.7; @@ -68,6 +68,23 @@ -o-user-select: none; user-select: none; } +/* +.emoji-picker-icon { + cursor: pointer; + position: absolute; + right: 10px; + top: 5px; + font-size: 20px; + opacity: 0.7; + z-index: 100; + transition: none; + color: black; + -moz-user-select: none; + -khtml-user-select: none; + -webkit-user-select: none; + -o-user-select: none; + user-select: none; +}*/ .emoji-picker-icon.parent-has-scroll { right: 28px; diff --git a/.DS_Store b/.DS_Store index 2807789..46562c8 100644 --- a/.DS_Store +++ b/.DS_Store Binary files differ diff --git a/api/ranking_trip.php b/api/ranking_trip.php index 97e4478..d62771b 100644 --- a/api/ranking_trip.php +++ b/api/ranking_trip.php @@ -4,7 +4,7 @@
-
+ @@ -19,7 +19,7 @@

Drive Trip


-
+
Equipo Puntaje TiempoProgresoP1P2P3P4P5P6P7P8P9P10P11P12P13P14P15
' . $count . ' ' . $dataR1["equipo"] . ' ' . round($dataR1["puntaje"]) . ' pts. ' . $dataR1["tiempo"] . ' +
+
'.$val.'%
+
+
' . ($dataR1["pregunta1"] == 1 ? '': '') . '' . ($dataR1["pregunta2"] == 1 ? '': '') . '' . ($dataR1["pregunta3"] == 1 ? '': '') . '' . ($dataR1["pregunta4"] == 1 ? '': '') . '' . ($dataR1["pregunta5"] == 1 ? '': '') . '' . ($dataR1["pregunta6"] == 1 ? '': '') . '' . ($dataR1["pregunta7"] == 1 ? '': '') . '' . ($dataR1["pregunta8"] == 1 ? '': '') . '' . ($dataR1["pregunta9"] == 1 ? '': '') . '' . ($dataR1["pregunta10"] == 1 ? '': '') . '' . ($dataR1["pregunta11"] == 1 ? '': '') . '' . ($dataR1["pregunta12"] == 1 ? '': '') . '' . ($dataR1["pregunta13"] == 1 ? '': '') . '' . ($dataR1["pregunta14"] == 1 ? '': '') . '' . ($dataR1["pregunta15"] == 1 ? '': '') . '
@@ -29,27 +29,96 @@ + + + + + + + + + + + + + + + + '' + order by 3 DESC,2"; $queryR1 = mysqli_query($connect, $q); while ($dataR1 = mysqli_fetch_array($queryR1)) { - + $suma = $dataR1["pregunta1"]+$dataR1["pregunta2"]+$dataR1["pregunta3"]+$dataR1["pregunta4"]+$dataR1["pregunta5"]+$dataR1["pregunta6"]+$dataR1["pregunta7"]+$dataR1["pregunta8"]+$dataR1["pregunta9"]+$dataR1["pregunta10"]+$dataR1["pregunta11"]+$dataR1["pregunta12"]+$dataR1["pregunta13"]+$dataR1["pregunta14"]+$dataR1["pregunta15"]; + $val = 100*$suma/15; + $bg_color = ""; + $color = ""; + if ($val < 30 ) { + $bg_color = "#d91e49"; + $color = "#000"; + } + if ($val >= 30 && $val < 70 ) { + $bg_color = "#ff8000"; + $color = "#000"; + } + if ($val >= 70 ) { + $bg_color = "#008f39"; + $color = "#fff"; + } + $val = number_format ( $val , 2 ); echo ' + + + + + + + + + + + + + + + + + '; $count++; @@ -71,7 +140,7 @@ Volver - + diff --git a/js/.DS_Store b/js/.DS_Store index acaa0ec..f22c63d 100644 --- a/js/.DS_Store +++ b/js/.DS_Store Binary files differ diff --git a/js/emoji/.DS_Store b/js/emoji/.DS_Store index fc3fe6c..540926f 100644 --- a/js/emoji/.DS_Store +++ b/js/emoji/.DS_Store Binary files differ diff --git a/js/emoji/lib/css/emoji.css b/js/emoji/lib/css/emoji.css index 7d28e91..1813737 100644 --- a/js/emoji/lib/css/emoji.css +++ b/js/emoji/lib/css/emoji.css @@ -55,7 +55,7 @@ .emoji-picker-icon { cursor: pointer; position: absolute; - right: 10px; + right: 18px; top: 5px; font-size: 20px; opacity: 0.7; @@ -68,6 +68,23 @@ -o-user-select: none; user-select: none; } +/* +.emoji-picker-icon { + cursor: pointer; + position: absolute; + right: 10px; + top: 5px; + font-size: 20px; + opacity: 0.7; + z-index: 100; + transition: none; + color: black; + -moz-user-select: none; + -khtml-user-select: none; + -webkit-user-select: none; + -o-user-select: none; + user-select: none; +}*/ .emoji-picker-icon.parent-has-scroll { right: 28px; diff --git a/js/emoji/lib/js/jquery.emojiarea.js b/js/emoji/lib/js/jquery.emojiarea.js index 0187010..8202803 100644 --- a/js/emoji/lib/js/jquery.emojiarea.js +++ b/js/emoji/lib/js/jquery.emojiarea.js @@ -414,7 +414,7 @@ editorDiv.scrollTop(editorDiv[0].scrollHeight); }); - $textarea.after(""); + $textarea.after(""); $textarea.hide().after(this.$editor); this.setup(); diff --git a/.DS_Store b/.DS_Store index 2807789..46562c8 100644 --- a/.DS_Store +++ b/.DS_Store Binary files differ diff --git a/api/ranking_trip.php b/api/ranking_trip.php index 97e4478..d62771b 100644 --- a/api/ranking_trip.php +++ b/api/ranking_trip.php @@ -4,7 +4,7 @@
-
+ @@ -19,7 +19,7 @@

Drive Trip


-
+
Equipo Puntaje TiempoProgresoP1P2P3P4P5P6P7P8P9P10P11P12P13P14P15
' . $count . ' ' . $dataR1["equipo"] . ' ' . round($dataR1["puntaje"]) . ' pts. ' . $dataR1["tiempo"] . ' +
+
'.$val.'%
+
+
' . ($dataR1["pregunta1"] == 1 ? '': '') . '' . ($dataR1["pregunta2"] == 1 ? '': '') . '' . ($dataR1["pregunta3"] == 1 ? '': '') . '' . ($dataR1["pregunta4"] == 1 ? '': '') . '' . ($dataR1["pregunta5"] == 1 ? '': '') . '' . ($dataR1["pregunta6"] == 1 ? '': '') . '' . ($dataR1["pregunta7"] == 1 ? '': '') . '' . ($dataR1["pregunta8"] == 1 ? '': '') . '' . ($dataR1["pregunta9"] == 1 ? '': '') . '' . ($dataR1["pregunta10"] == 1 ? '': '') . '' . ($dataR1["pregunta11"] == 1 ? '': '') . '' . ($dataR1["pregunta12"] == 1 ? '': '') . '' . ($dataR1["pregunta13"] == 1 ? '': '') . '' . ($dataR1["pregunta14"] == 1 ? '': '') . '' . ($dataR1["pregunta15"] == 1 ? '': '') . '
@@ -29,27 +29,96 @@ + + + + + + + + + + + + + + + + '' + order by 3 DESC,2"; $queryR1 = mysqli_query($connect, $q); while ($dataR1 = mysqli_fetch_array($queryR1)) { - + $suma = $dataR1["pregunta1"]+$dataR1["pregunta2"]+$dataR1["pregunta3"]+$dataR1["pregunta4"]+$dataR1["pregunta5"]+$dataR1["pregunta6"]+$dataR1["pregunta7"]+$dataR1["pregunta8"]+$dataR1["pregunta9"]+$dataR1["pregunta10"]+$dataR1["pregunta11"]+$dataR1["pregunta12"]+$dataR1["pregunta13"]+$dataR1["pregunta14"]+$dataR1["pregunta15"]; + $val = 100*$suma/15; + $bg_color = ""; + $color = ""; + if ($val < 30 ) { + $bg_color = "#d91e49"; + $color = "#000"; + } + if ($val >= 30 && $val < 70 ) { + $bg_color = "#ff8000"; + $color = "#000"; + } + if ($val >= 70 ) { + $bg_color = "#008f39"; + $color = "#fff"; + } + $val = number_format ( $val , 2 ); echo ' + + + + + + + + + + + + + + + + + '; $count++; @@ -71,7 +140,7 @@ Volver - + diff --git a/js/.DS_Store b/js/.DS_Store index acaa0ec..f22c63d 100644 --- a/js/.DS_Store +++ b/js/.DS_Store Binary files differ diff --git a/js/emoji/.DS_Store b/js/emoji/.DS_Store index fc3fe6c..540926f 100644 --- a/js/emoji/.DS_Store +++ b/js/emoji/.DS_Store Binary files differ diff --git a/js/emoji/lib/css/emoji.css b/js/emoji/lib/css/emoji.css index 7d28e91..1813737 100644 --- a/js/emoji/lib/css/emoji.css +++ b/js/emoji/lib/css/emoji.css @@ -55,7 +55,7 @@ .emoji-picker-icon { cursor: pointer; position: absolute; - right: 10px; + right: 18px; top: 5px; font-size: 20px; opacity: 0.7; @@ -68,6 +68,23 @@ -o-user-select: none; user-select: none; } +/* +.emoji-picker-icon { + cursor: pointer; + position: absolute; + right: 10px; + top: 5px; + font-size: 20px; + opacity: 0.7; + z-index: 100; + transition: none; + color: black; + -moz-user-select: none; + -khtml-user-select: none; + -webkit-user-select: none; + -o-user-select: none; + user-select: none; +}*/ .emoji-picker-icon.parent-has-scroll { right: 28px; diff --git a/js/emoji/lib/js/jquery.emojiarea.js b/js/emoji/lib/js/jquery.emojiarea.js index 0187010..8202803 100644 --- a/js/emoji/lib/js/jquery.emojiarea.js +++ b/js/emoji/lib/js/jquery.emojiarea.js @@ -414,7 +414,7 @@ editorDiv.scrollTop(editorDiv[0].scrollHeight); }); - $textarea.after(""); + $textarea.after(""); $textarea.hide().after(this.$editor); this.setup(); diff --git a/recursos/image20.png b/recursos/image20.png new file mode 100644 index 0000000..69c2b8d --- /dev/null +++ b/recursos/image20.png Binary files differ diff --git a/.DS_Store b/.DS_Store index 2807789..46562c8 100644 --- a/.DS_Store +++ b/.DS_Store Binary files differ diff --git a/api/ranking_trip.php b/api/ranking_trip.php index 97e4478..d62771b 100644 --- a/api/ranking_trip.php +++ b/api/ranking_trip.php @@ -4,7 +4,7 @@
-
+ @@ -19,7 +19,7 @@

Drive Trip


-
+
Equipo Puntaje TiempoProgresoP1P2P3P4P5P6P7P8P9P10P11P12P13P14P15
' . $count . ' ' . $dataR1["equipo"] . ' ' . round($dataR1["puntaje"]) . ' pts. ' . $dataR1["tiempo"] . ' +
+
'.$val.'%
+
+
' . ($dataR1["pregunta1"] == 1 ? '': '') . '' . ($dataR1["pregunta2"] == 1 ? '': '') . '' . ($dataR1["pregunta3"] == 1 ? '': '') . '' . ($dataR1["pregunta4"] == 1 ? '': '') . '' . ($dataR1["pregunta5"] == 1 ? '': '') . '' . ($dataR1["pregunta6"] == 1 ? '': '') . '' . ($dataR1["pregunta7"] == 1 ? '': '') . '' . ($dataR1["pregunta8"] == 1 ? '': '') . '' . ($dataR1["pregunta9"] == 1 ? '': '') . '' . ($dataR1["pregunta10"] == 1 ? '': '') . '' . ($dataR1["pregunta11"] == 1 ? '': '') . '' . ($dataR1["pregunta12"] == 1 ? '': '') . '' . ($dataR1["pregunta13"] == 1 ? '': '') . '' . ($dataR1["pregunta14"] == 1 ? '': '') . '' . ($dataR1["pregunta15"] == 1 ? '': '') . '
@@ -29,27 +29,96 @@ + + + + + + + + + + + + + + + + '' + order by 3 DESC,2"; $queryR1 = mysqli_query($connect, $q); while ($dataR1 = mysqli_fetch_array($queryR1)) { - + $suma = $dataR1["pregunta1"]+$dataR1["pregunta2"]+$dataR1["pregunta3"]+$dataR1["pregunta4"]+$dataR1["pregunta5"]+$dataR1["pregunta6"]+$dataR1["pregunta7"]+$dataR1["pregunta8"]+$dataR1["pregunta9"]+$dataR1["pregunta10"]+$dataR1["pregunta11"]+$dataR1["pregunta12"]+$dataR1["pregunta13"]+$dataR1["pregunta14"]+$dataR1["pregunta15"]; + $val = 100*$suma/15; + $bg_color = ""; + $color = ""; + if ($val < 30 ) { + $bg_color = "#d91e49"; + $color = "#000"; + } + if ($val >= 30 && $val < 70 ) { + $bg_color = "#ff8000"; + $color = "#000"; + } + if ($val >= 70 ) { + $bg_color = "#008f39"; + $color = "#fff"; + } + $val = number_format ( $val , 2 ); echo ' + + + + + + + + + + + + + + + + + '; $count++; @@ -71,7 +140,7 @@ Volver - + diff --git a/js/.DS_Store b/js/.DS_Store index acaa0ec..f22c63d 100644 --- a/js/.DS_Store +++ b/js/.DS_Store Binary files differ diff --git a/js/emoji/.DS_Store b/js/emoji/.DS_Store index fc3fe6c..540926f 100644 --- a/js/emoji/.DS_Store +++ b/js/emoji/.DS_Store Binary files differ diff --git a/js/emoji/lib/css/emoji.css b/js/emoji/lib/css/emoji.css index 7d28e91..1813737 100644 --- a/js/emoji/lib/css/emoji.css +++ b/js/emoji/lib/css/emoji.css @@ -55,7 +55,7 @@ .emoji-picker-icon { cursor: pointer; position: absolute; - right: 10px; + right: 18px; top: 5px; font-size: 20px; opacity: 0.7; @@ -68,6 +68,23 @@ -o-user-select: none; user-select: none; } +/* +.emoji-picker-icon { + cursor: pointer; + position: absolute; + right: 10px; + top: 5px; + font-size: 20px; + opacity: 0.7; + z-index: 100; + transition: none; + color: black; + -moz-user-select: none; + -khtml-user-select: none; + -webkit-user-select: none; + -o-user-select: none; + user-select: none; +}*/ .emoji-picker-icon.parent-has-scroll { right: 28px; diff --git a/js/emoji/lib/js/jquery.emojiarea.js b/js/emoji/lib/js/jquery.emojiarea.js index 0187010..8202803 100644 --- a/js/emoji/lib/js/jquery.emojiarea.js +++ b/js/emoji/lib/js/jquery.emojiarea.js @@ -414,7 +414,7 @@ editorDiv.scrollTop(editorDiv[0].scrollHeight); }); - $textarea.after(""); + $textarea.after(""); $textarea.hide().after(this.$editor); this.setup(); diff --git a/recursos/image20.png b/recursos/image20.png new file mode 100644 index 0000000..69c2b8d --- /dev/null +++ b/recursos/image20.png Binary files differ diff --git a/views/auditorio.php b/views/auditorio.php index 95df4ea..7e5441e 100644 --- a/views/auditorio.php +++ b/views/auditorio.php @@ -72,7 +72,7 @@ @@ -81,7 +81,7 @@
- +
- diff --git a/.DS_Store b/.DS_Store index 2807789..46562c8 100644 --- a/.DS_Store +++ b/.DS_Store Binary files differ diff --git a/api/ranking_trip.php b/api/ranking_trip.php index 97e4478..d62771b 100644 --- a/api/ranking_trip.php +++ b/api/ranking_trip.php @@ -4,7 +4,7 @@
-
+ @@ -19,7 +19,7 @@

Drive Trip


-
+
Equipo Puntaje TiempoProgresoP1P2P3P4P5P6P7P8P9P10P11P12P13P14P15
' . $count . ' ' . $dataR1["equipo"] . ' ' . round($dataR1["puntaje"]) . ' pts. ' . $dataR1["tiempo"] . ' +
+
'.$val.'%
+
+
' . ($dataR1["pregunta1"] == 1 ? '': '') . '' . ($dataR1["pregunta2"] == 1 ? '': '') . '' . ($dataR1["pregunta3"] == 1 ? '': '') . '' . ($dataR1["pregunta4"] == 1 ? '': '') . '' . ($dataR1["pregunta5"] == 1 ? '': '') . '' . ($dataR1["pregunta6"] == 1 ? '': '') . '' . ($dataR1["pregunta7"] == 1 ? '': '') . '' . ($dataR1["pregunta8"] == 1 ? '': '') . '' . ($dataR1["pregunta9"] == 1 ? '': '') . '' . ($dataR1["pregunta10"] == 1 ? '': '') . '' . ($dataR1["pregunta11"] == 1 ? '': '') . '' . ($dataR1["pregunta12"] == 1 ? '': '') . '' . ($dataR1["pregunta13"] == 1 ? '': '') . '' . ($dataR1["pregunta14"] == 1 ? '': '') . '' . ($dataR1["pregunta15"] == 1 ? '': '') . '
@@ -29,27 +29,96 @@ + + + + + + + + + + + + + + + + '' + order by 3 DESC,2"; $queryR1 = mysqli_query($connect, $q); while ($dataR1 = mysqli_fetch_array($queryR1)) { - + $suma = $dataR1["pregunta1"]+$dataR1["pregunta2"]+$dataR1["pregunta3"]+$dataR1["pregunta4"]+$dataR1["pregunta5"]+$dataR1["pregunta6"]+$dataR1["pregunta7"]+$dataR1["pregunta8"]+$dataR1["pregunta9"]+$dataR1["pregunta10"]+$dataR1["pregunta11"]+$dataR1["pregunta12"]+$dataR1["pregunta13"]+$dataR1["pregunta14"]+$dataR1["pregunta15"]; + $val = 100*$suma/15; + $bg_color = ""; + $color = ""; + if ($val < 30 ) { + $bg_color = "#d91e49"; + $color = "#000"; + } + if ($val >= 30 && $val < 70 ) { + $bg_color = "#ff8000"; + $color = "#000"; + } + if ($val >= 70 ) { + $bg_color = "#008f39"; + $color = "#fff"; + } + $val = number_format ( $val , 2 ); echo ' + + + + + + + + + + + + + + + + + '; $count++; @@ -71,7 +140,7 @@ Volver - + diff --git a/js/.DS_Store b/js/.DS_Store index acaa0ec..f22c63d 100644 --- a/js/.DS_Store +++ b/js/.DS_Store Binary files differ diff --git a/js/emoji/.DS_Store b/js/emoji/.DS_Store index fc3fe6c..540926f 100644 --- a/js/emoji/.DS_Store +++ b/js/emoji/.DS_Store Binary files differ diff --git a/js/emoji/lib/css/emoji.css b/js/emoji/lib/css/emoji.css index 7d28e91..1813737 100644 --- a/js/emoji/lib/css/emoji.css +++ b/js/emoji/lib/css/emoji.css @@ -55,7 +55,7 @@ .emoji-picker-icon { cursor: pointer; position: absolute; - right: 10px; + right: 18px; top: 5px; font-size: 20px; opacity: 0.7; @@ -68,6 +68,23 @@ -o-user-select: none; user-select: none; } +/* +.emoji-picker-icon { + cursor: pointer; + position: absolute; + right: 10px; + top: 5px; + font-size: 20px; + opacity: 0.7; + z-index: 100; + transition: none; + color: black; + -moz-user-select: none; + -khtml-user-select: none; + -webkit-user-select: none; + -o-user-select: none; + user-select: none; +}*/ .emoji-picker-icon.parent-has-scroll { right: 28px; diff --git a/js/emoji/lib/js/jquery.emojiarea.js b/js/emoji/lib/js/jquery.emojiarea.js index 0187010..8202803 100644 --- a/js/emoji/lib/js/jquery.emojiarea.js +++ b/js/emoji/lib/js/jquery.emojiarea.js @@ -414,7 +414,7 @@ editorDiv.scrollTop(editorDiv[0].scrollHeight); }); - $textarea.after(""); + $textarea.after(""); $textarea.hide().after(this.$editor); this.setup(); diff --git a/recursos/image20.png b/recursos/image20.png new file mode 100644 index 0000000..69c2b8d --- /dev/null +++ b/recursos/image20.png Binary files differ diff --git a/views/auditorio.php b/views/auditorio.php index 95df4ea..7e5441e 100644 --- a/views/auditorio.php +++ b/views/auditorio.php @@ -72,7 +72,7 @@ @@ -81,7 +81,7 @@
- +
- diff --git a/views/ranking_trip_reload.php b/views/ranking_trip_reload.php index 305ad01..78e304f 100644 --- a/views/ranking_trip_reload.php +++ b/views/ranking_trip_reload.php @@ -9,7 +9,7 @@ -
+
Equipo Puntaje TiempoProgresoP1P2P3P4P5P6P7P8P9P10P11P12P13P14P15
' . $count . ' ' . $dataR1["equipo"] . ' ' . round($dataR1["puntaje"]) . ' pts. ' . $dataR1["tiempo"] . ' +
+
'.$val.'%
+
+
' . ($dataR1["pregunta1"] == 1 ? '': '') . '' . ($dataR1["pregunta2"] == 1 ? '': '') . '' . ($dataR1["pregunta3"] == 1 ? '': '') . '' . ($dataR1["pregunta4"] == 1 ? '': '') . '' . ($dataR1["pregunta5"] == 1 ? '': '') . '' . ($dataR1["pregunta6"] == 1 ? '': '') . '' . ($dataR1["pregunta7"] == 1 ? '': '') . '' . ($dataR1["pregunta8"] == 1 ? '': '') . '' . ($dataR1["pregunta9"] == 1 ? '': '') . '' . ($dataR1["pregunta10"] == 1 ? '': '') . '' . ($dataR1["pregunta11"] == 1 ? '': '') . '' . ($dataR1["pregunta12"] == 1 ? '': '') . '' . ($dataR1["pregunta13"] == 1 ? '': '') . '' . ($dataR1["pregunta14"] == 1 ? '': '') . '' . ($dataR1["pregunta15"] == 1 ? '': '') . '