git pull made

src/app/pages/agenda/agenda.page.html

@@ -62,7 +62,12 @@
                               <div *ngIf="calendars.Role == 'Presidente da República'"> PR </div>
                               <div *ngIf="calendars.Role == 'Ministro e Director do Gabinete do PR'"> MDGPR </div>
                               <div *ngIf="calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República' && calendars.Fullname"> Agenda do {{calendars.Fullname}} </div>  
-                              <div *ngIf="calendars.Role != 'Presidente da República' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars == 'Meu calendario' "> Minha agenda </div>
+                              <div *ngIf="calendars.Role != 'Presidente da República' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars == 'Meu calendario' ">
+                                <!-- <span *ngIf="SessionStore.user.Profile == 'PR' ">PR</span>
+                                <span *ngIf="SessionStore.user.Profile == 'MDGPR' ">MDGPR</span>
+                                <span *ngIf="SessionStore.user.Profile != 'MDGPR' && SessionStore.user.Profile != 'PR'  ">Minha agenda</span> -->
+                                Minha agenda
+                              </div>
                             </div>
  
                             <div *ngIf="!environment.presidential">

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

@@ -39,7 +39,12 @@
                  <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}} </div>
                  <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
                  <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
-                 <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
+                 <div *ngIf="calendars == 'Meu calendario'"> 
+                  <!-- <span *ngIf="SessionStore.user.Profile == 'PR' ">Agenda do PR</span>
+                  <span *ngIf="SessionStore.user.Profile == 'MDGPR' ">Agenda do MDGPR</span>
+                  <span *ngIf="SessionStore.user.Profile != 'MDGPR' && SessionStore.user.Profile != 'PR'  ">Minha agenda</span> -->
+                  Minha agenda
+                 </div>
               </mat-option>
 
             </mat-select>

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

@@ -78,6 +78,7 @@ export class NewEventPage implements OnInit {
   loggeduser: LoginUserRespose;
   members:any;
   CalendarName;
+  SessionStore = SessionStore;
 
   public listColors = ['primary', 'accent', 'warn'];
   public stepHours = [1, 2, 3, 4, 5];

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

@@ -62,7 +62,13 @@
       </ion-segment-button> -->
 
       <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAryPR; let i  index"  [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId ">
-        <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
+        <div *ngIf="calendars == 'Meu calendario'"> 
+          <!-- <span *ngIf="SessionStore.user.Profile == 'PR' ">PR</span>
+          <span *ngIf="SessionStore.user.Profile == 'MDGPR' ">MDGPR</span>
+          <span *ngIf="SessionStore.user.Profile != 'MDGPR' && SessionStore.user.Profile != 'PR'  ">Minha agenda</span> -->
+
+          Minha agenda
+        </div>
         <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}} </div>
         <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
         <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>

src/app/pages/gabinete-digital/event-list/event-list.page.ts

@@ -47,6 +47,8 @@ export class EventListPage implements OnInit {
     delete(): void;
   }
 
