Merge branch 'developer-c' of bitbucket.org:equilibriumito/gabinete-digital into feature/calendar

src/app/home/home.page.html

@@ -4,7 +4,7 @@
       <!-- <ion-icon name="home"></ion-icon> -->
       <ion-icon class="nav-icon" src="assets/images/icons-nav-home.svg"></ion-icon>
       <ion-badge color="danger">{{totalEvent}}</ion-badge>
-      <ion-label>Iníci1o</ion-label>
+      <ion-label>Início</ion-label>
     </ion-tab-button>
 
     <ion-tab-button tab="agenda">

src/app/pages/events/events.page.html

@@ -94,7 +94,7 @@
           class="icon-next" 
           slot="end" 
           src="assets/images/icons-arrow-circle-arrow-right.svg"
-          (click)="openExpedientList()"
+          (click)="viewExpedientListPage()"
           ></ion-icon>
           
         </div>

src/app/pages/events/events.page.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, LOCALE_ID } from '@angular/core';
+import { Component, OnInit, LOCALE_ID, EventEmitter, Output } from '@angular/core';
 
 import { Event } from '../../models/event.model';
 import { EventsService } from 'src/app/services/events.service';
@@ -15,6 +15,7 @@ import { DailyWorkTask } from '../../models/dailyworktask.model';
 import { ViewEventPage } from '../agenda/view-event/view-event.page';
 import { ExpedientePage } from '../gabinete-digital/expediente/expediente.page';
 import { ExpedienteDetailPage } from '../gabinete-digital/expediente/expediente-detail/expediente-detail.page';
