From 1522f7919e7fc1f8cd96cd68102179e3d9c49f95 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 1 Apr 2021 17:27:01 +0100 Subject: [PATCH 01/12] save --- src/app/shared/agenda/edit-event/edit-event.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8507950bc..6c32e2e7a 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.html +++ b/src/app/shared/agenda/edit-event/edit-event.component.html @@ -179,7 +179,7 @@
- +
From c0308a16110e6209df330ff2741d845f5b37d99d Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 1 Apr 2021 17:28:34 +0100 Subject: [PATCH 02/12] save --- src/app/shared/agenda/edit-event/edit-event.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6c32e2e7a..0ccb16d5b 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.html +++ b/src/app/shared/agenda/edit-event/edit-event.component.html @@ -179,7 +179,7 @@
- +
From 9a36e1c2cbfc73379c6437656b795d0539194ecf Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 5 Apr 2021 14:12:59 +0100 Subject: [PATCH 03/12] save --- src/global.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/global.scss b/src/global.scss index 8a7b43e87..62ac04b65 100644 --- a/src/global.scss +++ b/src/global.scss @@ -97,7 +97,10 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- width: 100% !important; margin-left: 0px !important; } - +.line{ + margin-top: 15px; +border-top: 1px solid #d8d8d8; +} From 356732e919c411b1ea01f420eff754a9c95785fb Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 5 Apr 2021 14:13:13 +0100 Subject: [PATCH 04/12] save --- config.xml | 2 +- .../pages/agenda/edit-event/edit-event.page.html | 14 ++++++++++---- .../pages/agenda/edit-event/edit-event.page.scss | 4 +++- .../pages/agenda/view-event/view-event.page.html | 3 ++- .../pages/agenda/view-event/view-event.page.scss | 8 ++++++++ .../approve-event/approve-event.page.html | 1 + .../expedient-task-modal.page.ts | 1 + .../expediente-detail/expediente-detail.page.html | 5 +++-- src/app/services/events.service.ts | 2 +- .../approve-event/approve-event.component.html | 1 + .../agenda/edit-event/edit-event.component.html | 6 ++---- .../agenda/edit-event/edit-event.component.scss | 13 ++++--------- .../agenda/edit-event/edit-event.component.ts | 7 ++++++- .../shared/agenda/view-event/view-event.page.html | 9 ++++++--- .../shared/agenda/view-event/view-event.page.scss | 4 ++++ 15 files changed, 53 insertions(+), 27 deletions(-) diff --git a/config.xml b/config.xml index db621118f..b3e4a2084 100644 --- a/config.xml +++ b/config.xml @@ -3,7 +3,7 @@ gabinete digital An awesome Ionic/Cordova app. Ionic Framework Team - + diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html index 673b2c65c..5d46eb719 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -1,13 +1,17 @@ - -
+ +
+
Editar Evento
+
+ +
@@ -173,8 +177,8 @@
-
- +
+
@@ -203,7 +207,9 @@
+
+
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.scss b/src/app/pages/agenda/edit-event/edit-event.page.scss index 9659a0bfa..f3440bae6 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.scss +++ b/src/app/pages/agenda/edit-event/edit-event.page.scss @@ -69,6 +69,7 @@ float: left; } .ion-input-class-no-height{ + width: calc(100% - 45px); border: 1px solid #ebebeb; border-radius: 5px; overflow: auto; @@ -162,4 +163,5 @@ justify-content: space-between; padding: 20px; overflow: auto; - } \ No newline at end of file + } + \ No newline at end of file diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html index 3a68f4910..448628f3f 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -47,6 +47,7 @@ +
Intervenientes
@@ -60,7 +61,7 @@
Detalhes
-

+
diff --git a/src/app/pages/agenda/view-event/view-event.page.scss b/src/app/pages/agenda/view-event/view-event.page.scss index c74dbf83b..54eaf645b 100644 --- a/src/app/pages/agenda/view-event/view-event.page.scss +++ b/src/app/pages/agenda/view-event/view-event.page.scss @@ -151,6 +151,10 @@ ion-menu{ font-size: 16px; } } + .line{ + margin-top: 15px; + border-top: 1px solid #d8d8d8; + } .middle-conten{ .middle-content h3, .middle-content p{ font-size: 16px; @@ -230,4 +234,8 @@ ion-menu{ margin: 0 auto !important; margin-bottom: 10px !important; } + } + textarea{ + border:none; + --background:#fff !important; } \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html index 160c2abdc..23aa99595 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html @@ -54,6 +54,7 @@ +
Intervenientes
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index a9678402e..a7bda9ddf 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -80,6 +80,7 @@ export class ExpedientTaskModalPage implements OnInit { this.taskDate = new Date(this.task.taskStartDate); this.getAttachments(); + this.getSubjectType(); } close(){ diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index d4f238c72..a7d6b17b7 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -55,8 +55,8 @@
- -
+ +
@@ -79,6 +79,7 @@
+
Intervenientes
diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index e0be9c7e9..2f4b88c16 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -192,7 +192,7 @@ export class EventsService { return this.http.delete(`${puturl}`, options) } postExpedientEvent(docId:any, body:any, sharedagenda:string, serialNumber:any){ - const geturl = environment.apiURL + 'calendar/' + ((sharedagenda != '') ? sharedagenda : 'CreateEventExpediente'); + const geturl = environment.apiURL + 'calendar/' + ((sharedagenda != '') ? sharedagenda : 'CreateEventExpediente')+'/event'; let params = new HttpParams(); params = params.set("DocId", docId); diff --git a/src/app/shared/agenda/approve-event/approve-event.component.html b/src/app/shared/agenda/approve-event/approve-event.component.html index bfe3ff7ba..8f9862116 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.html +++ b/src/app/shared/agenda/approve-event/approve-event.component.html @@ -65,6 +65,7 @@
+
Intervenientes
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 0ccb16d5b..8f5e704f3 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.html +++ b/src/app/shared/agenda/edit-event/edit-event.component.html @@ -177,10 +177,8 @@
-
- - - +
+
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 fcb66c717..dc20d1e33 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.scss +++ b/src/app/shared/agenda/edit-event/edit-event.component.scss @@ -57,7 +57,6 @@ ion-content{ margin-bottom: 15px; } .ion-item-class-2{ - margin: 0px auto; } .ion-icon-class{ @@ -81,8 +80,11 @@ ion-content{ float: left; } .ion-input-class-no-height{ + height: auto !important; border: 1px solid #ebebeb; border-radius: 5px; + margin-bottom: 15px; + overflow: auto; } .list-people{ @@ -165,11 +167,4 @@ ion-content{ color:red; } - } - - -.container-div{ - ion-textarea{ - height: 81px; - } -} \ No newline at end of file + } \ 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 7cf1473f5..0da22289c 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.ts +++ b/src/app/shared/agenda/edit-event/edit-event.component.ts @@ -36,10 +36,15 @@ export class EditEventComponent implements OnInit { private eventsService: EventsService, public alertController: AlertController, ) { + } ngOnInit() { + let innerHtml :string = this.postEvent.Body.Text; + this.postEvent.Body.Text = innerHtml; + console.log(this.postEvent); + this.isEventEdited = false; if(this.postEvent.IsRecurring == false){ @@ -49,13 +54,13 @@ export class EditEventComponent implements OnInit { this.isRecurring = "Repete"; } } + close(){ console.log('!!!!!!!!!!!!!!!!! close') this.closeComponent.emit(); this.clearContact.emit(); } save(){ - this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => { const alert = await this.alertController.create({ cssClass: 'my-custom-class', 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 2c5e63791..4790b191d 100644 --- a/src/app/shared/agenda/view-event/view-event.page.html +++ b/src/app/shared/agenda/view-event/view-event.page.html @@ -32,6 +32,7 @@
+
Intervenientes
@@ -44,15 +45,16 @@
Detalhes
- -

+ +
+

Documentos Anexados

- +

{{attach.SourceName}}

@@ -61,5 +63,6 @@
+
\ No newline at end of file diff --git a/src/app/shared/agenda/view-event/view-event.page.scss b/src/app/shared/agenda/view-event/view-event.page.scss index fc6473ef4..316f0026a 100644 --- a/src/app/shared/agenda/view-event/view-event.page.scss +++ b/src/app/shared/agenda/view-event/view-event.page.scss @@ -123,6 +123,10 @@ ion-menu{ font-size: 16px; } } + .line{ + margin-top: 15px; + border-top: 1px solid #d8d8d8; + } .middle-conten{ .middle-content h3, .middle-content p{ font-size: 16px; From 03057602d13288839279a4deb8c4b86758737b1c Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 5 Apr 2021 14:41:01 +0100 Subject: [PATCH 05/12] save --- src/app/pages/agenda/view-event/view-event.page.html | 6 +++--- src/app/pages/agenda/view-event/view-event.page.scss | 1 - src/app/pages/agenda/view-event/view-event.page.ts | 12 +++++++++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html index 448628f3f..9db38d0b1 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -59,15 +59,15 @@ -
Detalhes
+
Detalhes11
-
+
-

Documentos Anexados

+
Documentos Anexados
diff --git a/src/app/pages/agenda/view-event/view-event.page.scss b/src/app/pages/agenda/view-event/view-event.page.scss index 54eaf645b..78ef0dad7 100644 --- a/src/app/pages/agenda/view-event/view-event.page.scss +++ b/src/app/pages/agenda/view-event/view-event.page.scss @@ -162,7 +162,6 @@ ion-menu{ } .bottom-content{ - width: 360px; margin: 0 auto; .bottom-content h3{ diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index ed5b2dc28..2a2538bde 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -8,6 +8,7 @@ import { EventsService } from 'src/app/services/events.service'; import { Event } from '../../../models/event.model'; import { EditEventPage } from '../edit-event/edit-event.page'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; +import { ProcessesService } from 'src/app/services/processes.service'; @Component({ selector: 'app-view-event', @@ -41,6 +42,7 @@ export class ViewEventPage implements OnInit { private attachmentsService: AttachmentsService, public alertController: AlertController, private iab: InAppBrowser, + private processes: ProcessesService, ) { this.profile = this.navParams.get('profile'); @@ -135,9 +137,13 @@ export class ViewEventPage implements OnInit { viewDocument(){ - const url: string = this.loadedAttachments.DocumentURL.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); - const browser = this.iab.create(url,"_blank"); - browser.show(); + /* this.processes.GetDocumentUrl(this.task.DocId, this.task.FsId).subscribe(res=>{ + console.log(res); + const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); + const browser = this.iab.create(url,"_blank"); + browser.show(); + + }); */ } } From 01d68edbf327092392aebaf42abc10557cb2a73a Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 5 Apr 2021 14:46:23 +0100 Subject: [PATCH 06/12] save --- src/app/pages/agenda/view-event/view-event.page.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html index 9db38d0b1..33832fbfc 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -59,11 +59,13 @@
-
Detalhes11
+
+
Detalhes
+
From e0c5fe2e575500c0c84eefb60927547936c41719 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 5 Apr 2021 14:56:40 +0100 Subject: [PATCH 07/12] save --- src/app/pages/agenda/view-event/view-event.page.html | 2 +- src/app/pages/agenda/view-event/view-event.page.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html index 33832fbfc..f42f80adc 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -72,7 +72,7 @@
Documentos Anexados
+ (click)="viewDocument(attach.SourceId)">

{{attach.SourceName}}

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

diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index 2a2538bde..63e9f1d8c 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -136,14 +136,14 @@ export class ViewEventPage implements OnInit { } - viewDocument(){ - /* this.processes.GetDocumentUrl(this.task.DocId, this.task.FsId).subscribe(res=>{ + viewDocument(sourceId){ + this.processes.GetDocumentUrl(sourceId, '8').subscribe(res=>{ console.log(res); const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); const browser = this.iab.create(url,"_blank"); browser.show(); - }); */ + }); } } From ade02d2d79e3c27921ac1347d8a024435313eff4 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 5 Apr 2021 15:02:57 +0100 Subject: [PATCH 08/12] sace --- .../pages/agenda/view-event/view-event.page.ts | 1 - .../shared/agenda/view-event/view-event.page.html | 2 +- .../shared/agenda/view-event/view-event.page.ts | 15 +++++++++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index 63e9f1d8c..4f51b5931 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -135,7 +135,6 @@ export class ViewEventPage implements OnInit { }); } - viewDocument(sourceId){ this.processes.GetDocumentUrl(sourceId, '8').subscribe(res=>{ console.log(res); 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 4790b191d..e9faf0c36 100644 --- a/src/app/shared/agenda/view-event/view-event.page.html +++ b/src/app/shared/agenda/view-event/view-event.page.html @@ -56,7 +56,7 @@

Documentos Anexados

+ (click)="viewDocument(attach.SourceId)">

{{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 c742ad4c1..5b5ff2375 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -7,6 +7,7 @@ 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'; @Component({ selector: 'app-view-event', @@ -42,6 +43,7 @@ export class ViewEventPage implements OnInit { private attachmentsService: AttachmentsService, public alertController: AlertController, private iab: InAppBrowser, + private processes: ProcessesService, ) { this.isEventEdited = false; @@ -109,10 +111,15 @@ export class ViewEventPage implements OnInit { event: this.loadedEvent }) } - viewDocument(){ - const url: string = this.loadedAttachments.DocumentURL.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); - const browser = this.iab.create(url,"_blank"); - browser.show(); + + viewDocument(sourceId){ + this.processes.GetDocumentUrl(sourceId, '8').subscribe(res=>{ + console.log(res); + const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); + const browser = this.iab.create(url,"_blank"); + browser.show(); + + }); } } From 8ced295f64b8fa5006505a55ab6ad1fbbd52d9f2 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 6 Apr 2021 09:26:31 +0100 Subject: [PATCH 09/12] save --- .../agenda/edit-event/edit-event.page.html | 2 +- .../agenda/view-event/view-event.page.ts | 3 +- .../edit-event/app-edit-event-home.page.html | 2 +- src/app/pages/events/events-routing.module.ts | 67 ++++++++++--------- .../approve-event-modal.page.html | 2 +- .../approve-event/approve-event.page.html | 4 +- .../gabinete-digital/gabinete-digital.page.ts | 2 +- .../approve-event.component.html | 2 +- .../approve-event/approve-event.component.ts | 10 ++- .../edit-event/edit-event.component.html | 2 +- .../event-list/event-list.component.html | 2 +- .../events-to-approve.page.ts | 8 ++- 12 files changed, 57 insertions(+), 49 deletions(-) diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html index 5065380c9..f9a4550c0 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -6,7 +6,7 @@
- Editar Evento + Editar Evento com divisão
diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index e2d3845ee..f45837924 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -8,7 +8,6 @@ import { EventsService } from 'src/app/services/events.service'; import { Event } from '../../../models/event.model'; import { EditEventPage } from '../edit-event/edit-event.page'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; -import { EventEditPage } from '../../events/edit-event/edit-event.component'; import { ProcessesService } from 'src/app/services/processes.service'; @Component({ @@ -115,7 +114,7 @@ export class ViewEventPage implements OnInit { } const modal = await this.modalController.create({ - component: EventEditPage, + component: EditEventPage, componentProps: { eventId: this.loadedEvent.EventId, profile: this.profile, diff --git a/src/app/pages/events/edit-event/app-edit-event-home.page.html b/src/app/pages/events/edit-event/app-edit-event-home.page.html index 95d9fe4c5..860adfe23 100644 --- a/src/app/pages/events/edit-event/app-edit-event-home.page.html +++ b/src/app/pages/events/edit-event/app-edit-event-home.page.html @@ -3,7 +3,7 @@ - Visualizar Evento + 21Visualizar Evento