merge with developer

2026-04-19 13:02:56 +00:00 · 2021-09-21 06:16:06 +01:00
parent 42ae5de817 102b504cbd
commit f84e6a4352
42 changed files with 934 additions and 296 deletions
@@ -189,7 +189,7 @@ export class EditEventPage implements OnInit {
    }

    this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc)
-  
+
    this.postEvent.EventRecurrence.Type = this.selectedRecurringType;

    this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
@@ -204,7 +204,7 @@ export class EditEventPage implements OnInit {
      finally {
        this.goBack();
      }
-        
+
      }
      this.toastService.successMessage();

@@ -213,7 +213,7 @@ export class EditEventPage implements OnInit {
    });

    this.isEventEdited = true;
-    
+
    this.modalController.dismiss(this.isEventEdited);


@@ -285,7 +285,7 @@ export class EditEventPage implements OnInit {
          if(newAttendeesCC) {
            this.setIntervenientCC(newAttendeesCC);
          }
-          
+
        }
      });
    }
@@ -3,7 +3,12 @@
 </ion-header>

 <ion-content class="main-content-l height-100 white ">
-  
+  <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+    <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
+    <ion-refresher-content>
+    </ion-refresher-content>
+  </ion-refresher>
+
  <div class="main-content d-flex height-100" [className]="isModal ? '_main-content d-flex height-100 ma-0 px-20 pt-30 pb-20 background-white' : 'main-content d-flex height-100'">
    <div class="content d-flex flex-column width-100">
      <div class="main-header  d-flex">
@@ -22,29 +27,29 @@
            </button>
            <button class="btn-no-color" (click)="deleteEvent()">
              <ion-icon class="delete"  name="trash-sharp"></ion-icon>
-            </button> 
+            </button>
          </div>
        </div>
      </div>

      <div class="overflow-y-auto">
        <div class="upper-content ml-45">
-          
+
          <div class="content-location">
            <span class="date">{{loadedEvent.Location}}</span>
-            
+
            <div *ngIf="loadedEvent.Organizer">
              <div *ngIf="loadedEvent.Organizer.Name == 'Agenda do Presidente da República' ">
                <span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' " style="background-color: #99e47b;">{{loadedEvent.CalendarName}}</span>
                <span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' " style="background-color: #958bfc;">{{loadedEvent.CalendarName}}</span>
              </div>
-      
+
              <div *ngIf="loadedEvent.Organizer.Name == 'Agenda do Ministro e Director do Gabinete do PR' ">
                <span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' "  style="background-color: #ffb703;">{{loadedEvent.CalendarName}}</span>
                <span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' " style="background-color: #f05d5e;">{{loadedEvent.CalendarName}}</span>
              </div>
            </div>
-    
+
          </div>

          <div class="content-details">
@@ -76,8 +81,8 @@
            <div class="line"></div>
          </div>
        </div>
-      
-        <div *ngIf="loadedAttachments" class="bottom-content width-100">
+
+        <div *ngIf="loadedEvent.Attachments" class="bottom-content width-100">
          <h5>Documentos Anexados</h5>
          <ion-list class="width-100">
            <ion-item *ngFor="let attach of loadedEvent.Attachments; let i = index" class="width-100" class="ion-no-margin ion-no-padding">
@@ -86,20 +91,20 @@
                  <span class="attach-title-item d-block">{{attach.SourceName}}</span>
                  <span class="span-left d-block">{{attach.Stakeholders}}</span>
                </p>
-    
+
                <div class="d-flex pr-10">
                  <span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</span>
                </div>
-    
+
                <div (click)="docIndex(i);openTaskOptions()" class="cursor-pointer" style="width: 35px; height: 41px;" autoHide="false">
                  <ion-icon src="assets/images/icons-menu.svg"  ></ion-icon>
                </div>
-    
+
              </ion-label>
            </ion-item>
          </ion-list>
        </div>
-        
+
      </div>

    </div>
@@ -110,6 +115,6 @@
        <button (click)="deleteEvent()" full class="btn-delete" shape="round" >Eliminar</button>
      </div>
    </div>
-    
-  </div>    
-</ion-content>
+
+  </div>
+</ion-content>
@@ -150,6 +150,11 @@ export class ViewEventPage implements OnInit {

  }

+  doRefresh(ev){
+    this.loadEvent();
+    ev.target.complete();
+  }
+
  loadEvent() {
    const loader = this.toastService.loading();
    this.eventsService.getEvent(this.eventId).subscribe(res => {
@@ -159,12 +164,12 @@ export class ViewEventPage implements OnInit {
      this.customDate = this.days[this.today.getDay()]+ ", "  + this.today.getDate() +" de "  + ( this.months[this.today.getMonth()]); */
      loader.remove()
    }, (error)=>{
-      
+
      if(error.status == 0) {
        this.toastService.badRequest('Não é possível  vizualizar este evento no modo offline')
      } else {
        this.toastService.badRequest('Este evento já não existe na sua agenda')
-      } 
+      }

      loader.remove()
      this.modalController.dismiss('Eevent not Foud');
@@ -173,7 +178,7 @@ export class ViewEventPage implements OnInit {
  }

  deleteEvent(){
-    this.eventsService.deleteEvent(this.loadedEvent.EventId, 0).subscribe(async () =>
+    this.eventsService.deleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName).subscribe(async () =>
      {
        const alert = await this.alertController.create({
          cssClass: 'my-custom-class',
@@ -191,7 +196,7 @@ export class ViewEventPage implements OnInit {


  async OpenDeleteEventModal() {
-    
+
    const modal = await this.modalController.create({
      component: EliminateEventPage,
      componentProps: {