Merge Release 3.6.1 to main

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.iemr.inventory-ui</groupId>
 	<artifactId>inventory-ui</artifactId>
-	<version>3.4.0</version>
+	<version>3.6.1</version>
 	<name>Inventory-UI</name>
 	<description>Piramal - inventory: Module ui</description>
 	<packaging>war</packaging>

src/app/app-modules/core/services/http-interceptor.service.ts

@@ -80,7 +80,20 @@ export class HttpInterceptorService implements HttpInterceptor {
       }),
       catchError((error: HttpErrorResponse) => {
         console.error(error);
-
+        if (error.status === 401 || error.status === 403) {
+          this.confirmationService.alert(
+            'Session expired. Please log in again to continue',
+            'error',
+          );
+        } else
+          this.confirmationService.alert(
+            error.error.errorMessage ||
+              'Something went wrong. Please try again later.',
+            'error',
+          );
+        this.router.navigate(['/login']);
+        sessionStorage.clear();
+        localStorage.clear();
         this.spinnerService.show();
         return throwError(error.error);
       }),

src/app/app-modules/inventory/reports/beneficiary-drug-issue-report/beneficiary-drug-issue-report.component.ts

@@ -247,8 +247,8 @@ export class BeneficiaryDrugIssueReportComponent implements OnInit, DoCheck {
           const blob = new Blob([buffer], {
             type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
           });
-          saveAs(blob, wb_name + '.xlsx');
           if (navigator.msSaveBlob) {
+            saveAs(blob, wb_name + '.xlsx');
             navigator.msSaveBlob(blob, wb_name);
           } else {
             const link = document.createElement('a');

src/app/app-modules/inventory/reports/consumption-report/consumption-report.component.ts

@@ -273,8 +273,8 @@ export class ConsumptionReportComponent implements OnInit, DoCheck {
           const blob = new Blob([buffer], {
             type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
           });
-          saveAs(blob, wb_name + '.xlsx');
           if (navigator.msSaveBlob) {
+            saveAs(blob, wb_name + '.xlsx');
             navigator.msSaveBlob(blob, wb_name);
           } else {
             const link = document.createElement('a');

src/app/app-modules/inventory/reports/daily-stock-details-report/daily-stock-details-report.component.ts

@@ -200,6 +200,7 @@
         'adjustmentReceipt',
         'adjustmentIssue',
         'closingStock',
+        'itemEnteredDate',
       ];
       const array = this.consumptionList.filter(function (obj: any) {
         for (const key in obj) {
@@ -234,8 +235,7 @@
             finalCellName = newcellPosition + cellPosition + '1';
             console.log(finalCellName);
           }
-          const newName = this.modifyHeader(headers, i);
-          // delete report_worksheet[finalCellName].w; report_worksheet[finalCellName].v = newName;
+
           i++;
           if (i === 91 + count * 26) {
             // i = 65;
@@ -247,8 +247,9 @@
         const workbook = new ExcelJS.Workbook();
         const criteria_worksheet = workbook.addWorksheet('Criteria');
         const report_worksheet = workbook.addWorksheet('Report');
+        const prettyHeaders = headers.map((h) => this.modifyHeader(h));
 
-        report_worksheet.addRow(headers);
+        report_worksheet.addRow(prettyHeaders);
         criteria_worksheet.addRow(this.criteriaHead);
 
         // Add data
@@ -273,8 +274,8 @@
           const blob = new Blob([buffer], {
             type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
           });
-          saveAs(blob, wb_name + '.xlsx');
           if (navigator.msSaveBlob) {
+            saveAs(blob, wb_name + '.xlsx');
             navigator.msSaveBlob(blob, wb_name);
           } else {
             const link = document.createElement('a');
@@ -298,12 +299,8 @@
     }
   }
 
-  modifyHeader(headers: any, i: any) {
-    let modifiedHeader: string;
-    modifiedHeader = headers[i - 65]
-      .toString()
-      .replace(/([A-Z])/g, ' $1')
-      .trim();
+  modifyHeader(header: string): string {
+    let modifiedHeader = header.replace(/([A-Z])/g, ' $1').trim();
     modifiedHeader =
       modifiedHeader.charAt(0).toUpperCase() + modifiedHeader.substr(1);
     return modifiedHeader.replace(/I D/g, 'ID');

src/app/app-modules/inventory/reports/daily-stock-summary-report/daily-stock-summary-report.component.ts

@@ -232,8 +232,7 @@
             finalCellName = newcellPosition + cellPosition + '1';
             console.log(finalCellName);
           }
-          const newName = this.modifyHeader(headers, i);
-          // delete report_worksheet[finalCellName].w; report_worksheet[finalCellName].v = newName;
+
           i++;
           if (i === 91 + count * 26) {
             // i = 65;
@@ -244,8 +243,9 @@
         const workbook = new ExcelJS.Workbook();
         const criteria_worksheet = workbook.addWorksheet('Criteria');
         const report_worksheet = workbook.addWorksheet('Report');
+        const prettyHeaders = headers.map((h) => this.modifyHeader(h));
 
-        report_worksheet.addRow(headers);
+        report_worksheet.addRow(prettyHeaders);
         criteria_worksheet.addRow(this.criteriaHead);
 
         // Add data
@@ -272,8 +272,8 @@
           const blob = new Blob([buffer], {
             type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
           });
-          saveAs(blob, wb_name + '.xlsx');
           if (navigator.msSaveBlob) {
+            saveAs(blob, wb_name + '.xlsx');
             navigator.msSaveBlob(blob, wb_name);
           } else {
             const link = document.createElement('a');
@@ -297,15 +297,10 @@
     }
   }
 
-  modifyHeader(headers: any, i: any) {
-    let modifiedHeader: string;
-    modifiedHeader = headers[i - 65]
-      .toString()
-      .replace(/([A-Z])/g, ' $1')
-      .trim();
+  modifyHeader(header: string): string {
+    let modifiedHeader = header.replace(/([A-Z])/g, ' $1').trim();
     modifiedHeader =
       modifiedHeader.charAt(0).toUpperCase() + modifiedHeader.substr(1);
-    //console.log(modifiedHeader);
     return modifiedHeader.replace(/I D/g, 'ID');
   }
 

src/app/app-modules/inventory/reports/expiry-report/expiry-report.component.ts

@@ -232,8 +232,8 @@ export class ExpiryReportComponent implements OnInit, DoCheck {
           const blob = new Blob([buffer], {
             type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
           });
-          saveAs(blob, wb_name + '.xlsx');
           if (navigator.msSaveBlob) {
+            saveAs(blob, wb_name + '.xlsx');
             navigator.msSaveBlob(blob, wb_name);
           } else {
             const link = document.createElement('a');

src/app/app-modules/inventory/reports/inward-stock-report/inward-stock-report.component.ts

@@ -269,8 +269,8 @@ export class InwardStockReportComponent implements OnInit, DoCheck {
           const blob = new Blob([buffer], {
             type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
           });
-          saveAs(blob, wb_name + '.xlsx');
           if (navigator.msSaveBlob) {
+            saveAs(blob, wb_name + '.xlsx');
             navigator.msSaveBlob(blob, wb_name);
           } else {
             const link = document.createElement('a');

src/app/app-modules/inventory/reports/monthly-report/monthly-report.component.ts

@@ -195,6 +195,7 @@
         'adjustmentReceipt',
         'adjustmentIssue',
         'closingStock',
+        'itemEnteredDate',
       ];
       const array = this.consumptionList.filter(function (obj: any) {
         for (const key in obj) {
@@ -230,8 +231,6 @@
             finalCellName = newcellPosition + cellPosition + '1';
             console.log(finalCellName);
           }
-          const newName = this.modifyHeader(headers, i);
-          // delete report_worksheet[finalCellName].w; report_worksheet[finalCellName].v = newName;
           i++;
           if (i === 91 + count * 26) {
             // i = 65;
@@ -242,8 +241,9 @@
         const workbook = new ExcelJS.Workbook();
         const criteria_worksheet = workbook.addWorksheet('Criteria');
         const report_worksheet = workbook.addWorksheet('Report');
+        const prettyHeaders = headers.map((h) => this.modifyHeader(h));
 
-        report_worksheet.addRow(headers);
+        report_worksheet.addRow(prettyHeaders);
         criteria_worksheet.addRow(this.criteriaHead);
 
         // Add data
@@ -268,8 +268,8 @@
           const blob = new Blob([buffer], {
             type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
           });
-          saveAs(blob, wb_name + '.xlsx');
           if (navigator.msSaveBlob) {
+            saveAs(blob, wb_name + '.xlsx');
             navigator.msSaveBlob(blob, wb_name);
           } else {
             const link = document.createElement('a');
@@ -293,15 +293,10 @@
     }
   }
 
-  modifyHeader(headers: any, i: any) {
-    let modifiedHeader: string;
-    modifiedHeader = headers[i - 65]
-      .toString()
-      .replace(/([A-Z])/g, ' $1')
-      .trim();
+  modifyHeader(header: string): string {
+    let modifiedHeader = header.replace(/([A-Z])/g, ' $1').trim();
     modifiedHeader =
       modifiedHeader.charAt(0).toUpperCase() + modifiedHeader.substr(1);
-
     return modifiedHeader.replace(/I D/g, 'ID');
   }
 

src/app/app-modules/inventory/reports/short-expiry-report/short-expiry-report.component.ts

@@ -209,8 +209,8 @@ export class ShortExpiryReportComponent implements OnInit, DoCheck {
           const blob = new Blob([buffer], {
             type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
           });
-          saveAs(blob, wb_name + '.xlsx');
           if (navigator.msSaveBlob) {
+            saveAs(blob, wb_name + '.xlsx');
             navigator.msSaveBlob(blob, wb_name);
           } else {
             const link = document.createElement('a');

src/app/app-modules/inventory/reports/transit-report/transit-report.component.ts

@@ -237,8 +237,8 @@ export class TransitReportComponent implements OnInit, DoCheck {
           const blob = new Blob([buffer], {
             type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
           });
-          saveAs(blob, wb_name + '.xlsx');
           if (navigator.msSaveBlob) {
+            saveAs(blob, wb_name + '.xlsx');
             navigator.msSaveBlob(blob, wb_name);
           } else {
             const link = document.createElement('a');

src/app/app-modules/inventory/reports/yearly-report/yearly-report.component.ts

@@ -199,8 +199,6 @@
             finalCellName = newcellPosition + cellPosition + '1';
             console.log(finalCellName);
           }
-          const newName = this.modifyHeader(headers, i);
-          // delete report_worksheet[finalCellName].w; report_worksheet[finalCellName].v = newName;
           i++;
           if (i === 91 + count * 26) {
             // i = 65;
@@ -211,8 +209,9 @@
         const workbook = new ExcelJS.Workbook();
         const criteria_worksheet = workbook.addWorksheet('Criteria');
         const report_worksheet = workbook.addWorksheet('Report');
+        const prettyHeaders = headers.map((h) => this.modifyHeader(h));
 
-        report_worksheet.addRow(headers);
+        report_worksheet.addRow(prettyHeaders);
         criteria_worksheet.addRow(this.criteriaHead);
 
         // Add data
@@ -238,8 +237,8 @@
           const blob = new Blob([buffer], {
             type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
           });
-          saveAs(blob, wb_name + '.xlsx');
           if (navigator.msSaveBlob) {
+            saveAs(blob, wb_name + '.xlsx');
             navigator.msSaveBlob(blob, wb_name);
           } else {
             const link = document.createElement('a');
@@ -263,15 +262,10 @@
     }
   }
 
-  modifyHeader(headers: any, i: any) {
-    let modifiedHeader: string;
-    modifiedHeader = headers[i - 65]
-      .toString()
-      .replace(/([A-Z])/g, ' $1')
-      .trim();
+  modifyHeader(header: string): string {
+    let modifiedHeader = header.replace(/([A-Z])/g, ' $1').trim();
     modifiedHeader =
       modifiedHeader.charAt(0).toUpperCase() + modifiedHeader.substr(1);
-
     return modifiedHeader.replace(/I D/g, 'ID');
   }
 

src/app/app-modules/rx/rx-item-dispense/rx-item-dispense.component.ts

@@ -202,22 +202,25 @@ export class RxItemDispenseComponent implements OnInit, OnChanges, DoCheck {
       this.clearBatchArray(selectionBatchList);
 
       if (this.issueType === 0) {
-        console.error('Issue Type is 0, allocating batches', this.issueType);
-        this.allocate();
-        this.allocated = false;
         element.preDefinedBatchList.forEach((batch: any) => {
           selectionBatchList.push(
             this.utils.initBatchListElement(batch, this.issueType),
           );
         });
-      } else if (this.issueType === 1) {
-        this.allocate();
       }
       currentGroup.patchValue({
         qtyDispensed: null,
       });
       currentGroup.controls['selectionBatchList'] = selectionBatchList;
     });
+
+    if (this.issueType === 0) {
+      this.allocated = false;
+      this.allocate();
+    } else if (this.issueType === 1) {
+      this.allocated = true;
+      this.allocate();
+    }
   }
 
   clearBatchArray(formArray: any) {

src/app/login/login.component.ts

@@ -222,6 +222,22 @@ export class LoginComponent implements OnInit {
     let roleObj;
     if (loginDataResponse.previlegeObj[0].roles) {
       roleObj = loginDataResponse.previlegeObj[0].roles;
+      const hasPharmacist = roleObj.some(
+        (role: any) => role.RoleName === 'Pharmacist',
+      );
+
+      if (!hasPharmacist) {
+        sessionStorage.clear();
+
+        this.router.navigate(['/login']).then(() => {
+          this.confirmationService.alert(
+            'Designation is not matched with your roles , Please map the Designation or include more roles',
+            'error',
+          );
+        });
+        return;
+      }
+
       if (roleObj.length > 0) {
         roleObj.forEach((role: any) => {
           role.serviceRoleScreenMappings.forEach((serviceRole: any) => {
@@ -285,6 +301,7 @@ export class LoginComponent implements OnInit {
       // this.sessionstorage.userID = loginDataResponse.userID;
       // this.sessionstorage.userName = loginDataResponse.userName;
       // this.sessionstorage.username = this.userName;
+
       const services = loginDataResponse.previlegeObj.map((item: any) => {
         if (
           item.roles[0].serviceRoleScreenMappings[0].providerServiceMapping