From 2c28e37a4b09610c5e3ab7da7d1c887065ab91b6 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 23 Jun 2023 12:14:24 +0100 Subject: [PATCH] change words to english --- .gitignore | 1 - gabinete-digital-fo.code-workspace | 23 +++++++++++ src/app/domain/process/DiplomaGenerate.ts | 16 ++------ src/app/domain/process/DiplomaSignPr.ts | 2 +- src/app/domain/process/DiplomasValidate.ts | 2 +- src/app/domain/process/DispatchDomain.ts | 13 +----- src/app/domain/process/DispatchPrDomain.ts | 28 +++++-------- src/app/domain/process/Expediente.ts | 23 ++++------- .../process/GenericBehaviorTaskActions.ts | 40 +++++++++---------- .../domain/process/RequestsForDeferment.ts | 37 +++++++---------- src/app/domain/process/RequestsForOpinion.ts | 39 +++++++++--------- version/git-version.ts | 14 +++---- 12 files changed, 110 insertions(+), 128 deletions(-) create mode 100644 gabinete-digital-fo.code-workspace diff --git a/.gitignore b/.gitignore index 80b2c44ec..e8ea8cb22 100644 --- a/.gitignore +++ b/.gitignore @@ -84,7 +84,6 @@ migrat/ cypress/videos *.rar -src/app/domain src/app/models/beast-orm-pro.ts diff --git a/gabinete-digital-fo.code-workspace b/gabinete-digital-fo.code-workspace new file mode 100644 index 000000000..45d87704e --- /dev/null +++ b/gabinete-digital-fo.code-workspace @@ -0,0 +1,23 @@ +{ + "folders": [ + { + "path": "." + }, + { + "path": "../beast-ORM-v0" + }, + { + "path": "../new-doc" + }, + { + "path": "../IDOC" + }, + { + "path": "../sih" + } + ], + "settings": { + "nuxt.isNuxtApp": false, + "git.ignoreLimitWarning": true + } +} \ No newline at end of file diff --git a/src/app/domain/process/DiplomaGenerate.ts b/src/app/domain/process/DiplomaGenerate.ts index 15835fdea..1dd941e7c 100644 --- a/src/app/domain/process/DiplomaGenerate.ts +++ b/src/app/domain/process/DiplomaGenerate.ts @@ -1,4 +1,5 @@ import { ProcessesService } from "src/app/services/processes.service"; +import { GenericBehaviorProcess } from "./GenericBehaviorTaskActions"; // check 1 export class DiplomaGenerates { @@ -9,7 +10,7 @@ export class DiplomaGenerates { * @event 'All' * @returns */ - async enviarDiploma({note = '', docs = [], serialnumber}) { + async SendDiploma({note = '', docs = [], serialnumber}) { let body = { "serialNumber": serialnumber, "action": "Enviar diploma", @@ -27,17 +28,8 @@ export class DiplomaGenerates { * @event 'All' * @returns */ - delegar(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 this.processes.DelegateTask(body).toPromise(); + delegate(task: any, note, EmailAddress) { + return GenericBehaviorProcess.Delegate(task, note, EmailAddress) } /** diff --git a/src/app/domain/process/DiplomaSignPr.ts b/src/app/domain/process/DiplomaSignPr.ts index 9bbdb99b4..e369ae018 100644 --- a/src/app/domain/process/DiplomaSignPr.ts +++ b/src/app/domain/process/DiplomaSignPr.ts @@ -14,7 +14,7 @@ export class DiplomasSignPrDomain { * @param serialNumber * @returns */ - async arquivar(note: string, documents: AttachmentList, serialNumber) { + async archive(note: string, documents: AttachmentList, serialNumber) { let body = { "serialNumber": serialNumber, diff --git a/src/app/domain/process/DiplomasValidate.ts b/src/app/domain/process/DiplomasValidate.ts index 5e43c2b68..0eef6d9b0 100644 --- a/src/app/domain/process/DiplomasValidate.ts +++ b/src/app/domain/process/DiplomasValidate.ts @@ -61,7 +61,7 @@ export class DiplomasValidate { * @param serialNumber * @returns */ - static async arquivar(note: string, documents: AttachmentList, serialNumber) { + static async archive(note: string, documents: AttachmentList, serialNumber) { let body = { "serialNumber": serialNumber, diff --git a/src/app/domain/process/DispatchDomain.ts b/src/app/domain/process/DispatchDomain.ts index 3e0cc119a..26d8f45c4 100644 --- a/src/app/domain/process/DispatchDomain.ts +++ b/src/app/domain/process/DispatchDomain.ts @@ -101,7 +101,7 @@ export class DispatchDomain { * @event 'Reexecutar Despacho', 'Tarefa de Despacho' */ static async requestAppear() { - return GenericBehaviorProcess.requestAppear(task, {}) + return GenericBehaviorProcess.RequestAppear(task, {}) } /** @@ -122,16 +122,7 @@ export class DispatchDomain { * @event 'Reexecutar Despacho' , 'Tarefa de Despacho' */ static async Delegar(task, note, taskParticipants) { - let body = { - "SerialNumber": task.SerialNumber, - "DispatchDocId": task.DocId, - "FolderID": task.FolderId || task.FolderID, - "Subject": task.Folio, - "Comment": note, - "DelegatedUserEmail": taskParticipants[0].EmailAddress, - } - - return this.processes.DelegateTask(body).toPromise() + 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 index 403c3961a..91b053646 100644 --- a/src/app/domain/process/DispatchPrDomain.ts +++ b/src/app/domain/process/DispatchPrDomain.ts @@ -36,7 +36,7 @@ export class DispatchPrDomain { * @param serialNumber * @returns */ - static async generateDiploma(note: string, documents: any, serialNumber) { + static async SendDiploma(note: string, documents: any, serialNumber) { let body = { "serialNumber": serialNumber, @@ -60,7 +60,7 @@ export class DispatchPrDomain { * @param serialNumber * @returns */ - static async conclude(note: string, documents: any, serialNumber) { + static async Conclude(note: string, documents: any, serialNumber) { let body = { "serialNumber": serialNumber, "action": "Executado", @@ -83,7 +83,7 @@ export class DispatchPrDomain { * @param serialNumber * @returns */ - static async rerun(note: string, documents: any, serialNumber) { + static async Rerun(note: string, documents: any, serialNumber) { let body = { "serialNumber": serialNumber, "action": "Reexecução", @@ -105,8 +105,8 @@ export class DispatchPrDomain { * @param serialNumber * @returns */ - static async requestAppear(task, postData) { - return GenericBehaviorProcess.requestAppear(task, {}) + static async RequestAppear(task, postData) { + return GenericBehaviorProcess.RequestAppear(task, {}) } @@ -117,7 +117,7 @@ export class DispatchPrDomain { * @param serialNumber * @returns */ - static async setUpMeeting() {} + static async SetUpMeeting() {} /** @@ -153,19 +153,9 @@ export class DispatchPrDomain { * @param serialNumber * @returns */ - static async Delegate(task: any, note, taskParticipants) { - let body = { - "SerialNumber": task.SerialNumber, - "DispatchDocId": task.DocId, - "FolderID": task.FolderId || task.FolderID, - "Subject": task.Folio, - "Comment": note, - "DelegatedUserEmail": taskParticipants[0].EmailAddress, - } - - return await this.processes.DelegateTask(body).toPromise() - } - + static async Delegate(task: any, note, EmailAddress) { + return GenericBehaviorProcess.Delegate(task, note, EmailAddress) + } /** * @pt Efetuar Despacho diff --git a/src/app/domain/process/Expediente.ts b/src/app/domain/process/Expediente.ts index baa4082aa..41e2ca05b 100644 --- a/src/app/domain/process/Expediente.ts +++ b/src/app/domain/process/Expediente.ts @@ -35,7 +35,7 @@ export class Expediente { * @PT Submeter para revisão * @event 'Concluir Despacho', 'Tarefa de Despacho', */ - async sendToReview(note:string, documents:any, serialnumber) { + async SendToReview(note:string, documents:any, serialnumber) { let body = { "serialNumber": serialnumber, "action": "Retificar", @@ -55,7 +55,7 @@ export class Expediente { * @pt Arquivar * @event 'Concluir Despacho', 'Tarefa de Despacho', */ - async archive(SerialNumber) { + async Archive(SerialNumber) { let otherbody = { "serialNumber": SerialNumber, @@ -72,7 +72,7 @@ export class Expediente { * @Profile PR * @event 'Concluir Despacho', 'Tarefa de Despacho', */ - sendToPending(serialnumber) { + SendToPending(serialnumber) { this.processes.SetTaskToPending(serialnumber) } @@ -171,24 +171,17 @@ export class Expediente { } static async requestAppear(task) { - return await GenericBehaviorProcess.requestAppear(task, {}) + return await GenericBehaviorProcess.RequestAppear(task, {}) } static async ApplicationForDeferment(task) { - return await GenericBehaviorProcess.ApplicationForDeferment(task) + return await GenericBehaviorProcess.ApplicationForDeferment(task, [], [], {}, '', '') } - static async setUpMeeting(task) { - return await GenericBehaviorProcess.setUpMeeting(task, {}) + static async SetUpMeeting(task) { + return await GenericBehaviorProcess.SetUpMeeting(task, {}) } - /** - * @pr Enviar para pendentes - * @param task - * @returns - */ - static async SetTaskToPending(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 index 0acd324c8..45fe8e2e4 100644 --- a/src/app/domain/process/GenericBehaviorTaskActions.ts +++ b/src/app/domain/process/GenericBehaviorTaskActions.ts @@ -7,7 +7,7 @@ export class GenericBehaviorProcess { static processes: ProcessesService static p: any - static async setUpMeeting(task, createEventFromData) { + static async SetUpMeeting(task, createEventFromData) { const eventBody = { BodyType: '1', Text: 'this.postData.Body.Text', @@ -86,7 +86,7 @@ export class GenericBehaviorProcess { * @param serialNumber * @returns */ - static async archive(note: string, documents: AttachmentList, serialNumber) { + static async Archive(note: string, documents: AttachmentList, serialNumber) { let body = { "serialNumber": serialNumber, @@ -110,7 +110,7 @@ export class GenericBehaviorProcess { * @returns * @emits finish proceses */ - static async executed(note:string, documents:any, serialNumber) { + static async Executed(note:string, documents:any, serialNumber) { let body = { "serialNumber": serialNumber, "action": "Conhecimento", @@ -132,7 +132,7 @@ export class GenericBehaviorProcess { * @param serialNumber * @returns */ - static async rerun(note:string, documents:any, serialNumber) { + static async Rerun(note:string, documents:any, serialNumber) { let body = { "serialNumber": serialNumber, "action": "Reexecução", @@ -155,7 +155,7 @@ export class GenericBehaviorProcess { * @param serialNumber * @returns */ - static async conclude(note: string, documents: any, serialNumber) { + static async Conclude(note: string, documents: any, serialNumber) { let body = { "serialNumber": serialNumber, @@ -172,17 +172,15 @@ export class GenericBehaviorProcess { } - static async Delegar() { - + static async Delegate(task: any, note, EmailAddress) { let body = { - "SerialNumber": 'this.task.SerialNumber', - "DispatchDocId": 'this.task.DocId', - "FolderID": 'this.task.FolderId' || 'this.task.FolderID', - "Subject": 'this.task.Folio', - "Comment": 'this.note', - "DelegatedUserEmail": 'this.taskParticipants[0].EmailAddress', + "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() } @@ -209,7 +207,7 @@ export class GenericBehaviorProcess { } } - static async requestAppear(task, _postData) { + static async RequestAppear(task, _postData) { const postData = { DistributionType: "Paralelo", CountryCode: 'AO', @@ -281,15 +279,15 @@ export class GenericBehaviorProcess { } - static async ApplicationForDeferment(task) { + static async ApplicationForDeferment(task, attendees, docs, dispatchFolder, Email, Priority) { const postData = { DistributionType: "Paralelo", CountryCode: 'AO', - Priority: 'this.postData.Priority', - UserEmail: 'this.loggeduser.Email', - UsersSelected: 'attendees', - DispatchFolder: 'this.dispatchFolder', - AttachmentList: 'docs' + Priority: Priority, + UserEmail: Email, + UsersSelected: attendees, + DispatchFolder: dispatchFolder, + AttachmentList: docs } await this.processes.postDeferimento(postData).toPromise() diff --git a/src/app/domain/process/RequestsForDeferment.ts b/src/app/domain/process/RequestsForDeferment.ts index 4896c955d..1ab574385 100644 --- a/src/app/domain/process/RequestsForDeferment.ts +++ b/src/app/domain/process/RequestsForDeferment.ts @@ -7,15 +7,15 @@ export class RequestForApproval { /** * @activityInstanceName 'Tarefa de Deferimento', 'Reapreciar Deferimento', 'Concluir Deferimento' */ - static Arquivar() { + static Archive(serialNumber, note, documents) { let body = { - "serialNumber": 'serialNumber', + "serialNumber": serialNumber, "action": "Arquivo", "ActionTypeId": 95, "dataFields": { - "ReviewUserComment": 'note', + "ReviewUserComment": note, }, - "AttachmentList" :'documents', + "AttachmentList" :documents, } return this.processes.CompleteTask(body) @@ -24,47 +24,40 @@ export class RequestForApproval { /** * @activityInstanceName 'Tarefa de Deferimento', 'Reapreciar Deferimento', 'Concluir Deferimento' */ - static async Delegar() { - let body = { - "serialNumber": 'this.serialNumber', - "action": "Registar", - "ActionTypeId": 104, - "dataFields": { - "ReviewUserComment": 'this.note', - }, - "AttachmentList": 'docs', - } - - return await this.processes.CompleteTask(body).toPromise(); + static async Delegate(task, serialNumber, note, EmailAddress) { + return GenericBehaviorProcess.Delegate(task, note, EmailAddress) } /** * @evactivityInstanceNameent 'Tarefa de Deferimento', 'Reapreciar Deferimento', 'Concluir Deferimento' */ - static EfetuarDespacho(body) { + static PerfomeceDispatch(body) { return GenericBehaviorProcess.PerformeDispatch(body) } /** * @activityInstanceName 'Tarefa de Deferimento', 'Reapreciar Deferimento', 'Concluir Deferimento' */ - static MarcarReuniao() {} + static SetUpMeeting(task) { + return GenericBehaviorProcess.SetUpMeeting(task, {}); + } /** * @activityInstanceName 'Tarefa de Deferimento', 'Concluir Deferimento', 'Reapreciar Deferimento' */ - static enviarParaPendente(serialNumber) { + static SetTaskToPending(serialNumber) { return GenericBehaviorProcess.SetTaskToPending(serialNumber) } /** * @activityInstanceName 'Concluir Deferimento' */ - static SolicitarParecer(task) { - return GenericBehaviorProcess.requestAppear(task, {}) + static RequestAppear(task) { + return GenericBehaviorProcess.RequestAppear(task, {}) } /** + * @pt Solicitar Reapreciação * @activityInstanceName 'Concluir Deferimento' */ - static SolicitarReapreciação() { + static RequestReview() { let body = { "serialNumber": 'this.serialnumber', "action": "Reapreciação", diff --git a/src/app/domain/process/RequestsForOpinion.ts b/src/app/domain/process/RequestsForOpinion.ts index 269971b90..fa6de1486 100644 --- a/src/app/domain/process/RequestsForOpinion.ts +++ b/src/app/domain/process/RequestsForOpinion.ts @@ -7,15 +7,15 @@ export class RequestForOpinion { /** * @activityInstanceName 'Pedido de Parecer' */ - static arquivar() { + static arquivar(serialNumber, note, documents) { let body = { - "serialNumber": 'serialNumber', + "serialNumber": serialNumber, "action": "Arquivo", "ActionTypeId": 95, "dataFields": { - "ReviewUserComment": 'note', + "ReviewUserComment": note, }, - "AttachmentList" :'documents', + "AttachmentList" : documents, } return this.processes.CompleteTask(body) @@ -29,14 +29,14 @@ export class RequestForOpinion { * @activityInstanceName 'Pedido de Parecer' */ static SolicitarParecer(task) { - return GenericBehaviorProcess.requestAppear(task, {}) + return GenericBehaviorProcess.RequestAppear(task, {}) } /** * @profile != PR * @activityInstanceName 'Pedido de Parecer' */ - static PedidoDedeferimento(task) { - return GenericBehaviorProcess.requestAppear(task, {}) + static RequestsForDeferment(task) { + return GenericBehaviorProcess.RequestAppear(task, {}) } /** * @activityInstanceName 'Pedido de Parecer' @@ -51,17 +51,18 @@ export class RequestForOpinion { /** + * @pt Dar O Meu Parecer * @activityInstanceName 'Pedido de Parecer', 'Pedido de Parecer do Presidente' */ - static async DarOMeuParecer() { + static async GiveMyOpinion(serialNumber, note, documents) { let body = { - "serialNumber": 'serialNumber', + "serialNumber": serialNumber, "action": "Registar", "ActionTypeId": 104, "dataFields": { - "ReviewUserComment": 'note', + "ReviewUserComment": note, }, - "AttachmentList": 'docs', + "AttachmentList": documents, } return await this.processes.CompleteTask(body).toPromise(); @@ -69,24 +70,26 @@ export class RequestForOpinion { /** * @activityInstanceName 'Pedido de Parecer', 'Pedido de Parecer do Presidente' */ - static MarcarReuniao() {} + static MarcarReuniao(task) { + return GenericBehaviorProcess.SetUpMeeting(task, {}) + } /** * @Profile PR * @pt Reencaminhar * @activityInstanceName 'Pedido de Parecer do Presidente' */ - static async Reencaminhar() { + static async Reencaminhar(serialNumber, note, documents, attendees, FolderId) { let body = { - "usersSelected": 'attendees', - "serialNumber": 'this.task.SerialNumber', + "usersSelected": attendees, + "serialNumber": serialNumber, "action": "Reencaminhar", "actionTypeId": 98, "dataFields": { - "ReviewUserComment": 'this.note', + "ReviewUserComment": note, }, - "FolderId": 'this.task.FolderId', - "AttachmentList" : 'docs', + "FolderId": FolderId, + "AttachmentList" : documents, } return await this.processes.CompleteParecerPrTask(body).toPromise(); diff --git a/version/git-version.ts b/version/git-version.ts index bfa9889d1..d2acb3bd6 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "e4b08b887", - "SHA": "e4b08b8873b7278834b61cc63d60d4efc5757727", + "shortSHA": "e991ba5f4", + "SHA": "e991ba5f4e3a1388f75154cc4eea3e31f52167c2", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Jun 22 13:09:11 2023 +0100'", - "lastCommitMessage": "change order", - "lastCommitNumber": "5018", - "change": "diff --git a/.gitignore b/.gitignore\nindex 80b2c44ec..e8ea8cb22 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -84,7 +84,6 @@ migrat/\n cypress/videos\n *.rar\n \n-src/app/domain\n src/app/models/beast-orm-pro.ts", - "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/Rules/deploma.service.ts\n\tmodified: src/app/Rules/despacho.service.ts\n\tnew file: src/app/domain/agenda/event.ts\n\tnew file: src/app/domain/process/DiplomaGenerate.ts\n\tnew file: src/app/domain/process/DiplomaSignPr.ts\n\tnew file: src/app/domain/process/DiplomaToSign.ts\n\tnew file: src/app/domain/process/DiplomasValidate.ts\n\tnew file: src/app/domain/process/DispatchDomain.ts\n\tnew file: src/app/domain/process/DispatchPrDomain.ts\n\tnew file: src/app/domain/process/Expediente.ts\n\tnew file: src/app/domain/process/GenericBehaviorTaskActions.ts\n\tnew file: src/app/domain/process/RequestsForDeferment.ts\n\tnew file: src/app/domain/process/RequestsForOpinion.ts\n\tmodified: src/app/modals/delegar/delegar.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/services/events.service.ts\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: .gitignore\n\nUntracked files:\n (use \"git add ...\" to include in what will be committed)\n\tgabinete-digital-fo.code-workspace", + "lastCommitTime": "'Fri Jun 23 11:47:20 2023 +0100'", + "lastCommitMessage": "add domain layer", + "lastCommitNumber": "5019", + "change": "", + "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: .gitignore\n\tnew file: gabinete-digital-fo.code-workspace\n\tmodified: src/app/domain/process/DiplomaGenerate.ts\n\tmodified: src/app/domain/process/DiplomaSignPr.ts\n\tmodified: src/app/domain/process/DiplomasValidate.ts\n\tmodified: src/app/domain/process/DispatchDomain.ts\n\tmodified: src/app/domain/process/DispatchPrDomain.ts\n\tmodified: src/app/domain/process/Expediente.ts\n\tmodified: src/app/domain/process/GenericBehaviorTaskActions.ts\n\tmodified: src/app/domain/process/RequestsForDeferment.ts\n\tmodified: src/app/domain/process/RequestsForOpinion.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file