covering a case in chosing R type, added attachments field

valentin-stamate · May 23, 2022 · d0b7ef2 · d0b7ef2
1 parent 383065d
commit d0b7ef2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/app/database/models.ts b/src/app/database/models.ts
@@ -13,6 +13,7 @@ export interface EmailPreview {
     to: string;
     subject: string;
     html: string;
+    attachments: string[];
 }
 
 export interface AllowedStudent {

diff --git a/src/app/service/admin.service.ts b/src/app/service/admin.service.ts
@@ -118,6 +118,7 @@ export class AdminService {
                 to: data.emailTo,
                 subject: subject,
                 html: emailContent,
+                attachments: [],
             });
 
             if (!send) {
@@ -276,6 +277,7 @@ export class AdminService {
                 to: data.studentEmail,
                 subject: subject,
                 html: emailContent,
+                attachments: [filename],
             });
 
             if (!send) {
@@ -339,6 +341,7 @@ export class AdminService {
                 to: data.studentEmail,
                 subject: subject,
                 html: emailContent,
+                attachments: [],
             });
 
             if (!sent) {

diff --git a/src/app/services/file/xlsx.service.ts b/src/app/services/file/xlsx.service.ts
@@ -196,13 +196,18 @@ export class XLSXService {
             const year = new Date(firstRow[ReportsAnnouncementHeaders.ATTENDANCE_DATE]).getFullYear();
 
             /* rnData = [Data Prog., Data.Prez, Title] */
-            const r1Data = [new Date(firstRow[ReportsAnnouncementHeaders.R1]), new Date(secondRow[ReportsAnnouncementHeaders.R1]), thirdRow[ReportsAnnouncementHeaders.R1]];
-            const r2Data = [new Date(firstRow[ReportsAnnouncementHeaders.R2]), new Date(secondRow[ReportsAnnouncementHeaders.R2]), thirdRow[ReportsAnnouncementHeaders.R2]];
-            const r3Data = [new Date(firstRow[ReportsAnnouncementHeaders.R3]), new Date(secondRow[ReportsAnnouncementHeaders.R3]), thirdRow[ReportsAnnouncementHeaders.R3]];
+            const r1Data = [new Date(firstRow[ReportsAnnouncementHeaders.R1]), secondRow[ReportsAnnouncementHeaders.R1], thirdRow[ReportsAnnouncementHeaders.R1]];
+            const r2Data = [new Date(firstRow[ReportsAnnouncementHeaders.R2]), secondRow[ReportsAnnouncementHeaders.R2], thirdRow[ReportsAnnouncementHeaders.R2]];
+            const r3Data = [new Date(firstRow[ReportsAnnouncementHeaders.R3]), secondRow[ReportsAnnouncementHeaders.R3], thirdRow[ReportsAnnouncementHeaders.R3]];
 
             let lastData = undefined;
             let source = undefined;
 
+            /* If the cell is empty, put undefined, else put the date if it's valid or a date object otherwise */
+            r1Data[1] = r1Data[1] === undefined ? undefined : (isNaN(new Date(r1Data[1]) as any) ? new Date() : new Date(r1Data[1]));
+            r2Data[1] = r2Data[1] === undefined ? undefined : (isNaN(new Date(r2Data[1]) as any) ? new Date() : new Date(r2Data[1]));
+            r3Data[1] = r3Data[1] === undefined ? undefined : (isNaN(new Date(r3Data[1]) as any) ? new Date() : new Date(r3Data[1]));
+
             if (firstAlgorithm) {
                 /* Ia cel mai din stanga raport care nu are o data valida din 'Data Prez.' */
                 if (isNaN(r3Data[1])) {