change text, fixe create and edit event

src/app/pages/agenda/edit-event/edit-event.page.ts

@@ -87,7 +87,7 @@ export class EditEventPage implements OnInit {
 
   sesseionStora = SessionStore
   environment = environment
-  
+
   constructor(
     private modalController: ModalController,
     private navParams: NavParams,
@@ -111,7 +111,7 @@ export class EditEventPage implements OnInit {
     this.initCalendarName = this.postEvent.CalendarName;
 
 
-    
+
     for(const index in this.postEvent.Attendees) {
       const user = this.postEvent.Attendees[index]
 
@@ -119,7 +119,7 @@ export class EditEventPage implements OnInit {
       if(userData) {
         this.postEvent.Attendees[index].UserType = userData.UserType
       }
-      
+
     }
 
 
@@ -199,13 +199,13 @@ export class EditEventPage implements OnInit {
   }
 
   goBack() {
-    
+
     this.router.navigate(['/home',this.caller]);
   }
 
   getRecurrenceTypes() {
     this.eventsService.getRecurrenceTypes().subscribe(res=>{
-      
+
       this.recurringTypes = res;
     });
   }
@@ -216,7 +216,7 @@ export class EditEventPage implements OnInit {
     date.setSeconds(0);
 
     if(minutes % 15 != 0) {
-      
+
       if (minutes > 45) {
         date.setMinutes(60)
       } else if (minutes > 30) {
@@ -227,7 +227,7 @@ export class EditEventPage implements OnInit {
         date.setMinutes(15)
       }
 
-    } 
+    }
 
     return date
   }
@@ -236,15 +236,15 @@ export class EditEventPage implements OnInit {
     const _date = new Date(date);
     const minutes = _date .getMinutes();
     _date .setMinutes(minutes + 15)
-    return _date 
+    return _date
   }
 
   onSelectedRecurringChanged(ev?:any) {
 
     this.calculetedLastOccurrence(ev);
-    
+
     if(ev.length > 1){
-      
+
       this.selectedRecurringType = ev.filter(data => data != '-1');
     }
     if(ev.length == 0){
@@ -254,7 +254,7 @@ export class EditEventPage implements OnInit {
 
   calculetedLastOccurrence(type:number){
     // console.log(type);
-    var valor; 
+    var valor;
     var opcao: boolean;
     if (type == 0) {
       valor = 7;
@@ -280,15 +280,15 @@ export class EditEventPage implements OnInit {
       this.postEvent.EventRecurrence.LastOccurrence = time;
     } else {
       time = new Date(
-        time.getFullYear() + valor, 
-        time.getMonth(), 
-        time.getDate(), 
-        time.getHours(), 
+        time.getFullYear() + valor,
+        time.getMonth(),
+        time.getDate(),
+        time.getHours(),
         time.getMinutes()
       );
       this.postEvent.EventRecurrence.LastOccurrence = time;
     }
-    
+
   }
 
 
@@ -332,7 +332,7 @@ export class EditEventPage implements OnInit {
   openInicio() {
     let input: any = document.querySelector('#new-inicio')
     if(input) {
-      
+
       input.click()
     }
   }
@@ -366,7 +366,7 @@ export class EditEventPage implements OnInit {
 
     this.postEvent.EventRecurrence.Type = this.selectedRecurringType;
 
-    if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') {  
+    if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') {
       this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
 
         if(window['reloadCalendar']) {
@@ -374,7 +374,7 @@ export class EditEventPage implements OnInit {
         }
 
         if(this.initCalendarName != this.postEvent.CalendarName) {
-  
+
           let body = {
             "EventId": this.postEvent.EventId,
             "CalendarDestinationName": this.postEvent.CalendarName,
@@ -384,11 +384,11 @@ export class EditEventPage implements OnInit {
           } catch (error) {}
           finally {
           }
-  
+
         }
-  
+
         this.httpErrorHandle.httpsSucessMessagge('Editar evento')
-  
+
       }, error => {
         this.httpErrorHandle.httpStatusHandle(error)
       });
@@ -398,9 +398,9 @@ export class EditEventPage implements OnInit {
         if(window['reloadCalendar']) {
           window['reloadCalendar']()
         }
-        
+
         if(this.initCalendarName != this.postEvent.CalendarName) {
-  
+
           let body = {
             "EventId": this.postEvent.EventId,
             "CalendarDestinationName": this.postEvent.CalendarName,
@@ -410,22 +410,22 @@ export class EditEventPage implements OnInit {
           } catch (error) {}
           finally {
           }
-  
+
         }
-  
+
         this.httpErrorHandle.httpsSucessMessagge('Editar evento')
-  
+
       }, error => {
         this.httpErrorHandle.httpStatusHandle(error)
       });
     }
 
-    
+
 
     this.isEventEdited = true;
 
 
-    /* await this.saveDocument() */
+    await this.saveDocument()
 
     this.goBack();
   }
@@ -434,7 +434,7 @@ export class EditEventPage implements OnInit {
   async saveDocument() {
 
     try {
-      
+
       for( let e of this.loadedEventAttachments) {
         const id: any = e.Id
         const remove = e['remove']
@@ -452,7 +452,7 @@ export class EditEventPage implements OnInit {
             SerialNumber: '',
           };
 
-          await this.attachmentsService.setEventAttachmentById(DocumentToSave).toPromise();
+          // await this.attachmentsService.setEventAttachmentById(DocumentToSave).toPromise();
 
         } else if(remove) {
           await this.attachmentsService.deleteEventAttachmentById(e.Id).toPromise()
@@ -461,7 +461,7 @@ export class EditEventPage implements OnInit {
     } catch (error) {
 
     } finally {
-      
+
     }
 
     this.modalController.dismiss({
@@ -545,13 +545,13 @@ export class EditEventPage implements OnInit {
     if(this.postEvent.HasAttachments) {
       this.attachmentsService.getAttachmentsById(eventId).subscribe(res=>{
         this.loadedEventAttachments = res;
-        
+
       },((erro) => {
         console.error('editgetAttchament', erro)
-      }));  
+      }));
     }
 
-    
+
   }
 
   deleteAttachment(attachmentID: string, index) {
@@ -597,7 +597,7 @@ export class EditEventPage implements OnInit {
           SerialNumber: '',
         }
 
-        
+
         this.loadedEventAttachments.push(ApplicationIdDocumentToSave)
         this.postEvent.Attachments = this.loadedEventAttachments;
 
@@ -613,17 +613,17 @@ export class EditEventPage implements OnInit {
     setTimeout(() => {
 
       if(this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Oficial'] &&  this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Pessoal']) {
-      
+
         this.CalendarNamesOptions = ['Oficial', 'Pessoal']
-  
+
       } else if (this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Oficial']) {
         this.CalendarNamesOptions = ['Oficial']
         this.postEvent.CalendarName = 'Oficial'
-  
+
       } else if (this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Pessoal']) {
         this.CalendarNamesOptions = ['Pessoal']
         this.postEvent.CalendarName = 'Pessoal'
-  
+
       } else {
         this.CalendarNamesOptions = ['Oficial', 'Pessoal']
       }

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

@@ -1,7 +1,7 @@
 <ion-header class="ion-no-border header-2">
   <app-task-list-header
     [goBackButton] = true
-    [headerName] = environment.dispatchPR
+    [headerName] = headerName
     [ordinance] = ordinance
     [loading] = skeletonLoader
     (reorderList) = reorderList($event)

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

@@ -16,6 +16,7 @@ import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
 import { environment } from 'src/environments/environment';
 import { TaskService } from 'src/app/services/task.service'
 import { RouteService } from 'src/app/services/route.service';
+import { PermissionService } from 'src/app/services/permission.service';
 
 @Component({
   selector: 'app-despachos-pr',
@@ -58,6 +59,7 @@ export class DespachosPrPage implements OnInit {
   list = []
 
   ordinance: string =  'old'
+  headerName = ''
 
   constructor(
     private processes: ProcessesService,
@@ -69,10 +71,16 @@ export class DespachosPrPage implements OnInit {
     public ThemeService: ThemeService,
     public TaskService: TaskService,
     private RouteService: RouteService,
+    public p: PermissionService,
   ) {
 
     this.profile = 'mdgpr';
 
+    if(this.p.userPermission([this.p.permissionList.Gabinete.md_tasks])) {
+      this.headerName = `Despachos ${ environment.despachoLabel }`
+    } else {
+      this.headerName = "Despachos criados por mim"
+    }
   }
 
   ngOnInit() {
@@ -97,7 +105,7 @@ export class DespachosPrPage implements OnInit {
     this.backgroundservice.registerBackService('Online', () => {
       this.LoadList()
     });
-    
+
     this.dynamicSearch()
   }
 
@@ -115,7 +123,7 @@ export class DespachosPrPage implements OnInit {
   async dynamicSearch() {
 
     if(this.showSearch && this.searchSubject) {
-      
+
       const searchedList =this.TaskService.despachoprstore.list.filter((task) => {
         let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
         subject = subject.toLowerCase();
@@ -124,7 +132,7 @@ export class DespachosPrPage implements OnInit {
 
       this.list = this.TaskService.reorderList(this.ordinance, searchedList)
     } else {
-      
+
       const list = this.TaskService.despachoprstore.list
       this.list = this.TaskService.reorderList(this.ordinance, list)
     }
@@ -144,7 +152,7 @@ export class DespachosPrPage implements OnInit {
   }
 
   openExpedientDetailPage(data) {
-    
+
   }
 
   async LoadList() {
@@ -156,25 +164,25 @@ export class DespachosPrPage implements OnInit {
       let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
       this.despachoList = [];
       this.skeletonLoader = false;
-      
+
 
       let despachosPr;
       let despachos = this.sortService.sortArrayByDate(result);
 
       if(SessionStore.user.Profile != "PR") {
-        
-        
+
+
         if(SessionStore.user.Profile != 'Consultant') {
           despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
         } else {
           despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Gerar Diploma" || data.activityInstanceName == "Retificar Diploma");
         }
-        
+
       } else if (SessionStore.user.Profile == "PR") {
         despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Concluir Despacho");
       }
 
-      
+
       despachosPr = despachosPr.filter(data => data.workflowInstanceDataFields.Status == "Active");
 
       despachosPr.forEach((element, index) => {
@@ -188,12 +196,12 @@ export class DespachosPrPage implements OnInit {
         this.despachoList.push(task);
       });
 
-      
+
       this.despachoList = this.sortService.sortDate(this.despachoList, 'CreateDate')
       this.despachoprstore.reset(this.despachoList)
 
     } catch(error) {
-      
+
     }
 
     this.skeletonLoader = false
@@ -217,7 +225,7 @@ export class DespachosPrPage implements OnInit {
   }
 
   async viewExpedientDetail(serialNumber: any) {
-    
+
 
     let classs;
     if (window.innerWidth <= 800) {
@@ -235,9 +243,9 @@ export class DespachosPrPage implements OnInit {
       },
       cssClass: classs,
     });
- 
+
     modal.onDidDismiss().then((res) => {
-      
+
       this.LoadList();
     }, (error) => {
       console.log(error)

src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html

@@ -50,7 +50,8 @@
       </button>
     </div>
     <div class="bottom-title d-flex">
-      <h3 class="bottom-text">Diplomas por Assinar PR</h3>
+      <h3 class="bottom-text" *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])">Diplomas por Assinar PR</h3>
+      <h3 class="bottom-text" *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])">Diplomas para Assinar PR</h3>
     </div>
   </div>
 </ion-header>
@@ -143,4 +144,4 @@
     </div>
   </div>
 
-</ion-content>
+</ion-content>

src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss

@@ -3,21 +3,21 @@
 :host{
     margin: 0;
   }
-  
+
   .header-2 {
     border-top-right-radius: 24px;
     border-top-left-radius: 24px;
   }
-  
+
   ion-content, .header-2, .main-content{
     padding: 30px 20px 0 20px !important;
     background-color: white;
   }
-  
+
   .main-content {
     padding-top: 0px !important;
   }
-  
+
 .title{
     font-family: Roboto;
     font-size: rem(25);
@@ -42,7 +42,7 @@
     .bottom-text{
       font-size: rem(15) !important;
       font-family: Roboto !important;
-      color: #0d89d1 !important;
+      color: black !important;
     }
   }
 .item-list-small{
@@ -51,7 +51,7 @@
   }
   .ion-item-class{
     padding: 0;
-  
+
   }
   .label-text{
     width: 100%;
@@ -97,7 +97,7 @@ ion-item{
   .div-icon ion-icon{
     display: block;
     margin: 0 auto;
-  
+
   }
   .div-content-expediente p, .div-content-pendentes p{
     font-size: rem(19);
@@ -176,7 +176,7 @@ ion-item{
   .exp-workflow{
     float: left;
     margin: 0 !important;
-  
+
     .label{
       border-radius: 15px;
       background: var(--label-bg-color);
@@ -239,4 +239,5 @@ ion-item{
   font-size: rem(45);
   float: right;
   margin-right: 10px;
-}
+}
+

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

@@ -7,6 +7,7 @@ import { ThemeService } from 'src/app/services/theme.service'
 import { DeplomasStore } from 'src/app/store/deplomas.service';
 import { TaskService } from 'src/app/services/task.service'
 import { RouteService } from 'src/app/services/route.service';
+import { PermissionService } from 'src/app/services/permission.service';
 
 @Component({
   selector: 'app-diplomas-assinar',
@@ -37,7 +38,8 @@ export class DiplomasAssinarPage implements OnInit {
    private router: Router,
   public ThemeService: ThemeService,
   public TaskService: TaskService,
-  private RouteService: RouteService,) {
+  private RouteService: RouteService,
+  public p: PermissionService,) {
    }
 
   ngOnInit() {
@@ -69,7 +71,7 @@ export class DiplomasAssinarPage implements OnInit {
   async dynamicSearch() {
 
     if(this.showSearch && this.searchSubject) {
-      
+
       const list = this.TaskService.despachoStore.list.filter((task) => {
         let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
         subject = subject.toLowerCase();