add issued/unissued filter to licence list

cityssm · Jun 15, 2022 · 9fa7f95 · 9fa7f95
1 parent d193efe
commit 9fa7f95
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 18 deletions.
diff --git a/helpers/licencesDB/getReportData.js b/helpers/licencesDB/getReportData.js
@@ -78,10 +78,10 @@ export const getReportData = (reportName, reportParameters) => {
  break;
  case "licences-formatted":
  let issuedFilter = "";
- if (reportParameters.issued) {
- issuedFilter = (reportParameters.issued === "true"
- ? " and l.issueDate is not null"
- : " and l.issueDate is null");
+ if (reportParameters.issued && reportParameters.issued !== "") {
+ issuedFilter = (reportParameters.issued === "false"
+ ? " and l.issueDate is null"
+ : " and l.issueDate is not null");
  }
  sql = "select l.licenceId as " + licenceId + "," +
  " c.licenceCategory as " + licenceCategory + "," +

diff --git a/helpers/licencesDB/getReportData.ts b/helpers/licencesDB/getReportData.ts
@@ -121,10 +121,10 @@ export const getReportData = (reportName: string, reportParameters?: ReportParam
 
  let issuedFilter = "";
 
- if (reportParameters.issued) {
- issuedFilter = (reportParameters.issued === "true"
- ? " and l.issueDate is not null"
- : " and l.issueDate is null");
+ if (reportParameters.issued && reportParameters.issued !== "") {
+ issuedFilter = (reportParameters.issued === "false"
+ ? " and l.issueDate is null"
+ : " and l.issueDate is not null");
  }
 
  sql = "select l.licenceId as " + licenceId + "," +

diff --git a/views/report-search.ejs b/views/report-search.ejs
@@ -51,26 +51,39 @@
  </form>
  </div>
  </div>
- <% let uid = stringFns.getUID(); %>
- <a class="panel-block align-items-flex-start"
- href="<%= urlPrefix %>/reports/licences-formatted"
- aria-labelledby="h--<%= uid %>"
- aria-describedby="p--<%= uid %>"
- download>
+ <div class="panel-block align-items-flex-start">
  <div class="has-text-centered my-2 ml-2 mr-4">
  <span class="icon has-text-info" title="CSV">
  <i class="fas fa-fw fa-2x fa-file-csv" aria-hidden="true"></i>
  </span>
  </div>
- <div>
- <h3 class="title is-5 is-marginless" id="h--<%= uid %>">
+ <div class="is-flex-grow-1">
+ <h3 class="title is-5 is-marginless">
  Full <%= configFunctions.getProperty("settings.licenceAlias") %> List
  </h3>
- <p id="p--<%= uid %>">
+ <p>
  All active <%= configFunctions.getProperty("settings.licenceAliasPlural").toLowerCase() %>.
  </p>
+ <form class="mt-2" action="<%= urlPrefix %>/reports/licences-formatted" method="get">
+ <div class="field has-addons">
+ <div class="control is-expanded">
+ <div class="select is-fullwidth">
+ <select name="issued" aria-label="Issued Status">
+ <option value="">(All Licences)</option>
+ <option value="true">Issued <%= configFunctions.getProperty("settings.licenceAliasPlural") %> Only</option>
+ <option value="false">Unissued <%= configFunctions.getProperty("settings.licenceAliasPlural") %></option>
+ </select>
+ </div>
+ </div>
+ <div class="control">
+ <button class="button is-primary" type="submit">
+ Export
+ </button>
+ </div>
+ </div>
+ </form>
  </div>
- </a>
+ </div>
  <div class="panel-block align-items-flex-start">
  <div class="has-text-centered my-2 ml-2 mr-4">
  <span class="icon has-text-info" title="CSV">