Changeset 9

Timestamp:

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

Author:

bart

Message:

Tournament overview table, few bug fixes

Files:

• pom.xml (modified) (5 diffs)
• src/main/webapp/newsession.xhtml (modified) (4 diffs)
• src/main/webapp/newtournament.xhtml (modified) (5 diffs)
• src/main/webapp/plotlog.xhtml (modified) (6 diffs)
• src/main/webapp/utilstable.xhtml (added)

pom.xml

@@ -6 +6 @@
         <artifactId>runserver</artifactId>
         <packaging>war</packaging>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
         <name>runserver Maven Webapp</name>
         <url>http://maven.apache.org</url>
@@ -53 +53 @@
                         <groupId>geniusweb</groupId>
                         <artifactId>profile</artifactId>
-                        <version>1.1.0</version>
+                        <version>1.2.0</version>
                 </dependency>
 
@@ -59 +59 @@
                         <groupId>geniusweb</groupId>
                         <artifactId>party</artifactId>
-                        <version>1.1.0</version>
+                        <version>1.2.0</version>
                 </dependency>
 
@@ -65 +65 @@
                         <groupId>geniusweb</groupId>
                         <artifactId>references</artifactId>
-                        <version>1.1.0</version>
+                        <version>1.2.0</version>
                 </dependency>
 
@@ -71 +71 @@
                         <groupId>geniusweb</groupId>
                         <artifactId>protocol</artifactId>
-                        <version>1.1.0</version>
+                        <version>1.2.0</version>
                 </dependency>
 

src/main/webapp/newsession.xhtml

@@ -29 +29 @@
         <br /> Domain/Profile Server:
         <input type="url" name="url" id="profilesserverurl"
-                value="localhost:8080/profilesserver-1.1.0"
+                value="localhost:8080/profilesserver-1.2.0"
                 pattern=".*:[0-9]+/profilesserver" size="30"
                 onchange="connectDomain()"> </input>
@@ -43 +43 @@
                 <br /> <b>Participants</b> <br /> Parties Server: <input type="url"
                         name="url" id="partiesserverurl"
-                        value="localhost:8080/partiesserver-1.1.0"
+                        value="localhost:8080/partiesserver-1.2.0"
                         pattern=".*:[0-9]+/partiesserver" size="30"
                         onchange="connectParties()"> </input> <br /> <br /> <b>Party
@@ -273 +273 @@
          refresh table: copy all parties elements in there.
          Typically parties is something like
-         [{"uri":"http:130.161.180.1:8080/partiesserver/run/randomparty-1.1.0",
+         [{"uri":"http:130.161.180.1:8080/partiesserver/run/randomparty-1.2.0",
                  "capabilities":{"protocols":["SAOP"]},
                  "description":"places random bids until it can accept an offer with utility >0.6",
-                 "id":"randomparty-1.1.0",
+                 "id":"randomparty-1.2.0",
                  "partyClass":"geniusweb.exampleparties.randomparty.RandomParty"},
                                  ...]
@@ -571 +571 @@
         function init() {
                 selectProtocol();
-                document.getElementById("partiesserverurl").value =window.location.hostname+":8080/partiesserver-1.1.0"
-                document.getElementById("profilesserverurl").value =window.location.hostname+":8080/profilesserver-1.1.0"
+                document.getElementById("partiesserverurl").value =window.location.hostname+":8080/partiesserver-1.2.0"
+                document.getElementById("profilesserverurl").value =window.location.hostname+":8080/profilesserver-1.2.0"
                 connectDomain();
                 connectParties();

src/main/webapp/newtournament.xhtml

@@ -47 +47 @@
         <div id="box" class="box">
                 <br /> Domain/Profile Server: <input type="url" name="url"
-                        id="profilesserverurl" value="localhost:8080/profilesserver-1.1.0"
+                        id="profilesserverurl" value="localhost:8080/profilesserver-1.2.0"
                         pattern=".*:[0-9]+/profilesserver" size="30"
                         onchange="connectDomain()"> </input> <br /> Domain: <select
@@ -76 +76 @@
         <div id="box" class="box">
                 <br /> Parties Server: <input type="url" name="url"
-                        id="partiesserverurl" value="localhost:8080/partiesserver-1.1.0"
+                        id="partiesserverurl" value="localhost:8080/partiesserver-1.2.0"
                         pattern=".*:[0-9]+/partiesserver" size="30"
                         onchange="connectParties()"> </input> <br /> <br />
@@ -106 +106 @@
         <div id="started" style="visibility: hidden">
                 Your tournament started. Click <a href="" id="logref">here</a> to view
-                the log file.
+                the log file. <br />
+                <a href="" id="plotref">show results table.</a>.
         </div>
 
@@ -385 +386 @@
                                 document.getElementById("started").setAttribute("style","");
                         document.getElementById("logref").href="log/"+this.responseText+".json";
+                                document.getElementById("plotref").href="utilstable.xhtml?"+this.responseText;
                         } else 
                                 alert("request failed:"+this.statusText);
@@ -421 +423 @@
         */
         function init() {
-                document.getElementById("partiesserverurl").value =window.location.hostname+":8080/partiesserver-1.1.0";
-                document.getElementById("profilesserverurl").value =window.location.hostname+":8080/profilesserver-1.1.0";
+                document.getElementById("partiesserverurl").value =window.location.hostname+":8080/partiesserver-1.2.0";
+                document.getElementById("profilesserverurl").value =window.location.hostname+":8080/profilesserver-1.2.0";
 
 

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>