Changeset 8 for src/main/webapp/newsession.xhtml

Timestamp:

01/28/20 10:20:01 (5 years ago)

Author:

bart

Message:

Update 28 jan 2020

File:

• src/main/webapp/newsession.xhtml (modified) (16 diffs)

src/main/webapp/newsession.xhtml

@@ -13 +13 @@
 
         <br /> Protocol:
-        <select>
-                <option value="SAOP">SAOP</option>
+        <select id="selectedprotocol" onchange="selectProtocol()">
+                <option value="SAOP">SAOP (stacked alternating offers)</option>
+                <option value="SHAOP">SHAOP (stacked human alternating
+                        offers)</option>
         </select>
 
@@ -21 +23 @@
                 max="10000" value="10" />
         <select id="deadlinetype">
+                <option value="ROUNDS">rounds</option>
                 <option value="TIME">seconds</option>
-                <option value="ROUNDS">rounds</option>
         </select>
 
@@ -43 +45 @@
                         value="localhost:8080/partiesserver-1.1.0"
                         pattern=".*:[0-9]+/partiesserver" size="30"
-                        onchange="connectParties()"> </input> <br /> <br /> <b>Edit
-                        next party</b> <br /> Party: <select id="partyselection">
-                </select> <br /> Profile: <select id="profileselection">
-                </select> <br /> Parameters: { <input type="text" id="parameters"
-                        onchange="updateParameters()" value="" maxlength="100" /> }  <br /> <br />
+                        onchange="connectParties()"> </input> <br /> <br /> <b>Party
+                        settings</b> <br /> Party : <select id="partyselection">
+                </select> <br /> Profile: <select id="profileselection"></select> Filter: <input
+                        type="text" id="filter" value="" maxlength="40" /> <br />
+                Parameters: { <input type="text" id="parameters"
+                        onchange="updateParameters()" value="" maxlength="100" /> } <br />
+                <br />
+
+                <div id="cobsetting">
+                        <input type="checkbox" id="advancedCobSettings" onchange="advancedCobSet()" ></input>
+                        Advanced COB settings<br/>
+                        <div id="advancedsettings" style="display:none">
+                                <b>COB party settings</b> <br /> Party : <select
+                                        id="cobpartyselection">
+                                </select> <br /> Profile: <select id="cobprofileselection"></select>
+                                Filter: <input type="text" id="cobfilter" value=""
+                                        maxlength="40" /> <br /> Parameters: { <input
+                                        type="text" id="cobparameters" onchange="updateCobParameters()"
+                                        value="" maxlength="100" /> } <br /> <br />
+                        </div>
+                </div>
 
                 <button onclick="addParty()">Add</button>
@@ -53 +71 @@
 
                 <br /> <br /> <b>Selected Profiles, Parties for the session</b>
-                <table>
+                <table id="selectedpartiestable" width="100%">
+                        <colgroup>
+                                <col />
+                                <col />
+                                <col />
+                                <col />
+                                <col />
+                                <col />
+                        </colgroup>
                         <thead>
-                                <th align="left" width='40%'>Party</th>
-                                <th align="left" width='20%'>Parameters</th>
-                                <th align="left" width='40%'>Profile</th>
+                                <tr>
+                                        <th align="center">Party</th>
+                                        <th align="center">Parameters</th>
+                                        <th align="center">Profile</th>
+
+                                        <th align="center">COB Party</th>
+                                        <th align="center">COB Parameters</th>
+                                        <th align="center">COB Profile</th>
+                                </tr>
                         </thead>
                         <tbody id="partiesList">
-                                <tr id="partiesList">
-                                </tr>
-
                         </tbody>
                 </table>
@@ -84 +113 @@
 
 <script type="application/javascript">
+        
+        
+        
         
         
@@ -114 +146 @@
                 */
         var partyprofiles=[];
+        
+        var cobpartyprofiles=[];
 
         /** from http://fitzgeraldnick.com/2010/08/10/settimeout-patterns.html */
     
+        function getAdvancedCobSettings() {
+                return document.getElementById('advancedCobSettings').checked;
+        }
+        
+        function advancedCobSet() {
+            document.getElementById('advancedsettings').style.display=(getAdvancedCobSettings()?'':'none');
+        }
+        
     function async (fn) {
         setTimeout(fn, 1000);
@@ -131 +173 @@
     }
 
