Verb of the action changed

src/app/modals/add-note/add-note.page.html

@@ -50,6 +50,22 @@
 <ion-footer class="ion-no-border">
   <div class="buttons width-100">
     <button class="btn-cancel cursor-pointer" shape="round" (click)="close()">Cancelar</button>
-    <button class="btn-ok cursor-pointer" shape="round" (click)="save()">Enviar</button>
+    <button *ngIf="actionName == 'Executado'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Executado</button>
+    <button *ngIf="actionName == 'Gerar Diploma'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Gerar</button>
+    <button *ngIf="actionName == 'Arquivar'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Arquivar</button>
+    <button *ngIf="actionName == 'Reexecução'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Enviar</button>
+    <button *ngIf="actionName == 'Concluido'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Concluído</button>
+    <button *ngIf="actionName == 'Solicitar assinatura'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Solicitar</button>
+    <button *ngIf="actionName == 'Solicitar alteração'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Solicitar</button>
+    <button *ngIf="actionName == 'Concluir diploma'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Concluir</button>
+    <button *ngIf="actionName == 'Aprovar'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Aprovar</button>
+    <button *ngIf="actionName == 'Revisão'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Enviar</button>
+    <button *ngIf="actionName == 'Solicitar Reapreciação'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Solicitar</button>
+    <button *ngIf="actionName == 'Assinar Diploma'" class="btn-ok cursor-pointer" shape="round" (click)="save()">Assinado</button>
+    <button *ngIf="!actionName" class="btn-ok cursor-pointer" shape="round" (click)="save()">Enviar</button>
+    
+    
+    
+    
   </div>
 </ion-footer>

src/app/modals/add-note/add-note.page.ts

