save

src/app/home/home.page.ts

@@ -22,7 +22,7 @@ export class HomePage implements OnInit {
 
   ngOnInit() {
     //Initialize profile as mdgpr
-    this.profile = "mdgpr";
+    this.profile = "pr";
     if(this.profile == "mdgpr"){
       this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
         this.eventsList = res;

src/app/models/dailyworktask.model.ts

@@ -4,4 +4,5 @@ export class DailyWorkTask{
     Senders: string;
     CreateDate: string;
     DocumentURL: string;
+    Remetente:string;
 }

src/app/pages/agenda/agenda.page.html

@@ -3,13 +3,13 @@
   <ion-toolbar>
     <ion-buttons slot="end">
       <!-- customized TOGGLE button -->
-      <div class="toggleBox">
+      <!-- <div class="toggleBox">
         <div (click)="changeProfile()" class="toggle">
           <input type="checkbox">
           <label for="" class="onbtn">PR</label>
           <label for="" class="ofbtn">MDGPR</label>
         </div> 
-      </div>
+      </div> -->
     </ion-buttons>
     <ion-title>Agenda</ion-title>
   </ion-toolbar>

src/app/pages/agenda/agenda.page.ts

@@ -61,7 +61,7 @@ export class AgendaPage implements OnInit {
     ) {}
 
   ngOnInit() {
-    this.profile = "mdgpr";
+    this.profile = "pr";
     //Inicializar segment
    /*  localStorage.setItem('test', this.eventSelectedDate.toString()); */
 
@@ -153,7 +153,7 @@ export class AgendaPage implements OnInit {
       case "Combinada":
         //Inicializa o array eventSource
         this.eventSource=[];
-        if(this.profile == "mdgpr"){
+        if(this.profile == "pr"){
           this.eventService.getAllMdEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe(
             response => {
               this.eventsList = response;

src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html

@@ -49,7 +49,8 @@
       <ion-label>
         <p>{{customDate}}</p>
         <p>das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
-        <p>(Não se repete)</p>
+        <p *ngIf="!loadedEvent.workflowInstanceDataFields.IsRecurring">(Não se repete)</p>
+        <p *ngIf="loadedEvent.workflowInstanceDataFields.IsRecurring">Repete</p>
       </ion-label>
     </div>
   </div>
@@ -68,13 +69,13 @@
     </ion-item>
   </div>
 
-  <div class="bottom-content">
+  <div *ngIf="loadedAttachments" class="bottom-content">
     <ion-list>
       <h3>Documentos Anexados</h3>
       <ion-item>
       <ion-label>
         <p class="attach-title-item">Receita por Natureza</p>
-        <p><span class="span-left">OAPR - GTI</span><span class="span-right">13/04/2020<!-- {{ task.CreateDate | date: 'dd-MM-yy' }} --></span></p>
+        <p><span class="span-left">{{loadedAttachments.Remetente}}</span><span class="span-right">{{loadedAttachments.CreateDate}}<!-- {{ task.CreateDate | date: 'dd-MM-yy' }} --></span></p>
       </ion-label>
     </ion-item>
     </ion-list>

src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts

@@ -3,6 +3,7 @@ import { Router } from '@angular/router';
 import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { Event } from 'src/app/models/event.model';
 import { AlertService } from 'src/app/services/alert.service';
+import { AttachmentsService } from 'src/app/services/attachments.service';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { EmendMessageModalPage } from '../emend-message-modal/emend-message-modal.page';
 import { EventActionsPopoverPage } from '../event-actions-popover/event-actions-popover.page';
@@ -15,6 +16,7 @@ import { EventActionsPopoverPage } from '../event-actions-popover/event-actions-
 export class ApproveEventModalPage implements OnInit {
   event: Event;
   loadedEvent:any;
+  loadedAttachments:any;
   serialNumber:string;
   customDate:any;
   today:any;
@@ -28,6 +30,7 @@ export class ApproveEventModalPage implements OnInit {
     private modalController: ModalController,
     private navParams: NavParams,
     private processes:ProcessesService,
+    private attachmentsService: AttachmentsService,
     private popoverController: PopoverController,
     private menu: MenuController,
     private alertService: AlertService,
@@ -37,7 +40,8 @@ export class ApproveEventModalPage implements OnInit {
      }
 
   ngOnInit() {
-    this.getTask(); 
+    this.getTask();
+    this.getAttachments();
   }
 
   notImplemented(){
@@ -69,7 +73,7 @@ export class ApproveEventModalPage implements OnInit {
   }
 
   emendTask(serialNumber:string){
-    console.log('Emendar');
+    /* console.log('Emendar'); */
     this.menu.close();
     this.openEmendMessageModal(serialNumber);
     this.modalController.dismiss(null);
@@ -84,6 +88,12 @@ export class ApproveEventModalPage implements OnInit {
     this.router.navigate(['/home/gabinete-digital/event-list']);
     this.modalController.dismiss(null);
   }
+  getAttachments(){
+    this.attachmentsService.getAttachmentsBySerial(this.serialNumber).subscribe(res=>{
+      this.loadedAttachments = res;
+      console.log(res);
+    });
+  }
 
   async openOptions(ev:any) {
     const popover = await this.popoverController.create({

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

@@ -10,13 +10,13 @@
       </ion-label>
     </ion-item>
   <ion-buttons slot="end">
-<div class="toggleBox">
+<!-- <div class="toggleBox">
   <div (click)="changeProfile()" class="toggle">
     <input type="checkbox">
     <label for="" class="onbtn">PR</label>
     <label for="" class="ofbtn">MDGPR</label>
   </div> 
-</div>
+</div> -->
 </ion-buttons>
 </ion-toolbar>
   <ion-toolbar>
@@ -54,6 +54,10 @@
     <p class="p-small">{{customDate}}</p>
   </ion-label>
   <app-calendar></app-calendar>
+  <!-- <ion-item lines="none">
+    <ion-icon slot="start" src="assets/images/icons-agenda.svg"></ion-icon>
+    <label>A sua Agenda</label>
+  </ion-item> -->
   <!-- COMBINADA -->
   <div [ngSwitch]="segment">
     <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
@@ -61,7 +65,7 @@
        <ion-refresher-content>
       </ion-refresher-content>
     </ion-refresher>
-    <ion-list *ngSwitchCase="'Combinada'" >
+    <!-- <ion-list *ngSwitchCase="'Combinada'" >
       <ion-item-group>
         <ion-item-sliding>
           <ion-item lines="none" 
@@ -92,9 +96,29 @@
           </ion-item>
         </ion-item-sliding>
       </ion-item-group>
+    </ion-list> -->
+    <ion-list *ngSwitchCase="'Combinada'">
+      <div *ngIf="eventsList">
+        <ion-item-sliding>
+          <ion-item class="Rectangle" lines="none" 
+              *ngFor="let event of eventsList"
+              [routerLink]="['/home/events', event.EventId, 'events']">
+              <div class="content-{{profile}}-{{event.CalendarName}}">
+                <div class="approve-event-time">
+                  <p>{{event.StartDate | date: 'hh:mm'}}</p>
+                  <p>{{event.EndDate | date: 'hh:mm'}}</p>
+                </div>
+                <div class="approve-event-detail">
+                  <p>{{event.Location}}</p>
+                  <h3>{{event.Subject}}</h3>
+                </div>
+              </div>
+            </ion-item>
+        </ion-item-sliding>
+      </div>
     </ion-list>
     <!-- OFICIAL -->
-    <ion-list *ngSwitchCase="'Oficial'">
+    <!-- <ion-list *ngSwitchCase="'Oficial'">
       <ion-item-group>
         <ion-item-sliding>
           <ion-item lines="none" 
@@ -125,9 +149,29 @@
           </ion-item>
         </ion-item-sliding>
       </ion-item-group>
+    </ion-list> -->
+    <ion-list *ngSwitchCase="'Oficial'">
+      <div *ngIf="officialeventsList">
+        <ion-item-sliding>
+          <ion-item class="Rectangle" lines="none" 
+              *ngFor="let event of officialeventsList"
+              [routerLink]="['/home/events', event.EventId, 'events']">
+              <div class="content-{{profile}}-{{event.CalendarName}}">
+                <div class="approve-event-time">
+                  <p>{{event.StartDate | date: 'hh:mm'}}</p>
+                  <p>{{event.EndDate | date: 'hh:mm'}}</p>
+                </div>
+                <div class="approve-event-detail">
+                  <p>{{event.Location}}</p>
+                  <h3>{{event.Subject}}</h3>
+                </div>
+              </div>
+            </ion-item>
+        </ion-item-sliding>
+      </div>
     </ion-list>
     <!-- OFICIAL -->
-    <ion-list *ngSwitchCase="'Pessoal'">
+    <!-- <ion-list *ngSwitchCase="'Pessoal'">
       <ion-item-group>
         <ion-item-sliding>
           <ion-item lines="none" 
@@ -158,6 +202,26 @@
           </ion-item>
         </ion-item-sliding>
       </ion-item-group>
+    </ion-list> -->
+    <ion-list *ngSwitchCase="'Pessoal'">
+      <div *ngIf="personaleventsList">
+        <ion-item-sliding>
+          <ion-item class="Rectangle" lines="none" 
+              *ngFor="let event of personaleventsList"
+              [routerLink]="['/home/events', event.EventId, 'events']">
+              <div class="content-{{profile}}-{{event.CalendarName}}">
+                <div class="approve-event-time">
+                  <p>{{event.StartDate | date: 'hh:mm'}}</p>
+                  <p>{{event.EndDate | date: 'hh:mm'}}</p>
+                </div>
+                <div class="approve-event-detail">
+                  <p>{{event.Location}}</p>
+                  <h3>{{event.Subject}}</h3>
+                </div>
+              </div>
+            </ion-item>
+        </ion-item-sliding>
+      </div>
     </ion-list>
   </div>
 </ion-content>

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

@@ -63,7 +63,7 @@ export class EventsPage implements OnInit {
     //Inicializar segment
     this.segment = "Combinada";
     //Initialize profile as mdgpr
-    this.profile = "mdgpr";
+    this.profile = "pr";
     console.log(this.profile);
     
 

src/app/pages/gabinete-digital/event-list/event-list.page.html

@@ -46,7 +46,8 @@
                   <p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
                 </div>
                 <div class="approve-event-detail">
-                  <p>{{event.workflowInstanceDataFields.Location}}</p>
+                  <p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/mm/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
+                  <p *ngIf="event.workflowInstanceDataFields.StartDate == event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }}  |  {{event.workflowInstanceDataFields.Location}}</p>
                   <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
                 </div>
               </div>
@@ -66,7 +67,8 @@
                   <p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
                 </div>
                 <div class="approve-event-detail">
-                  <p>{{event.workflowInstanceDataFields.Location}}</p>
+                  <p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/mm/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
+                  <p *ngIf="event.workflowInstanceDataFields.StartDate == event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }}  |  {{event.workflowInstanceDataFields.Location}}</p>
                   <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
                 </div>
               </div>

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html

@@ -164,15 +164,15 @@
   </ion-label>
 </div>
 
-<div>
+<div *ngIf="loadedAttachments">
   <ion-item>
     <ion-label>Documentos Anexados</ion-label>
   </ion-item>
   <ion-list>
-    <ion-item>
+    <ion-item *ngFor="let attachment of loadedAttachments">
     <ion-label>
-      <p class="attach-title-item">{{task.Folio}}</p>
-      <p><span class="span-left">OAPR - GTI</span><span class="span-right">{{ task.CreateDate| date: 'dd/MM/yyyy' }}</span></p>
+      <h4 class="attach-title-item">{{attachment.Description}}</h4>
+      <p><span class="span-left">{{attachment.Stakeholders}}</span><span class="span-right"> {{ attachment.CreateDate | date: 'dd/MM/yyyy' }}</span></p>
     </ion-label>
   </ion-item>
   </ion-list>

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts

@@ -9,6 +9,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { EventPerson } from 'src/app/models/eventperson.model';
 import { EventsService } from 'src/app/services/events.service';
 import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
+import { AttachmentsService } from 'src/app/services/attachments.service';
 
 @Component({
   selector: 'app-book-meeting-modal',
@@ -20,6 +21,7 @@ export class BookMeetingModalPage implements OnInit {
   taskParticipants: any;
   taskParticipantsCc: any;
   taskDocId:string;
+  loadedAttachments:any;
 
   postData: Event;
   eventBody: EventBody;
@@ -32,6 +34,7 @@ export class BookMeetingModalPage implements OnInit {
     private router:Router,
     private navParams: NavParams,
     private processes:ProcessesService,
+    private attachmentsService: AttachmentsService,
     private calendarService: EventsService,
     ) {
       this.task = this.navParams.get('task');
@@ -52,6 +55,14 @@ export class BookMeetingModalPage implements OnInit {
   ngOnInit() {
     console.log(this.task)
     console.log(this.task.SerialNumber);
+    this.getAttachments();
+  }
+
+  getAttachments(){
+    this.attachmentsService.getAttachmentsBySerial(this.task.SerialNumber).subscribe(res=>{
+      this.loadedAttachments = res;
+      console.log(res);
+    });
   }
 
   close(){
@@ -89,7 +100,7 @@ export class BookMeetingModalPage implements OnInit {
 
     this.processes.FindTaskDocId(this.task.SerialNumber).subscribe(res =>{
       if(res){
-        this.calendarService.postExpedientEvent(res, this.postData, "md",this.task.SerialNumber);
+        this.calendarService.postExpedientEvent(res, this.postData, "pr",this.task.SerialNumber);
       } 
     });
     this.distartExpedientModal();

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

@@ -86,15 +86,15 @@
     </ion-label>
   </div>
 
-  <div>
+  <div *ngIf="loadedAttachments">
     <ion-item>
       <ion-label>Documentos Anexados</ion-label>
     </ion-item>
     <ion-list>
-      <ion-item>
+      <ion-item *ngFor="let attachment of loadedAttachments">
       <ion-label>
-        <h4 class="attach-title-item">{{task.workflowInstanceFolio}}</h4>
-        <p><span class="span-left">OAPR - GTI</span><span class="span-right"> {{ taskDate | date: 'dd/MM/yyyy' }}</span></p>
+        <h4 class="attach-title-item">{{attachment.Description}}</h4>
+        <p><span class="span-left">{{attachment.Stakeholders}}</span><span class="span-right"> {{ attachment.CreateDate | date: 'dd/MM/yyyy' }}</span></p>
       </ion-label>
     </ion-item>
     </ion-list>

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

@@ -12,6 +12,7 @@ import { AddParticipantsCcModalPage } from '../add-participants-cc-modal/add-par
 import { AddParticipantsModalPage } from '../add-participants-modal/add-participants-modal.page';
 import { environment } from 'src/environments/environment';
 import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
+import { AttachmentsService } from 'src/app/services/attachments.service';
 
 @Component({
   selector: 'app-expedient-task-modal',
@@ -32,6 +33,7 @@ export class ExpedientTaskModalPage implements OnInit {
   taskDate: Date;
   taskDescription: string;
   user: string;
+  loadedAttachments:any;
 
   postData: Despacho;
   dispatchFolder: Folder;
@@ -41,6 +43,7 @@ export class ExpedientTaskModalPage implements OnInit {
     private modalController: ModalController,
     private router:Router,
     private processes:ProcessesService,
+    private attachmentsService: AttachmentsService,
     private navParams: NavParams,
     private authService: AuthService,
     ) {
@@ -53,9 +56,9 @@ export class ExpedientTaskModalPage implements OnInit {
         Nad: 30,
         Subject: '',
         Message: '',
-        SourceSecFsId: '8',
+        SourceSecFsId: this.task.workflowInstanceDataFields.FsId,
         SouceType: 'DOC',
-        SourceId: '',
+        SourceId: this.task.workflowInstanceDataFields.DocId,
 
       };
       this.postData.DispatchFolder = this.dispatchFolder;
@@ -73,7 +76,9 @@ export class ExpedientTaskModalPage implements OnInit {
     });
     console.log(this.user); */ 
     console.log(this.task)
+    
     console.log(this.task.serialNumber);
+    this.getAttachments();
     
   }
 
@@ -128,6 +133,12 @@ export class ExpedientTaskModalPage implements OnInit {
     this.distartExpedientModal();
     this.close();
   }
+  getAttachments(){
+    this.attachmentsService.getAttachmentsBySerial(this.task.serialNumber).subscribe(res=>{
+      this.loadedAttachments = res;
+      console.log(res);
+    });
+  }
  
   async addParticipants(){
     const modal = await this.modalController.create({

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html

@@ -61,7 +61,7 @@
     </ion-item>
     <ion-item>
       <ion-label position="stacked">Remetentes</ion-label>
-      <ion-input disabled="true">OAPR - GTI</ion-input><!-- {{ task.Senders }} -->
+      <ion-input disabled="true">{{task.Remetente}}</ion-input><!-- {{ task.Senders }} -->
     </ion-item>
     <ion-item>
       <ion-label position="stacked">Data</ion-label>

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

@@ -29,7 +29,7 @@ export class ExpedienteDetailPage implements OnInit {
     private modalController: ModalController,
     private alertService: AlertService) { }
 
-  task: DailyWorkTask;
+  task: any;
   fulltask:any;
   eventsList: Event[];  
   serialnumber:string;
@@ -48,16 +48,17 @@ export class ExpedienteDetailPage implements OnInit {
 
   async LoadTaskDetail(serial:string)
   {
-    this.processes.GetTask(serial).subscribe(result => {
+    this.processes.GetTask(serial).subscribe(res => {
       this.task = {
-        "SerialNumber": result.serialNumber,
-        "Folio": result.workflowInstanceFolio,
-        "Senders": result.originator.email,
-        "CreateDate": formatDate(new Date(result.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
-        "DocumentURL": result.formURL
+        "SerialNumber": res.serialNumber,
+        "Folio": res.workflowInstanceFolio,
+        "Senders": res.originator.email,
+        "CreateDate": formatDate(new Date(res.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+        "DocumentURL": res.formURL,
+        "Remetente": res.workflowInstanceDataFields.Remetente
       }
-      this.fulltask = result;
-      /* console.log(result); */
+      this.fulltask = res;
+      console.log(res);
       
     });
   }

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

@@ -37,7 +37,7 @@
                 <ion-icon slot="end" name="calendar"></ion-icon>
                  <h3>{{ task.Folio }}</h3>
               </ion-item>
-              <p><span class="span-left">OAPR - GTI</span><span class="span-right">{{ task.CreateDate | date: 'dd-MM-yy' }}</span></p>
+              <p><span class="span-left">{{task.Remetente}}</span><span class="span-right">{{ task.CreateDate | date: 'dd-MM-yy' }}</span></p>
               <!-- <p><span class="span-left">{{ task.Senders }}</span><span class="span-right">{{ task.CreateDate | date: 'dd-MM-yy' }}</span></p> -->
             </div>
           </ion-item>

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

@@ -41,7 +41,8 @@ export class ExpedientePage implements OnInit {
           "Folio": element.workflowInstanceFolio,
           "Senders": element.originator.email,
           "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
-          "DocumentURL": element.formURL
+          "DocumentURL": element.formURL,
+          "Remetente": element.workflowInstanceDataFields.Remetente
         }
         this.taskslist.push(task);
       });

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

@@ -10,7 +10,7 @@
     <ion-refresher-content>
     </ion-refresher-content>
   </ion-refresher>
-  <ion-card color="#d4d5ca">
+  <!-- <ion-card color="#d4d5ca">
     <ion-card-header>
       <ion-card-title>Eventos para Aprovação</ion-card-title>
       <ion-card-content>
@@ -18,13 +18,13 @@
           <ion-label>Minha agenda</ion-label>
           <ion-button slot="end">{{count_ev_md}}</ion-button>
         </ion-item>
-        <ion-item (click)="openEventsToApproveList('PR')" class="ion-item-change-color"><!-- [routerLink]="['/home/gabinete-digital/event-list', 'pr']" -->
+        <ion-item (click)="openEventsToApproveList('PR')" class="ion-item-change-color">
           <ion-label>Agenda do Presidente</ion-label>
           <ion-button slot="end">{{count_ev_pr}}</ion-button>
         </ion-item>
       </ion-card-content>
     </ion-card-header>
-  </ion-card>
+  </ion-card> -->
     <ion-card color="#d4d5ca">
   <ion-card-header>
     <ion-card-title>Expediente</ion-card-title>
@@ -44,7 +44,7 @@
     </ion-card-content>
   </ion-card-header>
 </ion-card>
-<ion-card color="#d4d5ca">
+<!-- <ion-card color="#d4d5ca">
   <ion-card-header>
     <ion-card-title>Expediente para o PR</ion-card-title>
     <ion-card-content>
@@ -80,6 +80,6 @@
       </ion-item>
     </ion-card-content>
   </ion-card-header>
-</ion-card>
+</ion-card> -->
 
 </ion-content>

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

@@ -42,9 +42,9 @@ export class GabineteDigitalPage implements OnInit {
 
   LoadCounts() {
     this.showLoader = true;
-    this.processesbackend.GetTasksList("Expediente", true).subscribe(result =>{
+    this.processesbackend.GetTasksList("Expediente", true).subscribe(res =>{
       this.showLoader = false;
-      this.count_exp_dailywork = result;
+      this.count_exp_dailywork = res;
     });
     this.processesbackend.GetToApprovedEvents('PR','true').subscribe(res=>{
       this.count_ev_pr = res;