Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

2026-04-20 13:26:08 +00:00 · 2021-04-28 11:12:17 +01:00
parent 91163070ad 12dff45a9c
commit 32109edb8a
8 changed files with 172 additions and 48 deletions
@@ -9,6 +9,7 @@ export class Attachment {
    CreateDate: string;
    Stakeholders: string;
    Link: string;
+    ApplicationId?: string;
    //Data: any;
 }

@@ -3,6 +3,7 @@ import { EventPerson } from './eventperson.model';
 import { SearchDocument } from './search-document';

 export class Event{
+    ParentId?: string;
    EventId: string;
    Subject: string;
    Body: EventBody;
@@ -0,0 +1,26 @@
+export class ProcessTask {
+    SerialNumber: string
+    actions: string;
+    formURL: string
+    originator: {
+        email: string, 
+        manager: string, 
+        displayName: "", 
+        fqn: string, 
+        username: string
+    }
+    serialNumber: string
+    taskStartDate: string
+    workflowDisplayName: string
+    workflowID: number
+    workflowInstanceDataFields: {
+        FsId: string, 
+        MessageId: string, 
+        UserId: string, 
+        DocId: string, 
+        ViewerRequest: string,
+    }
+    workflowInstanceFolio: string
+    workflowInstanceID: number
+    workflowName: string
+}
@@ -80,6 +80,7 @@ export class ExpedientTaskModalPage implements OnInit {
        DeadlineType: '',

      };
+      
      this.postData.DispatchFolder = this.dispatchFolder;
      this.postData.UsersSelected = this.participants;
      /* By Default TypeDeadline should be 'Normal' */
@@ -96,10 +97,16 @@ export class ExpedientTaskModalPage implements OnInit {
  }

  ngOnInit() {
+
    this.taskDate = new Date(this.task.taskStartDate);

-    this.getAttachments();
+    if(!this.task.hasOwnProperty('isEvent')) {
+      // if not 
+      this.getAttachments();
+    }
+
    this.getSubjectType();
+    
  }

  close(){
@@ -107,13 +114,13 @@ export class ExpedientTaskModalPage implements OnInit {
    this.modalController.dismiss(null);
  }
  
-  getSubjectType(){
+  getSubjectType() {
    this.processes.GetSubjectType().subscribe(res=>{
      console.log(res);
      this.subjectTypes = res;
    });
  }
-  cancelTask(){
+  cancelTask() {
    this.modalController.dismiss(null);
    
  }
@@ -140,8 +147,8 @@ export class ExpedientTaskModalPage implements OnInit {
      };
    })

-    if(this.taskParticipants.length > 0){
-      switch (this.taskType){
+    if(this.taskParticipants.length > 0) {
+      switch (this.taskType) {
        case '0':
          this.postData = {
            DistributionType: "Paralelo",
@@ -152,7 +159,7 @@ export class ExpedientTaskModalPage implements OnInit {
            UsersSelected: attendees,
            DispatchFolder: this.dispatchFolder,
          }
-          console.log(this.postData);
+          console.log('this.postData', this.postData, this.taskType);
          this.processes.postDespatcho(this.postData);
          break;
        case '1':
@@ -182,23 +189,26 @@ export class ExpedientTaskModalPage implements OnInit {
          this.processes.postDeferimento(this.postData);
          break;
      }
+
+
    this.modalController.dismiss('openDiscart');
    /* this.distartExpedientModal();
    this.close(); */
  }
-  else{
+  else {
    this.alertController.presentAlert("Lista de intervenientes vazia. Por favor, adicione 1 ou mais intervenientes.");
  }
    
  }
-  getAttachments(){
+
+  getAttachments() {
    this.attachmentsService.getAttachmentsBySerial(this.task.serialNumber).subscribe(res=>{
      this.loadedAttachments = res;
      console.log(res);
    });
  }
 
-  async addParticipants(){
+  async addParticipants() {
    /* console.log('HERES'); */
    

@@ -241,7 +251,7 @@ export class ExpedientTaskModalPage implements OnInit {
    }
  }
  
-  async addParticipantsCc(){
+  async addParticipantsCc() {

    this.adding = "CC";
    this.contacts = this.taskParticipantsCc;
@@ -282,7 +292,7 @@ export class ExpedientTaskModalPage implements OnInit {

  }

-  async distartExpedientModal(){
+  async distartExpedientModal() {
    const modal = await this.modalController.create({
      component: DiscartExpedientModalPage,
       componentProps: {
@@ -304,7 +314,7 @@ export class ExpedientTaskModalPage implements OnInit {
    });
  }

-  async setContact(data:EventPerson[]){
+  async setContact(data:EventPerson[]) {

    if(this.adding == "intervenient"){
      this.taskParticipants = data;
@@ -315,15 +325,15 @@ export class ExpedientTaskModalPage implements OnInit {
    
  }

-  async setIntervenient(data){
+  async setIntervenient(data) {
    this.taskParticipants = data;
  }
  
-  async setIntervenientCC(data){
+  async setIntervenientCC(data) {
    this.taskParticipantsCc = data;
  }

-  async closeComponent(){
+  async closeComponent() {
    this.showAttendees = false;
  }

@@ -14,6 +14,7 @@ import { BookMeetingModalPage } from '../book-meeting-modal/book-meeting-modal.p
 import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
 import { momentG }  from 'src/plugin/momentG'
 import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
+import { ProcessTask } from 'src/app/models/task';

@Component({
  selector: 'app-expediente-detail',
@@ -91,6 +92,9 @@ export class ExpedienteDetailPage implements OnInit {
        "FsId": res.workflowInstanceDataFields.FsId,
        "DocId": res.workflowInstanceDataFields.DocId,
      }
+
+      console.log('task', this.fulltask);
+
      this.fulltask = res;
      console.log('GetTask', res);

@@ -339,9 +339,42 @@ ion-content{


 .active {
+  color: white !important;
+  fill: white !important;
  background: #42b9fe !important;
  box-sizing: border-box;
  .exp-card-title {
-    color: white !important;
+    color: rgb(255, 255, 255) !important;
  }
-}
+
+  svg path::part(native) {
+    color: white !important;
+    fill: white !important;
+  }
+
+  svg path::part(button):hover {
+    color: white !important;
+    fill: rgb(255, 255, 255) !important;
+  }
+
+  svg{
+    path{
+         fill: rgb(255, 255, 255) !important
+    }
+  }
+}
+
+.active ion-icon::part(button) {
+  color: white !important;
+  fill: rgb(255, 255, 255) !important;
+}
+
+.active ion-icon::part(native) {
+  color: white !important;
+  fill: rgb(255, 255, 255) !important;
+}
+
+.active ion-icon{
+  color: white !important;
+  fill: red !important;
+}
@@ -6,34 +6,26 @@
  </ion-header>
  <ion-content>
    <ion-list>
-      <ion-item (click)="openExpedientActionsModal('0',fulltask)">
+      <ion-item  (click)="openExpedientActionsModal('0',fulltask)">
        <ion-icon name="documents" slot="start"></ion-icon>
        <ion-label>Efectuar Despacho</ion-label>
      </ion-item>
-      <ion-item (click)="openExpedientActionsModal('1',fulltask)">
+      <ion-item  (click)="openExpedientActionsModal('1',fulltask)">
        <ion-icon name="arrow-undo" slot="start"></ion-icon>
        <ion-label>Pedido de Parecer</ion-label>
      </ion-item>
-      <ion-item (click)="openExpedientActionsModal('2',fulltask)">
+      <ion-item  (click)="openExpedientActionsModal('2',fulltask)">
        <ion-icon name="arrow-redo" slot="start"></ion-icon>
        <ion-label>Pedido de Deferimento</ion-label>
      </ion-item>
-      <ion-item (click)="openBookMeetingModal(task)">
+      <ion-item  (click)="openBookMeetingModal(task)">
        <ion-icon name="calendar" slot="start"></ion-icon>
        <ion-label>Marcar reunião</ion-label>
      </ion-item>
-      <ion-item (click)="deleteEvent()">
+      <!-- <ion-item (click)="deleteEvent()">
        <ion-icon name="trash" slot="start"></ion-icon>
        <ion-label>Descartar</ion-label>
-      </ion-item>
-      <ion-item (click)="editEvent()">
-        <ion-icon name="create-outline" slot="start"></ion-icon>
-        <ion-label>Editar</ion-label>
-      </ion-item>
-      <ion-item hidden disabled>
-        <ion-icon name="paper-plane" slot="start"></ion-icon>
-        <ion-label>Enviar para pendentes</ion-label>
-      </ion-item>
+      </ion-item> -->
    </ion-list>
  </ion-content>
 </ion-menu>
@@ -54,7 +46,7 @@
          <ion-label class="title">{{loadedEvent.Subject}}</ion-label>
        </div>

-        <div class="div-icon d-none">
+        <div class="div-icon">
          <button class="btn-no-color" (click)="editEvent()">
            <ion-icon class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
          </button>
@@ -64,10 +56,6 @@
          
        </div>

-        <ion-menu-button style="width: 35px; height: 41px;" autoHide="false">
-          <ion-icon  name="ellipsis-vertical-outline"></ion-icon>
-        </ion-menu-button>
-
      </div>
    </div>
  </ion-toolbar>
@@ -112,10 +100,21 @@
    <div *ngIf="loadedAttachments" class="bottom-content width-100">
      <h5>Documentos Anexados</h5>
      <ion-list class="width-100">
-        <ion-item *ngFor="let attach of loadedAttachments" class="width-100" lines="none" class="ion-no-margin ion-no-padding">
-          <ion-label class="width-100"  (click)="viewDocument(attach.SourceId)">
-            <p class="attach-title-item">{{attach.SourceName}}</p>
-            <p><span class="span-left">{{attach.Stakeholders}}</span><span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yy' }}</span></p>
+        <ion-item *ngFor="let attach of loadedAttachments; let i = index" class="width-100" lines="none" class="ion-no-margin ion-no-padding">
+          <ion-label class="width-100 d-flex " >
+            <div class="flex-grow-1"  (click)="viewDocument(attach.SourceId)">
+              <p class="attach-title-item">{{attach.SourceName}}</p>
+              <span class="span-left">{{attach.Stakeholders}}</span>
+            </div>
+
+            <div class="d-flex align-end">
+              <span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yy' }}</span>
+            </div>
+
+            <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
+              <ion-icon  name="ellipsis-vertical-outline"></ion-icon>
+            </ion-menu-button>
+
          </ion-label>
        </ion-item>
      </ion-list>
@@ -5,10 +5,11 @@ import { EventBody } from 'src/app/models/eventbody.model';
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { EventsService } from 'src/app/services/events.service';
 import { Event } from 'src/app/models/event.model';
-import { EditEventPage } from 'src/app/pages/agenda/edit-event/edit-event.page';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
+import { momentG }  from 'src/plugin/momentG';
+import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';

@Component({
  selector: 'app-view-event',
@@ -34,13 +35,13 @@ export class ViewEventPage implements OnInit {
  days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
  
  documents: Attachment[] = [];
+  dicIndex = 0;

  @Input() profile:string;
  @Input() eventId: string;

  @Output() viewEventDetailDismiss = new EventEmitter<any>();

-
  constructor(
    private eventsService: EventsService,
    private attachmentsService: AttachmentsService,
@@ -54,7 +55,6 @@ export class ViewEventPage implements OnInit {
    this.loadedEvent = new Event();
    this.eventBody = { BodyType : "1", Text : ""};
    this.loadedEvent.Body = this.eventBody;
-    
  }

  ngOnInit() {
@@ -69,6 +69,10 @@ export class ViewEventPage implements OnInit {
    this.loadEvent();
  }

+  docIndex(index: number) {
+    this.dicIndex = index;
+  }
+
  close(){
    console.log(this.isEventEdited);
    
@@ -86,10 +90,8 @@ export class ViewEventPage implements OnInit {
      this.customDate = this.days[this.today.getDay()]+ ", "  + this.today.getDate() +" de "  + ( this.months[this.today.getMonth()]);
      this.getAttachments(this.loadedEvent.EventId);
    });
-
-
-
  }
+
  deleteEvent(){
    this.eventsService.deleteEvent(this.loadedEvent.EventId, 0).subscribe(async () => 
      {
@@ -131,7 +133,6 @@ export class ViewEventPage implements OnInit {
    });
  }

-
  async openExpedientActionsModal(taskAction: any, task: any) {
    //this.modalController.dismiss();
    let classs;
@@ -140,6 +141,21 @@ export class ViewEventPage implements OnInit {
    } else  {
      classs = 'modal modal-desktop showAsideOptions'
    }
+
+    const doc = this.loadedAttachments[ this.dicIndex];
+
+    task = {
+      serialNumber: doc.SourceId,
+      taskStartDate: doc.CreateDate,
+      isEvent: true,
+      workflowInstanceDataFields: {
+        FsId: doc.ApplicationId, 
+        FolderID: null,
+        DocId: doc.SourceId, 
+        Subject: doc.SourceName
+      },
+    }
+
    const modal = await this.modalController.create({
      component: ExpedientTaskModalPage,
      componentProps: {
@@ -162,4 +178,38 @@ export class ViewEventPage implements OnInit {
    });
  }

-}
+  async openBookMeetingModal(task: any) {
+
+    const doc = this.loadedAttachments[ this.dicIndex];
+
+    task = {
+      serialNumber: doc.SourceId,
+      taskStartDate: doc.CreateDate,
+      isEvent: true,
+      workflowInstanceDataFields: {
+        FsId: doc.ApplicationId, 
+        FolderID: null,
+        DocId: doc.SourceId, 
+        Subject: doc.SourceName
+      },
+    }
+    
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    const modal = await this.modalController.create({
+      component: BookMeetingModalPage,
+      componentProps: {
+        task: task,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss();
+  }
+
+}