From 80836b5056f673df0851a10839b90c2afe598582 Mon Sep 17 00:00:00 2001
From: fherrero <fherrero@iri.upc.edu>
Date: Fri, 12 Nov 2021 12:07:19 +0100
Subject: [PATCH] Update html
---
html/css/style.css | 8 ++++--
html/css/style_public.css | 19 +++++++++++--
html/jury.html | 10 +++----
html/penalizations.html | 3 +-
html/public.html | 60 +++++++++++++++++++++------------------
html/timer.html | 26 ++++++++++-------
6 files changed, 78 insertions(+), 48 deletions(-)
diff --git a/html/css/style.css b/html/css/style.css
index 2ae433a..ec69802 100644
--- a/html/css/style.css
+++ b/html/css/style.css
@@ -30,17 +30,18 @@ body {
}
#timer_output_big {
- font-size: 16.5em;
+ font-size: 26.5em;
width: auto;
height: auto;
background-color: white;
- border: 3px solid black;
+ /*border: 0px solid black;*/
margin-right: auto;
margin-left: auto;
- margin-top: auto;
+ margin-top: 0px;
font-weight: 900;
text-align: center;
vertical-align: middle;
+ line-height: 1em;
}
#slot_timer_output {
@@ -89,6 +90,7 @@ body {
background-color: white;
padding-top: 0px;
height: 100%;
+ text-align: center;
}
.pen_name {
diff --git a/html/css/style_public.css b/html/css/style_public.css
index 7c26eb6..a53bdc2 100644
--- a/html/css/style_public.css
+++ b/html/css/style_public.css
@@ -74,17 +74,18 @@ body {
}
.image {
- height: 80vh;
+ height: 95vh;
}
.body_timer {
background-color: white;
padding-top: 0px;
- height: 100%;
+ height: 100%
}
.section {
font-size: 1.5em;
+ width: 120px;
}
@@ -92,3 +93,17 @@ body {
font-size: 2.5em;
}
+
+.section3 {
+ font-size: 1.5em;
+
+}
+
+#feedback_text
+{
+ resize: vertical;
+ width:100%;
+ height: 50vh;
+ border-style:solid;
+ font-size: 1.7em;
+}
diff --git a/html/jury.html b/html/jury.html
index 1af5f73..e07beb8 100644
--- a/html/jury.html
+++ b/html/jury.html
@@ -266,12 +266,12 @@
var team_names=[
"testing",
- "teamname1",
- "teamname2",
- "teamname3",
- "teamname4",
+ "UMA Garage",
+ "UrBots",
+ "Gromep",
+ "UNIZAR",
];
-
+
var team_colors=[
"black",
"blue",
diff --git a/html/penalizations.html b/html/penalizations.html
index f0cd3bd..51554cb 100644
--- a/html/penalizations.html
+++ b/html/penalizations.html
@@ -126,6 +126,7 @@
function add_penalization_feedback(id)
{
+ console.log("heee");
// feedback_param.get(function(value){ feedback_param_value = value; });
// attempt_time_param.get(function(value){ attempt_time_param_value = value; });
//
@@ -133,7 +134,7 @@
// feedback_param_value = pen_text + "\n" + feedback_param_value;
// feedback_param.set(feedback_param_value);
- var pen_text = "[PEN] Penalization " + id
+ var pen_text = "[PEN] Penalization " + id + ", " + document.getElementById("pen"+id+"_name").innerHTML;
feedback_msg.feedback.status = pen_text;
feedback_topic.publish(feedback_msg);
diff --git a/html/public.html b/html/public.html
index 1c7779b..2543a80 100644
--- a/html/public.html
+++ b/html/public.html
@@ -241,38 +241,44 @@
</head>
<body>
-
- <div class="row">
- <div style="width: 33%">
- <label class="section">Team             </label>
- <span class="section2" id="team_id" >1</span>
- <br>
- <label class="section">Challenge     </label>
- <span class="section2" id="challenge_id" >1</span>
- </div>
- <div style="width: 33%">
- <label class="section">Slot time</label>
- <br>
- <span id="slot_timer_output">00:00</span>
- </div>
- <div style="width: 33%">
- <label class="section">Attempt time</label>
- <br>
- <span id = "timer_output" class = "text-left">00:00:00</span>
- </div>
- </div>
-
+
<div class="row">
<div style="width: 45%">
- <label class="section">Mode             </label>
- <span class="section2" id="service_info" >Autonomous</span>
- <br>
- <label class="section">Feedback</label>
- <br>
- <textarea readonly id="feedback_text" style="resize: vertical; width:100%; border-style:solid; font-size: 1.1em;" wrap='off' rows="20" cols="auto">Received feedback messages will be shown here. Each message starting a new line</textarea>
+ <div class="row">
+ <div style="width: 49%">
+
+ <label class="section">Team</label>
+ <span class="section2" id="team_id" >1</span>
+ <br>
+ <label class="section">Challenge</label>
+ <span class="section2" id="challenge_id" >1</span>
+ <br>
+
+ <label class="section">Mode</label>
+ <span class="section2" id="service_info" >Autonomous</span>
+ <br>
+
+ </div>
+ <div style="width: 49%; text-align: right;">
+
+ <label class="section3">Slot time</label>
+ <br>
+ <span id="slot_timer_output">00:00</span>
+ <br>
+
+ <label class="section3">Attempt time</label>
+ <br>
+ <span id = "timer_output" class = "text-left">00:00:00</span>
+
+ </div>
+
+ <label class="section">Feedback</label>
+ <br>
+ <textarea readonly id="feedback_text" wrap='off' cols="auto">hola</textarea>
+ </div>
</div>
<div style="width: 55%; text-align: center;">
<img class="image" id="video_image" src="" alt="map image"/>
diff --git a/html/timer.html b/html/timer.html
index 6c60895..08b0bdc 100644
--- a/html/timer.html
+++ b/html/timer.html
@@ -71,6 +71,7 @@
var team_color_param_value;
var jury_mode_param_value;
var attempt_time_param_value;
+ var challenge_param_value;
function iteration()
{
@@ -79,16 +80,20 @@
{
team_name_param.get(function(value){ team_name_param_value = value; });
team_color_param.get(function(value){ team_color_param_value = value; });
+ challenge_param.get(function(value){ challenge_param_value = value; });
jury_mode_param.get(function(value){ jury_mode_param_value = value; });
attempt_time_param.get(function(value){ attempt_time_param_value = value; });
document.getElementById("timer_output_big").innerHTML = attempt_time_param_value;
document.getElementById("team_id").innerHTML = team_name_param_value;
document.getElementById("team_id").style.color = team_color_param_value;
+ document.getElementById("challenge_info").innerHTML = "Challenge " + challenge_param_value;
+ /*
if(jury_mode_param_value=="Disabled")
document.getElementById("service_info").innerHTML = "Autonomous";
else
document.getElementById("service_info").innerHTML = "Manual";
+ */
iteration();
},200);
@@ -107,25 +112,26 @@
</head>
<body class="body_timer">
-
- <main role="main" class="mycontainer">
-
- <div style="text-align: center;">
+
+ <main role="main" class="mycontainer" >
+
+<!-- <div style="text-align: center;">-->
- <span style='font-size: 10.5em;' id="team_id" >0</span>
+ <span style='font-size: 12.5em;' id="team_id" >0</span>
<br>
- <span style='font-size: 5.5em;' id="service_info" >Autonomous</span>
+ <span style='font-size: 7.5em; line-height: 1.6em' id="challenge_info" >Challenge 1</span>
+
+ <!--<span style='font-size: 5.5em;' id="service_info" >Autonomous</span>-->
<br>
- <p id = "timer_output_big">00:00:00</p>
+ <span id = "timer_output_big">00:00:00</span>
- </div>
+ <!--</div>-->
-
- </main>
+ </main>
</body>
</html>
--
GitLab