Peter changes 05/06

src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts

@@ -21,7 +21,7 @@ import { ThemeService } from 'src/app/services/theme.service'
 export class DespachosPrPage implements OnInit {
 
   customTaskPipe = new CustomTaskPipe()
-  skeletonLoader = true
+  skeletonLoader = false
 
   loggeduser: LoginUserRespose;
   despachosprstore = DespachosprStore;
@@ -48,7 +48,7 @@ constructor (
 
   ngOnInit() {
 
-    this.LoadList()
+    // this.LoadList()
 
     this.router.events.forEach((event) => {
       if (event instanceof NavigationStart &&

src/app/shared/gabinete-digital/despachos/despachos.page.ts

@@ -12,7 +12,7 @@ import { ThemeService } from 'src/app/services/theme.service'
 })
 export class DespachosPage implements OnInit {
 
-  skeletonLoader = true;
+  skeletonLoader = false;
   filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'|  'OverdueTasks' | 'Todos' = 'Todos'
   showSearch = false
   searchSubject = ''
@@ -29,7 +29,7 @@ export class DespachosPage implements OnInit {
 
   ngOnInit() {
 
-    this.LoadList();
+    // this.LoadList();
 
     this.router.events.forEach((event) => {
       if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital?despachos=true')) {

src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts

@@ -16,7 +16,7 @@ import { TaskService } from 'src/app/services/task.service'
 export class DiplomasAssinarPage implements OnInit {
 
   serialNumber:string;
-  skeletonLoader = true
+  skeletonLoader = false
 
   deplomasStore = DeplomasStore
   customTaskPipe = new CustomTaskPipe()
@@ -39,7 +39,7 @@ export class DiplomasAssinarPage implements OnInit {
 
   ngOnInit() {
 
-    this.LoadList()
+    // this.LoadList()
 
     this.router.events.forEach((event) => {
       if (event instanceof NavigationStart && '/home/gabinete-digital?diplomasassinar=true'.startsWith(event.url)) {

src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts

@@ -17,7 +17,7 @@ export class DiplomasGerarPage implements OnInit {
 
   diplomasList:DailyWorkTask[] = [];
   serialNumber:string;
-  skeletonLoader = true
+  skeletonLoader = false
 
   deplomasStore = DeplomasStore
   customTaskPipe = new CustomTaskPipe()
@@ -39,8 +39,19 @@ export class DiplomasGerarPage implements OnInit {
 
   ngOnInit() {
 
-    this.LoadList()
-    this.dynamicSearch()
+    this.router.events.forEach((event) => {
+      if (event instanceof NavigationStart && '/home/gabinete-digital/?gerarDiplomas=true'.startsWith(event.url)) {
+        if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
+          this.LoadList()
+          this.dynamicSearch()
+        } else {
+          this.LoadList()
+          this.dynamicSearch()
+        }
+      }
+    });
+
+
 
   }
 

src/app/shared/gabinete-digital/diplomas/diplomas.page.ts

@@ -48,7 +48,7 @@ export class DiplomasPage implements OnInit {
 
   ngOnInit() {
     // update list
-    this.LoadList()
+    // this.LoadList()
 
     this.router.events.forEach((event) => {
       if (event instanceof NavigationStart && '/home/gabinete-digital?diplomas=true'.startsWith(event.url)) {

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

@@ -67,7 +67,7 @@ export class EventsToApprovePage implements OnInit {
       }
     }
 
-    this.LoadToApproveEvents();
+    // this.LoadToApproveEvents();
 
     this.router.events.forEach((event) => {
       if (event instanceof NavigationStart &&

src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts

@@ -20,7 +20,7 @@ export class ExpedientesPrPage implements OnInit {
 
   taskslist = [];
   serialNumber:string;
-  skeletonLoader = true;
+  skeletonLoader = false;
   expedienteGdStore = ExpedienteGdStore;
   customTaskPipe = new CustomTaskPipe()
   expedienteTaskPipe = new ExpedienteTaskPipe()
@@ -48,7 +48,7 @@ export class ExpedientesPrPage implements OnInit {
 
   ngOnInit() {
 
-    this.LoadList()
+    // this.LoadList()
 
     this.router.events.forEach((event) => {
       if (event instanceof NavigationStart &&

src/app/shared/gabinete-digital/expedients/expedients.page.ts

@@ -20,7 +20,7 @@ export class ExpedientsPage implements OnInit {
   serialNumber: string;
 
   @Input() profile: string;
-  skeletonLoader = true
+  skeletonLoader = false
   expedientegbstore = ExpedienteGdStore
 
   expedienteTaskPipe = new ExpedienteTaskPipe()
@@ -53,7 +53,7 @@ export class ExpedientsPage implements OnInit {
   ngOnInit() {
     //Inicializar segment
     this.segment = "expedientes";
-    this.LoadList()
+    // this.LoadList()
 
     this.router.events.forEach((event) => {
       if (event instanceof NavigationStart &&