From 837c151316f71fe25e1667b9b38048066b187f6d Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 8 Jul 2021 11:38:04 +0100 Subject: [PATCH 01/12] Fix form bug --- .../expedient-task-modal/expedient-task-modal.page.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 34560e57c..1a498dfda 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 @@ -203,7 +203,7 @@ export class ExpedientTaskModalPage implements OnInit { // IsRecurring: new FormControl(this.postEvent.IsRecurring, [ // Validators.required // ]), - participantes: new FormControl(this.taskParticipantsCc, [ + participantes: new FormControl(this.taskParticipants, [ Validators.required ]), From a1cbd4338a496286d41ed543e815e9efbbe566f7 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 8 Jul 2021 13:41:27 +0100 Subject: [PATCH 02/12] Improve header --- src/app/modals/create-process/create-process.page.ts | 2 +- .../modals/document-detail/document-detail.page.html | 2 +- src/app/pages/agenda/new-event/new-event.page.html | 2 +- src/app/pages/agenda/view-event/view-event.page.html | 2 +- src/app/pages/chat/edit-group/edit-group.page.html | 2 +- .../group-contacts/group-contacts.page.html | 2 +- .../pages/chat/messages/contacts/contacts.page.html | 2 +- .../pages/chat/new-group/contacts/contacts.page.html | 2 +- src/app/pages/chat/new-group/new-group.page.html | 2 +- .../despachos-pr/despacho-pr/despacho-pr.page.html | 2 +- .../despachos/despacho/despacho.page.html | 2 +- .../diploma-assinar/diploma-assinar.page.html | 2 +- .../diplomas/diploma/diploma.page.html | 2 +- .../expediente-detail/expediente-detail.page.html | 2 +- .../expediente-pr/expediente-pr.page.html | 2 +- .../gabinete-digital/pedidos/pedido/pedido.page.html | 2 +- .../publications/edit-action/edit-action.page.html | 2 +- .../pages/publications/new-action/new-action.page.html | 2 +- .../new-publication/new-publication.page.html | 2 +- src/app/pages/publications/publications.page.html | 2 +- .../publication-detail/publication-detail.page.html | 4 ++-- .../view-publications/view-publications.page.html | 2 +- .../edit-event-to-approve.page.ts | 2 +- src/app/shared/agenda/edit-event/edit-event.page.ts | 2 +- src/app/shared/agenda/new-event/new-event.page.ts | 10 ++++++++-- 25 files changed, 33 insertions(+), 27 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 8298ebf53..7bc81d03f 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -184,7 +184,7 @@ export class CreateProcessPage implements OnInit { Priority: new FormControl(this.postData.Priority, [ Validators.required, ]), - participantes: new FormControl(this.taskParticipantsCc, [ + participantes: new FormControl(this.taskParticipants, [ // Validators.required ]), selectedTypes: new FormControl(this.selectedTypes, [ 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/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index 30e841b56..828d40013 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
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/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/tsconfig.json b/tsconfig.json index 1aced8f4a..6c69599eb 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -19,5 +19,9 @@ "angularCompilerOptions": { "fullTemplateTypeCheck": true, "strictInjectionParameters": true - } + }, + "include": [ + "src/app/home/home.page.ts", + "src/app/services/notifications.service.ts" + ] } \ No newline at end of file From e6aad67d5c7377a9b7a7e5968dee3632f56f1bec Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 8 Jul 2021 16:17:37 +0100 Subject: [PATCH 10/12] Improve eslint --- tsconfig.json | 6 +----- tslint.json | 6 ------ 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index 6c69599eb..1aced8f4a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -19,9 +19,5 @@ "angularCompilerOptions": { "fullTemplateTypeCheck": true, "strictInjectionParameters": true - }, - "include": [ - "src/app/home/home.page.ts", - "src/app/services/notifications.service.ts" - ] + } } \ No newline at end of file diff --git a/tslint.json b/tslint.json index 62a25eb89..7431f7bef 100644 --- a/tslint.json +++ b/tslint.json @@ -1,11 +1,5 @@ { "extends": "tslint:recommended", - "linterOptions": { - "exclude": [ - "src/app/home/home.page.ts", - "src/app/services/notifications.service.ts" - ] - }, "rules": { "align": { "options": [ From 773554d50aaddc13b5554a01708a1b04133cc0c4 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 9 Jul 2021 09:13:23 +0100 Subject: [PATCH 11/12] seach by pressing enter --- src/app/pages/search/search.page.ts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index 544890ff0..b6676b43a 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', From 323aebc68d77070beb3c384ef070536700868d7e Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 9 Jul 2021 09:16:45 +0100 Subject: [PATCH 12/12] Improve seach --- src/app/pages/search/search.page.ts | 2 +- src/app/shared/header/header.page.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index b6676b43a..a3cda93c2 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -575,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/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 @@
- +