hide related licences

closes #96
cityssm · Jun 8, 2022 · f242a3c · f242a3c
1 parent cb25dd5
commit f242a3c
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 5 deletions.
diff --git a/helpers/functions.config.d.ts b/helpers/functions.config.d.ts
@@ -17,6 +17,7 @@ export declare function getProperty(propertyName: "settings.licenceAliasPlural")
 export declare function getProperty(propertyName: "settings.licenseeAlias"): string;
 export declare function getProperty(propertyName: "settings.licenseeAliasPlural"): string;
 export declare function getProperty(propertyName: "settings.renewalAlias"): string;
+export declare function getProperty(propertyName: "settings.includeRelated"): boolean;
 export declare function getProperty(propertyName: "settings.includeBatches"): boolean;
 export declare function getProperty(propertyName: "settings.includeReplacementFee"): boolean;
 export declare function getProperty(propertyName: "exports.batches"): configTypes.ConfigBatchExport;

diff --git a/helpers/functions.config.js b/helpers/functions.config.js
@@ -23,6 +23,7 @@ configFallbackValues.set("settings.licenceAliasPlural", "Licences");
 configFallbackValues.set("settings.licenseeAlias", "Licensee");
 configFallbackValues.set("settings.licenseeAliasPlural", "Licensees");
 configFallbackValues.set("settings.renewalAlias", "Renewal");
+configFallbackValues.set("settings.includeRelated", true);
 configFallbackValues.set("settings.includeBatches", false);
 configFallbackValues.set("settings.includeReplacementFee", true);
 configFallbackValues.set("licenceLengthFunctions", {});

diff --git a/helpers/functions.config.ts b/helpers/functions.config.ts
@@ -38,6 +38,7 @@ configFallbackValues.set("settings.licenceAliasPlural", "Licences");
 configFallbackValues.set("settings.licenseeAlias", "Licensee");
 configFallbackValues.set("settings.licenseeAliasPlural", "Licensees");
 configFallbackValues.set("settings.renewalAlias", "Renewal");
+configFallbackValues.set("settings.includeRelated", true);
 configFallbackValues.set("settings.includeBatches", false);
 configFallbackValues.set("settings.includeReplacementFee", true);
 
@@ -71,6 +72,7 @@ export function getProperty(propertyName: "settings.licenceAliasPlural"): string
 export function getProperty(propertyName: "settings.licenseeAlias"): string;
 export function getProperty(propertyName: "settings.licenseeAliasPlural"): string;
 export function getProperty(propertyName: "settings.renewalAlias"): string;
+export function getProperty(propertyName: "settings.includeRelated"): boolean;
 export function getProperty(propertyName: "settings.includeBatches"): boolean;
 export function getProperty(propertyName: "settings.includeReplacementFee"): boolean;
 

diff --git a/public-typescript/licence-edit.js b/public-typescript/licence-edit.js
@@ -83,7 +83,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  clickEvent.currentTarget.closest(".message").remove();
  });
  }
- if (!isCreate) {
+ if (!isCreate && document.querySelector("#panel--relatedLicences")) {
  const currentDateString = cityssm.dateToString(new Date());
  const getRelatedLicenceHTML = (relatedLicence) => {
  const licenceURL = urlPrefix + "/licences/" + relatedLicence.licenceId +

diff --git a/public-typescript/licence-edit.ts b/public-typescript/licence-edit.ts
@@ -139,7 +139,7 @@ declare const bulmaJS: BulmaJS;
  * Related Licences
  */
 
- if (!isCreate) {
+ if (!isCreate && document.querySelector("#panel--relatedLicences")) {
 
  const currentDateString = cityssm.dateToString(new Date());
 
@@ -1204,7 +1204,7 @@ declare const bulmaJS: BulmaJS;
  url.searchParams.append("bankTransitNumber", bankTransitNumberElement.value);
  url.searchParams.append("bankAccountNumber", (document.querySelector("#licenceEdit--bankAccountNumber") as HTMLInputElement).value);
  }
- 
+
  let newStartDate = endDateStringElement.valueAsDate;
  newStartDate.setDate(newStartDate.getDate() + 1);
 

diff --git a/public/javascripts/licence-edit.min.js b/public/javascripts/licence-edit.min.js
diff --git a/types/configTypes.d.ts b/types/configTypes.d.ts
@@ -20,6 +20,7 @@ export interface Config {
  licenseeAlias?: string;
  licenseeAliasPlural?: string;
  renewalAlias?: string;
+ includeRelated?: boolean;
  includeBatches?: boolean;
  includeReplacementFee?: boolean;
  };

diff --git a/types/configTypes.ts b/types/configTypes.ts
@@ -20,6 +20,7 @@ export interface Config {
  licenseeAlias?: string;
  licenseeAliasPlural?: string;
  renewalAlias?: string;
+ includeRelated?: boolean;
  includeBatches?: boolean;
  includeReplacementFee?: boolean;
  };

diff --git a/views/licence-edit.ejs b/views/licence-edit.ejs
@@ -112,7 +112,7 @@
  </div>
  </div>
  </div>
- <% if (!isCreate || relatedLicence) { %>
+ <% if ((!isCreate && (configFunctions.getProperty("settings.includeRelated") || licence.relatedLicences.length > 0)) || (isCreate && relatedLicence)) { %>
  <div class="column">
  <% if (isCreate && relatedLicence) { %>
  <div class="message is-info">