From bfd7c75bb1ba67dfec726585bf8b679948c7e235 Mon Sep 17 00:00:00 2001
From: Kipchirchir Sigei <arapgodsmack@gmail.com>
Date: Mon, 6 Dec 2021 12:05:27 +0300
Subject: [PATCH 1/2] Remove data tables export buttom from report views

Signed-off-by: Kipchirchir Sigei <arapgodsmack@gmail.com>
---
 tally_ho/apps/tally/static/js/data_table.js | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/tally_ho/apps/tally/static/js/data_table.js b/tally_ho/apps/tally/static/js/data_table.js
index 8c8726fcd..6ef5b80d3 100644
--- a/tally_ho/apps/tally/static/js/data_table.js
+++ b/tally_ho/apps/tally/static/js/data_table.js
@@ -48,19 +48,10 @@ $(document).ready(function () {
     stateSave: true,
     ajax: LIST_JSON_URL,
     dom:
-      "<'row'<'col-sm-1'B><'col-sm-6'l><'col-sm-5'f>>" +
+      "<'row'<'col-sm-6'l><'col-sm-6'f>>" +
       "<'row'<'col-sm-12'tr>>" +
       "<'row'<'col-sm-5'i><'col-sm-7'p>>",
-    buttons: [
-      {
-        extend: "csv",
-        filename: exportFileName,
-        action: exportAction,
-        exportOptions: {
-          columns: ':visible :not(.hide-from-export)',
-        },
-      },
-    ],
+    buttons: [],
     select: {
       style: "multi",
     },

From eb8eef91297ed6fdcd16294fbe4d4bc1dddda698 Mon Sep 17 00:00:00 2001
From: Kipchirchir Sigei <arapgodsmack@gmail.com>
Date: Mon, 6 Dec 2021 12:06:29 +0300
Subject: [PATCH 2/2] Display report list views and update report export links

Signed-off-by: Kipchirchir Sigei <arapgodsmack@gmail.com>
---
 .../reports/candidates_votes_report.html         | 10 +++++++++-
 .../templates/reports/duplicate_results.html     |  6 +++++-
 .../tally/templates/reports/form_results.html    |  6 +++++-
 .../templates/super_admin/result_export.html     | 16 ++++------------
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/tally_ho/apps/tally/templates/reports/candidates_votes_report.html b/tally_ho/apps/tally/templates/reports/candidates_votes_report.html
index bd622e794..8ce7481ae 100644
--- a/tally_ho/apps/tally/templates/reports/candidates_votes_report.html
+++ b/tally_ho/apps/tally/templates/reports/candidates_votes_report.html
@@ -18,7 +18,15 @@
 
 <h1>{{ title }}</h1>
 <br>
-
+<div class="row">
+  <div class="col-sm-4">
+    {% if 'Active' in title %}
+    <a href="{% url 'result-export' tally_id=tally_id report='active-candidates' %}">{% trans 'Download Active Candidate Votes' %}</a>
+    {% else %}
+    <a href="{% url 'result-export' tally_id=tally_id report='all-candidates' %}">{% trans 'Download All Candidate Votes' %}</a>
+    {% endif %}
+  </div>
+</div>
 <table class="display datatable results">
   <caption style="margin-top: 2em; margin-left: -0.5em">
     <div id="report" class="row">
diff --git a/tally_ho/apps/tally/templates/reports/duplicate_results.html b/tally_ho/apps/tally/templates/reports/duplicate_results.html
index 556970e3e..f359cc4aa 100644
--- a/tally_ho/apps/tally/templates/reports/duplicate_results.html
+++ b/tally_ho/apps/tally/templates/reports/duplicate_results.html
@@ -18,7 +18,11 @@
 
 <h1>{% trans 'Result Forms with Duplicate Results' %}</h1>
 <br>
-
+<div class="row">
+  <div class="col-sm-5">
+    <a href="{% url 'result-export' tally_id=tally_id report='duplicates' %}">{% trans 'Download Result Forms With Duplicate Results' %}</a>
+  </div>
+</div>
 <table class="display datatable results">
   <caption style="margin-top: 2em; margin-left: -0.5em">
     <div id="report" class="row">
diff --git a/tally_ho/apps/tally/templates/reports/form_results.html b/tally_ho/apps/tally/templates/reports/form_results.html
index 65b7dc035..311a27f05 100644
--- a/tally_ho/apps/tally/templates/reports/form_results.html
+++ b/tally_ho/apps/tally/templates/reports/form_results.html
@@ -18,7 +18,11 @@
 
 <h1>{% trans 'Form Results' %}</h1>
 <br>
-
+<div class="row">
+  <div class="col-sm-4">
+    <a href="{% url 'result-export' tally_id=tally_id report='formresults' %}">{% trans 'Download Form List' %}</a>
+  </div>
+</div>
 <table class="display datatable results">
   <caption style="margin-top: 2em; margin-left: -0.5em; margin-bottom: 2em;">
     <div id="report" class="row">
diff --git a/tally_ho/apps/tally/templates/super_admin/result_export.html b/tally_ho/apps/tally/templates/super_admin/result_export.html
index e7c12f877..4de9c07b2 100644
--- a/tally_ho/apps/tally/templates/super_admin/result_export.html
+++ b/tally_ho/apps/tally/templates/super_admin/result_export.html
@@ -5,19 +5,11 @@
 {% block content %}
 
 <h1>{% trans 'Downloads' %}</h1>
-<!-- TODO: uncomment after figuring out how these reports can be used on the hnec public site -->
-<!-- <ul>
-    <li><a href="{% url 'form-results' tally_id=tally_id %}">{% trans 'Result Form List' %}</a></li>
-    <li><a href="{% url 'all-candidates-votes' tally_id=tally_id %}">{% trans 'All Candidate Votes' %}</a></li>
-    <li><a href="{% url 'active-candidates-votes' tally_id=tally_id %}">{% trans 'Active Candidate Votes' %}</a></li>
-    <li><a href="{% url 'result-forms-with-duplicate-results' tally_id=tally_id %}">{% trans 'Result Forms With Duplicate Results' %}</a></li>
-</ul> -->
-
 <ul>
-    <li><a href="{% url 'result-export' tally_id=tally_id report='formresults' %}">{% trans 'Result Form List' %}</a></li>
-    <li><a href="{% url 'result-export' tally_id=tally_id report='all-candidates' %}">{% trans 'All Candidate Votes' %}</a></li>
-    <li><a href="{% url 'result-export' tally_id=tally_id report='active-candidates' %}">{% trans 'Active Candidate Votes' %}</a></li>
-    <li><a href="{% url 'result-export' tally_id=tally_id report='duplicates' %}">{% trans 'Result Forms With Duplicate Results' %}</a></li>
+  <li><a href="{% url 'form-results' tally_id=tally_id %}">{% trans 'Result Form List' %}</a></li>
+  <li><a href="{% url 'all-candidates-votes' tally_id=tally_id %}">{% trans 'All Candidate Votes' %}</a></li>
+  <li><a href="{% url 'active-candidates-votes' tally_id=tally_id %}">{% trans 'Active Candidate Votes' %}</a></li>
+  <li><a href="{% url 'result-forms-with-duplicate-results' tally_id=tally_id %}">{% trans 'Result Forms With Duplicate Results' %}</a></li>
 </ul>
 
 {% endblock %}