@mrselva/attendance 1.1.2 → 1.2.0

package/README.md

@@ -4,7 +4,7 @@
 [![License: ISC](https://img.shields.io/badge/License-ISC-blue.svg)](LICENSE)
 [![Node.js Version](https://img.shields.io/badge/node-%3E%3D16.0.0-brightgreen.svg)](https://nodejs.org)
 
-> A fast and lightweight CLI tool to extract, normalize, and export multi-sheet attendance spreadsheets into organized Excel files and ZIP archives.
+> A fast and lightweight CLI tool to normalize, match, and export multi-sheet attendance spreadsheets into organized DigiCampus-compatible Excel files and ZIP archives.
 
 Run instantly with **`npx`** — no installation required!
 
@@ -29,16 +29,19 @@ 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.
-- **Multi-Sheet Detection**: Automatically discovers all relevant sheets and rosters across the workbook.
+- **Zero Configuration & Auto-Import**: If no file is in `./input/`, an interactive native file picker window opens so you can click and select your spreadsheet directly from your computer, or drag & drop file paths into the terminal.
+- **Spreadsheet Normalization Engine**: Raw sheets often contain mismatched column orders, duplicate headers (like repeated departments), extra spaces in header names, and stray empty rows. The CLI automatically converts uploaded files into an understandable, standardized format, saves it to `./normalized/Normalized_<filename>.xlsx`, and uses this clean file for all operations.
+- **DigiCampus Template Integration**: Upload or browse your DigiCampus template (`Upload_Attendance.xlsx`). The CLI fills attendance directly against the exact student roster required by DigiCampus.
+- **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!
 - **Smart Date Filtering**:
   - Export **All recorded dates**
   - Export a **Single date** (e.g. `YYYY-MM-DD`)
   - Export a **Date range** (from `YYYY-MM-DD` to `YYYY-MM-DD`)
   - Export the **Latest date only**
-- **Status Normalization**: Accurately normalizes attendance status (`PRESENT`, `ABSENT`, etc.) and handles blanks cleanly.
-- **Automatic ZIP Packaging**: Compresses generated export files directly into clean ZIP archives in `./output/`.
+- **Date-First Output Naming**: Generated files inside the ZIP start with the date (e.g. `2026-10-09_Upload_Attendance_BW_Batch1.xlsx`) for easy chronological sorting.
+- **Automatic ZIP Packaging**: Compresses generated export files directly into clean ZIP archives in `./output/` with full cohort and batch metadata in the archive name.
 
 ---
 
@@ -47,30 +50,33 @@ attendance
 Run the interactive wizard or pass flags for automation:
 
 ```bash
-# Interactive mode
+# Interactive mode (prompts for File, Year, Template, 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 with template
+npx @mrselva/attendance -y 2 -b 1 -v SHEET_CODE -t "path/to/Upload_Attendance.xlsx" -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`) |
+| `-t <file>` | `--template <path>` | DigiCampus upload template Excel file (.xlsx) |
 | `-a` | `--all` | Export all recorded dates |
 | `-d <date>` | `--date <YYYY-MM-DD>` | Export a specific date |
 | | `--latest` | Export the latest recorded date |
@@ -84,6 +90,8 @@ npx @mrselva/attendance -f "attendance_sheet.xlsx" -v SHEET_CODE -a
 ```text
 your-folder/
 ├── input/                             # Place source spreadsheets here (or auto-import)
+├── normalized/                        # Clean, standardized master spreadsheets
+├── digi/                              # DigiCampus upload templates
 └── output/                            # Automatically generated ZIP archives
 ```
 

package/index.js

@@ -5,10 +5,17 @@
  * 
  * Features:
  * - Scans ./input or current directory for attendance spreadsheets (.xlsx / .xls)
- * - Interactively prompts for sheet/category selection
- * - Allows exporting all recorded dates, specific date, range, or latest date
- * - Generates individual formatted Excel files with ZIP archive in ./output
- * - Works both interactively (in terminal) and with CLI flags (--vertical, --all, etc.)
+ * - Interactively prompts for file selection or opens OS file picker
+ * - Prompts for Academic Year (3rd Year standard vs 2nd Year batched)
+ * - Prompts for optional DigiCampus template upload (Upload_Attendance.xlsx)
+ * - Normalization Engine: Automatically standardizes irregular/mismatched raw sheets,
+ *   cleans duplicate headers, fixes column orders, removes empty rows, assigns batches,
+ *   and maintains a clean standardized file in ./normalized/Normalized_<file>.xlsx
+ * - Uses the normalized workbook for all downstream parsing and exports
+ * - Supports exporting specific dates, date ranges, latest date, or all instructional dates
+ * - Generates DigiCampus-compatible Excel files ('Students' sheet with Email Id, Registration Id, Attendance *)
+ * - Packages exports into ZIP archives in ./output with metadata naming
+ * - Preserves date-first file naming (YYYY-MM-DD_Upload_Attendance_...)
  */
 
 const fs = require('fs');
@@ -21,6 +28,8 @@ const AdmZip = require('adm-zip');
 // Paths (relative to user current working directory where npx is executed)
 const INPUT_DIR = path.resolve(process.cwd(), 'input');
 const OUTPUT_DIR = path.resolve(process.cwd(), 'output');
+const NORMALIZED_DIR = path.resolve(process.cwd(), 'normalized');
+const DIGI_DIR = path.resolve(process.cwd(), 'digi');
 
 // Optional category/sheet code to display name mapping
 const VERTICAL_NAMES = {};
@@ -66,6 +75,12 @@ function ensureDirs() {
   if (!fs.existsSync(OUTPUT_DIR)) {
     fs.mkdirSync(OUTPUT_DIR, { recursive: true });
   }
+  if (!fs.existsSync(NORMALIZED_DIR)) {
+    fs.mkdirSync(NORMALIZED_DIR, { recursive: true });
+  }
+  if (!fs.existsSync(DIGI_DIR)) {
+    fs.mkdirSync(DIGI_DIR, { recursive: true });
+  }
 }
 
 // Find excel files in input folder or current working directory
@@ -179,7 +194,255 @@ 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) {
+      let norm = null;
+      if (student.attendance && student.attendance[dc.dateStr] !== undefined) {
+        norm = student.attendance[dc.dateStr];
+      } else if (rows && student.rowIdx !== undefined) {
+        const cellVal = rows[student.rowIdx] ? rows[student.rowIdx][dc.colIdx] : null;
+        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;
+}
+
+/**
+ * Normalization Engine:
+ * Converts raw uploaded attendance sheets with mismatched column orders, duplicate headers,
+ * extra spaces, and irregular blank rows into a unified, clean default format workbook.
+ * 
+ * Standardized columns per sheet:
+ * ['S.No', 'Student Name', 'Register Number', 'Roll Number', 'Email Id', 'Department', 'Section', 'Gender', 'Batch', ...dateStrings]
+ */
+function createNormalizedWorkbook(rawWorkbook, selectedYear = 2) {
+  const normWb = xlsx.utils.book_new();
+  const excludedSheets = ['pivot table', 'summary', 'template', 'students data', 'student data', 'long leave'];
+  let sheetCount = 0;
+
+  for (const sheetName of rawWorkbook.SheetNames) {
+    if (excludedSheets.some(ex => sheetName.toLowerCase().includes(ex))) {
+      continue;
+    }
+    const ws = rawWorkbook.Sheets[sheetName];
+    const rows = xlsx.utils.sheet_to_json(ws, { header: 1, raw: true, defval: null });
+    if (!rows || rows.length < 2) continue;
+
+    const headerRow = rows[0];
+    let snoColIdx = -1;
+    let nameColIdx = -1;
+    let regColIdx = -1;
+    let rollColIdx = -1;
+    let emailColIdx = -1;
+    let deptColIdx = -1;
+    let secColIdx = -1;
+    let genderColIdx = -1;
+    const dateColumns = [];
+
+    for (let c = 0; c < headerRow.length; c++) {
+      const hVal = headerRow[c];
+      if (hVal === null || hVal === undefined) continue;
+      const hStr = String(hVal).trim().toLowerCase();
+
+      if (hStr.includes('register') || hStr.includes('reg no') || hStr.includes('reg.') || hStr.includes('registration id')) {
+        regColIdx = c;
+      } else if (hStr.includes('student name') || hStr === 'name') {
+        nameColIdx = c;
+      } else if (hStr.includes('kite email')) {
+        emailColIdx = c;
+      } else if (emailColIdx === -1 && (hStr.includes('email id') || hStr.includes('email') || hStr.includes('mail')) && !hStr.includes('soi')) {
+        emailColIdx = c;
+      } else if (hStr.includes('roll number') || hStr.includes('roll no')) {
+        rollColIdx = c;
+      } else if (hStr.includes('s.no') || hStr === 'sno' || hStr.includes('sl.no')) {
+        snoColIdx = c;
+      } else if (deptColIdx === -1 && (hStr.includes('department') || hStr === 'dept' || hStr === 'branch')) {
+        deptColIdx = c;
+      } else if (secColIdx === -1 && (hStr.includes('section') || hStr === 'sec')) {
+        secColIdx = c;
+      } else if (genderColIdx === -1 && (hStr.includes('gender') || hStr === 'sex')) {
+        genderColIdx = c;
+      } else {
+        const cellAddress = xlsx.utils.encode_cell({ r: 0, c: c });
+        const cellRaw = ws[cellAddress];
+        const dateStr = formatDate(hVal, cellRaw);
+        if (dateStr) {
+          dateColumns.push({ colIdx: c, dateStr });
+        }
+      }
+    }
+
+    if (regColIdx === -1 || dateColumns.length === 0) {
+      continue; // Skip non-vertical sheets
+    }
+
+    const stdHeader = [
+      'S.No',
+      'Student Name',
+      'Register Number',
+      'Roll Number',
+      'Email Id',
+      'Department',
+      'Section',
+      'Gender',
+      'Batch',
+      ...dateColumns.map(d => d.dateStr)
+    ];
+
+    const normData = [stdHeader];
+    let currentBatch = 1;
+    let sawBlankAfterBatch1 = false;
+    let studentCounter = 0;
+
+    for (let r = 1; r < rows.length; r++) {
+      const row = rows[r];
+      if (!row || row.length === 0) {
+        if (studentCounter > 0 && currentBatch === 1) {
+          sawBlankAfterBatch1 = true;
+        }
+        continue;
+      }
+
+      const name = nameColIdx !== -1 ? String(row[nameColIdx] || '').trim() : '';
+      const regNo = regColIdx !== -1 ? String(row[regColIdx] || '').trim() : '';
+      if (isSummaryRow(row, name, regNo)) break;
+
+      const rollNo = rollColIdx !== -1 ? String(row[rollColIdx] || '').trim() : '';
+      const email = emailColIdx !== -1 ? String(row[emailColIdx] || '').trim() : '';
+      const dept = deptColIdx !== -1 ? String(row[deptColIdx] || '').trim() : '';
+      const sec = secColIdx !== -1 ? String(row[secColIdx] || '').trim() : '';
+      const gender = genderColIdx !== -1 ? String(row[genderColIdx] || '').trim() : '';
+
+      const isStudent = name.length >= 2 && (regNo.length > 0 || rollNo.length > 0);
+      if (!isStudent) {
+        if (studentCounter > 0 && currentBatch === 1) {
+          sawBlankAfterBatch1 = true;
+        }
+        continue;
+      }
+
+      // Switch to Batch 2 in 2nd Year when empty separator row was encountered
+      if (selectedYear === 2 && currentBatch === 1 && sawBlankAfterBatch1) {
+        currentBatch = 2;
+      }
+
+      studentCounter++;
+      const attendanceRow = dateColumns.map(dc => normalizeStatus(row[dc.colIdx]) || '');
+
+      normData.push([
+        studentCounter,
+        name,
+        regNo,
+        rollNo,
+        email,
+        dept,
+        sec,
+        gender,
+        selectedYear === 2 ? `Batch ${currentBatch}` : 'Batch 1',
+        ...attendanceRow
+      ]);
+    }
+
+    const normWs = xlsx.utils.aoa_to_sheet(normData);
+    normWs['!cols'] = [
+      { wch: 6 },
+      { wch: 25 },
+      { wch: 18 },
+      { wch: 15 },
+      { wch: 35 },
+      { wch: 20 },
+      { wch: 10 },
+      { wch: 10 },
+      { wch: 12 },
+      ...dateColumns.map(() => ({ wch: 12 }))
+    ];
+
+    xlsx.utils.book_append_sheet(normWb, normWs, sheetName);
+    sheetCount++;
+  }
+
+  return { normWb, sheetCount };
+}
+
+// Load DigiCampus Upload Template (e.g. Upload_Attendance.xlsx)
+function loadTemplate(filePath) {
+  if (!filePath || !fs.existsSync(filePath)) return null;
+  const wb = xlsx.readFile(filePath);
+  const sheetName = wb.SheetNames[0];
+  const ws = wb.Sheets[sheetName];
+  const rows = xlsx.utils.sheet_to_json(ws, { header: 1, raw: true, defval: '' });
+  if (!rows || rows.length < 2) return null;
+
+  const headerRow = rows[0];
+  let emailCol = -1;
+  let regCol = -1;
+  let attCol = -1;
+
+  for (let c = 0; c < headerRow.length; c++) {
+    const h = String(headerRow[c] || '').trim().toLowerCase();
+    if (h.includes('email')) emailCol = c;
+    else if (h.includes('reg')) regCol = c;
+    else if (h.includes('attend')) attCol = c;
+  }
+
+  if (emailCol === -1 || regCol === -1) return null;
+
+  const students = [];
+  for (let r = 1; r < rows.length; r++) {
+    const row = rows[r];
+    const email = String(row[emailCol] || '').trim();
+    const regNo = String(row[regCol] || '').trim();
+    if (!email && !regNo) continue;
+    students.push({
+      email,
+      regNo,
+      defaultStatus: attCol !== -1 ? String(row[attCol] || '').trim() : ''
+    });
+  }
+
+  return { sheetName, students };
+}
+
+// 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;
@@ -190,6 +453,11 @@ function parseVerticalSheet(ws, sheetName) {
   let nameColIdx = -1;
   let emailColIdx = -1;
   let rollColIdx = -1;
+  let batchColIdx = -1;
+  let deptColIdx = -1;
+  let secColIdx = -1;
+  let genderColIdx = -1;
+  let snoColIdx = -1;
   const dateColumns = [];
 
   // Analyze header row
@@ -203,10 +471,22 @@ function parseVerticalSheet(ws, sheetName) {
       regColIdx = c;
     } else if (hStr.includes('student name') || hStr === 'name') {
       nameColIdx = c;
-    } else if (hStr.includes('email id') || hStr.includes('email') || hStr.includes('mail')) {
+    } else if (hStr.includes('kite email')) {
+      emailColIdx = c;
+    } else if (emailColIdx === -1 && (hStr.includes('email id') || hStr.includes('email') || hStr.includes('mail')) && !hStr.includes('soi')) {
       emailColIdx = c;
     } else if (hStr.includes('roll number') || hStr.includes('roll no')) {
       rollColIdx = c;
+    } else if (hStr.includes('s.no') || hStr === 'sno' || hStr.includes('sl.no')) {
+      snoColIdx = c;
+    } else if (hStr === 'batch') {
+      batchColIdx = c;
+    } else if (deptColIdx === -1 && (hStr.includes('department') || hStr === 'dept' || hStr === 'branch')) {
+      deptColIdx = c;
+    } else if (secColIdx === -1 && (hStr.includes('section') || hStr === 'sec')) {
+      secColIdx = c;
+    } else if (genderColIdx === -1 && (hStr.includes('gender') || hStr === 'sex')) {
+      genderColIdx = c;
     } else {
       const cellAddress = xlsx.utils.encode_cell({ r: 0, c: c });
       const cellRaw = ws[cellAddress];
@@ -222,84 +502,105 @@ 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
+  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 sno = snoColIdx !== -1 ? row[snoColIdx] : r;
     const name = nameColIdx !== -1 ? String(row[nameColIdx] || '').trim() : '';
     const regNo = regColIdx !== -1 ? String(row[regColIdx] || '').trim() : '';
     const email = emailColIdx !== -1 ? String(row[emailColIdx] || '').trim() : '';
     const rollNo = rollColIdx !== -1 ? String(row[rollColIdx] || '').trim() : '';
+    const dept = deptColIdx !== -1 ? String(row[deptColIdx] || '').trim() : '';
+    const sec = secColIdx !== -1 ? String(row[secColIdx] || '').trim() : '';
+    const gender = genderColIdx !== -1 ? String(row[genderColIdx] || '').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({
-      rowIdx: r,
-      sno: sno,
-      name: name,
-      regNo: regNo,
-      rollNo: rollNo,
-      email: email || ''
-    });
-  }
-
-  if (students.length === 0) return null;
+    if (isSummaryRow(row, name, regNo)) {
+      break;
+    }
 
-  // Filter dates to only those that have actual student attendance recorded
-  const instructionalDates = [];
-  for (const dc of dateColumns) {
-    let presentCount = 0;
-    let absentCount = 0;
+    const isStudent = name.length >= 2 && (regNo.length > 0 || rollNo.length > 0);
+    if (!isStudent) {
+      if (batch1Students.length > 0 && currentBatch === 1) {
+        sawBlankAfterBatch1 = true;
+      }
+      continue;
+    }
 
-    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++;
+    // Determine batch (from normalized batch column or blank row boundary)
+    if (batchColIdx !== -1) {
+      const bStr = String(row[batchColIdx] || '').toLowerCase();
+      currentBatch = bStr.includes('2') ? 2 : 1;
+    } else {
+      if (batch1Students.length > 0 && currentBatch === 1 && sawBlankAfterBatch1) {
+        currentBatch = 2;
       }
     }
 
-    // Only if at least one student was marked PRESENT or ABSENT
-    if (presentCount + absentCount > 0) {
-      instructionalDates.push({
-        ...dc,
-        presentCount,
-        absentCount,
-        totalStudents: students.length
-      });
+    // Build attendance dictionary for each date
+    const attendance = {};
+    for (const dc of dateColumns) {
+      const cellVal = row[dc.colIdx];
+      attendance[dc.dateStr] = normalizeStatus(cellVal) || '';
+    }
+
+    const studentObj = {
+      rowIdx: r,
+      sno,
+      name,
+      regNo,
+      rollNo,
+      email: email || '',
+      dept,
+      sec,
+      gender,
+      batch: currentBatch,
+      attendance
+    };
+
+    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) {
+// Generate formatted Excel workbook for a single date (DigiCampus Upload format)
+function generateExportWorkbook(verticalData, dateItem, rows, studentList, parsedTemplate) {
   const wb = xlsx.utils.book_new();
 
   // Export Sheet Header
@@ -307,19 +608,92 @@ function generateExportWorkbook(verticalData, dateItem, rows) {
     ['Email Id', 'Registration Id', 'Attendance *']
   ];
 
-  for (const student of verticalData.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
-    if (!status) {
-      status = 'ABSENT';
+  const students = studentList || verticalData.students;
+
+  if (parsedTemplate && parsedTemplate.students && parsedTemplate.students.length > 0) {
+    // Build lookup maps for fast matching
+    const studentByReg = new Map();
+    const studentByEmail = new Map();
+
+    for (const st of students) {
+      if (st.regNo) studentByReg.set(st.regNo.toUpperCase().trim(), st);
+      if (st.email) studentByEmail.set(st.email.toLowerCase().trim(), st);
+    }
+
+    // Check how many students in the template match this cohort
+    let matchCount = 0;
+    for (const ts of parsedTemplate.students) {
+      const tReg = (ts.regNo || '').toUpperCase().trim();
+      const tEmail = (ts.email || '').toLowerCase().trim();
+      if ((tReg && studentByReg.has(tReg)) || (tEmail && studentByEmail.has(tEmail))) {
+        matchCount++;
+      }
+    }
+
+    if (matchCount > 0) {
+      // Use exact template roster and fill attendance
+      for (const tStudent of parsedTemplate.students) {
+        const tReg = (tStudent.regNo || '').toUpperCase().trim();
+        const tEmail = (tStudent.email || '').toLowerCase().trim();
+
+        let matched = null;
+        if (tReg && studentByReg.has(tReg)) {
+          matched = studentByReg.get(tReg);
+        } else if (tEmail && studentByEmail.has(tEmail)) {
+          matched = studentByEmail.get(tEmail);
+        }
+
+        let status = 'ABSENT';
+        if (matched) {
+          if (matched.attendance && matched.attendance[dateItem.dateStr]) {
+            status = matched.attendance[dateItem.dateStr];
+          } else if (rows && matched.rowIdx !== undefined) {
+            const rawVal = rows[matched.rowIdx] ? rows[matched.rowIdx][dateItem.colIdx] : null;
+            status = normalizeStatus(rawVal) || 'ABSENT';
+          }
+        }
+
+        wsData.push([
+          tStudent.email,
+          tStudent.regNo,
+          status
+        ]);
+      }
+    } else {
+      // Fallback to vertical roster if template had 0 matches for this vertical
+      for (const student of students) {
+        let status = 'ABSENT';
+        if (student.attendance && student.attendance[dateItem.dateStr]) {
+          status = student.attendance[dateItem.dateStr];
+        } else if (rows && student.rowIdx !== undefined) {
+          const rawVal = rows[student.rowIdx] ? rows[student.rowIdx][dateItem.colIdx] : null;
+          status = normalizeStatus(rawVal) || 'ABSENT';
+        }
+
+        wsData.push([
+          student.email,
+          student.regNo,
+          status
+        ]);
+      }
     }
+  } else {
+    // Standard vertical roster
+    for (const student of students) {
+      let status = 'ABSENT';
+      if (student.attendance && student.attendance[dateItem.dateStr]) {
+        status = student.attendance[dateItem.dateStr];
+      } else if (rows && student.rowIdx !== undefined) {
+        const rawVal = rows[student.rowIdx] ? rows[student.rowIdx][dateItem.colIdx] : null;
+        status = normalizeStatus(rawVal) || 'ABSENT';
+      }
 
-    wsData.push([
-      student.email,
-      student.regNo,
-      status
-    ]);
+      wsData.push([
+        student.email,
+        student.regNo,
+        status
+      ]);
+    }
   }
 
   const ws = xlsx.utils.aoa_to_sheet(wsData);
@@ -335,17 +709,18 @@ function generateExportWorkbook(verticalData, dateItem, rows) {
   return wb;
 }
 
-// Parse Command Line Arguments (allows both CLI flags and interactive mode)
+// Parse Command Line Arguments
 function parseArgs() {
   const args = process.argv.slice(2);
   const flags = {
     vertical: null,
     all: false,
     date: null,
-    startDate: null,
-    endDate: null,
     latest: false,
     file: null,
+    year: null,
+    batch: null,
+    template: null,
     help: false
   };
 
@@ -355,6 +730,12 @@ 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 === '-t' || a === '--template') {
+      flags.template = args[++i];
     } else if (a === '-a' || a === '--all' || a === '--all-dates') {
       flags.all = true;
     } else if (a === '-d' || a === '--date') {
@@ -385,7 +766,7 @@ function cleanPath(input) {
 }
 
 // Open native OS file picker dialog
-function openFileDialog() {
+function openFileDialog(title = 'Select Attendance Spreadsheet') {
   const platform = process.platform;
   try {
     if (platform === 'win32') {
@@ -393,7 +774,7 @@ function openFileDialog() {
 Add-Type -AssemblyName System.Windows.Forms
 $dlg = New-Object System.Windows.Forms.OpenFileDialog
 $dlg.Filter = 'Excel Files (*.xlsx;*.xls)|*.xlsx;*.xls|All Files (*.*)|*.*'
-$dlg.Title = 'Select Attendance Spreadsheet'
+$dlg.Title = '${title.replace(/'/g, "''")}'
 $dlg.RestoreDirectory = $true
 $result = $dlg.ShowDialog()
 if ($result -eq [System.Windows.Forms.DialogResult]::OK) {
@@ -407,14 +788,14 @@ if ($result -eq [System.Windows.Forms.DialogResult]::OK) {
       });
       return output ? output.trim() : null;
     } else if (platform === 'darwin') {
-      const appleScript = 'POSIX path of (choose file with prompt "Select Attendance Spreadsheet" of type {"xlsx", "xls"})';
+      const appleScript = `POSIX path of (choose file with prompt "${title}" of type {"xlsx", "xls"})`;
       const output = execFileSync('osascript', ['-e', appleScript], {
         encoding: 'utf8',
         stdio: ['ignore', 'pipe', 'ignore']
       });
       return output ? output.trim() : null;
     } else {
-      const output = execFileSync('zenity', ['--file-selection', '--file-filter=Excel files | *.xlsx *.xls', '--title=Select Attendance Spreadsheet'], {
+      const output = execFileSync('zenity', ['--file-selection', '--file-filter=Excel files | *.xlsx *.xls', `--title=${title}`], {
         encoding: 'utf8',
         stdio: ['ignore', 'pipe', 'ignore']
       });
@@ -457,6 +838,25 @@ function importFileToInput(srcPath) {
   };
 }
 
+// Copy / import a selected template into ./digi/
+function importTemplateToDigi(srcPath) {
+  ensureDirs();
+  const fileName = path.basename(srcPath);
+  const destPath = path.join(DIGI_DIR, fileName);
+
+  if (path.resolve(srcPath) !== path.resolve(destPath)) {
+    try {
+      fs.copyFileSync(srcPath, destPath);
+      logSuccess(`Imported template "${fileName}" into ./digi/ folder!`);
+      return destPath;
+    } catch (err) {
+      logWarn(`Could not copy into ./digi/ (${err.message}). Using original path.`);
+      return srcPath;
+    }
+  }
+  return destPath;
+}
+
 // Interactive prompt for file selection when needed
 async function promptForFile(lines) {
   logHeader('Select Attendance Spreadsheet');
@@ -483,7 +883,7 @@ async function promptForFile(lines) {
       }
     } else {
       console.log(`${colors.dim}Opening file picker dialog... Please select your file in the window.${colors.reset}`);
-      const picked = openFileDialog();
+      const picked = openFileDialog('Select Attendance Spreadsheet');
       if (picked && fs.existsSync(picked) && fs.statSync(picked).isFile()) {
         return picked;
       }
@@ -512,7 +912,10 @@ 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)
+  -t, --template <path>       DigiCampus upload template Excel file (.xlsx)
   -a, --all                   Export all instructional dates automatically
   -d, --date <YYYY-MM-DD>     Export a single specific date
   --latest                    Export the latest instructional date
@@ -540,6 +943,7 @@ Running without options launches the interactive CLI wizard.
   });
   const lines = rl[Symbol.asyncIterator]();
 
+  // 1. Select / Import Input Attendance File
   if (flags.file) {
     const directPath = path.resolve(process.cwd(), flags.file);
     const inInputPath = path.join(INPUT_DIR, flags.file);
@@ -558,7 +962,6 @@ Running without options launches the interactive CLI wizard.
     const inputFiles = findInputFiles();
 
     if (inputFiles.length === 0) {
-      // Auto prompt to browse or drag & drop when input/ is empty
       const chosen = await promptForFile(lines);
       selectedFileObj = importFileToInput(chosen);
     } else if (inputFiles.length === 1) {
@@ -593,19 +996,117 @@ Running without options launches the interactive CLI wizard.
     }
   }
 
-  const inputFilePath = selectedFileObj.fullPath;
-  logInfo(`Reading attendance workbook: ${colors.bold}${selectedFileObj.relativePath || selectedFileObj.name}${colors.reset}`);
-  
-  let workbook;
+  // 2. Academic Year Selection (needed for cohort batch separation during normalization)
+  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;
+    }
+  }
+
+  // 3. DigiCampus Template Upload / Selection
+  let parsedTemplate = null;
+  let templateFilePath = null;
+
+  if (flags.template) {
+    const directT = path.resolve(process.cwd(), flags.template);
+    const inDigiT = path.join(DIGI_DIR, flags.template);
+    if (fs.existsSync(directT) && fs.statSync(directT).isFile()) {
+      templateFilePath = directT;
+    } else if (fs.existsSync(inDigiT) && fs.statSync(inDigiT).isFile()) {
+      templateFilePath = inDigiT;
+    } else {
+      logWarn(`Template file "${flags.template}" not found. Proceeding without template.`);
+    }
+  } else {
+    logHeader('DigiCampus Upload Template');
+    console.log('Upload a DigiCampus template (Upload_Attendance.xlsx) to match exact student rosters:');
+    console.log(`  [${colors.bold}1${colors.reset}] ${colors.green}Browse template file${colors.reset} (Opens file picker window) [Default]`);
+    console.log(`  [${colors.bold}2${colors.reset}] ${colors.cyan}Enter or drag & drop template path${colors.reset}`);
+    console.log(`  [${colors.bold}3${colors.reset}] ${colors.dim}Skip template${colors.reset} (Export directly from attendance sheet roster)\n`);
+
+    const tChoice = (await askQuestion(lines, `Choose option [1-3] (default: 1): `)).trim();
+
+    if (tChoice === '2') {
+      const manualT = await askQuestion(lines, 'Enter or drag & drop template file path: ');
+      const cleanedT = cleanPath(manualT);
+      if (cleanedT && fs.existsSync(cleanedT) && fs.statSync(cleanedT).isFile()) {
+        templateFilePath = cleanedT;
+      } else if (cleanedT) {
+        logWarn(`Template file not found at "${cleanedT}". Continuing without template.`);
+      }
+    } else if (tChoice === '3' || tChoice.toLowerCase() === 's' || tChoice.toLowerCase() === 'skip') {
+      logInfo('Skipping DigiCampus template. Exporting directly from attendance sheet roster.');
+    } else {
+      // Default: 1 (Browse dialog)
+      console.log(`${colors.dim}Opening file picker dialog... Please select your DigiCampus template.${colors.reset}`);
+      const pickedT = openFileDialog('Select DigiCampus Template (Upload_Attendance.xlsx)');
+      if (pickedT && fs.existsSync(pickedT) && fs.statSync(pickedT).isFile()) {
+        templateFilePath = pickedT;
+      } else {
+        logInfo('No template file selected. Continuing with attendance sheet roster.');
+      }
+    }
+  }
+
+  if (templateFilePath) {
+    const importedTPath = importTemplateToDigi(templateFilePath);
+    parsedTemplate = loadTemplate(importedTPath);
+    if (parsedTemplate && parsedTemplate.students.length > 0) {
+      logSuccess(`Loaded DigiCampus template with ${colors.bold}${parsedTemplate.students.length}${colors.reset} students.`);
+    } else {
+      logWarn('Uploaded template contained no student records. Continuing with attendance sheet roster.');
+      parsedTemplate = null;
+    }
+  }
+
+  // 4. Normalization Engine: Standardize uploaded spreadsheet
+  logHeader('Standardizing & Normalizing Attendance Sheet');
+  logInfo(`Reading raw workbook: ${colors.bold}${selectedFileObj.relativePath || selectedFileObj.name}${colors.reset}`);
+
+  let rawWorkbook;
   try {
-    workbook = xlsx.readFile(inputFilePath, { cellDates: false });
+    rawWorkbook = xlsx.readFile(selectedFileObj.fullPath, { cellDates: false });
   } catch (err) {
     logError(`Failed to read Excel file: ${err.message}`);
     rl.close();
     process.exit(1);
   }
 
-  // Discover all vertical sheets
+  const { normWb, sheetCount } = createNormalizedWorkbook(rawWorkbook, selectedYear);
+  if (sheetCount === 0) {
+    logError('No valid vertical attendance sheets with students and dates could be normalized.');
+    rl.close();
+    process.exit(1);
+  }
+
+  const normBaseName = path.basename(selectedFileObj.name, path.extname(selectedFileObj.name));
+  const normFileName = `Normalized_${normBaseName}.xlsx`;
+  const normFilePath = path.join(NORMALIZED_DIR, normFileName);
+  xlsx.writeFile(normWb, normFilePath);
+
+  logSuccess(`Standardized ${sheetCount} vertical sheet(s) into default format!`);
+  logSuccess(`Saved clean normalized workbook to: ${colors.bold}normalized/${normFileName}${colors.reset}`);
+  logInfo(`Using standardized workbook for all export operations.`);
+
+  // Use the clean, standardized workbook as the active workbook
+  const workbook = normWb;
+
+  // 5. Discover all vertical sheets from normalized workbook
   const verticalSheets = [];
   const excludedSheets = ['pivot table', 'summary', 'template', 'students data'];
 
@@ -621,12 +1122,47 @@ Running without options launches the interactive CLI wizard.
   }
 
   if (verticalSheets.length === 0) {
-    logError('No valid vertical attendance sheets with students and date columns were found.');
+    logError('No valid vertical attendance sheets were found in the standardized workbook.');
     rl.close();
     process.exit(1);
   }
 
-  // Vertical Selection
+  // 6. 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}`);
+  }
+
+  // 7. Vertical Selection
   let chosenVertical = null;
   let processAll = false;
 
@@ -645,7 +1181,6 @@ Running without options launches the interactive CLI wizard.
     }
   }
 
-  // Interactive selection if not resolved from flags
   if (!chosenVertical && !processAll) {
     logHeader('Select Vertical');
     console.log('Available verticals found in the spreadsheet:\n');
@@ -653,7 +1188,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,7 +1233,16 @@ Running without options launches the interactive CLI wizard.
 
   const targets = processAll ? verticalSheets : [chosenVertical];
 
-  // Date selection logic
+  function getDatesForVertical(vert) {
+    if (selectedYear === 2) {
+      if (selectedBatch === 1) return vert.batch1Dates;
+      if (selectedBatch === 2) return vert.batch2Dates;
+      return vert.dates;
+    }
+    return vert.dates;
+  }
+
+  // 8. Date selection logic
   let dateFilterMode = 'ALL';
   let singleDateVal = flags.date || null;
   let dateRangeVal = null;
@@ -699,11 +1254,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})`);
@@ -730,74 +1287,101 @@ Running without options launches the interactive CLI wizard.
 
   rl.close();
 
-  // Process selected verticals
+  // 9. Process selected verticals and generate export files
   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;
       }
-    } 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;
-    }
+      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 recorded 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]];
+      }
 
-    console.log(`  Dates to export: ${colors.bold}${datesToExport.length}${colors.reset}`);
+      if (datesToExport.length === 0) {
+        logWarn(`No matching dates found to export for ${vert.sheetName}${batchTag}.`);
+        continue;
+      }
 
-    const ws = workbook.Sheets[vert.sheetName];
-    const rows = xlsx.utils.sheet_to_json(ws, { header: 1, raw: true, defval: null });
+      console.log(`  Dates to export: ${colors.bold}${datesToExport.length}${colors.reset}`);
 
-    // Build ZIP archive directly in memory
-    const zip = new AdmZip();
+      const rows = vert.rows || xlsx.utils.sheet_to_json(workbook.Sheets[vert.sheetName], { header: 1, raw: true, defval: null });
+      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, parsedTemplate);
+        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 legacy unzipped folder if any existed
+      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
   logHeader('Export Complete');
-  console.log(`Check the ${colors.bold}${colors.cyan}./output${colors.reset} directory for all generated files and ZIP archives.\n`);
+  console.log(`Normalized master file: ${colors.bold}${colors.cyan}./normalized/${normFileName}${colors.reset}`);
+  console.log(`DigiCampus export archives: ${colors.bold}${colors.green}./output/*.zip${colors.reset}\n`);
 }
 
 main().catch(err => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrselva/attendance",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "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"
   }
-}
+}