@mrselva/attendance 1.1.2 → 1.1.3

package/README.md

@@ -30,7 +30,9 @@ attendance
 ## ✨ Features
 
 - **Zero Configuration & Auto-Import**: If no file is in `./input/`, an interactive file picker window opens so you can select your spreadsheet directly from your computer, or drag & drop file paths into the terminal.
-- **Interactive CLI Wizard**: Clean, color-coded terminal prompts to pick sheets and date filters.
+- **Cohort & Batch Support**:
+  - **3rd Year**: Exports standard whole-class roster.
+  - **2nd Year**: Automatically detects the empty row separating **Batch 1** (above the empty row) and **Batch 2** (below the empty row). Prompts you to export Batch 1, Batch 2, or Both Batches!
 - **Multi-Sheet Detection**: Automatically discovers all relevant sheets and rosters across the workbook.
 - **Smart Date Filtering**:
   - Export **All recorded dates**
@@ -47,29 +49,31 @@ attendance
 Run the interactive wizard or pass flags for automation:
 
 ```bash
-# Interactive mode
+# Interactive mode (asks Year, Batch, Sheet, Dates)
 npx @mrselva/attendance
 
-# Export all dates for a specific sheet
-npx @mrselva/attendance -v SHEET_CODE -a
+# 2nd Year - Export Batch 1
+npx @mrselva/attendance -y 2 -b 1 -v SHEET_CODE -a
 
-# Export a single date
-npx @mrselva/attendance -v SHEET_CODE -d 2024-09-12
+# 2nd Year - Export Batch 2
+npx @mrselva/attendance -y 2 -b 2 -v SHEET_CODE -a
 
-# Export the latest date recorded
-npx @mrselva/attendance -v SHEET_CODE --latest
+# 2nd Year - Export Both Batches separately
+npx @mrselva/attendance -y 2 -b all -v ALL -a
 
-# Process ALL sheets at once
-npx @mrselva/attendance -v ALL -a
+# 3rd Year - Export standard roster
+npx @mrselva/attendance -y 3 -v SHEET_CODE -a
 
 # Specify a custom input spreadsheet file
-npx @mrselva/attendance -f "attendance_sheet.xlsx" -v SHEET_CODE -a
+npx @mrselva/attendance -f "attendance_sheet.xlsx" -y 2 -b 1 -a
 ```
 
 ### Options Reference
 
 | Flag | Long Flag | Description |
 | :--- | :--- | :--- |
+| `-y <2\|3>` | `--year <2\|3>` | Academic year (`2` for 2nd year batched, `3` for 3rd year standard) |
+| `-b <1\|2\|all>` | `--batch <1\|2\|all>` | Batch selection for 2nd year (`1`, `2`, or `all` for both) |
 | `-v <code>` | `--vertical <code>` | Sheet code or name (or `ALL`) |
 | `-a` | `--all` | Export all recorded dates |
 | `-d <date>` | `--date <YYYY-MM-DD>` | Export a specific date |

package/index.js

@@ -179,7 +179,55 @@ function normalizeStatus(val) {
   return null;
 }
 
