Changeset 35114

Timestamp:

2021-04-24T15:05:10+12:00 (3 years ago)

Author:

davidb

Message:

Voting layout now responds to resizing window event

Location:

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision

Files:

• js/eurovision.js (modified) (6 diffs)
• transform/pages/document.xsl (modified) (6 diffs)

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/js/eurovision.js

@@ -4 +4 @@
 
 // The following needs to be kept in sync with the .voting-countries & .voting-points widths in css/eurovision.css
-var glob_voting_country_and_points_width = (180+35); 
+var glob_voting_country_and_points_width = (180+35);  
 
 
@@ -77 +77 @@
 
 
+
+function voting_mode(year)
+{
+
+    var vote_mode = undefined;
+
+    if (year>=2013) {
+    // Separate voting: Jury and Tele 
+        vote_mode = "Separated";
+    }
+    else if ((year>=2001) && (year<=2012)) {
+        vote_mode = "Combined";
+    }
+    else {
+        vote_mode = "Single";
+    }
+    
+    return vote_mode;
+}
+
+
+function nuanced_voting_type(country,year)
+{
+    var vote_type = undefined;
+
+    if (year>=2013) {
+        // Separate voting: Jury and Tele 
+        vote_type = "JT";
+    }
+    else if ((year>=2009) && (year<=2012)) {
+        if (country=="San Marino") {
+            vote_type = "J";
+    }
+        else {
+            // Combined Jury and Tele
+            vote_type = "C";
+    }
+    }
+    else if ((year>=2003) && (year<=2008)) {
+        vote_type = "T";
+    }
+    else if (year==2002) {
+        var jury_list = [ "Bosnia and Herzegovina", "Turkey", "Russia", "FYR Macedonia", "Romania"];
+        var comb_list = [ "Cyprus", "Greece", "Spain", "Croatia", "Finland", "Malta", "Slovenia", "Lithuania" ];
+        if (country in jury_list) {
+            vote_type = "J";
+    }
+        else if (country in comb_list) {
+            vote_type = "C";
+    }
+        else {
+            vote_type = "T";
+    }
+    }
+    else if (year==2001) {
+        var jury_list = [ "Bosnia and Herzegovina", "Turkey", "Russia" ];
+        var comb_list = [ "Croatia", "Greece", "Malta" ];
+        if (country in jury_list) {
+            vote_type = "J";
+    }
+        else if (country in comb_list) {
+            vote_type = "C";
+    }
+        else {
+            vote_type = "T";
+    }
+    }
+    else if ((year>=1998) && (year<=2000)) {
+        vote_type = "T";
+    }
+    else if (year==1997) {
+        var tele_list = [ "Austria", "Germany", "Sweeden", "Switzerland", "United Kingdom" ];
+        if (country in tele_list) {
+            vote_type = "T";
+    }
+        else {
+            vote_type = "J";
+    }
+    }
+    else {
+        vote_type = "J";
+    }
+
+    return vote_type;
+}
+
+
+
 function create_array2d(num_cols,num_rows)
 {
@@ -177 +265 @@
 
     var sorted_results_mapping = create_i_to_yx_mapping(num_cols,num_rows,num_countries)
-
+    
     for (var y=0; y<num_rows; y++) {
         for (var x=0; x<num_cols; x++) {
@@ -230 +318 @@
         }
         
-    }
-
-    $('#to-country-votes').append($vote_points_div);
+        $('#to-country-votes')
+        .append("<br />");
+    }
+
+    //$('#to-country-votes').append($vote_points_div);
 
     }
 }
       
+function append_all_to_country_votes()
+{
+    $('#to-country-votes').html("");
+    
+    append_to_country_votes("Jury Votes","JuryVotesJSON","JuryVotesTotal");
+    append_to_country_votes("Televotes","TeleVotesJSON","TeleVotesTotal");
+    
+    append_to_country_votes("Combined Jury & Tele Votes","CombVotesJSON","CombVotesTotal");
+    append_to_country_votes("Voting Exclusively by Jury","SingVotesJSON","SingVotesTotal");
+}
 
 function compare_countries(a,b)
