diff --git a/src/app/modals/view-event/view-event.page.ts b/src/app/modals/view-event/view-event.page.ts index a50efda54..111b1d64f 100644 --- a/src/app/modals/view-event/view-event.page.ts +++ b/src/app/modals/view-event/view-event.page.ts @@ -126,11 +126,11 @@ export class ViewEventPage implements OnInit { this.eventsService.getEvent(this.eventId).subscribe(res => { this.loadedEvent = res; // this.addEventToDb(res); - + loader.remove() }, (error) => { - - + + if (error.status === 0) { // this.getFromDb(); } else { @@ -148,10 +148,10 @@ export class ViewEventPage implements OnInit { this.eventsService.genericGetEvent(this.eventId, this.CalendarId).subscribe(res => { this.loadedEvent = res; // this.addEventToDb(res); - + loader.remove() }, (error) => { - + if (error.status === 0) { // this.getFromDb(); } else { @@ -238,7 +238,7 @@ export class ViewEventPage implements OnInit { cssClass: 'modal modal-desktop', }); - + modal.onDidDismiss().then((res) => { if (res) { @@ -382,7 +382,7 @@ export class ViewEventPage implements OnInit { }); modal.onDidDismiss().then( - async (res) => { }, + async (res) => { }, (error) => { console.log(error) }); 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 fcc93057d..ac19bc094 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -269,13 +269,13 @@
- +
- Com Conhecimento* + Com Conhecimento {{participant.Name}} @@ -367,7 +367,7 @@ - diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts index 56926e7dc..206422aa2 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -201,6 +201,10 @@ export class EditEventPage implements OnInit { this.modalController.dismiss(); } + cancel() { + this.modalController.dismiss({action:'cancel'}); + } + goBack() { this.router.navigate(['/home', this.caller]); @@ -643,7 +647,7 @@ export class EditEventPage implements OnInit { if (horaMinuto[1] === '59') { horaMinuto[1] = '00'; var novaString = partes[0] + ' ' + horaMinuto.join(':'); - + return novaString; } return string; 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 1032f20b8..37c45cba9 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -18,6 +18,7 @@

{{loadedEvent.Subject}}

+
@@ -64,7 +65,7 @@ Semanal Mensal Anual - (Não se repete) + (Não se repete)

diff --git a/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.ts b/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.ts index 013ec4f51..6386e0451 100644 --- a/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.ts +++ b/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.ts @@ -6,6 +6,7 @@ import { DeviceService } from "src/app/services/device.service" import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; import { ProcessesService } from 'src/app/services/processes.service'; import { PermissionService } from 'src/app/services/permission.service'; +import { HeaderSettingsService } from "src/app/services/header-settings.service" @Component({ selector: 'app-viewer-attachment', @@ -33,6 +34,7 @@ export class ViewerAttachmentPage implements OnInit { private erroHandler: HttpErrorHandle, public p: PermissionService, private processService: ProcessesService, + private HeaderSettingsService: HeaderSettingsService ) { } ngOnInit() { diff --git a/src/app/services/header-settings.service.spec.ts b/src/app/services/header-settings.service.spec.ts new file mode 100644 index 000000000..a0dd3d032 --- /dev/null +++ b/src/app/services/header-settings.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { HeaderSettingsService } from './header-settings.service'; + +describe('HeaderSettingsService', () => { + let service: HeaderSettingsService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(HeaderSettingsService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/services/header-settings.service.ts b/src/app/services/header-settings.service.ts new file mode 100644 index 000000000..b2a5af8fe --- /dev/null +++ b/src/app/services/header-settings.service.ts @@ -0,0 +1,11 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root' +}) +export class HeaderSettingsService { + + hideHeader = false + constructor() { } + +} diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html index 7eb86b176..f235afeb1 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.html +++ b/src/app/shared/agenda/approve-event/approve-event.page.html @@ -9,6 +9,7 @@
Evento Pendente de Aprovação
+
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html index 1373074cb..252b4559c 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html @@ -299,7 +299,7 @@
- +
@@ -309,7 +309,7 @@ display: grid; "> - Adicionar Intervenientes + Com Conhecimento {{participant.Name}} diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss index c0faa7367..c5a1a5a84 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss @@ -12,6 +12,7 @@ .main-header{ font-family: Roboto; background-color: #fff; + min-height: 86px; overflow:hidden; transform: translate3d(0, 1px, 0); 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 1d5b4a1fc..efbb05166 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -155,7 +155,7 @@ export class ViewEventPage implements OnInit { div.innerHTML = res.Body.Text res.Body.Text = div.innerText */ this.loadedEvent = res; - console.log('Event details',res) + // console.log('Event details',res) this.setTimeZone() this.today = new Date(res.StartDate); diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index cc2234028..b7faae8f4 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -241,13 +241,13 @@
- +
- Adicionar Intervenientes + Com Conhecimento {{participant.Name}} diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss index 680d890c1..163ecb7ad 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss @@ -13,7 +13,7 @@ margin-bottom: 20px; font-family: Roboto; background-color: #fff; - min-height: 79px; + min-height: 86px; overflow:hidden; transform: translate3d(0, 1px, 0); diff --git a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html index 093a8cdca..0e55f4200 100644 --- a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html +++ b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html @@ -1,5 +1,5 @@ -
+
@@ -28,7 +28,7 @@
-
+
@@ -44,7 +44,7 @@
-
+
-
+
Intervenientes
@@ -123,12 +123,12 @@
- -