@@ -14,6 +14,7 @@ export class AddNotePage implements OnInit {
   documents: SearchList[] = [];
   loadedAttachments:any;
   hideThisFeature: boolean = true;
+  actionName: string;
 
   constructor(
     private modalController: ModalController,
@@ -23,6 +24,7 @@ export class AddNotePage implements OnInit {
   ) {
     this.note = '';
     this.hideThisFeature = this.navParams.get('showAttachmentBtn');
+    this.actionName = this.navParams.get('actionName');
    }
 
   ngOnInit() {

src/app/modals/create-process/create-process.page.html

@@ -188,6 +188,7 @@
 <ion-footer>
   <div class="buttons">
     <button class="btn-cancel" shape="round" (click)="cancelTask()">Cancelar</button>
-    <button class="btn-ok" shape="round" (click)="saveTask()">Enviar</button>
+    <button *ngIf="taskType == '0'" class="btn-ok" shape="round" (click)="saveTask()">Despachar</button>
+    <button *ngIf="taskType == '1'" class="btn-ok" shape="round" (click)="saveTask()">Solicitar</button>
   </div>
 </ion-footer>

src/app/modals/delegar/delegar.page.html

@@ -93,7 +93,7 @@
 <ion-footer>
   <div class="buttons">
     <button class="btn-cancel" shape="round" (click)="cancelTask()">Cancelar</button>
-    <button class="btn-ok" shape="round" (click)="saveTask()">Enviar</button>
+    <button class="btn-ok" shape="round" (click)="saveTask()">Delegar</button>
   </div>
 </ion-footer>
 

src/app/pages/agenda/new-event/new-event.page.html

@@ -252,6 +252,11 @@
       </div>
     </div>
 
+    <!-- <div style="align-items: flex-start; display: flex; height: fit-content; margin-bottom: 15px">
+      <ion-icon style="height: 30px; width: 30px; margin-right: 10px; padding-left: 5px;" slot="start" src="assets/images/icons-description.svg"></ion-icon>
+      <ion-textarea class="textarea" autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="postEvent.Body.Text"  placeholder="Detalhes" autoGrow="true" ></ion-textarea>
+    </div> -->
+      
     <div class="container-div">
       <div class="ion-item-class-2">
         <div class="ion-icon-class">
@@ -259,7 +264,7 @@
         </div>
         <div class="ion-input-class-no-height flex-grow-1">
 
-          <ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="postEvent.Body.Text"  placeholder="Detalhes" ></ion-textarea>
+          <ion-textarea class="textarea" autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="postEvent.Body.Text"  placeholder="Detalhes" autoGrow="true" ></ion-textarea>
 
         </div>
       </div>

src/app/pages/agenda/new-event/new-event.page.scss

@@ -90,6 +90,10 @@ ion-content{
         border-radius: 5px;
         flex: 1;
       }
+
+      .textarea{
+        font-size: small;
+      }
       .list-people{
         width: 250px;
         float: left;

src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts

@@ -437,6 +437,7 @@ export class DespachoPrPage implements OnInit {
       component: AddNotePage,
       componentProps: {
         showAttachmentBtn: true,
+        actionName: actionName
       },
       cssClass: classs,
       backdropDismiss: true

src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html

@@ -127,7 +127,7 @@
     <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
       <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
         <div class="option-desc" *ngIf="task.WorkflowName == 'Despacho do Presidente da República' "> <div>Responder ao PR</div> </div>
-        <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
+        <button (click)="tstemethod(executadoText)" class="btn-cancel" shape="round" >Executado</button>
         <div class="option-desc" *ngIf="task.WorkflowName == 'Despacho do Presidente da República' ">Reencaminhar para Área Jurídica</div>
         <button (click)="openAddNoteModal('Gerar Diploma')" *ngIf="task.WorkflowName == 'Despacho do Presidente da República'" class="btn-cancel" style="margin-bottom: 0px !important;" shape="round" >Gerar Diploma </button>
         <div class="option-desc" *ngIf="task.WorkflowName == 'Despacho do Presidente da República' " >Outras opções</div>
@@ -140,7 +140,7 @@
         <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
       </div>
       <div class="buttons" *ngIf="task.activityInstanceName == 'Reexecutar Despacho'">
-        <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
+        <button (click)="tstemethod('Executado')" class="btn-cancel" shape="round" >Executado</button>
         <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
         <div class="solid"></div>
         <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>

src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts

@@ -47,6 +47,9 @@ export class DespachoPage implements OnInit {
   profile: string;
   intervenientes: any = []
   cc: any = [];
+  executadoText: string = "Executado";
+  gerarText: string = "Gerar"
+
 
   constructor(private activateRoute: ActivatedRoute,
     private processes: ProcessesService,
@@ -394,7 +397,12 @@ export class DespachoPage implements OnInit {
       // loader.remove()
   }
 
+  tstemethod(value: string) {
+    alert(value)
+  }
+
   async openAddNoteModal(actionName: string) {
+    
     let classs;
     if (window.innerWidth <= 800) {
       classs = 'modal modal-desktop'
@@ -405,6 +413,7 @@ export class DespachoPage implements OnInit {
       component: AddNotePage,
       componentProps: {
         showAttachmentBtn: true,
+        actionName: actionName
       },
       cssClass: classs,
       backdropDismiss: true

src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts

@@ -212,6 +212,7 @@ export class DiplomasGerarPage implements OnInit {
       component: AddNotePage,
       componentProps: {
         showAttachmentBtn: true,
+        actionName:false
       },
       cssClass: classs,
       backdropDismiss: true

src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts

@@ -377,6 +377,7 @@ export class DiplomaPage implements OnInit {
     const modal = await this.modalController.create({
       component: AddNotePage,
       componentProps: {
+      actionName:actionName
       },
       cssClass: classs,
       backdropDismiss: true

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts

@@ -297,6 +297,7 @@ export class ExpedienteDetailPage implements OnInit {
       component: AddNotePage,
       componentProps: {
         showAttachmentBtn: false,
+        actionName:actionName
       },
       cssClass: classs,
       //backdropDismiss: true

src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts

@@ -366,6 +366,7 @@ export class ExpedientePrPage implements OnInit {
       component: AddNotePage,
       componentProps: {
         showAttachmentBtn: false,
+        actionName:actionName
       },
       cssClass: classs,
       //backdropDismiss: true

src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts

@@ -663,6 +663,7 @@ export class PedidoPage implements OnInit {
       component: AddNotePage,
       componentProps: {
         showAttachmentBtn: true,
+        actionName:actionName
       },
       cssClass: classs,
       backdropDismiss: true

src/app/shared/agenda/new-event/new-event.page.html

@@ -293,7 +293,7 @@
         </div>
         <div class="ion-input-class-no-height flex-grow-1">
 
-          <ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="postEvent.Body.Text"  placeholder="Detalhes" ></ion-textarea>
+          <ion-textarea style="height: 150px;" autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="postEvent.Body.Text"  placeholder="Detalhes" autoGrow="true" ></ion-textarea>
 
         </div>
       </div>

src/app/shared/popover/deploma-options/deploma-options.page.ts

@@ -49,6 +49,7 @@ export class DeplomaOptionsPage implements OnInit {
     const modal = await this.modalController.create({
       component: AddNotePage,
       componentProps:{
+        actionName:actionName
       },
       cssClass: classs,
       backdropDismiss: true

src/app/shared/popover/despachos-options/despachos-options.page.ts

@@ -202,7 +202,8 @@ export class DespachosOptionsPage implements OnInit {
     const modal = await this.modalController.create({
       component: AddNotePage,
       componentProps: {
-        showAttachmentBtn: true
+        showAttachmentBtn: true,
+        actionName:actionName
       },
       cssClass: classs,
       backdropDismiss: true

src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts

@@ -233,7 +233,8 @@ export class DespachosPrOptionsPage implements OnInit {
     const modal = await this.modalController.create({
       component: AddNotePage,
       componentProps: {
-        showAttachmentBtn: true
+        showAttachmentBtn: true,
+        actionName:actionName
       },
       cssClass: classs,
       backdropDismiss: true

src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts

@@ -52,6 +52,7 @@ export class DiplomasGerarOptionsPage implements OnInit {
       component: AddNotePage,
       componentProps: {
         showAttachmentBtn: true,
+        actionName:false
       },
       cssClass: classs,
       backdropDismiss: true

src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts

@@ -90,6 +90,7 @@ export class OptsExpedientePrPage implements OnInit {
       component: AddNotePage,
       componentProps:{
         showAttachmentBtn: false,
+        actionName:actionName
       },
       cssClass: classs,
       backdropDismiss: true

src/app/shared/popover/opts-expediente/opts-expediente.page.ts

@@ -201,6 +201,7 @@ export class OptsExpedientePage implements OnInit {
       component: AddNotePage,
       componentProps:{
         showAttachmentBtn: false,
+        actionName:actionName
       },
       cssClass: classs,
       //backdropDismiss: true

src/app/shared/popover/request-options/request-options.page.ts

@@ -222,6 +222,7 @@ export class RequestOptionsPage implements OnInit {
       component: AddNotePage,
       componentProps:{
         showAttachmentBtn: true,
+        actionName:actionName
       },
       cssClass: classs,
       backdropDismiss: true

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "c0029364c",
-  "SHA": "c0029364c8429dc183fd6b9743f8f78ab81532f5",
+  "shortSHA": "d44ca806e",
+  "SHA": "d44ca806efc86c21048752383dd3b5169e68670e",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Eudes Inácio'",
-  "lastCommitTime": "'Wed Feb 15 18:47:55 2023 +0100'",
-  "lastCommitMessage": "dates on publications solved",
-  "lastCommitNumber": "4789",
+  "lastCommitTime": "'Thu Feb 16 15:43:15 2023 +0100'",
+  "lastCommitMessage": "pull made",
+  "lastCommitNumber": "4795",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 5 and 5 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   .husky/pre-commit\n\tmodified:   src/app/modals/view-document/view-document.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified:   src/app/shared/agenda/view-event/view-event.page.ts\n\tmodified:   src/assets/www/pdfjs/web/viewer.html\n\tmodified:   version/git-version.ts",
+  "changeStatus": "On branch no_bug_movemente\nYour branch is ahead of 'origin/no_bug_movemente' by 6 commits.\n  (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/add-note/add-note.page.html\n\tmodified:   src/app/modals/add-note/add-note.page.ts\n\tmodified:   src/app/modals/create-process/create-process.page.html\n\tmodified:   src/app/modals/delegar/delegar.page.html\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.html\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.scss\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.html\n\tmodified:   src/app/shared/popover/deploma-options/deploma-options.page.ts\n\tmodified:   src/app/shared/popover/despachos-options/despachos-options.page.ts\n\tmodified:   src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts\n\tmodified:   src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts\n\tmodified:   src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts\n\tmodified:   src/app/shared/popover/opts-expediente/opts-expediente.page.ts\n\tmodified:   src/app/shared/popover/request-options/request-options.page.ts",
   "changeAuthor": "eudes.inacio"
 }