diff --git a/event_report.xlsx b/event_report.xlsx index 2661a68..3512d84 100644 Binary files a/event_report.xlsx and b/event_report.xlsx differ diff --git a/src/controllers/ReadingReportController.ts b/src/controllers/ReadingReportController.ts index 5bd77e9..e714825 100644 --- a/src/controllers/ReadingReportController.ts +++ b/src/controllers/ReadingReportController.ts @@ -40,7 +40,7 @@ export class ReadingReportController extends Controller { const data: DeviceData[] = FullReportSchema.data; const reportParams: ReportParams = FullReportSchema.report_params; const workbook = new ExcelJS.Workbook(); - const worksheet = workbook.addWorksheet('Event Records'); + const worksheet = workbook.addWorksheet('Reading Records'); // ---------------- Logos ---------------- const jecLogoId = workbook.addImage({ @@ -55,7 +55,7 @@ export class ReadingReportController extends Controller { worksheet.addImage(jecLogoId, { tl: { col: 0, row: 0 }, - ext: { width: 120, height: 60 }, + ext: { width: 120, height: 120 }, }); worksheet.addImage(fastLogoId, { tl: { col: 7, row: 0 }, @@ -133,8 +133,13 @@ export class ReadingReportController extends Controller { for (const type of types) { const row = worksheet.getRow(currentRow); - - row.getCell(4).value = type; + if (type == 'Temperature') { + row.getCell(4).value = 'Temperature (°C)'; + } else if (type == 'Humidity') { + row.getCell(4).value = 'Humidity (%)'; + } else if (type == 'Battery') { + row.getCell(4).value = 'Battery (%)'; + } const stats = device.min_max_avg?.[type] ?? {}; row.getCell(5).value = stats.min ?? '-';