Merge branch 'consolidate-nest' into database-changes

bcgov · Mar 14, 2024 · 2c097bb · 2c097bb
2 parents cf69bc8 + 2b98d1c
commit 2c097bb
Show file tree

Hide file tree

Showing 24 changed files with 1,234 additions and 1,349 deletions.
diff --git a/backend/src/admin/admin.service.ts b/backend/src/admin/admin.service.ts
@@ -110,8 +110,6 @@ export class AdminService {
         console.log(err.response.data);
         throw new Error('No users found');
       });
-    console.log('searchData');
-    console.log(searchData);
     const firstName = searchData[0].firstName ? searchData[0].firstName : '';
     const lastName = searchData[0].lastName ? searchData[0].lastName : '';
     const username = searchData[0].attributes

diff --git a/backend/src/app.controller.ts b/backend/src/app.controller.ts
@@ -261,7 +261,6 @@ export class AppController {
   getHello(): string {
     return this.appService.getHello();
   }
-
   @Get()
   getHello2(): string {
     return this.appService.getHello();

diff --git a/backend/src/report/report.service.ts b/backend/src/report/report.service.ts
@@ -463,7 +463,20 @@ export class ReportService {
 
     // Format the raw ttls data
     const tenantAddr = rawData.tenantAddr;
-    const interestParcel = rawData.interestParcel[0];
+    const interestParcels = rawData.interestParcel;
+    let concatLegalDescriptions = '';
+    if (interestParcels && interestParcels.length > 0) {
+      interestParcels.sort((a, b) => b.interestParcelId - a.interestParcelId);
+      let legalDescArray = [];
+      for (let ip of interestParcels) {
+        if (ip.legalDescription && ip.legalDescription != '') {
+          legalDescArray.push(ip.legalDescription);
+        }
+      }
+      if (legalDescArray.length > 0) {
+        concatLegalDescriptions = legalDescArray.join('\n');
+      }
+    }
 
     const DB_Address_Mailing_Tenant = tenantAddr[0] ? nfrAddressBuilder(tenantAddr) : '';
 
@@ -647,7 +660,7 @@ export class ReportService {
       DB_Tenure_Type: rawData.type // convert a tenure type like LICENSE to License
         ? rawData.type.toLowerCase().charAt(0).toUpperCase() + rawData.type.toLowerCase().slice(1)
         : '',
-      DB_Legal_Description: interestParcel ? interestParcel.legalDescription : '',
+      DB_Legal_Description: concatLegalDescriptions,
       DB_Fee_Payable_Type: DB_Fee_Payable_Type,
       DB_Fee_Payable_Amount_GST: DB_Fee_Payable_Amount_GST == 0 ? '' : formatMoney(DB_Fee_Payable_Amount_GST),
       DB_Fee_Payable_Amount: formatMoney(DB_Fee_Payable_Amount),

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -25,7 +25,8 @@
     "web-vitals": "^2.1.4"
   },
   "devDependencies": {
-    "@babel/plugin-proposal-private-property-in-object": "^7.21.11"
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
+    "sass": "^1.71.1"
   },
   "scripts": {
     "start": "react-scripts start",

diff --git a/frontend/public/css/new.css b/frontend/public/css/new.css
@@ -17,3 +17,7 @@ hr {
   background-color: #000000;
   height: 1px;
 }
+
+.boldText {
+  font-weight: bold;
+}