-
- Documentos Anexados
-
+
- Text
- Text Text
+
+ {{document.Assunto}}
+ {{document.appName}}
+
+
+
+
+ {{document.EntidadeOrganicaNome}} {{document.Data | date: 'dd-MM-yy'}}
diff --git a/src/app/shared/agenda/new-event/new-event.component.scss b/src/app/shared/agenda/new-event/new-event.component.scss
index 9cdd3e022..1497762a9 100644
--- a/src/app/shared/agenda/new-event/new-event.component.scss
+++ b/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;
+ }
}
\ No newline at end of file
diff --git a/src/app/shared/agenda/new-event/new-event.component.ts b/src/app/shared/agenda/new-event/new-event.component.ts
index 915a84c36..4f0152386 100644
--- a/src/app/shared/agenda/new-event/new-event.component.ts
+++ b/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
();
@Output() setIntervenientCC = new EventEmitter();
@@ -33,11 +36,14 @@ export class NewEventPage implements OnInit {
@Output() GoBackEditOrAdd = new EventEmitter();
@Output() cloneAllmobileComponent = new EventEmitter();
+ 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
diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html
index a2afd0933..00b262bbc 100644
--- a/src/app/shared/agenda/view-event/view-event.page.html
+++ b/src/app/shared/agenda/view-event/view-event.page.html
@@ -55,20 +55,19 @@
+
+
Documentos Anexados
-
-
-
- {{attach.SourceName}}
- {{attach.Stakeholders}}{{ attach.CreateDate | date: 'dd-MM-yy' }}
-
-
+
+
+
+ {{attach.SourceName}}
+ {{attach.Stakeholders}}{{ attach.CreateDate | date: 'dd-MM-yy' }}
+
+
diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts
index 42e1439ca..ba519e09a 100644
--- a/src/app/shared/agenda/view-event/view-event.page.ts
+++ b/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 () =>
diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.html b/src/app/shared/event/attendee-modal/attendee-modal.page.html
index 8df57692d..b84c22a6e 100644
--- a/src/app/shared/event/attendee-modal/attendee-modal.page.html
+++ b/src/app/shared/event/attendee-modal/attendee-modal.page.html
@@ -12,7 +12,7 @@
-
+
@@ -20,6 +20,9 @@
{{ attendee.Name }}
{{ attendee.EmailAddress }}
+
+
+
-
Destinatário
@@ -39,8 +41,8 @@
{{ attendee.Name }}
{{ attendee.EmailAddress }}
-
- X
+
+
@@ -57,8 +59,8 @@
{{ attendee.Name }}
{{ attendee.EmailAddress }}
-
- X
+
+
diff --git a/src/app/shared/event/attendees/attendees.page.scss b/src/app/shared/event/attendees/attendees.page.scss
index 30cc9ce83..853c08fcf 100644
--- a/src/app/shared/event/attendees/attendees.page.scss
+++ b/src/app/shared/event/attendees/attendees.page.scss
@@ -1,6 +1,4 @@
-ion-item-group{
- margin: 15px;
-}
+
ion-item{
border-bottom:1px solid #ccc;
}
diff --git a/src/assets/images/icons-add-25.svg b/src/assets/images/icons-add-25.svg
new file mode 100644
index 000000000..c91a39283
--- /dev/null
+++ b/src/assets/images/icons-add-25.svg
@@ -0,0 +1,16 @@
+
diff --git a/src/assets/images/icons-delete-25.svg b/src/assets/images/icons-delete-25.svg
new file mode 100644
index 000000000..55e1ac1b7
--- /dev/null
+++ b/src/assets/images/icons-delete-25.svg
@@ -0,0 +1,16 @@
+