Merge with peter changes

2026-04-19 04:57:52 +00:00 · 2021-08-30 15:00:44 +01:00
parent 133b832f9b dc87181022
commit 02cf2f0ee9
37 changed files with 560 additions and 208 deletions
@@ -87,6 +87,48 @@
            </div>
          </div>

+          <div class="container-div">
+            <div class="ion-item-class-2">
+              <div class="ion-icon-class">
+                <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*"
+                class="d-block d-md-none"
+                [(ngModel)]="eventProcess.workflowInstanceDataFields.Category"
+                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>
+                  <ion-select-option value="Conferência">Conferência</ion-select-option>
+                  <ion-select-option value="Encontro">Encontro</ion-select-option>
+                </ion-select>
+  
+  
+                <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)]="eventProcess.workflowInstanceDataFields.Category" >
+                    <mat-option value="Reunião">
+                      Reunião
+                    </mat-option>
+                    <mat-option value="Viagem">
+                      Viagem
+                    </mat-option>
+                    <mat-option value="Conferência">
+                      Conferência
+                    </mat-option>
+                    <mat-option value="Encontro">
+                      Encontro
+                    </mat-option>
+                  </mat-select>
+                </mat-form-field>
+  
+  
+              </div>
+            </div>
+          </div>
+
          <div *ngIf="Form && validateFrom" >
            <div *ngIf="Form.get('participantes').invalid " class="input-errror-message">
              <div *ngIf="Form.get('participantes').errors?.required">
