From f92e4f4c74dd8212e13199de4a273e1138986cd9 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 13 Apr 2021 15:43:44 +0100 Subject: [PATCH 01/13] Fixe --- src/app/home/home.page.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 67e5fd7ab..c400bb31b 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -1,4 +1,4 @@ -/// +// import { Component, OnInit, NgZone } from '@angular/core'; import { EventsService } from '../services/events.service'; import { Event } from '../models/event.model'; @@ -12,8 +12,8 @@ import { Router } from '@angular/router'; import { ViewEventPage } from '../pages/agenda/view-event/view-event.page'; import { ApproveEventModalPage } from '../pages/agenda/approve-event-modal/approve-event-modal.page'; import { ExpedienteDetailPage } from '../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'; -import { PublicationDetailPage } from '../pages/publications/publication-detail/publication-detail.page'; import { ViewPublicationsPage } from '../pages/publications/view-publications/view-publications.page'; +import { PublicationDetailPage } from '../pages/publications/view-publications/publication-detail/publication-detail.page'; /* const { PushNotifications, LocalNotifications, LocalNotificationAction } = Plugins; */ From 377a29c5f7f2cceac45569ce90586cecfd97a761 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 14 Apr 2021 11:04:28 +0100 Subject: [PATCH 02/13] Improve search add search tags --- src/app/pages/search/search.page.html | 6 +++++- src/app/pages/search/search.page.scss | 18 +++++++++++++++++- src/app/pages/search/search.page.ts | 6 ++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index 375675c34..17727fe78 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -146,7 +146,11 @@ src="assets/images/icons-viagem.svg">
-

{{ searchDocument.Assunto}}

