diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 8a8506557..a7715062a 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -10,7 +10,6 @@ import { ThemeService } from 'src/app/services/theme.service'; import { environment } from 'src/environments/environment'; import { Storage } from '@ionic/storage'; import { ChatController } from './controller/chat'; -import { AngularFireMessaging } from '@angular/fire/messaging'; const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 8852ecf4e..0c34255ee 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -81,6 +81,10 @@ import { AngularFireModule } from '@angular/fire'; import { AngularFireMessagingModule } from '@angular/fire/messaging'; import { firebaseConfig } from '../firebase-config'; import { EditorModule } from '@tinymce/tinymce-angular'; +import { DeplomaOptionsPageModule } from './shared/popover/deploma-options/deploma-options.module'; +import { DiplomaOptionsPage } from './shared/popover/deploma-options/deploma-options.page'; +import { CreateProcessPageModule } from './modals/create-process/create-process.module'; +import { CreateProcessPage } from './modals/create-process/create-process.page'; // import { ServiceWorkerModule } from '@angular/service-worker'; // import { AngularFireModule } from '@angular/fire'; @@ -111,7 +115,6 @@ import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */ ); @NgModule({ declarations: [AppComponent], - entryComponents: [], imports: [BrowserModule, CommonModule, FormsModule, @@ -162,9 +165,16 @@ import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */ MatButtonModule, AngularFireModule.initializeApp(firebaseConfig), AngularFireMessagingModule, - EditorModule + EditorModule, + // options + DeplomaOptionsPageModule, + CreateProcessPageModule - ], + ], + entryComponents: [ + DiplomaOptionsPage, + CreateProcessPage + ], providers: [ { provide: MAT_DATE_LOCALE, useValue: 'pt' }, { diff --git a/src/app/modals/create-process/create-process.module.ts b/src/app/modals/create-process/create-process.module.ts index f3fb956c2..d8d36f30c 100644 --- a/src/app/modals/create-process/create-process.module.ts +++ b/src/app/modals/create-process/create-process.module.ts @@ -52,6 +52,8 @@ import { MatDialogModule } from '@angular/material/dialog'; ], declarations: [ CreateProcessPage - ] + ], + exports: [CreateProcessPage], + entryComponents: [CreateProcessPage] }) export class CreateProcessPageModule {} diff --git a/src/app/modals/group-icons/group-icons.page.ts b/src/app/modals/group-icons/group-icons.page.ts index 47d79442a..bbf609bd0 100644 --- a/src/app/modals/group-icons/group-icons.page.ts +++ b/src/app/modals/group-icons/group-icons.page.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { IonSlides, ModalController, NavParams } from '@ionic/angular'; +import { ModalController, NavParams } from '@ionic/angular'; import { PublicationsService } from 'src/app/services/publications.service'; @Component({ diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index f47d5a4b6..e2f364f8f 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -1,5 +1,5 @@ import { Component, ElementRef, OnInit, ViewChild, AfterViewInit, OnDestroy, ChangeDetectorRef, } from '@angular/core'; -import { IonSlides, ModalController, NavParams, PopoverController, Platform } from '@ionic/angular'; +import { ModalController, NavParams, PopoverController, Platform } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; import { ChatService } from 'src/app/services/chat.service'; import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page'; @@ -955,19 +955,6 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { } } - async touchEnd(zoomslides: IonSlides, card) { - // Zoom back to normal - const slider = await zoomslides.getSwiper(); - const zoom = slider.zoom; - zoom.out(); - - // Card back to normal - card.el.style['z-index'] = 9; - - this.zoomActive = false; - this.changeDetectorRef.detectChanges(); - } - touchStart(card) { // Make card appear above backdrop card.el.style['z-index'] = 11; diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts index b7f55352d..2d29142d4 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -199,6 +199,7 @@ export class DespachosPrPage implements OnInit { } this.skeletonLoader = false + this.dynamicSearch() } diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts index 6c6a2e3e1..267926471 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts @@ -4,7 +4,7 @@ import { ProcessesService } from 'src/app/services/processes.service'; import { momentG } from 'src/plugin/momentG'; import { ActivatedRoute } from '@angular/router'; -import { DeplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page'; +import { DiplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page'; import { ToastService } from 'src/app/services/toast.service'; import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; import { ThemeService } from 'src/app/services/theme.service' @@ -72,7 +72,7 @@ export class DiplomaAssinarPage implements OnInit { async openOptions(taskAction?: any) { const popover = await this.popoverController.create({ - component: DeplomaOptionsPage, + component: DiplomaOptionsPage, cssClass: 'exp-options', componentProps: { serialNumber: this.task.SerialNumber, diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts index b79504f23..fc78769e4 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts @@ -108,8 +108,8 @@ export class DiplomasAssinarPage implements OnInit { this.skeletonLoader = true try { - let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); - this.TaskService.loadDiplomas() + await this.TaskService.loadDiplomas() + this.dynamicSearch() } catch(error) { diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts index 3cbb41e12..673b277c8 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts @@ -124,7 +124,8 @@ export class DiplomasGerarPage implements OnInit { this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate'); this.deplomasStore.resetDiplomaGerar(this.diplomasList); - + + this.dynamicSearch() } catch(error) { } diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts index 131d10c5c..60b2c31f3 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts @@ -8,16 +8,22 @@ import { DiplomaPageRoutingModule } from './diploma-routing.module'; import { DiplomaPage } from './diploma.page'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; +import { DiplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - DiplomaPageRoutingModule, BtnModalDismissPageModule, ], - declarations: [DiplomaPage] + entryComponents: [ + DiplomaPage, + DiplomaOptionsPage + ], + declarations: [ + DiplomaPage, + ] }) export class DiplomaPageModule {} diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts index cafb67ca1..d2df013d2 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts @@ -7,7 +7,7 @@ import { momentG } from 'src/plugin/momentG'; import { ActivatedRoute } from '@angular/router'; import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page'; -import { DeplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page'; +import { DiplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page'; import { ToastService } from 'src/app/services/toast.service'; import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; @@ -86,7 +86,7 @@ export class DiplomaPage implements OnInit { async openOptions(taskAction?: any) { const popover = await this.popoverController.create({ - component: DeplomaOptionsPage, + component: DiplomaOptionsPage, cssClass: 'exp-options', componentProps: { serialNumber: this.serialNumber, diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts index 1890325b3..3712f9a03 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts @@ -166,6 +166,7 @@ export class DiplomasPage implements OnInit, OnDestroy { this.skeletonLoader = true await this.TaskService.loadDiplomas() + this.dynamicSearch() this.skeletonLoader = false } catch(error) { diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index ee65ae5f4..0b7cb3c87 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -117,7 +117,14 @@ export class ExpedientePage implements OnInit { LoadList() { this.processes.GetTaskListExpediente(false).subscribe(async res => { - this.TaskService.loadExpedientes() + + (async ()=> { + await this.TaskService.loadExpedientes() + this.dynamicSearch() + })() + + + this.skeletonLoader = true const result = res diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index 6679b7f24..98398943d 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -120,6 +120,8 @@ export class ExpedientesPrPage implements OnInit { this.expedienteGdStore.reset(this.taskslist); this.skeletonLoader = false + + this.dynamicSearch() }) } diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts index d2c962941..26e17cc2b 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts @@ -227,6 +227,8 @@ export class PedidosPage implements OnInit { } + this.dynamicSearch(); + }, (error) => { this.getFromDb() diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts index 742fc8ad0..983beb4f9 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts @@ -153,6 +153,7 @@ export class PendentesPage implements OnInit { }) this.skeletonLoader = false; + this.dynamicSearch() }, (error) => { if(error.status == 0) { diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts index 6e9a81ccc..bb64e0b61 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { customTask } from '../../../models/dailyworktask.model'; -import { NavigationEnd, NavigationStart, Router, } from '@angular/router'; +import { NavigationEnd, NavigationStart, Router } from '@angular/router'; import { DespachoService } from 'src/app/Rules/despacho.service'; import { TaskService } from 'src/app/services/task.service'; import { ThemeService } from 'src/app/services/theme.service' diff --git a/src/app/shared/popover/deploma-options/deploma-options-routing.module.ts b/src/app/shared/popover/deploma-options/deploma-options-routing.module.ts index 5d39a5173..3b1c53b2a 100644 --- a/src/app/shared/popover/deploma-options/deploma-options-routing.module.ts +++ b/src/app/shared/popover/deploma-options/deploma-options-routing.module.ts @@ -1,12 +1,12 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { DeplomaOptionsPage } from './deploma-options.page'; +import { DiplomaOptionsPage } from './deploma-options.page'; const routes: Routes = [ { path: '', - component: DeplomaOptionsPage + component: DiplomaOptionsPage } ]; diff --git a/src/app/shared/popover/deploma-options/deploma-options.module.ts b/src/app/shared/popover/deploma-options/deploma-options.module.ts index 320df16a2..e6866f35a 100644 --- a/src/app/shared/popover/deploma-options/deploma-options.module.ts +++ b/src/app/shared/popover/deploma-options/deploma-options.module.ts @@ -6,15 +6,25 @@ import { IonicModule } from '@ionic/angular'; import { DeplomaOptionsPageRoutingModule } from './deploma-options-routing.module'; -import { DeplomaOptionsPage } from './deploma-options.page'; +import { DiplomaOptionsPage } from './deploma-options.page'; +import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page'; +import { CreateProcessPageModule } from 'src/app/modals/create-process/create-process.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - DeplomaOptionsPageRoutingModule + DeplomaOptionsPageRoutingModule, + CreateProcessPageModule ], - declarations: [DeplomaOptionsPage] + declarations: [ + DiplomaOptionsPage, + ], + exports: [DiplomaOptionsPage], + entryComponents: [ + DiplomaOptionsPage, + CreateProcessPage + ] }) export class DeplomaOptionsPageModule {} diff --git a/src/app/shared/popover/deploma-options/deploma-options.page.ts b/src/app/shared/popover/deploma-options/deploma-options.page.ts index 46b66c2f1..8b9247dcc 100644 --- a/src/app/shared/popover/deploma-options/deploma-options.page.ts +++ b/src/app/shared/popover/deploma-options/deploma-options.page.ts @@ -18,7 +18,7 @@ import { TaskService } from 'src/app/services/task.service' templateUrl: './deploma-options.page.html', styleUrls: ['./deploma-options.page.scss'], }) -export class DeplomaOptionsPage implements OnInit { +export class DiplomaOptionsPage implements OnInit { serialNumber: string; @@ -325,8 +325,6 @@ export class DeplomaOptionsPage implements OnInit { this.openMenu(); */ } - }, (error) => { - console.log(error) }); } diff --git a/src/app/tiny-mce/tiny-mce.page.ts b/src/app/tiny-mce/tiny-mce.page.ts index f37af1593..585540c83 100644 --- a/src/app/tiny-mce/tiny-mce.page.ts +++ b/src/app/tiny-mce/tiny-mce.page.ts @@ -55,7 +55,7 @@ export class TinyMCEPage implements OnInit { - }) + },() => {}) } } diff --git a/version/git-version.ts b/version/git-version.ts index 81f324a57..f88725a53 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "c62c14c30", - "SHA": "c62c14c30b6a7f450adb780798f816cef8c1b877", + "shortSHA": "0f778d827", + "SHA": "0f778d82718a697989968b3ca212ca9cbcecba09", "branch": "developer-catch", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri Jul 14 10:19:33 2023 +0100'", + "lastCommitTime": "'Fri Jul 14 10:46:35 2023 +0100'", "lastCommitMessage": "add", - "lastCommitNumber": "5060", + "lastCommitNumber": "5061", "change": "", - "changeStatus": "On branch developer-catch\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified: version/git-version.ts", + "changeStatus": "On branch developer-catch\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/app.component.ts\n\tmodified: src/app/app.module.ts\n\tmodified: src/app/modals/create-process/create-process.module.ts\n\tmodified: src/app/modals/group-icons/group-icons.page.ts\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/shared/popover/deploma-options/deploma-options-routing.module.ts\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.module.ts\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.ts\n\tmodified: src/app/tiny-mce/tiny-mce.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file