diff --git a/src/app/modals/view-document/view-document.page.ts b/src/app/modals/view-document/view-document.page.ts index d29d10acc..ea6bc4623 100644 --- a/src/app/modals/view-document/view-document.page.ts +++ b/src/app/modals/view-document/view-document.page.ts @@ -91,7 +91,8 @@ export class ViewDocumentPage implements OnInit { cssClass: 'model aside-modal search-submodal', componentProps: { fulltask: this.task, - task: this.task + task: this.task, + content: "" } }); await modal.present(); 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 cef783aa9..fece579b5 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -127,6 +127,9 @@ export class DespachoPage implements OnInit { "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) @@ -155,7 +158,7 @@ export class DespachoPage implements OnInit { "DeadlineType": res.workflowInstanceDataFields.DeadlineType, "activityInstanceName": res.activityInstanceName, "Status": res.workflowInstanceDataFields.Status, - "Deadline": res.deadline + "Deadline": res.deadline, } // this.updateProcessOnDB(res); @@ -165,7 +168,7 @@ export class DespachoPage implements OnInit { const mergedArray1 = []; const mergedArray2 = []; - + // Merge array1 with tag this.fulltask.Documents.forEach(element => { @@ -179,11 +182,14 @@ export class DespachoPage implements OnInit { "Sender": element.Sender, "SourceDocId": element.SourceDocId, "content": "", + "path": "", + "ownerId": "", + "status": "", } this.mergedArray.push(docObject); }); - console.log('All',this.mergedArray) + console.log('All', this.mergedArray) let thedate = new Date(this.task.CreateDate); this.customDate = this.days[thedate.getDay()] + ", " + thedate.getDate() + " de " + (this.months[thedate.getMonth()]); @@ -235,7 +241,7 @@ export class DespachoPage implements OnInit { async viewDocument(docId: string, Document, content) { - if(Document.content == "") { + if (Document.content == "") { const modal = await this.modalController.create({ component: ViewDocumentPage, componentProps: { @@ -266,7 +272,7 @@ export class DespachoPage implements OnInit { await modal.present(); } - + } diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index ff446513e..2812ba982 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -119,7 +119,7 @@ export class LoginPage implements OnInit { const loader = this.toastService.loading() let attempt = await this.authService.login(this.userattempt, {saveSession: false}) - await this.authService.loginContenteProduction(this.userattempt, {saveSession: false}) + await this.authService.loginContenteProduction(this.userattempt, {saveSession: true}) loader.remove() diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index e5f98d630..292c126cf 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -115,7 +115,7 @@ export class AuthService { try { response = await this.http.post(environment.apiURL + "UserAuthentication/LoginJwt", '', this.opts).toPromise(); - + console.log('JWT',response) if(saveSession) { /* this.SetSession(response, user) */ diff --git a/src/app/services/http-error-handle.service.ts b/src/app/services/http-error-handle.service.ts index 6be31e892..7d5a18a69 100644 --- a/src/app/services/http-error-handle.service.ts +++ b/src/app/services/http-error-handle.service.ts @@ -146,6 +146,12 @@ export class HttpErrorHandle { case 'Aprovar exp': this.toastService._successMessage('Expediente enviado!'); break; + case 'Draft Save': + this.toastService._successMessage('Rascunho salvo!'); + break; + case 'Draft Concluído': + this.toastService._successMessage('Documento Concluído!'); + break; default: this.toastService._successMessage('Processo efetuado!') diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index 97e1c59aa..e638aa1f3 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -11,6 +11,7 @@ import { fullTaskList } from '../models/dailyworktask.model'; import { ChangeProfileService } from './change-profile.service'; import { SessionStore } from '../store/session.service'; import { StorageService } from './storage.service'; +import { DocumentManagementStore } from '../store/documentManagement'; @Injectable({ providedIn: 'root' }) @@ -20,12 +21,14 @@ export class ProcessesService { loggeduser: LoginUserRespose; headers: HttpHeaders; headers2: HttpHeaders; + documentMangement = DocumentManagementStore; + constructor( private http: HttpClient, private changeProfileService: ChangeProfileService, - private storageSevice: StorageService + private storageSevice: StorageService, ) { this.loggeduser = SessionStore.user; @@ -42,12 +45,13 @@ export class ProcessesService { setHeader() { + this.headers = new HttpHeaders(); this.headers = this.headers.set('Authorization', this.loggeduser.BasicAuthKey); this.headers2 = new HttpHeaders(); - this.headers2 = this.headers2.set('Authorization',"bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1laWQiOiIyNjIiLCJ1bmlxdWVfbmFtZSI6IkdpbHNvbiBNYW51ZWwiLCJlbWFpbCI6ImdpbHNvbi5tYW51ZWxAZ2FiaW5ldGVkaWdpdGFsLmxvY2FsIiwicm9sZSI6IlNlY3JldMOhcmlvIEdlcmFsIiwiZ3JvdXBzaWQiOiJHYWJpbmV0ZSBkZSBUZWNub2xvZ2lhcyBkZSBJbmZvcm1hw6fDo28iLCJvcmdhbmljZW50aXR5aWREIjoiMTA2IiwibmJmIjoxNjg4NTg0NTYzLCJleHAiOjE3MjAxMjA1NjMsImlhdCI6MTY4ODU4NDU2MywiaXNzIjoiOGIxMzBhN2YwLWM3YjctNDdzMjMtOWE4ZC1kNTlhMDE5YWY3NDkiLCJhdWQiOiJkMjh3dzE0NTMtM2M2OC00MWFkLThiNmMtYTUzNDUzODNlMGMyIn0.QDCrQsCH59GQMoudZTHyCMwwHYVwz1mZkLTzvzAwh64" + this.headers2 = this.headers2.set('Authorization',"Bearer "+ this.documentMangement.session?.AuthorizationJwt ); } @@ -132,6 +136,9 @@ export class ProcessesService { } GetDraftByID(id:string): Observable { + + console.log('Instancia estas instanciar?',this.documentMangement.session?.AuthorizationJwt) + const geturl = environment.apiPCURL + `Documents/${id}`; let params = new HttpParams(); @@ -144,6 +151,19 @@ export class ProcessesService { return this.http.get(`${geturl}`, options); } + SaveDraftByID(id:string, object): Observable { + const geturl = environment.apiPCURL + `Documents/${id}`; + let params = new HttpParams(); + + /* params = params.set("serialNumber", serialnumber); */ + + let options = { + headers: this.headers2, + /* params: params */ + }; + return this.http.put(`${geturl}`, object, options); + } + SetTaskToPending(serialNumber:string): Observable{ const geturl = environment.apiURL + 'Tasks/SetTaskPending'; let params = new HttpParams(); diff --git a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html index f764fd430..a69b884f8 100644 --- a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html +++ b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html @@ -1,5 +1,5 @@ -
+
@@ -7,4 +7,9 @@
+
+ + + +
diff --git a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.ts b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.ts index d30c25b22..6e02c4f45 100644 --- a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.ts +++ b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.ts @@ -1,6 +1,9 @@ import { Component, OnInit } from '@angular/core'; -import { ModalController } from '@ionic/angular'; +import { ModalController, NavParams } from '@ionic/angular'; +import { error } from 'console'; import { PermissionService } from 'src/app/services/permission.service'; +import { ProcessesService} from 'src/app/services/processes.service'; +import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; @Component({ selector: 'app-event-details-documents-options', @@ -9,12 +12,23 @@ import { PermissionService } from 'src/app/services/permission.service'; }) export class EventDetailsDocumentsOptionsPage implements OnInit { + Document: any + content: any = ""; + constructor( public p: PermissionService, private modalController: ModalController, - ) {} + private navParams: NavParams, + private processService: ProcessesService, + private erroHandler: HttpErrorHandle + ) { + this.Document = this.navParams.get('Document') + this.content = this.navParams.get('content') + } - ngOnInit() {} + ngOnInit() { + console.log(this.content) + } close() { this.modalController.dismiss(); @@ -25,13 +39,51 @@ export class EventDetailsDocumentsOptionsPage implements OnInit { } async openBookMeetingModal() { - this.modalController.dismiss({component:'openBookMeetingModal', taskAction: ''}); + this.modalController.dismiss({ component: 'openBookMeetingModal', taskAction: '' }); } - async openExpedientActionsModal( taskAction: any) { - this.modalController.dismiss({component:'openExpedientActionsModal', taskAction}); + async openExpedientActionsModal(taskAction: any) { + this.modalController.dismiss({ component: 'openExpedientActionsModal', taskAction }); } - async distartExpedientModal(body:any) {} + async distartExpedientModal(body: any) { } + + save(document,content) { + console.log(document) + let objectDraft = { + "status": true, + "description": document.Assunto, + "content": content, + "path": document.path, + "ownerId": document.ownerId + } + this.processService.SaveDraftByID(document.DocId, objectDraft).subscribe((res) => [ + this.erroHandler.httpsSucessMessagge('Draft Save'), + this.modalController.dismiss() + ],(error) => { + this.erroHandler.httpStatusHandle(error) + }) + + this.modalController.dismiss(); } + + saveDraft(document, content) { + console.log(document) + let objectDraft = { + "status": false, + "description": document.Assunto, + "content": content, + "path": document.path, + "ownerId": document.ownerId + } + this.processService.SaveDraftByID(document.DocId, objectDraft).subscribe((res) => [ + this.erroHandler.httpsSucessMessagge('Draft Save'), + this.modalController.dismiss() + ],(error) => { + this.erroHandler.httpStatusHandle(error) + }) + + } + +} diff --git a/src/app/tiny-mce/tiny-mce.page.html b/src/app/tiny-mce/tiny-mce.page.html index 04bd5d71d..2c02770dd 100644 --- a/src/app/tiny-mce/tiny-mce.page.html +++ b/src/app/tiny-mce/tiny-mce.page.html @@ -33,7 +33,6 @@ apiKey="wr5dk69kive0qr9ig6y5spqvlj3a0tsiwnzdsexnz241k69p" alignleft aligncenter alignright alignjustify | \ bullist numlist outdent indent | removeformat | print | help' }" initialValue='{{content}}' - [(ngModel)]="editorContent" + [(ngModel)]="content" (onSaveContent)="somefunction()" -> - \ No newline at end of file +> \ No newline at end of file diff --git a/src/app/tiny-mce/tiny-mce.page.ts b/src/app/tiny-mce/tiny-mce.page.ts index eda8bd1df..2b388877f 100644 --- a/src/app/tiny-mce/tiny-mce.page.ts +++ b/src/app/tiny-mce/tiny-mce.page.ts @@ -11,10 +11,11 @@ export class TinyMCEPage implements OnInit { - title = '

Hello, World!

This is my HTML document.

'; + title = '

Just Testing with an image yoOH.

'; Document: any - content: any + content: string editorContent: string; + value: string; @@ -28,6 +29,7 @@ export class TinyMCEPage implements OnInit { } ngOnInit() { + this.value = "" } close() { @@ -35,7 +37,7 @@ export class TinyMCEPage implements OnInit { } somefunction() { - console.log(this.title) + console.log(this.content) } async openOptions() { @@ -43,8 +45,8 @@ export class TinyMCEPage implements OnInit { component: EventDetailsDocumentsOptionsPage, cssClass: 'model aside-modal search-submodal', componentProps: { - /* fulltask: this.task, - task: this.task */ + Document: this.Document, + content: this.content } }); await modal.present(); diff --git a/version/git-version.ts b/version/git-version.ts index 888cf850d..66e618d9c 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "10eaf2964", - "SHA": "10eaf29645ac3edb6e68e136c35178b087aa321e", + "shortSHA": "9676bab7e", + "SHA": "9676bab7eb0427cf26a4970ce8bd7d96deaf504b", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Jul 6 13:17:36 2023 +0100'", - "lastCommitMessage": "change class", - "lastCommitNumber": "5039", + "lastCommitTime": "'Thu Jul 6 13:35:11 2023 +0100'", + "lastCommitMessage": "main data of refresh", + "lastCommitNumber": "5040", "change": "", - "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/store/documentManagement.ts", - "changeAuthor": "peter.maquiran" + "changeStatus": "On branch feature/gabinete-search\nYour branch is up to date with 'origin/feature/gabinete-search'.\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/view-document/view-document.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/services/http-error-handle.service.ts\n\tmodified: src/app/services/processes.service.ts\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.ts\n\tmodified: src/app/tiny-mce/tiny-mce.page.html\n\tmodified: src/app/tiny-mce/tiny-mce.page.ts", + "changeAuthor": "eudes.inacio" } \ No newline at end of file