From 9017cd4743aa0da1a96537e6a2a25d6c68d63f3b Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 31 Mar 2021 15:47:42 +0100 Subject: [PATCH 01/12] add question before discart expedient --- .../discart-expedient-modal.page.ts | 15 ++++++------- .../expedient-task-modal.page.ts | 1 + .../expediente-detail.page.html | 2 +- .../expediente-detail.page.ts | 21 +++++++++++++++++-- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts index ba630395d..ca3fc32a0 100644 --- a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts +++ b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts @@ -11,6 +11,7 @@ import { ProcessesService } from 'src/app/services/processes.service'; export class DiscartExpedientModalPage implements OnInit { serialNumber:string; folderId:string; + action:string; constructor( private modalController: ModalController, private processes:ProcessesService, @@ -19,6 +20,7 @@ export class DiscartExpedientModalPage implements OnInit { ) { this.serialNumber = this.navParams.get('serialNumber'); this.folderId = this.navParams.get('folderId'); + this.action = this.navParams.get('action'); } ngOnInit() { @@ -39,16 +41,15 @@ export class DiscartExpedientModalPage implements OnInit { } */ save(){ - - let body = { "serialNumber": this.serialNumber, "action": "Tratado" } - let body2 = { "serialNumber": this.serialNumber, "action": "Passivo" } - console.log(body); - - if(this.folderId){ + if(this.action != 'discart'){ + let body = { "serialNumber": this.serialNumber, "action": "Tratado" } + console.log(body); this.processes.PostTaskAction(body); } else{ - this.processes.PostTaskAction(body2); + let body = { "serialNumber": this.serialNumber, "action": "Passivo" } + console.log(body); + this.processes.PostTaskAction(body); } this.router.navigate(['/home/gabinete-digital/expediente']); this.modalController.dismiss(); 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 d32b3607a..08149a595 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 @@ -225,6 +225,7 @@ export class ExpedientTaskModalPage implements OnInit { componentProps: { serialNumber: this.task.serialNumber, folderId: this.task.workflowInstanceDataFields.FolderID, + action: 'complete', }, cssClass: 'discart-expedient-modal', backdropDismiss: false 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 9aeeea0a2..0517504b5 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 @@ -148,7 +148,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index ef5b75272..768864c61 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -13,6 +13,7 @@ import { ExpedientTaskModalPage } from '../expedient-task-modal/expedient-task-m import { BookMeetingModalPage } from '../book-meeting-modal/book-meeting-modal.page'; import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; import { momentG } from 'src/plugin/momentG' +import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page'; @Component({ selector: 'app-expediente-detail', @@ -135,10 +136,26 @@ export class ExpedienteDetailPage implements OnInit { } discartExpedient() { - let body = { "serialNumber": this.serialnumber, "action": "Passivo" } + /* let body = { "serialNumber": this.serialnumber, "action": "Passivo" } console.log(body); this.processes.PostTaskAction(body); - this.router.navigate(['/home/gabinete-digital/expediente']); + this.router.navigate(['/home/gabinete-digital/expediente']); */ + } + + async distartExpedientModal(task: any){ + const modal = await this.modalController.create({ + component: DiscartExpedientModalPage, + componentProps: { + serialNumber: task.serialNumber, + folderId: task.workflowInstanceDataFields.FolderID, + action: 'discart', + }, + cssClass: 'discart-expedient-modal', + backdropDismiss: false + }); + + await modal.present(); + modal.onDidDismiss(); } async openBookMeetingModal(task: any) { From e22c4851aac99504aa24ac19dc79a5d880832516 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 31 Mar 2021 15:54:57 +0100 Subject: [PATCH 02/12] save --- .../discart-expedient-modal.page.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts index ca3fc32a0..8754cfa4e 100644 --- a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts +++ b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts @@ -31,10 +31,12 @@ export class DiscartExpedientModalPage implements OnInit { /* let body = { "serialNumber": this.serialNumber, "action": "Tratado" } */ console.log(this.folderId); console.log('FOLDER'); - - this.processes.UpdateTaskStatus(this.folderId).subscribe(res=>{ - console.log(res); - }); + + if(this.action != 'discart'){ + this.processes.UpdateTaskStatus(this.folderId).subscribe(res=>{ + console.log(res); + }); + } this.modalController.dismiss(); } /* notDelete(){ From 7ccc3597108a61fee53a3a803dc57185c7304c7f Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 31 Mar 2021 15:57:35 +0100 Subject: [PATCH 03/12] save --- .../discart-expedient-modal.page.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts index 8754cfa4e..59a8fbe75 100644 --- a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts +++ b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts @@ -28,7 +28,6 @@ export class DiscartExpedientModalPage implements OnInit { } close(){ - /* let body = { "serialNumber": this.serialNumber, "action": "Tratado" } */ console.log(this.folderId); console.log('FOLDER'); @@ -36,12 +35,10 @@ export class DiscartExpedientModalPage implements OnInit { this.processes.UpdateTaskStatus(this.folderId).subscribe(res=>{ console.log(res); }); - } + } this.modalController.dismiss(); } - /* notDelete(){ - - } */ + save(){ if(this.action != 'discart'){ let body = { "serialNumber": this.serialNumber, "action": "Tratado" } From c77dac0dbe6b88b3a1d111443798241593848344 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 31 Mar 2021 16:47:14 +0100 Subject: [PATCH 04/12] save --- src/app/models/participant.model.ts | 2 +- src/app/pages/events/events.page.ts | 10 ++++++++-- .../expedient-task-modal.page.ts | 4 ++-- .../pages/gabinete-digital/gabinete-digital.page.ts | 12 +++++++++++- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/app/models/participant.model.ts b/src/app/models/participant.model.ts index f2b96575b..f8e12bd1d 100644 --- a/src/app/models/participant.model.ts +++ b/src/app/models/participant.model.ts @@ -1,5 +1,5 @@ export class Participant{ - UserId: string; + UserEmail: string; UserType: string; /* Deadline: Date; */ diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index a18e8d180..4e110aa97 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -2,7 +2,7 @@ import { Component, OnInit, LOCALE_ID, EventEmitter, Output } from '@angular/cor import { Event } from '../../models/event.model'; import { EventsService } from 'src/app/services/events.service'; -import { Router } from '@angular/router'; +import { NavigationExtras, Router } from '@angular/router'; import { ActivatedRoute, NavigationEnd } from '@angular/router'; import { AlertService } from 'src/app/services/alert.service'; import { AuthService } from 'src/app/services/auth.service'; @@ -315,7 +315,13 @@ export class EventsPage implements OnInit { } else{ console.log('ttt'); - this.router.navigate(['/home/gabinete-digital']); + let navigationExtras: NavigationExtras = { + queryParams: { + "show": true, + } + }; + + this.router.navigate(['/home/gabinete-digital'], navigationExtras); /* this.gabineteService.openExpedientListPage(); */ } } 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 08149a595..c2aef100a 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 @@ -174,7 +174,7 @@ export class ExpedientTaskModalPage implements OnInit { if(newattendees!= null){ newattendees.forEach(newattendee => { let att = { - 'UserId': newattendee.EmailAddress, + 'UserEmail': newattendee.EmailAddress, 'UserType': 'I', }; if(this.participants == null){ @@ -204,7 +204,7 @@ export class ExpedientTaskModalPage implements OnInit { if(newattendees!= null){ newattendees.forEach(newattendee => { let att = { - 'UserId': newattendee.EmailAddress, + 'UserEmail': newattendee.EmailAddress, 'UserType': 'CC', }; if(this.participants == null){ diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 8aad715eb..61dd1cfc3 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -5,6 +5,7 @@ import { EventsService } from 'src/app/services/events.service'; import { ModalController } from '@ionic/angular'; import { EventListPage } from './event-list/event-list.page'; import { ExpedientePage } from './expediente/expediente.page'; +import { ActivatedRoute } from '@angular/router'; @Component({ selector: 'app-gabinete-digital', @@ -42,7 +43,9 @@ export class GabineteDigitalPage implements OnInit { constructor( private processesbackend:ProcessesService, private modalController: ModalController, - private alertService: AlertService) { + private alertService: AlertService, + private route: ActivatedRoute, + ) { window.onresize = (event) => { // if not mobile remove all component @@ -53,6 +56,12 @@ export class GabineteDigitalPage implements OnInit { }; this.adjastModalHeight(); + + this.route.queryParams.subscribe(params => { + if(params["show"]){ + this.openExpedientListPage(); + } + }); } @@ -95,6 +104,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{ console.log(res); }); + } closeAllDesktopComponents(){ From 6dc5e91c2a1f786de0b75cbac8d4cd2c2ad02694 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 31 Mar 2021 17:01:01 +0100 Subject: [PATCH 05/12] save --- src/app/pages/events/events.page.ts | 2 - .../expediente/expediente.page.html | 42 ++----- .../expediente/expediente.page.scss | 106 ++++-------------- 3 files changed, 31 insertions(+), 119 deletions(-) diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 4e110aa97..4e1b5e55d 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -320,9 +320,7 @@ export class EventsPage implements OnInit { "show": true, } }; - this.router.navigate(['/home/gabinete-digital'], navigationExtras); - /* this.gabineteService.openExpedientListPage(); */ } } diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html index 91feec0b9..00b6cffe0 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -1,14 +1,7 @@ - - -
-
- -
- Gabinete Digital -
-
-
- + +
+ Correspondência +
@@ -20,7 +13,6 @@ - -
+
- - - - - -
+
{{ task.CreateDate | date: 'dd-MM-yy' }} @@ -71,10 +49,6 @@
- - - - diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.scss b/src/app/pages/gabinete-digital/expediente/expediente.page.scss index 467df29ea..653bf936c 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.scss @@ -1,83 +1,15 @@ @import '~src/function.scss'; -.header-toolbar{ - --background:transparent; - --opacity: 1; - - .main-header{ - width: 100%; /* 400px */ - height: 100%; - font-family: Roboto; - border-top-left-radius: 25px; - border-top-right-radius: 25px; - background-color: #fff; - overflow:hidden; - padding: 30px 20px 0px 20px; - color:#000; - transform: translate3d(0, 1px, 0); - - .header-top{ - width: 360px; - margin: 0px auto; - overflow: auto; - padding: 0 !important; - background: #fff; - .middle{ - padding: 0!important; - float: left; - width: 280px; - margin: 2.5px 0 0 5px; - display: flex; - align-items: center; - - } - .right{ - padding: 0!important; - float: right; - font-size: 25px; - color: #0782c9; - margin: 5px 0 0 0; - } - } - .header-bottom{ - width: 310px; - overflow: auto; - margin: 0 auto; - - .header-bottom-icon{ - width: 30px; - font-size: 25px; - float: left; - padding: 2px; - - } - .header-bottom-contacts{ - width: 275px; - font-size: 15px; - color: #797979; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - float: left; - padding: 5px; - margin: 1px; - } - } - - .title{ - font-size: 25px; - overflow: auto; - float: left; - } - .div-icon{ - width: 40px; - float: right; - font-size: 35px; - overflow: auto; - padding: 1px; - } - } - } /* CONTENT */ +:host{ + padding: 30px 20px 0 20px !important; + margin: 0; +} +.title{ + font-family: Roboto; + font-size: 25px; + color:#000; + overflow: auto; + } .item-list-small{ font-size: 11px; overflow: auto; @@ -95,6 +27,16 @@ ion-item{ --background: none; } +.item { + //border-radius: 15px; + //box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); + //Sborder: solid 1px #e9e9e9; + background-color: var(--white); + margin: 0 auto; + //padding: 10px; + margin-bottom: 10px; + overflow: auto; + } .div-content-expediente{ width: 100%; float: left; @@ -152,7 +94,7 @@ ion-item{ padding-top: 10px; } .exp-list-item{ - width: 368px; + //width: 368px; overflow: auto; /* border-bottom: 1px solid gray; */ margin: 10px auto; @@ -174,7 +116,7 @@ ion-item{ float: left; } .exp-remetente{ - width: 200px; + //width: 200px; font-family: Roboto; font-size: 13px; font-weight: normal; @@ -193,7 +135,6 @@ ion-item{ color: #42b9fe; } .exp-bottom-detail{ - width: 100px; float: left; font-family: Roboto; font-size: 16px; @@ -224,5 +165,4 @@ ion-item{ font-size: 45px; float: right; margin-right: 10px; -} - +} \ No newline at end of file From 1d40f166fa0cb5caf4cbfcaf2829d844e15bce7a Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 31 Mar 2021 17:04:44 +0100 Subject: [PATCH 06/12] save --- src/app/pages/events/events.page.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 4e1b5e55d..6920524c8 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -337,7 +337,6 @@ export class EventsPage implements OnInit { profile: this.profile, }, cssClass: classs, - backdropDismiss: false }); await modal.present(); modal.onDidDismiss(); From a0d62bef19336c0a19ecdbc4b6d20e7524ddbf59 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 31 Mar 2021 17:21:49 +0100 Subject: [PATCH 07/12] save --- src/app/pages/gabinete-digital/expediente/expediente.page.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html index 00b6cffe0..cf321bb06 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -1,4 +1,5 @@ +
Correspondência
From 6d57283361bea67514096c63ad06c398ae93930e Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 31 Mar 2021 17:34:17 +0100 Subject: [PATCH 08/12] save --- src/app/pages/events/events.page.html | 2 +- .../expedient-task-modal/expedient-task-modal.page.ts | 2 +- src/app/pages/gabinete-digital/expediente/expediente.page.ts | 2 +- src/app/shared/gabinete-digital/expedients/expedients.page.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 6d32c9f3c..8faa67aa4 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -110,7 +110,7 @@
{{task.taskStartDate | date: 'HH:mm'}}
-
{{ task.workflowInstanceFolio }}
+
{{ task.workflowInstanceDataFields.Subject }}
{{ task.workflowInstanceDataFields.Sender }}
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 c2aef100a..1034261b4 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 @@ -73,7 +73,7 @@ export class ExpedientTaskModalPage implements OnInit { /* By Default TypeDeadline should be 'Economia' */ this.postData.SubjectTypeId = '99999844'; /* Initialize 'Subject' with the title of the expedient */ - this.postData.DispatchFolder.Subject = this.task.workflowInstanceFolio; + this.postData.DispatchFolder.Subject = this.task.workflowInstanceDataFields.Subject; } ngOnInit() { diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index a932f2776..f6e8608f5 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -44,7 +44,7 @@ export class ExpedientePage implements OnInit { result.forEach(element => { let task: DailyWorkTask = { "SerialNumber": element.serialNumber, - "Folio": element.workflowInstanceFolio, + "Folio": element.workflowInstanceDataFields.Subject, "Senders": element.originator.email, "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'), "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index af076a0ba..7ed94ea63 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -51,7 +51,7 @@ export class ExpedientsPage implements OnInit { res.forEach(element => { let task: DailyWorkTask = { "SerialNumber": element.serialNumber, - "Folio": element.workflowInstanceFolio, + "Folio": element.workflowInstanceDataFields.Subject, "Senders": element.originator.email, "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'), "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, From e5c82b7d8c518f8b833ff13b7ead134b8932adcb Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 1 Apr 2021 10:34:41 +0100 Subject: [PATCH 09/12] save --- src/app/pages/events/events.page.html | 5 +++-- src/app/pages/events/events.page.ts | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 8faa67aa4..8e8831190 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -7,12 +7,13 @@

{{customDate}}

-

{{totalEvent}} eventos agendados para hoje

+

{{totalEvent}} evento agendado para hoje

+

{{totalEvent}} eventos agendados para hoje
{{currentHoursMinutes | date: 'HH:mm'}}
-
"{{currentEvent}}"
+
"{{currentEvent}}"
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 6920524c8..d151301ce 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -112,6 +112,7 @@ export class EventsPage implements OnInit { } RefreshEvents(){ + this.currentEvent = ""; this.showLoader = true; let date = new Date(); From 5864ffd8e5e7e815e5743c746a13501719e9cc8d Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 1 Apr 2021 11:07:49 +0100 Subject: [PATCH 10/12] =?UTF-8?q?issue=20Em=20"Correspond=C3=AAncias=20por?= =?UTF-8?q?=20ler"=20a=20lista=20de=20correspond=C3=AAncias=20tem=20as=20l?= =?UTF-8?q?etras=20e=20borders=20muito=20pr=C3=B3ximas,=20e=20o=20mesmo=20?= =?UTF-8?q?=C3=A9=20relactivo=20ao=20tamanho=20do=20assunto=20da=20corresp?= =?UTF-8?q?ond=C3=AAncia.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/pages/events/events.page.html | 20 +++++++++----------- src/app/pages/events/events.page.scss | 13 +++++++++---- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 8e8831190..9e42d1831 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -56,8 +56,8 @@
-
    -
  • +
    @@ -70,9 +70,9 @@
    {{event.Subject}}
- + - + - > -
+
{{task.taskStartDate | date: 'dd-MM-yy'}}
{{task.taskStartDate | date: 'HH:mm'}}
@@ -115,9 +113,9 @@
{{ task.workflowInstanceDataFields.Sender }}
- + - +
diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index 747464596..27d455055 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -364,17 +364,21 @@ ion-toolbar{ } } .content{ - ul{ + .item-exp{ + overflow: auto; + padding-top: 5px; + padding-bottom: 5px; + } + ion-list{ padding: 0px; margin: 0px; .d-flex{ width: 100%; - height: 40px; display: flex; justify-content: space-between; align-items: center; } - li{ + ion-item{ padding-bottom: 5px; margin-top: 5px; border-bottom: 1px solid #ebebeb; @@ -427,7 +431,7 @@ ion-toolbar{ background-color: #f05d5e; } } - li:last-child{ + ion-item:last-child{ border-bottom: unset !important; padding-bottom: unset !important; } @@ -462,6 +466,7 @@ ion-toolbar{ cursor: pointer; } + @media only screen and (min-width: 804px) { .schedule:first-child { From 25e1df9aa5c6866c398491a82408486429eaaf00 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 1 Apr 2021 11:25:51 +0100 Subject: [PATCH 11/12] save --- src/app/pages/agenda/edit-event/edit-event.page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ef7471556..539a05db3 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -3,7 +3,7 @@
- Editar Evento + 2Editar Evento
From eb3b08dabb50eef6e84534dcd36f5f4bad38be08 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 1 Apr 2021 11:52:12 +0100 Subject: [PATCH 12/12] =?UTF-8?q?Issue=20A=20contagem=20dos=20itens=20no?= =?UTF-8?q?=20icone=20"Inicio"=20e=20"Gabinete"=20n=C3=A3o=20correspondem?= =?UTF-8?q?=20ao=20n=C3=BAmero=20de=20eventos=20e=20correspond=C3=AAncias?= =?UTF-8?q?=20disponiveis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/home/home.page.ts | 11 ++++++----- src/app/pages/events/events.page.ts | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index a90a0b932..7bbf2f8d8 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -31,7 +31,7 @@ export class HomePage implements OnInit { } ngOnInit() { -/* //Initialize profile as mdgpr + //Initialize profile as mdgpr let date = new Date(); date.setMonth(date.getMonth() + 1); @@ -55,7 +55,8 @@ export class HomePage implements OnInit { this.processesbackend.GetTasksList("Expediente", true).subscribe(result => { this.totalExpediente = result; }); - + +/* PushNotifications.addListener('registrationError', (error: any) => { alert('Error on registration: ' + JSON.stringify(error)); }); @@ -225,7 +226,7 @@ export class HomePage implements OnInit { modal.onDidDismiss(); } */ - /* async viewPublications(folderId) { + /* async viewPublications(folderId) { const modal = await this.modalController.create({ component: ViewPublicationsPage, enterAnimation, @@ -238,8 +239,8 @@ export class HomePage implements OnInit { }); await modal.present(); modal.onDidDismiss(); - } - */ + } */ + diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index d151301ce..3ec7cb0a9 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -16,6 +16,7 @@ import { ViewEventPage } from '../agenda/view-event/view-event.page'; import { ExpedientePage } from '../gabinete-digital/expediente/expediente.page'; import { ExpedienteDetailPage } from '../gabinete-digital/expediente/expediente-detail/expediente-detail.page'; import { GabineteDigitalPage } from '../gabinete-digital/gabinete-digital.page'; +import { EditEventPage } from '../agenda/edit-event/edit-event.page'; @Component({ selector: 'app-events', @@ -343,6 +344,24 @@ export class EventsPage implements OnInit { modal.onDidDismiss(); } + async openEditEventModal(){ + let classs; + if( window.innerWidth <= 800){ + classs = 'modal' + } else { + classs = 'modal modal-desktop' + } + const modal = await this.modalController.create({ + component: EditEventPage, + componentProps:{ + profile: this.profile, + }, + cssClass: classs, + }); + await modal.present(); + modal.onDidDismiss(); + } +