include year in excel filename

EyeSeeTea · Nov 19, 2024 · 5139248 · 5139248
1 parent 47e0009
commit 5139248
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/pages/country-indicator-report/CountryIndicatorReport.tsx b/src/pages/country-indicator-report/CountryIndicatorReport.tsx
@@ -84,12 +84,13 @@ export const CountryIndicatorReport = React.memo(() => {
             : undefined;
 
     const downloadReport = () => {
-        if (indicatorReport && orgUnit && selectedPeriod) {
+        if (indicatorReport && orgUnit && selectedPeriod && year) {
             buildSpreadSheet({
                 indicatorReport,
                 countryName: orgUnit.displayName,
                 period: selectedPeriod,
                 settings,
+                year,
             }).then(downloadFile);
         }
     };

diff --git a/src/pages/country-indicator-report/excel-report.ts b/src/pages/country-indicator-report/excel-report.ts
@@ -12,24 +12,26 @@ type SpreadSheetOptions = {
     countryName: string;
     settings: UniqueBeneficiariesSettings[];
     period: UniqueBeneficiariesPeriod;
+    year: number;
 };
 
 export async function buildSpreadSheet(options: SpreadSheetOptions) {
-    const { indicatorReport, countryName } = options;
+    const { indicatorReport, countryName, year } = options;
     const workbook = new ExcelJS.Workbook();
     const sheet = workbook.addWorksheet(i18n.t("Country Projects & Indicators"));
     sheet.columns = generateColumns();
     generateRows(options, sheet);
-    return generateFileInBuffer(workbook, countryName, indicatorReport);
+    return generateFileInBuffer(workbook, countryName, indicatorReport, year);
 }
 
 async function generateFileInBuffer(
     workbook: ExcelJS.Workbook,
     countryName: string,
-    indicatorReport: IndicatorReport
+    indicatorReport: IndicatorReport,
+    year: number
 ) {
     const buffer = await workbook.xlsx.writeBuffer();
-    const filename = `${countryName.toLowerCase()}_${indicatorReport.period.name.toLowerCase()}_report.xlsx`;
+    const filename = `${countryName.toLowerCase()}_${indicatorReport.period.name.toLowerCase()}_${year}_report.xlsx`;
     return { buffer, filename };
 }