Changeset 36966

Timestamp:

2022-12-01T00:07:09+13:00 (17 months ago)

Author:

davidb

Message:

Dyanmic document load to upate metadata anv playervisual added

Location:

gs3-installations/mars/trunk/sites/mars/collect/amc-essentia

Files:

• etc/collectionConfig.xml (modified) (5 diffs)
• js/av_document.js (modified) (6 diffs)

gs3-installations/mars/trunk/sites/mars/collect/amc-essentia/etc/collectionConfig.xml

@@ -550 +550 @@
               <gsf:script src="{$httpCollection}/js/av_document.js"/>
 
-              <div class="documenttext" style="padding-bottom: 20px; width:100%;">
+              <div id="metadata-documenttext" class="documenttext" style="padding-bottom: 20px; width:100%;">
                 <style>
                   .doc-metadata td { padding: 7px; }
@@ -585 +585 @@
 
               
-              <div class="documenttext" style="position: relative;">
+              <div id="playervisual-documenttext" class="documenttext" style="position: relative;">
+                <div id="ajax-loaded-assocfilepath" style="display: none;"><gsf:metadata name="assocfilepath" pos="first"/></div>
+
                 
                 <div style="position: absolute; right: 24px; top: -18px; z-index: 1000; font-size: 90%; font-style:italic">
@@ -676 +678 @@
     <gsf:script>
       //var currentPosIsZero = true;
-
-
       
       document.addEventListener('DOMContentLoaded', function() {
@@ -715 +715 @@
                   </xsl:when>
                   <xsl:otherwise>
-                <input name="s1.maxDocs" type="hidden" value="3"/>
+                <input name="s1.maxDocs" type="hidden" value="5"/>
                   </xsl:otherwise>
                 </xsl:choose>
@@ -727 +727 @@
                   </xsl:when>
                   <xsl:otherwise>
-                <input name="s1.hitsPerPage" type="hidden" value="3"/>
+                <input name="s1.hitsPerPage" type="hidden" value="5"/>
                   </xsl:otherwise>
                 </xsl:choose>

gs3-installations/mars/trunk/sites/mars/collect/amc-essentia/js/av_document.js

@@ -130 +130 @@
     var av_cluster_y_delta = Math.abs(min_valence_val - max_valence_val)/2.0;
 
-    var av_cluster_rad = Math.max(Math.max(av_cluster_x_delta,av_cluster_y_delta),3.0);
-    
+    //var av_cluster_rad = Math.max(Math.max(av_cluster_x_delta,av_cluster_y_delta),3.0);
+
+    var av_cluster_rad   = Math.max(av_cluster_x_delta,av_cluster_y_delta);
+    var disp_cluster_coord = av_to_display_coord(av_cluster_rad,av_cluster_rad);
+    var disp_cluster_rad = disp_cluster_coord.x - av_chart_disp_x_mid; // **** **** ????
+    var disp_cluster_rad_maxed = Math.max(disp_cluster_rad,3.0);
+
     var disp_coord = av_to_display_coord(av_cluster_x_org,av_cluster_y_org);
     var disp_x = disp_coord.x;
@@ -139 +144 @@
     
     var ctx = av_chart_canvas.getContext("2d");
+    ctx.clearRect(0, 0, av_chart_canvas.width, av_chart_canvas.height);
     ctx.beginPath();
-    ctx.arc(disp_x/2, disp_y/2, av_cluster_rad/2, 0, 2*Math.PI, false);
+    ctx.arc(disp_x/2, disp_y/2, disp_cluster_rad_maxed/2, 0, 2*Math.PI, false);
     ctx.fillStyle = 'rgba(50,50,128,0.5)';
     ctx.fill();
@@ -147 +153 @@
     ctx.stroke();
     
+}
+
+function ajaxUpdateDocumentDisplayed()
+{
+    var $resultsTable = $('#resultsTable');
+
+    var $resultsTable_trs = $resultsTable.find('tr');
+
+    if ($resultsTable_trs.length>0) {
+    var $resultsTable_tr1 = $resultsTable_trs.first();
+    var div_doc_id = $resultsTable_tr1.attr('id')
+    var doc_id = div_doc_id.substring(3);
+    
+    console.log("first AV recommendation doc id = " + doc_id);
+
+    var $av_recommendation = $resultsTable_tr1.find('.AVRecommendation').first();
+
+    var new_doc_url = $av_recommendation.attr('href');
+    var new_doc_url_parts = new_doc_url.split("#");
+
+    var new_doc_metadata_url     = new_doc_url_parts[0] + "&excerptid=metadata-documenttext#" + new_doc_url_parts[1];
+    var new_doc_playervisual_url = new_doc_url_parts[0] + "&excerptid=playervisual-documenttext#" + new_doc_url_parts[1];
+
+    console.log("new doc metadata url = " + new_doc_metadata_url);
+    console.log("new doc playervisual url = " + new_doc_playervisual_url);
+
+    $.ajax({
+        method: "GET",
+        url: new_doc_metadata_url,
+    })
+        .fail(function(jqXHR,textStatus) {
+        console.error( "metadata-documenttext ajax request failed: " + textStatus);
+        })
+        .done(function(html_result) {
+        $('#metadata-documenttext').replaceWith(html_result);
+        });
+
+    
+    $.ajax({
+        method: "GET",
+        url: new_doc_playervisual_url,
+    })
+        .fail(function(jqXHR,textStatus) {
+        console.error( "playervisual-documenttext equest failed: " + textStatus);
+        })
+        .done(function(html_result) {
+        // current URL ends with  collect/amc-essentia/document/ds_51017_15513?p.frameOffset=...
+        // Need to remove old '/document/ds_...' and replace with new doc
+        
+        const current_doc_url_str = window.location.href;
+
+        console.log(current_doc_url_str);
+        var new_doc_url_str = current_doc_url_str.replace(/document\/\w+\?/,"document/"+doc_id+"?");
+        console.log("new doc url str = " + new_doc_url_str);
+        const new_doc_url = new URL(new_doc_url_str);
+        
+        var frameOffset = $av_recommendation.data("frameoffset");       
+        new_doc_url.searchParams.set('p.frameOffset', frameOffset);
+        new_doc_url.searchParams.set('d', doc_id);      
+        window.history.pushState({}, '', new_doc_url);
+        //window.history.replaceState({}, '', new_doc_url);
+        
+        $('#playervisual-documenttext').replaceWith(html_result);
+
+        gs.cgiParams['p_frameOffset'] = frameOffset;
+        gs.documentMetadata["assocfilepath"] = $('#ajax-loaded-assocfilepath').text();
+        
+        initPlayerVisual();
+        initWavesurferPlayer();
+
+        postInitWavesurfer(wavesurfer);
+
+        
+        });
+
+    
+    
+    
+    //var arousal_val = $av_recommendation.data("arousalval");
+    //var valence_val = $av_recommendation.data("valenceval");
+
+    
+    }
+
 }
 
@@ -203 +293 @@
         window.history.replaceState({}, '', updated_url);
         }
+        else {
+        // The result of a click on the AV-chart
+        ajaxUpdateDocumentDisplayed();
+        }
     });
     
@@ -382 +476 @@
 }
 
-$(document).ready(function() {
+function initPlayerVisual() {
 
     const doc_url = new URL(window.location);
@@ -406 +500 @@
     $('#av-timelinebar-help').show();   
     }
-
+}
+
+$(document).ready(function() {
+
+    initPlayerVisual();
+    
     $('#av-chart-img').on("click",function(e) { av_chart_click(this,e) } );
 });