save

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html

@@ -8,7 +8,7 @@
         </div>
       </div>
       <div class="overflow-y-auto content-default-padding">
-        
+
         <div class="ion-item-container width-100" [class.input-error]="Form?.get('Subject')?.invalid && validateFrom ">
           <ion-input placeholder="Assunto*" [(ngModel)]="postData.Subject"></ion-input>
         </div>
@@ -52,11 +52,11 @@
               <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
             </div>
             <div class="ion-input-class" >
-              <ion-select 
-                class="d-block d-md-none" 
-                [(ngModel)]="postData.CalendarName" 
-                placeholder="Selecione repetição" 
-                interface="action-sheet" 
+              <ion-select
+                class="d-block d-md-none"
+                [(ngModel)]="postData.CalendarName"
+                placeholder="Selecione repetição"
+                interface="action-sheet"
                 Cancel-text="Cancelar" required>
                 <ion-select-option value="Oficial">Oficial</ion-select-option>
                 <ion-select-option value="Pessoal">Pessoal</ion-select-option>
@@ -85,11 +85,11 @@
               <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
             </div>
             <div class="ion-input-class" [class.input-error]="Form?.get('Categories')?.invalid  && validateFrom ">
- 
-              <ion-select  placeholder="Selecione tipo de evento*" 
+
+              <ion-select  placeholder="Selecione tipo de evento*"
               class="d-block d-md-none"
-              [(ngModel)]="postData.Categories[0]" 
-              interface="action-sheet" 
+              [(ngModel)]="postData.Categories"
+              interface="action-sheet"
               Cancel-text="Cancelar" required>
                 <ion-select-option value="Reunião">Reunião</ion-select-option>
                 <ion-select-option value="Viagem">Viagem</ion-select-option>
@@ -100,7 +100,7 @@
 
               <mat-form-field class="d-none d-md-block" appearance="none" class="width-100" placeholder="Sample Type" required>
                 <!-- <input matInput type="text" > -->
-                <mat-select [(ngModel)]="postData.Categories[0]" >
+                <mat-select [(ngModel)]="postData.Categories" >
                   <mat-option value="Reunião">
                     Reunião
                   </mat-option>
@@ -116,7 +116,7 @@
                 </mat-select>
               </mat-form-field>
 
-  
+
             </div>
           </div>
           </div>
@@ -127,10 +127,10 @@
             <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
           </div>
           <div class="ion-input-class" [class.input-error]="Form?.get('Date')?.invalid  && validateFrom ">
-            <ion-datetime 
+            <ion-datetime
               class="d-block d-md-none"
               placeholder="Início*"
-              [(ngModel)]="postData.StartDate" 
+              [(ngModel)]="postData.StartDate"
               displayFormat="D MMM YYYY H:mm"
               minuteValues="0,15,30,45"
               monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
@@ -138,19 +138,19 @@
               max="2025"
               value="2020-11-19T11:06Z">
             </ion-datetime>
-           
+
             <mat-form-field appearance="none" class="width-100 date-hour-picker  d-md-block">
-              <input matInput [ngxMatDatetimePicker]="picker1" 
-                placeholder="Choose a date*" 
+              <input matInput [ngxMatDatetimePicker]="picker1"
+                placeholder="Choose a date*"
                 [formControl]="dateControlStart"
                 [min]="minDate"
                 [disabled]="disabled"
               >
               <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
-              <ngx-mat-datetime-picker #picker1 
-                [showSpinners]="showSpinners" 
+              <ngx-mat-datetime-picker #picker1
+                [showSpinners]="showSpinners"
                 [showSeconds]="showSeconds"
-                [stepHour]="stepHour" [stepMinute]="stepMinute" 
+                [stepHour]="stepHour" [stepMinute]="stepMinute"
                 [stepSecond]="stepSecond"
                 [touchUi]="touchUi">
               </ngx-mat-datetime-picker>
@@ -166,30 +166,30 @@
               <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
             </div>
             <div class="ion-input-class  flex-grow-1" [class.input-error]="Form?.get('Date')?.invalid  && validateFrom ">
