diff --git a/src/app/modals/document-detail/document-detail.page.ts b/src/app/modals/document-detail/document-detail.page.ts index 5201e2bae..a69824d57 100644 --- a/src/app/modals/document-detail/document-detail.page.ts +++ b/src/app/modals/document-detail/document-detail.page.ts @@ -70,10 +70,12 @@ export class DocumentDetailPage implements OnInit { taskStartDate: folder.DateDispatch, isEvent: true, workflowInstanceDataFields: { - FsId: folder.ApplicationID || folder.ApplicationId, FolderID: folder['FolderId'] || folder['FolderID'] || folder.folderId, - DocId: folder.DispatchNumber, // not used - Subject: folder.Assunto + Subject: folder.Assunto, + SourceSecFsID: folder.ApplicationID || folder['ApplicationId'], + SourceType: 'FOLDER', + SourceID: folder.folderId, + DispatchNumber: folder.DispatchNumber }, } } else if (document.ApplicationID == 8 || document.ApplicationId == 8) { @@ -82,10 +84,12 @@ export class DocumentDetailPage implements OnInit { taskStartDate: document.DocDate, isEvent: true, workflowInstanceDataFields: { - FsId: document.ApplicationID || document.ApplicationId, FolderID: null, - DocId: document.DocId || document['DocID'], - Subject: document.Assunto + Subject: document.Assunto, + DispatchNumber: null, + SourceSecFsID: document.ApplicationID || document.ApplicationId, + SourceType: 'DOC', + SourceID: document.DocId, } } } else { diff --git a/src/app/models/ExpedientTaskModalPage.ts b/src/app/models/ExpedientTaskModalPage.ts index 411693e89..2afe880ce 100644 --- a/src/app/models/ExpedientTaskModalPage.ts +++ b/src/app/models/ExpedientTaskModalPage.ts @@ -5,12 +5,12 @@ export class ExpedientTaskModalPageNavParamsTask { taskStartDate: string isEvent: boolean workflowInstanceDataFields: { - FsId: any, - FolderID: any, - DocId: any, - DocID?: any + FolderID: any, // folder Subject: string, - DispatchNumber?: any + DispatchNumber?: any, + SourceSecFsID: any, // aplication id + SourceType: 'DOC' | 'FOLDER', + SourceID: any // doc id } } diff --git a/src/app/models/dailyworktask.model.ts b/src/app/models/dailyworktask.model.ts index a927cf697..bba984a56 100644 --- a/src/app/models/dailyworktask.model.ts +++ b/src/app/models/dailyworktask.model.ts @@ -93,3 +93,24 @@ export class customTask { activityInstanceName : string Status : string } + + + + +export interface expedienteTask { + SerialNumber: string + Folio : string + Senders: string + CreateDate : string + DocumentURL : string + Note: any + FolderId : number | string + Remetente : string + DocId : number + FsId: any + WorkflowName : string + Status : string + DispatchNumber: any + AttachmentsProcessLastInstanceID: any + InstanceID: any +} \ No newline at end of file diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index 54091fbd3..602b61ae7 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -8,8 +8,6 @@ import { Event } from '../../../models/event.model'; import { EditEventPage } from '../edit-event/edit-event.page'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { ProcessesService } from 'src/app/services/processes.service'; -import { ExpedientTaskModalPage } from '../../gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page'; -import { BookMeetingModalPage } from '../../gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { ToastService } from 'src/app/services/toast.service'; @@ -207,9 +205,6 @@ export class ViewEventPage implements OnInit { async editEventDetail() { - console.log(this.caller); - - const modal = await this.modalController.create({ component: EditEventPage, componentProps: { diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts index 82da90c54..28aa74d78 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -190,51 +190,6 @@ export class DespachosPrPage implements OnInit { }); } - // old - async openExpedientActionsModal(taskAction: any, task: any) { - //this.modalController.dismiss(); - let classs; - if( window.innerWidth <= 800){ - classs = 'modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - - const doc = this.loadedAttachments[ this.dicIndex]; - - task = { - serialNumber: doc.SourceId, - taskStartDate: doc.CreateDate, - isEvent: true, - workflowInstanceDataFields: { - FsId: doc.ApplicationId, - FolderID: null, - DocId: doc.SourceId, - Subject: doc.SourceName - }, - } - - const modal = await this.modalController.create({ - component: ExpedientTaskModalPage, - componentProps: { - taskAction: taskAction, - task: task, - profile: this.profile, - }, - cssClass: classs, - }); - await modal.present(); - modal.onDidDismiss().then(res=>{ - console.log(res['data']); - if(res['data']=='openDiscart'){ - console.log('open discart'); - - // this.distartExpedientModal(); - - } - - }); - } async openBookMeetingModal(task: customFullTask) { 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 410e402d9..8fe5cb40c 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 @@ -125,26 +125,19 @@ export class ExpedientTaskModalPage implements OnInit { Nad: 30, Subject: '', Message: '', - SourceSecFsId: this.task.workflowInstanceDataFields.FsId, //361 - SourceType: 'DOC', //FOLDER - SourceId: this.task.workflowInstanceDataFields.DocID, //FolderId + SourceSecFsId: this.task.workflowInstanceDataFields.SourceSecFsID, //361 + SourceType: this.task.workflowInstanceDataFields.SourceType, //FOLDER + SourceId: this.task.workflowInstanceDataFields.SourceID, //FolderId DeadlineType: '', SubjectTypes: this.selectedTypes, NumberPDPP: this.task.workflowInstanceDataFields.DispatchNumber, }; + console.log('task 123123', this.task) + console.log('this.aplicationId', this.aplicationId) - if(this.aplicationId == 361) { - this.dispatchFolder.SourceType = 'FOLDER' - this.dispatchFolder.SourceId = this.task.workflowInstanceDataFields.FolderID - } else if(this.aplicationId == 8) { - this.dispatchFolder.SourceType = 'DOC' - this.dispatchFolder.SourceId = this.task.workflowInstanceDataFields.DocId - } - - - + this.postData.DispatchFolder = this.dispatchFolder; this.postData.UsersSelected = this.participants; /* By Default TypeDeadline should be 'Normal' */ @@ -152,6 +145,8 @@ export class ExpedientTaskModalPage implements OnInit { /* Initialize 'Subject' with the title of the expedient */ this.postData.DispatchFolder.Subject = this.task.workflowInstanceDataFields.Subject; this.profile = this.navParams.get('profile'); + + console.log(this.postData); } async setAdding(type: "intervenient" | "CC") { @@ -159,7 +154,7 @@ export class ExpedientTaskModalPage implements OnInit { } ngOnInit() { - console.log(this.postData); + this.taskDate = new Date(this.task.taskStartDate); if(!this.task.hasOwnProperty('isEvent')) { diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 30e702383..f28f11e24 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -20,6 +20,7 @@ import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; import { PermissionService } from 'src/app/OtherService/permission.service'; import { SearchDocumentPipe } from 'src/app/pipes/search-document.pipe'; import { ExpedientesService } from 'src/app/Rules/expedientes.service'; +import { expedienteTask } from 'src/app/models/dailyworktask.model'; @Component({ selector: 'app-expediente-detail', @@ -33,7 +34,7 @@ export class ExpedienteDetailPage implements OnInit { customDate:any; - task: any; + task: expedienteTask; fulltask: any; eventsList: Event[]; serialNumber: string; @@ -256,6 +257,7 @@ export class ExpedienteDetailPage implements OnInit { "AttachmentsProcessLastInstanceID": res.workflowInstanceDataFields.AttachmentsProcessLastInstanceID, "InstanceID": res.workflowInstanceDataFields.InstanceID } + this.fulltask = res; let thedate = new Date(this.task.CreateDate); diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts index 4546c2355..3781913e8 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts @@ -535,6 +535,7 @@ export class ExpedientePrPage implements OnInit { } async openOptions(taskAction?: any) { + const popover = await this.popoverController.create({ component: OptsExpedientePrPage, cssClass: 'exp-options', diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index 7a0f27203..dad7fcbc1 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { ModalController, NavParams } from '@ionic/angular'; import { SearchService } from "../../services/search.service"; import { SearchCategory } from "src/app/models/search-category"; -import { SearchDocument } from "src/app/models/search-document"; +import { FromSearchDocument, SearchDocument, SearchFolder } from "src/app/models/search-document"; import { formatDate } from '@angular/common'; import { SenderPage } from 'src/app/pages/search/sender/sender.page'; import { OrganicEntityPage } from 'src/app/pages/search/organic-entity/organic-entity.page'; @@ -11,6 +11,7 @@ import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; import { PublicationDetailPage } from '../publications/view-publications/publication-detail/publication-detail.page'; import { DocumentDetailPage } from 'src/app/modals/document-detail/document-detail.page'; import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page'; +import { task } from 'src/app/models/ExpedientTaskModalPage'; @@ -626,30 +627,34 @@ export class SearchPage implements OnInit { } - async openExpedientActionsModal(doc: any) { + // async openExpedientActionsModal(doc: SearchDocument) { - let customTask = { - serialNumber: doc.SourceId, - taskStartDate: doc.CreateDate, - isEvent: true, - workflowInstanceDataFields: { - FsId: doc.ApplicationId, - FolderID: null, - DocId: doc.SourceId, - Subject: doc.SourceName - }, - } + // let customTask: task = { + // serialNumber: doc.SourceId, + // taskStartDate: doc.CreateDate, + // isEvent: true, + // workflowInstanceDataFields: { + // FolderID: , + // Subject: , + // SourceSecFsID: , + // SourceType: , + // SourceID: , + // FolderID: null, + // DocId: doc.SourceId, + // Subject: doc.SourceName, + // }, + // } - const popover = await this.modalController.create({ - component: OptsExpedientePage, - cssClass: 'model aside-modal search-submodal', - componentProps: { - fulltask: customTask, - task: customTask - }, - //translucent: true - }); - return await popover.present(); - } + // const popover = await this.modalController.create({ + // component: OptsExpedientePage, + // cssClass: 'model aside-modal search-submodal', + // componentProps: { + // fulltask: customTask, + // task: customTask + // }, + // //translucent: true + // }); + // return await popover.present(); + // } } diff --git a/src/app/pipes/search-document.pipe.ts b/src/app/pipes/search-document.pipe.ts index 0a9474bd7..70d90666a 100644 --- a/src/app/pipes/search-document.pipe.ts +++ b/src/app/pipes/search-document.pipe.ts @@ -1,6 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { ExpedientTaskModalPageNavParamsTask } from '../models/ExpedientTaskModalPage'; -import { Attachments, FromSearchDocument, SearchDocument, SearchFolder } from '../models/search-document'; +import { Attachments, SearchDocument } from '../models/search-document'; @Pipe({ name: 'searchDocument' diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index e5b42f8a1..09e130f24 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -11,6 +11,7 @@ import { AlertController } from '@ionic/angular'; import { LocalstoreService } from '../store/localstore.service'; import { ToastService } from './toast.service'; import { UserStore } from 'src/app/store/user.service' +import { SHA1, SHA256, AES, enc } from 'crypto-js' @Injectable({ providedIn: 'root' @@ -50,6 +51,7 @@ export class AuthService { async login(user: UserForm): Promise { //user.BasicAuthKey = 'Basic ' + btoa(user.username + '@' + user.domainName + ':' + user.password); user.BasicAuthKey = 'Basic ' + btoa(user.username + ':' + user.password); //conversão em base64 das credenciais inseridas + console.log('Basic ' + btoa(user.username + ':' + SHA1(user.password).toString())); //conversão em base64 das credenciais inseridas const options = { headers: {'Authorization': user.BasicAuthKey }}; diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index 0f5f1690a..7694d8aba 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -175,7 +175,7 @@ export class ProcessesService { return this.http.post(`${geturl}`, body, options) } - UpdateTaskStatus(FolderId:string): Observable{ + UpdateTaskStatus(FolderId:any): Observable{ const geturl = environment.apiURL + 'Tasks/UpdateTaskStatus'; let params = new HttpParams(); diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts index bd179c573..a04ef85cf 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -1,5 +1,5 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; -import { AlertController, ModalController, NavParams, PopoverController } from '@ionic/angular'; +import { AlertController, ModalController, PopoverController } from '@ionic/angular'; import { Attachment } from 'src/app/models/attachment.model'; import { EventBody } from 'src/app/models/eventbody.model'; import { AttachmentsService } from 'src/app/services/attachments.service'; @@ -7,8 +7,6 @@ import { EventsService } from 'src/app/services/events.service'; import { Event } from 'src/app/models/event.model'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { ProcessesService } from 'src/app/services/processes.service'; -import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page'; -import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; import { OptsExpedientePage } from '../../popover/opts-expediente/opts-expediente.page'; import { ToastService } from 'src/app/services/toast.service'; import { EliminateEventPage } from 'src/app/modals/eliminate-event/eliminate-event.page'; diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts index 2e8d618a4..78c93aa72 100644 --- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts +++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts @@ -61,6 +61,10 @@ export class OptsExpedientePrPage implements OnInit { if(this.task.Status != 'Pending'){ this.showEnviarPendentes = true; } + + + console.log('OptsExpedientePrPage ---- ', this.task); + } ngOnInit() { @@ -271,7 +275,6 @@ export class OptsExpedientePrPage implements OnInit { task: task, profile: this.profile, fulltask: this.fulltask, - aplicationId: 361 }, cssClass: classs, }); diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts index 82401fab4..8216eac95 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { ModalController, NavParams, PopoverController } from '@ionic/angular'; import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; +import { customTask, expedienteTask, fullTask } from 'src/app/models/dailyworktask.model'; import { SearchDocument } from 'src/app/models/search-document'; import { PermissionService } from 'src/app/OtherService/permission.service'; import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; @@ -19,7 +20,8 @@ import { ToastService } from 'src/app/services/toast.service'; styleUrls: ['./opts-expediente.page.scss'], }) export class OptsExpedientePage implements OnInit { - task:any; + + task: expedienteTask fulltask: any; profile:string; caller:string; @@ -42,7 +44,7 @@ export class OptsExpedientePage implements OnInit { this.task = this.navParams.get('task'); this.fulltask = this.navParams.get('fulltask'); - if(this.task.Status != 'Pending'){ + if(this.task.Status != 'Pending') { this.showEnviarPendentes = true; } } @@ -214,7 +216,7 @@ export class OptsExpedientePage implements OnInit { async sendToReview(note:string, documents:any) { let body = { - "serialNumber": this.task.serialnumber || this.task.SerialNumber, + "serialNumber": this.task.SerialNumber, "action": "Retificar", "ActionTypeId": 99999877, "dataFields": { @@ -248,7 +250,7 @@ export class OptsExpedientePage implements OnInit { async approve(note:string, documents:any){ let body = { - "serialNumber": this.task.serialnumber || this.task.SerialNumber, + "serialNumber": this.task.SerialNumber, "action": "Aprovar", "ActionTypeId": 100000004 , "dataFields": { diff --git a/src/app/shared/popover/searched-document-options/searched-document-options.page.ts b/src/app/shared/popover/searched-document-options/searched-document-options.page.ts index dbdda1bc1..f8b237e14 100644 --- a/src/app/shared/popover/searched-document-options/searched-document-options.page.ts +++ b/src/app/shared/popover/searched-document-options/searched-document-options.page.ts @@ -1,12 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; import { ModalController, NavParams, PopoverController } from '@ionic/angular'; -import { DocumentSetUpMeetingPage } from 'src/app/modals/document-set-up-meeting/document-set-up-meeting.page'; -import { ExpedientTaskModalPageNavParamsTask } from 'src/app/models/ExpedientTaskModalPage'; import { PermissionService } from 'src/app/OtherService/permission.service'; -import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page'; -import { ProcessesService } from 'src/app/services/processes.service'; -import { ToastService } from 'src/app/services/toast.service'; @Component({ selector: 'app-searched-document-options',