Update database. Some fixes for videowall screens

jonsito · Sep 27, 2021 · 793cce1 · 793cce1
1 parent 3d06379
commit 793cce1
Show file tree

Hide file tree

Showing 5 changed files with 143 additions and 64 deletions.
diff --git a/agility/images/logos/el_area_jerez.png b/agility/images/logos/el_area_jerez.png
diff --git a/agility/images/logos/es_cantell.png b/agility/images/logos/es_cantell.png
diff --git a/agility/scripts/common.js.php b/agility/scripts/common.js.php
@@ -898,8 +898,8 @@ function setupWorkingData(prueba,jornada,manga,callback) {
                 }
             }).always(function() {
                 // obtenemos datos de la manga
-                if (manga<=0) {
-                    $.messager.alert('<?php _e("Error"); ?>', "No round information", "error");
+                if (manga<=1) { // round:1 means not initialized yet; do not call server
+                    if(manga<=0) $.messager.alert('<?php _e("Error"); ?>', "No round id provided", "error");
                     setManga(null);
                     return false;
                 }

diff --git a/agility/scripts/datagrid_formatters.js.php b/agility/scripts/datagrid_formatters.js.php
@@ -506,7 +506,8 @@ function formatVwTeamClasificaciones(value,rows) { return formatTeamClasificacio
 // repaint datagrid saving options, and load with empty data
 // WARNING !! DO NOT USE AS RESULT OF "OnLoadSuccess" (infinite loop)
 function resetDatagrid(dg,data) {
-    if ( dg.length ==0) return; // to avoid try to reset undefined jquery objects
+    if (typeof(dg==="undefined") || (dg===null)) return; // do nothing when non existent datagrid yet (i.e: init)
+    if ( dg.length===0) return; // to avoid try to reset undefined jquery objects
     if (typeof(data)==="undefined") data={"total":0,"rows":[]};
     var opts=dg.datagrid('options');
     setTimeout(function(){