@@ -341 +441 @@
             .append($a_to_country);
         }
+        $('#from-country-votes')
+        .append("<br />");
     }
     }
@@ -346 +448 @@
       
 
+function append_all_from_country_votes()
+{
+    $('#from-country-votes').html("");
+
+    append_from_country_votes(gs.documentMetadata["FromCountryType"]);
+}

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/transform/pages/document.xsl

@@ -55 +55 @@
         </td>
         <td>
+          <!--
           <gsf:switch>
         <gsf:metadata name='FromCountryType'/>  
@@ -67 +68 @@
         </gsf:otherwise>
           </gsf:switch>
+
+          -->
+
+          <gsf:switch>
+        <gsf:metadata name='FromCountryNuancedType'/>   
+        <gsf:when test="equals" test-value="J">
+          Jury
+        </gsf:when>
+        <gsf:when test="equals" test-value="T">
+          Televotes
+        </gsf:when>
+        <gsf:when test="equals" test-value="C">
+          Combined Jury and Televotes
+        </gsf:when>
+        <gsf:otherwise>
+
+          <gsf:switch>
+            <gsf:metadata name='FromCountryType'/>
+            <gsf:when test="equals" test-value="J">
+              Jury
+            </gsf:when>
+            <gsf:when test="equals" test-value="T">
+              Televotes
+            </gsf:when>
+            <gsf:otherwise> <!-- JT -->
+              Separate Jury and Televotes Added Together
+            </gsf:otherwise>
+          </gsf:switch>
+          
+        </gsf:otherwise>
+          </gsf:switch>
+
+          
         </td>
       </tr>   
@@ -148 +182 @@
         </td>
         <td>
+
+          <gsf:switch>
+        <gsf:metadata name='FlagImg'/>
+        <gsf:when test='exists'>
+          <span style="padding-right: 6px;"><gsf:metadata name="FlagImg"/></span>
+        </gsf:when>
+          </gsf:switch>
+
           <gsf:metadata name="Country" highlight="highlight" />
+
         </td>
       </tr>
@@ -162 +205 @@
         </td>
         <td>
-          <gsf:metadata name="Year" highlight="highlight" />
+          <xsl:variable name="escyear"><gsf:metadata name="Year"/></xsl:variable>
+          <a target="_blank" href="https://en.wikipedia.org/wiki/Eurovision_Song_Contest_{$escyear}">
+        Eurovision <gsf:metadata name="Year" highlight="highlight" />
+        @ Wikipedia
+        <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAVklEQVR4Xn3PgQkAMQhDUXfqTu7kTtkpd5RA8AInfArtQ2iRXFWT2QedAfttj2FsPIOE1eCOlEuoWWjgzYaB/IkeGOrxXhqB+uA9Bfcm0lAZuh+YIeAD+cAqSz4kCMUAAAAASUVORK5CYII=" alt="external link" />
+          </a>
         </td>
       </tr>
@@ -174 +222 @@
   <xsl:template name="documentContentFromCountry">
     <div id="from-country-votes">
-      <gsf:script>  
-    append_from_country_votes(gs.documentMetadata["FromCountryType"]);
+      <gsf:script>
+    $(document).ready(function() {
+      append_all_from_country_votes();
+    }); 
+
+    window.addEventListener("resize", function() { append_all_from_country_votes() });
       </gsf:script>
     </div>    
@@ -201 +253 @@
       
       <gsf:script>
-    append_to_country_votes("Jury Votes","JuryVotesJSON","JuryVotesTotal");
-    append_to_country_votes("Televotes","TeleVotesJSON","TeleVotesTotal");
-
-    append_to_country_votes("Combined Jury &amp; Tele Votes","CombVotesJSON","CombVotesTotal");
-    append_to_country_votes("Voting Exclusively by Jury","SingVotesJSON","SingVotesTotal");
+    $(document).ready(function() {
+      append_all_to_country_votes();
+    }); 
+
+    window.addEventListener("resize", function() { append_all_to_country_votes() });
       </gsf:script>