change words to english

.gitignore

@@ -84,7 +84,6 @@ migrat/
 cypress/videos
 *.rar
 
-src/app/domain
 src/app/models/beast-orm-pro.ts
 
 

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
+	}
+}

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) {
+  delegate(task: any, note, EmailAddress) {
-    let body = {
+    return GenericBehaviorProcess.Delegate(task, note, EmailAddress)
-      "SerialNumber": task.SerialNumber,
-      "DispatchDocId": task.DocId,
-      "FolderID": task.FolderId || task.FolderID,
-      "Subject": task.Folio,
-      "Comment": note,
-      "DelegatedUserEmail": EmailAddress,
-    }
-
-    return this.processes.DelegateTask(body).toPromise();
   }
 
   /**

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,

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,

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 = {
+    return GenericBehaviorProcess.Delegate(task, note, taskParticipants)
-      "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()
   }
   
 }

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) {
+    static async RequestAppear(task, postData) {
-        return GenericBehaviorProcess.requestAppear(task, {})
+        return GenericBehaviorProcess.RequestAppear(task, {})
     }
 
 
@@ -117,7 +117,7 @@ export class DispatchPrDomain {
      * @param serialNumber 
      * @returns 
      */
-    static async setUpMeeting() {}
+    static async SetUpMeeting() {}
 
 
     /**
@@ -153,20 +153,10 @@ export class DispatchPrDomain {
      * @param serialNumber 
      * @returns 
      */
-     static async Delegate(task: any, note, taskParticipants) {
+     static async Delegate(task: any, note, EmailAddress) {
-        let body = {
+        return GenericBehaviorProcess.Delegate(task, note, EmailAddress)
-            "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()
-     }
-
-
      /**
      * @pt Efetuar Despacho
      * @event 'Tarefa de Despacho'

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) {
+    static async SetUpMeeting(task) {
-      return await GenericBehaviorProcess.setUpMeeting(task, {})
+      return await GenericBehaviorProcess.SetUpMeeting(task, {})
     }
 
-    /**
+ 
-     * @pr Enviar para pendentes
-     * @param task 
-     * @returns 
-     */
-    static async SetTaskToPending(task) {
-      return await GenericBehaviorProcess.setUpMeeting(task, {})
-    }
   
 }

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',
+      "SerialNumber": task.SerialNumber,
-      "DispatchDocId": 'this.task.DocId',
+      "DispatchDocId": task.DocId,
-      "FolderID": 'this.task.FolderId' || 'this.task.FolderID',
+      "FolderID": task.FolderId || task.FolderID,
-      "Subject": 'this.task.Folio',
+      "Subject": task.Folio,
-      "Comment": 'this.note',
+      "Comment": note,
-      "DelegatedUserEmail": 'this.taskParticipants[0].EmailAddress',
+      "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',
+      Priority: Priority,
-      UserEmail: 'this.loggeduser.Email',
+      UserEmail: Email,
-      UsersSelected: 'attendees',
+      UsersSelected: attendees,
-      DispatchFolder: 'this.dispatchFolder',
+      DispatchFolder: dispatchFolder,
-      AttachmentList: 'docs'
+      AttachmentList: docs
     }
 
     await this.processes.postDeferimento(postData).toPromise()

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() {
+    static async Delegate(task, serialNumber, note, EmailAddress) {
-        let body = {
+        return GenericBehaviorProcess.Delegate(task, note, EmailAddress)
-            "serialNumber": 'this.serialNumber',
-            "action": "Registar",
-            "ActionTypeId": 104,
-            "dataFields": {
-              "ReviewUserComment": 'this.note',
-            },
-            "AttachmentList": 'docs',
-        }
-
-        return await this.processes.CompleteTask(body).toPromise();
           
     }
     /**
      * @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) {
+    static RequestAppear(task) {
-        return GenericBehaviorProcess.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",

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) {
+    static RequestsForDeferment(task) {
-        return GenericBehaviorProcess.requestAppear(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',
+            "usersSelected": attendees,
-            "serialNumber": 'this.task.SerialNumber',
+            "serialNumber": serialNumber,
             "action": "Reencaminhar",
             "actionTypeId": 98,
             "dataFields": {
-              "ReviewUserComment": 'this.note',
+              "ReviewUserComment": note,
             },
-            "FolderId":  'this.task.FolderId',
+            "FolderId":  FolderId,
-            "AttachmentList" : 'docs',
+            "AttachmentList" : documents,
         }
 
         return await this.processes.CompleteParecerPrTask(body).toPromise();

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "e4b08b887",
+  "shortSHA": "e991ba5f4",
-  "SHA": "e4b08b8873b7278834b61cc63d60d4efc5757727",
+  "SHA": "e991ba5f4e3a1388f75154cc4eea3e31f52167c2",
   "branch": "feature/gabinete-search",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Thu Jun 22 13:09:11 2023 +0100'",
+  "lastCommitTime": "'Fri Jun 23 11:47:20 2023 +0100'",
-  "lastCommitMessage": "change order",
+  "lastCommitMessage": "add domain layer",
-  "lastCommitNumber": "5018",
+  "lastCommitNumber": "5019",
-  "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",
+  "change": "",
-  "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n  (use \"git restore --staged <file>...\" 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 <file>...\" to update what will be committed)\n  (use \"git restore <file>...\" to discard changes in working directory)\n\tmodified:   .gitignore\n\nUntracked files:\n  (use \"git add <file>...\" to include in what will be committed)\n\tgabinete-digital-fo.code-workspace",
+  "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n  (use \"git restore --staged <file>...\" 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"
 }