From 545ab14a4aee13a3d9fa03687cce2fedefff2923 Mon Sep 17 00:00:00 2001 From: SnehaRH <77656297+snehar-nd@users.noreply.github.com> Date: Mon, 11 Aug 2025 10:16:51 +0530 Subject: [PATCH 1/4] fix: amm-636 short expiry report (#93) --- .../short-expiry-report.component.ts | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/app/app-modules/inventory/reports/short-expiry-report/short-expiry-report.component.ts b/src/app/app-modules/inventory/reports/short-expiry-report/short-expiry-report.component.ts index b7fb41e..45bd914 100644 --- a/src/app/app-modules/inventory/reports/short-expiry-report/short-expiry-report.component.ts +++ b/src/app/app-modules/inventory/reports/short-expiry-report/short-expiry-report.component.ts @@ -28,6 +28,7 @@ import { InventoryService } from '../../shared/service/inventory.service'; import { ConfirmationService } from '../../../core/services/confirmation.service'; import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; import { LanguageService } from 'src/app/app-modules/core/services/language.service'; +import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; @Component({ selector: 'app-short-expiry-report', @@ -45,6 +46,7 @@ export class ShortExpiryReportComponent implements OnInit, DoCheck { private inventoryService: InventoryService, private http_service: LanguageService, private confirmationService: ConfirmationService, + private sessionstorage: SessionStorageService ) {} today!: Date; @@ -82,15 +84,9 @@ export class ShortExpiryReportComponent implements OnInit, DoCheck { startDate.setSeconds(0); startDate.setMilliseconds(0); - console.log( - 'Data form value...', - JSON.stringify(this.shortExpiryForm.value), - ); - const reqObjForShortExpiryReport = {}; - console.log( - 'Data form data', - JSON.stringify(reqObjForShortExpiryReport, null, 4), - ); + const reqObjForShortExpiryReport = { + facilityID: this.sessionstorage.getItem('facilityID') + }; this.inventoryService .getShortExpiryReports(reqObjForShortExpiryReport) From 75337b39d5d2c8b7ce61d61861fe7c260c7abca1 Mon Sep 17 00:00:00 2001 From: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> Date: Mon, 25 Aug 2025 18:36:43 +0530 Subject: [PATCH 2/4] fix: amm-1250 Item entered date column added in the inventory report and headers are modified (#95) --- .../daily-stock-details-report.component.ts | 18 +++++++----------- .../daily-stock-summary-report.component.ts | 17 +++++------------ .../monthly-report.component.ts | 19 +++++++------------ .../yearly-report/yearly-report.component.ts | 18 ++++++------------ 4 files changed, 25 insertions(+), 47 deletions(-) diff --git a/src/app/app-modules/inventory/reports/daily-stock-details-report/daily-stock-details-report.component.ts b/src/app/app-modules/inventory/reports/daily-stock-details-report/daily-stock-details-report.component.ts index 7962f63..78ca9f4 100644 --- a/src/app/app-modules/inventory/reports/daily-stock-details-report/daily-stock-details-report.component.ts +++ b/src/app/app-modules/inventory/reports/daily-stock-details-report/daily-stock-details-report.component.ts @@ -200,6 +200,7 @@ export class DailyStockDetailsReportComponent implements OnInit, DoCheck { 'adjustmentReceipt', 'adjustmentIssue', 'closingStock', + 'itemEnteredDate' ]; const array = this.consumptionList.filter(function (obj: any) { for (const key in obj) { @@ -234,8 +235,7 @@ export class DailyStockDetailsReportComponent implements OnInit, DoCheck { 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 @@ export class DailyStockDetailsReportComponent implements OnInit, DoCheck { 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 @@ -298,14 +299,9 @@ export class DailyStockDetailsReportComponent implements OnInit, DoCheck { } } - modifyHeader(headers: any, i: any) { - let modifiedHeader: string; - modifiedHeader = headers[i - 65] - .toString() - .replace(/([A-Z])/g, ' $1') - .trim(); - modifiedHeader = - modifiedHeader.charAt(0).toUpperCase() + modifiedHeader.substr(1); + 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'); } diff --git a/src/app/app-modules/inventory/reports/daily-stock-summary-report/daily-stock-summary-report.component.ts b/src/app/app-modules/inventory/reports/daily-stock-summary-report/daily-stock-summary-report.component.ts index 3a40086..0f96f09 100644 --- a/src/app/app-modules/inventory/reports/daily-stock-summary-report/daily-stock-summary-report.component.ts +++ b/src/app/app-modules/inventory/reports/daily-stock-summary-report/daily-stock-summary-report.component.ts @@ -232,8 +232,6 @@ export class DailyStockSummaryReportComponent implements OnInit, DoCheck { 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 +242,9 @@ export class DailyStockSummaryReportComponent implements OnInit, DoCheck { 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 @@ -297,15 +296,9 @@ export class DailyStockSummaryReportComponent implements OnInit, DoCheck { } } - modifyHeader(headers: any, i: any) { - let modifiedHeader: string; - modifiedHeader = headers[i - 65] - .toString() - .replace(/([A-Z])/g, ' $1') - .trim(); - modifiedHeader = - modifiedHeader.charAt(0).toUpperCase() + modifiedHeader.substr(1); - //console.log(modifiedHeader); + 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'); } diff --git a/src/app/app-modules/inventory/reports/monthly-report/monthly-report.component.ts b/src/app/app-modules/inventory/reports/monthly-report/monthly-report.component.ts index 906a68a..bfece5f 100644 --- a/src/app/app-modules/inventory/reports/monthly-report/monthly-report.component.ts +++ b/src/app/app-modules/inventory/reports/monthly-report/monthly-report.component.ts @@ -195,6 +195,7 @@ export class MonthlyReportComponent implements OnInit, DoCheck { 'adjustmentReceipt', 'adjustmentIssue', 'closingStock', + 'itemEnteredDate' ]; const array = this.consumptionList.filter(function (obj: any) { for (const key in obj) { @@ -230,8 +231,7 @@ export class MonthlyReportComponent implements OnInit, DoCheck { 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 +242,9 @@ export class MonthlyReportComponent implements OnInit, DoCheck { 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 @@ -293,15 +294,9 @@ export class MonthlyReportComponent implements OnInit, DoCheck { } } - modifyHeader(headers: any, i: any) { - let modifiedHeader: string; - modifiedHeader = headers[i - 65] - .toString() - .replace(/([A-Z])/g, ' $1') - .trim(); - modifiedHeader = - modifiedHeader.charAt(0).toUpperCase() + modifiedHeader.substr(1); - + 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'); } diff --git a/src/app/app-modules/inventory/reports/yearly-report/yearly-report.component.ts b/src/app/app-modules/inventory/reports/yearly-report/yearly-report.component.ts index 0a2379d..c666d51 100644 --- a/src/app/app-modules/inventory/reports/yearly-report/yearly-report.component.ts +++ b/src/app/app-modules/inventory/reports/yearly-report/yearly-report.component.ts @@ -199,8 +199,7 @@ export class YearlyReportComponent implements OnInit, DoCheck { 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 +210,9 @@ export class YearlyReportComponent implements OnInit, DoCheck { 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 @@ -263,15 +263,9 @@ export class YearlyReportComponent implements OnInit, DoCheck { } } - modifyHeader(headers: any, i: any) { - let modifiedHeader: string; - modifiedHeader = headers[i - 65] - .toString() - .replace(/([A-Z])/g, ' $1') - .trim(); - modifiedHeader = - modifiedHeader.charAt(0).toUpperCase() + modifiedHeader.substr(1); - + 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'); } From 2da8bfd4eeefadaf50b6d498d6be90cc05641231 Mon Sep 17 00:00:00 2001 From: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> Date: Thu, 25 Sep 2025 12:45:49 +0530 Subject: [PATCH 3/4] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4ffdcaa..2e04373 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 com.iemr.aam-inventory-ui aam-inventory-ui - 3.4.0 + 3.4.1 AAM-Inventory-UI Piramal - inventory: Module ui war From e2f1f88680cd9c68d8942cbe676189c802d3d91c Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Tue, 28 Oct 2025 23:02:45 +0530 Subject: [PATCH 4/4] fix: amm-997 rolebase login --- src/app/login/login.component.ts | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts index 4d4cf16..5d10c71 100644 --- a/src/app/login/login.component.ts +++ b/src/app/login/login.component.ts @@ -165,6 +165,21 @@ 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) => {