-              <ion-datetime 
+              <ion-datetime
                 class="d-block d-md-none"
                 placeholder="Fim*"
-                [(ngModel)]="postData.EndDate" 
+                [(ngModel)]="postData.EndDate"
                 displayFormat="D MMM YYYY H:mm"
                 minuteValues="0,15,30,45"
                 monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
-                min="{{ionicMinDate}}" 
+                min="{{ionicMinDate}}"
                 max="2025"
                 value="2020-11-19T11:06Z">
               </ion-datetime>
-              
+
               <mat-form-field appearance="none" class="date-hour-picker width-100 d-none d-md-block">
-                <input matInput [ngxMatDatetimePicker]="fim" 
-                  placeholder="Choose a date*S" 
+                <input matInput [ngxMatDatetimePicker]="fim"
+                  placeholder="Choose a date*S"
                   [formControl]="dateControlEnd"
-                  [min]="endMinDate" 
+                  [min]="endMinDate"
                   [disabled]="disabled"
                 >
                 <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
-                <ngx-mat-datetime-picker #fim 
-                  [showSpinners]="showSpinners" 
+                <ngx-mat-datetime-picker #fim
+                  [showSpinners]="showSpinners"
                   [showSeconds]="showSeconds"
-                  [stepHour]="stepHour" [stepMinute]="stepMinute" 
+                  [stepHour]="stepHour" [stepMinute]="stepMinute"
                   [stepSecond]="stepSecond"
                   [touchUi]="touchUi">
                 </ngx-mat-datetime-picker>
@@ -204,15 +204,15 @@
               <ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
             </div>
             <div class="ion-input-class">
-              <ion-select 
+              <ion-select
                 class="d-block d-md-none"
-                [(ngModel)]="postData.IsRecurring" 
-                placeholder="Selecione repetição*" 
-                value="false" 
-                interface="action-sheet" 
-                Cancel-text="Cancelar" 
+                [(ngModel)]="postData.IsRecurring"
+                placeholder="Selecione repetição*"
+                value="false"
+                interface="action-sheet"
+                Cancel-text="Cancelar"
                 required
-                
+
               >
                 <ion-select-option value="false">Não se repete</ion-select-option>
                 <ion-select-option value="true">Repete</ion-select-option>
@@ -224,9 +224,9 @@
 
               <mat-form-field
                 floatLabel="never"
-                class="width-100 d-none d-md-block" 
-                value="false" 
-                interface="action-sheet" 
+                class="width-100 d-none d-md-block"
+                value="false"
+                interface="action-sheet"
                 required
                 appearance="none"
               >
@@ -307,21 +307,21 @@
             </div>
             <div class="attach-document">
               <ion-label>Anexar Documentos</ion-label>
-            </div> 
+            </div>
           </ion-label>
         </div>
 
-        <div class="list "  *ngFor="let document of documents; let i = index" > 
+        <div class="list "  *ngFor="let document of documents; let i = index" >
           <ion-list>
             <ion-item>
             <ion-label>
-              <p class="d-flex ion-justify-content-between"> 
-                <span class="attach-title-item">{{document.Assunto}}</span> 
-                <span class="app-name">{{document.appName}}</span> 
+              <p class="d-flex ion-justify-content-between">
+                <span class="attach-title-item">{{document.Assunto}}</span>
+                <span class="app-name">{{document.appName}}</span>
                 <span class="close-button text-black" (click)="removeAttachment(i)" >
                   <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
                 </span>
-              </p> 
+              </p>
               <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yy'}} </span></p>
             </ion-label>
           </ion-item>
@@ -331,12 +331,12 @@
     </div>
 
     <div class="aside-righ flex-grow-1">
-      <app-empty-container 
-          [texto]="emptyTextDescription" 
-          *ngIf="!showAttendees" 
+      <app-empty-container
+          [texto]="emptyTextDescription"
+          *ngIf="!showAttendees"
           class="d-flex height-100 flex-column">
       </app-empty-container>
