fix

src/app/pages/events/events.page.html

@@ -24,7 +24,7 @@
 
   <div class="conteiner-box pt-20 height-100">
     
-    <div class="main-content height-100"> 
+    <div class="main-content justify-center d-flex height-100"> 
       <div class="box-container d-flex mx-20" style="padding: 0px;overflow: hidden;">
         <ion-progress-bar type="indeterminate" *ngIf="loadingAllTask"></ion-progress-bar>
         <div class="px-20 pb-20">

src/app/pages/events/events.page.scss

@@ -630,3 +630,15 @@ ion-title{
 .conteiner-box-mobile {
   display: none;
 }
+
+
+
+
+@media screen and (max-width: 400px) {
+  .box-container {
+    width: 360px;
+    margin: 0px auto;
+    margin-left: 0px !important;
+    margin-right: 0px !important;
+  }
+}

src/app/pages/events/events.page.ts

@@ -126,9 +126,6 @@ export class EventsPage implements OnInit {
       this.hideSearch();
     });
 
-
-    // this.getEventsFromLocalDb();
-
   }
 
   async loadAllTask() {
@@ -362,6 +359,4 @@ export class EventsPage implements OnInit {
     }
   }
 
-
-
 }

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

@@ -115,65 +115,6 @@ export class EventListPage implements OnInit {
   }
 
 
-  getEventToAproveFromDB() {
-
-
-
-    if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
-      this.storage.get('event-to-aproveMD').then((events = []) => {
-        this.eventsMDGPRList = events
-      })
-
-      this.storage.get('event-to-aprovePR').then((events = []) => {
-        this.eventsPRList = events
-      })
-    } else {
-      this.platform.ready().then(() => {
-
-        this.sqliteservice.getListOfEventAprove('Agenda Oficial MDGPR', 'Agenda Pessoal MDGPR').then((event: any[] = []) => {
-
-          this.eventsMDGPRList = this.sortService.sortDate(this.transformaDataDB(event), 'taskStartDate')
-
-        })
-
-        this.sqliteservice.getListOfEventAprove('Agenda Oficial PR', 'Agenda Pessoal PR').then((event: any[] = []) => {
-          this.eventsPRList = this.sortService.sortDate(this.transformaDataDB(event), 'taskStartDate')
-        })
-        
-      })
-
-    }
-
-
-    
-  }
-
-  transformaDataDB(events = []) {
-    let MdEventsArray = [];
-    for (let i of events) {
-      let eventMD = {
-        Documents: i.Documents,
-        actions: i.actions,
-        activityInstanceName: i.activityInstanceName,
-        formURL: i.formURL,
-        interveners: i.interveners,
-        originator: i.originator,
-        serialNumber: i.serialNumber,
-        taskStartDate: i.taskStartDate,
-        totalDocuments: i.totalDocuments,
-        workflowDisplayName: i.workflowDisplayName,
-        workflowID: i.workflowID,
-        workflowInstanceDataFields: JSON.parse(i.workflowInstanceDataFields),
-        workflowInstanceFolio: i.workflowInstanceFolio,
-        workflowInstanceID: i.workflowInstanceID,
-        workflowName: i.workflowName,
-      }
-
-      MdEventsArray.push(eventMD);
-    }
-    return MdEventsArray;
-  }
-
   segmentChanged(ev: any) {
     this.LoadToApproveEvents();
   }
@@ -211,7 +152,6 @@ export class EventListPage implements OnInit {
         this.eventsList = []
       }
       
-      this.eventsList = this.eventsList
       this.eventsList = this.eventsList
       this.showLoader = false;
       this.eventoaprovacaostore.save(segment.OwnerUserId, this.eventsList)
@@ -269,7 +209,7 @@ export class EventListPage implements OnInit {
       this.LoadToApproveEvents();
       try {
         event?.target?.complete();
-} catch(error) {}
+      } catch(error) {}
     }, 1000);
   }
 
@@ -277,13 +217,6 @@ export class EventListPage implements OnInit {
     this.modalController.dismiss(null);
   }
   goBack() {
-    // if(this.router.url == '/home/agenda/event-list') {
-    //   this.router.navigate(['/home/agenda']);
-    // }
-    // else if(this.router.url == '/home/gabinete-digital/event-list'){
-    //   this.router.navigate(['/home/gabinete-digital']);
-    // }
-
     this.RouteService.goBack()
   }
 

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

