Fix the Report Downloading Issue

README.md

@@ -1,4 +1,6 @@
 # AAM InventoryUI
+[![DeepWiki](https://img.shields.io/badge/DeepWiki-PSMRI%2FHWC--Inventory--UI-blue)](https://deepwiki.com/PSMRI/HWC-Inventory-UI)
+
 
 This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 16.2.10.
 
@@ -34,3 +36,4 @@ If you encounter any issues, bugs, or have feature requests, please file them in
 
 We’d love to have you join our community discussions and get real-time support!  
 Join our [Discord server](https://discord.gg/FVQWsf5ENS) to connect with contributors, ask questions, and stay updated.  
+

pom.xml

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

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

@@ -63,7 +63,7 @@ <h4>{{ currentLanguageSet?.inventory?.beneficiaryDrugIssueReport }}</h4>
             mat-raised-button
             class="mat_green"
             color="accent"
-            type="submit"
+            type="button"
             [disabled]="!beneficiaryDrugIssueForm.valid"
             (click)="
               downloadReport(true); trackFieldInteraction('Download Button')

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

@@ -249,17 +249,12 @@ 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) {
-            navigator.msSaveBlob(blob, wb_name);
+          const filename = wb_name.replace(/ /g, '_') + '.xlsx';
+
+          if ((window as any).navigator && (window as any).navigator.msSaveBlob) {
+            (window as any).navigator.msSaveBlob(blob, filename);
           } else {
-            const link = document.createElement('a');
-            link.href = URL.createObjectURL(blob);
-            link.setAttribute('visibility', 'hidden');
-            link.download = wb_name.replace(/ /g, '_') + '.xlsx';
-            document.body.appendChild(link);
-            link.click();
-            document.body.removeChild(link);
+            saveAs(blob, filename);
           }
         });
       }

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

@@ -82,7 +82,7 @@ <h4>{{ currentLanguageSet?.inventory?.consumptionReport }}</h4>
             mat-raised-button
             color="accent"
             class="mat_green"
-            type="submit"
+            type="button"
             [disabled]="!consumptionForm.valid"
             (click)="
               downloadReport(true); trackFieldInteraction('Download Button')

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

@@ -275,17 +275,12 @@ 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) {
-            navigator.msSaveBlob(blob, wb_name);
+          const filename = wb_name.replace(/ /g, '_') + '.xlsx';
+
+          if ((window as any).navigator && (window as any).navigator.msSaveBlob) {
+            (window as any).navigator.msSaveBlob(blob, filename);
           } else {
-            const link = document.createElement('a');
-            link.href = URL.createObjectURL(blob);
-            link.setAttribute('visibility', 'hidden');
-            link.download = wb_name.replace(/ /g, '_') + '.xlsx';
-            document.body.appendChild(link);
-            link.click();
-            document.body.removeChild(link);
+            saveAs(blob, filename);
           }
         });
       }

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

@@ -83,7 +83,7 @@ <h4>{{ currentLanguageSet?.inventory?.dailyStockDetailsReport }}</h4>
             mat-raised-button
             color="accent"
             class="mat_green"
-            type="submit"
+            type="button"
             [disabled]="!dailyStockDetailsForm.valid"
             (click)="
               downloadReport(true); trackFieldInteraction('Download Button')

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

@@ -276,17 +276,12 @@ export class DailyStockDetailsReportComponent implements OnInit, DoCheck {
           const blob = new Blob([buffer], {
             type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
           });
-          saveAs(blob, wb_name + '.xlsx');
-          if (navigator.msSaveBlob) {
-            navigator.msSaveBlob(blob, wb_name);
+          const filename = wb_name.replace(/ /g, '_') + '.xlsx';
+
+          if ((window as any).navigator && (window as any).navigator.msSaveBlob) {
+            (window as any).navigator.msSaveBlob(blob, filename);
           } else {
-            const link = document.createElement('a');
-            link.href = URL.createObjectURL(blob);
-            link.setAttribute('visibility', 'hidden');
-            link.download = wb_name.replace(/ /g, '_') + '.xlsx';
-            document.body.appendChild(link);
-            link.click();
-            document.body.removeChild(link);
+            saveAs(blob, filename);
           }
         });
       }

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

@@ -78,7 +78,7 @@ <h4>{{ currentLanguageSet?.inventory?.dailyStockSummaryReport }}</h4>
         <button
           mat-raised-button
           color="accent"
-          type="submit"
+          type="button"
           class="mat_green"
           [disabled]="!dailyStockSummaryForm.valid"
           (click)="

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

@@ -273,17 +273,12 @@ export class DailyStockSummaryReportComponent implements OnInit, DoCheck {
           const blob = new Blob([buffer], {
             type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
           });
-          saveAs(blob, wb_name + '.xlsx');
-          if (navigator.msSaveBlob) {
-            navigator.msSaveBlob(blob, wb_name);
+          const filename = wb_name.replace(/ /g, '_') + '.xlsx';
+
+          if ((window as any).navigator && (window as any).navigator.msSaveBlob) {
+            (window as any).navigator.msSaveBlob(blob, filename);
           } else {
-            const link = document.createElement('a');
-            link.href = URL.createObjectURL(blob);
-            link.setAttribute('visibility', 'hidden');
-            link.download = wb_name.replace(/ /g, '_') + '.xlsx';
-            document.body.appendChild(link);
-            link.click();
-            document.body.removeChild(link);
+            saveAs(blob, filename);
           }
         });
       }

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

@@ -70,7 +70,7 @@
           mat-raised-button
           color="accent"
           class="mat_green w-50"
