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

Timestamp:

09/22/20 08:52:49 (4 years ago)

Author:

bart

Message:

Version 1.5.

File:

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

src/main/webapp/plotlog.xhtml

@@ -4 +4 @@
 <title>Plot log results</title>
 <script src="Chart.min_2.8.0.js"></script>
+<script src="utils.js"></script>
 </head>
 <style>
@@ -23 +24 @@
         <div id="progress">Waiting for log file name</div>
         <br />
-        <div>Notice, the plotted utilities do not include possible elicitation costs.</div>
+        <div>Notice, the plotted utilities do not include possible
+                elicitation costs.</div>
         <div style="width: 100%;">
                 <canvas id="canvas"></canvas>
         </div>
-        
-        Agreement: <div id="agreement" style="display:inline;">?</div>
+
+        Agreement:
+        <div id="agreement" style="display: inline;">?</div>
 </body>
 
@@ -39 +42 @@
         
         
+        
+        
 
         
@@ -52 +57 @@
 
         function connect() {
-                
-                var id=document.location.search;
-            id = location.search.split('id=')[1]
-            if (id==undefined) return;
+                var query = new URLSearchParams(location.search);
+                var id=query.get('id');
+            if (id==undefined) {
+                alert("missing ?id=<logfile> in URL"); 
+                return;
+                }
             
             // load the log file with given id
@@ -96 +103 @@
                 var profs=json['partyprofiles'];
                 for (var party in profs) {
-                        partyprofiles[party]=profs[party]['profile'].split('?',1)[0]; // hacky, remove complete query.
+                        partyprofiles[party]=withoutPartial(profs[party]['profile']);
                 }
                 
                 getProfiles(json, partyprofiles);
         }
+        
         
         /**
@@ -112 +120 @@
                         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.
+                        var profile = withoutPartial(shaop['profile']); // hacky, remove complete query.
                         partyprofiles[partyid]=profile;
                 }
@@ -120 +128 @@
         }
 
+
+        /**
+        @param uristr a string with an uri that may have ?partial=XX 
+        @return the given uristr   without the "partia=XXl" value 
+        */
+        function withoutPartial(uristr) {
+                var profuri=new URL(uristr);
+                var searchParams = new URLSearchParams(profuri.search);
+                searchParams.delete("partial");
+                profuri.search = searchParams.toString();
+                return profuri.toString();
+
+        } 
         
         /**
@@ -371 +392 @@
 
 
+
+
 </script>
 
@@ -376 +399 @@
 
 <script type="application/javascript">
+        
+        
         
         
@@ -407 +432 @@
 
 
+
+
 </script>