improve

src/app/modals/create-process/create-process.page.html

@@ -70,7 +70,7 @@
                 appearance="fill"
                 class="width-100 d-block"
                 appearance="none">
-                <mat-select [(ngModel)]="selectedTypes" multiple placeholder="Selecione o tipo de evento*">
+                <mat-select [(ngModel)]="selectedTypes" multiple placeholder="Selecione o tipo de assunto*">
                   <mat-option *ngFor="let type of subjectTypes" value="{{type.Code}}">{{type.Description}}</mat-option>
                 </mat-select>
               </mat-form-field>

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

@@ -176,7 +176,7 @@ export class NewEventPage implements OnInit {
     }
 
     window.onresize = (event) => {
-      if( window.innerWidth >= 1024){
+      if( window.innerWidth >= 1024) {
         this.modalController.dismiss();
       }
     };  
@@ -186,9 +186,9 @@ export class NewEventPage implements OnInit {
   }
 
   setDefaultTime() {
-    console.log(this.CalendarDate)
     this.postEvent.StartDate = this.roundTimeQuarterHour(this.CalendarDate);
-    this.postEvent.EndDate = this.postEvent.StartDate;
+    // this.postEvent.EndDate = this.postEvent.StartDate;
+    this.postEvent.EndDate = (new Date(this.postEvent.EndDate.getTime() + 15 * 60000))
   }
 
   close() {
@@ -446,7 +446,11 @@ export class NewEventPage implements OnInit {
       this.modalController.dismiss(data);
 
     } catch (error) {
-      this.toastService._badRequest()
+      if(error.status ==  0) {
+        this.toastService._badRequest('Não é possível  visualizar este processo no modo offline')
+      } else {
+        this.toastService._badRequest()
+      }
     } finally {
       loader.remove()
     }

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts

@@ -177,6 +177,7 @@ export class BookMeetingModalPage implements OnInit {
 
   }
   
+
   getRecurrenceTypes() {
     this.calendarService.getRecurrenceTypes().subscribe(res=>{
       this.recurringTypes = res;
@@ -208,8 +209,8 @@ export class BookMeetingModalPage implements OnInit {
   }
   
   setDefaultTime() {
-    this.postData.StartDate =  new Date()
+    this.postData.StartDate =  this.roundTimeQuarterHour();
-    this.postData.EndDate = (new Date(new Date().getTime() + 15 * 60000))
+    this.postData.EndDate = (new Date(this.postData.StartDate.getTime() + 15 * 60000))
   }
 
   getAttachments() {
@@ -351,6 +352,7 @@ export class BookMeetingModalPage implements OnInit {
 
 
 
+  
   selectedCalendarId () {
 
     if (this.calendarService.calendarNamesType[this.CalendarOwnerName]?.['Oficial'] && this.postData.CalendarName == 'Oficial') {
@@ -501,8 +503,8 @@ export class BookMeetingModalPage implements OnInit {
   }
 
 
-  roundTimeQuarterHour() {
+  roundTimeQuarterHour(timeToReturn?) {
-    var timeToReturn = new Date();
+    var timeToReturn = timeToReturn || new Date();
     var minutes = timeToReturn.getMinutes();
     var hours = timeToReturn.getHours();
 
@@ -515,14 +517,14 @@ export class BookMeetingModalPage implements OnInit {
       }
       timeToReturn.setHours(h);
       timeToReturn.setMinutes(m);
-    }else{
+    } else {
-      if(minutes > m){
+      if(minutes > m) {
 
         m = m + 15;
 
         timeToReturn.setHours(h);
         timeToReturn.setMinutes(m);
-      }else {
+      } else {
         timeToReturn.setHours(h);
         timeToReturn.setMinutes(m);
       }
@@ -534,7 +536,7 @@ export class BookMeetingModalPage implements OnInit {
     return timeToReturn;
   }
 
-  setStartDate(){
+  setStartDate() {
     this.postData.StartDate = this.roundTimeQuarterHour();
   }
 

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html

@@ -109,7 +109,7 @@
                 appearance="fill"
                 class="width-100 d-block"
                 appearance="none">
-                <mat-select [(ngModel)]="selectedTypes" multiple placeholder="Selecione o tipo de evento*">
+                <mat-select [(ngModel)]="selectedTypes" multiple placeholder="Selecione o tipo de assunto*">
                   <mat-option *ngFor="let type of subjectTypes" value="{{type.Code}}">{{type.Description}}</mat-option>
                 </mat-select>
               </mat-form-field>

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts

@@ -320,7 +320,11 @@ export class ExpedientTaskModalPage implements OnInit {
                 this.modalController.dismiss(action_despacho);
 
               } catch (error) {
-                await this.toastService._badRequest('Processo não efetuado')
+                if(error.status ==  0) {
+                  this.toastService._badRequest('Não é possível  visualizar este processo no modo offline')
+                } else {
+                  await this.toastService._badRequest('Processo não efetuado')
+                }
               } finally {
                 loader.remove()
               }
@@ -354,7 +358,11 @@ export class ExpedientTaskModalPage implements OnInit {
                 this.modalController.dismiss(action_parecer);
 
               } catch (error) {
-                await this.toastService._badRequest('Processo não efetuado')
+                if(error.status ==  0) {
+                  this.toastService._badRequest('Não é possível  visualizar este processo no modo offline')
+                } else {
+                  await this.toastService._badRequest('Processo não efetuado')
+                }
               } finally {
                 loader.remove()
               }
@@ -385,7 +393,11 @@ export class ExpedientTaskModalPage implements OnInit {
               this.toastService._successMessage('Processo efetuado');
               this.modalController.dismiss(action_deferimento);
             } catch (error) {
-              await this.toastService._badRequest('Processo não efetuado')
+              if(error.status ==  0) {
+                this.toastService._badRequest('Não é possível  visualizar este processo no modo offline')
+              } else {
+                await this.toastService._badRequest('Processo não efetuado')
+              }
             } finally {
               loader.remove()
             }
@@ -424,7 +436,11 @@ export class ExpedientTaskModalPage implements OnInit {
                 this.modalController.dismiss(action_despacho_pr);
               } catch (error) {
 
-                await this.toastService._badRequest('Processo não efetuado')
+                if(error.status ==  0) {
+                  this.toastService._badRequest('Não é possível  visualizar este processo no modo offline')
+                } else {
+                  await this.toastService._badRequest('Processo não efetuado')
+                }
               } finally {
                 //loader.remove()
               }
@@ -461,8 +477,11 @@ export class ExpedientTaskModalPage implements OnInit {
               await this.toastService._successMessage('Pedido enviado');
               this.modalController.dismiss(action_parecer_pr);
             } catch (error) {
-
+              if(error.status ==  0) {
-              await this.toastService._badRequest('Processo não efetuado')
+                this.toastService._badRequest('Não é possível  visualizar este processo no modo offline')
+              } else {
+                await this.toastService._badRequest('Processo não efetuado')
+              }
             } finally {
                 loader.remove()
             }

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html

@@ -92,8 +92,8 @@
 
     <div class="aside-right flex-column height-100 overflow-y-auto">
       <div class="buttons">
-        <div *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="option-desc"> <div *ngIf="loggeduser.Profile == 'MDGPR'">Enviar para o PR</div> </div>
+        <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc"> <div>Enviar para o PR</div> </div>
-        <button *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks]) && loggeduser.Profile == 'MDGPR'" (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Avaliação Superior</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Avaliação Superior</button>
         <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc"> <div>Solicitar revisão</div> </div>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Mandar para Revisão</button>
         <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc"> <div>Outras opções</div> </div>

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

@@ -90,6 +90,8 @@ export class ExpedienteDetailPage implements OnInit {
     private userAuth: AuthService,
   ) {
     this.loggeduser = SessionStore.user
+    console.log('SessionStore', SessionStore)
+    
     this.activatedRoute.paramMap.subscribe(params => {
       if (params["params"].SerialNumber) {
         this.serialNumber = params["params"].SerialNumber;

src/app/shared/popover/opts-expediente/opts-expediente.page.html

@@ -8,8 +8,8 @@
   <div class="width-100">
     <div class="d-flex width-100">
       <div class="flex-grow-1">
-        <button *ngIf="SessionStore.user.Profile == 'MDGPR'"  class="btn-cancel desk" shape="round"> Enviar para o PR </button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])"  class="btn-cancel desk" shape="round"> Enviar para o PR </button>
-        <button *ngIf="SessionStore.user.Profile == 'MDGPR'" (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Avaliação Superior</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Avaliação Superior</button>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Solicitar revisão </button>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Mandar para Revisão</button>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round">Outras opções </button>

src/app/shared/popover/opts-expediente/opts-expediente.page.ts

@@ -54,7 +54,7 @@ export class OptsExpedientePage implements OnInit {
   }
 
   ngOnInit() {
-  
+    console.log('SessionStore', SessionStore)
   }
 
   async openNewGroupPage(){

src/app/shared/popover/searched-document-options/searched-document-options.page.html

@@ -1,9 +1,7 @@
-<ion-content class="container width-100 ">
+<div class="buttons pa-20">
-  <div class="buttons">
+  <button (click)="openExpedientActionsModal('0')" class="btn-cancel" shape="round" >Efetuar Despacho</button>
-    <button (click)="openExpedientActionsModal('0')" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+  <div class="solid"></div>
-    <div class="solid"></div>
+  <button (click)="openExpedientActionsModal('0')"  class="btn-cancel" shape="round" >Solicitar Parecer</button>
-    <button (click)="openExpedientActionsModal('0')"  class="btn-cancel" shape="round" >Solicitar Parecer</button>
+  <button *ngIf="!p.userRole(['PR']) && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2')" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
-    <button *ngIf="!p.userRole(['PR']) && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2')" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
+  <button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>
-    <button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>
+</div>
-  </div>
-</ion-content>

src/environments/environment.prod.ts

@@ -3,4 +3,4 @@ import { oaprProd } from './suport/oapr'
 import { doneITProd } from './suport/doneIt'
 
 
-export const environment: Environment = oaprProd;
+export const environment: Environment = doneITProd;

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "ac23c085f",
+  "shortSHA": "0036ce6ab",
-  "SHA": "ac23c085fb436db5698015e7627ec7c098cae72c",
+  "SHA": "0036ce6ab20cb98b60cd6f86af434a2bffa15d13",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Wed Feb 1 18:04:01 2023 +0100'",
+  "lastCommitTime": "'Thu Feb 2 10:37:17 2023 +0100'",
-  "lastCommitMessage": "merge",
+  "lastCommitMessage": "fix loader",
-  "lastCommitNumber": "4708",
+  "lastCommitNumber": "4709",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/view-event/view-event.page.ts\n\tmodified:   src/app/pages/events/events.page.html\n\tmodified:   src/app/pages/events/events.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified:   src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified:   src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified:   src/app/shared/gabinete-digital/despachos/despachos.page.html\n\tmodified:   src/app/shared/gabinete-digital/despachos/despachos.page.ts\n\tmodified:   src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified:   src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified:   src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html\n\tmodified:   src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified:   src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html\n\tmodified:   src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts\n\tmodified:   src/app/shared/gabinete-digital/diplomas/diplomas.page.html\n\tmodified:   src/app/shared/gabinete-digital/diplomas/diplomas.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\tmodified:   src/app/shared/gabinete-digital/expedients/expedients.page.html\n\tmodified:   src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified:   src/app/shared/gabinete-digital/pedidos/pedidos.page.html\n\tmodified:   src/app/shared/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified:   src/app/shared/gabinete-digital/pendentes/pendentes.page.html\n\tmodified:   src/app/shared/gabinete-digital/pendentes/pendentes.page.ts",
+  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/create-process/create-process.page.html\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified:   src/app/shared/popover/opts-expediente/opts-expediente.page.html\n\tmodified:   src/app/shared/popover/opts-expediente/opts-expediente.page.ts\n\tmodified:   src/app/shared/popover/searched-document-options/searched-document-options.page.html\n\tmodified:   src/environments/environment.prod.ts\n\tnew file:   www.rar",
   "changeAuthor": "peter.maquiran"
 }