Changeset 36960

Timestamp:

2022-11-29T23:24:08+13:00 (17 months ago)

Author:

davidb

Message:

Clicking on the AV chart now initiates a new AV Recommendation

Location:

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

Files:

• etc/collectionConfig.xml (modified) (2 diffs)
• js/av_document.js (modified) (3 diffs)

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

@@ -689 +689 @@
             <div id="recommendationArea">
                 
-              <form action="{$library_name}" method="get" name="QueryForm">
+              <form id="av-query-form" action="{$library_name}" method="get" name="QueryForm">
                 <input name="a" type="hidden" value="q"/>
                 <input name="sa" type="hidden">
@@ -759 +759 @@
               <div>
                 <div id="av-chart-div" style="height: 265px; width: 250px; float: right; display: none;">
-                  <img id="av-chart-img" width="250" src="{$library_name}/sites/{$site_name}/collect/{$collName}/images/av-diagram-bw.svg" />
+                  <img id="av-chart-img" width="250"
+                   style="cursor: crosshair; background-colorXX: #fefefe;"
+                   src="{$library_name}/sites/{$site_name}/collect/{$collName}/images/av-diagram-bw.svg" />
                   <div>
                 <i>Or click inside the Arousal-Valence visualisation above to initiate a new AV-based recommendation.</i>

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

@@ -84 +84 @@
     var arousal_val = parseFloat($('#arousal-val').text());
     var valence_val = parseFloat($('#valence-val').text());
-    
+
+    $('#makeRecommendationFrom-AV').html(`(@${current_time_1dp} secs: arousal=${arousal_val}, valence=${valence_val})`);
+
+    return submitAVRecommendation(form, arousal_val,valence_val, current_time);
+}
+
+function submitAVRecommendation(form, arousal_val,valence_val, current_time)
+{
     form.elements["s1.arousal"].value = arousal_val;
     form.elements["s1.valence"].value = valence_val;
-
-    $('#makeRecommendationFrom-AV').html(`(@${current_time_1dp} secs: arousal=${arousal_val}, valence=${valence_val})`);
-    
+        
     var args = {
     "a":  "q",
@@ -129 +134 @@
         $('#resultsAreaDiv').html("<div>Recommendations:</div>"+html_result);
         $('#av-chart-div').show();
-        
-        const updated_url = new URL(window.location);
-        updated_url.searchParams.set('p.frameOffset', current_time);
-        //window.history.pushState({}, '', url + "?p.frameOffset=" + current_time);
-        //window.history.pushState({}, '', updated_url);
-        window.history.replaceState({}, '', updated_url);
-
-        
+
+        if (current_time) {
+        const updated_url = new URL(window.location);
+        updated_url.searchParams.set('p.frameOffset', current_time);
+        //window.history.pushState({}, '', url + "?p.frameOffset=" + current_time);
+        //window.history.pushState({}, '', updated_url);
+        window.history.replaceState({}, '', updated_url);
+        }
     });
     
@@ -273 +278 @@
 
     console.log(`av x,y: (${capped_av_x},${capped_av_y})`);
+
+    var form = $('#av-query-form')[0];
+    
+    submitAVRecommendation(form, capped_av_x, capped_av_y, null);
     
 }