issued and unissued reports

cityssm · Jun 14, 2022 · e594e45 · e594e45
1 parent 0d5dd1a
commit e594e45
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 0 deletions.
diff --git a/helpers/licencesDB/getReportData.js b/helpers/licencesDB/getReportData.js
@@ -77,6 +77,12 @@ export const getReportData = (reportName, reportParameters) => {
  sqlParameters = report.sqlParameters;
  break;
  case "licences-formatted":
+ let issuedFilter = "";
+ if (reportParameters.issued) {
+ issuedFilter = (reportParameters.issued === "true"
+ ? " and l.issueDate is not null"
+ : " and l.issueDate is null");
+ }
  sql = "select l.licenceId as " + licenceId + "," +
  " c.licenceCategory as " + licenceCategory + "," +
  " l.licenceNumber as " + licenceNumber + "," +
@@ -93,6 +99,7 @@ export const getReportData = (reportName, reportParameters) => {
  " from Licences l" +
  " left join LicenceCategories c on l.licenceCategoryKey = c.licenceCategoryKey" +
  " where l.recordDelete_timeMillis is null" +
+ issuedFilter +
  " order by startDate desc, endDate desc, licenceId";
  break;
  case "licenceAdditionalFees-all":

diff --git a/helpers/licencesDB/getReportData.ts b/helpers/licencesDB/getReportData.ts
@@ -1,3 +1,5 @@
+/* eslint-disable no-case-declarations */
+
 import sqlite from "better-sqlite3";
 import { licencesDB as databasePath } from "../../data/databasePaths.js";
 
@@ -117,6 +119,14 @@ export const getReportData = (reportName: string, reportParameters?: ReportParam
 
  case "licences-formatted":
 
+ let issuedFilter = "";
+
+ if (reportParameters.issued) {
+ issuedFilter = (reportParameters.issued === "true"
+ ? " and l.issueDate is not null"
+ : " and l.issueDate is null");
+ }
+
  sql = "select l.licenceId as " + licenceId + "," +
  " c.licenceCategory as " + licenceCategory + "," +
  " l.licenceNumber as " + licenceNumber + "," +
@@ -133,7 +143,9 @@ export const getReportData = (reportName: string, reportParameters?: ReportParam
  " from Licences l" +
  " left join LicenceCategories c on l.licenceCategoryKey = c.licenceCategoryKey" +
  " where l.recordDelete_timeMillis is null" +
+ issuedFilter +
  " order by startDate desc, endDate desc, licenceId";
+
  break;
 
  case "licenceAdditionalFees-all":

diff --git a/views/admin-yearEnd.ejs b/views/admin-yearEnd.ejs
@@ -22,6 +22,28 @@
  <div class="panel-block is-block">
  <div class="columns">
  <div class="column">
+ <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/licences-formatted?issued=false">All Unissued <%= configFunctions.getProperty("settings.licenceAliasPlural") %></a>
+ </h3>
+ <p>After the refresh process, these licences will be deleted.</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/licences-formatted?issued=true">All Issued <%= configFunctions.getProperty("settings.licenceAliasPlural") %></a>
+ </h3>
+ <p>After the refresh process, these licences will still exists, but will no longer be issued.</p>
+ </div>
+ </div>
  </div>
  <div class="column">
  <div class="message is-warning">