From 24640d2d28ff2ba83016f27a270954e5b6925d79 Mon Sep 17 00:00:00 2001
From: Iain-S <25081046+Iain-S@users.noreply.github.com>
Date: Tue, 15 Aug 2023 14:46:02 +0100
Subject: [PATCH] Move JavaScript function to its own file

---
 rctab/static/scripts/download_table.js        |  1 +
 rctab/static/scripts/tab_functions.js         |  1 +
 rctab/static/scripts/tables.js                |  1 +
 .../signed_in_azure_info_details.html         | 35 ++++---------------
 4 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/rctab/static/scripts/download_table.js b/rctab/static/scripts/download_table.js
index 482fa50..36e90ad 100644
--- a/rctab/static/scripts/download_table.js
+++ b/rctab/static/scripts/download_table.js
@@ -1,3 +1,4 @@
+/*ToDo*/
 function download_table_as_csv(table_id, start_date, separator = ',') {
     // see https://stackoverflow.com/questions/15547198/export-html-table-to-csv-using-vanilla-javascript
     // Select rows from table_id
diff --git a/rctab/static/scripts/tab_functions.js b/rctab/static/scripts/tab_functions.js
index 8b7f978..549d433 100644
--- a/rctab/static/scripts/tab_functions.js
+++ b/rctab/static/scripts/tab_functions.js
@@ -1,3 +1,4 @@
+/*ToDo*/
 function openTab(evt, tabName) {
     // Show the selected tab (tabName). Set the selected tab to be the active
     // tab. The the selected tab will then be activated on page refresh.
diff --git a/rctab/static/scripts/tables.js b/rctab/static/scripts/tables.js
index ca19356..655a7ef 100644
--- a/rctab/static/scripts/tables.js
+++ b/rctab/static/scripts/tables.js
@@ -1,3 +1,4 @@
+/*ToDo*/
 $(document).ready( function () {
     // Only run on the main page
     if ($('#subscription_table_all').length > 0) {
diff --git a/rctab/templates/signed_in_azure_info_details.html b/rctab/templates/signed_in_azure_info_details.html
index 888dc28..6d5389b 100644
--- a/rctab/templates/signed_in_azure_info_details.html
+++ b/rctab/templates/signed_in_azure_info_details.html
@@ -1,29 +1,9 @@
-<script charset="utf-8" src="https://cdn.plot.ly/plotly-2.20.0.min.js"></script>
-<script type = "text/javascript">
-    async function fetchusagedata(event) {
-        const usageSubmitBtn = document.getElementById("usagesubmitbtn")
-        usageSubmitBtn.disabled=true;
-        const usageInfoForm = document.getElementById("usageinfoform")
-        const outDiv = document.getElementById("azureusageinfo")
-        const datestring = document.getElementById("timeperiodstr").value
-        const subscription_id = document.getElementById("subscription_id").innerText
-        outDiv.innerHTML = '<div class="search-overlay"><div class="loader"></div><div class="loader-text"><br><br>Loading data<br><br>This may take a few seconds or a few minutes depending on the length of time requested.</div></div>'
-        event.preventDefault();
-        await fetch("/process_usage/" + subscription_id + "?timeperiodstr=" + datestring, {
-            method: "GET",
-        })
-        .then(response => {
-            return response.text();
-        })
-        .then(html => {
-            $("#azureusageinfo").html(html)
-        })
-    usageSubmitBtn.disabled=false;
-    }
-</script>
-
-
 {% extends "signed_in_base.html" %}
+{% block head %}
+{{ super() }}
+<script charset="utf-8" src="https://cdn.plot.ly/plotly-2.20.0.min.js"></script>
+<script type="text/javascript" charset="utf8" src="{{ url_for('static', path ='scripts/usage_data.js') }}"></script>
+{% endblock %}
 
 {% block noaccess %}
 
@@ -36,7 +16,7 @@ <h2><span id="subscription_id" class="subID">{{ subscription_id }}</span></h2>
         <tr>
             <th class="tooltip">Expiry Date<span class="tooltiptext">Your subscription will expire on this date</span></th>
             <th>Status</th>
-            <th class="tooltip">Approved<span class="tooltiptext">Approved credits are ring fenced for your use but cannot be spent until they are allocated</span></th>
+            <th class="tooltip">Approved<span class="tooltiptext">Approved credits are ring-fenced for your use but cannot be spent until they are allocated</span></th>
             <th class="tooltip">Allocated<span class="tooltiptext">Allocated credits are available to spend. When usage is greater than allocated your account will be disabled</span></th>
             <th class="tooltip">Total Costs<span class="tooltiptext">Totals Costs are the total usage and purchase costs, including amortised costs of reservations</span></th>
             <th class="tooltip">Remaining<span class="tooltiptext">If this goes below £0.0 your subscription will be disabled</span></th>
@@ -54,7 +34,6 @@ <h2><span id="subscription_id" class="subID">{{ subscription_id }}</span></h2>
     </tbody>
 </table>
 
-
 <h3>Useful cost analysis views</h3>
 <p>
     The following links will take you to useful cost analysis views for this subscription.
@@ -225,7 +204,7 @@ <h3>Usage breakdown</h3>
         <form method="get" class="tooltip" id="usageinfoform">
         <label for="timeperiodstr">Start date</label>
         <input type="date" id="timeperiodstr" min="2015-03-01">
-        <input type="button" id="usagesubmitbtn" value="fetch data" onclick="fetchusagedata(event);">
+        <input type="button" id="usagesubmitbtn" value="fetch data" onclick="fetchUsageData(event);">
         <span class="tooltiptext">Load usage data since start date. This may take some time depending on the length of time requested.</span>
         </form>
     </div>