-          type="submit"
+          type="button"
           [disabled]="!inwardStockForm.valid"
           (click)="
             downloadReport(true); trackFieldInteraction('Download Button')

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

@@ -271,17 +271,12 @@ 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) {
-            navigator.msSaveBlob(blob, wb_name);
+          const filename = wb_name.replace(/ /g, '_') + '.xlsx';
+
+          if ((window as any).navigator && (window as any).navigator.msSaveBlob) {
+            (window as any).navigator.msSaveBlob(blob, filename);
           } else {
-            const link = document.createElement('a');
-            link.href = URL.createObjectURL(blob);
-            link.setAttribute('visibility', 'hidden');
-            link.download = wb_name.replace(/ /g, '_') + '.xlsx';
-            document.body.appendChild(link);
-            link.click();
-            document.body.removeChild(link);
+            saveAs(blob, filename);
           }
         });
       }

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

@@ -68,7 +68,7 @@ <h4>{{ currentLanguageSet?.inventory?.monthlyReport }}</h4>
             mat-raised-button
             color="accent"
             class="mat_green"
-            type="submit"
+            type="button"
             [disabled]="!monthlyForm.valid"
             (click)="
               downloadReport(true); trackFieldInteraction('Download Button')

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

@@ -271,17 +271,12 @@ export class MonthlyReportComponent implements OnInit, DoCheck {
           const blob = new Blob([buffer], {
             type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
           });
-          saveAs(blob, wb_name + '.xlsx');
-          if (navigator.msSaveBlob) {
-            navigator.msSaveBlob(blob, wb_name);
+          const filename = wb_name.replace(/ /g, '_') + '.xlsx';
+
+          if ((window as any).navigator && (window as any).navigator.msSaveBlob) {
+            (window as any).navigator.msSaveBlob(blob, filename);
           } else {
-            const link = document.createElement('a');
-            link.href = URL.createObjectURL(blob);
-            link.setAttribute('visibility', 'hidden');
-            link.download = wb_name.replace(/ /g, '_') + '.xlsx';
-            document.body.appendChild(link);
-            link.click();
-            document.body.removeChild(link);
+            saveAs(blob, filename);
           }
         });
       }

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

@@ -39,7 +39,7 @@ <h4>{{ currentLanguageSet?.inventory?.shortExpiryReport }}</h4>
           mat-raised-button
           color="accent"
           class="mat_green"
-          type="submit"
+          type="button"
           (click)="
             downloadReport(true); trackFieldInteraction('Download Button')
           "

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

@@ -203,17 +203,12 @@ 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) {
-            navigator.msSaveBlob(blob, wb_name);
+          const filename = wb_name.replace(/ /g, '_') + '.xlsx';
+
+          if ((window as any).navigator && (window as any).navigator.msSaveBlob) {
+            (window as any).navigator.msSaveBlob(blob, filename);
           } else {
-            const link = document.createElement('a');
-            link.href = URL.createObjectURL(blob);
-            link.setAttribute('visibility', 'hidden');
-            link.download = wb_name.replace(/ /g, '_') + '.xlsx';
-            document.body.appendChild(link);
-            link.click();
-            document.body.removeChild(link);
+            saveAs(blob, filename);
           }
         });
       }

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

@@ -62,7 +62,7 @@ <h4>{{ currentLanguageSet?.inventory?.transitReport }}</h4>
           mat-raised-button
           color="accent"
           class="mat_green"
-          type="submit"
+          type="button"
           [disabled]="!transitForm.valid"
           (click)="
             downloadReport(true); trackFieldInteraction('Download Button')

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

@@ -239,17 +239,12 @@ 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) {
-            navigator.msSaveBlob(blob, wb_name);
+          const filename = wb_name.replace(/ /g, '_') + '.xlsx';
+
+          if ((window as any).navigator && (window as any).navigator.msSaveBlob) {
+            (window as any).navigator.msSaveBlob(blob, filename);
           } else {
-            const link = document.createElement('a');
-            link.href = URL.createObjectURL(blob);
-            link.setAttribute('visibility', 'hidden');
-            link.download = wb_name.replace(/ /g, '_') + '.xlsx';
-            document.body.appendChild(link);
-            link.click();
-            document.body.removeChild(link);
+            saveAs(blob, filename);
           }
         });
       }

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

@@ -49,7 +49,7 @@ <h4>{{ currentLanguageSet?.inventory?.yearlyReport }}</h4>
             mat-raised-button
             color="accent"
             class="mat_green"
-            type="submit"
+            type="button"
             [disabled]="!yearlyForm.valid"
             (click)="
               downloadReport(true); trackFieldInteraction('Download Button')

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

@@ -240,17 +240,12 @@ export class YearlyReportComponent implements OnInit, DoCheck {
           const blob = new Blob([buffer], {
             type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
           });
-          saveAs(blob, wb_name + '.xlsx');
-          if (navigator.msSaveBlob) {
-            navigator.msSaveBlob(blob, wb_name);
+          const filename = wb_name.replace(/ /g, '_') + '.xlsx';
+
+          if ((window as any).navigator && (window as any).navigator.msSaveBlob) {
+            (window as any).navigator.msSaveBlob(blob, filename);
           } else {
-            const link = document.createElement('a');
-            link.href = URL.createObjectURL(blob);
-            link.setAttribute('visibility', 'hidden');
-            link.download = wb_name.replace(/ /g, '_') + '.xlsx';
-            document.body.appendChild(link);
-            link.click();
-            document.body.removeChild(link);
+            saveAs(blob, filename);
           }
         });
       }