From 3c5ad4991fb45d01b5a0f37c8a62d34593bae005 Mon Sep 17 00:00:00 2001
From: drieJac <jac.drie@digitalteam.uk>
Date: Wed, 6 Nov 2024 12:40:12 +0000
Subject: [PATCH 1/3] Removed text Add new text at the top of the page Enable
 users to select their chosen fields first, then click a button to produce the
 report onscreen Include as default (already selected) fields: Candidate
 reference number, Full name, Application status Remove/hide the Save report
 button Add a Generate report button to the left of the Download report button
 Set the report to include records with the Applied status ONLY Remove the
 Application status and Stage filters from the screen Users should still be
 able to reorder columns as in the existing report

---
 src/views/Exercise/Reports/Custom.vue | 84 +++++----------------------
 1 file changed, 15 insertions(+), 69 deletions(-)

diff --git a/src/views/Exercise/Reports/Custom.vue b/src/views/Exercise/Reports/Custom.vue
index 0e03ae0d7..c240dd320 100644
--- a/src/views/Exercise/Reports/Custom.vue
+++ b/src/views/Exercise/Reports/Custom.vue
@@ -40,9 +40,10 @@
               </select>
               <button
                 class="govuk-button govuk-button--primary moj-button-menu__item moj-page-header-actions__action"
-                @click="openModal('modalRefSaveReport')"
+                :disabled="isLoading || columns.length === 0"
+                @click="generateReport"
               >
-                Save Report
+                Generate Report
               </button>
               <button
                 class="govuk-button govuk-button--primary moj-button-menu__item moj-page-header-actions__action"
@@ -61,7 +62,8 @@
       />
       <div class="govuk-inset-text govuk-!-margin-bottom-7">
         <p class="govuk-body">
-          This report is experimental. Please provide feedback if something doesn't look right.
+          <!-- This report is experimental. Please provide feedback if something doesn't look right. -->
+          Choose the fields you wish to include in your custom report from the dropdown below and then click 'generate' to produce your report on screen. Only candidates with the status 'Applied' will be included in the report.<br>Download the report when you are satisfied with the content.
         </p>
       </div>
       <div class="govuk-grid-row">
@@ -137,67 +139,9 @@
         </div>
       </div>
 
-      <div class="govuk-grid-row govuk-!-margin-top-3 govuk-!-margin-bottom-3">
-        <div class="govuk-grid-column-one-third">
-          <h2>Application status</h2>
-          <CheckboxGroup
-            id="select-status"
-            v-model="statuses"
-            label=""
-          >
-            <CheckboxItem
-              v-for="(status) in STATUS"
-              :key="status"
-              :value="status"
-              :label="$filters.lookup(status)"
-            />
-          </CheckboxGroup>
-        </div>
-
-        <div class="govuk-grid-column-two-thirds">
-          <h2>Stage</h2>
-          <div class="govuk-button-group">
-            <select
-              v-model="selectedStage"
-              class="govuk-select"
-            >
-              <option value="all">
-                All
-              </option>
-              <option
-                v-for="stage in availableStages"
-                :key="stage"
-                :value="stage"
-              >
-                {{ $filters.lookup(stage) }} ({{ $filters.formatNumber(applicationRecordCounts[stage]) }})
-              </option>
-            </select>
-          </div>
-          <div class="govuk-button-group">
-            <select
-              v-if="availableStatuses && availableStatuses.length > 0"
-              v-model="selectedStageStatus"
-              class="govuk-select"
-            >
-              <option
-                value="all"
-              >
-                All
-              </option>
-              <option
-                v-for="item in availableStatuses"
-                :key="item"
-                :value="item"
-              >
-                {{ $filters.lookup(item) }}
-              </option>
-            </select>
-          </div>
-        </div>
-      </div>
-
       <div
         v-if="columns.length > 0"
+        id="column-list"
         class="panel govuk-!-margin-bottom-3"
       >
         <h2 class="govuk-!-margin-bottom-0 govuk-!-margin-top-0">
