add transaction log report

cityssm · Jun 15, 2022 · 26a8343 · 26a8343
1 parent 8eceed9
commit 26a8343
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 7 deletions.
diff --git a/helpers/licencesDB/getReportData.js b/helpers/licencesDB/getReportData.js
@@ -130,6 +130,11 @@ export const getReportData = (reportName, reportParameters) => {
  sql = "select * from LicenceTransactions";
  break;
  case "licenceTransactions-byDate":
+ let dateFilter = "";
+ if (reportParameters.transactionDateString && reportParameters.transactionDateString !== "") {
+ dateFilter = " and t.transactionDate = ?";
+ sqlParameters.push(dateTimeFunctions.dateStringToInteger(reportParameters.transactionDateString));
+ }
  sql = "select" +
  " c.licenceCategory as " + licenceCategory + "," +
  " l.licenceNumber as " + licenceNumber + "," +
@@ -150,9 +155,8 @@ export const getReportData = (reportName, reportParameters) => {
  " left join Licences l on t.licenceId = l.licenceId" +
  " left join LicenceCategories c on l.licenceCategoryKey = c.licenceCategoryKey" +
  " where t.recordDelete_timeMillis is null" +
- " and t.transactionDate = ?" +
- " order by t.transactionTime";
- sqlParameters.push(dateTimeFunctions.dateStringToInteger(reportParameters.transactionDateString));
+ dateFilter +
+ " order by t.transactionDate, t.transactionTime";
  break;
  case "relatedLicences-all":
  sql = "select * from RelatedLicences";

diff --git a/helpers/licencesDB/getReportData.ts b/helpers/licencesDB/getReportData.ts
@@ -195,6 +195,13 @@ export const getReportData = (reportName: string, reportParameters?: ReportParam
 
  case "licenceTransactions-byDate":
 
+ let dateFilter = "";
+
+ if (reportParameters.transactionDateString && reportParameters.transactionDateString !== "") {
+ dateFilter = " and t.transactionDate = ?";
+ sqlParameters.push(dateTimeFunctions.dateStringToInteger(reportParameters.transactionDateString as string));
+ }
+
  sql = "select" +
  " c.licenceCategory as " + licenceCategory + "," +
  " l.licenceNumber as " + licenceNumber + "," +
@@ -217,10 +224,8 @@ export const getReportData = (reportName: string, reportParameters?: ReportParam
  " left join Licences l on t.licenceId = l.licenceId" +
  " left join LicenceCategories c on l.licenceCategoryKey = c.licenceCategoryKey" +
  " where t.recordDelete_timeMillis is null" +
- " and t.transactionDate = ?" +
- " order by t.transactionTime";
-
- sqlParameters.push(dateTimeFunctions.dateStringToInteger(reportParameters.transactionDateString as string));
+ dateFilter +
+ " order by t.transactionDate, t.transactionTime";
 
  break;
 

diff --git a/views/admin-yearEnd.ejs b/views/admin-yearEnd.ejs
@@ -63,6 +63,16 @@
  <p>After the refresh process, these <%= configFunctions.getProperty("settings.licenceAliasPlural").toLowerCase() %> will still exists, but will no longer be issued.</p>
  </div>
  </div>
+ <div class="media">
+ <div class="media-left" aria-hidden="true">
+ <i class="fas fa-fw fa-3x fa-file-csv" aria-hidden="true"></i>
+ </div>
+ <div class="media-content">
+ <h3 class="title is-4 is-marginless">
+ <a href="<%- urlPrefix %>/reports/licenceTransactions-byDate">Full Transaction Log</a>
+ </h3>
+ <p>After the refresh process, these transactions will be deleted.</p>
+ </div>
  </div>
  </div>
  <div class="column">