diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 75d36f772..b02cb6121 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -96,7 +96,7 @@ -
+
{{event.StartDate | date: 'HH:mm'}}
@@ -109,7 +109,7 @@
{{event.Subject}}
-

{{event.Location}}

+ {{event.Location}}
diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index bbdb63e1a..7cf7e218d 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -437,7 +437,6 @@ ion-toolbar{ } .schedule-date{ margin-right: 10px; - width: 22%; color: #797979 !important; font-size: 13px; } @@ -449,7 +448,6 @@ ion-toolbar{ .location{ font-family: Roboto; font-size: 15px; - font-weight: bold; color: black; width: 100%; @@ -458,6 +456,7 @@ ion-toolbar{ width: 100%; font-family: Roboto; font-size: 13px; + font-weight: bold; //color: #0d89d1; color: var(--title-text-color) } @@ -641,4 +640,14 @@ ion-title{ margin-left: 0px !important; margin-right: 0px !important; } -} \ No newline at end of file +} + + + +.item-exp { + justify-content: flex-start !important; +} + +.event-box-content { + justify-content: flex-start !important; +} diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 9582e9fea..36d503ebd 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -114,7 +114,7 @@
- + Para hoje @@ -159,7 +159,7 @@ class=" box-hover ion-no-padding cursor-pointer" *ngFor = "let task of AllProcess" (click)="goToProcess(task.SerialNumber || task.serialNumber, task.WorkflowName || task.workflowName || task.workflowDisplayName || task.workflowName, task.activityInstanceName)"> -
+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 0ff591126..23f253ec9 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -212,7 +212,7 @@ export class GabineteDigitalPage implements OnInit { let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject subject = subject.toLowerCase(); return subject.includes(this.searchSubject.toLowerCase()) - }) + }).filter( task => this.TaskService.filter(task, this.filterName)) if(ordinance == this.ordinance) { diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index f8c55c1be..f1c55ee08 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -305,6 +305,28 @@ export class EventsService { } else { this.hasAnyCalendar = true } + + + (() => { + const keys = {} + + for (let e of SessionStore.user.OwnerCalendars) { + if(!keys[e.CalendarId]) { + keys[e.CalendarId] = e.CalendarId + } else { + throw(`Calendar ${e.CalendarId} is repeated for user `+ SessionStore.user.FullName); + } + } + + for (let e of SessionStore.user.SharedCalendars) { + if(!keys[e.CalendarId]) { + keys[e.CalendarId] = e.CalendarId + } else { + throw(`Calendar ${e.CalendarId} is repeated for user `+ SessionStore.user.FullName); + } + } + })(); + } } diff --git a/version/git-version.ts b/version/git-version.ts index ce3c56957..8867bb484 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "e57e48d9c", - "SHA": "e57e48d9ce538cbaca45e8b38f19ff7d520b4462", + "shortSHA": "ab43d697e", + "SHA": "ab43d697eacabe1b9ba3063422805328de10e95d", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Sat Jun 10 10:26:47 2023 +0100'", + "lastCommitTime": "'Sat Jun 10 10:52:13 2023 +0100'", "lastCommitMessage": "fix", - "lastCommitNumber": "4959", + "lastCommitNumber": "4960", "change": "", - "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/models/beast-orm.ts\n\tmodified: src/app/pages/search/search.page.scss\n\tmodified: src/app/pages/search/search.page.ts\n\tnew file: src/assets/app.module.ts", + "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/view-event/view-event.page.html\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: version/git-version.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 04b5373eaa358edf7036441f15eb88461a1242a3 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Sat, 10 Jun 2023 14:17:41 +0100 Subject: [PATCH 2/5] remove limites --- .gitignore | 5 +- src/app/models/beast-orm.ts | 26 +++++++++- src/app/pages/events/events.page.html | 12 +++-- src/app/pages/events/events.page.scss | 4 ++ src/app/pages/events/events.page.ts | 42 +++++++++++++++ .../gabinete-digital/gabinete-digital.page.ts | 6 ++- src/app/services/processes.service.ts | 3 ++ src/app/services/task.service.ts | 51 +++++++++++++++++++ .../despachos-pr-options.page.ts | 2 +- version/git-version.ts | 12 ++--- 10 files changed, 146 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 79d9b37ce..13ac95725 100644 --- a/.gitignore +++ b/.gitignore @@ -82,4 +82,7 @@ _node_modules/ migrat/ cypress/videos -*.rar \ No newline at end of file +*.rar + +src/app/domain +src/app/controller \ No newline at end of file diff --git a/src/app/models/beast-orm.ts b/src/app/models/beast-orm.ts index 176f8aa43..911be6322 100644 --- a/src/app/models/beast-orm.ts +++ b/src/app/models/beast-orm.ts @@ -47,7 +47,7 @@ models.register({ models: [MessageModel, DeleteMessageModel, attachments] }) - +// acçoes export class ActionModel extends models.Model{ ProcessId = models.IntegerField({unique: true}) Description = models.CharField() @@ -75,4 +75,26 @@ models.register({ type: 'indexedDB', version: 14, models: [PublicationModel, ActionModel] -}) \ No newline at end of file +}) + +// gabinete + +export class DispatchModal extends models.Model{ + DateIndex = models.CharField() + DocumentId = models.IntegerField({unique: true}) + ProcessId = models.CharField() + Title = models.CharField() + Message = models.CharField() + DatePublication = models.CharField() + OriginalFileName = models.CharField() + FileBase64 = models.CharField() + FileExtension = models.CharField() + OrganicEntityId = models.IntegerField() +} + +models.register({ + databaseName: 'cabinet'+environment.version.lastCommitNumber + environment.id, + type: 'indexedDB', + version: 14, + models: [DispatchModal] +}) diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index b02cb6121..3529efba7 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -155,16 +155,18 @@
- +
{{task.TaskStartDate | date: 'dd-MM-yy'}}
{{task.TaskStartDate | date: 'HH:mm'}}
-
{{ task.Subject }}
-
{{ task.Senders }}
+
{{task.Folio || task.Subject || task.workflowInstanceDataFields.Subject }}
+
{{ task.Senders }}
+
{{task.workflowInstanceDataFields.Sender }}
+
@@ -275,7 +277,7 @@
-
diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index 7cf7e218d..479a3c04f 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -201,6 +201,7 @@ ion-toolbar{ color: var(--subtitle-text-color); font-size: 16px; margin: 0 auto; + min-height: 19px; } .div-botton-middle{ width: 75%; @@ -445,10 +446,13 @@ ion-toolbar{ flex-wrap: wrap; align-items: center; width: 78%; + min-height: 39px; + align-items: baseline; .location{ font-family: Roboto; font-size: 15px; color: black; + min-height: 19px; width: 100%; } diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index a536f909e..cbbf46779 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -68,6 +68,13 @@ export class EventsPage implements OnInit { showCorrespondenciasLoader = false loadingAllTask = false + + filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Não lidos' + showSearch = true; + searchSubject: string = ''; + AllProcess = [] + ordinance: string = 'old' + constructor( private eventService: EventsService, private router: Router, @@ -102,6 +109,13 @@ export class EventsPage implements OnInit { this.listToPresentexpediente = [] }) + this.TaskService.registerCallback({ + id: import.meta.url, + funx:() => { + this.dynamicSearch() + } + }) + } ngOnInit() { @@ -128,6 +142,34 @@ export class EventsPage implements OnInit { } + + async dynamicSearch() { + + const ordinance = this.ordinance + if(this.showSearch && this.searchSubject) { + + const AllProcess = this.TaskService.AllProcess.filter((task) => { + let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject + subject = subject.toLowerCase(); + return subject.includes(this.searchSubject.toLowerCase()) + }).filter( task => this.TaskService.filter(task, this.filterName)) + + + if(ordinance == this.ordinance) { + this.AllProcess = this.TaskService.reorderList(this.ordinance, AllProcess) + } + } else { + const AllProcess = this.TaskService.AllProcess + + if(ordinance == this.ordinance) { + this.AllProcess = this.TaskService.reorderList(this.ordinance, AllProcess) + .filter( task => this.TaskService.filter(task, this.filterName)) + } + } + } + + + async loadAllTask() { this.loadingAllTask = true await this.TaskService.LoadTask() diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 23f253ec9..a170efe1c 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -212,17 +212,19 @@ export class GabineteDigitalPage implements OnInit { let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject subject = subject.toLowerCase(); return subject.includes(this.searchSubject.toLowerCase()) - }).filter( task => this.TaskService.filter(task, this.filterName)) + }) if(ordinance == this.ordinance) { this.AllProcess = this.TaskService.reorderList(this.ordinance, AllProcess) + .filter( task => this.TaskService.filter(task, this.filterName)) } } else { - const AllProcess = this.TaskService.AllProcess + const AllProcess = this.TaskService.AllProcess.filter( task => this.TaskService.filter(task, this.filterName)) if(ordinance == this.ordinance) { this.AllProcess = this.TaskService.reorderList(this.ordinance, AllProcess) + .filter( task => this.TaskService.filter(task, this.filterName)) } } diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index 6cd0cb86f..994c091d7 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -60,6 +60,9 @@ export class ProcessesService { params = params.set("ProcessName", processname); params = params.set("OnlyCount", onlycount.toString()); + params = params.set("OnlyCount", onlycount.toString()); + params = params.set("pageNum", "1"); + params = params.set("pageSize", "500"); let options = { headers: this.headers, diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts index d2cc70fd5..0f6784f66 100644 --- a/src/app/services/task.service.ts +++ b/src/app/services/task.service.ts @@ -16,6 +16,7 @@ import { SessionStore } from 'src/app/store/session.service'; import { EventsService } from './events.service'; import { SortService } from './functions/sort.service'; import { customTask } from '../models/dailyworktask.model'; +import { Router } from '@angular/router'; @Injectable({ providedIn: 'root' @@ -61,6 +62,7 @@ export class TaskService { private despachoRule: DespachoService, public eventService: EventsService, private sortService: SortService, + private router: Router, ) { window['all-process-gabinete'] = () => { @@ -364,4 +366,53 @@ export class TaskService { } } + + + + goToProcess(serialNumber: string, workflowName: string, activityName: string) { + + + + if (workflowName == 'Despacho') { + if (activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho') { + this.router.navigate(['/home/gabinete-digital/despachos', serialNumber, 'gabinete-digital']); + } + } + else if (workflowName == 'Despacho do Presidente da República') { + if (activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho') { + this.router.navigate(['/home/gabinete-digital/despachos-pr', serialNumber, 'gabinete-digital']); + } + else if (activityName == 'Revisar Diploma' || activityName == 'Assinar Diploma') { + this.router.navigate(['/home/gabinete-digital/diplomas', serialNumber, 'gabinete-digital']); + } + else if (activityName == 'Diploma Assinado') { + this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']); + } else { + + } + } + else if (workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento') { + this.router.navigate(['/home/gabinete-digital/pedidos', serialNumber, 'gabinete-digital']); + } + else if (workflowName == 'Expediente') { + this.router.navigate(['/home/gabinete-digital/expediente', serialNumber, 'gabinete-digital']); + } + else if (workflowName == 'Expediente' && SessionStore.user.Profile == 'PR') { + this.router.navigate(['/home/gabinete-digital/expedientes-pr', serialNumber, 'gabinete-digital']); + } + else if (workflowName == "Pedido de Parecer do Presidente") { + this.router.navigate(['/home/gabinete-digital/pedidos', serialNumber, 'gabinete-digital']); + } + /* else if (workflowName == "Expediente") { + this.router.navigate(['/home/gabinete-digital/pedidos',serialNumber,'gabinete-digital']); + } */ + else if (workflowName == 'Agenda Pessoal PR' || workflowName == 'Agenda Oficial PR' || workflowName == 'Agenda Oficial MDGPR' || workflowName == 'Agenda Pessoal MDGPR' || activityName == "Aprovar Evento" || workflowName == "Agendar Evento") { + this.router.navigate(['/home/gabinete-digital/event-list/approve-event', serialNumber, 'gabinete-digital']); + } + else { + throw(`${workflowName} && ${activityName} no route`) + } + + } + } diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts index f1f71ff08..6c8b59230 100644 --- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts +++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts @@ -303,7 +303,7 @@ export class DespachosPrOptionsPage implements OnInit { try { await this.processes.CompleteTask(body).toPromise() - this.httpErroHandle.httpsSucessMessagge('Concluir') + this.httpErroHandle.httpsSucessMessagge('Concluir Despacho') this.close(); } catch (error) { if(error.status == 0) { diff --git a/version/git-version.ts b/version/git-version.ts index 8867bb484..c917c77e6 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "ab43d697e", - "SHA": "ab43d697eacabe1b9ba3063422805328de10e95d", + "shortSHA": "de531bc55", + "SHA": "de531bc5508a74ef4ad4407aef91d729cb82faf3", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Sat Jun 10 10:52:13 2023 +0100'", - "lastCommitMessage": "fix", - "lastCommitNumber": "4960", + "lastCommitTime": "'Sat Jun 10 12:19:46 2023 +0100'", + "lastCommitMessage": "improve", + "lastCommitNumber": "4961", "change": "", - "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/view-event/view-event.page.html\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: version/git-version.ts", + "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: .gitignore\n\tmodified: src/app/models/beast-orm.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/processes.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts\n\tmodified: version/git-version.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 2f6588c16488e7ab520cdacaa354abf1760b7506 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Sat, 10 Jun 2023 14:44:42 +0100 Subject: [PATCH 3/5] update details un upload file --- .../event-list/approve-event/approve-event.page.ts | 1 - .../agenda/approve-event/approve-event.page.ts | 5 +++++ .../edit-event-to-approve.page.ts | 4 ++-- version/git-version.ts | 12 ++++++------ 4 files changed, 13 insertions(+), 9 deletions(-) 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 4a56825d6..622aa4572 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 @@ -121,7 +121,6 @@ export class ApproveEventPage implements OnInit { this.processes.GetTask(this.serialNumber).subscribe(async res => { this.loadedEvent = res - console.log('1111=1=1=1=') this.addProcessToDB(this.loadedEvent) try { diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts index 55847ce4a..54444b063 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -55,6 +55,10 @@ export class ApproveEventPage implements OnInit { ) { // Event to approve list + + window['edit-approve-event-desktop'] = ()=> { + this.getTask() + } } toDateString(e) { @@ -168,6 +172,7 @@ export class ApproveEventPage implements OnInit { }); return await popover.present().then(() =>{ this.TaskService.loadEventosParaAprovacao() + this.getTask() }) } 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 5020fd780..49f9cda23 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 @@ -372,14 +372,14 @@ export class EditEventToApprovePage implements OnInit { if(document['action'] == 'add') { delete document.action this.attachmentsService.setEventAttachmentById(document).subscribe(()=>{ - + window['edit-approve-event-desktop']() }, error =>{ this.toastService.badRequest(); }); } else if(document['action'] == 'delete') { delete document.action this.attachmentsService.deleteEventAttachmentById(document.Id).subscribe( res=>{ - + window['edit-approve-event-desktop']() }, error =>{ this.toastService.badRequest() }) diff --git a/version/git-version.ts b/version/git-version.ts index c917c77e6..36148a320 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "de531bc55", - "SHA": "de531bc5508a74ef4ad4407aef91d729cb82faf3", + "shortSHA": "04b5373ea", + "SHA": "04b5373eaa358edf7036441f15eb88461a1242a3", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Sat Jun 10 12:19:46 2023 +0100'", - "lastCommitMessage": "improve", - "lastCommitNumber": "4961", + "lastCommitTime": "'Sat Jun 10 14:17:41 2023 +0100'", + "lastCommitMessage": "remove limites", + "lastCommitNumber": "4962", "change": "", - "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: .gitignore\n\tmodified: src/app/models/beast-orm.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/processes.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts\n\tmodified: version/git-version.ts", + "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file From ffa1f34b4c00e60a4a5ea48fc82fd5822e264773 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Sat, 10 Jun 2023 15:58:45 +0100 Subject: [PATCH 4/5] labels --- src/app/home/home.page.ts | 3 -- .../create-process/create-process.page.ts | 1 - src/app/pages/agenda/agenda.page.html | 2 +- src/app/pages/events/events.page.html | 4 +- .../despachos-pr/despachos-pr.page.ts | 6 ++- .../despachos/despachos.page.html | 8 +-- .../despachos/despachos.page.ts | 11 ++--- .../diplomas-assinar.page.html | 8 +-- .../diplomas-assinar/diplomas-assinar.page.ts | 7 ++- .../diplomas-gerar/diplomas-gerar.page.ts | 7 +-- .../diplomas/diploma/diploma.page.ts | 26 +--------- .../diplomas/diplomas.page.ts | 7 +-- .../approve-event-modal.page.ts | 1 - .../approve-event/approve-event.page.ts | 10 ---- .../event-list/event-list.page.html | 8 +-- .../expedient-task-modal.page.ts | 5 +- .../expediente/expediente.page.html | 8 +-- .../expediente/expediente.page.ts | 7 +-- .../expediente-pr/expediente-pr.page.ts | 35 ------------- .../expedientes-pr/expedientes-pr.page.ts | 1 - .../gabinete-digital.page.html | 16 +++--- .../gabinete-digital/gabinete-digital.page.ts | 10 ++-- .../pedidos/pedido/pedido.page.ts | 34 ------------- .../pedidos/pedidos.page.html | 8 +-- .../gabinete-digital/pedidos/pedidos.page.ts | 22 +++------ .../pendentes/pendentes.page.ts | 5 +- .../all-processes/all-processes.page.html | 8 +-- .../despachos/despachos.page.html | 8 +-- .../diplomas-assinar.page.html | 8 +-- .../diplomas-gerar/diplomas-gerar.page.html | 8 +-- .../diplomas/diplomas.page.html | 8 +-- .../events-to-approve.page.html | 8 +-- .../expedientes-pr/expedientes-pr.page.html | 8 +-- .../expedients/expedients.page.html | 8 +-- .../task-list-header.page.html | 8 +-- .../pedidos/pedidos.page.html | 8 +-- .../pendentes/pendentes.page.html | 8 +-- .../opts-expediente/opts-expediente.page.ts | 49 +------------------ version/git-version.ts | 12 ++--- 39 files changed, 128 insertions(+), 281 deletions(-) diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index ee3579477..01d483e25 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -122,10 +122,8 @@ export class HomePage implements OnInit { SessionStore.setUrlBeforeInactivity(pathname) if (this.platform.is('mobileweb')) { - // this.router.navigate(['/inactivity']); window.location.pathname = '/inactivity' } else { - // this.router.navigate(['/']); window.location.pathname = '/' } } @@ -135,7 +133,6 @@ export class HomePage implements OnInit { } goto(url) { - // this.router.navigateByUrl('/home/events', { replaceUrl: true }); this.router.navigate([url], { replaceUrl: true }) } diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 73fb88bde..c8247a6b8 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -186,7 +186,6 @@ export class CreateProcessPage implements OnInit { } close() { - //this.router.navigate(['/home/gabinete-digital/expediente']); this.modalController.dismiss(null); } diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index da0b3d1ad..add641971 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -270,7 +270,7 @@
- Todos + Todas
Pessoais diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 3529efba7..ed8137bc1 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -64,7 +64,7 @@
-
A sua Agenda
+
A sua agenda do dia