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

src/app/shared/agenda/edit-event/edit-event.component.html

@@ -187,30 +187,37 @@
       </div>
     </div>
     
-    <div hidden class="ion-item-container-no-border">
+    <div (click)="getDoc()" class="d-flex container-div width-100 ion-item-container-no-border" >
       <ion-label>
         <div class="attach-icon">
           <ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
         </div>
         <div class="attach-document">
-          <ion-label>Anexar Documentos</ion-label>
+          <ion-label>Adicionar documentos</ion-label>
         </div> 
       </ion-label>
     </div>
     
-    <div hidden>
-      <ion-item>
-        <ion-label>Documentos Anexados</ion-label>
-      </ion-item>
-      <ion-list>
-        <ion-item>
-        <ion-label>
-          <h4 class="attach-title-item">Text</h4>
-          <p><span class="span-left">Text</span><span class="span-right"> Text </span></p>
+    <div class="d-flex container-div width-100"  *ngFor="let document of loadedEventAttachments" > 
+      <ion-list class="width-100 list">
+        <ion-item class="width-100">
+        <ion-label class="width-100">
+          <p class="d-flex ion-justify-content-between"> 
+            <span class="attach-title-item">{{document.SourceName}}</span> 
+            <span class="app-name" *ngIf="document.ApplicationId  == 8"> Correspondencia </span>
+            <span class="app-name" *ngIf="document.ApplicationId == 386"> AccoesPresidenciais </span>
+            <span class="app-name" *ngIf="document.ApplicationId == 361 "> ArquivoDespachoElect </span>
+            <span class="close-button text-black" (click)="deleteAttachment(document.Id)" >
+              <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
+            </span>
+
+          </p> 
+          <p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.CreateDate | date: 'dd-MM-yy'}} </span></p>
         </ion-label>
       </ion-item>
       </ion-list>
     </div> 
+
   </div>    
 </ion-content>
 <ion-footer class="ion-no-border">

src/app/shared/agenda/edit-event/edit-event.component.scss

@@ -167,4 +167,38 @@ ion-content{
         color:red;
       }
 
-  }
+  }
+
+  
+.app-name{
+  background: #42b9f2;
+  border-radius: 18px;
+  text-align: center;
+  display: flex;
+  align-items: center;
+  padding: 0px 5px;
+  color: white;
+  font-size: 9pt;
+  font-weight: 500;
+  height: 19px;
+  -webkit-border-radius: 18px;
+  -moz-border-radius: 18px;
+  -ms-border-radius: 18px;
+  -o-border-radius: 18px;
+}
+
+
+.close-button {
+  display: none;
+}
+
+.list:hover {
+
+  .app-name {
+    display: none;
+  }
+
+  .close-button {
+    display: block !important;
+  }
+}

src/app/shared/agenda/edit-event/edit-event.component.ts

@@ -6,6 +6,9 @@ import { EventsService } from 'src/app/services/events.service';
 import { Event } from 'src/app/models/event.model';
 import { AlertController } from '@ionic/angular';
 import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
