Merge branch 'master' of http://209.50.56.224/git/ITTEC/SistemaMantenimiento

sistema-mantenimiento-front/src/app/components/template/notification-dialog/notification-dialog.component.html

@@ -10,8 +10,17 @@
   </div>
   <div class="dialog_details_column animated fadeIn" *ngIf="!isLoading && !hasError">
     <h2>{{ notification!.TITULO }}</h2>
+    <h3>{{ notification!.MODULO }}</h3><br>
+    <p>{{ notification!.CUERPO_NOTIFICACION }}</p>
   </div>
 </div>
 <div mat-dialog-actions align="end">
   <button mat-button mat-dialog-close>Cerrar</button>
+  <button mat-button [mat-dialog-close]="'start|' + notification!.ID_ORDEN + '|' + notification!.TIPO_ORDEN" 
+  *ngIf="!isLoading && !hasError && notification!.ID_ORDEN != null">
+    Iniciar orden
+  </button>
+  <button mat-button [mat-dialog-close]="'go|' + notification!.ID_MODULO" *ngIf="!isLoading && !hasError && notification!.ID_ORDEN == null">
+    Ir al módulo
+  </button>
 </div>

sistema-mantenimiento-front/src/app/services/notifications.service.ts

@@ -11,7 +11,7 @@ export class NotificationsService {
   constructor(private http: HttpClient) { }
 
   getNotification(idNotification: string, setRead: string, idUser: string, line: number){
-    return this.getQuery(`get-notification/${idNotification}/${idUser}/${line}`).pipe(map((data: any) => data));
+    return this.getQuery(`get-notification/${idNotification}/${setRead}/${idUser}/${line}`).pipe(map((data: any) => data));
   }
   
   private getQuery(query: string, tk?: string){