Changeset 9 for src/main/webapp/plotlog.xhtml

Timestamp:

01/30/20 16:52:47 (5 years ago)

Author:

bart

Message:

Tournament overview table, few bug fixes

File:

• src/main/webapp/plotlog.xhtml (modified) (6 diffs)

src/main/webapp/plotlog.xhtml

@@ -35 +35 @@
         
         
+        
 
         
@@ -76 +77 @@
         */
         function processLogFile(json) {
-                if (json['SAOPState']==undefined) {
+                if (json['SAOPState']!=undefined) {
+                        processSAOP(json['SAOPState']);
+                } else if (json['SHAOPState']!=undefined) {
+                        processSHAOP(json['SHAOPState']);
+                } else {
                 setStatus("Unknown log file contents "+Object.keys(json));
-                return;
-                }
-                processSAOP(json['SAOPState']);
+            }
         }
         
@@ -95 +98 @@
                 getProfiles(json, partyprofiles);
         }
+        
+        /**
+        Handle SHAOP protocol result. Get only SHAOP profiles. Remove all 'partial=XX' from relevant profiles.
+        */
+        function processSHAOP(json) {
+                var partyprofiles={}
+                var teams=json['settings']['SHAOPSettings']['participants'];
+                for (var partyid in json['partyNumbers']) {
+                        var nr= json['partyNumbers'][partyid];
+                        if ( (nr & 1 != 0)) continue; // skip COB parties
+                        var shaop=teams[nr/2]['shaop'];
+                        var profile = shaop['profile'].split('?',1)[0]; // hacky, remove complete query.
+                        partyprofiles[partyid]=profile;
+                }
+                        
+                
+                getProfiles(json, partyprofiles);
+        }
+
         
         /**
@@ -334 +356 @@
 
 
+
 </script>
 
@@ -339 +362 @@
 
 <script type="application/javascript">
+        
         
         
@@ -368 +392 @@
 
 
+
 </script>