-        
+    /**
+    Called when user changes the protocol */
+    function selectProtocol() {
+        var visible=getSelectedProtocol() == "SHAOP";
+                
+        document.getElementById("cobsetting").style.display=(visible ? 'block': 'none');
+            var tbl = document.getElementById('selectedpartiestable');
+            tbl.getElementsByTagName('col')[3].style.visibility=(visible?'':'collapse');
+            tbl.getElementsByTagName('col')[4].style.visibility=(visible?'':'collapse');
+            tbl.getElementsByTagName('col')[5].style.visibility=(visible?'':'collapse');
+                
+    }   
         
         /**
@@ -228 +281 @@
          */
         function updateParties(parties) {
-                var combobox = document.getElementById("partyselection");
+                 updatePartiesCombobox(parties, document.getElementById("partyselection"),['SAOP','SHAOP']);
+                 updatePartiesCombobox(parties, document.getElementById("cobpartyselection"),['COB']);
+        }
+    
+    /**
+    @param parties a list of parties r(as received from the server)
+    @param combobox a combobox element to put the party URLs in
+    @param behaviours a list of behaviours for the parties. Only these are put in the combobox.
+    */
+    function updatePartiesCombobox(parties, combobox, behaviours) {
                 combobox.options.length=0;
-        for (var party in parties) {
+        for (var p in parties) {
+                var party = parties[p];
+                if (intersect(party.capabilities.behaviours, behaviours).length==0)  
+                        continue;
             var option = document.createElement('option');
-            option.text = option.value = parties[party].uri;
+            option.text = option.value = party.uri;
             combobox.add(option, 0);
         }
-        }
-    
+
+    }
+
+    /**
+    @param a a list
+    @param b another list
+    @return intersection of a and b
+    */
+    function intersect(a, b) {
+        var t;
+        if (b.length > a.length) t = b, b = a, a = t; // indexOf to loop over shorter
+        return a.filter(function (e) {
+            return b.indexOf(e) > -1;
+        });
+    }
+
 
     /**
@@ -262 +341 @@
                 var domain = domaincombobox.options[domaincombobox.selectedIndex].value;
                 
-                var profilecombo = document.getElementById("profileselection");
+                updateProfileComboBox(document.getElementById("profileselection"), knowndomains[domain]);
+                updateProfileComboBox(document.getElementById("cobprofileselection"), knowndomains[domain]);
+        }
+        
+        function updateProfileComboBox(profilecombo, options) {
                 profilecombo.options.length=0;
-                for (var profile in knowndomains[domain]) {
+                for (var profile in options) {
             var option = document.createElement('option');
-            option.text = option.value = knowndomains[domain][profile];
+            option.text = option.value = options[profile];
             profilecombo.add(option, 0);
                 }
+
         }
         
@@ -275 +359 @@
         */
         function addParty() {
+                addNormalParty();
+                addCobParty();
+                updatePartyProfileTable(); // what, MVC?
+        }
+        
+        function addNormalParty() {
                 var partycombo = document.getElementById("partyselection");
                 var profilecombo = document.getElementById("profileselection");
+                var filteroptions = document.getElementById("filter").value;
                 
                 if (partycombo.options.length==0) {
@@ -286 +377 @@
                         return;
                 }
+                
+                if (filteroptions!="") {
+                        filteroptions="?"+filteroptions;
+                }
                 var newpartyprof = {};
-                
-                newpartyprof["party"]={"partyref":partycombo.options[partycombo.selectedIndex].value, 
+                newpartyprof["party"]={"partyref":partycombo.options[partycombo.selectedIndex].value , 
                                 "parameters":parameters };
-                newpartyprof["profile"]=profilecombo.options[profilecombo.selectedIndex].value;
+                newpartyprof["profile"]=profilecombo.options[profilecombo.selectedIndex].value +filteroptions;
                 
                 partyprofiles.push(newpartyprof)
-                updatePartyProfileTable(); // what, MVC?
-        }
+        }
+        
+        
+        function addCobParty() {
+                // we assume a sensible default has been loaded into the combo and set,
+                // regardless it being invisible
+                var partycombo = document.getElementById("cobpartyselection");
+                if (partycombo.options.length==0) {
+                        alert("Please set cpb partier server and select a party");
+                        return;
+                }
+
+                var newpartyprof = {};
+                if (getAdvancedCobSettings()) {
+                        var profilecombo = document.getElementById("cobprofileselection");
+                        var filteroptions = document.getElementById("cobfilter").value;
+
+                        if (profilecombo.options.length==0) {
+                                alert("Please set a cob profile");
+                                return;
+                        }
+                        if (filteroptions!="") {
+                                filteroptions="?"+filteroptions;
+                        }
+                        newpartyprof["party"]={"partyref":partycombo.options[partycombo.selectedIndex].value , 
+                                        "parameters":parameters };
+                        newpartyprof["profile"]=profilecombo.options[profilecombo.selectedIndex].value +filteroptions;
+                } else {
+                        var profilecombo = document.getElementById("profileselection");
+                        newpartyprof["party"]={"partyref":partycombo.options[partycombo.selectedIndex].value , 
+                                        "parameters":{} };
+                        newpartyprof["profile"]=profilecombo.options[profilecombo.selectedIndex].value;
+                }
+                cobpartyprofiles.push(newpartyprof)
+        }
+
         
         /** updates the party and profiles table, to match the #partyprofiles list.             */
