bug fixes

valentin-stamate · Jul 2, 2022 · 56a6679 · 56a6679
1 parent d8676cc
commit 56a6679
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 53 deletions.
diff --git a/backend/src/app/controller/admin.controller.ts b/backend/src/app/controller/admin.controller.ts
@@ -26,8 +26,6 @@ export class AdminController {
         try {
             const fileModel = await CoordinatorService.downloadFile(coordinatorId, fileId);
 
-            console.log(fileModel.name);
-
             res.setHeader('Content-disposition', 'attachment; filename=' + fileModel.name);
             res.setHeader('Content-type', fileModel.mimeType);
             res.end(fileModel.data);

diff --git a/backend/src/app/controller/coordinator.controller.ts b/backend/src/app/controller/coordinator.controller.ts
@@ -58,13 +58,9 @@ export class CoordinatorController {
 
             const fileModel = await CoordinatorService.downloadFile(coordinator.id, fileId);
 
-            console.log(fileModel.name);
-
             res.setHeader('Content-disposition', 'attachment; filename=' + fileModel.name);
             res.setHeader('Content-type', fileModel.mimeType);
 
-            console.log(fileModel.data);
-
             res.end(fileModel.data);
         } catch (err) {
             next(err);

diff --git a/backend/src/app/controller/coordinator.student.forms.controller.ts b/backend/src/app/controller/coordinator.student.forms.controller.ts
@@ -23,7 +23,6 @@ export class CoordinatorStudentFormsController {
             const fileName = `report_${UtilService.stringDate(new Date())}.zip`;
 
             res.setHeader('Content-disposition', 'attachment; filename=' + fileName);
-            console.log(ContentType.DOCX);
             res.setHeader('Content-type', ContentType.DOCX);
             res.end(buffer);
         } catch (err) {

diff --git a/backend/src/app/database/connect.ts b/backend/src/app/database/connect.ts
@@ -62,47 +62,37 @@ export async function populateDatabase() {
     });
 
     const adminModelB = AdminModel.fromObject({
-        username: 'valentin',
+        username: 'valentin.stamate',
         email: 'stamatevalentin125@gmail.com',
     });
 
-    const fullProfessorNameA = 'Prof.   univ. dr.  Buraza Costel';
+    const fullProfessorNameA = 'Prof.univ.dr. Lenuța Alboaie';
     const [professorFunctionA, professorNameA] = UtilService.splitProfessorName(fullProfessorNameA);
 
     const coordinatorModelA = CoordinatorModel.fromObject({
         name: professorNameA,
         function: professorFunctionA,
-        email: 'adriana.bejinariu20@gmail.com',
-        password: '12345!@#$%QwErT',
-    });
-
-    const fullProfessorNameB = 'Prof.   univ. dr.  Ciochina Stefan';
-    const [professorFunctionB, professorNameB] = UtilService.splitProfessorName(fullProfessorNameB);
-
-    const coordinatorModelB = CoordinatorModel.fromObject({
-        name: professorNameB,
-        function: professorFunctionB,
         email: 'stamatevalentin125@gmail.com',
-        password: 'ana.are.mere.125',
+        password: '12345',
     });
 
     const studentModelA = StudentModel.fromObject({
-        identifier: 'adriana.bejinariu',
-        fullName: 'Adriana Bejinariu',
-        email: 'adriana.bejinariu20@gmail.com',
-        alternativeEmail: 'adriana.bejinariu@info.uaic.ro',
+        identifier: 'valentin.stamate',
+        fullName: 'STAMATE D. VALENTIN',
+        email: 'stamatevalentin125@gmail.com',
+        alternativeEmail: 'valentin.stamate@info.uaic.ro',
         attendanceYear: 2019,
         coordinatorName: professorNameA,
         coordinatorFunction: professorFunctionA,
         isActive: true,
     });
 
     const studentModelB = StudentModel.fromObject({
-        identifier: 'valentin',
-        fullName: 'Valentin Aioanei',
-        email: 'stamatevalentin125@gmail.com',
-        alternativeEmail: 'valentin.stamate@info.uaic.ro',
-        attendanceYear: 2019,
+        identifier: '31091020401RSD201007',
+        fullName: 'CALANCEA C. CRISTINA-GEORGIANA',
+        email: 'geo.calancea@gmail.com',
+        alternativeEmail: 'geo.calancea@gmail.com',
+        attendanceYear: 2020,
         coordinatorName: professorNameA,
         coordinatorFunction: professorFunctionA,
         isActive: true,
@@ -111,7 +101,6 @@ export async function populateDatabase() {
     await adminRepo.save(adminModelA);
     await adminRepo.save(adminModelB);
     await coordinatorRepo.save(coordinatorModelA);
-    await coordinatorRepo.save(coordinatorModelB);
     await studentRepo.save(studentModelA);
     await studentRepo.save(studentModelB);
 

diff --git a/backend/src/app/service/admin.email.service.ts b/backend/src/app/service/admin.email.service.ts
@@ -81,9 +81,8 @@ export class AdminEmailService {
 
         const verbalProcessDataList = XLSXService.parseReportAnnouncement(file, true, startDate, endDate);
 
-
         if (getEmails) {
-            return verbalProcessDataList.map(item => `${item.coordinatorEmail}:${item.studentEmail}`);
+            return verbalProcessDataList.map(item => `${item.coordinatorEmail}`);
         }
 
         const emailEndpointResponse: EmailEndpointResponse = {
@@ -92,7 +91,7 @@ export class AdminEmailService {
         };
 
         for (let data of verbalProcessDataList) {
-            if (!emailToList.some(item => item === `${data.coordinatorEmail}:${data.studentEmail}`)) {
+            if (!emailToList.some(item => item === `${data.coordinatorEmail}`)) {
                 continue;
             }
 
@@ -155,7 +154,7 @@ export class AdminEmailService {
         const verbalProcessDataList = XLSXService.parseReportAnnouncement(file, false, startDate, endDate);
 
         if (getEmails) {
-            return verbalProcessDataList.map(item => `${item.studentEmail}:${item.coordinatorEmail}`);
+            return verbalProcessDataList.map(item => `Student:${item.studentEmail} Coordonator:${item.coordinatorEmail}`);
         }
 
         const emailEndpointResponse: EmailEndpointResponse = {
@@ -164,7 +163,8 @@ export class AdminEmailService {
         };
 
         for (const data of verbalProcessDataList) {
-            if (!emailToList.some(item => item === `${data.studentEmail}:${data.coordinatorEmail}`)) {
+            /* For some reason it works like this, without space, I don't know where dissapears */
+            if (!emailToList.some(item => item === `Student:${data.studentEmail}Coordonator:${data.coordinatorEmail}`)) {
                 continue;
             }
 

diff --git a/backend/src/app/service/admin.service.ts b/backend/src/app/service/admin.service.ts
@@ -62,19 +62,19 @@ export class AdminService {
 
         await allowedStudentsRepo.clear();
 
-        await studentsRepo.createQueryBuilder()
-            .update()
-            .set({isActive: false})
-            .execute();
+        // await studentsRepo.createQueryBuilder()
+        //     .update()
+        //     .set({isActive: false})
+        //     .execute();
 
         for (let data of allowedStudentsList) {
             const model = AllowedStudentModel.fromObject(data);
             await allowedStudentsRepo.save(model);
 
-            await studentsRepo.createQueryBuilder()
-                .update()
-                .set({isActive: true})
-                .where(`identifier = :identifier`, {identifier: model.identifier});
+            // await studentsRepo.createQueryBuilder()
+            //     .update()
+            //     .set({isActive: true})
+            //     .where(`identifier = :identifier`, {identifier: model.identifier});
 
             rowsCreated++;
         }
@@ -241,12 +241,23 @@ export class AdminService {
         const coordinators = XLSXService.parseCoordinatorsExcel(file);
 
         const coordinatorRepo = dbConnection.getRepository(CoordinatorModel);
-        await coordinatorRepo.clear();
+        // await coordinatorRepo.clear();
 
         let rowsCreated = 0;
         for (let item of coordinators) {
             const model = CoordinatorModel.fromObject(item);
-            await coordinatorRepo.create(model);
+
+            const existingCoordinator = await coordinatorRepo.findOne({
+                where: {
+                    name: model.name,
+                }
+            });
+
+            if (existingCoordinator != null) {
+                continue;
+            }
+
+            await coordinatorRepo.save(model);
             rowsCreated++;
         }
 

diff --git a/backend/src/app/service/auth.service.ts b/backend/src/app/service/auth.service.ts
@@ -212,9 +212,6 @@ export class AuthService {
         const adminRepo = dbConnection.getRepository(AdminModel);
         const authorizationKeyRepo = dbConnection.getRepository(AuthorizationKeyModel);
 
-        console.log(username);
-        console.log(email);
-
         const existingAdmin = await adminRepo.findOne({
             where: {
                 username: username,

diff --git a/backend/src/app/service/coordinator.service.ts b/backend/src/app/service/coordinator.service.ts
@@ -108,6 +108,7 @@ export class CoordinatorService {
             where: {
                 coordinatorName: coordinator.name,
                 coordinatorFunction: coordinator.function,
+                isActive: true,
             }
         });
     }

diff --git a/backend/src/app/service/student.form.service.ts b/backend/src/app/service/student.form.service.ts
@@ -76,8 +76,6 @@ export class StudentFormService {
 
         existingStudent.scientificArticleISI = existingStudent.scientificArticleISI ?? [];
 
-        console.log(existingStudent);
-
         const report = existingStudent.scientificArticleISI.find(item => `${item.id}` === reportId);
 
         if (report == null) {

diff --git a/...src/app/components/admin-email/activity-notification/activity-notification.component.html b/...src/app/components/admin-email/activity-notification/activity-notification.component.html
@@ -137,7 +137,8 @@
                 <div class="email-recipient-container">
 
                   <div class="email-recipient" *ngFor="let item of emailToList">
-                    <div>{{item}}</div>
+                    <div>{{item.split(' ')[0]}}</div>
+                    <div>{{item.split(' ')[1]}}</div>
                     <div class="email-button" (click)="onDeleteEmail(item)">x</div>
                   </div>
 

diff --git a/frontend/src/app/components/admin-users/coordinators/coordinators.component.html b/frontend/src/app/components/admin-users/coordinators/coordinators.component.html
@@ -39,7 +39,7 @@
             </label>
           </div>
 
-          <div *ngIf="filename !== ''"><small>Fișierul <b>{{filename}}</b> încărcat cu success.</small></div>
+          <div *ngIf="filenameCoordinatorFile !== ''"><small>Fișierul <b>{{filenameCoordinatorFile}}</b> încărcat cu success.</small></div>
 
           <div class="field is-grouped">
             <div class="control">

diff --git a/frontend/src/app/components/coordinator-activity/coordinator-activity.component.html b/frontend/src/app/components/coordinator-activity/coordinator-activity.component.html
@@ -160,7 +160,7 @@
                 a descărca un fișier dați click pe numele lui, iar pentru stergere, butonul roșu.
               </div>
 
-              <div class="is-flex is-flex-wrap-wrap" style="gap: 32px">
+              <div class="is-flex is-flex-wrap-wrap" style="gap: 32px; margin-top: 16px">
                 <div *ngFor="let item of files" class="is-flex">
                   <button class="button is-small" (click)="onDownloadFile(item)">{{item.name}}</button>
                   <button class="button is-small is-danger" (click)="onDeleteFile(item)">X</button>