From 6812e43958c64ad6ed0f86944995b90c08142a45 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 17 Jul 2023 11:29:37 +0100 Subject: [PATCH] fix chat --- .gitignore | 3 +- package.json | 2 +- src/app/domain/agenda/event.ts | 0 src/app/domain/process/DiplomaGenerate.ts | 51 --- src/app/domain/process/DiplomaSignPr.ts | 63 ---- src/app/domain/process/DiplomaToSign.ts | 83 ----- src/app/domain/process/DiplomasValidate.ts | 93 ------ src/app/domain/process/DispatchDomain.ts | 128 -------- src/app/domain/process/DispatchPrDomain.ts | 171 ---------- src/app/domain/process/Expediente.ts | 189 ----------- .../process/GenericBehaviorTaskActions.ts | 308 ------------------ .../domain/process/RequestsForDeferment.ts | 75 ----- src/app/domain/process/RequestsForOpinion.ts | 97 ------ src/app/pages/chat/messages/messages.page.ts | 16 +- version/git-version.ts | 12 +- 15 files changed, 19 insertions(+), 1272 deletions(-) delete mode 100644 src/app/domain/agenda/event.ts delete mode 100644 src/app/domain/process/DiplomaGenerate.ts delete mode 100644 src/app/domain/process/DiplomaSignPr.ts delete mode 100644 src/app/domain/process/DiplomaToSign.ts delete mode 100644 src/app/domain/process/DiplomasValidate.ts delete mode 100644 src/app/domain/process/DispatchDomain.ts delete mode 100644 src/app/domain/process/DispatchPrDomain.ts delete mode 100644 src/app/domain/process/Expediente.ts delete mode 100644 src/app/domain/process/GenericBehaviorTaskActions.ts delete mode 100644 src/app/domain/process/RequestsForDeferment.ts delete mode 100644 src/app/domain/process/RequestsForOpinion.ts diff --git a/.gitignore b/.gitignore index 373b61264..5ba2467e5 100644 --- a/.gitignore +++ b/.gitignore @@ -93,4 +93,5 @@ src/app/pipes/process.service.spec.ts src/app/pipes/process.service.ts /.angular -./.angular \ No newline at end of file +./.angular +src/app/domain \ No newline at end of file diff --git a/package.json b/package.json index fe48ba065..7203119ff 100644 --- a/package.json +++ b/package.json @@ -293,4 +293,4 @@ "url": "git+https://Kayaya@bitbucket.org/equilibriumito/gabinete-digital.git" }, "license": "ISC" -} +} \ No newline at end of file diff --git a/src/app/domain/agenda/event.ts b/src/app/domain/agenda/event.ts deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/app/domain/process/DiplomaGenerate.ts b/src/app/domain/process/DiplomaGenerate.ts deleted file mode 100644 index 134420742..000000000 --- a/src/app/domain/process/DiplomaGenerate.ts +++ /dev/null @@ -1,51 +0,0 @@ -import { ProcessesService } from "src/app/services/processes.service"; -import { GenericBehaviorProcess } from "./GenericBehaviorTaskActions"; - -// check 1 -export class DiplomaGenerates { - - processes: ProcessesService - - /** - * @activityInstanceName 'All' - * @returns - */ - async SendDiploma({note = '', docs = [], serialnumber}) { - let body = { - "serialNumber": serialnumber, - "action": "Enviar diploma", - "ActionTypeId": 104, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" : docs, - } - - return await this.processes.CompleteTask(body).toPromise(); - } - - /** - * @activityInstanceName 'All' - * @returns - */ - delegate(task: any, note, EmailAddress) { - return GenericBehaviorProcess.Delegate(task, note, EmailAddress) - } - - /** - * @activityInstanceName 'All' - * @returns - */ - async sendExpedienteToPending(serialnumber) { - - this.processes.SetTaskToPending(serialnumber).toPromise(); - - } - - /** - * need to work on - * @activityInstanceName 'All' - * @returns - */ - static async setUpMeeting() {} -} \ No newline at end of file diff --git a/src/app/domain/process/DiplomaSignPr.ts b/src/app/domain/process/DiplomaSignPr.ts deleted file mode 100644 index 47a7be220..000000000 --- a/src/app/domain/process/DiplomaSignPr.ts +++ /dev/null @@ -1,63 +0,0 @@ -import { AttachmentList } from "src/app/models/Excludetask"; -import { GenericBehaviorProcess } from "src/app/domain/process/GenericBehaviorTaskActions" -import { ProcessesService } from "src/app/services/processes.service"; -// check -export class DiplomasSignPrDomain { - - processes: ProcessesService - - /** - * @activityInstanceName 'Diploma Assinado' - * @description arquivar - * @param note - * @param documents - * @param serialNumber - * @returns - */ - async archive(note: string, documents: AttachmentList, serialNumber) { - - let body = { - "serialNumber": serialNumber, - "action": "Arquivo", - "ActionTypeId": 95, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - return this.processes.CompleteTask(body) - } - - /** - * @activityInstanceName 'Diploma Assinado', - * @description Concluir - * @param note - * @param documents - * @param serialNumber - * @returns - */ - async conclude(note: string, documents: any, serialNumber) { - - let body = { - "serialNumber": serialNumber, - "action": "Concluir", - "ActionTypeId": 95, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList": documents, - } - - return await this.processes.CompleteTask(body).toPromise(); - - } - - /** - * @activityInstanceName 'Diploma Assinado', - */ - static async PerformeDispatch(body) { - return GenericBehaviorProcess.PerformeDispatch(body) - } - -} \ No newline at end of file diff --git a/src/app/domain/process/DiplomaToSign.ts b/src/app/domain/process/DiplomaToSign.ts deleted file mode 100644 index b1f15d2a4..000000000 --- a/src/app/domain/process/DiplomaToSign.ts +++ /dev/null @@ -1,83 +0,0 @@ -import { AttachmentList } from "src/app/models/Excludetask"; -import { GenericBehaviorProcess } from "src/app/domain/process/GenericBehaviorTaskActions" -import { ProcessesService } from "src/app/services/processes.service"; - -// check -export class DiplomasSignPrDomain { - - - static processes: ProcessesService - - /** - * @description arquivar - * @param note - * @param documents - * @param serialNumber - * @returns - */ - static async archive(note: string, documents: AttachmentList, serialNumber) { - - let body = { - "serialNumber": serialNumber, - "action": "Arquivo", - "ActionTypeId": 95, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - return this.processes.CompleteTask(body).toPromise(); - - } - - /** - * @description Concluir - * @param note - * @param documents - * @param serialNumber - * @returns - */ - static async finish(note: string, documents: any, serialNumber) { - - let body = { - "serialNumber": serialNumber, - "action": "Concluir", - "ActionTypeId": 95, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList": documents, - } - - return await this.processes.CompleteTask(body).toPromise(); - - } - - /** - * @activityInstanceName - */ - static async PerformeDispatch(body) { - return GenericBehaviorProcess.PerformeDispatch(body)} - - - /** - * - * @param param0 - * @returns - */ - static async sign({note, documents, serialNumber, activityInstanceName}) { - let body = { - "serialNumber": serialNumber, - "action": "Assinado", - "ActionTypeId": 99999842, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - return this.processes.CompleteTask(body).toPromise(); - } - -} \ No newline at end of file diff --git a/src/app/domain/process/DiplomasValidate.ts b/src/app/domain/process/DiplomasValidate.ts deleted file mode 100644 index aa51dd99a..000000000 --- a/src/app/domain/process/DiplomasValidate.ts +++ /dev/null @@ -1,93 +0,0 @@ -import { AttachmentList } from "src/app/models/Excludetask" -import { GenericBehaviorProcess } from "src/app/domain/process/GenericBehaviorTaskActions" -import { ProcessesService } from "src/app/services/processes.service" - -// check -export class DiplomasValidate { - static processes: ProcessesService - static p: any - - /** - * @pt solicitar assinatura - * @activityInstanceName 'Revisar Diploma' - * @description Solicitar assinatura do Presidente - * @param note - * @param documents - * @param serialNumber - * @returns - */ - static async askSignature(note: string, documents: any, serialNumber) { - let body = { - "serialNumber": serialNumber, - "action": "Aprovar", - "ActionTypeId": 99999840, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList": documents, - } - - return await this.processes.CompleteTask(body).toPromise() - } - - /** - * @activityInstanceName 'Revisar Diploma', - * @description Solicitar alteração - * @param note - * @param documents - * @param serialNumber - * @returns - */ - static async askToChange(note: string, documents: any, serialNumber) { - let body = { - "serialNumber": serialNumber, - "action": "Retificar", - "ActionTypeId": 99999841, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList": documents, - } - - return await this.processes.CompleteTask(body).toPromise() - } - - - /** - * @activityInstanceName 'Revisar Diploma', 'Diploma Assinado', - * @description Arquivar - * @param note - * @param documents - * @param serialNumber - * @returns - */ - static async archive(note: string, documents: AttachmentList, serialNumber) { - - let body = { - "serialNumber": serialNumber, - "action": "Arquivo", - "ActionTypeId": 95, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - return this.processes.CompleteTask(body) - - } - - /** - * @activityInstanceName 'Revisar Diploma', 'Diploma Assinado', - */ - static async PerformeDispatch(body) { - return GenericBehaviorProcess.PerformeDispatch(body) - } - - /** - * need to work on - * @activityInstanceName 'Revisar Diploma' - */ - static async setUpMeeting() {} - -} \ No newline at end of file diff --git a/src/app/domain/process/DispatchDomain.ts b/src/app/domain/process/DispatchDomain.ts deleted file mode 100644 index 946a69524..000000000 --- a/src/app/domain/process/DispatchDomain.ts +++ /dev/null @@ -1,128 +0,0 @@ -import { ProcessesService } from "src/app/services/processes.service"; -import { GenericBehaviorProcess } from "src/app/domain/process/GenericBehaviorTaskActions" -import { task } from "src/app/models/ExpedientTaskModalPage"; - -function prohibited (a: any) { - return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) { - console.log("first(): called"); - }; -} - -function permited (a: any) { - return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) { - console.log("first(): called"); - }; -} - -export class DispatchDomain { - - static processes: ProcessesService - - /** - * @pt arquivar - * @activityInstanceName 'Concluir Despacho' - * @param note - * @param documents - * @param serialNumber - * @returns - */ - @prohibited({userRoleId:[], permission:[]}) - static async archive(note:string, documents:any, serialNumber) { - - let body = { - "serialNumber": serialNumber, - "action": "Arquivo", - "ActionTypeId": 95, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - return await this.processes.CompleteTask(body).toPromise() - } - - /** - * @pt executado - * @activityInstanceName 'Tarefa de Despacho', 'Reexecutar Despacho' - * @param note - * @param documents - * @param serialNumber - * @returns - * @emits finish proceses - */ - static async executed(note:string, documents:any, serialNumber) { - let body = { - "serialNumber": serialNumber, - "action": "Conhecimento", - "ActionTypeId": 104, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - return await this.processes.CompleteTask(body).toPromise() - } - - /** - * @pt reexecutar - * @activityInstanceName 'Concluir Despacho' - * @param note - * @param documents - * @param serialNumber - * @returns - */ - static async rerun(note:string, documents:any, serialNumber) { - let body = { - "serialNumber": serialNumber, - "action": "Reexecução", - "ActionTypeId": 100000010, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - return await this.processes.CompleteTask(body).toPromise() - - } - - /** - * @activityInstanceName 'Concluir Despacho', 'Reexecutar Despacho', 'Tarefa de Despacho' - * @param SerialNumber - */ - static async sendToPending(SerialNumber) { - this.processes.SetTaskToPending(SerialNumber).toPromise(); - } - - /** - * @pt pedido de parecer - * @activityInstanceName 'Reexecutar Despacho', 'Tarefa de Despacho' - */ - static async requestAppear() { - return GenericBehaviorProcess.RequestAppear(task, {}) - } - - /** - * @pt Efetuar Despacho - * @activityInstanceName 'Concluir Despacho', 'Reexecutar Despacho', 'Tarefa de Despacho' - */ - static async PerformeDispatch(body) { - return GenericBehaviorProcess.PerformeDispatch(body) - } - - /** - * @pt marcar reunião - * @activityInstanceName 'Concluir Despacho', 'Reexecutar Despacho', 'Tarefa de Despacho' - */ - static async setUpMeeting() {} - - /** - * @activityInstanceName 'Reexecutar Despacho' , 'Tarefa de Despacho' - */ - static async Delegar(task, note, taskParticipants) { - return GenericBehaviorProcess.Delegate(task, note, taskParticipants) - } - -} \ No newline at end of file diff --git a/src/app/domain/process/DispatchPrDomain.ts b/src/app/domain/process/DispatchPrDomain.ts deleted file mode 100644 index df0785c05..000000000 --- a/src/app/domain/process/DispatchPrDomain.ts +++ /dev/null @@ -1,171 +0,0 @@ -import { GenericBehaviorProcess } from "src/app/domain/process/GenericBehaviorTaskActions" -import { ProcessesService } from "src/app/services/processes.service" - -export class DispatchPrDomain { - static processes: ProcessesService - - /** - * @pt executado - * @activityInstanceName 'Tarefa de Despacho', - * @param note - * @param documents - * @param serialNumber - * @returns - */ - static async executed(note: string, documents: any, serialNumber) { - let body = { - "serialNumber": serialNumber, - "action": "Conhecimento", - "ActionTypeId": 104, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList": documents, - } - - return serialNumber - - } - - - /** - * @pt gerar diploma - * @activityInstanceName 'Tarefa de Despacho', - * @param note - * @param documents - * @param serialNumber - * @returns - */ - static async SendDiploma(note: string, documents: any, serialNumber) { - - let body = { - "serialNumber": serialNumber, - "action": "Reencaminhar", - "ActionTypeId": 99999839, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - - return await this.processes.CompleteTask(body).toPromise() - } - - /** - * @concluir - * @activityInstanceName 'Tarefa de Despacho', - * @param note - * @param documents - * @param serialNumber - * @returns - */ - static async Conclude(note: string, documents: any, serialNumber) { - let body = { - "serialNumber": serialNumber, - "action": "Executado", - "ActionTypeId": 104, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList": documents, - } - - return await this.processes.CompleteTask(body).toPromise() - - } - - /** - * @pt reexecutar - * @activityInstanceName 'Concluir Despacho', - * @param note - * @param documents - * @param serialNumber - * @returns - */ - static async Rerun(note: string, documents: any, serialNumber) { - let body = { - "serialNumber": serialNumber, - "action": "Reexecução", - "ActionTypeId": 100000010, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList": documents, - } - - return await this.processes.CompleteTask(body).toPromise() - - } - - /** - * @activityInstanceName 'Tarefa de Despacho', - * @param note - * @param documents - * @param serialNumber - * @returns - */ - static async RequestAppear(task, postData) { - return GenericBehaviorProcess.RequestAppear(task, {}) - } - - - /** - * @activityInstanceName 'Tarefa de Despacho', 'Concluir Despacho' - * @param note - * @param documents - * @param serialNumber - * @returns - */ - static async SetUpMeeting() {} - - - /** - * @activityInstanceName 'Concluir Despacho', 'Tarefa de Despacho', - */ - static async sendToPending(serialNumber) { - return GenericBehaviorProcess.SetTaskToPending(serialNumber) - } - - /** - * @pt Marcar como Concluido - * @activityInstanceName 'Concluir Despacho', - */ - static async MarkAsCompleted() { - let body = { - "serialNumber": 'serialNumber', - "action": "Executado", - "ActionTypeId": 104, - "dataFields": { - "ReviewUserComment": 'note', - }, - "AttachmentList": 'documents', - } - return await this.processes.CompleteTask(body).toPromise() - } - - - /** - * @pt Delegar - * @activityInstanceName 'Tarefa de Despacho' - * @param note - * @param documents - * @param serialNumber - * @returns - */ - static async Delegate(task: any, note, EmailAddress) { - return GenericBehaviorProcess.Delegate(task, note, EmailAddress) - } - - /** - * @pt Efetuar Despacho - * @activityInstanceName 'Tarefa de Despacho' - * @param note - * @param documents - * @param serialNumber - * @returns - */ - PerformeDispatch(body) { - return GenericBehaviorProcess.PerformeDispatch(body) - } -} \ No newline at end of file diff --git a/src/app/domain/process/Expediente.ts b/src/app/domain/process/Expediente.ts deleted file mode 100644 index d4a179f47..000000000 --- a/src/app/domain/process/Expediente.ts +++ /dev/null @@ -1,189 +0,0 @@ -import { ProcessesService } from "src/app/services/processes.service"; -import { GenericBehaviorProcess } from "./GenericBehaviorTaskActions"; - -export class Expediente { - - processes: ProcessesService - - /** - * @Pt Solicitar consideração superior, Aprovar - * @description - * @param note - * @param documents - * @param serialnumber - * @returns - * @Profile != PR - */ - async AskForSupeiorValidaiton(note:string, documents:any, serialnumber) { - let body = { - "serialNumber": serialnumber, - "action": "Aprovar", - "ActionTypeId": 100000004 , - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - - - return await this.processes.CompleteTask(body).toPromise(); - - } - - /** - * check - * @PT Submeter para revisão - * @activityInstanceName 'Concluir Despacho', 'Tarefa de Despacho', - */ - async SendToReview(note:string, documents:any, serialnumber) { - let body = { - "serialNumber": serialnumber, - "action": "Retificar", - "ActionTypeId": 99999877, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - - return await this.processes.CompleteTask(body).toPromise() - } - - /** - * check - * @pt Arquivar - * @activityInstanceName 'Concluir Despacho', 'Tarefa de Despacho', - */ - async Archive(SerialNumber) { - - let otherbody = { - "serialNumber": SerialNumber, - "action": "Passivo", - "ActionTypeId": 99999877, - "dataFields": { - "Note": "", - } - } - - return await this.processes.CompleteTask(otherbody).toPromise() - } - /** - * @pt Enviar para pendentes - * @Profile PR - * @activityInstanceName 'Concluir Despacho', 'Tarefa de Despacho', - */ - SendToPending(serialnumber) { - this.processes.SetTaskToPending(serialnumber) - } - - - /** - * @Profile PR - * @pt Pedido de parecer - */ - async RequestOpinion() { - const postData = { - DistributionType: "Paralelo", - CountryCode: 'AO', - Priority: 'this.postData.Priority', - UserEmail: 'this.loggeduser.Email', - UsersSelected: 'attendees', - DispatchFolder: 'this.dispatchFolder', - AttachmentList: 'docs' - } - - let ActionTypeId; - - if('this.loggeduser.Profile'.concat('') != 'PR') { - ActionTypeId = 92 - } else if ('this.loggeduser.Profile'.concat('') == 'PR' ) { - ActionTypeId = 99999881 - } - - let action_parecer = { - "serialNumber": 'this.task.serialNumber', - "action": "Tratado", - "ActionTypeId": ActionTypeId, - "dataFields": { - "Note": 'this.postData.DispatchFolder.Message', - } - } - - if('this.loggeduser.Profile'.concat('') != 'PR') { - let taskResult = await this.processes.postParecer(postData).toPromise(); - } else if ('this.loggeduser.Profile'.concat('') == 'PR' ) { - let taskResult = await this.processes.postParecerPr(postData).toPromise(); - } - - await this.processes.CompleteTask(action_parecer).toPromise(); - } - - /** - * @pt pedidod de deferimetno - */ - async defermentrequest() { - const postData = { - DistributionType: "Paralelo", - CountryCode: 'AO', - Priority: 'this.postData.Priority', - UserEmail: 'this.loggeduser.Email', - UsersSelected: 'attendees', - DispatchFolder: 'this.dispatchFolder', - AttachmentList: 'docs' - } - // - let action_deferimento = { - "serialNumber": 'this.task.serialNumber', - "action": "Tratado", - "ActionTypeId": 93, - "dataFields": { - "Note": 'this.postData.DispatchFolder.Message', - } - } - - await this.processes.postDeferimento(postData).toPromise(); - await this.processes.CompleteTask(action_deferimento).toPromise(); - - } - - /** - * @pt Anexar Documentos - */ - addAttachment() { - let body = { - "InstanceID": 'this.task.InstanceID', - "WorkflowDisplayName": 'this.task.WorkflowName', - "FolderID": 'this.task.FolderId', - "DispatchNumber": 'this.task.DispatchNumber', - "AttachmentsProcessLastInstanceID": 'this.task.AttachmentsProcessLastInstanceID', - "Attachments": [] - } - - // const Attachments = this.searchDocumentPipe.transformToAttachment(element) - // body.Attachments = Attachments; - - // await this.attachmentsService.AddAttachment(body).toPromise() - - } - - async PerformeDispatch(body) { - return await GenericBehaviorProcess.PerformeDispatch(body) - } - - static async requestAppear(task) { - return await GenericBehaviorProcess.RequestAppear(task, {}) - } - - static async ApplicationForDeferment(task) { - return await GenericBehaviorProcess.ApplicationForDeferment(task, [], [], {}, '', '') - } - - static async SetUpMeeting(task) { - return await GenericBehaviorProcess.SetUpMeeting(task, {}) - } - - - -} \ No newline at end of file diff --git a/src/app/domain/process/GenericBehaviorTaskActions.ts b/src/app/domain/process/GenericBehaviorTaskActions.ts deleted file mode 100644 index 2f4c8f90a..000000000 --- a/src/app/domain/process/GenericBehaviorTaskActions.ts +++ /dev/null @@ -1,308 +0,0 @@ -import { AttachmentList } from "src/app/models/Excludetask"; -import { ProcessesService } from "src/app/services/processes.service"; - - -export class GenericBehaviorProcess { - - static processes: ProcessesService - static p: any - - static async SetUpMeeting(task, createEventFromData) { - const eventBody = { - BodyType: '1', - Text: 'this.postData.Body.Text', - } - - // createEventFromData - const postData = { - EventId: '', - Subject: 'this.postData.Subject', - Body: 'this.eventBody', - Location: 'this.postData.Location', - CalendarId: '', - CalendarName: 'this.postData.CalendarName', - StartDate: 'this.dateStart', - EndDate: 'this.dateEnd', - EventType: 'Reunião', - Attendees: 'Attendees', - IsMeeting: false, - IsRecurring: false, - AppointmentState: 0, - TimeZone: 'UTC', - Organizer: null, - Category: 'Reunião', - HasAttachments: true, - EventRecurrence: { - Type: 'this.EventRecurrenceType', - LastOccurrence: 'this.Occurrence' - }, - } - - if(task.FsId == '8') { - - try { - // const CalendarId = this.selectedCalendarId() - // await this.calendarService.genericPostExpedientEvent(task.DocId, this.postData, "",task.SerialNumber, task.FsId, CalendarId).toPromise(); - - // this.modalController.dismiss(); - //this.httpErroHandle.httpsSucessMessagge('Marcar Reunião') - - } catch (error) { - // this.httpErroHandle.httpStatusHandle(error) - } - finally { - // loader.remove() - } - - - } - else if(task.FsId == '361') { - - try { - - // const CalendarId = this.selectedCalendarId() - // await this.calendarService.genericCreateTaskEvent(task.FolderID | task.FolderId, this.postData, "",task.SerialNumber, task.FsId, CalendarId).toPromise(); - - // this.close(); - // this.httpErroHandle.httpsSucessMessagge('Marcar Reunião') - - } catch (error) { - // this.httpErroHandle.httpStatusHandle(error) - } finally { - // loader.remove() - } - } - - } - - static async SetTaskToPending(serialNumber) { - return await this.processes.SetTaskToPending(serialNumber).toPromise() - } - - /** - * @description arquivar - * @param note - * @param documents - * @param serialNumber - * @returns - */ - static async Archive(note: string, documents: AttachmentList, serialNumber) { - - let body = { - "serialNumber": serialNumber, - "action": "Arquivo", - "ActionTypeId": 95, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - return this.processes.CompleteTask(body).toPromise(); - } - - /** - * @pt executado - * @activityInstanceName 'Tarefa de Despacho', 'Reexecutar Despacho' - * @param note - * @param documents - * @param serialNumber - * @returns - * @emits finish proceses - */ - static async Executed(note:string, documents:any, serialNumber) { - let body = { - "serialNumber": serialNumber, - "action": "Conhecimento", - "ActionTypeId": 104, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - return await this.processes.CompleteTask(body).toPromise() - } - - /** - * @pt reexecutar - * @activityInstanceName 'Concluir Despacho' - * @param note - * @param documents - * @param serialNumber - * @returns - */ - static async Rerun(note:string, documents:any, serialNumber) { - let body = { - "serialNumber": serialNumber, - "action": "Reexecução", - "ActionTypeId": 100000010, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - return await this.processes.CompleteTask(body).toPromise() - - } - - /** - * @activityInstanceName 'Diploma Assinado', - * @description Concluir - * @param note - * @param documents - * @param serialNumber - * @returns - */ - static async Conclude(note: string, documents: any, serialNumber) { - - let body = { - "serialNumber": serialNumber, - "action": "Concluir", - "ActionTypeId": 95, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList": documents, - } - - return await this.processes.CompleteTask(body).toPromise(); - - } - - - static async Delegate(task: any, note, EmailAddress) { - let body = { - "SerialNumber": task.SerialNumber, - "DispatchDocId": task.DocId, - "FolderID": task.FolderId || task.FolderID, - "Subject": task.Folio, - "Comment": note, - "DelegatedUserEmail": EmailAddress, - } - return await this.processes.DelegateTask(body).toPromise() - } - - - /** - * @activityInstanceName 'Revisar Diploma', 'Diploma Assinado', - */ - static async PerformeDispatch(body: any) { - - const postData = { - DistributionType: "Paralelo", - CountryCode: 'AO', - Priority: "this.postData.Priority", - UserEmail: "this.loggeduser.Email", - UsersSelected: "attendees", - DispatchFolder: "this.dispatchFolder", - AttachmentList: "docs" - } - - if(this.p.userRole(['PR'])) { - return this.processes.postDespatchoPr(postData).toPromise(); - } else { - return this.processes.postDespatcho(postData).toPromise(); - } - } - - static async RequestAppear(task, _postData) { - const postData = { - DistributionType: "Paralelo", - CountryCode: 'AO', - Priority: 'this.postData.Priority', - UserEmail: 'this.loggeduser.Email', - UsersSelected: 'attendees', - DispatchFolder: 'this.dispatchFolder', - AttachmentList: 'docs' - } - - if (task.activityInstanceName == 'Tarefa de Despacho' || task.activityInstanceName == 'Reexecutar Despacho') { - if(this.p.userRole(['PR'])) { - await this.processes.postParecerPr(postData).toPromise(); - } else { - await this.processes.postParecer(postData).toPromise(); - } - let body; - - if(task.activityInstanceName == 'Concluir Despacho' - || task.activityInstanceName == 'Concluir Parecer' - || task.activityInstanceName == 'Concluir Deferimento' - || task.activityInstanceName == 'Tarefa de Deferimento' - ) { - body = { - "serialNumber": task.serialNumber, - "action": "Parecer", - "ActionTypeId": 92, - "dataFields": { - "ReviewUserComment": 'note', - }, - "AttachmentList" :' documents', - } - - } - else { - body = { - "serialNumber": task.serialnumber, - "action": "Conhecimento", - "ActionTypeId": 92, - "dataFields": { - "ReviewUserComment": 'note', - }, - "AttachmentList" : 'documents', - } - - } - - return this.processes.CompleteTask(body).toPromise(); - - } else { - - if(this.p.userRole(['PR'])) { - await this.processes.postParecerPr(postData).toPromise(); - } else { - await this.processes.postParecer(postData).toPromise(); - } - - const body = { - "serialNumber": task.serialNumber, - "action": "Parecer", - "ActionTypeId": 92, // Pedido de parece - "dataFields": { - "ReviewUserComment": 'note', - }, - "AttachmentList" :null, - } - return this.processes.CompleteTask(body).toPromise(); - } - - } - - static async ApplicationForDeferment(task, attendees, docs, dispatchFolder, Email, Priority) { - const postData = { - DistributionType: "Paralelo", - CountryCode: 'AO', - Priority: Priority, - UserEmail: Email, - UsersSelected: attendees, - DispatchFolder: dispatchFolder, - AttachmentList: docs - } - - await this.processes.postDeferimento(postData).toPromise() - - const body = { - "serialNumber": task.serialNumber, - "action": "Deferimento", - "ActionTypeId": 93, // Pedido de deferimento - "dataFields": { - "ReviewUserComment": 'note', - }, - "AttachmentList" :null, - } - return this.processes.CompleteTask(body).toPromise(); - - } - -} \ No newline at end of file diff --git a/src/app/domain/process/RequestsForDeferment.ts b/src/app/domain/process/RequestsForDeferment.ts deleted file mode 100644 index c4ac5ae36..000000000 --- a/src/app/domain/process/RequestsForDeferment.ts +++ /dev/null @@ -1,75 +0,0 @@ -import { GenericBehaviorProcess } from "src/app/domain/process/GenericBehaviorTaskActions" -import { ProcessesService } from "src/app/services/processes.service" - -export class RequestForApproval { - static processes: ProcessesService - - /** - * @c 'Tarefa de Deferimento', 'Reapreciar Deferimento', 'Concluir Deferimento' - */ - static Archive(serialNumber, note, documents) { - let body = { - "serialNumber": serialNumber, - "action": "Arquivo", - "ActionTypeId": 95, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } - - return this.processes.CompleteTask(body) - } - - /** - * @activityInstanceName 'Tarefa de Deferimento', 'Reapreciar Deferimento', 'Concluir Deferimento' - */ - static async Delegate(task, serialNumber, note, EmailAddress) { - return GenericBehaviorProcess.Delegate(task, note, EmailAddress) - - } - /** - * @evactivityInstanceNameent 'Tarefa de Deferimento', 'Reapreciar Deferimento', 'Concluir Deferimento' - */ - static PerfomeceDispatch(body) { - return GenericBehaviorProcess.PerformeDispatch(body) - } - /** - * @activityInstanceName 'Tarefa de Deferimento', 'Reapreciar Deferimento', 'Concluir Deferimento' - */ - static SetUpMeeting(task) { - return GenericBehaviorProcess.SetUpMeeting(task, {}); - } - /** - * @activityInstanceName 'Tarefa de Deferimento', 'Concluir Deferimento', 'Reapreciar Deferimento' - */ - static SetTaskToPending(serialNumber) { - return GenericBehaviorProcess.SetTaskToPending(serialNumber) - } - /** - * @activityInstanceName 'Concluir Deferimento' - */ - static RequestAppear(task) { - return GenericBehaviorProcess.RequestAppear(task, {}) - } - - /** - * @pt Solicitar Reapreciação - * @activityInstanceName 'Concluir Deferimento' - */ - static RequestReview() { - let body = { - "serialNumber": 'this.serialnumber', - "action": "Reapreciação", - "ActionTypeId": 100000009, - "dataFields": { - "ReviewUserComment": 'note', - }, - "AttachmentList": 'documents', - } - - return this.processes.CompleteTask(body).toPromise() - } - - -} \ No newline at end of file diff --git a/src/app/domain/process/RequestsForOpinion.ts b/src/app/domain/process/RequestsForOpinion.ts deleted file mode 100644 index fa6de1486..000000000 --- a/src/app/domain/process/RequestsForOpinion.ts +++ /dev/null @@ -1,97 +0,0 @@ -import { GenericBehaviorProcess } from "src/app/domain/process/GenericBehaviorTaskActions" -import { ProcessesService } from "src/app/services/processes.service" - -export class RequestForOpinion { - static processes: ProcessesService - - /** - * @activityInstanceName 'Pedido de Parecer' - */ - static arquivar(serialNumber, note, documents) { - let body = { - "serialNumber": serialNumber, - "action": "Arquivo", - "ActionTypeId": 95, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" : documents, - } - - return this.processes.CompleteTask(body) - } - /** - * @activityInstanceName 'Pedido de Parecer' - */ - static EfetuarDespacho(body) { - return GenericBehaviorProcess.PerformeDispatch(body)} - /** - * @activityInstanceName 'Pedido de Parecer' - */ - static SolicitarParecer(task) { - return GenericBehaviorProcess.RequestAppear(task, {}) - } - /** - * @profile != PR - * @activityInstanceName 'Pedido de Parecer' - */ - static RequestsForDeferment(task) { - return GenericBehaviorProcess.RequestAppear(task, {}) - } - /** - * @activityInstanceName 'Pedido de Parecer' - */ - static setUpMeeting(){} - /** - * @activityInstanceName 'Pedido de Parecer' - */ - static SendToPeding(serialNumber){ - return GenericBehaviorProcess.SetTaskToPending(serialNumber) - } - - - /** - * @pt Dar O Meu Parecer - * @activityInstanceName 'Pedido de Parecer', 'Pedido de Parecer do Presidente' - */ - static async GiveMyOpinion(serialNumber, note, documents) { - let body = { - "serialNumber": serialNumber, - "action": "Registar", - "ActionTypeId": 104, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList": documents, - } - - return await this.processes.CompleteTask(body).toPromise(); - } - /** - * @activityInstanceName 'Pedido de Parecer', 'Pedido de Parecer do Presidente' - */ - static MarcarReuniao(task) { - return GenericBehaviorProcess.SetUpMeeting(task, {}) - } - /** - * @Profile PR - * @pt Reencaminhar - * @activityInstanceName 'Pedido de Parecer do Presidente' - */ - static async Reencaminhar(serialNumber, note, documents, attendees, FolderId) { - - let body = { - "usersSelected": attendees, - "serialNumber": serialNumber, - "action": "Reencaminhar", - "actionTypeId": 98, - "dataFields": { - "ReviewUserComment": note, - }, - "FolderId": FolderId, - "AttachmentList" : documents, - } - - return await this.processes.CompleteParecerPrTask(body).toPromise(); - } -} \ No newline at end of file diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index 10f82dfca..0f714e387 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -630,9 +630,11 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { source: CameraSource.Camera }); - const base64 = 'data:image/jpeg;base64,' + file.base64String + const imageBase64 = 'data:image/jpeg;base64,' + file.base64String + const blob = this.dataURItoBlob(imageBase64) + + console.log(imageBase64) - const blob = this.dataURItoBlob(base64) const formData = new FormData(); formData.append("blobFile", blob); @@ -648,9 +650,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { }], temporaryData: formData, attachmentsModelData: { - fileBase64: await this.fileService.blobToBase64(blob), + fileBase64: imageBase64, } - }) } @@ -747,9 +748,12 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { //const imageData = await this.fileToBase64Service.convert(file) // - const response = await fetch('data:image/jpeg;base64,' + file.base64String!); + const imageBase64 = 'data:image/jpeg;base64,' + file.base64String + const response = await fetch(imageBase64); const blob = await response.blob(); + console.log(imageBase64) + const formData = new FormData(); formData.append("blobFile", blob); @@ -765,7 +769,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { "title_link_download": false, }], attachmentsModelData: { - fileBase64: await this.fileService.blobToBase64(blob), + fileBase64: imageBase64, } }) diff --git a/version/git-version.ts b/version/git-version.ts index f4b903789..b96444f8b 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "1ef13da92", - "SHA": "1ef13da922d910963d222668e370b851875bb055", + "shortSHA": "289b2ecf0", + "SHA": "289b2ecf052a652f40371fba012307a3cf9dfafa", "branch": "developer-catch-merge", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Sun Jul 16 21:38:37 2023 +0100'", - "lastCommitMessage": "fix", - "lastCommitNumber": "5082", + "lastCommitTime": "'Sun Jul 16 22:17:34 2023 +0100'", + "lastCommitMessage": ".", + "lastCommitNumber": "5083", "change": "", - "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: version/git-version.ts", + "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: .gitignore\n\tmodified: package.json\n\tdeleted: src/app/domain/agenda/event.ts\n\tdeleted: src/app/domain/process/DiplomaGenerate.ts\n\tdeleted: src/app/domain/process/DiplomaSignPr.ts\n\tdeleted: src/app/domain/process/DiplomaToSign.ts\n\tdeleted: src/app/domain/process/DiplomasValidate.ts\n\tdeleted: src/app/domain/process/DispatchDomain.ts\n\tdeleted: src/app/domain/process/DispatchPrDomain.ts\n\tdeleted: src/app/domain/process/Expediente.ts\n\tdeleted: src/app/domain/process/GenericBehaviorTaskActions.ts\n\tdeleted: src/app/domain/process/RequestsForDeferment.ts\n\tdeleted: src/app/domain/process/RequestsForOpinion.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file