-      <app-attendee-modal class=" d-flex flex-column height-100" 
+      <app-attendee-modal class=" d-flex flex-column height-100"
         *ngIf="showAttendees"
         [footer]="false"
         [taskParticipants]="taskParticipants"

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts

@@ -47,7 +47,7 @@ const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
 })
 
 export class BookMeetingModalPage implements OnInit {
-  
+
   public date: any;
   public disabled = false;
   public showSpinners = true;
@@ -94,12 +94,12 @@ export class BookMeetingModalPage implements OnInit {
   @ViewChild('fim') fim: any;
   @ViewChild('inicio') inicio: any;
   @ViewChild('picker1') picker1: any;
-  
+
   task: any;
-  
+
   taskParticipants: EventPerson[];
   taskParticipantsCc: EventPerson[] = [];
-  
+
   taskDocId:string;
   loadedAttachments:any;
   documents:SearchDocument[] = [];
@@ -146,7 +146,7 @@ export class BookMeetingModalPage implements OnInit {
      this.dateControlEnd = new FormControl(moment(new Date(new Date().getTime() + 15 * 60000)));
 
 
-     this.postData.Categories = ['Reunião']
+     this.postData.Categories = 'Reunião'
     }
 
   ngOnInit() {
@@ -170,12 +170,12 @@ export class BookMeetingModalPage implements OnInit {
   close(){
     this.modalController.dismiss(null);
   }
-  
+
   goBack() {
     this.modalController.dismiss(null);
     window.history.back();
   }
-  
+
 
   runValidation() {
     this.validateFrom  = true
@@ -208,13 +208,13 @@ export class BookMeetingModalPage implements OnInit {
       participantes: new FormControl(this.taskParticipants, [
         Validators.required
       ]),
-      Categories: new FormControl(this.postData.Categories[0], [
+      Categories: new FormControl(this.postData.Categories, [
         Validators.required
       ]),
 
     })
   }
-  
+
 
   async saveTask(){
 
@@ -225,8 +225,8 @@ export class BookMeetingModalPage implements OnInit {
 
 
     if(this.Form.invalid) return false
-    
-    
+
+
     let Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
 
     this.eventBody={
@@ -249,7 +249,7 @@ export class BookMeetingModalPage implements OnInit {
       AppointmentState: 0,
       TimeZone: 'UTC',
       Organizer: null,
-      Categories: ['Reunião'],
+      Categories: 'Reunião',
       HasAttachments: true,
       EventRecurrence: null,
     }
@@ -263,7 +263,7 @@ export class BookMeetingModalPage implements OnInit {
           case 'MDGPR':
             await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise();
             break;
-        
+
           case 'PR':
             await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "pr",this.task.SerialNumber, this.task.FsId).toPromise()
             break;
@@ -289,7 +289,7 @@ export class BookMeetingModalPage implements OnInit {
           case 'MDGPR':
             await this.calendarService.createTaskEvent(this.task.FolderId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise();
             break;
-        
+
           case 'PR':
             await this.calendarService.createTaskEvent(this.task.FolderId, this.postData, "pr",this.task.SerialNumber, this.task.FsId).toPromise();
             break;
@@ -302,7 +302,7 @@ export class BookMeetingModalPage implements OnInit {
       } finally {
         loader.remove()
       }
-      
+
     }
   }
 
@@ -325,7 +325,7 @@ export class BookMeetingModalPage implements OnInit {
       await modal.present();
 
       modal.onDidDismiss().then((data) => {
-        
+
         if(data) {
           data = data['data'];
 
@@ -336,14 +336,14 @@ export class BookMeetingModalPage implements OnInit {
           this.setIntervenientCC(newAttendeesCC);
         }
       });
-      
+
     } else {
       this.showAttendees = true;
     }
   }
 
   async addParticipantsCc() {
-    
+
     this.adding = "CC";
 
     if(window.innerWidth <= 800) {
@@ -361,7 +361,7 @@ export class BookMeetingModalPage implements OnInit {
       await modal.present();
 
       modal.onDidDismiss().then((data) => {
-        
+
         if(data){
           data = data['data'];
 
@@ -414,7 +414,7 @@ export class BookMeetingModalPage implements OnInit {
   removeAttachment(index: number){
     this.documents = this.documents.filter( (e, i) =>  index != i);
   }
-  
+
   validateFormInputs(){
     let formLocation = this.postData.Location.trim();
     if(!this.postData.Location && formLocation.length <= 0){
@@ -434,10 +434,10 @@ export class BookMeetingModalPage implements OnInit {
   setIntervenient(data){
     this.taskParticipants = data;
   }
-  
+
   setIntervenientCC(data){
     this.taskParticipantsCc = data;
   }
 
 
-}
+}

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

@@ -56,7 +56,7 @@ export class ExpedientTaskModalPage implements OnInit {
 
   taskDate: Date;
   taskDescription: string;
-  
+
   loadedAttachments:any;
   documents:SearchDocument[] = [];
 
@@ -104,7 +104,7 @@ export class ExpedientTaskModalPage implements OnInit {
 
       this.loggeduser = userAuth.ValidatedUser;
       this.task = this.navParams.get('task');
-      
+
       this.taskType = this.navParams.get('taskAction');
 
       this.selectedTypes = ['99999850'];
@@ -123,7 +123,7 @@ export class ExpedientTaskModalPage implements OnInit {
         NumberPDPP: this.task.workflowInstanceDataFields.DispatchNumber,
 
       };
-      
+
       this.postData.DispatchFolder = this.dispatchFolder;
       this.postData.UsersSelected = this.participants;
       /* By Default TypeDeadline should be 'Normal' */
@@ -139,7 +139,7 @@ export class ExpedientTaskModalPage implements OnInit {
 
   ngOnInit() {
     console.log(this.postData);
-    
+
     this.taskDate = new Date(this.task.taskStartDate);
     if(!this.task.hasOwnProperty('isEvent')) {
       this.getAttachments();
@@ -162,7 +162,7 @@ export class ExpedientTaskModalPage implements OnInit {
     this.router.navigate(['/home/gabinete-digital/expediente']);
     this.modalController.dismiss(null);
   }
-  
+
   getSubjectType() {
     this.processes.GetSubjectType().subscribe(res=>{
       console.log(res);
@@ -197,7 +197,7 @@ export class ExpedientTaskModalPage implements OnInit {
       // CalendarName: new FormControl(this.postEvent.CalendarName, [
       //   Validators.required
       // ]),
-      // Categories: new FormControl(this.postEvent.Categories[0], [
+      // Categories: new FormControl(this.postEvent.Categories, [
       //   Validators.required
       // ]),
       // IsRecurring: new FormControl(this.postEvent.IsRecurring, [
@@ -209,7 +209,7 @@ export class ExpedientTaskModalPage implements OnInit {
 
     })
   }
-  // 
+  //
   async saveTask(){
 
     if(this.loggeduser.Profile == 'MDGPR') {
@@ -239,7 +239,7 @@ export class ExpedientTaskModalPage implements OnInit {
         UserType:  val.IsRequired?"I": "CC"
       };
     })
-    
+
     let docs = {
       ProcessInstanceID: "",
       Attachments: []
@@ -271,7 +271,7 @@ export class ExpedientTaskModalPage implements OnInit {
                 DispatchFolder: this.dispatchFolder,
                 AttachmentList: docs,
               }
-              
+
               console.log(this.postData);
 
               try {
@@ -279,7 +279,7 @@ export class ExpedientTaskModalPage implements OnInit {
                 this.taskResult = await this.processes.postDespatcho(this.postData).toPromise();
                 await this.toastService.successMessage('Processo efetuado');
                 this.modalController.dismiss();
-                
+
               } catch (error) {
                 await this.toastService.badRequest('Processo não efetuado')
               } finally {
@@ -288,7 +288,7 @@ export class ExpedientTaskModalPage implements OnInit {
 
               console.log('this.taskResult', this.taskResult);
               break;
-    
+
             case '1':
               this.postData = {
                 DistributionType: "Paralelo",
@@ -299,7 +299,7 @@ export class ExpedientTaskModalPage implements OnInit {
                 DispatchFolder: this.dispatchFolder,
                 AttachmentList: docs
               }
-              
+
               let action_parecer = {
                 "serialNumber": this.task.serialNumber,
                 "action": "Tratado",
@@ -313,7 +313,7 @@ export class ExpedientTaskModalPage implements OnInit {
                 this.taskResult = await this.processes.postParecer(this.postData).toPromise();
                 await this.toastService.successMessage('Pedido enviado');
                 this.modalController.dismiss(action_parecer);
-                
+
               } catch (error) {
                 await this.toastService.badRequest('Processo não efetuado')
               } finally {
@@ -324,7 +324,7 @@ export class ExpedientTaskModalPage implements OnInit {
               this.postData = {
                 DistributionType: "Paralelo",
                 CountryCode: 'AO',
-                Priority: this.postData.Priority, 
+                Priority: this.postData.Priority,
                 UserEmail: this.loggeduser.Email,
                 UsersSelected: attendees,
                 DispatchFolder: this.dispatchFolder,
@@ -372,7 +372,7 @@ export class ExpedientTaskModalPage implements OnInit {
               AttachmentList: docs,
             }
             console.log(this.postData);
-            
+
             let action_despacho_pr = {
               "serialNumber": this.task.serialNumber,
               "action": "Tratado",
@@ -394,7 +394,7 @@ export class ExpedientTaskModalPage implements OnInit {
 
             console.log('this.taskResult', this.taskResult);
             break;
-  
+
           case '1':
             this.postData = {
               DistributionType: "Paralelo",
@@ -405,7 +405,7 @@ export class ExpedientTaskModalPage implements OnInit {
               DispatchFolder: this.dispatchFolder,
               AttachmentList: docs
             }
-            
+
             let action_parecer_pr = {
               "serialNumber": this.task.serialNumber,
               "action": "Tratado",
@@ -453,11 +453,11 @@ export class ExpedientTaskModalPage implements OnInit {
         cssClass: 'attendee modal modal-desktop',
         backdropDismiss: false
       });
-  
+
       await modal.present();
-  
+
       modal.onDidDismiss().then((data) => {
-        
+
         if(data){
           data = data['data'];
 
@@ -472,11 +472,11 @@ export class ExpedientTaskModalPage implements OnInit {
       this.showAttendees = true
     }
   }
- 
+
   async setIntervenient(data) {
     this.taskParticipants = data;
   }
-  
+
   async setIntervenientCC(data) {
     this.taskParticipantsCc = data;
   }
@@ -485,7 +485,7 @@ export class ExpedientTaskModalPage implements OnInit {
     this.adding = 'intervenient'
     this.openAttendees();
   }
-  
+
   async addParticipantsCc() {
     this.adding = "CC";
     this.openAttendees();
@@ -507,14 +507,14 @@ export class ExpedientTaskModalPage implements OnInit {
       cssClass: 'discart-expedient-modal',
       backdropDismiss: false
     });
-    
+
     await modal.present();
     modal.onDidDismiss().then(res=>{
       if(res['data']=='close'){
         console.log('Expedient Discard closed');
         this.modalController.dismiss(res['data'])
       }
-      
+
     });
   }
 
@@ -523,13 +523,13 @@ export class ExpedientTaskModalPage implements OnInit {
     if(this.adding == "intervenient"){
       this.taskParticipants = data;
     } else if (this.adding == "CC") {
-      
+
       this.taskParticipantsCc = data;
     }
-    
+
   }
 
-  
+
 
   async closeComponent() {
     this.showAttendees = false;
@@ -586,4 +586,4 @@ export class ExpedientTaskModalPage implements OnInit {
 
   }
 
-}
+}