+import { GabineteDigitalPage } from '../gabinete-digital/gabinete-digital.page';
 
 @Component({
   selector: 'app-events',
@@ -58,6 +59,8 @@ export class EventsPage implements OnInit {
   taskslist:DailyWorkTask[];
   expedientList:any;
 
+  @Output() openExpedientListPage:EventEmitter<any> = new EventEmitter<any>();
+
   constructor(private eventService: EventsService, 
     private router: Router, 
     private storageService:StorageService,
@@ -65,6 +68,7 @@ export class EventsPage implements OnInit {
     private alertController: AlertService,
     private authService: AuthService,
     private processes:ProcessesService,
+    private gabineteService: GabineteDigitalPage,
     private modalController:ModalController) {
       this.prEventList = null;
 
@@ -239,8 +243,7 @@ export class EventsPage implements OnInit {
     return await modal.present();
   }
 
-  LoadList()
+  LoadList(){
-  {
     this.processes.GetTasksList("Expediente", false).subscribe(result => {
       this.expedientList = result.reverse();
       console.log(this.expedientList);
@@ -306,13 +309,30 @@ export class EventsPage implements OnInit {
     });
   }
 
+  viewExpedientListPage(){
+    if( window.innerWidth <= 1024){
+      this.openExpedientList();
+    }
+    else{
+      console.log('ttt');
+      this.router.navigate(['/home/gabinete-digital']);
+      this.gabineteService.openExpedientListPage();
+    }
+  }
+
   async openExpedientList(){
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal'
+    } else  {
+      classs = 'modal modal-desktop'
+    }
     const modal = await this.modalController.create({
       component: ExpedientePage,
       componentProps:{
         profile: this.profile,
       },
-      cssClass: 'modal',
+      cssClass: classs,
       backdropDismiss: false
     });
     await modal.present();

src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts

@@ -10,6 +10,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
 })
 export class DiscartExpedientModalPage implements OnInit {
   serialNumber:string;
+  folderId:string;
   constructor(
     private modalController: ModalController,
     private processes:ProcessesService,
@@ -17,6 +18,7 @@ export class DiscartExpedientModalPage implements OnInit {
     private navParams: NavParams,
   ) { 
     this.serialNumber = this.navParams.get('serialNumber');
+    this.folderId = this.navParams.get('folderId');
    }
 
   ngOnInit() {
@@ -24,13 +26,20 @@ export class DiscartExpedientModalPage implements OnInit {
     
   }
   close(){
+    /* let body = { "serialNumber": this.serialNumber, "action": "Tratado" } */
+    console.log(this.folderId);
+    console.log('FOLDER');
+    
+    this.processes.UpdateTaskStatus(this.folderId).subscribe(res=>{
+      console.log(res);
+    });
     this.modalController.dismiss();
   }
   /* notDelete(){
 
   } */
   save(){
-    let body = { "serialNumber": this.serialNumber, "action": "Task Completed" }
+    let body = { "serialNumber": this.serialNumber, "action": "Tratado" }
     console.log(body);
     this.processes.PostTaskAction(body);
     this.router.navigate(['/home/gabinete-digital/expediente']);

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts

@@ -224,6 +224,7 @@ export class ExpedientTaskModalPage implements OnInit {
       component: DiscartExpedientModalPage,
        componentProps: {
         serialNumber: this.task.serialNumber,
+        folderId: this.task.workflowInstanceDataFields.FolderID,
       },
       cssClass: 'discart-expedient-modal',
       backdropDismiss: false

src/app/pages/gabinete-digital/expediente/expediente.page.ts

@@ -38,8 +38,7 @@ export class ExpedientePage implements OnInit {
     this.LoadList();
   }
 
-  LoadList()
+  LoadList(){
-  {
     this.processes.GetTasksList("Expediente", false).subscribe(result => {
       this.taskslist = new Array();
       result.forEach(element => {

src/app/pages/gabinete-digital/gabinete-digital.page.ts

@@ -200,7 +200,6 @@ this.processesbackend.GetActionsList().subscribe(res=>{
   async openExpedientList(){
     
     this.closeAllDesktopComponent();
-
     let classs;
     if( window.innerWidth <= 1024){
       classs = 'modal'

src/app/services/processes.service.ts

@@ -120,6 +120,19 @@ export class ProcessesService {
       console.log(res);
     });
   }
+
+  UpdateTaskStatus(FolderId:string): Observable<any>{
+    const geturl = environment.apiURL + 'Tasks/UpdateTaskStatus';
+    let params = new HttpParams();
+
+    params = params.set("FolderId", FolderId);
+    
+    let options = { 
+      headers: this.headers, 
+      params: params 
+    };
+    return this.http.post<any>(`${geturl}`,'', options);
+  }
   
   postDespatcho(body:any){
     const geturl = environment.apiURL + 'Processes/CreateDispatch';

src/app/shared/agenda/view-event/view-event.page.html

@@ -20,13 +20,8 @@
 <ion-content>
   <div class="main-content">
     <div class="upper-content">
-      <div class="content-location d-flex justify-space-between ">
+      <div class="content-location">
-        <div class="location-detail">
+        <p><span class="date">{{loadedEvent.Location}}</span><span class="label">{{loadedEvent.CalendarName}}</span></p>
-          <ion-label >{{loadedEvent.Location}}</ion-label>
-        </div>
-        <div class="button-{{profile}}-{{loadedEvent.CalendarName}}">
-          <ion-button  class="button-{{profile}}-{{loadedEvent.CalendarName}}" slot="end">{{loadedEvent.CalendarName}}</ion-button>
-        </div>
       </div>
       <div class="content-details">
         <ion-label>
@@ -38,18 +33,18 @@
       </div>
     </div>
     <div class="middle-content">
+      <h5>Intervenientes</h5>
       <ion-item class="ion-no-margin ion-no-padding">
         <ion-label>
-          <h3>Intervenientes</h3>
           <div *ngFor="let attendee of loadedEvent.Attendees">
             <p>{{attendee.Name}}</p>
           </div>
         </ion-label>
       </ion-item>
+      <h5>Detalhes</h5>
       <ion-item class="ion-no-margin ion-no-padding">
         <ion-label>
-          <h3>Detalhes</h3>
+          <p [innerHTML]="loadedEvent.Body.Text"></p>
-          <p>{{loadedEvent.Body.Text}}</p>
         </ion-label>
       </ion-item>
     </div>

src/app/shared/agenda/view-event/view-event.page.scss

@@ -87,6 +87,19 @@ ion-menu{
           width: 100%;
           margin: 0 auto;
           padding: 0;
+          overflow: auto;
+
+          .date{
+            float: left;
+          }
+          
+          .label{
+            border-radius: 20px;
+            background: #ffb703;
+            float: right !important;
+            padding: 5px 13.5px 5px 13.5px;
+            color: #fff;
+        }
         }
       
         .location-detail{
@@ -95,35 +108,7 @@ ion-menu{
           float: left;
           margin: 5px 5px 5px 0px;
         }
-        .button-mdgpr-Oficial{
+        
-            --border-radius: 20px;
-            --background: #ffb703;
-            margin-left: 5px;
-            float: left;
-        }
-        .button-mdgpr-Pessoal{
-          --border-radius: 20px;
-          --background: #f05d5e;
-          margin-left: 5px;
-          float: left;
-        }
-
-        .button-pr-Oficial{
-          width: 91px;
-          --border-radius: 20px;
-          --background: #cbeecb;
-          margin-left: 5px;
-          float: left;
-      }
-      .button-pr-Pessoal{
-        width: 91px;
-        --border-radius: 20px;
-        --background: #cab0dc;
-        margin-left: 5px;
-        float: left;
-      }
-
-
         .button-calendar-type ion-button{
           height: 25px;
         }

src/app/shared/gabinete-digital/expedients/expedients.page.ts

@@ -41,15 +41,14 @@ export class ExpedientsPage implements OnInit {
 
   openExpedientDetailPage(data){
     console.log(data);
-    
     this.openExpedientDetail.emit(data);
   }
 
-  LoadList()
+  LoadList(){
-  {
     this.processes.GetTasksList("Expediente", false).subscribe(result => {
       this.taskslist = new Array();
-      result.forEach(element => {
+      let res = result.reverse();
+      res.forEach(element => {
         let task: DailyWorkTask = {
           "SerialNumber": element.serialNumber,
           "Folio": element.workflowInstanceFolio,