Implementación de corrección de cronograma de actividades

sistema-mantenimiento-front/src/app/components/personal-management/employee/schedule-activities/form-schedule-activity/form-schedule-activity.component.ts

@@ -221,7 +221,9 @@ export class FormScheduleActivityComponent implements OnInit{
     this.isLoading = true;
     
     const encActivity: string = await this._encService.encrypt(this.idActivity.toString());
-    await lastValueFrom(this._employeeService.getScheduleActivitiesByActivity(encActivity)).then(
+    const USER: string = this.resourcesService.getUser();
+    const LINE: number = this.resourcesService.getLineNumber();
+    await lastValueFrom(this._employeeService.getScheduleActivitiesByActivity(encActivity, USER, LINE)).then(
       async ( responseData: ResponseDataActivityEmployee ) => {
         if (!responseData.error) {
           

sistema-mantenimiento-front/src/app/components/personal-management/employee/schedule-activities/schedule-activities.component.html

@@ -8,7 +8,7 @@
         }
 
         <nav class="override-nav">
-            <mat-card-title class="mat-card-title centre">Cronograma de Actividades - Empleado #{{ idEmployee }}</mat-card-title>
+            <mat-card-title class="mat-card-title centre">Cronograma de actividades - Empleado #{{ idEmployee }}</mat-card-title>
 
             <div class="override-actions">
                 <div style="display:flex; align-items: center;">
@@ -115,11 +115,11 @@
 
                 <tr class="mat-row" *matNoDataRow>
                     <td class="mat-cell p-20 align-center" colspan="12">
-                      <object data="assets/img/empty_data.svg" width="250"></object>
-                      <h2>Sin datos</h2>
+                        <object data="assets/img/empty_data.svg" width="250"></object>
+                        <h2>Sin datos</h2>
                     </td>
-                  </tr>
-              </table>
+                </tr>
+            </table>
         </div>
     </mat-card>
 </main>

sistema-mantenimiento-front/src/app/components/personal-management/employee/schedule-activities/schedule-activities.component.ts

@@ -141,6 +141,8 @@ export class ScheduleActivitiesComponent implements OnInit{
         if (!responseData.error) {
           this.arrScheduleActivities = responseData.response;
           this.dataSource.data = responseData.response;
+          console.log(responseData.response);
+          
           this.setValueRow();
 
           this.dateSelected.setValue(moment());
@@ -301,14 +303,22 @@ export class ScheduleActivitiesComponent implements OnInit{
         let fechaInicio: Date = this.resourcesService.formatStrDateToDate(activityEmployeeElement.FECHA_INICIO);
         let fechaFinal: Date = this.resourcesService.formatStrDateToDate(activityEmployeeElement.FECHA_FINAL);
         let diffDays = (fechaFinal.getTime() - fechaInicio.getTime()) / (1000*60*60*24) + 1;
-        for (let index = 0; index < diffDays; index++) {
-          let compareDate: Date = new Date( fechaInicio.getFullYear(), fechaInicio.getMonth(), fechaInicio.getDate() + index );
-          if (  compareDate >= this.startDateWeek && compareDate <= this.endDateWeek ) {
-            this.setColorCell(index, rowEmployee, activityEmployeeElement.COLOR);
-          } else {
-            this.setColorCell(index, rowEmployee, "#FFFFFF");
-          }
+        
+        for (let days = 0; days < diffDays; days++) {
+          let dayDifference: Date = new Date( fechaInicio.getFullYear(), fechaInicio.getMonth(), fechaInicio.getDate() + days );
+          // console.log(dayDifference);
+          
+          this.arrWeek.map((week: string, index: number) => {
+            let dateOfWeek: Date = new Date( this.startDateWeek.getFullYear(), this.startDateWeek.getMonth(), this.startDateWeek.getDate() + index );
+            
+            if (dateOfWeek.getTime() === dayDifference.getTime()) {
+              console.log(index);
+              console.log(dateOfWeek);
+              this.setColorCell(index, rowEmployee, activityEmployeeElement.COLOR);
+            }          
+          });
         }
+
       } else if (activityEmployeeElement.PERIODICIDAD === 'SE') {
         let fechaInicio: Date = this.resourcesService.formatStrDateToDate(activityEmployeeElement.FECHA_INICIO);
         let weekSelect = fechaInicio.getDay();

sistema-mantenimiento-front/src/app/services/personal-management/employee.service.ts

@@ -103,8 +103,8 @@ export class EmployeeService {
   public deleteActivity(requestDataForm: DeleteFormActivity, idActivity: string){
     return this._httpRequestService.putQuery(`${this._url}/delete-activity/${idActivity}`, requestDataForm).pipe(map((data:any) => data))
   }
-  public getScheduleActivitiesByActivity(idActivity: string) {
-    return this._httpRequestService.getQuery(`${this._url}/get-schedule-activities-by-activity/${idActivity}`).pipe(map((data:any) => data))
+  public getScheduleActivitiesByActivity(idActivity: string, user: string, line: number) {
+    return this._httpRequestService.getQuery(`${this._url}/get-schedule-activities-by-activity/${idActivity}/${user}/${line}`).pipe(map((data:any) => data))
   }
 
 }

sistema-mantenimiento-front/src/environments/environment.prod.ts

@@ -119,10 +119,12 @@ export const supportedFiles = [
 ];
 
 export const validateRFC = "/^([A-ZÑ&]{3,4}) ?(?:- ?)?(\d{2}(?:0[1-9]|1[0-2])(?:0[1-9]|[12]\d|3[01])) ?(?:- ?)?([A-Z\d]{2})([A\d])$/";
-// export const socket = 'http://localhost:3200';
-export const socket = 'https://a9cf-209-50-56-224.ngrok-free.app';
-// export const apiTemp = `http://192.168.100.105:8000/api/`;
-export const apiTemp = 'http://git.ittec.mx/sam/public/api/';
+export const socket = 'http://localhost:3200';
+// export const socket = 'https://a9cf-209-50-56-224.ngrok-free.app';
+
+export const apiTemp = `http://192.168.100.105:8000/api/`;
+// export const apiTemp = 'http://git.ittec.mx/sam/public/api/';
+
 
 /*******************************************************************************/
 /* Para evitar que surjan errores como en el sistema de vacaciones, se eliminó */