pull from developer-prod made

src/app/shared/API/middleware/interface.d.ts

@@ -0,0 +1,5 @@
+
+export interface refreshToken {
+  Authorization: string,
+  refreshToken: null
+}

src/app/shared/API/middleware/middleware-service.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { MiddlewareServiceService } from './middleware-service.service';
+
+describe('MiddlewareServiceService', () => {
+  let service: MiddlewareServiceService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(MiddlewareServiceService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

src/app/shared/API/middleware/middleware-service.service.ts

@@ -0,0 +1,23 @@
+import { Injectable } from '@angular/core';
+import { environment } from 'src/environments/environment';
+import { HttpServiceService } from 'src/app/services/http/http-service.service';
+import { Observable } from "rxjs";
+import { refreshToken } from "./interface"
+@Injectable({
+  providedIn: 'root'
+})
+export class MiddlewareServiceService {
+
+  constructor(
+    private HttpServiceService: HttpServiceService,
+  ) {}
+
+
+  refreshToken(refreshToken: string): Observable<refreshToken>  {
+    const data = {
+      refreshToken: refreshToken
+    }
+
+    return this.HttpServiceService.put(environment.apiURL + "UserAuthentication/RefreshToken", data, {})
+  }
+}

src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts

@@ -15,6 +15,7 @@ import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
 import { EventToApproveEdit } from 'src/app/models/event.model';
 import { ThemeService } from 'src/app/services/theme.service'
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { DomSanitizerService } from 'src/app/services/DomSanitizer.service';
 
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
@@ -131,7 +132,8 @@ export class EditEventToApprovePage implements OnInit {
     private processes:ProcessesService,
     private toastService: ToastService,
     public ThemeService: ThemeService,
-    public httpErrorHandler: HttpErrorHandle
+    public httpErrorHandler: HttpErrorHandle,
+    private domSanitizeService: DomSanitizerService
   ) {
     this.isEventEdited = false;
   }
@@ -324,6 +326,10 @@ export class EditEventToApprovePage implements OnInit {
       e.IsRequired = false
     })
 
+    this.eventProcess.workflowInstanceDataFields.Subject = /* this.domSanitizeService.sanitizeInput( */this.eventProcess.workflowInstanceDataFields.Subject/* ) */;
+    this.eventProcess.workflowInstanceDataFields.Location = /* this.domSanitizeService.sanitizeInput( */this.eventProcess.workflowInstanceDataFields.Location/* ) */;
+    this.eventProcess.workflowInstanceDataFields.Body = /* this.domSanitizeService.sanitizeInput( */this.eventProcess.workflowInstanceDataFields.Body/* ) */;
+
     this.eventProcess.workflowInstanceDataFields.ParticipantsList = this.taskParticipants.concat(this.taskParticipantsCc)
 
     this.eventProcess.workflowInstanceDataFields.ParticipantsList.forEach(e=>{

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

@@ -15,6 +15,7 @@ import { ThemeService } from 'src/app/services/theme.service'
 import { SessionStore } from 'src/app/store/session.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
 import { ContactsService } from 'src/app/services/contacts.service'
+import { DomSanitizerService } from 'src/app/services/DomSanitizer.service';
 
 @Component({
   selector: 'app-edit-event',
@@ -100,7 +101,8 @@ export class EditEventPage implements OnInit {
     private attachmentsService: AttachmentsService,
     public ThemeService: ThemeService,
     private httpErrorHandle: HttpErrorHandle,
-    private contactsService: ContactsService
+    private contactsService: ContactsService,
+    private domSanitizeService: DomSanitizerService
   ) {}
 
   ngOnInit() {
@@ -344,6 +346,9 @@ export class EditEventPage implements OnInit {
     }
 
     this._postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
+    this._postEvent.Subject = /* this.domSanitizeService.sanitizeInput( */this._postEvent.Subject/* ) */;
+    this._postEvent.Location = /* this.domSanitizeService.sanitizeInput( */this._postEvent.Location/* ) */;
+    this._postEvent.Body.Text = /* this.domSanitizeService.sanitizeInput( */this._postEvent.Body.Text/* ) */;
 
     if(!this._postEvent.EventRecurrence.hasOwnProperty('Type')) {
       this._postEvent.EventRecurrence.Type = '-1'

src/app/shared/agenda/new-event/new-event.module.ts

@@ -14,9 +14,9 @@ import { MatInputModule } from '@angular/material/input';
 import { MatNativeDateModule } from '@angular/material/core';
 
 import {
-  NgxMatDatetimePickerModule, 
-  NgxMatNativeDateModule, 
-  NgxMatTimepickerModule 
+  NgxMatDatetimePickerModule,
+  NgxMatNativeDateModule,
+  NgxMatTimepickerModule
 } from '@angular-material-components/datetime-picker';
 
 import { ReactiveFormsModule } from '@angular/forms';
@@ -24,13 +24,14 @@ import { MatButtonModule } from '@angular/material/button';
 import { MatSelectModule } from '@angular/material/select';
 import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
 
-import { 
+import {
   MAT_MOMENT_DATE_FORMATS,
   MomentDateAdapter,
   MAT_MOMENT_DATE_ADAPTER_OPTIONS
 } from '@angular/material-moment-adapter';
 import {DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE} from '@angular/material/core';
 import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module';
+import { InputFilterDirective } from 'src/app/services/directives/input-filter.directive';
 
 
 @NgModule({
@@ -47,7 +48,7 @@ import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/att
     NgxMatDatetimePickerModule,
     NgxMatTimepickerModule,
     NgxMatNativeDateModule,
-    // 
+    //
 
     NgxMatMomentModule,
     // BrowserAnimationsModule,

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

@@ -22,14 +22,14 @@
     <div *ngIf="Form && validateFrom" >
       <div *ngIf="Form.get('Subject').invalid " class="input-errror-message">
         <div *ngIf="Form.get('Subject').errors?.required">
-          
+
         </div>
         <div *ngIf="Form.get('Subject').errors?.minlength">
           O campo deve ter pelo menos 4 caracteres.
         </div>
       </div>
     </div>
-    
+
     <div class="container-div" (click)="changeAgenda()">
       <div class="ion-item-class-2 d-flex">
         <div class="ion-icon-class">
@@ -44,7 +44,7 @@
                 <div *ngIf="calendars != 'Meu calendario' && calendars == 'Presidente da República'"> {{ environment.agendaPR}} </div>
                 <div *ngIf="calendars != 'Meu calendario' && calendars == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
                 <div *ngIf="calendars != 'Meu calendario' && calendars != 'Ministro e Director do Gabinete do PR' && calendars != 'Presidente da República'"> Agenda do {{calendars}} </div>
-                
+
                 <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div> -->
                 <mat-option *ngFor="let calendars of eventService.calendarNamesAry" value="{{calendars.Fullname || calendars}}">
                  <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}} </div>
@@ -138,7 +138,7 @@
               [disabled]="disabled"
             >
             <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" ></mat-datepicker-toggle>
-            <ngx-mat-datetime-picker #picker1              
+            <ngx-mat-datetime-picker #picker1
               [showSpinners]="showSpinners"
               [showSeconds]="showSeconds"
               [stepHour]="stepHour" [stepMinute]="stepMinute"
@@ -329,10 +329,10 @@
       </ion-item>
       </ion-list>
 
-      
+
     </div>
 
-    
+
 
   </div>
 
@@ -343,7 +343,7 @@
 </ion-content>
 <ion-footer class="ion-no-border">
   <ion-toolbar class="footer-toolbar">
-    
+
     <ion-buttons slot="start">
       <button class="btn-ok" fill="clear" color="#fff" (click)="save()">
         <ion-label>Gravar</ion-label>
@@ -355,7 +355,7 @@
         <ion-label>Cancelar</ion-label>
       </button>
     </ion-buttons>
-    
+
 
     <!-- <app-new-event
         [loggedAttend]="loggedAttend"

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

@@ -34,6 +34,8 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { Subject } from 'rxjs';
 
 import { TaskService } from 'src/app/services/task.service'
+import { ContactsService } from 'src/app/services/contacts.service';
+import { DomSanitizerService } from 'src/app/services/DomSanitizer.service';
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
     dateInput: "YYYY-MMMM-DD HH:mm"
@@ -131,6 +133,8 @@ export class NewEventPage implements OnInit {
 
   CalendarNamesOptions = ['Oficial', 'Pessoal']
   environment = environment
+  eventPersons: EventPerson[];
+  contacts: EventPerson[] = [];
 
   constructor(
     private modalController: ModalController,
@@ -142,7 +146,9 @@ export class NewEventPage implements OnInit {
     private chatMethodService: ChatMethodsService,
     private hhtpErrorHandle: HttpErrorHandle,
     private processeService: ProcessesService,
-    public TaskService: TaskService
+    public TaskService: TaskService,
+    private contactsService: ContactsService,
+    private domSanitazerService: DomSanitizerService
   ) {
     this.dateAdapter.setLocale('pt');
     this.loggeduser = SessionStore.user;
@@ -220,6 +226,7 @@ export class NewEventPage implements OnInit {
           }
         })
       }
+      console.log('Attendes',this.taskParticipants)
       this.taskParticipants = removeDuplicate(this.taskParticipants);
       this.taskParticipantsCc = removeDuplicate(this.taskParticipantsCc);
 
@@ -234,6 +241,7 @@ export class NewEventPage implements OnInit {
 
     this.injectValidation();
     this.changeAgenda()
+    this.fetchContacts("")
 
   }
 
@@ -497,6 +505,10 @@ export class NewEventPage implements OnInit {
     }
 
     this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
+    this.postEvent.Subject = this.domSanitazerService.sanitizeInput(this.postEvent.Subject);
+    this.postEvent.Location = this.domSanitazerService.sanitizeInput(this.postEvent.Location);
+    this.postEvent.Body.Text = this.domSanitazerService.sanitizeInput(this.postEvent.Body.Text);
+    
 
 
     if (this.documents.length > 0) {
@@ -987,5 +999,34 @@ export class NewEventPage implements OnInit {
     return toAproveObject;
   }
 
+  async fetchContacts(filter: string) {
+
+    if (this.loggeduser.Profile == 'PR') {
+      this.contactsService.getContacts(filter).subscribe(result => {
+        if (this.eventPersons != null) {
+          this.eventPersons.forEach(attendee => {
+            const index: number = result.findIndex((cont) => {
+              return cont.EmailAddress.toLocaleLowerCase() == attendee.EmailAddress.toLocaleLowerCase()
+            });
+
+            result.splice(index, 1);
+
+          });
+        }
+        this.contacts = result;
+        console.log('Attendes Email', this.loggeduser.Email)
+        let filterLoggedUserEmail = this.contacts.filter(item => item.RoleDescription == "Ministro e Director do Gabinete do PR")
+        console.log('Attendes Email', filterLoggedUserEmail)
+
+        this.contacts = filterLoggedUserEmail;
+
+        this.taskParticipants.push(this.contacts[0]);
+      this.setIntervenient.emit(this.taskParticipants);
+        console.log('Attendes Email', this.taskParticipants)
+      }
+      );
+    }
+  }
+
 }
 

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

@@ -31,7 +31,7 @@
 
 
           <!-- <div class="div-icon" (click)="openOptions()">
-            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/theme/blue/icons-menu.svg"></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-menu.svg"></ion-icon>
           </div>
@@ -130,7 +130,7 @@
             </div>
 
             <!-- <div (click)="docIndex(i);LoadDocumentDetails()" class="doc-options">
-              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/theme/blue/icons-menu.svg"></ion-icon>
               <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
                 src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
             </div> -->

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

@@ -8,7 +8,7 @@
         <div class="right">
           <!-- <div (click)=" ChatSystemService.getGroupRoom(this.roomId).deleteAll()">delete all</div> -->
           <button title="Menu" class="btn-no-color" (click)="openGroupMessagesOptions()">
-            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/theme/blue/icons-menu.svg"></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
           </button>
         </div>

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

@@ -29,6 +29,7 @@ import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx';
 import { SessionStore } from 'src/app/store/session.service';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { PermissionService } from 'src/app/services/permission.service';
+import { FileValidatorService } from "src/app/services/file/file-validator.service"
 
 @Component({
   selector: 'app-group-messages',
@@ -105,6 +106,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     private platform: Platform,
     private fileOpener: FileOpener,
     public p: PermissionService,
+    private FileValidatorService: FileValidatorService
   ) {
 
     this.ChatSystemService.getUser()
@@ -901,9 +903,11 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
 
     const file: any = await this.fileService.getFileFromDevice(types);
 
+    const fileName = file.name
 
+    const validation = this.FileValidatorService.fileNameValidation(fileName)
 
-    if (file.type != "application/img" && file.type != "image/png" && file.type != "image/jpeg" && file.type != "image/gif") {
+    if(validation.isOk) {
 
       const encodedData = btoa(JSON.stringify(await this.getBase64(file).catch ((error) => {
         console.error(error);
@@ -946,9 +950,8 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
           fileBase64: fileBase64,
         }
       })
-
     } else {
-
+      this.toastService._badRequest("Ficheiro inválido")
     }
 
 

src/app/shared/chat/messages/messages.page.html

@@ -9,7 +9,7 @@
         </div>
         <div hidden class="right">
           <button title="Menu" class="btn-no-color" (click)="_openMessagesOptions()">
-            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/theme/blue/icons-menu.svg"></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg">
             </ion-icon>
           </button>

src/app/shared/chat/messages/messages.page.ts

@@ -33,6 +33,7 @@ import { Howl } from 'howler';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { ChatMessageDebuggingPage } from 'src/app/shared/popover/chat-message-debugging/chat-message-debugging.page';
 import { PermissionService } from 'src/app/services/permission.service';
+import { FileValidatorService } from "src/app/services/file/file-validator.service"
 
 
 const IMAGE_DIR = 'stored-images';
@@ -100,7 +101,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   roomName: any;
   isAdmin = false;
   roomCountDownDate: string;
-  
+
 
   constructor(
     public popoverController: PopoverController,
@@ -122,6 +123,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     private platform: Platform,
     private fileOpener: FileOpener,
     public p: PermissionService,
+    private FileValidatorService: FileValidatorService
   ) {
     // update
     this.checkAudioPermission()
@@ -172,8 +174,8 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     this.audioPermissionStatus = permissionStatus.state
 
     permissionStatus.onchange = (data: any) => {
-      // 
-      // 
+      //
+      //
     }
 
   }
@@ -510,7 +512,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   }
 
   getChatMembers() {
-    // 
+    //
 
     // this.showLoader = true;
     // this.chatService.getMembers(this.roomId).subscribe(res => {
@@ -648,7 +650,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       resultType: CameraResultType.Base64,
       source: CameraSource.Camera
     });
-
+    console.log('Selected: ', file)
     var base64 = 'data:image/jpeg;base64,' + file.base64String
     const compressedImage = await this.compressImageBase64(
       base64,
@@ -656,7 +658,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       800, // maxHeight
       0.9  // quality
     ).then((picture) => {
-      console.log('Selected: ', picture)
+
       base64 = picture
     });
 
@@ -788,42 +790,46 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
     //const imageData =  await this.fileToBase64Service.convert(file)
     //
-
+    console.log('Selected: ', file)
     var base64 = 'data:image/jpeg;base64,' + file.base64String
-    const compressedImage = await this.compressImageBase64(
-      base64,
-      800, // maxWidth
-      800, // maxHeight
-      0.9  // quality
-    ).then((picture) => {
-      console.log('Selected: ', picture)
-      base64 = picture
-    });
+    if (file.format == "jpeg" || file.format == "png" || file.format == "gif") {
 
-    const response = await fetch(base64);
-    const blob = await response.blob();
+      const compressedImage = await this.compressImageBase64(
+        base64,
+        800, // maxWidth
+        800, // maxHeight
+        0.9  // quality
+      ).then((picture) => {
 
-    console.log(base64)
+        base64 = picture
+      });
 
-    const formData = new FormData();
-    formData.append("blobFile", blob);
+      const response = await fetch(base64);
+      const blob = await response.blob();
+
+      console.log(base64)
+
+      const formData = new FormData();
+      formData.append("blobFile", blob);
+
+      this.ChatSystemService.getDmRoom(roomId).send({
+        file: {
+          "type": "application/img",
+          "guid": ''
+        },
+        temporaryData: formData,
+        attachments: [{
+          "title": file.path,
+          //"image_url": 'data:image/jpeg;base64,' + file.base64String,
+          "text": "description",
+          "title_link_download": false,
+        }],
+        attachmentsModelData: {
+          fileBase64: base64,
+        }
+      })
+    }
 
-    this.ChatSystemService.getDmRoom(roomId).send({
-      file: {
-        "type": "application/img",
-        "guid": ''
-      },
-      temporaryData: formData,
-      attachments: [{
-        "title": file.path,
-        //"image_url": 'data:image/jpeg;base64,' + file.base64String,
-        "text": "description",
-        "title_link_download": false,
-      }],
-      attachmentsModelData: {
-        fileBase64: base64,
-      }
-    })
 
   }
 
@@ -835,63 +841,70 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     const roomId = this.roomId
 
     const file: any = await this.fileService.getFileFromDevice(types);
-    console.log(file.type)
+
+    if (file.type == 'application/pdf' || file.type == 'application/doc' || file.type == 'application/docx' ||
+      file.type == 'application/xls' || file.type == 'application/xlsx' || file.type == 'application/ppt' ||
+      file.type == 'application/pptx' || file.type == 'application/txt') {
+
+      console.log('FILE', file)
+
+      const fileName = file.name
+
+      const validation = this.FileValidatorService.fileNameValidation(fileName)
+
+      if (validation.isOk) {
+
+        const encodedData = btoa(JSON.stringify(await this.getBase64(file).catch((error) => {
+          console.error(error);
+        })));
+
+        let blob;
+        let formData
+        let fileBase64
+        if (this.platform.is("tablet")) {
+
+          blob = this.fileService.base64toBlob(encodedData, file.type)
+          console.log('BLOB BLOB', blob)
+
+          formData = new FormData();
+          formData.append('blobFile', blob);
+          /*  console.log('add file', fileBase64) */
+
+        } else {
+          blob = this.fileService.base64toBlob(encodedData, file.type)
+
+          fileBase64 = await this._getBase64(file)
+
+          formData = new FormData();
+          formData.append('blobFile', blob);
+        }
 
 
 
-    if (file.type != "application/img" && file.type != "image/png" && file.type != "image/jpeg" && file.type != "image/gif") {
-
-      const encodedData = btoa(JSON.stringify(await this.getBase64(file).catch((error) => {
-        console.error(error);
-      })));
-
-      let blob;
-      let formData
-      let fileBase64
-      if (this.platform.is("tablet")) {
-
-        blob = this.fileService.base64toBlob(encodedData, file.type)
-        console.log('BLOB BLOB', blob)
-
-        formData = new FormData();
-        formData.append('blobFile', blob);
-        /*  console.log('add file', fileBase64) */
 
+        this.ChatSystemService.getDmRoom(roomId).send({
+          file: {
+            "type": file.type,
+            "guid": '',
+          },
+          attachments: [{
+            "title": file.name,
+            "name": file.name,
+            //"image_url": res,
+            // "text": "description",
+            "title_link_download": false,
+          }],
+          temporaryData: formData,
+          attachmentsModelData: {
+            fileBase64: fileBase64,
+          }
+        })
       } else {
-        blob = this.fileService.base64toBlob(encodedData, file.type)
-
-        fileBase64 = await this._getBase64(file)
-
-        formData = new FormData();
-        formData.append('blobFile', blob);
+        this.toastService._badRequest("Ficheiro inválido")
       }
 
-
-
-
-      this.ChatSystemService.getDmRoom(roomId).send({
-        file: {
-          "type": file.type,
-          "guid": '',
-        },
-        attachments: [{
-          "title": file.name,
-          "name": file.name,
-          //"image_url": res,
-          // "text": "description",
-          "title_link_download": false,
-        }],
-        temporaryData: formData,
-        attachmentsModelData: {
-          fileBase64: fileBase64,
-        }
-      })
-
-    } else {
-
     }
 
-
   }
 
   _getBase64(file) {

src/app/shared/event/attendee-modal/attendee-modal.page.ts

@@ -59,7 +59,7 @@ export class AttendeePage implements OnInit {
     this.LtaskParticipants = removeDuplicate(this.taskParticipants);
     this.LtaskParticipantsCc = removeDuplicate(this.taskParticipantsCc);
     this.loggeduser = SessionStore.user;
-    
+
   }
 
   ngOnChanges() {
@@ -137,7 +137,7 @@ export class AttendeePage implements OnInit {
       itm.IsRequired = false;
       this.LtaskParticipantsCc.push(itm);
     } else {
-      // 
+      //
     }
 
     // run only in gabinete digital
@@ -247,15 +247,15 @@ export class AttendeePage implements OnInit {
         this.showLoader = false;
       } else {
         this.contacts = this.sort(result as any);
-        console.log('Attendes Email', this.loggeduser.Email)
+        // console.log('Attendes Email', this.loggeduser.Email)
         let filterLoggedUserEmail = this.contacts.filter(item => item.EmailAddress.toLocaleLowerCase() != this.loggeduser.Email.toLocaleLowerCase())
         if(this.taskType == 0 || this.taskType == 1){
           filterLoggedUserEmail = this.contacts.filter(item => item.IsPR == false)
          }
-        console.log('Attendes Email', filterLoggedUserEmail)
+        // console.log('Attendes Email', filterLoggedUserEmail)
         let filterEmptyEmail = filterLoggedUserEmail.filter(item => item.EmailAddress.toLocaleLowerCase() != "")
         this.contacts = filterEmptyEmail;
-        console.log('Attendes Email', this.contacts)
+        // console.log('Attendes Email', this.contacts)
         this.showLoader = false;
 
       }
@@ -271,4 +271,4 @@ export class AttendeePage implements OnInit {
     }
   }
 
-}
+}

src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header.page.html

@@ -9,7 +9,7 @@
         <ion-label class="title">{{ task.Folio}}</ion-label>
       </div>
       <div class="div-icon" (click)="openOptions.emit()">
-        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/theme/blue/icons-menu.svg"></ion-icon>
         <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
       </div>
     </div>

src/app/shared/gabinete-digital/generic/task-details/task-details.page.html

@@ -9,7 +9,7 @@
         <ion-label class="title">{{ task.Folio}}</ion-label>
       </div>
       <div class="div-icon" (click)="openOptions.emit()">
-        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/theme/blue/icons-menu.svg"></ion-icon>
         <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
       </div>
     </div>

src/app/shared/header/header.page.html

@@ -48,15 +48,14 @@
         <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon font-45-em" src='assets/images/theme/gov/icons-profile.svg'></ion-icon> -->
 
         <div *ngIf="profilePicture == ''" class="profile-image">
-          <img *ngIf="loggeduser.RoleDescription == 'Presidente da República' " class="profile-image"
+     <!--      <img *ngIf="loggeduser.RoleDescription == 'Presidente da República' " class="profile-image"
             src='assets/images/presidente.png'>
           <img *ngIf="loggeduser.RoleDescription == 'Ministro e Director do Gabinete do PR' " class="profile-image"
             src='assets/images/ministro.png'>
           <img *ngIf="loggeduser.RoleDescription == 'Secretário Geral' " class="profile-image"
-            src='assets/images/secretaria_geral.png'>
+            src='assets/images/secretaria_geral.png'> -->
 
           <ion-icon
-            *ngIf="loggeduser.RoleDescription != 'Presidente da República'&& loggeduser.RoleDescription != 'Ministro e Director do Gabinete do PR' && loggeduser.RoleDescription != 'Secretário Geral' "
             class="icon font-45-em" src='assets/images/theme/gov/icons-profile.svg'></ion-icon>
         </div>
 
@@ -212,15 +211,14 @@
             <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon" src='assets/images/theme/gov/icons-profile.svg'></ion-icon> -->
 
             <div *ngIf="profilePicture == ''" class="profile-image">
-              <img *ngIf="loggeduser.RoleDescription == 'Presidente da República' " class="profile-image"
+              <!-- <img *ngIf="loggeduser.RoleDescription == 'Presidente da República' " class="profile-image"
                 src='assets/images/presidente.png'>
               <img *ngIf="loggeduser.RoleDescription == 'Ministro e Director do Gabinete do PR' " class="profile-image"
                 src='assets/images/ministro.png'>
               <img *ngIf="loggeduser.RoleDescription == 'Secretário Geral' " class="profile-image"
-                src='assets/images/secretaria_geral.png'>
+                src='assets/images/secretaria_geral.png'> -->
 
               <ion-icon
-                *ngIf="loggeduser.RoleDescription != 'Presidente da República'&& loggeduser.RoleDescription != 'Ministro e Director do Gabinete do PR' && loggeduser.RoleDescription != 'Secretário Geral' "
                 class="icon" src='assets/images/theme/gov/icons-profile.svg'></ion-icon>
             </div>
 

src/app/shared/header/header.page.ts

@@ -102,26 +102,29 @@ export class HeaderPage implements OnInit {
 
   getProfilpicture() {
 
-    this.attachmentService.getUserProfilePhoto(this.SessionStore.user.UserPhoto).subscribe((base) => {
+    if (this.SessionStore.user.UserPhoto) {
+      this.attachmentService.getUserProfilePhoto(this.SessionStore.user.UserPhoto).subscribe((base) => {
 
-      this.storageService.store(this.SessionStore.user.RoleID.toString(), 'data:image/jpeg;base64,' + base).then((value) => {
-        this.profilePicture = 'data:image/jpeg;base64,' + base;
+        this.storageService.store(this.SessionStore.user.RoleID.toString(), 'data:image/jpeg;base64,' + base).then((value) => {
+          this.profilePicture = 'data:image/jpeg;base64,' + base;
 
-        console.log('picture saved', value)
-      }).catch((error) => {
-        console.log('picture not saved')
-      });
-    }, (error) => {
-      console.log('profile picture errro: ', error)
-      this.storageService.get(this.SessionStore.user.RoleID.toString()).then((picture) => {
-        console.log(picture)
-        this.profilePicture = picture
-      }).catch((error) => {
-        this.profilePicture = "";
+          console.log('picture saved')
+        }).catch((error) => {
+          console.log('picture not saved')
+        });
+      }, (error) => {
+        console.log('profile picture errro: ', error)
+        this.storageService.get(this.SessionStore.user.RoleID.toString()).then((picture) => {
+          /* console.log(picture) */
+          this.profilePicture = picture
+        }).catch((error) => {
+          this.profilePicture = "";
+        })
       })
-    })
-
 
+    } else {
+      this.profilePicture = "";
+    }
 
   }
 
@@ -266,7 +269,7 @@ export class HeaderPage implements OnInit {
 
       modal.onDidDismiss().then(() => {
         this.notificationLengthData()
-        this.getProfilpicture()
+        this.getProfilePictureSorage()
         this.showProfileModal = false
       })
 
@@ -311,4 +314,13 @@ export class HeaderPage implements OnInit {
 
   }
 
+  getProfilePictureSorage() {
+    this.storageService.get(this.SessionStore.user.RoleID.toString()).then((picture) => {
+      /* console.log(picture) */
+      this.profilePicture = picture
+    }).catch((error) => {
+      this.profilePicture = "";
+    })
+  }
+
 }

src/app/shared/popover/deploma-options/deploma-options.page.ts

@@ -28,7 +28,7 @@ export class DiplomaOptionsPage implements OnInit {
   fulltask: any
   DraftIds = ""
   DraftNames = ""
-  asDrat: boolean;
+  asDraft: boolean;
 
 
   constructor(
@@ -48,7 +48,7 @@ export class DiplomaOptionsPage implements OnInit {
 
     this.DraftIds = this.navParams.get("DraftIds");
     this.DraftNames = this.navParams.get("DraftNames");
-    this.asDrat = this.navParams.get('asDrat');
+    this.asDraft = this.navParams.get('asDraft');
 
 
     console.log('this.task', this.task)
@@ -241,7 +241,7 @@ export class DiplomaOptionsPage implements OnInit {
 
   async AssinarNew(note?, doc?) {
 
-    if (this.asDrat) {
+    if (this.asDraft) {
       const modal = await this.modalController.create({
         component: PopupQuestionPage,
         componentProps: {

src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html

@@ -9,7 +9,7 @@
   </div>
   <div *ngIf="content != ''" class="buttons header-fix">
     <!-- <button (click)="save(Document, content)" class="btn-cancel" shape="round" >Salvar</button> -->
-    <button (click)="AssinarDraft()" class="btn-cancel" shape="round" >Assinar</button>
+    <button *ngIf="p.userRole('PR')" (click)="AssinarDraft()" class="btn-cancel" shape="round" >Assinar</button>
     <button class="btn-cancel" shape="round"  (click)="close()">Cancelar</button>
   </div>
 </ion-content>

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

@@ -14,6 +14,7 @@ import { FilePicker } from '@capawesome/capacitor-file-picker';
 import { Directory, Encoding, Filesystem } from '@capacitor/filesystem';
 import { utf8Encode } from '@angular/compiler/src/util';
 import { checkFileTypeService } from 'src/app/services/checkFileType.service';
+import { FileValidatorService } from "src/app/services/file/file-validator.service"
 
 @Component({
   selector: 'app-new-publication',
@@ -60,7 +61,8 @@ export class NewPublicationPage implements OnInit {
     public ThemeService: ThemeService,
     private httpErroHandle: HttpErrorHandle,
     public PublicationFolderService: PublicationFolderService,
-    public checkFileType: checkFileTypeService
+    public checkFileType: checkFileTypeService,
+    private FileValidatorService: FileValidatorService
   ) {
     this.publicationTitle = 'Nova Publicação';
  
@@ -145,6 +147,7 @@ export class NewPublicationPage implements OnInit {
     this.capturedImage = 'data:image/jpeg;base64,' + capturedImage.base64String;
     this.capturedImageTitle = 'foto';
 
+    /* if(validation.isOk) { */
     const compressedImage = await this.compressImageBase64(
       this.capturedImage,
       800, // maxWidth
@@ -157,6 +160,9 @@ export class NewPublicationPage implements OnInit {
       }
       this.seletedContent.push(fileObject)
     });
+  /* }  else {
+    this.toastService._badRequest("Imagem inválida")
+  } */
   }
 
   async laodPicture() {
@@ -211,6 +217,27 @@ export class NewPublicationPage implements OnInit {
       
     });
 
+    /*       this.capturedImage = 'data:image/jpeg;base64,' +capturedImage.base64String;
+      this.capturedImageTitle = 'foto';
+
+
+      const validation = await this.FileValidatorService.ValidateImage(this.capturedImage)
+
+      if(validation.isOk) {
+
+        const compressedImage = await this.compressImageBase64(
+          this.capturedImage,
+          800, // maxWidth
+          800, // maxHeight
+          0.9  // quality
+        ).then((picture) => {
+          console.log('Selected: ', picture)
+          this.capturedImage = picture
+        });
+      } else {
+        this.toastService._badRequest("Imagem inválida")
+      } */
+
   };
 
 
@@ -320,7 +347,6 @@ export class NewPublicationPage implements OnInit {
 
       } */
 
-
     }
     else {
       let time = new Date()

src/app/shared/publication/view-publications/view-publications.module.ts

@@ -1,4 +1,4 @@
-import { NgModule } from '@angular/core';
+import { NgModule,CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 
@@ -31,6 +31,7 @@ setup(attributes: Attributes) {
   ],
   exports: [ViewPublicationsPage],
   declarations: [ViewPublicationsPage],
-  providers: [{provide: LAZYLOAD_IMAGE_HOOKS, useClass: LazyLoadImageHooks}]
+  providers: [{provide: LAZYLOAD_IMAGE_HOOKS, useClass: LazyLoadImageHooks}],
+  schemas: [CUSTOM_ELEMENTS_SCHEMA]
 })
 export class ViewPublicationsPageModule {}

src/app/shared/publication/view-publications/view-publications.page.html

@@ -34,7 +34,7 @@
     <ion-refresher-content>
     </ion-refresher-content>
   </ion-refresher>
-  <div class="main-container px-20" *ngIf="publicationFolderService.FolderDetails[foldserId]">
+  <div class="main-container px-20" *ngIf="publicationFolderService.FolderDetails[folderId]">
     <p class="item-content-detail">{{publicationFolderService.FolderDetails[folderId].Detail}}</p>
 
     <ion-card *ngFor="let publication of publicationFolderService.publicationList[folderId] let i = index">