diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index d401b6aa2..e0b7fa13d 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -1,3 +1,5 @@ +/* eslint-disable */ +/* tslint:disable */ /// /// import { Component, OnInit, NgZone, Inject } from '@angular/core'; diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index fa36fe6fb..d67a970cb 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -91,7 +91,7 @@
-
+
diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 8298ebf53..9995d0bf5 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -184,8 +184,8 @@ export class CreateProcessPage implements OnInit { Priority: new FormControl(this.postData.Priority, [ Validators.required, ]), - participantes: new FormControl(this.taskParticipantsCc, [ - // Validators.required + participantes: new FormControl(this.taskParticipants, [ + Validators.required ]), selectedTypes: new FormControl(this.selectedTypes, [ Validators.required, diff --git a/src/app/modals/document-detail/document-detail.page.html b/src/app/modals/document-detail/document-detail.page.html index 1bce97e89..44cfb60a6 100644 --- a/src/app/modals/document-detail/document-detail.page.html +++ b/src/app/modals/document-detail/document-detail.page.html @@ -3,7 +3,7 @@
-
+
{{LoadedDocument.Subject}} 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 7adc4a995..ededa9e0e 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -122,7 +122,7 @@ displayFormat="D MMM YYYY H:mm" minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" - min="2021" + min="{{minDate}}" max="2025" > @@ -143,7 +143,7 @@ displayFormat="D MMM YYYY H:mm" minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" - min="2021" + min="{{minDate}}" max="2025" > 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 e249eaf84..f58e01c2b 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -95,6 +95,7 @@ export class EditEventPage implements OnInit { } this.getAttachments(this.postEvent.EventId); + } ngOnInit() { 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 200b162db..58a8a76e5 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -1,7 +1,7 @@
-
+
Novo Evento
@@ -19,7 +19,7 @@
-
+
@@ -46,7 +46,7 @@
-
+
@@ -75,13 +75,13 @@
-
+
@@ -102,14 +102,14 @@
-
+
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 df8088032..4ec826d8c 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -78,6 +78,10 @@ export class NewEventPage implements OnInit { this.selectedSegment = this.navParams.get('segment'); this.selectedDate = this.navParams.get('eventSelectedDate'); + + + this.postEvent.StartDate = new Date() + this.postEvent.EndDate = (new Date(new Date().getTime() + 15 * 60000)) } ngOnInit() { 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 10cd89e2d..5168253e8 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -6,7 +6,7 @@
-
+
- +
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index 544890ff0..a3cda93c2 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -463,15 +463,15 @@ export class SearchPage implements OnInit { } } - clearInputRemetente(){ + clearInputRemetente() { this.searchSender = ""; } - clearInputDocumentDate(){ + clearInputDocumentDate() { this.searchDocumentDate = ""; } - clearInputOrganicEntity(){ + clearInputOrganicEntity() { this.searchOrganicEntiry = ""; } @@ -516,7 +516,6 @@ export class SearchPage implements OnInit { classs = 'search-desktop-modal search-submodal' } - const modal = await this.modalController.create({ component: OrganicEntityPage, cssClass: classs, @@ -532,10 +531,10 @@ export class SearchPage implements OnInit { } - async filterDocList(categoryName:string){ + async filterDocList(categoryName:string) { // show all category - if(this. showCategory == categoryName ){ + if(this. showCategory == categoryName ) { this.showSearchDocuments = this.searchDocuments; @@ -563,12 +562,12 @@ export class SearchPage implements OnInit { const ApplicationType = searchDocument.ApplicationType.toString() const Id = searchDocument.Id - if(this.select == false){ + if(this.select == false) { if(this.type == "Agenda") { const modal = await this.modalCtrl.create({ component: ViewEventPage, - componentProps:{ + componentProps: { eventId: Id }, cssClass: 'modal modal-desktop', @@ -576,7 +575,7 @@ export class SearchPage implements OnInit { await modal.present(); modal.onDidDismiss().then((res)=>{}); - } else if(this.type == "AccoesPresidenciais"){ + } else if(this.type == "AccoesPresidenciais") { this.viewPublicationDetail(Id); } diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts index 30a02bc15..6759832fa 100644 --- a/src/app/services/notifications.service.ts +++ b/src/app/services/notifications.service.ts @@ -1,3 +1,5 @@ +/* eslint-disable */ +/* tslint:disable */ /// import { Injectable, NgZone } from '@angular/core'; import { ActivatedRoute } from '@angular/router' 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 740177c72..46daecaf0 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 @@ -102,11 +102,11 @@ @@ -144,7 +144,7 @@ displayFormat="D MMM YYYY H:mm" minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" - min="2018" + min="{{minDate}}" max="2025" > diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts index d38c61290..07229c485 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts @@ -37,7 +37,8 @@ export class EditEventToApprovePage implements OnInit { public showSeconds = false; public touchUi = false; public enableMeridian = false; - public minDate: any; + public minDate = new Date().toISOString().slice(0,10) + public endMinDate = new Date(new Date().getTime() + 15 * 60000); public maxDate: any; public stepHour = 1; public stepMinute = 5; @@ -219,8 +220,8 @@ export class EditEventToApprovePage implements OnInit { // IsRecurring: new FormControl(this.postEvent.IsRecurring, [ // Validators.required // ]), - participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [ - // Validators.required + participantes: new FormControl(this.taskParticipants, [ + Validators.required ]), }) diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index 40972b507..cd98e1da2 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -38,7 +38,8 @@ export class EditEventPage implements OnInit { public showSeconds = false; public touchUi = false; public enableMeridian = false; - public minDate: any; + public minDate = new Date().toISOString().slice(0,10) + public endMinDate = new Date(new Date().getTime() + 15 * 60000); public maxDate: any; public stepHour = 1; public stepMinute = 5; @@ -179,8 +180,8 @@ export class EditEventPage implements OnInit { IsRecurring: new FormControl(this.postEvent.IsRecurring, [ Validators.required ]), - participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [ - // Validators.required + participantes: new FormControl(this.taskParticipants, [ + Validators.required ]), }) diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index c3c86c8f7..1bdd7e343 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -60,7 +60,7 @@ export class NewEventPage implements OnInit { public showSeconds = false; public touchUi = false; public enableMeridian = false; - public minDate = new Date(); + public minDate = new Date().toISOString().slice(0,10) public endMinDate = new Date(new Date().getTime() + 15 * 60000); public stepHour = 1; public stepMinute = 5; @@ -251,8 +251,8 @@ export class NewEventPage implements OnInit { IsRecurring: new FormControl(this.postEvent.IsRecurring, [ Validators.required ]), - participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [ - // Validators.required + participantes: new FormControl(this.taskParticipants, [ + Validators.required ]), }) @@ -482,6 +482,11 @@ export class NewEventPage implements OnInit { } } + /** + * + * @description o pipeline já esta a funcionar tuda vez que nos fazer push na branch master e test o pipeline executa os teste, mas agora os teste temos que melhora para testar a app em tudos os pontos + * o pipeline já está a funcionar toda vez que nos fazer um push na branch master ou teste o pipeline executa os testes, mas agora os testes temos que melhorar para testar a app em todos os pontos + */ restoreTemporaryData(): boolean { @@ -505,4 +510,5 @@ export class NewEventPage implements OnInit { window['temp.path:/home/agenda/new-event.component.ts'] = {} } -} \ No newline at end of file +} + 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 a8f44e586..2493e6082 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 @@ -81,7 +81,7 @@ displayFormat="D MMM YYYY H:mm" minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" - min="2018" + min="{{minDate}}" max="2022" > @@ -119,7 +119,7 @@ displayFormat="D MMM YYYY H:mm" minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" - min="2018" + min="{{minDate}}" max="2025" > 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 c4882f5a6..24de08236 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 @@ -44,7 +44,8 @@ export class EditEventToApproveComponent implements OnInit { public showSeconds = false; public touchUi = false; public enableMeridian = false; - public minDate: any; + public minDate = new Date().toISOString().slice(0,10) + public endMinDate = new Date(new Date().getTime() + 15 * 60000); public maxDate: any; public stepHour = 1; public stepMinute = 5; diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index 960483e35..466a34afa 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -71,7 +71,7 @@
- +
diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index 33ccdb0d5..4057b1b2d 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -41,7 +41,7 @@ export class HeaderPage implements OnInit { let classs, showSearchInput, type; if(window.innerWidth < 1366) { - classs = 'modal modal-width-100 modal-padding-top' + classs = 'modal modal-width-100' showSearchInput = true } else { classs = 'modal modal-desktop desktop-search' diff --git a/src/app/shared/publication/edit-action/edit-action.page.html b/src/app/shared/publication/edit-action/edit-action.page.html index 1d5567ec3..c1ee952d9 100644 --- a/src/app/shared/publication/edit-action/edit-action.page.html +++ b/src/app/shared/publication/edit-action/edit-action.page.html @@ -37,7 +37,7 @@ displayFormat="D MMM YYYY H:mm" minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" - min="2018" + min="{{minDate}}" max="2025" class="d-block d-md-none"> @@ -77,7 +77,7 @@ displayFormat="D MMM YYYY H:mm" minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" - min="2018" + min="{{minDate}}" max="2022"> diff --git a/src/app/shared/publication/edit-action/edit-action.page.ts b/src/app/shared/publication/edit-action/edit-action.page.ts index 140f17adb..207689af1 100644 --- a/src/app/shared/publication/edit-action/edit-action.page.ts +++ b/src/app/shared/publication/edit-action/edit-action.page.ts @@ -21,7 +21,8 @@ export class EditActionPage implements OnInit { public showSeconds = false; public touchUi = false; public enableMeridian = false; - public minDate: any; + public minDate = new Date().toISOString().slice(0,10) + public endMinDate = new Date(new Date().getTime() + 15 * 60000); public maxDate: any; public stepHour = 1; public stepMinute = 5; diff --git a/src/app/shared/publication/new-action/new-action.page.html b/src/app/shared/publication/new-action/new-action.page.html index 940a74a85..c678e6c6b 100644 --- a/src/app/shared/publication/new-action/new-action.page.html +++ b/src/app/shared/publication/new-action/new-action.page.html @@ -37,7 +37,7 @@ displayFormat="D MMM YYYY H:mm" minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" - min="2018" + min="{{minDate}}" max="2025"> @@ -76,7 +76,7 @@ displayFormat="D MMM YYYY H:mm" minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" - min="2018" + min="{{minDate}}" max="2025"> diff --git a/src/app/shared/publication/new-action/new-action.page.ts b/src/app/shared/publication/new-action/new-action.page.ts index 16ff40939..52125aee6 100644 --- a/src/app/shared/publication/new-action/new-action.page.ts +++ b/src/app/shared/publication/new-action/new-action.page.ts @@ -24,7 +24,7 @@ export class NewActionPage implements OnInit { public showSeconds = false; public touchUi = false; public enableMeridian = false; - public minDate: any; + public minDate = new Date().toISOString().slice(0,10) public maxDate: any; public stepHour = 1; public stepMinute = 5;