Changeset 35118

Timestamp:

2021-04-24T15:14:43+12:00 (3 years ago)

Author:

davidb

Message:

More nuanced display for Jury/Tele/Combined/Split voting

File:

• main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/etc/collectionConfig.xml (modified) (4 diffs)

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

@@ -332 +332 @@
       <option name="-maxcompact" value="13"/>
       -->
+      <!--
       <option name="-maxcompact" value="16"/>
-
+      -->
+      
       <option name="-sort" value="Title"/>
 
@@ -446 +448 @@
 
           <gsf:switch>
-        <gsf:metadata name='FromCountryType'/>  
+        <gsf:metadata name='FromCountryNuancedType'/>   
         <gsf:when test="equals" test-value="J">
           (Jury)
@@ -453 +455 @@
           (Televotes)
         </gsf:when>
+        <gsf:when test="equals" test-value="C">
+          (Combined Jury and Televotes)
+        </gsf:when>
         <gsf:otherwise>
-          (Separate Jury and Televotes Added Together)
+
+          <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>
@@ -602 +620 @@
     <gsf:metadata name="FromCountry"/>
     <gsf:metadata name="FromCountryType"/>
+    <gsf:metadata name="FromCountryVoteMode"/>
+    <gsf:metadata name="FromCountryNuancedType"/>
     <gsf:metadata name="FromCountryYear"/>