+import { SearchPage } from 'src/app/pages/search/search.page';
+import { AttachmentsService } from 'src/app/services/attachments.service';
+import { Attachment } from 'src/app/models/attachment.model';
 @Component({
   selector: 'app-edit-event',
   templateUrl: './edit-event.component.html',
@@ -21,6 +24,7 @@ export class EditEventComponent implements OnInit {
   segment:string = "true";
   eventAttendees: EventPerson[];
   minDate: string;
+  loadedEventAttachments: Attachment[];
 
   @Input() taskParticipants: EventPerson[];
   @Input() taskParticipantsCc: EventPerson[];
@@ -40,8 +44,11 @@ export class EditEventComponent implements OnInit {
     private modalController: ModalController,
     private eventsService: EventsService,
     public alertController: AlertController,
+    private attachmentsService: AttachmentsService,
+    
   ) {
-   
+  
+
   }
 
   ngOnInit() {
@@ -49,7 +56,11 @@ export class EditEventComponent implements OnInit {
     if(!this.restoreTemporaryData()){
  
       if(this.postEvent){
-        this.postEvent.Body.Text = this.postEvent.Body.Text.replace(/<[^>]+>/g, '');
+        if( this.postEvent.Body){
+          if(typeof(this.postEvent.Body.Text) == 'string'){
+            this.postEvent.Body.Text = this.postEvent.Body.Text.replace(/<[^>]+>/g, '');
+          }
+        }
       }
   
       // attendees list
@@ -78,6 +89,10 @@ export class EditEventComponent implements OnInit {
         this.isRecurring = "Repete";
       }
     }
+
+    this.getAttachments(this.postEvent.EventId);
+
+
    
   }
   
@@ -90,6 +105,9 @@ export class EditEventComponent implements OnInit {
     this.deleteTemporaryData();
   }
 
+
+
+
   async save(){
 
     this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
@@ -120,6 +138,7 @@ export class EditEventComponent implements OnInit {
     this.clearContact.emit();
   }
 
+
   async addParticipantsCc() {
 
     this.saveTemporaryData();
@@ -150,15 +169,65 @@ export class EditEventComponent implements OnInit {
       this.eventBody = restoredData.eventBody
       this.segment = restoredData.segment
 
-      return true;
+      return true;  
     } else {
       return false;
     }
     
+    
   }
 
   deleteTemporaryData(){
     window['temp.path:/home/agenda/edit-event.component.ts'] = {}
   }
 
+  getAttachments(eventId: string){
+    this.attachmentsService.getAttachmentsById(eventId).subscribe(res=>{
+      this.loadedEventAttachments = res;
+      console.log('res', res); 
+    });
+  }
+
+  deleteAttachment(attachmentID: string) {
+
+    this.attachmentsService.deleteEventAttachmentById(attachmentID).subscribe( 
+      res=>{
+      this.loadedEventAttachments = this.loadedEventAttachments.filter(e=> e.Id.toString() != attachmentID);
+    })
+  }
+
+ 
+  async getDoc() {
+    const modal = await this.modalController.create({
+      component: SearchPage,
+      cssClass: 'group-messages modal-desktop search-modal search-modal-to-desktop',
+      componentProps: {
+        type: 'AccoesPresidenciais & ArquivoDespachoElect'
+      }
+    });
+    await modal.present();
+    modal.onDidDismiss().then( async (res)=>{
+      if(res){
+        const data = res.data;
+        //data.selected
+        const DocumentToSave = {
+          SourceTitle: data.selected.Assunto,
+          ParentId: this.postEvent.EventId,
+          Source: '1',
+          SourceId: data.selected.Id,
+          ApplicationId: data.selected.ApplicationType.toString(),
+          Id: '0',
+          Link: '',
+          SerialNumber: '',
+        };
+
+        await this.attachmentsService.setEventAttachmentById(DocumentToSave).subscribe(()=>{
+          this.getAttachments(this.postEvent.EventId);
+        });
+
+      }
+    });
+  }
+
+
 }

src/app/shared/agenda/event-list/event-list.component.ts

@@ -44,11 +44,11 @@ export class EventListComponent implements OnInit {
         this.profile = 'PR'
       }
 
-      this.LoadToApproveEvents();
+      // this.LoadToApproveEvents();
   
       this.router.events.forEach((event) => {
         if(event instanceof NavigationEnd && event.url == this.router.url) {
-          this.LoadToApproveEvents();
+          // this.LoadToApproveEvents();
         }
       });
     }

src/app/shared/agenda/new-event/new-event.component.html

@@ -183,26 +183,29 @@
       </div>
     </div>
     
-    <div hidden class="ion-item-container-no-border">
+    <div  class="ion-item-container-no-border"  (click)="getDoc()">
       <ion-label>
         <div class="attach-icon">
           <ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
         </div>
         <div class="attach-document">
-          <ion-label>Anexar Documentos</ion-label>
+          <ion-label>Adicionar documentos</ion-label>
         </div> 
       </ion-label>
     </div>
     
-    <div hidden>
-      <ion-item>
-        <ion-label>Documentos Anexados</ion-label>
-      </ion-item>
+    <div class="list "  *ngFor="let document of documents; let i = index" > 
       <ion-list>
         <ion-item>
         <ion-label>
-          <h4 class="attach-title-item">Text</h4>
-          <p><span class="span-left">Text</span><span class="span-right"> Text </span></p>
+          <p class="d-flex ion-justify-content-between"> 
+            <span class="attach-title-item">{{document.Assunto}}</span> 
+            <span class="app-name">{{document.appName}}</span> 
+            <span class="close-button text-black" (click)="removeAttachment(i)" >
+              <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
+            </span>
+          </p> 
+          <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yy'}} </span></p>
         </ion-label>
       </ion-item>
       </ion-list>

src/app/shared/agenda/new-event/new-event.component.scss

@@ -176,4 +176,38 @@ ion-content{
   ion-textarea{
     height: 81px;
   }
+}
+
+
+.app-name{
+  background: #42b9f2;
+  border-radius: 18px;
+  text-align: center;
+  display: flex;
+  align-items: center;
+  padding: 0px 5px;
+  color: white;
+  font-size: 9pt;
+  font-weight: 500;
+  height: 19px;
+  -webkit-border-radius: 18px;
+  -moz-border-radius: 18px;
+  -ms-border-radius: 18px;
+  -o-border-radius: 18px;
+}
+
+
+.close-button {
+  display: none;
+}
+
+.list:hover {
+
+  .app-name {
+    display: none;
+  }
+
+  .close-button {
+    display: block !important;
+  }
 }

src/app/shared/agenda/new-event/new-event.component.ts

@@ -2,9 +2,13 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
 import { EventBody } from 'src/app/models/eventbody.model';
 import { EventPerson } from 'src/app/models/eventperson.model';
 import { EventsService } from 'src/app/services/events.service';
+import { AttachmentsService } from 'src/app/services/attachments.service';
 import { Event } from 'src/app/models/event.model';
 import { ModalController } from '@ionic/angular';
 import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
+import { SearchPage } from 'src/app/pages/search/search.page';
+import { SearchDocument } from "src/app/models/search-document";
+import {  EventAttachment } from 'src/app/models/attachment.model';
 @Component({
   selector: 'app-new-event',
   templateUrl: './new-event.component.html',
@@ -21,7 +25,6 @@ export class NewEventPage implements OnInit {
   @Input() selectedDate: Date;
   @Input() taskParticipants: EventPerson[];
   @Input() taskParticipantsCc: any = [];
-
   
   @Output() setIntervenient = new EventEmitter<any>();
   @Output() setIntervenientCC = new EventEmitter<any>();
@@ -33,11 +36,14 @@ export class NewEventPage implements OnInit {
   @Output() GoBackEditOrAdd  = new EventEmitter<any>();
   @Output() cloneAllmobileComponent = new EventEmitter<any>();
 
+  documents:SearchDocument[] = [];
+
   minDate: string;
 
   constructor(
     private modalController: ModalController,
     private eventService: EventsService, 
+    private attachmentsService: AttachmentsService
   ) {}
 
   ngOnInit() {
@@ -121,6 +127,23 @@ export class NewEventPage implements OnInit {
 
   }
 
+  async getDoc(){
+    const modal = await this.modalController.create({
+      component: SearchPage,
+      cssClass: 'group-messages modal-desktop search-modal search-modal-to-desktop',
+      componentProps: {
+        type: 'AccoesPresidenciais & ArquivoDespachoElect'
+      }
+    });
+    await modal.present();
+    modal.onDidDismiss().then((res)=>{
+      if(res){
+        const data = res.data;
+        this.documents.push(data.selected);
+      }
+    });
+  }
+  
   close(){
 
     this.deleteTemporaryData();
@@ -131,24 +154,73 @@ export class NewEventPage implements OnInit {
     this.setIntervenientCC.emit([]);
   }
 
-  save(){
+  
+
+  async save(){
     
     this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
-    
+
+
+    if(this.documents.length >= 0){
+      this.postEvent.HasAttachments = true;
+    }
+
     if(this.profile=='mdgpr') {
-      this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).subscribe();
+      this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).subscribe(
+        (id) => {
+
+          const eventId: string = id;
+
+          const DocumentToSave: EventAttachment[] = this.documents.map((e) => {
+            return {
+              SourceTitle: e.Assunto,
+              ParentId: eventId,
+              Source: '1',
+              SourceId: e.Id,
+              ApplicationId: e.ApplicationType.toString(),
+              Id: '',
+              Link: '',
+              SerialNumber: ''
+            };
+          });
+          
+          DocumentToSave.forEach((attachments) => {
+            this.attachmentsService.setEventAttachmentById(attachments).subscribe();
+          });
+
+        });
     }
     else if(this.profile=='pr') {
-      this.eventService.postEventPr(this.postEvent, this.postEvent.CalendarName).subscribe();
+      this.eventService.postEventPr(this.postEvent, this.postEvent.CalendarName).subscribe(
+        (id) => {
+
+          const eventId: string =  id;
+
+          const toDocumentTosSave: EventAttachment[] = this.documents.map((e) => {
+            return {
+              SourceTitle: e.Assunto,
+              ParentId: eventId,
+              Source: '1',
+              SourceId: e.Id,
+              ApplicationId: e.ApplicationType.toString(),
+              Id: '',
+              Link: '',
+              SerialNumber: ''
+            };
+          });
+
+          toDocumentTosSave.forEach((attachments) => {
+            this.attachmentsService.setEventAttachmentById(attachments);
+          });
+
+        });
     }
-    
-    this.deleteTemporaryData();
+  }
 
-    this.onAddEvent.emit(this.postEvent);
-    this.GoBackEditOrAdd.emit();
+  removeAttachment(index: number){
+
+    this.documents = this.documents.filter( (e, i) =>  index != i);
 
-    this.setIntervenient.emit([]);
-    this.setIntervenientCC.emit([]);
   }
 
 
@@ -184,11 +256,11 @@ export class NewEventPage implements OnInit {
   }
 
 
-  restoreTemporaryData(): boolean{
+  restoreTemporaryData(): boolean {
     
     const restoredData =  window['temp.path:/home/agenda/new-event.component.ts']
 
-    if(JSON.stringify(restoredData) != "{}" && undefined != restoredData){
+    if(JSON.stringify(restoredData) != "{}" && undefined != restoredData) {
       this.postEvent = restoredData.postEvent
       this.eventBody = restoredData.eventBody
       this.segment = restoredData.segment

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

@@ -55,20 +55,19 @@
         <ion-item lines="none" class="ion-no-margin ion-no-padding">
           <div [innerHTML]="loadedEvent.Body.Text"></div>
         </ion-item>
+        <div class="line"></div>
       </div>
     </div>
-    <div class="line"></div>
   
-    <div *ngIf="loadedAttachments" class="bottom-content">
+    <div *ngIf="loadedAttachments" class="bottom-content width-100">
       <h5>Documentos Anexados</h5>
-      <ion-list>
-        <ion-item lines="none" class="ion-no-margin ion-no-padding">
-        <ion-label *ngFor="let attach of loadedAttachments"
-        (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-label>
-      </ion-item>
+      <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-label>
+        </ion-item>
       </ion-list>
     </div>
     <!-- <div class="line"></div> -->

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

@@ -32,6 +32,8 @@ export class ViewEventPage implements OnInit {
   months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
   days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
   
+  documents: Attachment[] = [];
+
   @Input() profile:string;
   @Input() eventId: string;
 
@@ -76,12 +78,15 @@ export class ViewEventPage implements OnInit {
   loadEvent(){
     this.eventsService.getEvent(this.eventId).subscribe(res => {
       this.loadedEvent = res;
-      console.log(res);
+      // console.log(res);
       this.today = new Date(res.StartDate);
-      console.log(new Date(this.today));
+      // console.log(new Date(this.today));
       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 () => 

src/app/shared/event/attendee-modal/attendee-modal.page.html

@@ -12,7 +12,7 @@
     <ion-list lines="none"  class="flex-grow-1 overflow-y-auto height-100" >
       <ion-item-sliding class="px-20">
         <div *ngFor="let attendee of contacts;">
-          <ion-item (click)="selectContact(attendee)" *ngIf="filterSearchList(attendee)" >
+          <ion-item *ngIf="filterSearchList(attendee)" >
             <div class="pr-10">
               <ion-icon class="font-35" src="assets/images/icons-userprofile.svg"></ion-icon>
             </div>
@@ -20,6 +20,9 @@
               <h3>{{ attendee.Name }}</h3>
               <p>{{ attendee.EmailAddress }}</p>
             </ion-label>
+            <div (click)="selectContact(attendee)">
+              <ion-icon class="font-35" src="assets/images/icons-add-25.svg"></ion-icon>
+            </div>
           </ion-item>
         </div>
 
@@ -27,7 +30,6 @@
     </ion-list>
     <hr/>
 
-    
     <ion-list lines="none" *ngIf="taskParticipants.length >= 1 && adding == 'intervenient' " class="flex-grow-1 overflow-y-auto height-100 pb-0" >
       <div  class="px-20 font-15 pt-20" style="border-top:1px solid #ebebeb;font-weight: 500;" *ngIf="taskParticipants.length >= 1 || taskParticipantsCc.length >= 1"  > Destinatário</div> 
       <ion-item-sliding class="px-20"> 
@@ -39,8 +41,8 @@
             <h3>{{ attendee.Name }}</h3>
             <p>{{ attendee.EmailAddress }}</p>
           </ion-label>
-          <div style="color:red" (click)="remove(attendee)">
-            X
+          <div  (click)="remove(attendee)">
+            <ion-icon class="font-35" src="assets/images/icons-delete-25.svg"></ion-icon>
           </div>
         </ion-item>
       </ion-item-sliding>
@@ -57,8 +59,8 @@
             <h3>{{ attendee.Name }}</h3>
             <p>{{ attendee.EmailAddress }}</p>
           </ion-label>
-          <div style="color:red" (click)="remove(attendee)">
-            X
+          <div  (click)="remove(attendee)">
+            <ion-icon class="font-35" src="assets/images/icons-delete-25.svg"></ion-icon>
           </div>
         </ion-item>
       </ion-item-sliding>

src/app/shared/event/attendees/attendees.page.scss

@@ -1,6 +1,4 @@
-ion-item-group{
-    margin: 15px;
-}
+
 ion-item{
     border-bottom:1px solid #ccc;
 }