Changeset 34893

Timestamp:

2021-02-16T23:43:20+13:00 (3 years ago)

Author:

davidb

Message:

Voting totals added in

Location:

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

Files:

• etc/collectionConfig.xml (modified) (2 diffs)
• js/eurovision.js (modified) (2 diffs)
• prepare/voting-excel/xlsx-to-jsonmetadata.py (modified) (2 diffs)
• transform/pages/document.xsl (modified) (1 diff)

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/etc/collectionConfig.xml

@@ -144 +144 @@
     </format>
   </search>
-
+<!--
   <search type="jenaTDB" orthogonal="true"/>
-  
+-->  
 
   <infodb type="jdbm"/>
@@ -453 +453 @@
     <gsf:metadata name="JuryVotesJSON" />
     <gsf:metadata name="TeleVotesJSON" />
-    
+    <gsf:metadata name="JuryVotesTotal" />
+    <gsf:metadata name="TeleVotesTotal" />
+
     <gsf:metadata name="Albania-J" />
     <gsf:metadata name="Andorra-J" />

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

@@ -1 +1 @@
 
-function append_from_country_votes(vote_label, votes_json_type)
+function append_from_country_votes(vote_label, votes_json_type, votes_type_total)
 {
     // TODO
@@ -7 +7 @@
     if (gs.documentMetadata[votes_json_type]) {
     var $vote_div = $('<div>').attr("class","voting-label").append(vote_label);
+    $vote_div.append(" (Total: " + gs.documentMetadata[votes_type_total] + ")");
     $('#from-country-votes').append($vote_div);
     

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/voting-excel/xlsx-to-jsonmetadata.py

@@ -56 +56 @@
     #
     # for data_hashmap in data_hashmap_array_finals:
-    #    print data_hashmap.get('To country'), data_hashmap.get('Year'), data_hashmap.get('Points'), "(Points from " + data_hashmap.get('From country') + ")"
+    #    print(data_hashmap.get('To country'), data_hashmap.get('Year'), data_hashmap.get('Points'), "(Points from " + data_hashmap.get('From country') + ")")
 
 
@@ -191 +191 @@
     # Debug output
     #
-    # print to_country_year_voting_groups
-    
-    # Next step is to express the grouped by-country voting data
+    # print(to_country_year_voting_groups)
+    
+    # Next step is to express the grouped to-country voting data
     # in the Greenstone JSON metadata format:
     

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

@@ -132 +132 @@
     <div id="from-country-votes">
       <gsf:script>
-    append_from_country_votes("Jury Votes","JuryVotesJSON");
-    append_from_country_votes("Televotes","TeleVotesJSON");
+    append_from_country_votes("Jury Votes","JuryVotesJSON","JuryVotesTotal");
+    append_from_country_votes("Televotes","TeleVotesJSON","TeleVotesTotal");
       </gsf:script>