mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
improve
This commit is contained in:
@@ -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: {
|
||||
|
||||
+13
-3
@@ -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' },
|
||||
{
|
||||
|
||||
@@ -52,6 +52,8 @@ import { MatDialogModule } from '@angular/material/dialog';
|
||||
],
|
||||
declarations: [
|
||||
CreateProcessPage
|
||||
]
|
||||
],
|
||||
exports: [CreateProcessPage],
|
||||
entryComponents: [CreateProcessPage]
|
||||
})
|
||||
export class CreateProcessPageModule {}
|
||||
|
||||
@@ -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({
|
||||
|
||||
@@ -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()
|
||||
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -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) {
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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
|
||||
}
|
||||
];
|
||||
|
||||
|
||||
@@ -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 {}
|
||||
|
||||
@@ -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)
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ export class TinyMCEPage implements OnInit {
|
||||
|
||||
|
||||
|
||||
})
|
||||
},() => {})
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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 <file>...\" 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 <file>...\" 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"
|
||||
}
|
||||
Reference in New Issue
Block a user