+  SessionStore = SessionStore;
+  
   constructor(
     private processes: ProcessesService,
     private modalController: ModalController,

src/app/pages/gabinete-digital/gabinete-digital.page.ts

@@ -312,13 +312,12 @@ export class GabineteDigitalPage implements OnInit {
       if (activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho') {
         this.router.navigate(['/home/gabinete-digital/despachos-pr', serialNumber, 'gabinete-digital']);
       }
-      else if (activityName == 'Revisar Diploma' ) {
+      else if (activityName == 'Revisar Diploma' || activityName == 'Diploma Assinado') {
         this.router.navigate(['/home/gabinete-digital/diplomas', serialNumber, 'gabinete-digital']);
-      }
+      } else if ( activityName == 'Assinar Diploma') {
-      else if (activityName == 'Diploma Assinado' || activityName == 'Assinar Diploma') {
         this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']);
       } else {
-
+        throw('Bug!');
       }
     }
     else if (workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento') {

src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html

@@ -128,7 +128,7 @@
           <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
           <div class="solid"></div>
           <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
-          <button *ngIf="loggeduser.Profile == 'MDGPR' && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
+          <button *ngIf="loggeduser.Profile != 'PR' && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
           <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
           <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
         </div>
@@ -137,7 +137,7 @@
           <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
           <div class="solid"></div>
           <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
-          <button *ngIf="loggeduser.Profile == 'MDGPR' && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
+          <button *ngIf="loggeduser.Profile != 'PR' && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
           <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
           <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
         </div>

src/app/services/background.service.ts

@@ -72,7 +72,7 @@ export class BackgroundService {
   async offline() {
 
     if(this.status == 'offline') {
-      return false
+      return true
     }
 
     const hasReachedTheServer = await this.tryToReachTheServer()
@@ -90,7 +90,11 @@ export class BackgroundService {
           e.funx()
         }
       })
+
+      return true
     }
+
+    return false
   }
 
 
@@ -101,11 +105,15 @@ export class BackgroundService {
 
     try {
       await this.http.post(environment.apiURL + "UserAuthentication/Login", '', opts).toPromise();
+      
       return true
     } catch (error) {
-      if(error.status != 400) {
+
+      if(error.status === 0) {
         return false
-      }
+      } 
+
+      return true
     }
   }
 

src/app/services/http-error-handle.service.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
 import { ToastService } from 'src/app/services/toast.service';
+import { BackgroundService } from 'src/app/services/background.service';
 
 @Injectable({
   providedIn: 'root'
@@ -7,14 +8,21 @@ import { ToastService } from 'src/app/services/toast.service';
 export class HttpErrorHandle {
 
   constructor(
-    private toastService: ToastService
+    private toastService: ToastService,
+    private backgroundService: BackgroundService
   ) { }
 
-  httpStatusHandle(error) {
+  async httpStatusHandle(error) {
     switch (error.status
     ) {
       case 0:
-        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+        const result = await this.backgroundService.offline()
+        if(result) {
+          this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+        } else {
+          
+        }
+        
         break;
       case 400:
         this.toastService._badRequest('Lamentamos, mas houve um problema com sua solicitação. Por favor, tente novamente')

src/app/services/task.service.ts

@@ -399,13 +399,12 @@ export class TaskService {
       if (activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho') {
         this.router.navigate(['/home/gabinete-digital/despachos-pr', serialNumber, 'gabinete-digital']);
       }
-      else if (activityName == 'Revisar Diploma' || activityName == 'Assinar Diploma') {
+      else if (activityName == 'Revisar Diploma' || activityName == 'Diploma Assinado') {
         this.router.navigate(['/home/gabinete-digital/diplomas', serialNumber, 'gabinete-digital']);
-      }
+      } else if ( activityName == 'Assinar Diploma') {
-      else if (activityName == 'Diploma Assinado') {
         this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']);
       } else {
-
+        throw('Bug!');
       }
     }
     else if (workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento') {

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

@@ -12,7 +12,12 @@
     <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
 
       <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAryPR; let i  index"  [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId ">
-        <div *ngIf="calendars == 'Meu calendario'"> Minha agenda</div>
+        <div *ngIf="calendars == 'Meu calendario'"> 
+          <!-- <span *ngIf="SessionStore.user.Profile == 'PR' ">PR</span>
+          <span *ngIf="SessionStore.user.Profile == 'MDGPR' ">MDGPR</span>
+          <span *ngIf="SessionStore.user.Profile != 'MDGPR' && SessionStore.user.Profile != 'PR'  ">Minha agenda</span> -->
+          Minha agenda
+        </div>
         <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}}</div>
         <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}}</div>
         <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}}</div>

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

@@ -30,6 +30,7 @@ export class EventListPage implements OnInit {
   eventoaprovacaostore = EventoAprovacaoStore;
   environment = environment
   color: 'pr' | 'mdgpr'
+  SessionStore = SessionStore;
 
   @Input() profile:string;
   @Input() showComponent:string;

src/app/shared/gabinete-digital/all-processes/all-processes.page.ts

@@ -148,10 +148,9 @@ export class AllProcessesPage implements OnInit {
       if (activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho') {
         this.router.navigate(['/home/gabinete-digital/despachos-pr', serialNumber, 'gabinete-digital']);
       }
-      else if (activityName == 'Revisar Diploma' || activityName == 'Assinar Diploma') {
+      else if (activityName == 'Revisar Diploma' || activityName == 'Diploma Assinado') {
         this.router.navigate(['/home/gabinete-digital/diplomas', serialNumber, 'gabinete-digital']);
-      }
+      } else if ( activityName == 'Assinar Diploma') {
-      else if (activityName == 'Diploma Assinado') {
         this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']);
       } else {
         throw('Bug!');

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

@@ -58,7 +58,12 @@
           Minha agenda
         </ion-segment-button> -->
         <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAryPR; let i  index"  [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId ">
-          <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
+          <div *ngIf="calendars == 'Meu calendario'"> 
+            <!-- <span *ngIf="SessionStore.user.Profile == 'PR' ">PR</span>
+            <span *ngIf="SessionStore.user.Profile == 'MDGPR' ">MDGPR</span>
+            <span *ngIf="SessionStore.user.Profile != 'MDGPR' && SessionStore.user.Profile != 'PR'  ">Minha agenda</span> -->
+            Minha agenda
+          </div>
           <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}} </div>
           <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
           <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>

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

@@ -45,6 +45,7 @@ export class EventsToApprovePage implements OnInit {
     delete(): void;
   }
   routerSubscription;
+  SessionStore = SessionStore;
 
 
   constructor(

src/app/shared/publication/new-publication/convertBlobToBase64.worker.js

@@ -0,0 +1,15 @@
+convertBlobToBase64 = (blob) => new Promise((resolve, reject) => {
+  const reader = new FileReader;
+  reader.onerror = reject;
+  reader.onload = () => {
+    resolve(reader.result);
+  };
+  reader.readAsDataURL(blob);
+}).catch ((error) => {
+  console.error(error);
+});;
+
+onmessage = async function(oEvent) {
+  const result = await convertBlobToBase64(oEvent.data);
+  postMessage(result);
+};

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

@@ -86,7 +86,7 @@ export class NewPublicationPage implements OnInit {
 
   async takePicture() {
     const capturedImage = await Camera.getPhoto({
-      quality: 90,
+      quality: 50,
       // allowEditing: true,
       resultType: CameraResultType.Base64,
       source: CameraSource.Camera

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "4109e30d0",
+  "shortSHA": "299d46f78",
-  "SHA": "4109e30d0772063fe33a0d1313dda48a2f1d808c",
+  "SHA": "299d46f781fb953966db3639733ae96032e1b75a",
   "branch": "developer-catch-merge",
   "lastCommitAuthor": "'Eudes Inácio'",
-  "lastCommitTime": "'Wed Jul 26 09:47:31 2023 +0100'",
+  "lastCommitTime": "'Wed Jul 26 14:12:23 2023 +0100'",
-  "lastCommitMessage": "Notification stop duplication",
+  "lastCommitMessage": "git pull made",
-  "lastCommitNumber": "5108",
+  "lastCommitNumber": "5112",
   "change": "",
-  "changeStatus": "On branch developer-catch-merge\nYour branch and 'origin/developer-catch-merge' have diverged,\nand have 1 and 4 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   src/app/modals/create-process/create-process.page.ts\n\tmodified:   src/app/modals/profile/profile.page.scss\n\tmodified:   src/app/models/Excludetask.ts\n\tmodified:   src/app/pages/agenda/agenda.page.ts\n\tmodified:   src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified:   src/app/services/contacts.service.ts\n\tmodified:   src/app/services/processes.service.ts\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.ts",
+  "changeStatus": "On branch developer-catch-merge\nYour branch and 'origin/developer-catch-merge' have diverged,\nand have 2 and 6 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.html\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified:   src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified:   src/app/services/background.service.ts\n\tmodified:   src/app/services/http-error-handle.service.ts\n\tmodified:   src/app/services/task.service.ts\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.html\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tnew file:   src/app/shared/publication/new-publication/convertBlobToBase64.worker.js\n\tmodified:   src/app/shared/publication/new-publication/new-publication.page.ts",
   "changeAuthor": "eudes.inacio"
 }