Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html

@@ -50,7 +50,7 @@
             <div class="ion-icon-class">
               <ion-icon class="icon-time" slot="start" name="time-outline"></ion-icon>
             </div>
-            <div class="ion-input-class" [class.input-error]="Form?.get('Priority')?.invalid  && validateFrom ">
+            <div class="ion-input-class" [class.input-error]="Form?.get('Priority')?.invalid  && validateFrom || validateField ">
               <ion-select
                 placeholder="Prazo*"
                 [(ngModel)]="postData.Priority"

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts

@@ -88,7 +88,8 @@ export class ExpedientTaskModalPage implements OnInit {
   toppings = new FormControl();
 
   Form: FormGroup;
-  validateFrom = false
+  validateFrom = false;
+  validateField = false;
 
   get toppingsValues() {
     return this.toppings.value;
@@ -133,7 +134,7 @@ export class ExpedientTaskModalPage implements OnInit {
         SubjectTypes: this.selectedTypes,
         NumberPDPP: this.task.workflowInstanceDataFields.DispatchNumber,
       };
-      
+
       this.postData.DispatchFolder = this.dispatchFolder;
       this.postData.UsersSelected = this.participants;
       /* By Default TypeDeadline should be 'Normal' */
@@ -187,7 +188,7 @@ export class ExpedientTaskModalPage implements OnInit {
   }
 
   runValidation() {
-    this.validateFrom  = true
+    this.validateFrom  = true;
   }
 
   injectValidation() {
@@ -277,7 +278,7 @@ export class ExpedientTaskModalPage implements OnInit {
           })
         });
 
-        
+
       } else { // 8
         docs.Attachments.push({
           ApplicationId: 8,
@@ -429,17 +430,23 @@ export class ExpedientTaskModalPage implements OnInit {
               }
             }
 
-            try {
-              this.taskResult = await this.despachoService.createDespacho(this.postData).toPromise();
-              await this.toastService.successMessage('Processo efetuado');
-              this.modalController.dismiss(action_despacho_pr);
-            } catch (error) {
-              await this.toastService.badRequest('Processo não efetuado')
-            } finally {
-              loader.remove()
-            }
+            if(this.postData.DispatchFolder.Message){
+              try {
+                this.taskResult = await this.despachoService.createDespacho(this.postData).toPromise();
+                await this.toastService.successMessage('Processo efetuado');
+                this.modalController.dismiss(action_despacho_pr);
+              } catch (error) {
 
-            console.log('this.taskResult', this.taskResult);
+                await this.toastService.badRequest('Processo não efetuado')
+              } finally {
+                //loader.remove()
+              }
+            }
+            else{
+              this.validateField = true;
+              this.toastService.badRequest('Por favor adicione uma nota');
+            }
+            loader.remove();
             break;
 
           case '1': // parecer
@@ -463,7 +470,6 @@ export class ExpedientTaskModalPage implements OnInit {
             }
 
             try {
-
               this.taskResult = await this.processes.postParecerPr(this.postData).toPromise();
               await this.toastService.successMessage('Pedido enviado');
               this.modalController.dismiss(action_parecer_pr);
@@ -471,8 +477,9 @@ export class ExpedientTaskModalPage implements OnInit {
 
               await this.toastService.badRequest('Processo não efetuado')
             } finally {
-              loader.remove()
+                loader.remove()
             }
+
             break;
         }
         break;