Changeset 35123 for main

Timestamp:

2021-04-27T14:04:33+12:00 (3 years ago)

Author:

davidb

Message:

Upgrade of graphic quality used to show pick a random song

Location:

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

Files:

• js/eurovision.js (modified) (1 diff)
• transform/pages/about.xsl (modified) (2 diffs)

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

@@ -454 +454 @@
     append_from_country_votes(gs.documentMetadata["FromCountryType"]);
 }
+
+
+function display_random_entrant(json_data)
+{    
+    var rand_result = json_data.results.bindings[0];
+    var esc_entrant_uri = rand_result.esc_entrant_uri.value;
+    var country         = rand_result.country.value;
+    var year            = rand_result.year.value;
+    var flag_img        = rand_result.flag_img.value;
+    $('#select-random-entrant-a').attr("href",esc_entrant_uri);
+    $('#select-random-entrant-span').html(flag_img + " " + country + " " + year);
+
+    $('#select-random-entrant-item').slideDown(400, function() {
+    $("#select-random-entrant-div button").css("cursor", "pointer");
+    $("#select-random-entrant-div a").css("cursor", "pointer");
+    $("#select-random-entrant-div").css("cursor", "default");
+    });
+
+    
+}
+
+
+function cycle_display_random_entrant(json_data)
+{
+    console.log('cycle-random_entrant');
+    
+    if ($('#select-random-entrant-ul').is(":visible")) {
+    $('#select-random-entrant-item').slideUp(400, function() {
+        display_random_entrant(json_data);
+    });
+    }
+    else {
+    console.log('show for the first time');
+    $('#select-random-entrant-ul').show();
+    display_random_entrant(json_data);
+    }
+}
+
+function ajaxpick_random_entrant() {
+
+    var endpoint_url="//sowemustthink.space/greenstone3-lod3/greenstone/query";
+    var sparql_query = $('#select-random-entrant-sparqlquery').text();
+
+    $("#select-random-entrant-div").css("cursor", "progress");
+    $("#select-random-entrant-div a").css("cursor", "progress");
+    $("#select-random-entrant-div button").css("cursor", "progress");
+    
+    $.ajax({
+    type: "POST",
+    url: endpoint_url,
+    data: { query: sparql_query, output: "json" },
+    success: cycle_display_random_entrant,
+    dataType: "json"
+    });
+}

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

@@ -172 +172 @@
 PREFIX gsdlextracted: <http://greenstone.org/gsdlextracted#>
 
-SELECT ?random ?esc_entrant_uri ?country ?year WHERE {
+SELECT ?random ?esc_entrant_uri ?country ?year ?flag_img WHERE {
   GRAPH &lt;<xsl:value-of select="$graphURI"/>&gt;  {
     ?esc_entrant_uri gsdlextracted:Year ?year.
     ?esc_entrant_uri gsdlextracted:Country ?country.
+    ?esc_entrant_uri gsdlextracted:FlagImg ?flag_img.
     BIND(SHA512(CONCAT(STR(RAND()), STR(?esc_entrant_uri))) AS ?random).
   }
@@ -181 +182 @@
 ORDER BY ?random
       </div>
-      <div id="select-random-entrant-div" style="display: none;">
-        Or how about picking a song ...
-        <ul>
-          <li><a id="select-random-entrant-a">... at random</a></li>
+      <div id="select-random-entrant-div" >
+        Or how about picking a song at random:
+        <ul id="select-random-entrant-ul" style="display: none;">
+          <li>
+        <div id="select-random-entrant-item" style="display: none;">
+          <a id="select-random-entrant-a">
+            <span id="select-random-entrant-span" style="display: inline-block; padding: 6px;"></span>
+          </a>
+          <span class="page ssq" style="margin-left: 6px;">
+            <button type="button" onclick="ajaxpick_random_entrant()">Pick again</button>
+          </span>
+        </div>
+          </li>
         </ul>
       </div>
       <gsf:script>
-        $(document).ready(function() {
-          var endpoint_url="//sowemustthink.space/greenstone3-lod3/greenstone/query";
-          var sparql_query = $('#select-random-entrant-sparqlquery').text();
-          $.ajax({
-            type: "POST",
-            url: endpoint_url,
-            data: { query: sparql_query, output: "json" },
-            success: function(json_data) {
-          var rand_result = json_data.results.bindings[0];
-          var esc_entrant_uri = rand_result.esc_entrant_uri.value;
-          $('#select-random-entrant-a').attr("href",esc_entrant_uri);
-          $('#select-random-entrant-div').show();
-        },
-            dataType: "json"
-          });
-        });
+        $(document).ready(function() { ajaxpick_random_entrant() });
       </gsf:script>