-// Parse a vertical sheet to extract students and date columns
+
+// Check if a row represents summary / totals
+function isSummaryRow(row, name, regNo) {
+  if (name && (/no\s*\.?\s*of/i.test(name) || /total/i.test(name) || /present/i.test(name) || /absent/i.test(name))) {
+    return true;
+  }
+  if (regNo && (/no\s*\.?\s*of/i.test(regNo) || /total/i.test(regNo) || /present/i.test(regNo) || /absent/i.test(regNo))) {
+    return true;
+  }
+  if (row && Array.isArray(row)) {
+    const text = row.map(cell => String(cell || '').trim()).join(' ').toLowerCase();
+    return /no\s*\.?\s*of\s*(present|absent)/i.test(text) ||
+           /\b(total\s*present|total\s*absent|no\s*\.?\s*of\s*students)\b/i.test(text);
+  }
+  return false;
+}
+
+// Calculate instructional dates for a given student roster
+function getInstructionalDates(students, dateColumns, rows) {
+  if (!students || students.length === 0) return [];
+  const instructionalDates = [];
+  for (const dc of dateColumns) {
+    let presentCount = 0;
+    let absentCount = 0;
+
+    for (const student of students) {
+      const cellVal = rows[student.rowIdx] ? rows[student.rowIdx][dc.colIdx] : null;
+      const norm = normalizeStatus(cellVal);
+      if (norm === 'PRESENT') {
+        presentCount++;
+      } else if (norm === 'ABSENT') {
+        absentCount++;
+      }
+    }
+
+    if (presentCount + absentCount > 0) {
+      instructionalDates.push({
+        ...dc,
+        presentCount,
+        absentCount,
+        totalStudents: students.length
+      });
+    }
+  }
+  instructionalDates.sort((a, b) => a.dateStr.localeCompare(b.dateStr));
+  return instructionalDates;
+}
+
+// Parse a vertical sheet to extract students (batch 1 & 2) and date columns
 function parseVerticalSheet(ws, sheetName) {
   const rows = xlsx.utils.sheet_to_json(ws, { header: 1, raw: true, defval: null });
   if (!rows || rows.length < 2) return null;
@@ -222,11 +270,20 @@ function parseVerticalSheet(ws, sheetName) {
     return null; // Not a vertical attendance sheet
   }
 
-  // Parse student records
-  const students = [];
+  // Parse student records, separating Batch 1 and Batch 2 across empty separator row
+  const batch1Students = [];
+  const batch2Students = [];
+  let currentBatch = 1;
+  let sawBlankAfterBatch1 = false;
+
   for (let r = 1; r < rows.length; r++) {
     const row = rows[r];
-    if (!row) continue;
+    if (!row || row.length === 0) {
+      if (batch1Students.length > 0 && currentBatch === 1) {
+        sawBlankAfterBatch1 = true;
+      }
+      continue;
+    }
 
     const sno = row[0];
     const name = nameColIdx !== -1 ? String(row[nameColIdx] || '').trim() : '';
@@ -235,71 +292,66 @@ function parseVerticalSheet(ws, sheetName) {
     const rollNo = rollColIdx !== -1 ? String(row[rollColIdx] || '').trim() : '';
 
     // Ignore summary/totals rows at bottom
-    const isSummary = /no\s*\.?\s*of/i.test(name) || 
-                      /no\s*\.?\s*of/i.test(regNo) || 
-                      /total/i.test(name) || 
-                      /total/i.test(regNo) ||
-                      /present/i.test(regNo) ||
-                      /absent/i.test(regNo);
-    if (isSummary) continue;
-
-    if (!name || name.length < 2) continue;
-    if (sno !== null && sno !== undefined && isNaN(Number(sno))) continue;
-    if (!regNo && !rollNo) continue;
-
-    students.push({
+    if (isSummaryRow(row, name, regNo)) {
+      break;
+    }
+
+    const isStudent = name.length >= 2 && (regNo.length > 0 || rollNo.length > 0);
+
+    if (!isStudent) {
+      if (batch1Students.length > 0 && currentBatch === 1) {
+        sawBlankAfterBatch1 = true;
+      }
+      continue;
+    }
+
+    // Valid student row
+    const snoNum = Number(sno);
+    if (batch1Students.length > 0 && currentBatch === 1 && (sawBlankAfterBatch1 || snoNum === 1)) {
+      currentBatch = 2;
+    }
+
+    const studentObj = {
       rowIdx: r,
       sno: sno,
       name: name,
       regNo: regNo,
       rollNo: rollNo,
-      email: email || ''
-    });
-  }
-
-  if (students.length === 0) return null;
-
-  // Filter dates to only those that have actual student attendance recorded
-  const instructionalDates = [];
-  for (const dc of dateColumns) {
-    let presentCount = 0;
-    let absentCount = 0;
+      email: email || '',
+      batch: currentBatch
+    };
 
-    for (const student of students) {
-      const cellVal = rows[student.rowIdx] ? rows[student.rowIdx][dc.colIdx] : null;
-      const norm = normalizeStatus(cellVal);
-      if (norm === 'PRESENT') {
-        presentCount++;
-      } else if (norm === 'ABSENT') {
-        absentCount++;
-      }
-    }
-
-    // Only if at least one student was marked PRESENT or ABSENT
-    if (presentCount + absentCount > 0) {
-      instructionalDates.push({
-        ...dc,
-        presentCount,
-        absentCount,
-        totalStudents: students.length
-      });
+    if (currentBatch === 1) {
+      batch1Students.push(studentObj);
+    } else {
+      batch2Students.push(studentObj);
     }
   }
 
-  // Sort dates chronologically
-  instructionalDates.sort((a, b) => a.dateStr.localeCompare(b.dateStr));
+  const allStudents = [...batch1Students, ...batch2Students];
+  if (allStudents.length === 0) return null;
+
+  const allDates = getInstructionalDates(allStudents, dateColumns, rows);
+  const batch1Dates = getInstructionalDates(batch1Students, dateColumns, rows);
+  const batch2Dates = getInstructionalDates(batch2Students, dateColumns, rows);
 
   return {
     sheetName,
     verticalName: VERTICAL_NAMES[sheetName] || sheetName,
-    students,
-    dates: instructionalDates,
-    allDateColumns: dateColumns
+    students: allStudents,
+    batch1Students,
+    batch2Students,
+    hasBatches: batch1Students.length > 0 && batch2Students.length > 0,
+    dates: allDates,
+    batch1Dates,
+    batch2Dates,
+    allDateColumns: dateColumns,
+    rows
   };
 }
 
 // Generate formatted Excel workbook for a single date
-function generateExportWorkbook(verticalData, dateItem, rows) {
+function generateExportWorkbook(verticalData, dateItem, rows, studentList) {
   const wb = xlsx.utils.book_new();
 
   // Export Sheet Header
@@ -307,7 +359,9 @@ function generateExportWorkbook(verticalData, dateItem, rows) {
     ['Email Id', 'Registration Id', 'Attendance *']
   ];
 
-  for (const student of verticalData.students) {
+  const students = studentList || verticalData.students;
+
+  for (const student of students) {
     const rawVal = rows[student.rowIdx] ? rows[student.rowIdx][dateItem.colIdx] : null;
     let status = normalizeStatus(rawVal);
     // On an instructional day, any unrecorded or blank student is marked ABSENT
@@ -346,6 +400,8 @@ function parseArgs() {
     endDate: null,
     latest: false,
     file: null,
+    year: null,
+    batch: null,
     help: false
   };
 
@@ -355,6 +411,10 @@ function parseArgs() {
       flags.help = true;
     } else if (a === '-v' || a === '--vertical') {
       flags.vertical = args[++i];
+    } else if (a === '-y' || a === '--year') {
+      flags.year = args[++i];
+    } else if (a === '-b' || a === '--batch') {
+      flags.batch = args[++i];
     } else if (a === '-a' || a === '--all' || a === '--all-dates') {
       flags.all = true;
     } else if (a === '-d' || a === '--date') {
@@ -512,7 +572,9 @@ Usage: npx @mrselva/attendance [options] [vertical]
        or: node index.js [options] [vertical]
 
 Options:
-  -v, --vertical <code/name>  Vertical code (e.g., AD, BW, CD, CS, DMA, EI, FW, ALL)
+  -y, --year <2|3>            Academic year (2 for 2nd year batched, 3 for 3rd year standard)
+  -b, --batch <1|2|all>       Batch selection for 2nd year (1, 2, or all)
+  -v, --vertical <code/name>  Sheet/vertical code (e.g., AD, BW, CD, CS, DMA, EI, FW, ALL)
   -a, --all                   Export all instructional dates automatically
   -d, --date <YYYY-MM-DD>     Export a single specific date
   --latest                    Export the latest instructional date
@@ -626,6 +688,63 @@ Running without options launches the interactive CLI wizard.
     process.exit(1);
   }
 
+  // Academic Year Selection (2nd Year vs 3rd Year)
+  let selectedYear = null;
+  if (flags.year) {
+    const yStr = String(flags.year).trim();
+    if (yStr.startsWith('2')) selectedYear = 2;
+    else if (yStr.startsWith('3')) selectedYear = 3;
+  }
+
+  if (!selectedYear) {
+    logHeader('Select Academic Year');
+    console.log('Choose student cohort / year:\n');
+    console.log(`  [${colors.bold}1${colors.reset}] ${colors.green}3rd Year${colors.reset} (Standard whole class / single list) [Default]`);
+    console.log(`  [${colors.bold}2${colors.reset}] ${colors.cyan}2nd Year${colors.reset} (Batched: Batch 1 & Batch 2 separated by empty row)`);
+
+    const yearAns = (await askQuestion(lines, `\nSelect year [1 or 2] (default: 1): `)).trim();
+    if (yearAns === '2' || yearAns.toLowerCase().startsWith('2')) {
+      selectedYear = 2;
+    } else {
+      selectedYear = 3;
+    }
+  }
+
+  // Batch selection for 2nd Year
+  let selectedBatch = null; // 1, 2, or 'BOTH'
+  if (selectedYear === 2) {
+    if (flags.batch) {
+      const bStr = String(flags.batch).trim().toLowerCase();
+      if (bStr === '1' || bStr === 'b1' || bStr === 'batch1' || bStr === '1st') selectedBatch = 1;
+      else if (bStr === '2' || bStr === 'b2' || bStr === 'batch2' || bStr === '2nd') selectedBatch = 2;
+      else if (bStr === 'all' || bStr === 'both' || bStr === '3') selectedBatch = 'BOTH';
+    }
+
+    if (!selectedBatch) {
+      logHeader('Select Batch for 2nd Year');
+      console.log('Choose which batch to export:\n');
+      console.log(`  [${colors.bold}1${colors.reset}] ${colors.green}Batch 1${colors.reset} (Students above the empty row) [Default]`);
+      console.log(`  [${colors.bold}2${colors.reset}] ${colors.cyan}Batch 2${colors.reset} (Students below the empty row)`);
+      console.log(`  [${colors.bold}3${colors.reset}] ${colors.yellow}Both Batches${colors.reset} (Export Batch 1 and Batch 2 separately)`);
+
+      const batchAns = (await askQuestion(lines, `\nSelect batch [1-3] (default: 1): `)).trim();
+      if (batchAns === '2' || batchAns.toLowerCase().startsWith('2')) {
+        selectedBatch = 2;
+      } else if (batchAns === '3' || batchAns.toLowerCase().startsWith('3') || batchAns.toLowerCase() === 'both' || batchAns.toLowerCase() === 'all') {
+        selectedBatch = 'BOTH';
+      } else {
+        selectedBatch = 1;
+      }
+    }
+  }
+
+  if (selectedYear === 2) {
+    const batchLabelStr = selectedBatch === 'BOTH' ? 'Both Batches (Batch 1 & Batch 2)' : `Batch ${selectedBatch}`;
+    logInfo(`Cohort: ${colors.bold}2nd Year${colors.reset} | Target: ${colors.bold}${batchLabelStr}${colors.reset}`);
+  } else {
+    logInfo(`Cohort: ${colors.bold}3rd Year (Standard Whole Class)${colors.reset}`);
+  }
+
   // Vertical Selection
   let chosenVertical = null;
   let processAll = false;
@@ -653,7 +772,18 @@ Running without options launches the interactive CLI wizard.
     verticalSheets.forEach((v, idx) => {
       const code = colors.bold + v.sheetName.padEnd(5) + colors.reset;
       const name = (v.verticalName !== v.sheetName ? `(${v.verticalName})` : '').padEnd(35);
-      const countInfo = `${colors.dim}${v.students.length} students, ${v.dates.length} dates recorded${colors.reset}`;
+      let countInfo = '';
+      if (selectedYear === 2) {
+        if (selectedBatch === 1) {
+          countInfo = `${colors.dim}${v.batch1Students.length} students (Batch 1), ${v.batch1Dates.length} dates${colors.reset}`;
+        } else if (selectedBatch === 2) {
+          countInfo = `${colors.dim}${v.batch2Students.length} students (Batch 2), ${v.batch2Dates.length} dates${colors.reset}`;
+        } else {
+          countInfo = `${colors.dim}B1: ${v.batch1Students.length} sts, B2: ${v.batch2Students.length} sts${colors.reset}`;
+        }
+      } else {
+        countInfo = `${colors.dim}${v.students.length} students, ${v.dates.length} dates recorded${colors.reset}`;
+      }
       console.log(`  [${colors.bold}${idx + 1}${colors.reset}] ${code} ${name} ${countInfo}`);
     });
     console.log(`  [${colors.bold}A${colors.reset}] ${colors.bold}ALL  ${colors.reset} (Process ALL verticals at once)`);
@@ -687,6 +817,16 @@ Running without options launches the interactive CLI wizard.
 
   const targets = processAll ? verticalSheets : [chosenVertical];
 
+  // Helper to get dates for chosen cohort & batch
+  function getDatesForVertical(vert) {
+    if (selectedYear === 2) {
+      if (selectedBatch === 1) return vert.batch1Dates;
+      if (selectedBatch === 2) return vert.batch2Dates;
+      return vert.dates;
+    }
+    return vert.dates;
+  }
+
   // Date selection logic
   let dateFilterMode = 'ALL';
   let singleDateVal = flags.date || null;
@@ -699,11 +839,13 @@ Running without options launches the interactive CLI wizard.
   } else if (flags.date) {
     dateFilterMode = 'SINGLE';
   } else if (!processAll) {
-    const totalDates = chosenVertical.dates.length;
-    const firstDate = totalDates > 0 ? chosenVertical.dates[0].dateStr : 'N/A';
-    const lastDate = totalDates > 0 ? chosenVertical.dates[totalDates - 1].dateStr : 'N/A';
+    const refDates = getDatesForVertical(chosenVertical);
+    const totalDates = refDates.length;
+    const firstDate = totalDates > 0 ? refDates[0].dateStr : 'N/A';
+    const lastDate = totalDates > 0 ? refDates[totalDates - 1].dateStr : 'N/A';
 
-    logHeader(`Date Selection for Vertical: ${chosenVertical.sheetName}`);
+    const batchNameHeader = selectedYear === 2 ? (selectedBatch === 'BOTH' ? ' (Batches 1 & 2)' : ` (Batch ${selectedBatch})`) : '';
+    logHeader(`Date Selection for Sheet: ${chosenVertical.sheetName}${batchNameHeader}`);
     console.log(`Found ${colors.bold}${totalDates}${colors.reset} instructional dates (${firstDate} to ${lastDate}).\n`);
     console.log(`  [${colors.bold}1${colors.reset}] Export ${colors.green}ALL ${totalDates} dates${colors.reset} (Recommended - generates upload files for each date)`);
     console.log(`  [${colors.bold}2${colors.reset}] Export a ${colors.cyan}single specific date${colors.reset} (e.g., ${lastDate})`);
@@ -734,65 +876,92 @@ Running without options launches the interactive CLI wizard.
   logHeader('Processing & Generating Export Files');
 
   for (const vert of targets) {
-    console.log(`\n${colors.bold}Sheet: ${vert.sheetName}${vert.verticalName !== vert.sheetName ? ' - ' + vert.verticalName : ''}${colors.reset}`);
-    console.log(`  Students: ${colors.bold}${vert.students.length}${colors.reset}`);
+    let batchesToProcess = [];
+    if (selectedYear === 2) {
+      if (selectedBatch === 1) {
+        batchesToProcess = [{ label: 'Batch1', students: vert.batch1Students, dates: vert.batch1Dates }];
+      } else if (selectedBatch === 2) {
+        batchesToProcess = [{ label: 'Batch2', students: vert.batch2Students, dates: vert.batch2Dates }];
+      } else {
+        // BOTH
+        batchesToProcess = [
+          { label: 'Batch1', students: vert.batch1Students, dates: vert.batch1Dates },
+          { label: 'Batch2', students: vert.batch2Students, dates: vert.batch2Dates }
+        ];
+      }
+    } else {
+      // 3rd Year
+      batchesToProcess = [{ label: '', students: vert.students, dates: vert.dates }];
+    }
 
-    let datesToExport = [...vert.dates];
+    for (const batchItem of batchesToProcess) {
+      const batchTag = batchItem.label ? ` (${batchItem.label})` : '';
+      console.log(`\n${colors.bold}Sheet: ${vert.sheetName}${vert.verticalName !== vert.sheetName ? ' - ' + vert.verticalName : ''}${batchTag}${colors.reset}`);
+      console.log(`  Students: ${colors.bold}${batchItem.students.length}${colors.reset}`);
 
-    if (dateFilterMode === 'SINGLE' && singleDateVal) {
-      datesToExport = datesToExport.filter(d => d.dateStr === singleDateVal);
-      if (datesToExport.length === 0) {
-        logWarn(`Date ${singleDateVal} was not found among instructional dates for ${vert.sheetName}.`);
-        const fallbackCol = vert.allDateColumns.find(d => d.dateStr === singleDateVal);
-        if (fallbackCol) {
-          datesToExport = [{ ...fallbackCol, presentCount: 0, absentCount: 0, totalStudents: vert.students.length }];
-        } else {
-          logError(`Date ${singleDateVal} does not exist in the spreadsheet!`);
-          continue;
+      if (batchItem.students.length === 0) {
+        logWarn(`No students found for ${vert.sheetName}${batchTag}. Skipping.`);
+        continue;
+      }
+
+      let datesToExport = [...batchItem.dates];
+
+      if (dateFilterMode === 'SINGLE' && singleDateVal) {
+        datesToExport = datesToExport.filter(d => d.dateStr === singleDateVal);
+        if (datesToExport.length === 0) {
+          logWarn(`Date ${singleDateVal} was not found among instructional dates for ${vert.sheetName}${batchTag}.`);
+          const fallbackCol = vert.allDateColumns.find(d => d.dateStr === singleDateVal);
+          if (fallbackCol) {
+            datesToExport = [{ ...fallbackCol, presentCount: 0, absentCount: 0, totalStudents: batchItem.students.length }];
+          } else {
+            logError(`Date ${singleDateVal} does not exist in the spreadsheet!`);
+            continue;
+          }
         }
+      } else if (dateFilterMode === 'RANGE' && dateRangeVal) {
+        datesToExport = datesToExport.filter(d => d.dateStr >= dateRangeVal.start && d.dateStr <= dateRangeVal.end);
+      } else if (dateFilterMode === 'LATEST' && datesToExport.length > 0) {
+        datesToExport = [datesToExport[datesToExport.length - 1]];
       }
-    } else if (dateFilterMode === 'RANGE' && dateRangeVal) {
-      datesToExport = datesToExport.filter(d => d.dateStr >= dateRangeVal.start && d.dateStr <= dateRangeVal.end);
-    } else if (dateFilterMode === 'LATEST' && datesToExport.length > 0) {
-      datesToExport = [datesToExport[datesToExport.length - 1]];
-    }
 
-    if (datesToExport.length === 0) {
-      logWarn(`No matching dates found to export for ${vert.sheetName}.`);
-      continue;
-    }
+      if (datesToExport.length === 0) {
+        logWarn(`No matching dates found to export for ${vert.sheetName}${batchTag}.`);
+        continue;
+      }
 
-    console.log(`  Dates to export: ${colors.bold}${datesToExport.length}${colors.reset}`);
+      console.log(`  Dates to export: ${colors.bold}${datesToExport.length}${colors.reset}`);
 
-    const ws = workbook.Sheets[vert.sheetName];
-    const rows = xlsx.utils.sheet_to_json(ws, { header: 1, raw: true, defval: null });
+      const rows = vert.rows || xlsx.utils.sheet_to_json(workbook.Sheets[vert.sheetName], { header: 1, raw: true, defval: null });
+      const zip = new AdmZip();
 
-    // Build ZIP archive directly in memory
-    const zip = new AdmZip();
+      const yearTag = selectedYear === 2 ? '2nd_Year' : '3rd_Year';
 
-    for (const dateItem of datesToExport) {
-      const fileName = `Upload_Attendance_${vert.sheetName}_${dateItem.dateStr}.xlsx`;
-      const outWb = generateExportWorkbook(vert, dateItem, rows);
-      const fileBuffer = xlsx.write(outWb, { type: 'buffer', bookType: 'xlsx' });
-      zip.addFile(fileName, fileBuffer);
-    }
+      for (const dateItem of datesToExport) {
+        const batchFileSuffix = batchItem.label ? `_${batchItem.label}` : '';
+        const fileName = `${dateItem.dateStr}_Upload_Attendance_${vert.sheetName}${batchFileSuffix}.xlsx`;
+        const outWb = generateExportWorkbook(vert, dateItem, rows, batchItem.students);
+        const fileBuffer = xlsx.write(outWb, { type: 'buffer', bookType: 'xlsx' });
+        zip.addFile(fileName, fileBuffer);
+      }
 
-    // Save only the ZIP archive in output/
-    const zipFileName = `${vert.sheetName}_Attendance.zip`;
-    const zipFilePath = path.join(OUTPUT_DIR, zipFileName);
-    zip.writeZip(zipFilePath);
+      const batchZipSuffix = batchItem.label ? `_${batchItem.label}` : '';
+      const zipBaseName = `${yearTag}_${vert.sheetName}${batchZipSuffix}_Attendance`;
+      const zipFileName = `${zipBaseName}.zip`;
+      const zipFilePath = path.join(OUTPUT_DIR, zipFileName);
+      zip.writeZip(zipFilePath);
 
-    // Clean up any previously created unzipped folder for this vertical if it exists
-    const oldVertFolder = path.join(OUTPUT_DIR, `${vert.sheetName}_Attendance`);
-    if (fs.existsSync(oldVertFolder) && fs.statSync(oldVertFolder).isDirectory()) {
-      fs.rmSync(oldVertFolder, { recursive: true, force: true });
-    }
+      // Clean up any previously created unzipped folder for this vertical if it exists
+      const oldVertFolder = path.join(OUTPUT_DIR, zipBaseName);
+      if (fs.existsSync(oldVertFolder) && fs.statSync(oldVertFolder).isDirectory()) {
+        fs.rmSync(oldVertFolder, { recursive: true, force: true });
+      }
 
-    const zipStat = fs.statSync(zipFilePath);
-    const zipSizeKb = (zipStat.size / 1024).toFixed(1);
+      const zipStat = fs.statSync(zipFilePath);
+      const zipSizeKb = (zipStat.size / 1024).toFixed(1);
 
-    logSuccess(`Generated ZIP archive containing ${datesToExport.length} export files:`);
-    console.log(`   ${colors.bold}${colors.green}${zipFilePath}${colors.reset} (${zipSizeKb} KB)`);
+      logSuccess(`Generated ZIP archive containing ${datesToExport.length} export files:`);
+      console.log(`   ${colors.bold}${colors.green}${zipFilePath}${colors.reset} (${zipSizeKb} KB)`);
+    }
   }
 
   // Final summary

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrselva/attendance",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Extract multi-sheet attendance data and export formatted Excel sheets with ZIP archives",
   "main": "index.js",
   "scripts": {
@@ -33,4 +33,4 @@
     "adm-zip": "^0.6.1",
     "xlsx": "^0.18.5"
   }
-}
+}