This commit is contained in:
Peter Maquiran
2023-07-14 18:57:07 +01:00
parent 0f778d8271
commit a61ee6c07e
22 changed files with 72 additions and 45 deletions
@@ -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;
@@ -199,6 +199,7 @@ export class DespachosPrPage implements OnInit {
}
this.skeletonLoader = false
this.dynamicSearch()
}
@@ -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,
@@ -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) {
@@ -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) {
}
@@ -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 {}
@@ -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,
@@ -166,6 +166,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
this.skeletonLoader = true
await this.TaskService.loadDiplomas()
this.dynamicSearch()
this.skeletonLoader = false
} catch(error) {
@@ -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
@@ -120,6 +120,8 @@ export class ExpedientesPrPage implements OnInit {
this.expedienteGdStore.reset(this.taskslist);
this.skeletonLoader = false
this.dynamicSearch()
})
}
@@ -227,6 +227,8 @@ export class PedidosPage implements OnInit {
}
this.dynamicSearch();
}, (error) => {
this.getFromDb()
@@ -153,6 +153,7 @@ export class PendentesPage implements OnInit {
})
this.skeletonLoader = false;
this.dynamicSearch()
}, (error) => {
if(error.status == 0) {