@@ -278,58 +278,7 @@ export class GabineteDigitalPage implements OnInit {
     this.LoadCounts();
   }
 
-  addProcessToDB(data) {}
 
-  getAllProcessFromDB() {}
-
-  dataTranform(data) {
-
-  }
-
-  sortArrayISODate(myArray: any): any[] {
-    // return myArray.sort(function (a, b) {
-    //   return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
-    // });
-
-    return myArray.sort((a,b) => Date.parse(b.CreateDate || b.taskStartDate) - Date.parse(a.CreateDate || a.taskStartDate))
-  }
-
-  setFormatDate(start: any, end: any, allday: boolean) {
-    let customDate;
-
-    const totalSeconds = Math.floor((end - (start)) / 1000);;
-    const totalMinutes = Math.floor(totalSeconds / 60);
-    const totalHours = Math.floor(totalMinutes / 60);
-    const totalDays = Math.floor(totalHours / 24);
-
-    if (totalDays == 0) {
-      if (allday) {
-        customDate = this.getCustomDate(start) + ", " + this.getCustomHours(start) + " (todo dia)";
-
-        return customDate;
-      }
-      else {
-        customDate = this.getCustomDate(start) + ", " + this.getCustomHours(start) + " | " + this.getCustomHours(end);
-        return customDate;
-      }
-    }
-    else {
-      customDate = this.getCustomDate(start) + "," + this.getCustomHours(start) +
-        " (termina:" + this.getCustomDate(end) + "," + this.getCustomHours(end) + ")";
-      return customDate;
-    }
-  }
-
-  getCustomDate(thedate: Date) {
-    return thedate.getDate() + "/" +
-      (thedate.getMonth() + 1) + "/" +
-      thedate.getFullYear();
-  }
-
-  getCustomHours(thedate: Date) {
-    return thedate.getHours() + ":" +
-      thedate.getMinutes();
-  }
   goto(url) {
     this.router.navigate([url])
   }
@@ -380,10 +329,6 @@ export class GabineteDigitalPage implements OnInit {
 
   }
 
