-
-
+
+ +

{{customDate}}

diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 9e388f070..1fe5b49d5 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -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) { diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html index 654cc73aa..94e6676e0 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -4,7 +4,6 @@ [headerName] = environment.dispatchPR [ordinance] = ordinance [loading] = skeletonLoader - [loaderTop] = true (reorderList) = reorderList($event) (changeFilterName) = changeFilterName($event) (goBack) = goBack() diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html index 79a73b37a..0d8ed6918 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html @@ -8,7 +8,6 @@ [headerName] = "headerName" [ordinance] = ordinance [loading] = skeletonLoader - [loaderTop] = true (reorderList) = reorderList($event) (changeFilterName) = changeFilterName($event) (goBack) = goBack() diff --git a/src/app/pages/gabinete-digital/expediente/expediente.module.ts b/src/app/pages/gabinete-digital/expediente/expediente.module.ts index 2b01007de..3895d1939 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.module.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.module.ts @@ -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, diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html index 912fe57ed..a64246c97 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -110,13 +110,13 @@
Lista vazia
-
+
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index 0371ef326..2f66821ce 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -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 - - }) - } - } - } diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html index 3881541d5..23b8bfe83 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html @@ -5,7 +5,6 @@ [headerName] = "headerName" [ordinance] = ordinance [loading] = skeletonLoader - [loaderTop] = true (reorderList) = reorderList($event) (changeFilterName) = changeFilterName($event) (goBack) = goBack() 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 9d0a7c1bf..825db5219 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 @@ -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', diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 40cbca0e6..f8c55c1be 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -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); diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 16a865ce9..ee55c1414 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,4 +4,4 @@ import { doneITDev } from './suport/doneIt' import { DevDev } from './suport/dev' -export const environment: Environment = DevDev \ No newline at end of file +export const environment: Environment = doneITDev \ No newline at end of file diff --git a/version/git-version.ts b/version/git-version.ts index 2371f4409..c06202c4e 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "033a6c331", - "SHA": "033a6c331c21852d9e950fb47f44fd4f8f3d466a", + "shortSHA": "11d9e22f1", + "SHA": "11d9e22f11a17ba5a2e30a522bd98501ef71e33a", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue May 23 11:56:12 2023 +0100'", - "lastCommitMessage": "improve", - "lastCommitNumber": "4940", + "lastCommitTime": "'Wed May 24 14:26:54 2023 +0100'", + "lastCommitMessage": "add new features", + "lastCommitNumber": "4941", "change": "", - "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/app-routing.module.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.module.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.module.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.module.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.module.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.module.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.module.ts\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.html\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.scss\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified: src/app/pages/publications/publications.page.ts\n\tmodified: src/app/pipes/evento-approve.pipe.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.module.ts\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tdeleted: src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html\n\tdeleted: src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.scss\n\tdeleted: src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.module.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.module.ts\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.module.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.html\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\trenamed: src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients-routing.module.ts -> src/app/shared/gabinete-digital/generic/task-list-header/task-list-header-routing.module.ts\n\tnew file: src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.module.ts\n\tnew file: src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.html\n\tnew file: src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.scss\n\trenamed: src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.spec.ts -> src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.spec.ts\n\tnew file: src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.ts\n\tmodified: src/app/shared/gabinete-digital/generic/task-list/task-list.page.html\n\tmodified: src/app/shared/gabinete-digital/generic/task-list/task-list.page.ts\n\tnew file: src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header-routing.module.ts\n\trenamed: src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.module.ts -> src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header.module.ts\n\tnew file: src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header.page.html\n\tnew file: src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header.page.scss\n\tnew file: src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header.page.spec.ts\n\tnew file: src/app/shared/gabinete-digital/generic/task-listt-header/task-listt-header.page.ts\n\tmodified: src/environments/environment.ts", + "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.module.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/environments/environment.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file