@@ -305 +433 @@
                         var cell2 = row.insertCell(-1);
                         var cell3 = row.insertCell(-1);
+                        var cell4 = row.insertCell(-1);
+                        var cell5 = row.insertCell(-1);
+                        var cell6 = row.insertCell(-1);
+                        
                         cell1.innerHTML = partyprofiles[pp]["party"]["partyref"];
                         cell2.innerHTML = JSON.stringify(partyprofiles[pp]["party"]["parameters"]);
                         cell3.innerHTML = partyprofiles[pp]["profile"];
+                        cell4.innerHTML = cobpartyprofiles[pp]["party"]["partyref"];
+                        cell5.innerHTML = JSON.stringify(cobpartyprofiles[pp]["party"]["parameters"]);
+                        cell6.innerHTML = cobpartyprofiles[pp]["profile"];
                 }
 
@@ -372 +507 @@
         }
         
+        function getSelectedProtocol() {
+                var protocolcombo = document.getElementById("selectedprotocol");
+                return protocolcombo.options[protocolcombo.selectedIndex].value;
+        }
         /**
         @return a json request package for the run server
         */
         function makeRequest() {
+
+                if (getSelectedProtocol()=="SHAOP") {
+                        return makeShaopRequest();
+                } else {
+                        return makeSaopRequest();
+                } 
+        }
+        
+        /**
+        @return a SAOP request
+        */
+        function makeSaopRequest() {
                 var deadline={};
                 var value = document.getElementById("deadlinevalue").value;
@@ -386 +537 @@
                 }
                 
-                
                 return JSON.stringify({"SAOPSettings": { "participants": partyprofiles, "deadline":deadline }});
-
-        }
-        
+        }
+
+        /**
+        @return a SHAOP request
+        */
+        function makeShaopRequest() {
+                var deadline={};
+                var value = document.getElementById("deadlinevalue").value;
+                var dtypecombo  = document.getElementById("deadlinetype");
+                if (dtypecombo.options[dtypecombo.selectedIndex].value=="TIME") {
+                        deadline["deadlinetime"] = { "durationms": 1000*value};
+                } else {
+                        // ROUNDS
+                        deadline["deadlinerounds"] = {"rounds": value, "durationms":10000};
+                }
+                
+                var parties=[];
+                for (let i=0; i< partyprofiles.length; i++) {
+                        var group={};
+                        group['shaop'] = partyprofiles[i];
+                        group['cob'] = cobpartyprofiles[i];
+                        
+                        parties.push(group);
+                }
+                return JSON.stringify({"SHAOPSettings": { "participants": parties, "deadline":deadline }});
+        }
+
         
         /**
@@ -396 +570 @@
         */
         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"
@@ -407 +582 @@
 
 
+
+
+
 </script>