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 b0645c1a9..2873f7c2f 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -279,13 +279,13 @@
- +
- Com Conhecimento* + Com Conhecimento {{participant.Name}} @@ -377,7 +377,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 7c5e10f74..04f8d0ddb 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -203,6 +203,10 @@ export class EditEventPage implements OnInit { this.modalController.dismiss(); } + cancel() { + this.modalController.dismiss({action:'cancel'}); + } + goBack() { this.router.navigate(['/home', this.caller]); @@ -645,7 +649,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/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index 8a71d5f0e..70d545321 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -155,7 +155,6 @@ [stepHour]="1" [stepMinute]="15" [hideTime]="!allDayCheck" - [disabled]="true" > 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 4235073ba..b85a867aa 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -11,7 +11,6 @@ import { ToastService } from 'src/app/services/toast.service'; import { Event } from '../../../models/event.model'; import { AttendeesPageModal } from '../../events/attendees/attendees.page'; import { SearchPage } from '../../search/search.page'; -import { ThemePalette } from '@angular/material/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { ThemeService } from 'src/app/services/theme.service'; import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; @@ -25,6 +24,9 @@ import { TaskService } from 'src/app/services/task.service' import { ContactsService } from 'src/app/services/contacts.service'; import { DomSanitizerService } from 'src/app/services/DomSanitizer.service'; import { momentG } from 'src/plugin/momentG'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, ThemePalette } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MomentDateAdapter } from '@angular/material-moment-adapter'; const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { @@ -37,12 +39,25 @@ const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { monthYearA11yLabel: "MMMM YYYY" } } +const MY_DATE_FORMAT = { + parse: { + dateInput: 'DD-MM-YYYY', + }, + display: { + dateInput: 'DD/MM/YYYY', + monthYearLabel: 'MMMM YYYY', + dateA11yLabel: 'LL', + monthYearA11yLabel: 'MMMM YYYY' + } +}; @Component({ selector: 'app-new-event', templateUrl: './new-event.page.html', styleUrls: ['./new-event.page.scss'], providers: [ { provide: NGX_MAT_DATE_FORMATS, useValue: CUSTOM_DATE_FORMATS }, + { provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE] }, +{ provide: MAT_DATE_FORMATS, useValue: MY_DATE_FORMAT } ] }) @@ -114,7 +129,8 @@ export class NewEventPage implements OnInit { private processeService: ProcessesService, public TaskService: TaskService, private contactsService: ContactsService, - private domSanitazerService: DomSanitizerService + private domSanitazerService: DomSanitizerService, + private dateAdapter: DateAdapter ) { this.loggeduser = SessionStore.user; this.postEvent = new Event(); 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/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index d7343c06a..acba86506 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -61,7 +61,7 @@ export class ApproveEventPage implements OnInit { private attachmentsService: AttachmentsService, ) { this.activatedRoute.paramMap.subscribe(params => { - // + // if (params["params"].serialNumber) { this.serialNumber = params["params"].serialNumber; @@ -72,7 +72,7 @@ export class ApproveEventPage implements OnInit { }); window['approve-event-getTask'] = () => { - this.getTask1() + this.getTask() } } @@ -81,7 +81,7 @@ export class ApproveEventPage implements OnInit { } ngOnInit() { - + this.getTask(); this.backgroundservice.registerBackService('Online', () => { this.getTask(); @@ -95,12 +95,12 @@ export class ApproveEventPage implements OnInit { } addProcessToDB(data) { - + } getProcessFromDB() { - + } getTask1 = () => { @@ -108,11 +108,11 @@ export class ApproveEventPage implements OnInit { this.loadedEvent = res this.addProcessToDB(this.loadedEvent) - + try { this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate); this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]); - + } catch(error) { // console.log(this.loadedEvent) throw(error) @@ -133,11 +133,11 @@ export class ApproveEventPage implements OnInit { this.loadedEvent = res this.getAttachments(); this.addProcessToDB(this.loadedEvent) - + try { this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate); this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]); - + } catch(error) { // console.log(this.loadedEvent) throw(error) @@ -154,7 +154,7 @@ export class ApproveEventPage implements OnInit { async approveTask(serialNumber: string) { let body = { "serialNumber": serialNumber, "action": "Aprovar" } - + const loader = this.toastService.loading() @@ -174,7 +174,7 @@ export class ApproveEventPage implements OnInit { } async emendTask(serialNumber: string) { - + const modal = await this.modalController.create({ component: EmendMessageModalPage, @@ -188,9 +188,9 @@ export class ApproveEventPage implements OnInit { modal.onDidDismiss() .then(async (res) => { - - if(res.data.option == 'save') { - + + if(res.data.option == 'save') { + let body = { "serialNumber": serialNumber, "action": "Emendar", @@ -198,14 +198,14 @@ export class ApproveEventPage implements OnInit { "ReviewUserComment": res.data, } } - + const loader = this.toastService.loading() try { await this.processes.PostTaskAction(body).toPromise() .catch(() => { - + this.offlineManager.storeRequestData('event-listRever', body); }); this.httpErrorHandle.httpsSucessMessagge('Rever') @@ -217,7 +217,7 @@ export class ApproveEventPage implements OnInit { loader.remove() } - + } }, (error) => { console.log(error) @@ -229,7 +229,7 @@ export class ApproveEventPage implements OnInit { async rejeitar(serialNumber: string) { let body = { "serialNumber": serialNumber, "action": "Descartar" } - + const loader = this.toastService.loading() try { await this.processes.PostTaskAction(body).toPromise(); @@ -281,6 +281,7 @@ export class ApproveEventPage implements OnInit { }); return await popover.present().then(() => { this.TaskService.loadEventosParaAprovacao() + this.getTask(); }, (error) => { console.log(error) }) @@ -302,9 +303,9 @@ export class ApproveEventPage implements OnInit { modal.onDidDismiss().then(async (res) => { - + if(res.data.option == 'save') { - + let body = { "serialNumber": serialNumber, "action": "Emendar", @@ -312,7 +313,7 @@ export class ApproveEventPage implements OnInit { "ReviewUserComment": res.data, } } - + const loader = this.toastService.loading() @@ -327,7 +328,7 @@ export class ApproveEventPage implements OnInit { loader.remove() } - + } else { } @@ -380,7 +381,7 @@ export class ApproveEventPage implements OnInit { } catch (error) { console.error('getAttchaments',error) } - + } 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/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index 7581ea20c..f6159a89e 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -259,7 +259,7 @@ export class NewPublicationPage implements OnInit { if (this.platform.is('ios')) { this.recordevideoIos(element.fullPath) } else { - + this.recordVideoAndroid(element.fullPath) } } catch (e) { 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 b93174794..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 @@ -8,7 +8,7 @@
- Editar evento por aprovar ccxcxcxc
+ Editar evento por aprovar
Campos marcados com * são obrigatórios
@@ -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/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index e59a32677..cafbd4728 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -148,8 +148,8 @@ export class EditEventToApproveComponent implements OnInit { async getTask() { const result = await this.processes.GetTask(this.serialNumber).toPromise(); - - + + this.eventProcess = result this.eventProcess.workflowInstanceDataFields.Category = result.workflowInstanceDataFields.EventType this.eventProcess.workflowInstanceDataFields.LastOccurrence = new Date(this.eventProcess.workflowInstanceDataFields.LastOccurrence) @@ -190,17 +190,17 @@ export class EditEventToApproveComponent implements OnInit { getRecurrenceTypes() { this.eventsService.getRecurrenceTypes().subscribe(res=>{ - + this.recurringTypes = res; }); } onSelectedRecurringChanged(ev:any){ - + this.calculetedLastOccurrence(ev); - + if(ev.length > 1){ - + this.postEvent.EventRecurrence.Type = ev.filter(data => data != '-1'); } if(ev.length == 0){ @@ -209,7 +209,7 @@ export class EditEventToApproveComponent implements OnInit { } calculetedLastOccurrence(type:number){ - var valor; + var valor; var opcao: boolean; if (type == 0) { valor = 7; @@ -235,15 +235,15 @@ export class EditEventToApproveComponent implements OnInit { this.eventProcess.workflowInstanceDataFields.LastOccurrence = time; } else { time = new Date( - time.getFullYear() + valor, - time.getMonth(), - time.getDate(), - time.getHours(), + time.getFullYear() + valor, + time.getMonth(), + time.getDate(), + time.getHours(), time.getMinutes() ); this.eventProcess.workflowInstanceDataFields.LastOccurrence = time; } - + } openLastOccurrence() { @@ -318,24 +318,26 @@ export class EditEventToApproveComponent implements OnInit { if(document['action'] == 'add') { delete document.action this.attachmentsService.setEventAttachmentById(document).subscribe(()=>{ - this.toastService._successMessage(); + window['approve-event-getTask'] () + // this.toastService._successMessage(); }, error =>{ if(error.status == 0) { this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') } else { - + this.toastService._badRequest(); } }); } else if(document['action'] == 'delete') { delete document.action this.attachmentsService.deleteEventAttachmentById(document.Id).subscribe( res=>{ - this.toastService._successMessage() + window['approve-event-getTask'] () + // this.toastService._successMessage() }, error =>{ if(error.status == 0) { this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') } else { - + this.toastService._badRequest() } }) @@ -360,7 +362,7 @@ export class EditEventToApproveComponent implements OnInit { backdropDismiss: false }); - + modal.onDidDismiss().then((data) => { @@ -372,7 +374,7 @@ export class EditEventToApproveComponent implements OnInit { this.setIntervenient(newAttendees); this.setIntervenientCC(newAttendeesCC); - + } }); await modal.present(); @@ -420,7 +422,7 @@ export class EditEventToApproveComponent implements OnInit { this.loadedAttachments = result - // + // } deleteAttachment(attachment: Attachment, index) { @@ -463,7 +465,7 @@ export class EditEventToApproveComponent implements OnInit { this.loadedAttachments.push(DocumentToSave) - + // await this.attachmentsService.setEventAttachmentById(DocumentToSave).subscribe(()=>{ // this.getAttachments(); 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 @@
- -