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

Timestamp:

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

Author:

bart

Message:

Version 1.5.

File:

• src/main/webapp/newtournament.xhtml (modified) (8 diffs)

src/main/webapp/newtournament.xhtml

@@ -36 +36 @@
                         id="protocolselection" onchange="selectProtocol()">
                         <option value="SAOP">SAOP</option>
+                        <option value="MOPAC">MOPAC</option>
+                        <option value="AMOP">AMOP</option>
                         <option value="SHAOP">SHAOP</option>
-                </select> <br /> Deadline: <input type="number" id="deadlinevalue"
+
+
+                </select> 
+                
+                <div id="votingevaluator">
+                        <br /> Voting Evaluator: <select id="selectedevaluator">
+                                <option value="LargestAgreement">Largest Agreement</option>
+                                <option value="LargestAgreementsLoop">Largest Agreements
+                                        and Repeat</option>
+                        </select>
+                </div>
+
+
+                <br /> Deadline: <input type="number" id="deadlinevalue"
                         name="deadline" min="1" max="10000" value="10" /> <select
                         id="deadlinetype">
@@ -87 +102 @@
                 <!-- party  1 selection -->
                 Party: <select id="partyselection">
-                </select> 
-                <br /> Parameters: {
+                </select> <br /> Parameters: {
                 <textarea id="parameters" rows="2" cols="70"
                         onchange="getParameters('parameters')" value="" />
@@ -95 +109 @@
                 <div class="onlySHAOP">
                         COB: <select id="partyselection2">
-                        </select> 
-                        <br /> Parameters: {
+                        </select> <br /> Parameters: {
                         <textarea id="parameters2" rows="2" cols="70"
                                 onchange="getParameters('parameters2')" value="" />
@@ -166 +179 @@
         
         
+        
         // FIXME quick and dirty code. No clean MVC
         
@@ -186 +200 @@
     */
     function selectProtocol() {
-        const isShaop= "SHAOP"==document.getElementById("protocolselection").value;
-        setStyleSheet('.onlySHAOP','{ display: '+(isShaop? '?':'none')+'; }')
+            const protocol = document.getElementById("protocolselection").value;
+                setStyleSheet('.onlySHAOP','{ display: '+(protocol=="SHAOP"? '?':'none')+'; }')
+                
+                document.getElementById("votingevaluator").style.display=(protocol=="MOPAC" ? 'block': 'none');
     }
     
@@ -536 +552 @@
                 
                 // create S(H)AOPSettings. [header] is a weird ECMA script workaround for javascript issue.
-                const sessionSettings = { [header]:{"participants":[],"deadline":deadline}};
-                
+                var settingvalues={"participants":[],"deadline":deadline};
+                if (protocol=="MOPAC") {
+                        var combo = document.getElementById("selectedevaluator");
+                        var evaluator = combo.options[combo.selectedIndex].value;
+                        settingvalues['votingevaluator'] = { [evaluator]: {} };
+                } 
+                        
+                const sessionSettings = { [header]:settingvalues};
+
                 var teamsFull = [];
                 for (const team of teamslist) {
-                        if (protocol=="SAOP") // only first member of team is used.
-                                teamsFull.push({"Team":[team[0]]});
+                        if (protocol=="SHAOP") 
+                                teamsFull.push({"Team":team});
                         else
-                                teamsFull.push({"Team":team});
+                                teamsFull.push({"Team":[team[0]]}); // most protocols have just 1 member per team
                 }
                 var profilesFull = [] ;
                 for (const profileset of profiles) {
-                        if (protocol=="SAOP") // only first member of team is used.
+                        if (protocol=="SHAOP") // only first member of team is used.
+                                profilesFull.push({"ProfileList":profileset});
+                        else
                                 profilesFull.push({"ProfileList":[profileset[0]]});
-                        else
-                                profilesFull.push({"ProfileList":profileset});
                 }
                 
@@ -562 +585 @@
         */
         function init() {
-                document.getElementById("partiesserverurl").value =window.location.hostname+":8080/partiesserver-1.4.4";
-                document.getElementById("profilesserverurl").value =window.location.hostname+":8080/profilesserver-1.4.4";
+                document.getElementById("partiesserverurl").value =window.location.hostname+":8080/partiesserver-1.5.0";
+                document.getElementById("profilesserverurl").value =window.location.hostname+":8080/profilesserver-1.5.0";
 
                 selectProtocol();
@@ -587 +610 @@
 
 
+
 </script>