+ +
+ {{ searchDocument.Assunto}} + {{ searchDocument.appName}} +
{{ searchDocument.EntidadeOrganicaNome }} {{ formateIsoDate(searchDocument.Data) }} diff --git a/src/app/pages/search/search.page.scss b/src/app/pages/search/search.page.scss index 79a489d33..c045b9293 100644 --- a/src/app/pages/search/search.page.scss +++ b/src/app/pages/search/search.page.scss @@ -155,7 +155,7 @@ ion-slide{ .content{ width: 100%; margin-left: 10px; - p{ + .result-name{ margin: 0px; width: 100%; font-family: Roboto; @@ -169,6 +169,22 @@ ion-slide{ font-weight: 300; color: #797979; } + .app-name{ + background: #42b9f2; + border-radius: 18px; + text-align: center; + display: flex; + align-items: center; + padding: 0px 5px; + color: white; + font-size: 9pt; + font-weight: 500; + height: 19px; + -webkit-border-radius: 18px; + -moz-border-radius: 18px; + -ms-border-radius: 18px; + -o-border-radius: 18px; + } span.documente-date{ } diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index c4d902356..d165c7b1f 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -36,6 +36,8 @@ export class SearchPage implements OnInit { showLoader: boolean; + currentPath: string + // See http://idangero.us/swiper/api/ for valid options. slideOpts = { slidesPerView: parseInt(`${window.innerWidth/147}`, 10), @@ -53,6 +55,8 @@ export class SearchPage implements OnInit { private search: SearchService, private modalCtrl: ModalController,) { this.ordinance = "recent"; + + this.currentPath= window.location.pathname; } ngOnInit() { @@ -220,6 +224,7 @@ export class SearchPage implements OnInit { // bind respose this.sortArrayISODate(res.Documents).forEach(e => { + e['appName'] = 'Correspondencia' this.searchDocuments.push(e) }); @@ -245,6 +250,7 @@ export class SearchPage implements OnInit { this.sortArrayISODate(res.Documents).forEach(e => { + e['appName'] = 'ArquivoDespachoElect' this.searchDocuments.push(e) }); From 8828c319a4e8f59904c527a25993f23f45a2cf01 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 14 Apr 2021 12:02:43 +0100 Subject: [PATCH 03/13] Improve aganda --- src/app/pages/agenda/agenda.page.ts | 39 ++++++++++--------- .../agenda/view-event/view-event.page.ts | 10 +---- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 35448c226..4bb685237 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -863,26 +863,29 @@ export class AgendaPage implements OnInit { selectFirstEventOfTheDay(){ setTimeout(()=>{ + + if(this.eventSelectedDate.toLocaleDateString('en-US') != (new Date()).toLocaleDateString('en-US')){ + let sortedDate = this.eventSource.sort((a,b) =>{ + return (b.startTime) -(a.startTime); + }); - let sortedDate = this.eventSource.sort((a,b) =>{ - return (b.startTime) -(a.startTime); - }); - - - let filterDate = sortedDate.filter((e) => { - return e.startTime.toLocaleDateString('en-US') == this.eventSelectedDate.toLocaleDateString('en-US'); - }); - - const firstEventStartHours = new Date(filterDate[filterDate.length - 1].startTime).getHours(); - - const scrollContainer = document.querySelector('.timeline-wrapper'); - - scrollContainer.scroll({ - top: firstEventStartHours*60, - left: 0, - behavior: 'smooth' - }) + + let filterDate = sortedDate.filter((e) => { + return e.startTime.toLocaleDateString('en-US') == this.eventSelectedDate.toLocaleDateString('en-US'); + }); + + const firstEventStartHours = new Date(filterDate[filterDate.length - 1].startTime).getHours(); + + const scrollContainer = document.querySelector('.timeline-wrapper'); + scrollContainer.scroll({ + top: firstEventStartHours*60, + left: 0, + behavior: 'smooth' + }) + + } + }, 500); } diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index 20af874a9..80039d53a 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -109,12 +109,6 @@ export class ViewEventPage implements OnInit { async editEventDetail() { - let classs; - if( window.innerWidth <= 800){ - classs = 'modal' - } else { - classs = 'modal modal-desktop' - } const modal = await this.modalController.create({ component: EditEventPage, @@ -122,7 +116,7 @@ export class ViewEventPage implements OnInit { eventId: this.loadedEvent.EventId, profile: this.profile, }, - cssClass: classs, + cssClass: 'modal modal-desktop', }); } @@ -131,7 +125,7 @@ export class ViewEventPage implements OnInit { let classs; if( window.innerWidth <= 800){ - classs = 'modal' + classs = 'modal modal-desktop' } else { classs = 'modal modal-desktop showAsideOptions' } From ccc5b2d4ee261ee39b3bf183c2cfe83cc590aa0e Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 14 Apr 2021 12:10:53 +0100 Subject: [PATCH 04/13] Agenda automatic update edited event --- src/app/pages/agenda/view-event/view-event.page.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index 80039d53a..f70564f5a 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -109,7 +109,6 @@ export class ViewEventPage implements OnInit { async editEventDetail() { - const modal = await this.modalController.create({ component: EditEventPage, componentProps: { @@ -145,6 +144,7 @@ export class ViewEventPage implements OnInit { if(res){ setTimeout(() => { /* this.loadEvent(); */ + this.loadEvent() this.getAttachments(); }, 250); this.isEventEdited = true; From 5f2c34ef7cf13c1fd854dbde566b5dfb5591e1ef Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 14 Apr 2021 12:25:13 +0100 Subject: [PATCH 05/13] Improve gabinete when opening modal --- .../pages/gabinete-digital/event-list/event-list.page.ts | 4 ++-- .../expediente/expediente-detail/expediente-detail.page.ts | 4 ++-- .../pages/gabinete-digital/expediente/expediente.page.ts | 2 +- src/app/pages/gabinete-digital/gabinete-digital.page.ts | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index c4ff82d22..7f7029a21 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts @@ -53,7 +53,7 @@ export class EventListPage implements OnInit { window.onresize = (event) => { // if not mobile remove all component - if( window.innerWidth <= 1024){ + if( window.innerWidth <= 800){ this.modalController.dismiss(); } }; @@ -76,7 +76,7 @@ export class EventListPage implements OnInit { async openApproveModal(eventSerialNumber){ let classs; - if( window.innerWidth <= 1024){ + if( window.innerWidth <= 800){ classs = 'cal-modal modal modal-desktop' } else { classs = 'gabinete-digital-mobile-modal-to-Desktop' 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 0faf5dfbb..14b9fca6b 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 @@ -141,7 +141,7 @@ export class ExpedienteDetailPage implements OnInit { //this.modalController.dismiss(); let classs; if( window.innerWidth <= 800){ - classs = 'modal' + classs = 'modal modal-desktop' } else { classs = 'modal modal-desktop showAsideOptions' } @@ -193,7 +193,7 @@ export class ExpedienteDetailPage implements OnInit { async openBookMeetingModal(task: any) { let classs; if( window.innerWidth <= 800){ - classs = 'book-meeting-modal' + classs = 'book-meeting-modal modal modal-desktop' } else { classs = 'modal modal-desktop showAsideOptions' } diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index 1363d9c4d..b25cf5eac 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -69,7 +69,7 @@ export class ExpedientePage implements OnInit { let classs; if( window.innerWidth <= 800){ - classs = 'modal modal-desktop' + classs = 'modal modal-desktop ' } else { classs = 'gabinete-digital-mobile-modal-to-Desktop' } diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index a7eacfcb0..412623260 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -181,7 +181,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{ let classs; if( window.innerWidth <= 800){ - classs = 'modal' + classs = 'modal modal-desktop' } else { classs = 'gabinete-digital-mobile-modal-to-Desktop' } @@ -228,8 +228,8 @@ this.processesbackend.GetActionsList().subscribe(res=>{ this.closeAllDesktopComponent(); let classs; - if( window.innerWidth <= 1024){ - classs = 'modal' + if( window.innerWidth <= 800){ + classs = 'modal modal modal-desktop' } else { classs = 'gabinete-digital-mobile-modal-to-Desktop' } From 13bd4131b371799110e11fd36d70de93802a2716 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 14 Apr 2021 14:27:49 +0100 Subject: [PATCH 06/13] Fixe css bug for home/publications --- src/app/pages/gabinete-digital/event-list/event-list.page.ts | 3 +-- src/app/pages/publications/publications.page.html | 2 +- src/app/pages/publications/publications.page.scss | 1 - .../publication/view-publications/view-publications.page.scss | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index 7f7029a21..f2a607b1d 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts @@ -28,7 +28,7 @@ export class EventListPage implements OnInit { private modalController: ModalController, private router: Router, private navParams: NavParams, - ) { } + ) { } ngOnInit() { this.profile = this.navParams.get('profile'); @@ -73,7 +73,6 @@ export class EventListPage implements OnInit { }); } - async openApproveModal(eventSerialNumber){ let classs; if( window.innerWidth <= 800){ diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index d9004521b..98e1f15a8 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -16,7 +16,7 @@
-
+
Acções Presidenciais
diff --git a/src/app/pages/publications/publications.page.scss b/src/app/pages/publications/publications.page.scss index f59e569bf..5073912de 100644 --- a/src/app/pages/publications/publications.page.scss +++ b/src/app/pages/publications/publications.page.scss @@ -61,7 +61,6 @@ ion-toolbar{ } .div-title{ padding: 0!important; - float: left; } .title{ font-size: 25px; diff --git a/src/app/shared/publication/view-publications/view-publications.page.scss b/src/app/shared/publication/view-publications/view-publications.page.scss index 147d06abf..9d478cb21 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.scss +++ b/src/app/shared/publication/view-publications/view-publications.page.scss @@ -108,7 +108,6 @@ .actions-icon{ display: flex; - overflow: auto; align-items: top; justify-content: flex-end; padding: 0 !important; @@ -116,7 +115,6 @@ .actions-icon ion-icon{ margin-left: 5px; font-size: 35px; - float: right; padding: 0 !important; } /* .title-icon{ From f31299c24a9787053cdf38ea48268c3b490f5edf Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 14 Apr 2021 15:27:50 +0100 Subject: [PATCH 07/13] Improve home publi9cation for mobile --- .../new-action/new-action.page.html | 15 -------- .../new-action/new-action.page.scss | 13 +++---- .../new-publication/new-publication.page.html | 16 +-------- .../new-publication/new-publication.page.scss | 8 ++--- .../new-publication/new-publication.page.ts | 12 +++---- .../publication-detail.page.html | 17 +-------- .../publication-detail.page.scss | 5 --- .../publication-detail.page.ts | 2 +- .../pages/publications/publications.page.html | 4 +-- .../pages/publications/publications.page.ts | 7 ++-- .../publication-detail.page.html | 24 +++---------- .../publication-detail.page.scss | 6 ---- .../view-publications.page.html | 35 ++++++------------- .../view-publications.page.scss | 4 --- .../view-publications.page.ts | 4 +-- 15 files changed, 37 insertions(+), 135 deletions(-) diff --git a/src/app/pages/publications/new-action/new-action.page.html b/src/app/pages/publications/new-action/new-action.page.html index 5a8ff7e6d..1b6d8c16a 100644 --- a/src/app/pages/publications/new-action/new-action.page.html +++ b/src/app/pages/publications/new-action/new-action.page.html @@ -1,18 +1,3 @@ - - -
-
- -
- -
- -
-
- -
diff --git a/src/app/pages/publications/new-action/new-action.page.scss b/src/app/pages/publications/new-action/new-action.page.scss index 0afd7e02b..3235d1aa2 100644 --- a/src/app/pages/publications/new-action/new-action.page.scss +++ b/src/app/pages/publications/new-action/new-action.page.scss @@ -14,7 +14,6 @@ ion-toolbar{ border-width: 0 !important; } .div-top-header{ - width: 400px; margin: 0 auto; background-color: #0782c9; overflow: auto; @@ -41,7 +40,6 @@ ion-toolbar{ margin-right: 10px; } .content-top{ - width: 344px; background: #f3f2f2; height: 20px; margin: 0 auto; @@ -60,7 +58,6 @@ ion-toolbar{ overflow: auto; } .title-content{ - width: 360px; margin: 0px auto; overflow: auto; padding: 0 !important; @@ -79,7 +76,6 @@ font-size: 25px; overflow: auto; } .ion-item-container{ - width: 360px; margin: 15px auto; border: 1px solid #ebebeb; border-radius: 5px; @@ -92,8 +88,8 @@ font-size: 25px; overflow: auto; } .ion-item-class-2{ - width: 360px; margin: 0px auto; + display: flex; } .ion-icon-class{ width: 45px; @@ -101,24 +97,23 @@ font-size: 25px; float: left; padding: 10px; font-size: 25px; + } .ion-input-class{ - width: 315px; height: auto; border: 1px solid #ebebeb; border-radius: 5px; padding-left: 5px; padding-right: 10px; - float: left; + flex: 1; } .ion-textarea-class{ - width: 315px; height: auto; border: 1px solid #ebebeb; border-radius: 5px; padding-left: 5px; padding-right: 10px; - float: left; + flex: 1; } .ion-input-class-no-height{ border: 1px solid #ebebeb; diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html index 2afd16c36..bdb7963d1 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.html +++ b/src/app/pages/publications/new-publication/new-publication.page.html @@ -1,18 +1,4 @@ - - -
-
- -
- -
- -
-
- - +
diff --git a/src/app/pages/publications/new-publication/new-publication.page.scss b/src/app/pages/publications/new-publication/new-publication.page.scss index b4b9d9880..c4a9f8a30 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.scss +++ b/src/app/pages/publications/new-publication/new-publication.page.scss @@ -14,7 +14,6 @@ ion-toolbar{ border-width: 0 !important; } .div-top-header{ - width: 400px; margin: 0 auto; background-color: #0782c9; overflow: auto; @@ -41,7 +40,6 @@ ion-toolbar{ margin-right: 10px; } .content-top{ - width: 344px; background: #f3f2f2; height: 20px; margin: 0 auto; @@ -60,7 +58,6 @@ ion-toolbar{ overflow: auto; } .title-content{ - width: 360px; margin: 0px auto; overflow: auto; padding: 0 !important; @@ -79,7 +76,6 @@ font-size: 25px; overflow: auto; } .ion-item-container{ - width: 360px; margin: 15px auto; border: 1px solid #ebebeb; border-radius: 5px; @@ -92,8 +88,8 @@ font-size: 25px; overflow: auto; } .ion-item-class-2{ - width: 360px; margin: 0px auto; + display: flex; } .ion-icon-class{ width: 45px; @@ -109,7 +105,7 @@ font-size: 25px; border-radius: 5px; padding-left: 5px; padding-right: 10px; - float: left; + flex: 1; } .ion-input-class-no-height{ border: 1px solid #ebebeb; 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 502a47b0c..976e8c80d 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -81,7 +81,7 @@ export class NewPublicationPage implements OnInit { this.capturedImage = imageData; this.capturedImageTitle = new Date().getTime() + '.jpeg'; }, (err) => { - console.log(err); + /* console.log(err); */ }); } @@ -102,7 +102,7 @@ export class NewPublicationPage implements OnInit { this.capturedImage = imageData; this.capturedImageTitle = new Date().getTime() + '.jpeg'; }, (err) => { - console.log(err); + /* console.log(err); */ }); } @@ -139,8 +139,8 @@ export class NewPublicationPage implements OnInit { FileBase64: this.publication.FileBase64, FileExtension: 'jpeg', } - console.log('Edit - keep image'); - console.log(this.publication); + /* console.log('Edit - keep image'); + console.log(this.publication); */ this.publications.UpdatePublication(this.publication.ProcessId, this.publication); this.close(); } @@ -159,8 +159,8 @@ export class NewPublicationPage implements OnInit { FileExtension: 'jpeg', } - console.log('Create'); - console.log(this.publication); + /* console.log('Create'); + console.log(this.publication); */ this.publications.CreatePublication(this.folderId, this.publication); this.close(); } diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.html b/src/app/pages/publications/publication-detail/publication-detail.page.html index e937f9f16..bfc55cfb7 100644 --- a/src/app/pages/publications/publication-detail/publication-detail.page.html +++ b/src/app/pages/publications/publication-detail/publication-detail.page.html @@ -1,21 +1,6 @@ - - -
-
- -
- -
- -
-
- - + -
diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.scss b/src/app/pages/publications/publication-detail/publication-detail.page.scss index dd3f55ae5..3230c6d73 100644 --- a/src/app/pages/publications/publication-detail/publication-detail.page.scss +++ b/src/app/pages/publications/publication-detail/publication-detail.page.scss @@ -10,7 +10,6 @@ border-width: 0 !important; } .div-top-header{ - width: 400px; margin: 0 auto; background-color: #0782c9; overflow: auto; @@ -37,7 +36,6 @@ margin-right: 10px; } .content-top{ - width: 344px; background: #f3f2f2; height: 20px; margin: 0 auto; @@ -55,7 +53,6 @@ overflow: auto; } .title-content{ - width: 360px; margin: 0px auto; overflow: auto; padding: 0 !important; @@ -67,7 +64,6 @@ overflow: auto; } .div-title{ - width: 270px; /* padding: 0!important; */ float: left; margin: 2.5px 0 0 5px; @@ -88,7 +84,6 @@ object-fit: cover; } .post-description{ - width: 360px; margin: 0 auto; margin-bottom: 35px; } \ No newline at end of file diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/publication-detail/publication-detail.page.ts index 6e564f5d5..cb93c0fd7 100644 --- a/src/app/pages/publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/publication-detail/publication-detail.page.ts @@ -94,7 +94,7 @@ export class PublicationDetailPage implements OnInit { publicationType: publicationType, publication: this.publication, }, - cssClass: 'new-publication', + cssClass: 'new-publication modal modal-desktop', backdropDismiss: false }); await modal.present(); diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 98e1f15a8..8517bb29c 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -17,8 +17,8 @@
-
- Acções Presidenciais +
+ Acções Presidenciais
-
+
@@ -28,7 +28,7 @@

{{count_ev_md+count_ev_pr}} Documentos

-
+
@@ -36,7 +36,7 @@

{{count_exp_dailywork}} Documentos

-
+
@@ -44,21 +44,24 @@

Pendentes

- Documentos

-
+ +

Pedidos de Parecer

- Documentos

-
+ +

Pedidos de Deferimento

- Documentos

-
+ +
@@ -66,15 +69,15 @@

- Documentos

- -
+

Expediente Presidente

- Documentos

-
+ +
@@ -82,9 +85,7 @@

- Documentos

- - -
+
@@ -95,7 +96,8 @@
-
+ +
@@ -107,14 +109,16 @@
-
+

Diplomas assinaldos PR

- Documentos

+
+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 3a3b9b069..0b5a60046 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -345,3 +345,9 @@ ion-content{ width: 25%; } } + + +.active { + border: 1px solid green; + box-sizing: border-box; +} \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 8cc4ca006..34ad0b2c6 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -12,6 +12,7 @@ import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; templateUrl: './gabinete-digital.page.html', styleUrls: ['./gabinete-digital.page.scss'], }) + export class GabineteDigitalPage implements OnInit { segment:string; @@ -27,11 +28,13 @@ export class GabineteDigitalPage implements OnInit { count_ev_pr=0; count_ev_md=0; + selectedElement = ""; desktopComponent: any = { showEventList: false, showExpediente : false } + showEventsToApprove = false; showEmptyContainer = false; showExpedients = true; @@ -46,7 +49,7 @@ export class GabineteDigitalPage implements OnInit { private alertService: AlertService, private activatedRoute: ActivatedRoute, private router: Router, - ) { + ) { window.onresize = (event) => { // if not mobile remove all component @@ -74,6 +77,7 @@ export class GabineteDigitalPage implements OnInit { showExpediente: false } } + ngOnInit() { //Initialize profile as mdgpr this.profile = "MDGPR"; @@ -174,6 +178,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{ //} } + openExpedientListPage(){ this.closeAllDesktopComponents(); if( window.innerWidth <= 1024){ @@ -183,6 +188,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{ this.showExpedients = true; } } + openExpedientPage(data){ console.log(data); @@ -195,6 +201,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{ this.showExpedientDetail = true; } } + async openExpedientList(){ this.closeAllDesktopComponent();