From 4195e321bbd39cbb3ff51cee17687a39211d166a Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 25 Aug 2021 10:40:17 +0100 Subject: [PATCH 01/10] fix --- src/app/home/home.page.ts | 11 ++++++----- src/app/modals/create-process/create-process.page.ts | 2 +- src/app/modals/delegar/delegar.page.ts | 2 +- src/app/modals/forward/forward.page.ts | 2 +- src/app/pages/events/edit-event/edit-event.page.ts | 2 +- .../event-detail-modal/event-detail-modal.page.ts | 2 +- .../pages/events/event-detail/event-detail.page.ts | 2 +- .../despachos/despacho/despacho.page.ts | 2 +- src/app/services/socket/synchro.service.ts | 3 ++- 9 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 070babc46..29b4d2352 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -2,17 +2,16 @@ /* tslint:disable */ /// /// -import { Component, OnInit, NgZone, Inject } from '@angular/core'; -import { EventsService } from '../services/events.service'; +import { Component, OnInit, NgZone } from '@angular/core'; import { Event } from '../models/event.model'; -import { ProcessesService } from '../services/processes.service'; import { NotificationsService } from '../services/notifications.service'; -import { ModalController, AlertController, AnimationController, Platform } from '@ionic/angular'; +import { AlertController, Platform } from '@ionic/angular'; import { Router, ActivatedRoute } from '@angular/router'; import { ToDayEventStorage } from '../store/to-day-event-storage.service'; import { DocumentCounterService } from 'src/app/OtherService/document-counter.service' import { PermissionService } from '../OtherService/permission.service'; -import { TotalDocumentService, TotalDocumentStore } from '../store/total-document.service'; +import { TotalDocumentStore } from '../store/total-document.service'; +import { connection } from '../services/socket/synchro.service'; // import { NetworkService } from '../services/network.service'; @@ -67,6 +66,8 @@ export class HomePage implements OnInit { postEvent: any; folderId: string; + connection = connection + constructor(private zone: NgZone, private router: Router, public modalCtrl: AlertController, diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 4f315f1f5..059bdfccf 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -506,7 +506,7 @@ export class CreateProcessPage implements OnInit { taskParticipants: this.taskParticipants, taskParticipantsCc: this.taskParticipantsCc }, - cssClass: 'modal attendee', + cssClass: 'modal attendee modal-desktop', backdropDismiss: false }); diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts index c9ce5ab44..1a1116285 100644 --- a/src/app/modals/delegar/delegar.page.ts +++ b/src/app/modals/delegar/delegar.page.ts @@ -129,7 +129,7 @@ export class DelegarPage implements OnInit { taskParticipants: this.taskParticipants, taskParticipantsCc: this.taskParticipantsCc }, - cssClass: 'modal attendee', + cssClass: 'modal attendee modal-desktop', backdropDismiss: false }); diff --git a/src/app/modals/forward/forward.page.ts b/src/app/modals/forward/forward.page.ts index 02c92198a..ede8b6f3b 100644 --- a/src/app/modals/forward/forward.page.ts +++ b/src/app/modals/forward/forward.page.ts @@ -167,7 +167,7 @@ export class ForwardPage implements OnInit { taskParticipants: this.taskParticipants, taskParticipantsCc: this.taskParticipantsCc }, - cssClass: 'modal attendee', + cssClass: 'modal attendee modal-desktop', backdropDismiss: false }); diff --git a/src/app/pages/events/edit-event/edit-event.page.ts b/src/app/pages/events/edit-event/edit-event.page.ts index b6c51d26a..994fa65a8 100644 --- a/src/app/pages/events/edit-event/edit-event.page.ts +++ b/src/app/pages/events/edit-event/edit-event.page.ts @@ -91,7 +91,7 @@ export class EditEventPage implements OnInit { componentProps: { eventAttendees: this.loadedEvent.Attendees }, - cssClass: 'attendee', + cssClass: 'attendee modal-desktop', backdropDismiss: false }); diff --git a/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts b/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts index 66940fd16..65585077c 100644 --- a/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts +++ b/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts @@ -93,7 +93,7 @@ export class EventDetailModalPage implements OnInit { componentProps: { eventAttendees: this.loadedEvent.Attendees }, - cssClass: 'attendee', + cssClass: 'attendee modal-desktop', backdropDismiss: false }); diff --git a/src/app/pages/events/event-detail/event-detail.page.ts b/src/app/pages/events/event-detail/event-detail.page.ts index bc5a58008..96a642ed8 100644 --- a/src/app/pages/events/event-detail/event-detail.page.ts +++ b/src/app/pages/events/event-detail/event-detail.page.ts @@ -91,7 +91,7 @@ export class EventDetailPage implements OnInit { componentProps: { eventAttendees: this.loadedEvent.Attendees }, - cssClass: 'attendee', + cssClass: 'attendee modal-desktop', backdropDismiss: false }); diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index 3629425c9..1c7e55605 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -302,7 +302,7 @@ export class DespachoPage implements OnInit { async openExpedientActionsModal(taskAction: any, task: any) { let classs; - if( window.innerWidth <= 800){ + if( window.innerWidth <= 800) { classs = 'modal modal-desktop' } else { classs = 'modal modal-desktop showAsideOptions' diff --git a/src/app/services/socket/synchro.service.ts b/src/app/services/socket/synchro.service.ts index 3d9d261eb..537ee72ff 100644 --- a/src/app/services/socket/synchro.service.ts +++ b/src/app/services/socket/synchro.service.ts @@ -116,4 +116,5 @@ export class SynchroService { export const connection = new SynchroService() connection.setUrl() -connection.connect() \ No newline at end of file +connection.connect() + From f469fa0588874214fd39b17c596b7d5eefc75fa7 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 25 Aug 2021 10:49:17 +0100 Subject: [PATCH 02/10] Improve option centralization --- src/app/shared/popover/chat-popover/chat-popover.page.html | 2 +- src/app/shared/popover/chat-popover/chat-popover.page.scss | 2 +- .../shared/popover/deploma-options/deploma-options.page.html | 2 +- .../shared/popover/deploma-options/deploma-options.page.scss | 2 +- .../popover/despachos-options/despachos-options.page.html | 2 +- .../popover/despachos-options/despachos-options.page.scss | 2 +- .../popover/despachos-pr-options/despachos-pr-options.page.html | 2 +- .../popover/despachos-pr-options/despachos-pr-options.page.scss | 2 +- .../popover/opts-expediente-pr/opts-expediente-pr.page.html | 2 +- .../popover/opts-expediente-pr/opts-expediente-pr.page.scss | 2 +- .../shared/popover/opts-expediente/opts-expediente.page.html | 2 +- .../shared/popover/opts-expediente/opts-expediente.page.scss | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.html b/src/app/shared/popover/chat-popover/chat-popover.page.html index 10bab132a..f179b830e 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.html +++ b/src/app/shared/popover/chat-popover/chat-popover.page.html @@ -1,4 +1,4 @@ - +
-
+
Documentos Anexados
-
  • +

  • {{attach.SourceName}} diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts index a04ef85cf..4a9c0f6fd 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -22,7 +22,6 @@ export class ViewEventPage implements OnInit { isEventEdited: boolean; eventBody: EventBody; loadedAttachments:any; - loadedEventAttachments: Attachment[]; pageId: string; showLoader: boolean; @@ -44,7 +43,6 @@ export class ViewEventPage implements OnInit { constructor( private eventsService: EventsService, - private attachmentsService: AttachmentsService, public alertController: AlertController, private iab: InAppBrowser, private processes: ProcessesService, @@ -96,7 +94,6 @@ export class ViewEventPage implements OnInit { this.loadedEvent = res; this.today = new Date(res.StartDate); this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]); - this.getAttachments(this.loadedEvent.EventId); }, (error)=> { console.log('errer', ) @@ -142,12 +139,6 @@ export class ViewEventPage implements OnInit { } - getAttachments(eventId){ - this.attachmentsService.getAttachmentsById(eventId).subscribe(res=>{ - this.loadedAttachments = res; - console.log(res); - }); - } async editEvent() { this.viewEventDetailDismiss.emit({ diff --git a/src/app/store/chat/chat-message.service.ts b/src/app/store/chat/chat-message.service.ts index e9e5fe84d..0ae5cf854 100644 --- a/src/app/store/chat/chat-message.service.ts +++ b/src/app/store/chat/chat-message.service.ts @@ -13,7 +13,7 @@ export class ChatMessageService { constructor() { - this.keyName = ('chat'+SHA1(this.constructor.name)).toString() + this.keyName = (SHA1('chat'+this.constructor.name)).toString() setTimeout(()=> { let restore = localstoreService.get(this.keyName, {}) diff --git a/src/app/store/chat/chat-user.service.ts b/src/app/store/chat/chat-user.service.ts index e18ce4ad5..af9876222 100644 --- a/src/app/store/chat/chat-user.service.ts +++ b/src/app/store/chat/chat-user.service.ts @@ -14,7 +14,7 @@ export class ChatUserService { constructor() { - this.keyName = ('chat'+SHA1(this.constructor.name)).toString() + this.keyName = (SHA1('chat'+this.constructor.name)).toString() setTimeout(()=> { let restore = localstoreService.get(this.keyName, {}) diff --git a/src/app/store/localstore.service.ts b/src/app/store/localstore.service.ts index bdf55dab8..548c1e7cb 100644 --- a/src/app/store/localstore.service.ts +++ b/src/app/store/localstore.service.ts @@ -6,7 +6,7 @@ import { AES, enc, SHA1 } from 'crypto-js' }) export class LocalstoreService { - private prefix = 'v14-' + private prefix = 'v15-' constructor() { From c15c45243fd446244c8ce7f32821afc82d522d9e Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 25 Aug 2021 13:04:26 +0100 Subject: [PATCH 06/10] Fix --- src/app/pages/agenda/view-event/view-event.page.ts | 1 - src/app/shared/agenda/view-event/view-event.page.ts | 1 - 2 files changed, 2 deletions(-) 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 242beef54..6b2fa3ca7 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -1,6 +1,5 @@ import { Component, OnInit } from '@angular/core'; import { AlertController, ModalController, PopoverController } from '@ionic/angular'; -import { Attachment } from 'src/app/models/attachment.model'; import { EventBody } from 'src/app/models/eventbody.model'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { EventsService } from 'src/app/services/events.service'; diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts index 4a9c0f6fd..862f72ccd 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -2,7 +2,6 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import { AlertController, ModalController, PopoverController } from '@ionic/angular'; import { Attachment } from 'src/app/models/attachment.model'; import { EventBody } from 'src/app/models/eventbody.model'; -import { AttachmentsService } from 'src/app/services/attachments.service'; import { EventsService } from 'src/app/services/events.service'; import { Event } from 'src/app/models/event.model'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; From e76df5c22f3c1fff9146078672c06df54dde7d4a Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 25 Aug 2021 15:23:30 +0100 Subject: [PATCH 07/10] Fix refresh --- .../agenda/new-event/new-event.page.html | 3 -- .../pages/agenda/new-event/new-event.page.ts | 4 --- .../publication-detail.page.ts | 17 +++++++---- .../view-publications.page.ts | 3 +- .../agenda/new-event/new-event.page.html | 5 +--- .../shared/agenda/new-event/new-event.page.ts | 30 +++---------------- .../agenda/view-event/view-event.page.ts | 2 +- .../view-publications.page.ts | 4 ++- src/app/store/deplomas.service.ts | 1 + 9 files changed, 23 insertions(+), 46 deletions(-) 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 63ef2105f..b7aa03b6c 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -123,7 +123,6 @@ 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="{{minDate}}" max="2025" > @@ -144,7 +143,6 @@ 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="{{minDate}}" max="2025" > @@ -182,7 +180,6 @@ [(ngModel)]="postEvent.EventRecurrence.LastOccurrence" displayFormat="DD MMM YYYY" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" - min="2021" max="2045" > 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 dbe92c75b..2b52cab02 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -31,8 +31,6 @@ export class NewEventPage implements OnInit { public showSeconds = false; public touchUi = false; public enableMeridian = false; - public minDate = new Date().toISOString().slice(0,10) - public endMinDate = new Date(new Date().getTime() + 15 * 60000); public stepHour = 1; public stepMinute = 5; public stepSecond = 5; @@ -81,8 +79,6 @@ export class NewEventPage implements OnInit { this.selectedDate = this.navParams.get('eventSelectedDate'); this.taskParticipants = this.navParams.get('attendees'); - console.log(this.taskParticipants); - this.postEvent.StartDate = new Date() this.postEvent.EndDate = (new Date(new Date().getTime() + 15 * 60000)) } 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 035353783..a13637b80 100644 --- a/src/app/pages/publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/publication-detail/publication-detail.page.ts @@ -5,6 +5,7 @@ import { PublicationsService } from 'src/app/services/publications.service'; import { ToastService } from 'src/app/services/toast.service'; import { ImageModalPage } from '../gallery/image-modal/image-modal.page'; import { NewPublicationPage } from '../new-publication/new-publication.page'; +import { Location } from '@angular/common'; @Component({ @@ -23,8 +24,8 @@ export class PublicationDetailPage implements OnInit { private navParams:NavParams, private publications:PublicationsService, private animationController: AnimationController, - private toastService: ToastService - ) { + private toastService: ToastService, + private location: Location ) { alert('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!') @@ -56,7 +57,7 @@ export class PublicationDetailPage implements OnInit { }, 2000); } - getPublicationDetail(){ + getPublicationDetail() { this.showLoader = true; console.log(this.publicationId); /* console.log(this.folderId); */ @@ -78,17 +79,21 @@ export class PublicationDetailPage implements OnInit { }); } - close(){ - this.modalController.dismiss(); + close() { + this.location.back() + } - async deletePost(){ + async deletePost() { const loader = this.toastService.loading() try { await this.publications.DeletePublication(this.folderId, this.publicationId).toPromise(); this.toastService.successMessage('Publicação eliminado') + if(window['app-view-publications-page-doRefresh']) { + window['app-view-publications-page-doRefresh']() + } this.close(); } catch (error) { this.toastService.badRequest('Publicação não eliminado') diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts index 1888cb060..c4d58a5a6 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.ts +++ b/src/app/pages/publications/view-publications/view-publications.page.ts @@ -47,6 +47,7 @@ export class ViewPublicationsPage implements OnInit { console.log(params["params"]); } + window['app-view-publications-page-doRefresh'] = this.doRefresh }); } @@ -73,7 +74,7 @@ export class ViewPublicationsPage implements OnInit { this.getPublications(); } - doRefresh(event) { + doRefresh =(event) => { setTimeout(() => { this.getPublicationDetail(); this.getPublications(); diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html index c06351678..0dce0afc6 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -108,7 +108,6 @@ @@ -140,7 +139,6 @@ @@ -207,8 +205,7 @@ 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 4a28ebb23..755dc8789 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -21,10 +21,9 @@ import { FormControl } from '@angular/forms'; import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; import { ThemePalette } from '@angular/material/core'; -import { NgZone, ViewChild } from '@angular/core'; +import { ViewChild } from '@angular/core'; import { FormGroup, Validators } from '@angular/forms'; import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; -import { EliminateEventPage } from 'src/app/modals/eliminate-event/eliminate-event.page'; const moment = _rollupMoment || _moment; @@ -61,8 +60,6 @@ export class NewEventPage implements OnInit { public showSeconds = false; public touchUi = false; public enableMeridian = false; - public minDate = new Date().toISOString().slice(0,10) - public endMinDate = new Date(new Date().getTime() + 15 * 60000); public stepHour = 1; public stepMinute = 5; public stepSecond = 5; @@ -110,13 +107,9 @@ export class NewEventPage implements OnInit { public stepMinutes = [1, 5, 10, 15, 20, 25]; public stepSeconds = [1, 5, 10, 15, 20, 25]; - public dateControlOccurrence = new FormControl(moment("DD MM YYYY hh")); showLoader = false - get dateOccurrence () { - return this.dateControlOccurrence.value - } constructor( private modalController: ModalController, @@ -131,7 +124,7 @@ export class NewEventPage implements OnInit { this.loggeduser = userService.ValidatedUser; this.postEvent = new Event(); - this.postEvent.StartDate = new Date(); + this.postEvent.StartDate = new Date() this.postEvent.EndDate = new Date(new Date().getTime() + 15 * 60000); } @@ -216,7 +209,6 @@ export class NewEventPage implements OnInit { this.date = new Date(2021,9,4,5,6,7); - this.getDatepickerData() this.injectValidation(); @@ -251,7 +243,7 @@ export class NewEventPage implements OnInit { dateEnd: new FormControl(this.postEvent.EndDate, [ Validators.required ]), - dateOccurrence: new FormControl(this.postEvent.EventRecurrence.Type.toString() == '-1' ? ['ok']: this.dateOccurrence, [ + dateOccurrence: new FormControl(this.postEvent.EventRecurrence.Type.toString() == '-1' ? ['ok']: this.postEvent.EventRecurrence.LastOccurrence, [ Validators.required ]), participantes: new FormControl(this.taskParticipants, [ @@ -334,17 +326,6 @@ export class NewEventPage implements OnInit { } } - getDatepickerData() { - if (this.postEvent) { - this.postEvent.EventRecurrence.LastOccurrence = this.dateOccurrence - } - } - - restoreDatepickerData() { - if (this.postEvent) { - this.dateControlOccurrence = new FormControl(moment(this.postEvent.EventRecurrence.LastOccurrence, "DD MM YYYY HH:mm")) - } - } @@ -358,7 +339,6 @@ export class NewEventPage implements OnInit { return false } - this.getDatepickerData() this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc); @@ -483,7 +463,6 @@ export class NewEventPage implements OnInit { } afterSave() { - this.getDatepickerData() this.deleteTemporaryData(); this.onAddEvent.emit(this.postEvent); @@ -521,7 +500,6 @@ export class NewEventPage implements OnInit { } saveTemporaryData() { - this.getDatepickerData() window['temp.path:/home/agenda/new-event.component.ts'] = { postEvent: this.postEvent, eventBody: this.eventBody, @@ -545,7 +523,7 @@ export class NewEventPage implements OnInit { this.segment = restoredData.segment // restore dater for date and hours picker - this.restoreDatepickerData() + return true; } else { diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts index 862f72ccd..04d844b06 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -146,7 +146,7 @@ export class ViewEventPage implements OnInit { }) } - viewDocument(sourceId){ + viewDocument(sourceId) { this.processes.GetDocumentUrl(sourceId, '8').subscribe(res=>{ console.log(res); const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts index b2469dba3..70016f30e 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.ts +++ b/src/app/shared/publication/view-publications/view-publications.page.ts @@ -54,6 +54,8 @@ export class ViewPublicationsPage implements OnInit { this.getPublications(); this.getPublicationDetail(); + + window['app-view-publications-page-doRefresh'] = this.doRefresh } ngOnChanges(changes: any): void { @@ -71,7 +73,7 @@ export class ViewPublicationsPage implements OnInit { } - doRefresh(event) { + doRefresh =(event) => { this.getPublications(); setTimeout(() => { diff --git a/src/app/store/deplomas.service.ts b/src/app/store/deplomas.service.ts index 99f1dba71..d00f1f0f1 100644 --- a/src/app/store/deplomas.service.ts +++ b/src/app/store/deplomas.service.ts @@ -48,6 +48,7 @@ export class DeplomasService { } set deplomasReviewCount(arg: number) { this._diplomasReviewCount = arg + this.saveDiplomasReviewList() } get countDiplomasAssinadoListCount() { From 629027f0b539380eb3e3908aad7187fbd85226af Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 25 Aug 2021 15:29:06 +0100 Subject: [PATCH 08/10] Remove code --- src/app/store/localstore.service.ts | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/app/store/localstore.service.ts b/src/app/store/localstore.service.ts index 548c1e7cb..921c7a385 100644 --- a/src/app/store/localstore.service.ts +++ b/src/app/store/localstore.service.ts @@ -60,17 +60,3 @@ export class LocalstoreService { export const localstoreService = new LocalstoreService() console.log( AES.encrypt( 'pode ser qualquer', 'ayrton').toString() ) - -// // Create WebSocket connection. -// const socket = new WebSocket('ws://localhost:8080'); - -// // Listen for messages -// socket.addEventListener('message', function (event) { -// console.log('Message from server ', event.data); // Message from server mobile first é fraco - -// var p = Promise.resolve(event.data); -// p.then(function(v) { -// console.log(v); // mobile first é fraco -// }); - -// }); From b1f800b2fe5c52be17ba362c9f78652aeed8eef3 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 25 Aug 2021 16:02:40 +0100 Subject: [PATCH 09/10] Fix counting --- package-lock.json | 14 ++++++++++++++ package.json | 1 + src/app/OtherService/document-counter.service.ts | 8 ++++---- src/app/app.module.ts | 5 +++++ src/app/pages/events/events.module.ts | 3 +++ src/app/pages/events/events.page.html | 7 +++++++ src/app/pages/events/events.page.ts | 3 ++- .../gabinete-digital/gabinete-digital.page.html | 2 +- .../gabinete-digital/gabinete-digital.page.ts | 7 +------ 9 files changed, 38 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0356fc6d8..327dd8601 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21752,6 +21752,15 @@ "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=" }, + "ng2-pdf-viewer": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/ng2-pdf-viewer/-/ng2-pdf-viewer-7.0.1.tgz", + "integrity": "sha512-kjjsvHd5t1Ff7ydb3Far3d6cSyw/XJH5KXgcp/0bFzSFBAV2c5aOghxoY/yQVjgG+R6F16nVUh2UrZdngLXLSg==", + "requires": { + "pdfjs-dist": "~2.7.570", + "tslib": "^2.0.0" + } + }, "ngx-socket-io": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/ngx-socket-io/-/ngx-socket-io-3.2.0.tgz", @@ -22617,6 +22626,11 @@ "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==" }, + "pdfjs-dist": { + "version": "2.7.570", + "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.7.570.tgz", + "integrity": "sha512-/ZkA1FwkEOyDaq11JhMLazdwQAA0F9uwrP7h/1L9Akt9KWh1G5/tkzS+bPuUELq2s2GDFnaT+kooN/aSjT7DXQ==" + }, "pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", diff --git a/package.json b/package.json index 8e99fe4b8..d4d5367b1 100644 --- a/package.json +++ b/package.json @@ -93,6 +93,7 @@ "jetifier": "^1.6.6", "lite-server": "^2.6.1", "moment": "^2.29.1", + "ng2-pdf-viewer": "^7.0.1", "ngx-socket-io": "^3.2.0", "puppeteer": "^10.1.0", "rxjs": "~6.6.3", diff --git a/src/app/OtherService/document-counter.service.ts b/src/app/OtherService/document-counter.service.ts index 93a91d208..bf9f37521 100644 --- a/src/app/OtherService/document-counter.service.ts +++ b/src/app/OtherService/document-counter.service.ts @@ -26,14 +26,14 @@ export class DocumentCounterService { // falta a contagem dos deplomas get mdTotalDocument(): number { - return this.despachoStore.count + this.expedienteGbStore.count + this.pedidosStore.countdeferimento - + this.pedidosStore.countparecer + this.expedientePrStore.count + this.despachoPrStore.count + this.pendentesStore.count + return this.despachoStore.count + /** this.expedientePrStore.count + */ this.pedidosStore.countdeferimento + + this.pedidosStore.countparecer + this.expedienteGbStore.count + this.despachoPrStore.count + this.pendentesStore.count + this.eventoAprovacaoStore.count + this.deplomasStore.diplomasListCount + this.deplomasStore.countDiplomasAssinadoListCount + this.deplomasStore.deplomasReviewCount } get prTotalDocument(): number { - return this.despachoStore.count + this.expedienteGbStore.count + this.pedidosStore.countdeferimento - + this.pedidosStore.countparecer + this.expedientePrStore.count + this.despachoPrStore.count + this.pendentesStore.count + return this.despachoStore.count + /** this.expedientePrStore.count + */ this.pedidosStore.countdeferimento + + this.pedidosStore.countparecer + this.expedienteGbStore.count + this.despachoPrStore.count + this.pendentesStore.count + this.eventoAprovacaoStore.count + this.deplomasStore.diplomasListCount + this.deplomasStore.countDiplomasAssinadoListCount + this.deplomasStore.deplomasReviewCount } } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index c8f7c50b9..ea7ce1aef 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -54,6 +54,9 @@ import { far } from '@fortawesome/free-regular-svg-icons' import { fab } from '@fortawesome/free-brands-svg-icons' import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx'; +import { PdfViewerModule } from 'ng2-pdf-viewer'; + + @NgModule({ declarations: [AppComponent], entryComponents: [], @@ -84,6 +87,8 @@ import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx'; MatSelectModule, MatDialogModule, + // + PdfViewerModule ], providers: [ { provide: MAT_DATE_LOCALE, useValue: 'pt' }, diff --git a/src/app/pages/events/events.module.ts b/src/app/pages/events/events.module.ts index df42957a9..dbac51237 100644 --- a/src/app/pages/events/events.module.ts +++ b/src/app/pages/events/events.module.ts @@ -11,6 +11,7 @@ import { EventsPage } from './events.page'; import { HeaderNoSearchPageModule } from 'src/app/shared/headers/header-no-search/header-no-search.module'; import { HeaderPageModule } from 'src/app/shared/header/header.module'; +import { PdfViewerModule } from 'ng2-pdf-viewer'; @NgModule({ imports: [ @@ -19,6 +20,8 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; IonicModule, EventsPageRoutingModule, HeaderPageModule, + // + PdfViewerModule ], declarations: [EventsPage], schemas: [CUSTOM_ELEMENTS_SCHEMA] diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 7e067c269..f600014db 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -112,4 +112,11 @@

    • + + + +     diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 8bca24ba2..da6483b96 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -69,7 +69,8 @@ export class EventsPage implements OnInit { loggeduser: User; existingScreenOrientation: string; - + pdfSrc = "https://vadimdez.github.io/ng2-pdf-viewer/assets/pdf-test.pdf"; + constructor( private eventService: EventsService, private router: Router, diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 0f3d1709e..a68f3bbb2 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -120,7 +120,7 @@

    Expediente Presidente

    Expediente

    -

    {{expedienteprstore.count}} Documentos

    +

    not {{expedienteprstore.count}} Documentos

    diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index c971df302..1c5977f2c 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -95,7 +95,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { despachoStore = DespachoStore; eventoaprovacaostore = EventoAprovacaoStore; pedidosstore = PedidosStore; - expedienteprstore = ExpedienteprStore; + // expedienteprstore = ExpedienteprStore; despachoprstore = DespachosprStore; totalDocumentStore = TotalDocumentStore deplomasStore = DeplomasStore @@ -459,11 +459,6 @@ export class GabineteDigitalPage implements OnInit, DoCheck { this.expedientegbstore.count = this.count_exp_dailywork; this.expedientegbstore.reset(expedientes) - let expedientes_pr = await this.processesbackend.GetTasksList("Expediente", false).toPromise(); - expedientes_pr = expedientes_pr.filter(data => data.workflowInstanceDataFields.Status == "Active") - this.count_exp_pr = Object.keys(expedientes_pr).length; - this.expedienteprstore.count = this.count_exp_pr; - this.expedienteprstore.reset(expedientes_pr) let despachos = await this.processesbackend.GetTasksList("Despacho", false).toPromise(); despachos = despachos.filter(data => data.workflowInstanceDataFields.Status == "Active") From 07435162e12e42437c43ac894bad4be11c64e70e Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 25 Aug 2021 16:20:25 +0100 Subject: [PATCH 10/10] fix counting --- src/app/OtherService/document-counter.service.ts | 2 +- .../pages/gabinete-digital/gabinete-digital.page.html | 9 --------- src/app/pages/gabinete-digital/gabinete-digital.page.ts | 6 +++++- src/app/store/eventoaprovacao-store.service.ts | 4 ++-- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/app/OtherService/document-counter.service.ts b/src/app/OtherService/document-counter.service.ts index bf9f37521..671d4243a 100644 --- a/src/app/OtherService/document-counter.service.ts +++ b/src/app/OtherService/document-counter.service.ts @@ -18,7 +18,7 @@ export class DocumentCounterService { despachoStore = DespachoStore; eventoAprovacaoStore = EventoAprovacaoStore; pedidosStore = PedidosStore; - expedientePrStore = ExpedienteprStore; + // expedientePrStore = ExpedienteprStore; despachoPrStore = DespachosprStore; deplomasStore = DeplomasStore diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index a68f3bbb2..5dae4bfa1 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -114,15 +114,6 @@

    {{expedientegbstore.count}} Documentos

    -
    -
    - -
    -

    Expediente Presidente

    -

    Expediente

    -

    not {{expedienteprstore.count}} Documentos

    -
    -
    diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 1c5977f2c..34acf1aaa 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -112,7 +112,6 @@ export class GabineteDigitalPage implements OnInit, DoCheck { constructor( private processesbackend:ProcessesService, private modalController: ModalController, - private alertService: AlertService, private activatedRoute: ActivatedRoute, private router: Router, authService: AuthService, @@ -500,14 +499,19 @@ export class GabineteDigitalPage implements OnInit, DoCheck { let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR', false).toPromise(); let mdEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal MDGPR', false).toPromise(); const eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal); + this.eventoaprovacaostore.countMd = eventsMDGPRList.length this.eventoaprovacaostore.resetmd(eventsMDGPRList); + + let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR', false).toPromise(); let prEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal PR', false).toPromise(); const eventsPRList = prEventsOficial.concat(prEventsPessoal); + this.eventoaprovacaostore.countPr = eventsPRList.length this.eventoaprovacaostore.resetpr(eventsPRList); + let diplomasValidar = despachospr.filter(data => data.activityInstanceName == "Revisar Diploma"); this.count_dip_pv = Object.keys(diplomasValidar).length; this.deplomasStore.resetDiplomasReview(diplomasValidar) diff --git a/src/app/store/eventoaprovacao-store.service.ts b/src/app/store/eventoaprovacao-store.service.ts index 494300f69..5e8f5a187 100644 --- a/src/app/store/eventoaprovacao-store.service.ts +++ b/src/app/store/eventoaprovacao-store.service.ts @@ -14,8 +14,8 @@ export class EventoaprovacaoStoreService { private keyNamemd: string; private keyNamepr: string; private _count = 0 - _countPr = 0 - _countMd = 0 + private _countPr = 0 + private _countMd = 0 constructor() {