diff --git a/src/app/models/beast-orm-function.ts b/src/app/models/beast-orm-function.ts index d50e4fddd..273ce2628 100644 --- a/src/app/models/beast-orm-function.ts +++ b/src/app/models/beast-orm-function.ts @@ -41,7 +41,8 @@ export function SAVE({key, localStorage, instance, dataToSave}) { localStorage.setItem(newKey, cipherText) } else { - localStorage.setItem(prefix() + key, dataToSave) + const stringifyData = JSON.stringify(dataToSave) + localStorage.setItem(prefix() + key, stringifyData) } } diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html index 17cbfd6f8..30bba2131 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html @@ -66,10 +66,10 @@
Documentos Anexados
- + (click)="viewDocument(attachment.DocId, attachment, attachment.content)">

{{ attachment.Assunto }}

{{ attachment.DocNumber }}

{{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}

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 f649a05aa..da3ea24b4 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 @@ -21,6 +21,7 @@ import { RouteService } from 'src/app/services/route.service'; import { PermissionService } from 'src/app/services/permission.service'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; import { TaskService } from 'src/app/services/task.service' +import { TinyMCEPage } from 'src/app/tiny-mce/tiny-mce.page'; @Component({ selector: 'app-despacho-pr', @@ -41,6 +42,7 @@ export class DespachoPrPage implements OnInit { profile: string; intervenientes: any =[] cc: any = []; + mergedArray: any = []; constructor( private activateRoute: ActivatedRoute, @@ -121,6 +123,15 @@ export class DespachoPrPage implements OnInit { "TaskStartDate": res.taskStartDate } this.fulltask = res; + let stringDraft = res.workflowInstanceDataFields.DraftIds; + let split_stringDraft = stringDraft?.split(","); + + try { + this.getDraft(split_stringDraft); + } catch (error) { + console.log(error) + } + this.getDocumentPdf(this.fulltask.Documents) // this.updateProcessOnDB(res); // console.log('this.fulltask', this.fulltask) @@ -177,26 +188,40 @@ export class DespachoPrPage implements OnInit { } - async viewDocument(DocId: string, Document) { + async viewDocument(docId: string, Document, content) { - const modal = await this.modalController.create({ - component: ViewDocumentPage, - componentProps: { - trustedUrl: '', - file: { - title: Document.Assunto, - url: '', - title_link: '', + if (Document.content == "") { + const modal = await this.modalController.create({ + component: ViewDocumentPage, + componentProps: { + trustedUrl: '', + file: { + title: Document.Assunto, + url: '', + title_link: '', + }, + Document, + applicationId: Document.ApplicationId, + docId: Document.DocId || Document.SourceId, + folderId: this.task.FolderId, + task: this.fulltask }, - Document, - applicationId: Document.ApplicationId, - docId: Document.DocId || Document.SourceId, - folderId: this.task.FolderId, - task: this.fulltask - }, - cssClass: 'modal modal-desktop' - }); - await modal.present(); + cssClass: 'modal modal-desktop' + }); + await modal.present(); + } else { + const modal = await this.modalController.create({ + component: TinyMCEPage, + componentProps: { + Document, + content + }, + cssClass: 'modal modal-desktop' + }); + await modal.present(); + } + + } @@ -557,5 +582,49 @@ export class DespachoPrPage implements OnInit { } + getDocumentPdf(Documents: any) { + Documents.forEach(element => { + let docObject = { + "ApplicationId": element.ApplicationId, + "Assunto": element.Assunto, + "DocDate": element.DocDate, + "DocId": element.DocId, + "DocNumber": element.DocNumber, + "FolderId": element.FolderId, + "Sender": element.Sender, + "SourceDocId": element.SourceDocId, + "content": "", + "path": "", + "ownerId": "", + "status": "", + } + this.mergedArray.push(docObject); + }); + } + getDraft(split_stringDraft: string[]) { + split_stringDraft.forEach(element => { + console.log('List of ids', element) + this.processes.GetDraftByID(element).subscribe((resd) => { + let object = { + "ApplicationId": "", + "Assunto": resd.data.description, + "DocDate": "", + "DocId": resd.data.id, + "DocNumber": "", + "FolderId": "", + "Sender": "", + "SourceDocId": "", + "content": resd.data.content, + "path": resd.data.path, + "ownerId": resd.data.ownerId, + "status": resd.data.status, + } + this.mergedArray.push(object) + console.log('List of draff', resd) + }) + + }); + } + } diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index fece579b5..bf9b6c5ff 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -111,36 +111,13 @@ export class DespachoPage implements OnInit { this.TaskService.loadDiplomas(); let stringDraft = res.workflowInstanceDataFields.DraftIds; console.log('sring to array', stringDraft) - let split_stringDraft = stringDraft.split(","); - let listDrafts = [] - - split_stringDraft.forEach(element => { - console.log('List of ids', element) - this.processes.GetDraftByID(element).subscribe((resd) => { - let object = { - "ApplicationId": "", - "Assunto": resd.data.description, - "DocDate": "", - "DocId": resd.data.id, - "DocNumber": "", - "FolderId": "", - "Sender": "", - "SourceDocId": "", - "content": resd.data.content, - "path": resd.data.path, - "ownerId": resd.data.ownerId, - "status": resd.data.status, - } - this.mergedArray.push(object) - console.log('List of draff', resd) - }) - - }); - - - - + let split_stringDraft = stringDraft?.split(","); + try { + this.getDraft(split_stringDraft); + } catch (error) { + console.log(error) + } this.task = { "SerialNumber": res.serialNumber, @@ -164,31 +141,8 @@ export class DespachoPage implements OnInit { // this.updateProcessOnDB(res); this.fulltask = res; - console.log('Anexos', this.fulltask.Documents) - - const mergedArray1 = []; - const mergedArray2 = []; - - - // Merge array1 with tag - this.fulltask.Documents.forEach(element => { - let docObject = { - "ApplicationId": element.ApplicationId, - "Assunto": element.Assunto, - "DocDate": element.DocDate, - "DocId": element.DocId, - "DocNumber": element.DocNumber, - "FolderId": element.FolderId, - "Sender": element.Sender, - "SourceDocId": element.SourceDocId, - "content": "", - "path": "", - "ownerId": "", - "status": "", - } - this.mergedArray.push(docObject); - }); - + this.getDocumentPdf(this.fulltask.Documents) + console.log('All', this.mergedArray) let thedate = new Date(this.task.CreateDate); @@ -220,6 +174,49 @@ export class DespachoPage implements OnInit { } }); } + getDocumentPdf(Documents: any) { + Documents.forEach(element => { + let docObject = { + "ApplicationId": element.ApplicationId, + "Assunto": element.Assunto, + "DocDate": element.DocDate, + "DocId": element.DocId, + "DocNumber": element.DocNumber, + "FolderId": element.FolderId, + "Sender": element.Sender, + "SourceDocId": element.SourceDocId, + "content": "", + "path": "", + "ownerId": "", + "status": "", + } + this.mergedArray.push(docObject); + }); + } + getDraft(split_stringDraft: string[]) { + split_stringDraft.forEach(element => { + console.log('List of ids', element) + this.processes.GetDraftByID(element).subscribe((resd) => { + let object = { + "ApplicationId": "", + "Assunto": resd.data.description, + "DocDate": "", + "DocId": resd.data.id, + "DocNumber": "", + "FolderId": "", + "Sender": "", + "SourceDocId": "", + "content": resd.data.content, + "path": resd.data.path, + "ownerId": resd.data.ownerId, + "status": resd.data.status, + } + this.mergedArray.push(object) + console.log('List of draff', resd) + }) + + }); + } // updateProcessOnDB(res) { // if (this.platform.is('desktop') || this.platform.is('mobileweb')) { diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html index 69e9c050c..4da539873 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html @@ -66,11 +66,11 @@
Documentos Anexados
-

{{ attachment.Assunto }}

{{ attachment.DocNumber }}

diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts index cedc2a14c..09587631d 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts @@ -16,6 +16,7 @@ import { AttachmentList } from 'src/app/models/Excludetask'; import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page'; import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page'; import { TaskService } from 'src/app/services/task.service' +import { TinyMCEPage } from 'src/app/tiny-mce/tiny-mce.page'; @Component({ selector: 'app-diploma-assinar', @@ -35,6 +36,7 @@ export class DiplomaAssinarPage implements OnInit { attachments:any; customDate: any; caller:string; + mergedArray: any = []; constructor( private processes: ProcessesService, @@ -110,6 +112,15 @@ export class DiplomaAssinarPage implements OnInit { } this.fulltask = res; + let stringDraft = res.workflowInstanceDataFields.DraftIds; + let split_stringDraft = stringDraft?.split(","); + + try { + this.getDraft(split_stringDraft); + } catch (error) { + console.log(error) + } + this.getDocumentPdf(this.fulltask.Documents) let thedate = new Date(this.task.CreateDate); this.customDate = this.days[thedate.getDay()]+ ", " + thedate.getDate() +" de " + ( this.months[thedate.getMonth()]); @@ -139,26 +150,40 @@ export class DiplomaAssinarPage implements OnInit { } - async viewDocument(DocId:string, Document) { + async viewDocument(docId: string, Document, content) { - const modal = await this.modalController.create({ - component: ViewDocumentPage, - componentProps: { - trustedUrl: '', - file: { - title: Document.Assunto, - url: '', - title_link: '', + if (Document.content == "") { + const modal = await this.modalController.create({ + component: ViewDocumentPage, + componentProps: { + trustedUrl: '', + file: { + title: Document.Assunto, + url: '', + title_link: '', + }, + Document, + applicationId: Document.ApplicationId, + docId: Document.DocId || Document.SourceId, + folderId: this.task.FolderId, + task: this.fulltask }, - Document, - applicationId: Document.ApplicationId, - docId: Document.DocId || Document.SourceId, - folderId: this.task.FolderId, - task: this.fulltask - }, - cssClass: 'modal modal-desktop' - }); - await modal.present(); + cssClass: 'modal modal-desktop' + }); + await modal.present(); + } else { + const modal = await this.modalController.create({ + component: TinyMCEPage, + componentProps: { + Document, + content + }, + cssClass: 'modal modal-desktop' + }); + await modal.present(); + } + + } @@ -334,4 +359,48 @@ export class DiplomaAssinarPage implements OnInit { this.modalController.dismiss(); } + getDocumentPdf(Documents: any) { + Documents.forEach(element => { + let docObject = { + "ApplicationId": element.ApplicationId, + "Assunto": element.Assunto, + "DocDate": element.DocDate, + "DocId": element.DocId, + "DocNumber": element.DocNumber, + "FolderId": element.FolderId, + "Sender": element.Sender, + "SourceDocId": element.SourceDocId, + "content": "", + "path": "", + "ownerId": "", + "status": "", + } + this.mergedArray.push(docObject); + }); + } + getDraft(split_stringDraft: string[]) { + split_stringDraft.forEach(element => { + console.log('List of ids', element) + this.processes.GetDraftByID(element).subscribe((resd) => { + let object = { + "ApplicationId": "", + "Assunto": resd.data.description, + "DocDate": "", + "DocId": resd.data.id, + "DocNumber": "", + "FolderId": "", + "Sender": "", + "SourceDocId": "", + "content": resd.data.content, + "path": resd.data.path, + "ownerId": resd.data.ownerId, + "status": resd.data.status, + } + this.mergedArray.push(object) + console.log('List of draff', resd) + }) + + }); + } + } diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html index e8e1f6027..74c16bc27 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html @@ -8,7 +8,7 @@
-
+
{{ task.Folio}}
@@ -64,11 +64,11 @@
Documentos Anexados
- + (click)="viewDocument(attachment.DocId, attachment, attachment.content)">

{{ attachment.Assunto }}

{{ attachment.DocNumber }}

{{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}

diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts index 5d730d106..846876982 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts @@ -20,6 +20,7 @@ import { DespachoService } from 'src/app/Rules/despacho.service' import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page'; import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page'; import { TaskService } from 'src/app/services/task.service' +import { TinyMCEPage } from 'src/app/tiny-mce/tiny-mce.page'; @Component({ @@ -40,7 +41,8 @@ export class DiplomaPage implements OnInit { intervenientes: any = [] cc: any = []; attachments: any; - customDate: any + customDate: any; + mergedArray: any = []; constructor( private processes: ProcessesService, @@ -120,7 +122,17 @@ export class DiplomaPage implements OnInit { "activityInstanceName": res.activityInstanceName, } this.fulltask = res; + console.log('Diploma anexo',this.fulltask.Documents ) // this.updateProcessOnDB(res) + let stringDraft = res.workflowInstanceDataFields.DraftIds; + let split_stringDraft = stringDraft?.split(","); + + try { + this.getDraft(split_stringDraft); + } catch (error) { + console.log(error) + } + this.getDocumentPdf(this.fulltask.Documents) let thedate = new Date(this.task.CreateDate); this.customDate = this.days[thedate.getDay()] + ", " + thedate.getDate() + " de " + (this.months[thedate.getMonth()]); @@ -170,8 +182,9 @@ export class DiplomaPage implements OnInit { } - async viewDocument(DocId: string, Document) { + async viewDocument(DocId: string, Document, content) { + if (Document.content == "") { const modal = await this.modalController.create({ component: ViewDocumentPage, componentProps: { @@ -190,6 +203,17 @@ export class DiplomaPage implements OnInit { cssClass: 'modal modal-desktop' }); await modal.present(); + } else { + const modal = await this.modalController.create({ + component: TinyMCEPage, + componentProps: { + Document, + content + }, + cssClass: 'modal modal-desktop' + }); + await modal.present(); + } } @@ -446,5 +470,49 @@ export class DiplomaPage implements OnInit { }); } + getDocumentPdf(Documents: any) { + Documents.forEach(element => { + let docObject = { + "ApplicationId": element.ApplicationId, + "Assunto": element.Assunto, + "DocDate": element.DocDate, + "DocId": element.DocId, + "DocNumber": element.DocNumber, + "FolderId": element.FolderId, + "Sender": element.Sender, + "SourceDocId": element.SourceDocId, + "content": "", + "path": "", + "ownerId": "", + "status": "", + } + this.mergedArray.push(docObject); + }); + } + getDraft(split_stringDraft: string[]) { + split_stringDraft.forEach(element => { + console.log('List of ids', element) + this.processes.GetDraftByID(element).subscribe((resd) => { + let object = { + "ApplicationId": "", + "Assunto": resd.data.description, + "DocDate": "", + "DocId": resd.data.id, + "DocNumber": "", + "FolderId": "", + "Sender": "", + "SourceDocId": "", + "content": resd.data.content, + "path": resd.data.path, + "ownerId": resd.data.ownerId, + "status": resd.data.status, + } + this.mergedArray.push(object) + console.log('List of draff', resd) + }) + + }); + } + } diff --git a/src/app/store/documentManagement.ts b/src/app/store/documentManagement.ts index 90347baed..2db3d75a5 100644 --- a/src/app/store/documentManagement.ts +++ b/src/app/store/documentManagement.ts @@ -17,7 +17,7 @@ export class CPSession extends models.LocalStorage { } // content production -models.migrate({ +models.migrate({ databaseName:'content-production', type: 'localStorage', version: 1, diff --git a/src/app/tiny-mce/tiny-mce.page.html b/src/app/tiny-mce/tiny-mce.page.html index 2c02770dd..528614cd6 100644 --- a/src/app/tiny-mce/tiny-mce.page.html +++ b/src/app/tiny-mce/tiny-mce.page.html @@ -1,4 +1,4 @@ - +
@@ -15,7 +15,7 @@
- +
...\" to unstage)\n\tmodified: src/app/services/processes.service.ts", + "changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 3 and 3 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/models/beast-orm-function.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/store/documentManagement.ts\n\tmodified: src/app/tiny-mce/tiny-mce.page.html\n\tmodified: src/app/tiny-mce/tiny-mce.page.ts\n\tmodified: src/global.scss", "changeAuthor": "eudes.inacio" } \ No newline at end of file