From cdc55aa00c357032f96a6ea92d2bf5c84df1f850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Thu, 15 Feb 2024 11:25:19 +0100 Subject: [PATCH 1/3] bug creating action with begin date higher then end date solved --- .../shared/publication/new-action/new-action.page.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/shared/publication/new-action/new-action.page.ts b/src/app/shared/publication/new-action/new-action.page.ts index 68eedee4e..21cc28180 100644 --- a/src/app/shared/publication/new-action/new-action.page.ts +++ b/src/app/shared/publication/new-action/new-action.page.ts @@ -73,7 +73,7 @@ export class NewActionPage implements OnInit { } - get dateValid() { +/* get dateValid() { var validado: boolean; if (window.innerWidth <= 800) { @@ -86,6 +86,10 @@ export class NewActionPage implements OnInit { } else { return ['ok'] } + } */ + + get dateValid() { + return new Date(this.folder.DateBegin).getTime() < new Date(this.folder.DateBegin).getTime() ? 'ok': null } runValidation() { @@ -117,11 +121,7 @@ export class NewActionPage implements OnInit { this.injectValidation() this.runValidation() - if(this.Form.invalid) { - return false - } else { - - } + if(this.Form.invalid) return false From a70f1d8f4926b73d8188b28c367ca03aa10c4a82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Thu, 15 Feb 2024 11:35:49 +0100 Subject: [PATCH 2/3] Bug of encode revert to html solved --- src/app/pages/agenda/view-event/view-event.page.ts | 4 ++-- src/app/shared/agenda/view-event/view-event.page.ts | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) 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 5357b4d24..3fadb0eb5 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -215,9 +215,9 @@ export class ViewEventPage implements OnInit { if(this.CalendarId) { this.eventsService.genericGetEvent(this.eventId, this.CalendarId).subscribe(res => { - const div = document.createElement("div") + /* const div = document.createElement("div") div.innerHTML = res.Body.Text - res.Body.Text = div.innerText + res.Body.Text = div.innerText */ this.loadedEvent = res; this.setTimeZone() 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 0bcae5e4f..64cb68226 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -126,6 +126,7 @@ export class ViewEventPage implements OnInit { this.eventsService.getEvent(this.eventId).subscribe(res => { this.loadedEvent = res; + this.setTimeZone() this.today = new Date(res.StartDate); @@ -145,10 +146,11 @@ export class ViewEventPage implements OnInit { this.eventsService.genericGetEvent(this.eventId, this.CalendarId).subscribe(res => { - const div = document.createElement("div") + /* const div = document.createElement("div") div.innerHTML = res.Body.Text - res.Body.Text = div.innerText + res.Body.Text = div.innerText */ this.loadedEvent = res; + console.log('Event details',res) this.setTimeZone() this.today = new Date(res.StartDate); From f21d49dc3a640c6ff2edbf1a9afd388db15d7288 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 16 Feb 2024 10:41:12 +0100 Subject: [PATCH 3/3] create dispatch from attachment --- .../view-document/view-document.page.ts | 5 ++- .../expedient-task-modal.page.ts | 38 ++++++++++++++++--- 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/src/app/modals/view-document/view-document.page.ts b/src/app/modals/view-document/view-document.page.ts index c9fe527e3..5f32c03fd 100644 --- a/src/app/modals/view-document/view-document.page.ts +++ b/src/app/modals/view-document/view-document.page.ts @@ -172,7 +172,10 @@ export class ViewDocumentPage implements OnInit { taskAction: taskAction, // check task: this.task, // check document: this.Document, // nope - aplicationId: this.Document.ApplicationId || this.Document.ApplicationID // check + aplicationId: this.Document.ApplicationId || this.Document.ApplicationID, // check + applicationId: this.applicationId, + docId: this.docId, + createProcessFromFile: true, }, cssClass: classs, }); 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 99acd47cd..b28900f29 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 @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { ModalController, NavParams } from '@ionic/angular'; import { Despacho } from 'src/app/models/despacho.model'; @@ -27,6 +27,7 @@ import { PermissionService } from 'src/app/services/permission.service'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; import { RouteService } from 'src/app/services/route.service'; import { TaskService } from 'src/app/services/task.service' +import { z } from 'zod'; const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { @@ -41,6 +42,12 @@ const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { } +const createProcessFromFileSchema = z.object({ + applicationId: z.any(), + docId: z.any(), +}); + + @Component({ selector: 'app-expedient-task-modal', templateUrl: './expedient-task-modal.page.html', @@ -59,6 +66,8 @@ export class ExpedientTaskModalPage implements OnInit { taskType:string; task: task; aplicationId = null + docId!: string + createProcessFromFile: false taskParticipants: any = []; taskParticipantsCc: any = []; @@ -121,14 +130,31 @@ export class ExpedientTaskModalPage implements OnInit { this.loggeduser = SessionStore.user; this.task = this.navParams.get('task'); - - this.SearchFolder = this.navParams.get('SearchFolder'); - this.aplicationId = this.navParams.get('aplicationId') - this.document = this.navParams.get('document') + this.aplicationId = this.navParams.get('aplicationId') | this.navParams.get('applicationId') + this.docId = this.navParams.get('docId') + this.createProcessFromFile = this.navParams.get('createProcessFromFile') || false; + this.document = this.navParams.get('document'); this.taskType = this.navParams.get('taskAction'); + + if(this.createProcessFromFile) { + try { + createProcessFromFileSchema.parse({ + applicationId: this.aplicationId, + docId: this.docId + }); + + this.task.workflowInstanceDataFields.SourceSecFsID = this.aplicationId; //361 + this.task.workflowInstanceDataFields.SourceType = 'DOC'; //FOLDER + this.task.workflowInstanceDataFields.SourceID = this.docId; //FolderId + + } catch (error) { + console.error('Validation failed params, expediente-task-modal:', error.errors); + } + } + // try { // if(this.document) { // const doc: any = this.document @@ -475,7 +501,7 @@ export class ExpedientTaskModalPage implements OnInit { this.validateField = true; this.toastService._badRequest('Por favor selecione um assunto'); } */ - + /* } else{ this.validateField = true;