From 1ef13da922d910963d222668e370b851875bb055 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Sun, 16 Jul 2023 21:38:37 +0100 Subject: [PATCH] fix --- .../document-set-up-meeting.page.html | 7 +- .../document-set-up-meeting.page.ts | 2 + .../set-room-owner/set-room-owner.page.html | 2 +- .../group-contacts/group-contacts.page.html | 2 +- .../chat/messages/contacts/contacts.page.html | 2 +- .../new-group/contacts/contacts.page.html | 2 +- .../events/attendees/attendees.page.html | 2 +- .../event-list/event-list.page.html | 31 ++-- .../event-list/event-list.page.scss | 2 + .../event-list/event-list.page.ts | 64 ++++++-- .../book-meeting-modal.page.ts | 4 +- .../gabinete-digital/gabinete-digital.page.ts | 18 +-- .../publication-detail.page.ts | 148 ------------------ src/app/services/events.service.ts | 30 +--- .../events/attendees/attendees.page.html | 2 +- src/app/services/task.service.ts | 5 +- .../group-contacts/group-contacts.page.html | 2 +- .../chat/messages/contacts/contacts.page.html | 2 +- .../new-group/contacts/contacts.page.html | 2 +- .../attendee-modal/attendee-modal.page.html | 2 +- .../all-processes/all-processes.page.ts | 14 +- .../events-to-approve.page.ts | 4 +- .../store/eventoaprovacao-store.service.ts | 4 +- src/function.scss | 4 + version/git-version.ts | 10 +- 25 files changed, 133 insertions(+), 234 deletions(-) delete mode 100644 src/app/pages/publications/publication-detail/publication-detail.page.ts diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html index 52e9e734e..be1b03ade 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html @@ -92,11 +92,8 @@ - - Oficial - - - Pessoal + + Agenda {{ calendars }} diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts index a7ad1f857..a1388a540 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts @@ -139,6 +139,8 @@ export class DocumentSetUpMeetingPage implements OnInit { }] } + this.changeAgenda() + } ngOnInit() { diff --git a/src/app/modals/set-room-owner/set-room-owner.page.html b/src/app/modals/set-room-owner/set-room-owner.page.html index 54a856094..b7c598e85 100644 --- a/src/app/modals/set-room-owner/set-room-owner.page.html +++ b/src/app/modals/set-room-owner/set-room-owner.page.html @@ -18,7 +18,7 @@
- +
diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html index 352f84d7b..18ad65e3a 100644 --- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html +++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html @@ -18,7 +18,7 @@
- +
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.html b/src/app/pages/chat/messages/contacts/contacts.page.html index ed4e55190..a915077f6 100644 --- a/src/app/pages/chat/messages/contacts/contacts.page.html +++ b/src/app/pages/chat/messages/contacts/contacts.page.html @@ -18,7 +18,7 @@
- +
diff --git a/src/app/pages/chat/new-group/contacts/contacts.page.html b/src/app/pages/chat/new-group/contacts/contacts.page.html index 1d146e957..1052cb20b 100644 --- a/src/app/pages/chat/new-group/contacts/contacts.page.html +++ b/src/app/pages/chat/new-group/contacts/contacts.page.html @@ -18,7 +18,7 @@
- +
diff --git a/src/app/pages/events/attendees/attendees.page.html b/src/app/pages/events/attendees/attendees.page.html index 886782945..2001ab9fb 100644 --- a/src/app/pages/events/attendees/attendees.page.html +++ b/src/app/pages/events/attendees/attendees.page.html @@ -2,7 +2,7 @@ Adicionar intervenientes - + diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html index 6d37d63ca..738d623bd 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.html +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html @@ -93,20 +93,21 @@
- - -
-
-

{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}

-

{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}

-
-
-

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}

-

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}

-

{{event.workflowInstanceDataFields.Subject}}

-
-
{{ event.activityInstanceName }}
+ +
+
+
+

{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}

+

{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}

+
+
+

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}

+

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}

+

{{event.workflowInstanceDataFields.Subject}}