-  onSegmentVistaChange() {
-
-  }
-
   checkUser() {
     this.selectedElement = 'allProcessesTag';
     this.showAllProcesses = true;
@@ -500,7 +445,9 @@ export class GabineteDigitalPage implements OnInit {
 
   async LoadCounts() {
     
+    // this.skeletonLoader = true
     await this.TaskService.LoadTask()
+    // this.skeletonLoader = false
   }
 
   doRefresh(event) {

src/app/services/auth.service.ts

@@ -30,6 +30,8 @@ export class AuthService {
   public isWsAuthenticated: boolean = false;
   opts:any;
 
+  tabIsActive = true
+
   constructor(
     private http: HttpClient,
     private storageService:StorageService,
@@ -52,6 +54,22 @@ export class AuthService {
         }
 
       }
+
+      window.addEventListener('focus', (event) => {
+        if(!this.tabIsActive) {
+          this.tabIsActive = true
+          const data = SessionStore.getDataFromLocalStorage();
+          
+          if(!data?.user?.Authorization && SessionStore?.user?.Authorization) {
+            window.location.reload();
+          }
+        }
+      });
+    
+      window.addEventListener('blur',  (event) => {
+        this.tabIsActive = false
+      });
+
     }
 
     async login(user: UserForm, {saveSession = true}): Promise<LoginUserRespose> {

src/app/services/task.service.ts

@@ -168,9 +168,8 @@ export class TaskService {
     try {
       await this.loadExpedientes()
       this.loadCount = true;
-      this.showLoader = false;
+
     } catch(error) {
-      this.showLoader = false
       this.loadCount = true;
     }
 
@@ -187,6 +186,7 @@ export class TaskService {
 
     await this.loadEventosParaAprovacao()
     this.loadCount = true
+    this.showLoader = false;
   }
 
   async loadDespachos() {

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

@@ -20,7 +20,7 @@
         <p><span class="date">{{customDate}}</span></p>
       </ion-label>
       <ion-label>
-        <p><span class="color-red">{{ task.DeadlineType }}</span></p>
+        <p><span class="color-red">{{ task.Deadline }}</span></p>
       </ion-label>
       <ion-label>
         <p class="d-flex mt-10"><span class="label">{{ task.activityInstanceName }}</span></p>

src/app/store/despacho-store.service.ts

@@ -31,7 +31,7 @@ export class DespachoStoreService {
     this.keyName = (SHA1("DespachoStoreService"+ 'home/eventSource')).toString()
     window['ObjectQueryService'] = this.Query()
 
-    setTimeout(()=>{ 
+    setTimeout(() => { 
       let restore = localstoreService.get(this.keyName, {})
       this._list = restore.list || []
       this._count = parseInt(restore.count)  || 0

src/app/store/session.service.ts

@@ -43,11 +43,15 @@ class SessionService {
   constructor() {
 
     this.keyName = (SHA1("SessionService")).toString()
-    let restore = localstoreService.get(this.keyName, {})
+    let restore = this.getDataFromLocalStorage()
     this._user = restore.user || new UserSession()
 
   }
 
+  getDataFromLocalStorage() {
+    return localstoreService.get(this.keyName, {})
+  }
+
   get user(): UserSession {
     return this._user  || new UserSession()
   }

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "0b3ffa3ea",
+  "shortSHA": "b2da8463b",
-  "SHA": "0b3ffa3ea7e094cc5fa08e542fc0bdc76917ddf1",
+  "SHA": "b2da8463b448e5ccf881a48bb024a7733de1ea45",
   "branch": "feature/gabinete-search",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Fri May 26 10:08:35 2023 +0100'",
+  "lastCommitTime": "'Fri May 26 14:23:37 2023 +0100'",
-  "lastCommitMessage": "fix",
+  "lastCommitMessage": "feature/gabinete-search",
-  "lastCommitNumber": "4943",
+  "lastCommitNumber": "4944",
   "change": "",
-  "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/app.component.ts\n\tmodified:   src/app/guards/auth.guard.ts\n\tmodified:   src/app/guards/login.guard.ts\n\tmodified:   src/app/home/home.page.ts\n\tmodified:   src/app/modals/create-process/create-process.page.ts\n\tmodified:   src/app/modals/document-detail/document-detail.page.ts\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified:   src/app/modals/preview-camera/preview-camera.page.ts\n\tmodified:   src/app/modals/profile/profile.page.ts\n\tmodified:   src/app/modals/set-room-owner/set-room-owner.page.ts\n\tmodified:   src/app/modals/view-document/view-document.page.ts\n\tmodified:   src/app/modals/view-event/view-event.page.ts\n\tmodified:   src/app/modals/view-media/view-media.page.ts\n\tmodified:   src/app/pages/agenda/agenda.page.ts\n\tmodified:   src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.html\n\tmodified:   src/app/pages/events/events.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos/despacho/despacho.module.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.scss\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/services/auth.service.ts\n\tmodified:   src/app/services/chat.service.ts\n\tmodified:   src/app/services/chat/chat-system.service.ts\n\tmodified:   src/app/services/chat/message.service.ts\n\tmodified:   src/app/services/chat/rochet-chat-connector.service.ts\n\tmodified:   src/app/services/chat/room.service.ts\n\tmodified:   src/app/services/native-notification.service.ts\n\tmodified:   src/app/services/network-service.service.ts\n\tmodified:   src/app/services/notification/sw.js\n\tmodified:   src/app/services/notifications.service.ts\n\tmodified:   src/app/services/processes.service.ts\n\tmodified:   src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified:   src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.html\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified:   src/app/shared/agenda/view-event/view-event.page.ts\n\tmodified:   src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified:   src/app/shared/chat/messages/messages.page.ts\n\tmodified:   src/app/shared/fingerprint/fingerprint.page.ts\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified:   src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.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.ts\n\tmodified:   src/app/shared/gabinete-digital/generic/task-details/task-details.page.html\n\tmodified:   src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss\n\tmodified:   src/app/shared/header/header.page.ts\n\tmodified:   src/app/shared/popover/deploma-options/deploma-options.page.ts\n\tmodified:   src/app/shared/popover/opts-expediente/opts-expediente.page.ts\n\tmodified:   src/app/shared/publication/edit-action/edit-action.page.ts\n\tmodified:   src/app/shared/shared.module.ts\n\tmodified:   src/global.scss",
+  "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/events/events.page.html\n\tmodified:   src/app/pages/events/events.page.scss\n\tmodified:   src/app/pages/events/events.page.ts\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/services/auth.service.ts\n\tmodified:   src/app/services/task.service.ts\n\tmodified:   src/app/shared/gabinete-digital/generic/task-details/task-details.page.html\n\tmodified:   src/app/store/despacho-store.service.ts\n\tmodified:   src/app/store/session.service.ts",
   "changeAuthor": "peter.maquiran"
 }