From 4174471f39d2c0194f35896e2564d6c9d745a601 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 18 Oct 2021 16:20:51 +0100 Subject: [PATCH 1/4] Fix --- .../document-detail/document-detail.page.ts | 42 ++++--------------- .../document-set-up-meeting.page.ts | 1 - .../despacho-pr/despacho-pr.page.ts | 2 + .../expedient-task-modal.page.ts | 3 ++ 4 files changed, 14 insertions(+), 34 deletions(-) diff --git a/src/app/modals/document-detail/document-detail.page.ts b/src/app/modals/document-detail/document-detail.page.ts index 047a19fdc..0efb39141 100644 --- a/src/app/modals/document-detail/document-detail.page.ts +++ b/src/app/modals/document-detail/document-detail.page.ts @@ -72,33 +72,9 @@ export class DocumentDetailPage implements OnInit { let folder: SearchFolderDetails = this.LoadedDocument if(this.LoadedDocument.ApplicationID == 361 || this.LoadedDocument.ApplicationId == 361) { - // task = { - // serialNumber: folder.DispatchNumber, - // taskStartDate: folder.DateDispatch, - // isEvent: true, - // workflowInstanceDataFields: { - // FolderID: folder['FolderId'] || folder['FolderID'] || folder.folderId, - // Subject: folder.Assunto, - // SourceSecFsID: folder.ApplicationID || folder['ApplicationId'], - // SourceType: 'FOLDER', - // SourceID: folder.folderId, - // DispatchNumber: folder.DispatchNumber - // }, - // } + } else if (document.ApplicationID == 8 || document.ApplicationId == 8) { - // task = { - // serialNumber: document.DocId, - // taskStartDate: document.DocDate, - // isEvent: true, - // workflowInstanceDataFields: { - // FolderID: null, - // Subject: document.Assunto, - // DispatchNumber: null, - // SourceSecFsID: document.ApplicationID || document.folderId, - // SourceType: 'DOC', - // SourceID: document.DocId, - // } - // } + } else { console.log('unexpected ApplicationID') } @@ -155,7 +131,7 @@ export class DocumentDetailPage implements OnInit { const selectedDoc = this.LoadedDocument.Documents[ this.dicIndex] - this.task = { + let task = { serialNumber: '', taskStartDate: '', isEvent: true, @@ -174,15 +150,15 @@ export class DocumentDetailPage implements OnInit { componentProps: { trustedUrl: '', file: { - title: this.task.workflowInstanceDataFields.Subject, + title: task.workflowInstanceDataFields.Subject, url: '', title_link: '', }, Document: this.LoadedDocument.Documents[ this.dicIndex], - applicationId: this.task.workflowInstanceDataFields.SourceSecFsID, - docId: this.task.workflowInstanceDataFields.SourceID , + applicationId: task.workflowInstanceDataFields.SourceSecFsID, + docId: task.workflowInstanceDataFields.SourceID , folderId: '', - task: this.task + task: task }, cssClass: 'modal modal-desktop' }); @@ -215,7 +191,7 @@ export class DocumentDetailPage implements OnInit { component: ExpedientTaskModalPage, componentProps: { taskAction: taskAction, - task: this.task, + task: this.DocumentTask, seachDocuments: this.LoadedDocument, aplicationId: this.LoadedDocument.ApplicationId || this.LoadedDocument.ApplicationID }, @@ -238,7 +214,7 @@ export class DocumentDetailPage implements OnInit { const modal = await this.modalController.create({ component: DocumentSetUpMeetingPage, componentProps: { - subject: this.task.workflowInstanceDataFields.Subject, + subject: this.LoadedDocument.Assunto, document: this.LoadedDocument, }, cssClass: classs, diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts index 74beab957..947058b71 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts @@ -184,7 +184,6 @@ export class DocumentSetUpMeetingPage implements OnInit { } else{ console.log(this.document); -alert('PARA') this.docs.push({ ApplicationId: this.document.ApplicationId || this.document.ApplicationType, Source: 1, diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts index 48104a7d7..f033435a5 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts @@ -109,6 +109,8 @@ export class DespachoPrPage implements OnInit { "activityInstanceName": res.activityInstanceName, } this.fulltask = res; + + console.log(this.task); console.log('GetTask', res); diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index bb6b2a947..9429153b1 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -110,6 +110,9 @@ export class ExpedientTaskModalPage implements OnInit { this.loggeduser = userAuth.ValidatedUser; this.task = this.navParams.get('task'); + + console.log('create dispatch with this data', this.task); + this.SearchFolder = this.navParams.get('SearchFolder'); this.aplicationId = this.navParams.get('aplicationId') From f14bd19bc1c81c5086e402d911ec638165323ce6 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 19 Oct 2021 14:38:49 +0100 Subject: [PATCH 2/4] Fix bug --- .gitignore | 3 ++- package-lock.json | 25 +++++++++++++++++++++---- package.json | 2 +- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index c3cc397fa..8e9cdb052 100644 --- a/.gitignore +++ b/.gitignore @@ -49,4 +49,5 @@ src/app/store/notification.service.spec.ts src/app/store/notification.service.ts -src/assets/www/pdfjs/web/compressed.tracemonkey-pldi-09.pdf.pdf \ No newline at end of file +src/assets/www/pdfjs/web/compressed.tracemonkey-pldi-09.pdf.pdf +node_modules_ \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index d1536dc0e..e7ef6064f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2304,14 +2304,31 @@ } }, "@ionic/angular": { - "version": "5.8.1", - "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.8.1.tgz", - "integrity": "sha512-VKgq71yPPyiS+wN8cyfTsVmp0EEamUAGaYq7lZuupnhZ+/8LNyo5Xp/kl8txtCnGFTNIDZpMpmI8+/7KnU8Zuw==", + "version": "5.8.4", + "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.8.4.tgz", + "integrity": "sha512-pvy7qOTVih3mqcyIV6C3BK8seeZOEoanRFw+Z5m+soXDcvgrouHBBAKzURu2RUx8uDZqlX38Pkn89ontvqIZUg==", "requires": { - "@ionic/core": "5.8.1", + "@ionic/core": "5.8.4", "tslib": "^1.9.3" }, "dependencies": { + "@ionic/core": { + "version": "5.8.4", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.8.4.tgz", + "integrity": "sha512-ioaH7wXAtexcpk23III0KArjSXStkpPrpZ5BCNkyter3EbOmDVd8XIXRcT86zRG68rbGI7Pd9GrugxeaDyMk/g==", + "requires": { + "@stencil/core": "^2.4.0", + "ionicons": "^5.5.3", + "tslib": "^2.1.0" + }, + "dependencies": { + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + } + } + }, "tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", diff --git a/package.json b/package.json index 30de89858..7a56af1fc 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "@ionic-native/sqlite-porter": "^4.20.0", "@ionic-native/status-bar": "^5.0.0", "@ionic-native/wheel-selector": "^5.31.1", - "@ionic/angular": "^5.5.4", + "@ionic/angular": "^5.8.4", "@ionic/core": "^5.8.1", "@ionic/pwa-elements": "^3.0.2", "@ionic/storage": "^2.3.1", From 9a07ceaf5ade89c6ef9cc89063a7a3cb55ed9a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Tue, 19 Oct 2021 15:06:14 +0100 Subject: [PATCH 3/4] if condition added to pedidos page to check platform for sqlite --- .../gabinete-digital/pedidos/pedidos.page.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts index b77c432f0..1195faae0 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts @@ -3,7 +3,7 @@ import { ActivatedRoute, NavigationStart, Router } from '@angular/router'; import { CalendarComponent } from 'ionic2-calendar'; import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model'; import { ProcessesService } from 'src/app/services/processes.service'; -import { ModalController, NavParams } from '@ionic/angular'; +import { ModalController, NavParams, Platform } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; import { PedidosStore } from 'src/app/store/pedidos-store.service'; import { ModalService } from 'src/app/services/modal.service'; @@ -48,7 +48,8 @@ export class PedidosPage implements OnInit { private modalService: ModalService, private sqliteservice: SqliteService, private sortService: SortService, - private backgroundservice: BackgroundService + private backgroundservice: BackgroundService, + private platform: Platform ) { //Inicializar segment this.segment = 'parecer'; @@ -158,7 +159,7 @@ export class PedidosPage implements OnInit { } this.parecerList.push(task); }); - this.sqliteservice.addProcess(this.parecerList); + this.addPedidoToDb(this.parecerList); this.listToPresentparecerList = this.sortService.sortArrayISODate(this.parecerList); } @@ -198,7 +199,7 @@ export class PedidosPage implements OnInit { } }); }); - this.sqliteservice.addProcess(this.deferimentoList); + this.addPedidoToDb(this.deferimentoList); this.listToPresentdeferimentoList = this.sortService.sortArrayISODate(this.deferimentoList); } @@ -209,6 +210,13 @@ export class PedidosPage implements OnInit { } + addPedidoToDb(pedido) { + if (this.platform.is('desktop') || this.platform.is('mobileweb')) { + } else { + this.sqliteservice.addProcess(pedido); + } + } + getFromDb() { let parecerlist = []; From a77fffe6f85a1e80138dd8451faa5127f3a46185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Tue, 19 Oct 2021 15:39:34 +0100 Subject: [PATCH 4/4] Bug on agenda page fixed that prevent of showing the events --- src/app/pages/agenda/agenda.page.ts | 80 ++++++++++------------------- 1 file changed, 27 insertions(+), 53 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 68d481431..edaca3579 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -508,23 +508,7 @@ export class AgendaPage implements OnInit { this.CalendarStore.pushEvent(response, 'md'); console.log('CALENDAR STORE', this.CalendarStore.eventSource) - - let array = [] - response.forEach(element => { - let event = { - startTime: new Date(element.StartDate), - endTime: new Date(element.EndDate), - allDay: false, - event: element, - calendarName: element.CalendarName, - profile: "md", - id: element.EventId, - } - array.push(event) - }); - - this.listToPresent = array; - console.log('LIST TO PRESET', this.listToPresent) + this.trasnformData(response,'md'); this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) @@ -550,7 +534,7 @@ export class AgendaPage implements OnInit { this.CalendarStore.removeRange(startTime, endTime, 'pr') // calendar this.CalendarStore.pushEvent(response, 'pr'); - this.listToPresent = response; + this.trasnformData(response,'pr'); this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) @@ -576,23 +560,7 @@ export class AgendaPage implements OnInit { // startTime = 1, endTime = 31 this.CalendarStore.removeRange(startTime, endTime, 'pr') this.CalendarStore.pushEvent(response, 'pr'); - let array = [] - response.array.forEach(element => { - let event = { - startTime: new Date(element.StartDate), - endTime: new Date(element.EndDate), - allDay: false, - event: element, - calendarName: element.CalendarName, - profile: element.profile, - id: element.EventId, - } - array.push(event) - }); - - this.listToPresent = array; - - // this.CalendarStore.eventSource + this.trasnformData(response,'pr') this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) @@ -629,7 +597,7 @@ export class AgendaPage implements OnInit { // loop this.CalendarStore.pushEvent(eventsList, 'md'); - this.listToPresent = eventsList; + this.trasnformData(response,'md') this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) @@ -659,7 +627,7 @@ export class AgendaPage implements OnInit { /* this.CalendarStore.removeRange(startTime, endTime, 'pr') this.CalendarStore.pushEvent(eventsList, 'pr'); */ - this.listToPresent = eventsList; + this.trasnformData(response,'pr') this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) @@ -699,7 +667,7 @@ export class AgendaPage implements OnInit { this.CalendarStore.removeRange(startTime, endTime, 'pr') this.CalendarStore.pushEvent(eventsList, 'pr'); - this.listToPresent = eventsList; + this.trasnformData(eventsList,'pr') this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) @@ -726,6 +694,25 @@ export class AgendaPage implements OnInit { } } + trasnformData(response,profile) { + let array = [] + response.forEach(element => { + let event = { + startTime: new Date(element.StartDate), + endTime: new Date(element.EndDate), + allDay: false, + event: element, + calendarName: element.CalendarName, + profile: profile, + id: element.EventId, + } + array.push(event) + }); + + this.listToPresent = array; + console.log('LIST TO PRESET', this.listToPresent) + } + addEventToDB(response, profile) { if (this.platform.is('desktop') || this.platform.is('mobileweb')) { } else { @@ -756,20 +743,7 @@ export class AgendaPage implements OnInit { this.sqliteservice.getAllEvents().then((events: any[]) => { console.log('ALL EVENTS FROM DB', events) let eventArray = []; - events.forEach(element => { - let event = { - startTime: new Date(element.StartDate), - endTime: new Date(element.EndDate), - allDay: false, - event: element, - calendarName: element.CalendarName, - profile: element.Profile, - id: element.EventId, - } - eventArray.push(event); - }); - - this.listToPresent = eventArray + this.trasnformData(events,this.profile) this.updateEventListBox() this.myCal.update(); @@ -777,7 +751,7 @@ export class AgendaPage implements OnInit { this.showLoader = false; this.showTimeline = true; - + }) }