+
+
{{ event.activityInstanceName }}
+
@@ -120,7 +121,7 @@
Lista vazia diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.scss b/src/app/pages/gabinete-digital/event-list/event-list.page.scss index 85fa3515b..68de899f3 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.scss +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.scss @@ -49,7 +49,9 @@ ion-item-sliding{ padding: 10px; margin-bottom: 10px; overflow: auto; + width: 100%; } + .content-pr-Oficial{ background-color: var(--white); border-radius: 5px; 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 0f7a466d0..85c87164a 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 @@ -6,7 +6,7 @@ import { ModalController } from '@ionic/angular'; import { ApproveEventModalPage } from './approve-event-modal/approve-event-modal.page'; import { NavigationStart, Router } from '@angular/router'; import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service'; - +import { TaskService } from 'src/app/services/task.service' import { BackgroundService } from '../../../services/background.service'; import { SortService } from 'src/app/services/functions/sort.service'; import { ThemeService } from 'src/app/services/theme.service' @@ -26,8 +26,6 @@ export class EventListPage implements OnInit { profile: string; segment: any; showLoader: boolean; - eventsPRList: any = []; - eventsMDGPRList: any = []; eventPerson: EventPerson; eventBody: EventBody; categories: string[]; @@ -35,7 +33,6 @@ export class EventListPage implements OnInit { skeletonLoader = true eventoaprovacaostore = EventoAprovacaoStore; - eventsList: any = [] color: 'pr' | 'mdgpr' environment = environment filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' @@ -46,6 +43,10 @@ export class EventListPage implements OnInit { list = [] ordinance: string = 'old' + listSubscription : { + delete(): void; + } + constructor( private processes: ProcessesService, private modalController: ModalController, @@ -55,6 +56,7 @@ export class EventListPage implements OnInit { public ThemeService: ThemeService, private RouteService: RouteService, public eventService: EventsService, + public TaskService: TaskService, ) { } ngOnInit() { @@ -80,6 +82,15 @@ export class EventListPage implements OnInit { } }) + this.listSubscription = this.eventoaprovacaostore.registerCallback({ + id: import.meta.url, + funx:() => { + + this.dynamicSearch() + + } + }) + const location = window.location @@ -110,6 +121,12 @@ export class EventListPage implements OnInit { } + + ngOnDestroy() { + this.listSubscription.delete() + } + + ngAfterViewInit(): void { @@ -119,7 +136,27 @@ export class EventListPage implements OnInit { this.ordinance = orderBy; - // this.dynamicSearch(); + this.dynamicSearch(); + } + + + async dynamicSearch() { + + if(this.showSearch && this.searchSubject) { + + const list = this.eventoaprovacaostore.get(this.segment).filter((task) => { + let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject + subject = subject.toLowerCase(); + return subject.includes(this.searchSubject.toLowerCase()) + }) + + this.list = this.TaskService.reorderList(this.ordinance, list) + } else { + const list = this.eventoaprovacaostore.get(this.segment) + + this.list = this.TaskService.reorderList(this.ordinance, list) + } + } @@ -141,30 +178,33 @@ export class EventListPage implements OnInit { this.color = 'mdgpr' } + let eventsList let genericEvents = await this.processes.eventsToApprove(SessionStore.user.UserId,'mobile agenda').toPromise() try { - this.eventsList = this.sortService.sortArrayByDate(genericEvents).reverse(); + eventsList = this.sortService.sortArrayByDate(genericEvents).reverse(); } catch (error) { this.skeletonLoader = false - this.eventsList = []; + eventsList = []; } - this.eventoaprovacaostore.save(segment, this.eventsList) + this.eventoaprovacaostore.save(segment, eventsList as any) + this.dynamicSearch() } else if(segment) { this.color = 'pr' + let eventsList = [] let allEvents = await this.processes.eventsToApprove(segment,'mobile agenda').toPromise() try { - this.eventsList = this.sortService.sortArrayByDate(allEvents).reverse(); + eventsList = this.sortService.sortArrayByDate(allEvents).reverse(); } catch(error) { this.skeletonLoader = false - this.eventsList = [] + eventsList = [] } - this.eventsList = this.eventsList this.showLoader = false; - this.eventoaprovacaostore.save(segment, this.eventsList) + this.eventoaprovacaostore.save(segment, eventsList) + this.dynamicSearch() } this.showLoader = false; diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index ac814b6ce..cbd55f6f5 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -161,6 +161,7 @@ export class BookMeetingModalPage implements OnInit { }] } + this.changeAgenda(); } ngOnInit() { @@ -319,11 +320,12 @@ export class BookMeetingModalPage implements OnInit { } else if(this.task.FsId == '361') { - + console.log('361') const loader = this.toastService.loading() try { const CalendarId = this.selectedCalendarId() + console.log({CalendarId}) await this.calendarService.genericCreateTaskEvent(this.task.FolderID | this.task.FolderId, this.postData, "",this.task.SerialNumber, this.task.FsId, CalendarId).toPromise(); this.close(); diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index d64b92776..0524e36c6 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -112,6 +112,7 @@ export class GabineteDigitalPage implements OnInit { window.onresize = (event) => { if (window.innerWidth < 701) { + this.modalController.dismiss(); this.hideRefreshBtn = false; this.hideInMobile = false; this.segmentVista = "listview"; @@ -197,6 +198,14 @@ export class GabineteDigitalPage implements OnInit { this.hideRefreshButton(); + } + + ngAfterViewInit(): void { + // We can access the TestComponent now that this portion of the view tree has been initiated. + const element = this.scroll.nativeElement + this.scroll.nativeElement.addEventListener("scroll", (e)=> { + this.changeTab() + }); (async () => { @@ -236,15 +245,6 @@ export class GabineteDigitalPage implements OnInit { } }); - } - - ngAfterViewInit(): void { - // We can access the TestComponent now that this portion of the view tree has been initiated. - this.scroll.nativeElement.addEventListener("scroll", (e)=> { - this.changeTab() - }); - - } diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/publication-detail/publication-detail.page.ts deleted file mode 100644 index 5066402ff..000000000 --- a/src/app/pages/publications/publication-detail/publication-detail.page.ts +++ /dev/null @@ -1,148 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { AnimationController, ModalController, NavParams } from '@ionic/angular'; -import { Publication } from 'src/app/models/publication'; -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 { SqliteService } from 'src/app/services/sqlite.service'; -import { BackgroundService } from 'src/app/services/background.service'; -import { ThemeService } from 'src/app/services/theme.service' -import { RouteService } from 'src/app/services/route.service'; -import { PermissionService } from 'src/app/services/permission.service'; -import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; - -@Component({ - selector: 'app-publication-detail', - templateUrl: './publication-detail.page.html', - styleUrls: ['./publication-detail.page.scss'], -}) -export class PublicationDetailPage implements OnInit { - showLoader: boolean; - publicationId: string; - folderId: string; - publication: Publication; - - constructor( - private modalController: ModalController, - private navParams:NavParams, - private publications:PublicationsService, - private toastService: ToastService, - private RouteService: RouteService, - public ThemeService: ThemeService, - public p:PermissionService, - private httpErrorHandle: HttpErrorHandle ) { - - this.publicationId = this.navParams.get('publicationId'); - /* this.folderId = this.navParams.get('folderIdId'); */ - this.publication = { - DateIndex: null, - DocumentId: null, - ProcessId:'', - Title:'', - Message: '', - /* image: null, */ - DatePublication: null, - FileBase64: '', - OriginalFileName: '', - FileExtension: '', - }; - } - - ngOnInit() { - this.getPublicationDetail(); - } - doRefresh(event) { - this.getPublicationDetail(); - - setTimeout(() => { - try { - event?.target?.complete(); -} catch(error) {} - }, 2000); - } - - getPublicationDetail() { - this.showLoader = true; - this.publications.GetPublicationById(this.publicationId).subscribe(res=>{ - - /* this.publication = res; */ - this.publication = { - DateIndex: res.DateIndex, - DocumentId: res.DocumentId, - ProcessId:res.ProcessId, - Title:res.Title, - Message: res.Message, - DatePublication: res.DatePublication, - FileBase64: "data:image/jpg;base64," + res.FileBase64, - OriginalFileName: res.OriginalFileName, - FileExtension: 'jpeg', - } - this.showLoader = false; - }); - } - - getFromDB() { - - } - - close() { - this.RouteService.goBack() - - } - - async deletePost() { - - const loader = this.toastService.loading() - - try { - await this.publications.DeletePublication(this.folderId, this.publicationId).toPromise(); - this.httpErrorHandle.httpsSucessMessagge('Eliminar publicação') - if(window['app-view-publications-page-doRefresh']) { - window['app-view-publications-page-doRefresh']() - } - this.close(); - } catch (error) { - this.httpErrorHandle.httpStatusHandle(error) - } finally { - loader.remove() - } - - } - - async editPost(publicationType:any) { - - - const modal = await this.modalController.create({ - component: NewPublicationPage, - componentProps:{ - publicationType: publicationType, - publication: this.publication, - }, - cssClass: 'new-publication modal modal-desktop', - backdropDismiss: false - }); - - modal.onDidDismiss().then(()=>{ - setTimeout(() => { - this.getPublicationDetail(); - }, 5000); - }); - - await modal.present(); - } - - openPreview(imageUrl:string){ - this.modalController.create({ - component: ImageModalPage, - componentProps: { - imageUrl:imageUrl, - } - }).then(modal => modal.present()); - } - - - - - -} diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index d89f882cc..fb49f1ced 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -1165,22 +1165,13 @@ export class EventsService { params = params.set("SerialNumber", serialNumber); params = params.set("applicationID", applicationID); - const headers = [ - this.headerSharedOficial, - this.headerSharedPessoal, - this.headerOwnPessoal, - this.headerOwnOficial - ] - - const header = headers.find( (header) => { - return header?.get('CalendarId')?.includes(CalendarId) - }) - + const calendar = this.DetectCalendars(CalendarId) + const header = this.makeHeader(calendar) + options = { headers: header, params: params - }; - + } return this.http.post(`${geturl}`, body, options) } @@ -1238,22 +1229,15 @@ export class EventsService { params = params.set("SerialNumber", serialNumber); params = params.set("applicationID", applicationID); - const headers = [ - this.headerSharedOficial, - this.headerSharedPessoal, - this.headerOwnPessoal, - this.headerOwnOficial - ] - - const header = headers.find((header)=> { - return header?.get('CalendarId')?.includes(CalendarId) - }) + const calendar = this.DetectCalendars(CalendarId) + const header = this.makeHeader(calendar) options = { headers: header, params: params } + console.log('post') return this.http.post(`${geturl}`, body, options) } diff --git a/src/app/services/events/attendees/attendees.page.html b/src/app/services/events/attendees/attendees.page.html index 7f88b8bc5..8d7a3724c 100644 --- a/src/app/services/events/attendees/attendees.page.html +++ b/src/app/services/events/attendees/attendees.page.html @@ -2,7 +2,7 @@ Adicionar intervenientes - + diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts index 531f6703f..156e32415 100644 --- a/src/app/services/task.service.ts +++ b/src/app/services/task.service.ts @@ -155,7 +155,10 @@ export class TaskService { sortArrayISODate(myArray: any): any[] { - return myArray.sort((a,b) => Date.parse(b.CreateDate || b.taskStartDate || b.TaskStartDate || b.TaskReceiveDate || b.taskReceiveDate ) - Date.parse(a.CreateDate || b.taskStartDate || b.TaskStartDate || a.TaskReceiveDate || a.taskReceiveDate )) + return myArray.sort((a,b) => + Date.parse(b.CreateDate || b.taskStartDate || b.TaskStartDate || b.TaskReceiveDate || b.taskReceiveDate ) + - + Date.parse(a.CreateDate || b.taskStartDate || b.TaskStartDate || a.TaskReceiveDate || a.taskReceiveDate )) } reorderList(orderBy: string, list) { diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html index 882b0c426..d582861b3 100644 --- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html +++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html @@ -22,7 +22,7 @@
- +
diff --git a/src/app/shared/chat/messages/contacts/contacts.page.html b/src/app/shared/chat/messages/contacts/contacts.page.html index 275ec29b7..1622ef118 100644 --- a/src/app/shared/chat/messages/contacts/contacts.page.html +++ b/src/app/shared/chat/messages/contacts/contacts.page.html @@ -16,7 +16,7 @@
- +
diff --git a/src/app/shared/chat/new-group/contacts/contacts.page.html b/src/app/shared/chat/new-group/contacts/contacts.page.html index b5e1c8af7..e6b2258b9 100644 --- a/src/app/shared/chat/new-group/contacts/contacts.page.html +++ b/src/app/shared/chat/new-group/contacts/contacts.page.html @@ -17,7 +17,7 @@
- +
diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.html b/src/app/shared/event/attendee-modal/attendee-modal.page.html index cdd776675..fc05547bf 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.html +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.html @@ -2,7 +2,7 @@ Adicionar intervenientes - + diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts index 1d0c6c864..4ef484e7b 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core'; import { NavigationEnd, Router } from '@angular/router'; import { LoginUserRespose } from 'src/app/models/user.model'; import { ThemeService } from 'src/app/services/theme.service' @@ -8,6 +8,7 @@ import { TaskService } from 'src/app/services/task.service' selector: 'app-all-processes', templateUrl: './all-processes.page.html', styleUrls: ['./all-processes.page.scss'], + changeDetection: ChangeDetectionStrategy.OnPush }) export class AllProcessesPage implements OnInit { @@ -42,6 +43,7 @@ export class AllProcessesPage implements OnInit { private router: Router, public ThemeService: ThemeService, public TaskService: TaskService, + private cdr: ChangeDetectorRef ) {} ngOnInit() { @@ -84,6 +86,7 @@ export class AllProcessesPage implements OnInit { async closeSearch() { this.searchSubject = '' this.dynamicSearch() + this.cdr.markForCheck() } async basicSearch() { @@ -94,8 +97,9 @@ export class AllProcessesPage implements OnInit { reorderList(orderBy: string) { this.ordinance = orderBy; + this.cdr.markForCheck() - this.dynamicSearch(); + this.dynamicSearch(); } async dynamicSearch() { @@ -113,6 +117,8 @@ export class AllProcessesPage implements OnInit { const AllProcess = this.TaskService.AllProcess this.AllProcess = this.TaskService.reorderList(this.ordinance, AllProcess) } + + this.cdr.markForCheck() } checkFilter() { @@ -125,6 +131,8 @@ export class AllProcessesPage implements OnInit { } else if (this.router.url.includes('unread')) { this.filterName = 'Não lidos' } + + this.cdr.markForCheck() } @@ -167,6 +175,8 @@ export class AllProcessesPage implements OnInit { else { throw(`${workflowName} && ${activityName} no route`) } + + this.cdr.markForCheck() } } diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts index 60e63ef1b..e1baa15b5 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts @@ -120,7 +120,7 @@ export class EventsToApprovePage implements OnInit { this.ordinance = orderBy; - // this.dynamicSearch(); + this.dynamicSearch(); } @@ -142,6 +142,8 @@ export class EventsToApprovePage implements OnInit { this.list = this.TaskService.reorderList(this.ordinance, list) } + console.log(this.list) + } diff --git a/src/app/store/eventoaprovacao-store.service.ts b/src/app/store/eventoaprovacao-store.service.ts index 648c5a9ef..d4d2ef805 100644 --- a/src/app/store/eventoaprovacao-store.service.ts +++ b/src/app/store/eventoaprovacao-store.service.ts @@ -94,7 +94,8 @@ export class EventoaprovacaoStoreService { this._list[segment] = value this._counts[segment] = value.length - + this.runCallback() + this.updateCount(); setTimeout(() => { @@ -103,7 +104,6 @@ export class EventoaprovacaoStoreService { counts: this._counts }) - this.runCallback() }, 10) if(window['all-process-gabinete']) { diff --git a/src/function.scss b/src/function.scss index 412a6618e..b65367ab9 100644 --- a/src/function.scss +++ b/src/function.scss @@ -35,6 +35,7 @@ // convert px to rem @function rem($size) { + $size : $size+ ""; $remSize: math.div(to-number($size), 16); //Default font size on html is 16px; @return #{$remSize}rem; @@ -42,12 +43,14 @@ // convert px to em @function em($size) { + $size : $size+ ""; $remSize: math.div(to-number($size), 16); @return #{$remSize}em; } // convert pt to rem @function pt-rem($size) { + $size : $size+ ""; $pxSize: to-number($size) * 1.328147; $remSize: $pxSize / 16; @return #{$remSize}rem; @@ -55,6 +58,7 @@ // convert pt to em @function pt-em($size) { + $size : $size+ ""; $pxSize: to-number($size) * 1.328147; $remSize: $pxSize / 16; @return #{$remSize}em; diff --git a/version/git-version.ts b/version/git-version.ts index e9f368c57..c49c2ff6e 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "d96b5cfac", - "SHA": "d96b5cfacdf71129b3523da630c89049c67701d9", + "shortSHA": "02725cd36", + "SHA": "02725cd368ca72aa27e9399dd85c0423502192e5", "branch": "developer-catch-merge", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Sat Jul 15 11:39:30 2023 +0100'", + "lastCommitTime": "'Sat Jul 15 11:41:06 2023 +0100'", "lastCommitMessage": "merge", - "lastCommitNumber": "5080", + "lastCommitNumber": "5081", "change": "", - "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/shared/agenda/view-event/view-event.page.html", + "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/modals/set-room-owner/set-room-owner.page.html\n\tmodified: src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html\n\tmodified: src/app/pages/chat/messages/contacts/contacts.page.html\n\tmodified: src/app/pages/chat/new-group/contacts/contacts.page.html\n\tmodified: src/app/pages/events/attendees/attendees.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.scss\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tdeleted: src/app/pages/publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/services/events/attendees/attendees.page.html\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.html\n\tmodified: src/app/shared/chat/new-group/contacts/contacts.page.html\n\tmodified: src/app/shared/event/attendee-modal/attendee-modal.page.html\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/store/eventoaprovacao-store.service.ts\n\tmodified: src/function.scss", "changeAuthor": "peter.maquiran" } \ No newline at end of file