@@ -416,7 +360,7 @@ export default {
       customReportName: null,
       selectedColumn: '',
       whereClauses: [],
-      columns: [],
+      columns: ['referenceNumber', 'personalDetails.fullName', 'status'],
       warnings: '',
       warningTimeout: null,
       groups: [
@@ -692,12 +636,6 @@ export default {
       },
       deep: true,
     },
-    columns: {
-      handler: function() {
-        this.getApplicationRecords();
-      },
-      deep: true,
-    },
     type: {
       handler: function() {
         this.getApplicationRecords();
@@ -812,6 +750,14 @@ export default {
       this.columns = report.columns;
       this.whereClauses = report.whereClauses;
     },
+    generateReport() {
+      this.getApplicationRecords();
+      // Scroll to the list of columns
+      const element = document.querySelector('#column-list'); // Replace with the actual element selector
+      if (element) {
+        element.scrollIntoView({ behavior: 'smooth', block: 'start' });
+      }
+    },
     downloadReport() {
       const header = [...this.columns].map(col => this.keys[col].label);
       const csv = [[...header]];

From 04d2fb3fde23ab8927c2adb00ffb3f9b4d50df0c Mon Sep 17 00:00:00 2001
From: drieJac <jac.drie@digitalteam.uk>
Date: Wed, 6 Nov 2024 12:53:16 +0000
Subject: [PATCH 2/3] Ensure download report button doesnt display when no
 columns

---
 src/views/Exercise/Reports/Custom.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Exercise/Reports/Custom.vue b/src/views/Exercise/Reports/Custom.vue
index c240dd320..7e52b0711 100644
--- a/src/views/Exercise/Reports/Custom.vue
+++ b/src/views/Exercise/Reports/Custom.vue
@@ -47,7 +47,7 @@
               </button>
               <button
                 class="govuk-button govuk-button--primary moj-button-menu__item moj-page-header-actions__action"
-                :disabled="isLoading || !data"
+                :disabled="isLoading || !data || columns.length === 0"
                 @click="downloadReport"
               >
                 Download Report

From 8257b8b1f2bd868c189eaddfac12732d6a65b7b7 Mon Sep 17 00:00:00 2001
From: drieJac <jac.drie@digitalteam.uk>
Date: Wed, 6 Nov 2024 13:11:57 +0000
Subject: [PATCH 3/3] Set data to null when columns are changed. Remove unused
 components.

---
 src/views/Exercise/Reports/Custom.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/Exercise/Reports/Custom.vue b/src/views/Exercise/Reports/Custom.vue
index 7e52b0711..37463bf6b 100644
--- a/src/views/Exercise/Reports/Custom.vue
+++ b/src/views/Exercise/Reports/Custom.vue
@@ -325,8 +325,6 @@ import _ from 'lodash';
 import Modal from '@jac-uk/jac-kit/components/Modal/Modal.vue';
 import LoadingMessage from '@jac-uk/jac-kit/draftComponents/LoadingMessage.vue';
 import Banner from '@jac-uk/jac-kit/draftComponents/Banner.vue';
-import CheckboxGroup from '@jac-uk/jac-kit/draftComponents/Form/CheckboxGroup.vue';
-import CheckboxItem from '@jac-uk/jac-kit/draftComponents/Form/CheckboxItem.vue';
 import { STATUS } from '@jac-uk/jac-kit/helpers/constants';
 import { applicationRecordCounts, availableStages, availableStatuses } from '@/helpers/exerciseHelper';
 import permissionMixin from '@/permissionMixin';
@@ -342,8 +340,6 @@ export default {
     draggable,
     LoadingMessage,
     Banner,
-    CheckboxGroup,
-    CheckboxItem,
   },
   mixins: [permissionMixin],
   data() {
@@ -636,6 +632,12 @@ export default {
       },
       deep: true,
     },
+    columns: {
+      handler: function() {
+        this.data = null;
+      },
+      deep: true,
+    },
     type: {
       handler: function() {
         this.getApplicationRecords();