wip

Author: michaelwood

cove/cove_360/templates/cove_360/components/explore/summary.html

@@ -234,4 +234,47 @@ <h3  id="conversion-title">
 
       {% cove_modal_list className="unique-ids" modalTitle="Unique IDs" itemList=grants_aggregates.unique_ids %}
       {% cove_modal_list className="distinct-funding-org-identifier" modalTitle="Funder Organisation IDs" itemList=grants_aggregates.distinct_funding_org_identifier %}
-      {% cove_modal_list className="distinct-recipient-org-identifier" modalTitle="Recipient Organisation IDs" itemList=grants_aggregates.distinct_recipient_org_identifier %}
+      {% cove_modal_list className="distinct-recipient-org-identifier" modalTitle="Recipient Organisation IDs" itemList=grants_aggregates.distinct_recipient_org_identifier %}
+
+
+      <h3 class="panel-title panel-title-explore">
+        {% trans "Download data and share these results" %}
+      </h3>
+      <h4>Share</h4>
+        <p>{% trans "You can share these test results with others by using the following url:" %}</p>
+            <p><a href="{{current_url}}"> {{ current_url }}</a>
+            <button class="button button--small margin-left:1" onclick="navigator.clipboard.writeText('{{current_url}}'); this.innerHTML = 'Copied!';">Copy Link to Clipboard</button>
+            </p>
+            <p>{% trans "If your data is not suitable for sharing publicly, then you should treat this url with care. Only share it with people who have permission to access the data." %}</p>
+        <p>{% trans "After 7 days, the link will expire and the data will be deleted from our servers - so the results will no longer be available. You can revisit these results until then." %}</p>
+        <h4><span class="glyphicon glyphicon-download-alt"></span> Download</h4>
+        <p>{% trans "This application converts data in Excel and CSV format into JSON format, allowing you download the converted version." %}</p>
+        <p>{% trans "If your file is originally in JSON format select ‘Convert to Spreadsheet’ in the summary section to create an Excel version of the file." %}</p>
+        {% if not conversion_error and conversion != 'flattenable' %}
+          <p>{% trans "We provide the following formats to download:" %}</p>
+          <ul class="left-space">
+            {% if conversion == 'unflatten' %}
+            <li>
+              <a href="{{converted_url}}">{{JSON}} ({% trans converted %})</a> {{converted_file_size|filesizeformat}}
+            </li>
+            {% elif conversion == 'flatten' %}
+            <li>
+              <a href="{{converted_url}}-titles.xlsx">{{xlsx}} ({% trans converted %})</a> {{converted_file_size_titles|filesizeformat}}
+            </li>
+            <li class="list-unstyled">
+              <sub>{% trans "You can also download an" %}<a href="{{converted_url}}.xlsx"> {% trans "Excel Spreadsheet (.xlsx) with JSON field names" %}</a> {% trans "instead of titles as column headers" %} ({{converted_file_size|filesizeformat}})</sub>
+            </li>
+            {% endif %}
+          </ul>
+        {% else %}
+          <p>(No downloads available as the conversion hasn't happened, or has errored).</p>
+        {% endif %}
+        {% if user.is_authenticated %}
+            <h3 class="box__heading">Original file download for admin users</h2>
+            <p>Warning, this is the original file uploaded. Do not download if you don't trust whoever sent you a link to this page, it could contain a virus. Note that this box and this download link are only visible to admin users, not others you share this page with.</p>
+            <ul class="left-space">
+              <li>
+                <a href="{{original_file.url}}">{% trans "Original file" %} ({{file_type}})</a> {{original_file.size|filesizeformat}}
+              </li>
+            </ul>
+        {% endif %}

cove/cove_360/templates/cove_360/components/explore_checking.html

@@ -1,5 +1,16 @@
 {% load i18n %} {% load humanize %} {% load cove_tags %}
 
+{% trans 'Converted from Original' as converted %}
+{% trans 'Original' as original %}
+{% trans 'Excel Spreadsheet (.xlsx)' as xlsx %}
+{% trans 'OpenDocument Spreadsheet (.ods)' as ods %}
+{% trans 'CSV Spreadsheet (.csv)' as csv %}
+{% trans 'Excel Spreadsheet (.xlsx) with titles' as xlsx_titles %}
+{% trans 'OpenDocument Spreadsheet (.ods) with titles' as ods_titles %}
+{# Translators: JSON probably does not need a transalation: http://www.json.org/ #}
+{% trans 'JSON' as JSON %}
+{% trans 'XML' as XML %}
+
 <div
   class="margin-top:1 margin-bottom:2"
   style="display: flex; flex-direction: row; justify-content: end"
@@ -112,15 +123,5 @@ <h2 class="base-card__title">{{usefulness_checks_count }}</h2>
 <div class="spacer-4"></div>
 
 <script>
-  (function(){
-    /* If "?open-all=true" is passed show all tabs on the page at once */
-    const params = new URLSearchParams(window.location.search);
-
-    if (params.get("open-all")){
-      for (const tab of document.getElementsByClassName("tab-content")){
-        tab.removeAttribute("style");
-      }
-    }
 
-  })();
 </script>

cove/cove_360/templates/cove_360/components/explore_publishing.html

@@ -1,5 +1,16 @@
 {% load i18n %}
 
+{% trans 'Converted from Original' as converted %}
+{% trans 'Original' as original %}
+{% trans 'Excel Spreadsheet (.xlsx)' as xlsx %}
+{% trans 'OpenDocument Spreadsheet (.ods)' as ods %}
+{% trans 'CSV Spreadsheet (.csv)' as csv %}
+{% trans 'Excel Spreadsheet (.xlsx) with titles' as xlsx_titles %}
+{% trans 'OpenDocument Spreadsheet (.ods) with titles' as ods_titles %}
+{# Translators: JSON probably does not need a transalation: http://www.json.org/ #}
+{% trans 'JSON' as JSON %}
+{% trans 'XML' as XML %}
+
 <h3>{% trans "Submit your data" %}</h3>
 
 <div class="base-card base-card--red margin-bottom:2">

cove/cove_360/templates/cove_360/data_loading.html

@@ -27,30 +27,36 @@ <h2 class="heading-in-panel" >Data processing is in progress</h2>
 
 // Start the results processing if it returns in time
 // If it doesn't, it will fail silently and rely on the polling mechanism
-fetch(resultsUrl)
-  .then((response) => {
-    if (response.ok) {
+
+(async function(){
+
+try {
+  const response = await fetch(resultsUrl);
+  if (response.ok) {
+    window.location.href = resultsUrl;
+  } else {
+    throw Error(`Server has errored ${response.statusText}`);
+  }
+} catch (error) {
+  console.error("Error fetching results:", error);
+  window.location.href = resultsUrl;
+}
+
+})();
+
+
+async function updateStatus() {
+  try {
+    const response = await fetch(pollUrl);
+    const data = response.json();
+    if (data.done) {
+      clearInterval(poller);
       window.location.href = resultsUrl;
     }
-  })
-  .catch((error) => {
-    console.error("Error fetching results:", error);
-  });
-
-function updateStatus() {
-  fetch(pollUrl)
-    .then((response) => response.json())
-    .then((data) => {
-      if (data.done) {
-        clearInterval(poller);
-        window.location.href = resultsUrl;
-      }
-      console.log(data);
-    })
-    .catch((error) => {
+  } catch {
       console.error("Error updating status:", error);
       window.location.href = resultsUrl;
-    });
+  }
 }
 
 const poller = setInterval(updateStatus, 5000);

cove/cove_360/tests_functional.py

@@ -71,33 +71,34 @@ def server_url(request, live_server):
                                                   'Unique grant identifiers:  2',
                                                   'Unique funder organisation identifiers:  1',
                                                   '360G-fundingproviders-000002/X/00/X'], True),
-    ('fundingproviders-grants_broken_grants.json', ['data does not use the 360Giving Data Standard correctly (15 Errors)',
-                                                 'Check your data 4 Grants',
+    ('fundingproviders-grants_broken_grants.json', ['data does not use the 360Giving Data Standard correctly',
+                                                    '15 Errors',
                                                  'Unique funder organisation identifiers:  2',
                                                  'Unique recipient organisation identifiers:  2',
                                                  '360G-fundingproviders-000002/X/00/X'], True),
-    ('fundingproviders-grants_2_grants.xlsx', ['Data about 1 funder',
+    ('fundingproviders-grants_2_grants.xlsx', ['1 funding organisation',
                                             'There are 2 grants to 1 recipient organisation and 0 to recipient individuals',
                                             'The grants were awarded in GBP with a total value of £331,495',
                                             # check that there's no errors after the heading
                                             'Data conversion successful\nBefore checking',
-                                            'data does not use the 360Giving Data Standard correctly (7 Errors)',
+                                            'data does not use the 360Giving Data Standard correctly',
+                                            '7 Errors',
                                             'description is missing but required',
                                             'Sheet: grants Row: 2',
-                                            'Check your data 2 Grants',
                                             'Unique funder organisation identifiers:  1',
                                             'Unique recipient organisation identifiers:  1',
                                             '360G-fundingproviders-000002/X/00/X'], True),
     # Test conversion warnings are shown
     ('tenders_releases_2_releases.xlsx', ['Data conversion unsuccessful - 5 Errors have been found',
-                                          'data does not use the 360Giving Data Standard correctly (76 Errors)',
+                                          'data does not use the 360Giving Data Standard correctly',
+                                          '76 Errors',
                                           'You may have a duplicate Identifier: We couldn\'t merge these rows with the id "1": field "ocid" in sheet "items": one cell has the value: "PW-14-00627094", the other cell has the value: "PW-14-00629344"'
                                           ], True),
     # Test that titles that aren't in the rollup are converted correctly
     # (See @check_url_input_result_page).
     ('fundingproviders-grants_2_grants_titleswithoutrollup.xlsx', [], True),
     # Test a 360 csv in cp1252 encoding
-    ('fundingproviders-grants_2_grants_cp1252.csv', ['Data about 1 funder',
+    ('fundingproviders-grants_2_grants_cp1252.csv', ['1 funding organisation',
                                                   'There are 2 grants to 1 recipient organisation and 0 to recipient individuals',
                                                   'The grants were awarded in GBP with a total value of £331,495',
                                                   'This file is not \'utf-8\' encoded (it is cp1252 encoded)'], True),
@@ -214,8 +215,6 @@ def test_explore_360_url_input(server_url, browser, httpserver, source_filename,
     browser.find_element_by_class_name("cookie-consent-no").click()
 
     # Do the assertions
-
-    a = input()
     check_url_input_result_page(server_url, browser, httpserver, source_filename, expected_text, conversion_successful, authed)
 
 
@@ -232,9 +231,6 @@ def check_url_input_result_page(server_url, browser, httpserver, source_filename
     if source_filename == 'validation_errors-3.json':
         assert 'UNSAFE' not in body_text
 
-    assert 'Data Quality Tool' in browser.find_element_by_class_name('title360').text
-    assert '360Giving' in browser.find_element_by_tag_name('body').text
-
     if conversion_successful:
         if source_filename.endswith('.json'):
             if authed:
@@ -260,9 +256,6 @@ def check_url_input_result_page(server_url, browser, httpserver, source_filename
             converted_file = browser.find_element_by_link_text("JSON (Converted from Original)").get_attribute("href")
             assert "unflattened.json" in browser.find_element_by_link_text("JSON (Converted from Original)").get_attribute("href")
 
-        # Test for Load New File button
-        assert 'Load New File' in body_text
-
         if authed:
             assert 'Note that this box and this download link are only visible to admin users' in body_text