@@ -72,6 +72,7 @@ export class EditEventToApprovePage implements OnInit {
    workflowInstanceDataFields:{
      Body: "",
      OccurrenceType: '',
+      Category: '',
      LastOccurrence: '',
      IsRecurring: false,
      ParticipantsList: [],
@@ -146,7 +147,7 @@ export class EditEventToApprovePage implements OnInit {

  async getTask() {

-    this.processes.GetTask(this.serialNumber).subscribe( result =>{
+    this.processes.GetTask(this.serialNumber).subscribe( (result) =>{
      this.eventProcess = result

      this.restoreDatepickerData()
@@ -302,6 +303,7 @@ export class EditEventToApprovePage implements OnInit {
        LastOccurrence: this.eventProcess.workflowInstanceDataFields.LastOccurrence,
      },
      ParticipantsList: this.eventProcess.workflowInstanceDataFields.ParticipantsList,
+      Category: this.eventProcess.workflowInstanceDataFields.Category
    }

    try {
@@ -55,7 +55,7 @@
      </div>
    </div>

-
+   123123
    <div class="container-div">
      <div class="ion-item-class-2 width-100 d-flex">
        <div class="ion-icon-class">
@@ -8,7 +8,7 @@ import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popo
 import { MessagesOptionsPage } from 'src/app/shared/popover/messages-options/messages-options.page';
 import { ContactsPage } from '../new-group/contacts/contacts.page';
 import { Router } from '@angular/router';
-import { connection } from 'src/app/services/socket/synchro.service';
+import { synchro } from 'src/app/services/socket/synchro.service';
 import { ChatOptionsFeaturesPage } from 'src/app/modals/chat-options-features/chat-options-features.page';
 import { ChatMessageStore } from 'src/app/store/chat/chat-message.service';
 import { ChatUserStorage } from 'src/app/store/chat/chat-user.service';
@@ -39,7 +39,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
  @Output() openNewEventPage:EventEmitter<any> = new EventEmitter<any>();


-  connection  = connection;
+  synchro  = synchro;
  chatMessageStore = ChatMessageStore
  chatUserStorage = ChatUserStorage

@@ -152,7 +152,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy

  sendMessage() {

-    this.connection.$send({})
+    this.synchro.$send({})

    let body = {
      "message":
@@ -68,6 +68,49 @@
            </div>
          </div>

+
+          <div class="container-div width-100">
+            <div class="ion-item-class-2">
+              <div class="ion-icon-class">
+                <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*"
+                class="d-block d-md-none"
+                [(ngModel)]="eventProcess.workflowInstanceDataFields.Category"
+                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>
+                  <ion-select-option value="Conferência">Conferência</ion-select-option>
+                  <ion-select-option value="Encontro">Encontro</ion-select-option>
+                </ion-select>
+  
+  
+                <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)]="eventProcess.workflowInstanceDataFields.Category" >
+                    <mat-option value="Reunião">
+                      Reunião
+                    </mat-option>
+                    <mat-option value="Viagem">
+                      Viagem
+                    </mat-option>
+                    <mat-option value="Conferência">
+                      Conferência
+                    </mat-option>
+                    <mat-option value="Encontro">
+                      Encontro
+                    </mat-option>
+                  </mat-select>
+                </mat-form-field>
+  
+  
+              </div>
+            </div>
+          </div>
+
          <div class="container-div width-100">
            <div class="ion-item-class-2 width-100">
              <div class="ion-icon-class">
@@ -68,6 +68,7 @@ export class EditEventToApproveComponent implements OnInit {
    workflowInstanceDataFields:{
      Body: "",
      OccurrenceType: '',
+      Category: '',
      LastOccurrence: '',
      ParticipantsList: [],
      Agenda: '',
@@ -132,41 +133,42 @@ export class EditEventToApproveComponent implements OnInit {
  async getTask() {

    const result = await this.processes.GetTask(this.serialNumber).toPromise();
-      console.log(result);
+    console.log(result);

    this.eventProcess = result
+    this.eventProcess.workflowInstanceDataFields.Category = result.workflowInstanceDataFields.EventType

-      this.startDate = new Date(this.eventProcess.workflowInstanceDataFields.StartDate);
-      this.endDate = new Date(this.eventProcess.workflowInstanceDataFields.EndDate);
+    this.startDate = new Date(this.eventProcess.workflowInstanceDataFields.StartDate);
+    this.endDate = new Date(this.eventProcess.workflowInstanceDataFields.EndDate);

-      // description
-      let body : any =this.eventProcess.workflowInstanceDataFields.Body.replace(/<[^>]+>/g, '')
-      this.eventProcess.workflowInstanceDataFields.Body = body
-      this.Location = this.eventProcess.workflowInstanceDataFields.Location
+    // description
+    let body : any =this.eventProcess.workflowInstanceDataFields.Body.replace(/<[^>]+>/g, '')
+    this.eventProcess.workflowInstanceDataFields.Body = body
+    this.Location = this.eventProcess.workflowInstanceDataFields.Location

-      this.InstanceId = this.eventProcess.workflowInstanceDataFields.InstanceId
-      try {
-        this.getAttachments()
+    this.InstanceId = this.eventProcess.workflowInstanceDataFields.InstanceId
+    try {
+      this.getAttachments()

-      } catch (error) {
+    } catch (error) {

+    }
+
+
+    if(this.eventProcess.workflowInstanceDataFields.IsRecurring == false) {
+      this.isRecurring = "Não se repete";
+    }
+    else {
+      this.isRecurring = "Repete";
+    }
+
+    this.eventProcess.workflowInstanceDataFields.ParticipantsList.forEach(e => {
+      if(e.IsRequired) {
+        this.taskParticipants.push(e);
+      } else {
+        this.taskParticipantsCc.push(e);
      }
-
-
-      if(this.eventProcess.workflowInstanceDataFields.IsRecurring == false) {
-        this.isRecurring = "Não se repete";
-      }
-      else {
-        this.isRecurring = "Repete";
-      }
-
-      this.eventProcess.workflowInstanceDataFields.ParticipantsList.forEach(e => {
-        if(e.IsRequired) {
-          this.taskParticipants.push(e);
-        } else {
-          this.taskParticipantsCc.push(e);
-        }
-      })
+    })
    /* }) */
  }

@@ -254,6 +256,7 @@ export class EditEventToApproveComponent implements OnInit {
        LastOccurrence: this.eventProcess.workflowInstanceDataFields.LastOccurrence,
      },
      ParticipantsList: this.eventProcess.workflowInstanceDataFields.ParticipantsList,
+      Category: this.eventProcess.workflowInstanceDataFields.Category
    }

    console.log(event);
@@ -307,14 +310,19 @@ export class EditEventToApproveComponent implements OnInit {

      modal.onDidDismiss().then((data) => {

-        if(data){
+        if(data) {
          data = data['data'];

          const newAttendees: EventPerson[] = data['taskParticipants'];
          const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];

-          this.setIntervenient(newAttendees);
-          this.setIntervenientCC(newAttendeesCC);
+          if(newAttendees.length) {
+            this.setIntervenient(newAttendees);
+          }
+          if(newAttendeesCC) {
+            this.setIntervenientCC(newAttendeesCC);
+          }
+          
        }
      });
    } else {
@@ -77,8 +77,14 @@
        </div>

        <div class="div-profile d-flex cursor-pointer" (click)="openProfile()">
+          
          <ion-icon class="icon" src='assets/images/icons-profile.svg'></ion-icon>
-          <ion-label class="profile-text">{{profileLabel(loggeduser.Profile)}}</ion-label>
+
+          <div class="profile-text">
+            <ion-label>{{profileLabel(loggeduser.Profile)}}</ion-label>
+            <div *ngIf="this.notificationLength > 0 && !production" class="icon-badge" style="right: -18px;top: -9px;" >{{this.notificationLength}}</div>
+          </div>
+
        </div>
      </div>
    </div>
@@ -7,6 +7,7 @@ import { ProfilePage } from 'src/app/modals/profile/profile.page';
 import { StorageService } from '../../services/storage.service';
 import { SessionStore } from 'src/app/store/session.service';
 import { NotificationsService } from '../../services/notifications.service';
+import { environment } from 'src/environments/environment';

@Component({
  selector: 'app-header',
@@ -24,6 +25,8 @@ export class HeaderPage implements OnInit {
  notificationLength: 0;
  SessionStore = SessionStore

+  production = environment.production
+  
  constructor(
    private router: Router,
    private modalController: ModalController,
@@ -46,8 +49,6 @@ export class HeaderPage implements OnInit {
    } else {
      this.UpdateNotificationCount();
    }
-    
-    

  }

@@ -154,7 +155,8 @@ export class HeaderPage implements OnInit {
      componentProps: {
      }
    });
-    return await modal.present();
+    await modal.present();
+    
  }

  async dynamicSearch() {
@@ -26,7 +26,7 @@ export class ProfileComponent implements OnInit {

    this.loggeduser = authService.ValidatedUser;

-    console.log(this.loggeduser.RoleDescription)
+    // console.log(this.loggeduser.RoleDescription)

    this.checkState()
  }