Merge

src/app/shared/agenda/approve-event/approve-event.component.html

@@ -21,7 +21,7 @@
     <ion-list>
       <ion-item (click)="approveTask(loadedEvent.serialNumber)">
         <ion-icon name="checkmark-sharp"></ion-icon>
-        <ion-label>Aprovar</ion-label>
+        <ion-label>Aprovar3</ion-label>
       </ion-item>
       <ion-item (click)="emendTask(loadedEvent.serialNumber)">
         <ion-icon name="create-outline"></ion-icon>
@@ -65,6 +65,7 @@
           </ion-label>
         </div>
       </div>
+      <div class="line"></div>
       <div class="middle-content">
         <h5>Intervenientes</h5>
         <ion-item class="ion-no-margin ion-no-padding">

src/app/shared/agenda/approve-event/approve-event.component.ts

@@ -71,8 +71,12 @@ export class ApproveEventComponent implements OnInit {
     })
   }
   approveTask(serialNumber:string){
-
-    this.approveEventDismiss.emit({ 
+    let body = { "serialNumber": serialNumber, "action": "Aprovar" }
+    console.log(body);
+    this.processes.PostTaskAction(body);
+    this.alertService.presentAlert('Operação realizada com sucesso!');
+    this.modalController.dismiss(serialNumber);
+    /* this.approveEventDismiss.emit({ 
       "serialNumber": serialNumber,
       "action": "Aprovar", 
       "saveData": {
@@ -80,7 +84,7 @@ export class ApproveEventComponent implements OnInit {
         today: this.today,
         customDate: this.customDate
       }
-    });
+    }); */
   }
 
   emendTask(serialNumber:string){

src/app/shared/agenda/edit-event/edit-event.component.html

@@ -3,7 +3,7 @@
     <div class="main-header">
       <div class="title-content">
         <div class="middle">
-          <ion-label class="title">Editar Evento</ion-label>
+          <ion-label class="title">2Editar Evento</ion-label>
         </div>
       </div>
     </div>
@@ -177,10 +177,8 @@
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
         </div>
-        <div class="ion-input-class-no-height flex-grow-1">
-          
-          <ion-textarea  [(ngModel)]="postEvent.Body.Text"  placeholder="Detalhes" ></ion-textarea>
-          
+        <div class="ion-input-class-no-height width-100">
+          <ion-textarea [(ngModel)]="postEvent.Body.Text"  placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
         </div>
       </div>
     </div>

src/app/shared/agenda/edit-event/edit-event.component.scss

@@ -57,7 +57,6 @@ ion-content{
         margin-bottom: 15px;
       }
       .ion-item-class-2{
-
         margin: 0px auto;
       }
       .ion-icon-class{
@@ -81,8 +80,11 @@ ion-content{
         float: left;
       }
       .ion-input-class-no-height{
+        height: auto !important;
         border: 1px solid #ebebeb;
         border-radius: 5px;
+        margin-bottom: 15px;
+        overflow: auto;
       }
       .list-people{
 
@@ -165,11 +167,4 @@ ion-content{
         color:red;
       }
 
-  }
-
-
-.container-div{
-  ion-textarea{
-    height: 81px;
-  }
-}
+  }

src/app/shared/agenda/edit-event/edit-event.component.ts

@@ -36,10 +36,15 @@ export class EditEventComponent implements OnInit {
     private eventsService: EventsService,
     public alertController: AlertController,
   ) { 
+   
 
   }
 
   ngOnInit() {
+    let innerHtml :string = this.postEvent.Body.Text;
+    this.postEvent.Body.Text = innerHtml;
+    console.log(this.postEvent);
+    
     this.isEventEdited = false;
 
     if(this.postEvent.IsRecurring == false){
@@ -49,13 +54,13 @@ export class EditEventComponent implements OnInit {
       this.isRecurring = "Repete";
     }
   }
+  
   close(){
     console.log('!!!!!!!!!!!!!!!!! close')
     this.closeComponent.emit();
     this.clearContact.emit();
   }
   save(){
-
     this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
       const alert = await this.alertController.create({
         cssClass: 'my-custom-class',

src/app/shared/agenda/event-list/event-list.component.html

@@ -49,7 +49,7 @@
            <ion-item
              class=" ion-no-padding width-100"
              *ngFor="let event of eventsPRList"
-             (click)="openApproveModal(event.serialNumber)">
+             (click)="openApproveModal(event.serialNumber, event)">
              <div class="item event-pr-{{event.workflowInstanceDataFields.Agenda}} width-100">
                  <div class="approve-event-time">
                    <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>

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

@@ -32,6 +32,7 @@
         </ion-label>
       </div>
     </div>
+    <div class="line"></div>
     <div class="middle-content">
       <div *ngIf="loadedEvent.Attendees">
         <h5>Intervenientes</h5>
@@ -44,22 +45,24 @@
         </ion-item>
       </div>
       <h5>Detalhes</h5>
-      <ion-item class="ion-no-margin ion-no-padding">
-          <p [innerHTML]="loadedEvent.Body.Text"></p>
+      <ion-item lines="none" class="ion-no-margin ion-no-padding">
+          <ion-textarea [innerHTML]="loadedEvent.Body.Text"></ion-textarea>
       </ion-item>
     </div>
+    <div class="line"></div>
   
     <div *ngIf="loadedAttachments" class="bottom-content">
+      <h5>Documentos Anexados</h5>
       <ion-list>
-        <h3>Documentos Anexados</h3>
-        <ion-item class="ion-no-margin ion-no-padding">
+        <ion-item lines="none" class="ion-no-margin ion-no-padding">
         <ion-label *ngFor="let attach of loadedAttachments"
-        (click)="viewDocument()">
+        (click)="viewDocument(attach.SourceId)">
           <p class="attach-title-item">{{attach.SourceName}}</p>
           <p><span class="span-left">{{attach.Stakeholders}}</span><span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yy' }}</span></p>
         </ion-label>
       </ion-item>
       </ion-list>
     </div>
+    <!-- <div class="line"></div> -->
   </div>    
 </ion-content>

src/app/shared/agenda/view-event/view-event.page.scss

@@ -123,6 +123,10 @@ ion-menu{
             font-size: 16px;
         }
       }
+      .line{
+        margin-top: 15px;
+        border-top: 1px solid #d8d8d8;
+      }
       .middle-conten{
         .middle-content h3, .middle-content p{
           font-size: 16px;

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

@@ -7,6 +7,7 @@ import { EventsService } from 'src/app/services/events.service';
 import { Event } from 'src/app/models/event.model';
 import { EditEventPage } from 'src/app/pages/agenda/edit-event/edit-event.page';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
+import { ProcessesService } from 'src/app/services/processes.service';
 
 @Component({
   selector: 'app-view-event',
@@ -42,24 +43,26 @@ export class ViewEventPage implements OnInit {
     private attachmentsService: AttachmentsService,
     public alertController: AlertController,
     private iab: InAppBrowser,
+    private processes: ProcessesService,
   ) 
   {
     this.isEventEdited = false;
     this.loadedEvent = new Event();
     this.eventBody = { BodyType : "1", Text : ""};
     this.loadedEvent.Body = this.eventBody;
+    
   }
 
   ngOnInit() {
+   
     /* console.log(this.eventId); */
     this.loadEvent();
-    this.getAttachments();
-    
+    //this.getAttachments();
   }
   
   ngOnChanges(changes: any): void {
+    this.loadedAttachments = null;
     this.loadEvent();
-    this.getAttachments();
   }
 
   close(){
@@ -73,12 +76,11 @@ export class ViewEventPage implements OnInit {
   loadEvent(){
     this.eventsService.getEvent(this.eventId).subscribe(res => {
       this.loadedEvent = res;
-
       console.log(res);
-      
       this.today = new Date(res.StartDate);
       console.log(new Date(this.today));
       this.customDate = this.days[this.today.getDay()]+ ", "  + this.today.getDate() +" de "  + ( this.months[this.today.getMonth()]);
+      this.getAttachments(this.loadedEvent.EventId);
     });
   }
   deleteEvent(){
@@ -95,8 +97,8 @@ export class ViewEventPage implements OnInit {
       });  
   }
 
-  getAttachments(){
-    this.attachmentsService.getAttachmentsById(this.eventId).subscribe(res=>{
+  getAttachments(eventId){
+    this.attachmentsService.getAttachmentsById(eventId).subscribe(res=>{
       this.loadedAttachments = res;
       console.log(res);
     });
@@ -109,10 +111,15 @@ export class ViewEventPage implements OnInit {
       event: this.loadedEvent
     })
   }
-  viewDocument(){
-    const url: string = this.loadedAttachments.DocumentURL.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
-    const browser = this.iab.create(url,"_blank");
-    browser.show();
+  
+  viewDocument(sourceId){
+    this.processes.GetDocumentUrl(sourceId, '8').subscribe(res=>{
+      console.log(res);
+      const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
+      const browser = this.iab.create(url,"_blank");
+      browser.show();
+      
+    });
   }
 
 }

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts

@@ -67,7 +67,7 @@ S
   }
   async openApproveModal(eventSerialNumber){
     let classs;
-    if( window.innerWidth <= 1024){
+    if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
     } else  {
       classs = 'modal modal-desktop showAsideOptions'
@@ -81,7 +81,11 @@ S
       cssClass: classs,
     });
     await modal.present();
-    modal.onDidDismiss();
+    modal.onDidDismiss().then((res) => {
+      console.log(res['data']);
+      
+      this.LoadToApproveEvents();
+    });
   }
 
   doRefresh(event) {

src/app/shared/publication/new-publication/new-publication.page.html

@@ -29,9 +29,9 @@
     </div>
   </div>
   
-  <div class="container-title py-10">Fotografia Anexada</div>
+  <div class="container-title py-10 hide-desktop">Fotografia Anexada</div>
 
-  <div class="picture d-flex pb-5" *ngIf="publication.FileBase64.length > 10">
+  <div class="picture d-flex pb-5 hide-desktop" *ngIf="publication.FileBase64.length > 10">
     <div  class="post-img">
       <img src="{{publication.FileBase64}}" alt="image" >
     </div>
@@ -45,7 +45,7 @@
     
   </div>
 
-  <div *ngIf="capturedImage != ''" class="ion-item-container-no-border">
+  <div *ngIf="capturedImage != ''" class="ion-item-container-no-border hide-desktop">
     <ion-label class="attached-title">Fotografia Anexada</ion-label>
     <ion-item lines="none">
       <ion-thumbnail slot="start">
@@ -66,7 +66,7 @@
     </ion-thumbnail> -->
   </div>
 
-  <div class="ion-item-container-no-border">
+  <div class="ion-item-container-no-border hide-desktop">
     <ion-label (click)="takePicture()">
       <div class="attach-icon">
         <ion-icon src="assets/images/icons-add-photo.svg"></ion-icon>
@@ -77,7 +77,7 @@
       </ion-label>
   </div>
 
-  <div class="ion-item-container-no-border">
+  <div class="ion-item-container-no-border hide-desktop">
     <ion-label (click)="getPicture()">
       <div class="attach-icon">
         <ion-icon src="assets/images/icons-add-photos.svg"></ion-icon>

src/app/shared/publication/new-publication/new-publication.page.scss

@@ -152,4 +152,8 @@ font-size: 25px;
 .container-title{
   font-size: 15px;
   font-weight: bold;
-}
+}
+.hide-desktop{
+  display: block;
+}
+

src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts

@@ -12,10 +12,11 @@ import { PublicationsService } from 'src/app/services/publications.service';
 })
 export class PublicationDetailPage implements OnInit {
   showLoader: boolean;
-  folderId: string;
+  /* folderId: string; */
   publication: Publication;
 
   @Input() publicationId: string;
+  @Input() folderId: string;
   @Output() addNewPublication =  new EventEmitter<any>();
   @Output() closeDesktopComponent =  new EventEmitter<any>();
   @Output() goBackToViewPublications = new EventEmitter();
@@ -41,6 +42,8 @@ export class PublicationDetailPage implements OnInit {
     }
 
   ngOnInit() {
+    console.log(this.folderId);
+    
     /* console.log(this.publication.FileBase64); */
     this.getPublicationDetail();
   }