Skip to content

Commit 85cbfe7

Browse files
committed
perroenpista: fix logo reload and F/T/R/E/N data handling
Need to clear canvas before repaint new logo Also add parsing of "datos" event to handle FTR
1 parent e750a6b commit 85cbfe7

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

agility/livestream/perroenpista.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636

3737
function initialize() {
3838
// initialize logo canvas
39-
var c = document.getElementById("pp_Logo");
40-
var ctx = c.getContext("2d");
39+
var canvas = document.getElementById("pp_Logo");
40+
var ctx = canvas.getContext("2d");
4141
ac_config.myImage = new Image(150,150);
4242
ac_config.myImage.onload = function() { ctx.drawImage(ac_config.myImage, 0, 0); };
4343

@@ -84,6 +84,7 @@ <h4><span id="pp_NombreRing"></span><br/></h4>
8484
Tocados: <span id="pp_Toc"></span><br/>
8585
Eliminado: <span id="pp_Eli"></span><br/>
8686
No Presentado: <span id="pp_NPr"></span><br/>
87+
Tiempo final: <span id="pp_Tim"></span><br/>
8788
<p>
8889

8990
</p>

agility/livestream/perroenpista.js

+12-2
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,21 @@ function parseEvent(entry) {
7676
case "llamada":
7777
// ajustamos logo y timestamp
7878
$('#pp_Timestamp').html(entry.Timestamp);
79+
var canvas = document.getElementById("pp_Logo");
80+
ctx = canvas.getContext("2d");
81+
ctx.clearRect(0, 0, canvas.width, canvas.height);
7982
ac_config.myImage.src="../ajax/database/clubFunctions.php?Operation=getLogoByPerro&Federation=0&Perro="+data['Dog'];
8083
lista=['Drs','Nombre','NombreLargo','NombreGuia','NombreClub','NombreEquipo',"Categoria",'Grado'];
81-
// no break;
84+
// no break
8285
case "aceptar":
83-
lista=lista.concat(['Flt','Toc','Reh','Eli','NPr']);
86+
lista=lista.concat(['Flt','Toc','Reh','Eli','NPr','Tim']);
87+
break;
88+
case "datos": // -1: no change; else data
89+
if (data['Flt']>=0 ) lista=lista.concat(['Flt']);
90+
if (data['Toc']>=0 ) lista=lista.concat(['Toc']);
91+
if (data['Reh']>=0 ) lista=lista.concat(['Reh']);
92+
if (data['Eli']>=0 ) lista=lista.concat(['Eli']);
93+
if (data['NPr']>=0 ) lista=lista.concat(['NPr']);
8494
break;
8595
}
8696
// rellenamos pagina

0 commit comments

Comments
 (0)