From d176438e036d8701f11c4894ae5b07f1a11c45d1 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 15 Apr 2021 14:58:29 +0100 Subject: [PATCH 01/14] Improve spelling --- src/app/home/home.page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 86e8b92b3..50aec61e2 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -20,7 +20,7 @@ - Acções + Ações From 3752df0029b58f3561a894ff36dfa2967a92f85b Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 16 Apr 2021 13:02:45 +0100 Subject: [PATCH 02/14] Remove dev test data --- src/app/pages/search/search.page.html | 29 +++++++++++++++------------ src/app/pages/search/search.page.scss | 4 ++-- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index 17727fe78..06412dc5e 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -76,19 +76,18 @@
-
+
- - -
-

{{ category.Name }}

- {{ category.Qtd }} -
- - +
+
+ {{ category.Name }} + {{ category.Qtd }} +
+
+
- - +
+ +
+ +
+ +
@@ -167,5 +171,4 @@ - \ No newline at end of file diff --git a/src/app/pages/search/search.page.scss b/src/app/pages/search/search.page.scss index c045b9293..cb7b9c617 100644 --- a/src/app/pages/search/search.page.scss +++ b/src/app/pages/search/search.page.scss @@ -61,13 +61,12 @@ ion-slide{ flex-wrap: wrap; justify-content: center; align-items: center; - p{ + span{ padding: 0px; margin: 0px; font-family: Roboto; color: #0d89d1; font-size: 15px; - width: 100%; } .label{ width: 100%; @@ -75,6 +74,7 @@ ion-slide{ font-size: 13px; font-weight: 300; color: #797979; + text-align: center; } border-radius: 15px; } From 18a661f2b6f6005cdc14349830804d2ec3ef3aa3 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 16 Apr 2021 14:10:18 +0100 Subject: [PATCH 03/14] Improve search category --- src/app/pages/search/search.page.html | 6 +++--- src/app/pages/search/search.page.scss | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index 06412dc5e..99671de61 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -81,11 +81,11 @@
-
-
+
+ {{ category.Name }} {{ category.Qtd }} -
+
diff --git a/src/app/pages/search/search.page.scss b/src/app/pages/search/search.page.scss index cb7b9c617..02665f66e 100644 --- a/src/app/pages/search/search.page.scss +++ b/src/app/pages/search/search.page.scss @@ -55,8 +55,7 @@ ion-slide{ margin: 0px 5px; margin-bottom: 10px; padding: 5px 20px; - height: 100%; - box-sizing: 100%; + box-sizing: border-box; display: flex; flex-wrap: wrap; justify-content: center; @@ -82,7 +81,7 @@ ion-slide{ .active-category{ background-color: #42b9fe; color: white; - p{ + span{ color: white; } .label{ From 34d34261926d8d8f42819aac04e5e805c6e5b10a Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 16 Apr 2021 14:11:22 +0100 Subject: [PATCH 04/14] Improve search category --- src/app/pages/search/search.page.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/pages/search/search.page.scss b/src/app/pages/search/search.page.scss index 02665f66e..28043fbc3 100644 --- a/src/app/pages/search/search.page.scss +++ b/src/app/pages/search/search.page.scss @@ -66,6 +66,7 @@ ion-slide{ font-family: Roboto; color: #0d89d1; font-size: 15px; + text-align: center; } .label{ width: 100%; From 036bdf64bfe30c4e3978cb32c62470717597c1e9 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 16 Apr 2021 14:32:22 +0100 Subject: [PATCH 05/14] Fixe Attendess border and add Button to add and delete --- src/app/pages/agenda/new-event/new-event.page.ts | 2 +- .../pages/events/attendees/attendees.page.html | 13 ++++++++----- .../pages/events/attendees/attendees.page.scss | 3 --- .../attendee-modal/attendee-modal.page.html | 14 ++++++++------ .../shared/event/attendees/attendees.page.scss | 4 +--- src/assets/images/icons-add-25.svg | 16 ++++++++++++++++ src/assets/images/icons-delete-25.svg | 16 ++++++++++++++++ 7 files changed, 50 insertions(+), 18 deletions(-) create mode 100644 src/assets/images/icons-add-25.svg create mode 100644 src/assets/images/icons-delete-25.svg diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index 996aa1e9b..98156e5cf 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -126,7 +126,7 @@ export class NewEventPage implements OnInit { adding: this.adding, taskParticipants: this.taskParticipants }, - cssClass: 'attendee', + cssClass: 'attendee modal modal-desktop', backdropDismiss: false }); diff --git a/src/app/pages/events/attendees/attendees.page.html b/src/app/pages/events/attendees/attendees.page.html index e17f9782f..e122b5732 100644 --- a/src/app/pages/events/attendees/attendees.page.html +++ b/src/app/pages/events/attendees/attendees.page.html @@ -12,7 +12,7 @@
- +
@@ -20,6 +20,9 @@

{{ attendee.Name }}

{{ attendee.EmailAddress }}

+
+ +
@@ -39,8 +42,8 @@

{{ attendee.Name }}

{{ attendee.EmailAddress }}

-
- X +
+
@@ -57,8 +60,8 @@

{{ attendee.Name }}

{{ attendee.EmailAddress }}

-
- X +
+
diff --git a/src/app/pages/events/attendees/attendees.page.scss b/src/app/pages/events/attendees/attendees.page.scss index 30cc9ce83..7cb035cfa 100644 --- a/src/app/pages/events/attendees/attendees.page.scss +++ b/src/app/pages/events/attendees/attendees.page.scss @@ -1,6 +1,3 @@ -ion-item-group{ - margin: 15px; -} ion-item{ border-bottom:1px solid #ccc; } 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 }}

+
+ +
@@ -27,7 +30,6 @@
-
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 @@ + + + + + + + + + + + + + + + + From 36ba435be72ae7c07a15de11dee8edbd56ead4d0 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 16 Apr 2021 14:34:42 +0100 Subject: [PATCH 06/14] Fixe search category box was on top of each other --- src/app/pages/search/search.page.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index 99671de61..9e483b5f6 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -83,8 +83,8 @@
- {{ category.Name }} - {{ category.Qtd }} + {{ category.Name }} + {{ category.Qtd }}
From 751916b603410f93395f7f0ef53d3f4860ce08a4 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 16 Apr 2021 14:40:43 +0100 Subject: [PATCH 07/14] Add responsiveness for new event for mobile --- src/app/pages/agenda/agenda.page.html | 1 + src/app/pages/agenda/new-event/new-event.page.scss | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index a08be14a4..80ebd92f0 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -466,6 +466,7 @@ > + Date: Mon, 19 Apr 2021 11:35:48 +0100 Subject: [PATCH 08/14] Improve search select document from searh --- .../agenda/new-event/new-event.page.html | 4 +- .../agenda/new-event/new-event.page.scss | 1 - .../pages/agenda/new-event/new-event.page.ts | 5 +- .../attendee-modal/attendee-modal.page.html | 2 +- src/app/pages/search/search.page.html | 15 +-- src/app/pages/search/search.page.ts | 96 +++++++++++++------ .../agenda/edit-event/edit-event.component.ts | 5 + .../agenda/event-list/event-list.component.ts | 4 +- .../agenda/new-event/new-event.component.html | 16 ++-- .../agenda/new-event/new-event.component.scss | 18 ++++ .../agenda/new-event/new-event.component.ts | 23 +++++ 11 files changed, 137 insertions(+), 52 deletions(-) diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index 51efa7332..f0d73ed20 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -220,8 +220,8 @@
- - + + Cancelar diff --git a/src/app/pages/agenda/new-event/new-event.page.scss b/src/app/pages/agenda/new-event/new-event.page.scss index 2879f6af0..c0cf6f573 100644 --- a/src/app/pages/agenda/new-event/new-event.page.scss +++ b/src/app/pages/agenda/new-event/new-event.page.scss @@ -18,7 +18,6 @@ ion-content{ transform: translate3d(0, 1px, 0); .title-content{ - padding: 0px 20px; margin: 0px auto; overflow: auto; background: #fff; diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index 98156e5cf..769e3b367 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -5,6 +5,7 @@ import { EventPerson } from 'src/app/models/eventperson.model'; import { EventsService } from 'src/app/services/events.service'; import { Event } from '../../../models/event.model'; import { AttendeesPage } from '../../events/attendees/attendees.page'; +import { SearchPage } from '../../search/search.page'; @Component({ selector: 'app-new-event', @@ -43,7 +44,7 @@ export class NewEventPage implements OnInit { ngOnInit() { - console.log(this.profile); +/* console.log(this.profile); */ let selectedStartdDate = this.selectedDate; let selectedEndDate = new Date(this.selectedDate); @@ -118,6 +119,8 @@ export class NewEventPage implements OnInit { this.modalController.dismiss(this.postEvent); } + + async openAttendees() { const modal = await this.modalController.create({ component: AttendeesPage, diff --git a/src/app/pages/events/attendee-modal/attendee-modal.page.html b/src/app/pages/events/attendee-modal/attendee-modal.page.html index 84045ca5d..20e71cf0b 100644 --- a/src/app/pages/events/attendee-modal/attendee-modal.page.html +++ b/src/app/pages/events/attendee-modal/attendee-modal.page.html @@ -10,7 +10,7 @@ - +

{{ attendee.Name }}

diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index 9e483b5f6..9de3907e3 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -4,7 +4,7 @@
- +
- + +
@@ -140,20 +141,20 @@
    -
  • +
  • - - -
    {{ searchDocument.Assunto}} - {{ searchDocument.appName}} + {{ searchDocument.appName}}
    {{ searchDocument.EntidadeOrganicaNome }} diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index d165c7b1f..f3a3a3293 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { ModalController } from '@ionic/angular'; +import { ModalController, NavParams } from '@ionic/angular'; import { SearchService } from "../../services/search.service"; import { SearchCategory } from "src/app/models/search-category"; import { SearchDocument } from "src/app/models/search-document"; @@ -9,8 +9,9 @@ import { OrganicEntityPage } from 'src/app/pages/search/organic-entity/organic-e import WordCloud from 'src/plugin/wordcloud2.js'; import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; import { PublicationDetailPage } from '../publications/view-publications/publication-detail/publication-detail.page'; -import { ExpedienteDetailPage } from '../gabinete-digital/expediente/expediente-detail/expediente-detail.page'; import { DocumentDetailPage } from 'src/app/modals/document-detail/document-detail.page'; + + @Component({ selector: 'app-search', templateUrl: './search.page.html', @@ -51,13 +52,47 @@ export class SearchPage implements OnInit { windowWidth: number; + type : "Agenda" | "Correspondencia" | "AccoesPresidenciais" | "ArquivoDespachoElect" | "AccoesPresidenciais & ArquivoDespachoElect" = "Agenda"; + select = false; + constructor(private modalController: ModalController, private search: SearchService, - private modalCtrl: ModalController,) { + private modalCtrl: ModalController, + private navParams: NavParams) { this.ordinance = "recent"; - this.currentPath= window.location.pathname; + + this.type = this.navParams.get('type'); + + + if(this.type == null || this.type == undefined) { + + this.select = true; + + if(this.currentPath == '/home/agenda') { + this.type = "Agenda" + } else if (this.currentPath =='/home/gabinete-digital') { + this.type = "AccoesPresidenciais & ArquivoDespachoElect" + + } else if (this.currentPath == '/home/publications') { + this.type = "AccoesPresidenciais" + } else { + this.select = false + } + } else { + this.select = true; + } + + + } + + selectItem(item: SearchDocument) { + if(this.select){ + this.modalController.dismiss({ + selected: item + }); } + } ngOnInit() { @@ -172,9 +207,9 @@ export class SearchPage implements OnInit { /** * @description Basic search */ - basicSearch(){ + basicSearch(){ - if(window.location.pathname == '/home/agenda'){ + if(this.type == "Agenda" ){ this.showLoader = true; @@ -205,7 +240,7 @@ export class SearchPage implements OnInit { this.loadWordCloud(); }); - } else if (window.location.pathname =='/home/gabinete-digital'){ + } else if ( this.type == "AccoesPresidenciais & ArquivoDespachoElect"){ this.showLoader = true; @@ -267,7 +302,7 @@ export class SearchPage implements OnInit { this.loadWordCloud(); }); - } else if (window.location.pathname == '/home/publications'){ + } else if (this.type == "AccoesPresidenciais"){ this.showLoader = true; @@ -297,7 +332,7 @@ export class SearchPage implements OnInit { this.loadWordCloud(); }); } - + } /** @@ -424,7 +459,7 @@ export class SearchPage implements OnInit { itemIcons(): string{ - return window.location.pathname + return this.type } viewDocument(){ @@ -437,27 +472,28 @@ export class SearchPage implements OnInit { async viewDetail(id:any) { console.log(id); - - if(window.location.pathname == '/home/agenda'){ + if(!this.selectItem){ + if(window.location.pathname == '/home/agenda'){ - const modal = await this.modalCtrl.create({ - component: ViewEventPage, - componentProps:{ - eventId: id - }, - cssClass: 'modal modal-desktop', - }); - await modal.present(); - modal.onDidDismiss().then((res)=>{}); - - } else if(window.location.pathname == '/home/publications'){ + const modal = await this.modalCtrl.create({ + component: ViewEventPage, + componentProps:{ + eventId: id + }, + cssClass: 'modal modal-desktop', + }); + await modal.present(); + modal.onDidDismiss().then((res)=>{}); - this.viewPublicationDetail(id); - } - else if(window.location.pathname == '/home/gabinete-digital'){ - console.log('OPEN DOC'); - this.viewDocumentDetail(id,''); - + } else if(window.location.pathname == '/home/publications'){ + + this.viewPublicationDetail(id); + } + else if(window.location.pathname == '/home/gabinete-digital'){ + console.log('OPEN DOC'); + this.viewDocumentDetail(id,''); + + } } } @@ -480,7 +516,7 @@ export class SearchPage implements OnInit { async viewDocumentDetail(docId:string, applicationId:string) { let classs; if( window.innerWidth <= 800){ - classs = 'modal' + classs = 'modal modal-desktop' } else { classs = 'modal modal-desktop showAsideOptions' } diff --git a/src/app/shared/agenda/edit-event/edit-event.component.ts b/src/app/shared/agenda/edit-event/edit-event.component.ts index 0f584a9de..122039e85 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.ts +++ b/src/app/shared/agenda/edit-event/edit-event.component.ts @@ -6,6 +6,7 @@ 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'; @Component({ selector: 'app-edit-event', templateUrl: './edit-event.component.html', @@ -90,6 +91,9 @@ export class EditEventComponent implements OnInit { this.deleteTemporaryData(); } + + + async save(){ this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc); @@ -120,6 +124,7 @@ export class EditEventComponent implements OnInit { this.clearContact.emit(); } + async addParticipantsCc() { this.saveTemporaryData(); diff --git a/src/app/shared/agenda/event-list/event-list.component.ts b/src/app/shared/agenda/event-list/event-list.component.ts index ba845ab01..c5ef3efe1 100644 --- a/src/app/shared/agenda/event-list/event-list.component.ts +++ b/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(); } }); } diff --git a/src/app/shared/agenda/new-event/new-event.component.html b/src/app/shared/agenda/new-event/new-event.component.html index d7d90b844..4ecbfdaed 100644 --- a/src/app/shared/agenda/new-event/new-event.component.html +++ b/src/app/shared/agenda/new-event/new-event.component.html @@ -183,26 +183,26 @@
    - -
    - +

    {{document.SourceName}} - webTRIX - K2 - Exchange - File + webTRIX + K2 + Exchange + File + + +

    {{document.Stakeholders}} {{document.CreateDate}}

    diff --git a/src/app/shared/agenda/edit-event/edit-event.component.scss b/src/app/shared/agenda/edit-event/edit-event.component.scss index 0f62f6403..f9eea71be 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.scss +++ b/src/app/shared/agenda/edit-event/edit-event.component.scss @@ -185,4 +185,20 @@ ion-content{ -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/edit-event/edit-event.component.ts b/src/app/shared/agenda/edit-event/edit-event.component.ts index b1830de52..1c8110988 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.ts +++ b/src/app/shared/agenda/edit-event/edit-event.component.ts @@ -62,8 +62,6 @@ export class EditEventComponent implements OnInit { } } } - - // attendees list if(this.postEvent.Attendees != null) { @@ -186,7 +184,17 @@ export class EditEventComponent implements OnInit { 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); + }) + + } + } diff --git a/src/app/shared/agenda/new-event/new-event.component.html b/src/app/shared/agenda/new-event/new-event.component.html index 4ecbfdaed..9f723382f 100644 --- a/src/app/shared/agenda/new-event/new-event.component.html +++ b/src/app/shared/agenda/new-event/new-event.component.html @@ -194,13 +194,16 @@
    -
    +

    {{document.Assunto}} {{document.appName}} + + +

    {{document.EntidadeOrganicaNome}} {{document.Data}}

    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 1b4a00508..1497762a9 100644 --- a/src/app/shared/agenda/new-event/new-event.component.scss +++ b/src/app/shared/agenda/new-event/new-event.component.scss @@ -194,4 +194,20 @@ ion-content{ -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 b6e579bcf..4f0152386 100644 --- a/src/app/shared/agenda/new-event/new-event.component.ts +++ b/src/app/shared/agenda/new-event/new-event.component.ts @@ -173,6 +173,7 @@ export class NewEventPage implements OnInit { const DocumentToSave: EventAttachment[] = this.documents.map((e) => { return { + SourceTitle: e.Assunto, ParentId: eventId, Source: '1', SourceId: e.Id, @@ -197,10 +198,14 @@ export class NewEventPage implements OnInit { 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: '' }; }); @@ -210,16 +215,12 @@ export class NewEventPage implements OnInit { }); } - - this.gobackOnSave(); } - async gobackOnSave(){ - //this.onAddEvent.emit(this.postEvent); - //this.GoBackEditOrAdd.emit(); - //this.deleteTemporaryData(); - //this.setIntervenient.emit([]); - //this.setIntervenientCC.emit([]); + removeAttachment(index: number){ + + this.documents = this.documents.filter( (e, i) => index != i); + } @@ -255,7 +256,7 @@ export class NewEventPage implements OnInit { } - restoreTemporaryData(): boolean{ + restoreTemporaryData(): boolean { const restoredData = window['temp.path:/home/agenda/new-event.component.ts'] From 0a900b1621155fa5db885056bc4cb57b54c3d1f6 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 20 Apr 2021 16:06:31 +0100 Subject: [PATCH 13/14] Improve add attachment --- src/app/services/attachments.service.ts | 2 +- .../edit-event/edit-event.component.html | 4 +- .../agenda/edit-event/edit-event.component.ts | 37 ++++++++++++++++++- .../agenda/new-event/new-event.component.html | 4 +- .../agenda/view-event/view-event.page.html | 10 ++--- 5 files changed, 45 insertions(+), 12 deletions(-) diff --git a/src/app/services/attachments.service.ts b/src/app/services/attachments.service.ts index 9d75b3625..2f281bbf3 100644 --- a/src/app/services/attachments.service.ts +++ b/src/app/services/attachments.service.ts @@ -87,7 +87,7 @@ export class AttachmentsService { params: params } - return this.http.post(`${geturl}`, options); + return this.http.delete(`${geturl}`, options); } } diff --git a/src/app/shared/agenda/edit-event/edit-event.component.html b/src/app/shared/agenda/edit-event/edit-event.component.html index ab5549365..8d5982231 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.html +++ b/src/app/shared/agenda/edit-event/edit-event.component.html @@ -187,7 +187,7 @@
    -
    +
    @@ -213,7 +213,7 @@

    -

    {{document.Stakeholders}} {{document.CreateDate}}

    +

    {{document.Stakeholders}} {{document.CreateDate | date: 'dd-MM-yy'}}

    diff --git a/src/app/shared/agenda/edit-event/edit-event.component.ts b/src/app/shared/agenda/edit-event/edit-event.component.ts index 1c8110988..b6c24c673 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.ts +++ b/src/app/shared/agenda/edit-event/edit-event.component.ts @@ -184,7 +184,7 @@ export class EditEventComponent implements OnInit { getAttachments(eventId: string){ this.attachmentsService.getAttachmentsById(eventId).subscribe(res=>{ this.loadedEventAttachments = res; - console.log('res', res); + console.log('res', res); }); } @@ -194,7 +194,40 @@ export class EditEventComponent implements OnInit { 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); + }); + + } + }); + } + + } diff --git a/src/app/shared/agenda/new-event/new-event.component.html b/src/app/shared/agenda/new-event/new-event.component.html index 9f723382f..8efe9fa8e 100644 --- a/src/app/shared/agenda/new-event/new-event.component.html +++ b/src/app/shared/agenda/new-event/new-event.component.html @@ -194,7 +194,7 @@
    -
    +
    @@ -205,7 +205,7 @@

    -

    {{document.EntidadeOrganicaNome}} {{document.Data}}

    +

    {{document.EntidadeOrganicaNome}} {{document.Data | date: 'dd-MM-yy'}}

    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..d94f58aee 100644 --- a/src/app/shared/agenda/view-event/view-event.page.html +++ b/src/app/shared/agenda/view-event/view-event.page.html @@ -59,12 +59,12 @@
    -
    +
    Documentos Anexados
    - - - + + +

    {{attach.SourceName}}

    {{attach.Stakeholders}}{{ attach.CreateDate | date: 'dd-MM-yy' }}

     From 7d882d3a112e9904b1e3725f4c136b9e8958a060 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 20 Apr 2021 16:31:38 +0100 Subject: [PATCH 14/14] Improve edit event --- .../agenda/edit-event/edit-event.component.html | 7 +++---- .../shared/agenda/view-event/view-event.page.html | 15 +++++++-------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/app/shared/agenda/edit-event/edit-event.component.html b/src/app/shared/agenda/edit-event/edit-event.component.html index 8d5982231..4e317be59 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.html +++ b/src/app/shared/agenda/edit-event/edit-event.component.html @@ -204,10 +204,9 @@

    {{document.SourceName}} - webTRIX - K2 - Exchange - File + Correspondencia + AccoesPresidenciais + ArquivoDespachoElect 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 d94f58aee..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' }}

    +     +