This commit is contained in:
Peter Maquiran
2023-05-25 16:24:18 +01:00
parent 11d9e22f11
commit 483ce54ed9
12 changed files with 35 additions and 82 deletions
+4 -2
View File
@@ -23,9 +23,11 @@
<div class="conteiner-box pt-20 height-100">
<div class="main-content height-100">
<div class="box-container d-flex mx-20">
<div>
<div class="box-container d-flex mx-20" style="padding: 0px;overflow: hidden;">
<ion-progress-bar type="indeterminate" *ngIf="loadingAllTask"></ion-progress-bar>
<div class="px-20">
<p class="time ion-text-left ">{{customDate}}</p>
<div class="wrap d-flex float-left">
<div class="event-box pointer" (click)="goToAllTaskFilter('ForToDay')">
+8 -1
View File
@@ -66,6 +66,7 @@ export class EventsPage implements OnInit {
showAgendaLoader = false
showCorrespondenciasLoader = false
loadingAllTask = false
constructor(
private eventService: EventsService,
@@ -83,7 +84,13 @@ export class EventsPage implements OnInit {
public TaskService: TaskService
) {
this.TaskService.LoadTask()
(async () =>{
this.loadingAllTask = true
await this.TaskService.LoadTask()
this.loadingAllTask = false
})()
window['zipPhoneCallback'] = function (zipphone) {
@@ -4,7 +4,6 @@
[headerName] = environment.dispatchPR
[ordinance] = ordinance
[loading] = skeletonLoader
[loaderTop] = true
(reorderList) = reorderList($event)
(changeFilterName) = changeFilterName($event)
(goBack) = goBack()
@@ -8,7 +8,6 @@
[headerName] = "headerName"
[ordinance] = ordinance
[loading] = skeletonLoader
[loaderTop] = true
(reorderList) = reorderList($event)
(changeFilterName) = changeFilterName($event)
(goBack) = goBack()
@@ -21,8 +21,6 @@ import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatSelectModule } from '@angular/material/select';
import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
import { TaskListPageModule } from 'src/app/shared/gabinete-digital/generic/task-list/task-list.module'
@NgModule({
@@ -30,7 +28,7 @@ import { TaskListPageModule } from 'src/app/shared/gabinete-digital/generic/task
CommonModule,
FormsModule,
IonicModule,
TaskListPageModule,
// TaskListPageModule,
//
MatInputModule,
MatNativeDateModule,
@@ -110,13 +110,13 @@
</ion-list>
<div
*ngIf="!skeletonLoader && listToPresent.length == 0 && listToPresent.length == 0"
*ngIf="!skeletonLoader && list.length == 0 && list.length == 0"
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span>
</div>
<div *ngIf="skeletonLoader && listToPresent.length == 0">
<div *ngIf="skeletonLoader && list.length == 0">
<ion-list>
<ion-item>
@@ -26,7 +26,6 @@ export class ExpedientePage implements OnInit {
//profile:string;
showLoader: boolean;
taskslist = [];
serialNumber: string;
//expedienteGdStore = ExpedienteGdStore;
@@ -34,8 +33,6 @@ export class ExpedientePage implements OnInit {
expedienteTaskPipe = new ExpedienteTaskPipe()
onlinecheck: boolean;
listToPresent= []
showSearch = false
searchSubject = ''
list = []
@@ -123,25 +120,25 @@ export class ExpedientePage implements OnInit {
this.skeletonLoader = true
const result = res
this.taskslist = new Array();
let taskslist = new Array();
let ress = result.filter((data: any) => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active");
ress.forEach((element: any) => {
let task = this.expedienteTaskPipe.transform(element)
this.taskslist.push(task);
this.addProcessTODb(task);
taskslist.push(task);
// this.addProcessTODb(task);
});
this.taskslist = this.taskslist.filter(function(item) {
taskslist = taskslist.filter(function(item) {
return item.activityInstanceName != 'Retificar Expediente'
})
this.listToPresent = this.sortService.sortDate(this.taskslist, 'TaskStartDate').reverse()
this.expedientegbstore.reset(this.listToPresent);
this.expedientegbstore.reset(taskslist);
this.skeletonLoader = false;
}, (error) => {
this.getEventsFromLocalDb();
// this.getEventsFromLocalDb();
})
}
@@ -169,53 +166,4 @@ export class ExpedientePage implements OnInit {
this.router.navigate(['/home/gabinete-digital/expediente', serialNumber, 'gabinete-digital']);
}
addProcessTODb(task) {
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
this.storage.set('gabinete-expediente',task).then(() => {
})
} else {
this.sqliteservice.addProcess(task);
}
}
getEventsFromLocalDb() {
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
this.storage.get('gabinete-expediente').then((expediente) => {
this.listToPresent = expediente
})
} else {
this.taskslist = new Array();
this.sqliteservice.getprocessByworkflow("Expediente").then((expediente: any[]) => {
expediente.forEach((element) => {
var workflow = JSON.parse(element.workflowInstanceDataFields);
let exped = {
"CreateDate": element.taskStartDate,
"DocumentsQty": element.totalDocuments,
"Senders": workflow.Senders,
"SerialNumber": element.serialNumber,
"Status": workflow.Status,
"Subject": workflow.Subject,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName
}
this.taskslist.push(exped)
});
this.taskslist = this.taskslist.filter(function(item) {
return item.activityInstanceName != 'Retificar Expediente'
})
this.listToPresent = this.taskslist
})
}
}
}
@@ -5,7 +5,6 @@
[headerName] = "headerName"
[ordinance] = ordinance
[loading] = skeletonLoader
[loaderTop] = true
(reorderList) = reorderList($event)
(changeFilterName) = changeFilterName($event)
(goBack) = goBack()
@@ -13,7 +13,7 @@ import { ThemeService } from 'src/app/services/theme.service'
import { SortService } from 'src/app/services/functions/sort.service';
import { RouteService } from 'src/app/services/route.service';
import { SessionStore } from 'src/app/store/session.service';
import { TaskService } from 'src/app/services/task.service'
import { TaskService } from 'src/app/services/task.service';
@Component({
selector: 'app-expedientes-pr',
+5 -4
View File
@@ -851,7 +851,7 @@ export class EventsService {
let params = new HttpParams();
const now = new Date();
event.TimeZone = now.getTimezoneOffset().toString()
event.TimeZone = now.toString().match(/([A-Z]+[\+-][0-9]+.*)/)[1]
params = params.set("CalendarName", calendarName);
@@ -882,7 +882,7 @@ export class EventsService {
let params = new HttpParams();
const now = new Date();
event.TimeZone = now.getTimezoneOffset().toString()
event.TimeZone = now.toString().match(/([A-Z]+[\+-][0-9]+.*)/)[1]
params = params.set("CalendarName", calendarName);
@@ -914,8 +914,9 @@ export class EventsService {
const puturl = environment.apiURL + 'Calendar/PostEvent';
let params = new HttpParams();
const now = new Date()
event.TimeZone = now.getTimezoneOffset().toString()
const now = new Date();
event.TimeZone = now.toString().match(/([A-Z]+[\+-][0-9]+.*)/)[1];
params = params.set("CalendarName", calendarName);
+1 -1
View File
@@ -4,4 +4,4 @@ import { doneITDev } from './suport/doneIt'
import { DevDev } from './suport/dev'
export const environment: Environment = DevDev
export const environment: Environment = doneITDev
File diff suppressed because one or more lines are too long