Merge branch 'develop' of bitbucket.org:equilibriumito/gabinete-digital-fo into feature/aganda-show-list-box

src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html

@@ -8,6 +8,7 @@
 
   <div class="buttons">
     <button *ngIf="activityInstanceName == 'Aprovar Evento'" class="btn-cancel" shape="round" (click)="emendarTask()">Rever</button>
+    <button *ngIf="activityInstanceName == 'Aprovar Evento'" class="btn-cancel" shape="round" (click)="editTask()">Editar</button>
     <button *ngIf="activityInstanceName == 'Aprovar Evento'" class="btn-cancel" shape="round" (click)="approveTask()">Aprovar</button>
     <div class="solid"></div>
     <button *ngIf="activityInstanceName != 'Aprovar Evento'" class="btn-cancel" shape="round" (click)="editTask()">Editar</button>

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

@@ -57,7 +57,7 @@
             <ion-label>
               <p>{{customDate}}</p>
               <p>das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}</p>
-              <p>
+              <p *ngIf="loadedEvent.EventRecurrence">
                 <span *ngIf="loadedEvent.EventRecurrence.Type == 0">Diário</span>
                 <span *ngIf="loadedEvent.EventRecurrence.Type == 1">Semanal</span>
                 <span *ngIf="loadedEvent.EventRecurrence.Type == 2">Mensal</span>

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

@@ -166,7 +166,9 @@ export class ViewEventPage implements OnInit {
           window.history.back();
         }
         else {
-          this.router.navigate(['/home', params["params"].caller]);
+          // this.router.navigate(['/home', params["params"].caller]);
+          this.RouteService.goBack();
+          
         }
       });
     }

src/app/pages/chat/group-messages/group-messages.page.html

@@ -11,7 +11,7 @@
         </div>
         <div class="middle-container" *ngIf="!showMessageOptions">
           <div class="middle add-ellipsis">
-            <ion-label class="title">{{wsChatMethodsService.getGroupRoom(roomId).name}}</ion-label>
+            <ion-label class="title">{{groupNameFormart}}</ion-label>
           </div>
         </div>
         <div class="middle-container-options" *ngIf="showMessageOptions">

src/app/pages/chat/group-messages/group-messages.page.ts

@@ -68,6 +68,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
   selectedMsgId: string;
   roomCountDownDate: any;
   downloadFile: any;
+  groupNameFormart = "";
 
   @ViewChild('scrollMe') private myScrollContainer: ElementRef;
 
@@ -82,6 +83,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
   showAvatar = true;
   audioPermissionStatus: 'granted'| 'denied' | 'prompt' | null = null
   sessionStore = SessionStore
+  isAdmin = false;
   constructor(
     private modalController: ModalController,
     public popoverController: PopoverController,
@@ -116,6 +118,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
     this.wsChatMethodsService.getGroupRoom(this.roomId).loadHistory({});
     this.wsChatMethodsService.getGroupRoom(this.roomId).scrollDown = this.scrollToBottomClicked;
     this.wsChatMethodsService.openRoom(this.roomId)
+    this.groupNameFormart = this.wsChatMethodsService.getGroupRoom(this.roomId).name.split('-').join(' ') 
 
     setTimeout(() => {
       this.scrollToBottomClicked()
@@ -362,7 +365,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
     } catch (err) { }
   }
 
-  getRoomInfo() {
+  async getRoomInfo() {
     this.showLoader = true;
     // this.chatService.getRoomInfo(this.roomId).subscribe(room => {
     //   this.room = room['room'];
@@ -373,6 +376,24 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
     //   this.getGroupContacts(this.room);
     //   this.showLoader = false;
     // });
+    this.wsChatMethodsService.getGroupRoom(this.roomId).loadHistory({});
+    let room = await this.chatService.getRoomInfo(this.roomId).toPromise();
+    // console.log('ROOM',room)
+    this.room = room['room'];
+    if (this.room.name) {
+      this.roomName = this.room.name.split('-').join(' ');
+    }
+    
+
+    if(SessionStore.user.ChatData.data.userId == this.room.u._id){
+      this.isAdmin = true
+    } else {
+      this.isAdmin = false
+    }
+
+    if (this.room.customFields.countDownDate) {
+      this.roomCountDownDate = this.room.customFields.countDownDate;
+    }
   }
 
   async getChatMembers() {
@@ -507,6 +528,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
       componentProps: {
         roomId: this.roomId,
         members: this.members,
+        isAdmin: this.isAdmin,
       },
     });
     await modal.present();

src/app/pages/events/events.page.ts

@@ -24,6 +24,7 @@ import { ThemeService } from 'src/app/services/theme.service'
 import { Storage } from '@ionic/storage';
 import { PermissionList } from 'src/app/models/permission/permissionList';
 import { PermissionService } from 'src/app/services/permission.service';
+import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
 @Component({
   selector: 'app-events',
   templateUrl: './events.page.html',
@@ -471,6 +472,22 @@ export class EventsPage implements OnInit {
 
   }
 
+  async openEventDetail(id: any) {
+    // 
+
+    const modal = await this.modalController.create({
+      component: ViewEventPage,
+      componentProps: {
+        eventId: id,
+      },
+      cssClass: 'view-event',
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss();
+
+  }
+
   LoadList() {
     this.processes.GetTaskListExpediente(false).subscribe(result => {
       // 

src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html

@@ -101,9 +101,8 @@
       </div>
 
     <div *ngIf="loadedEvent" class="aside-right flex-column height-100">
-      {{ loadedEvent.activityInstanceName }}
       <div class="aside-buttons">
-        <button full class="btn-cancel" shape="round" *ngIf="loadedEvent.activityInstanceName == 'Aprovar Evento'">Editar evento</button>
+        <button (click)="editar(loadedEvent.serialNumber)" full class="btn-cancel" shape="round" *ngIf="loadedEvent.activityInstanceName == 'Aprovar Evento'">Editar evento</button>
         <button (click)="approveTask(loadedEvent.serialNumber)" full class="btn-cancel" shape="round" *ngIf="loadedEvent.activityInstanceName == 'Aprovar Evento'">Aprovar</button>
         <button (click)="emendTask(loadedEvent.serialNumber)" class="btn-cancel" shape="round" >Rever</button>
         <div class="solid"></div>