Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

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

@@ -20,8 +20,8 @@ export class DespachoStoreService {
     
     setTimeout(()=>{ 
       let restore = localstoreService.get(this.keyName, {})
-      this._list = restore.eventsList || []
-      this._count = this._list.length || 0
+      this._list = restore.list || []
+      this._count = parseInt(restore.count)  || 0
     }, 10)
 
   }
@@ -36,20 +36,21 @@ export class DespachoStoreService {
   
   set count(value: number) {
     this._count = value
+    this.save()
   }
 
   reset(eventsList: any) {
     this._list = eventsList
 
     this.count = this._list.length
-    this.save(this._list)
+    this.save()
   }
 
-  private save(eventsList: any) {
+  private save() {
     setTimeout(()=>{ 
       localstoreService.set(this.keyName,{
-        eventsList,
-        count: this._list.length
+        list: this._list,
+        count: this._count
       })
     }, 10)
     

src/app/store/despachos-page-store.service.ts

@@ -20,8 +20,8 @@ export class DespachosPageStoreService {
     
     setTimeout(()=>{ 
       let restore = localstoreService.get(this.keyName, {})
-      this._list = restore.eventsList || []
-      this._count = this._list.length || 0
+      this._list = restore.list || []
+      this._count = parseInt(restore.count) || 0
     }, 10)
 
   }
@@ -35,23 +35,23 @@ export class DespachosPageStoreService {
   }
   set count(value) {
     this._count = value
+    this.save()
   }
 
   reset(eventsList: any) {
     this._list = eventsList
 
     this.count = this._list.length
-    this.save(this._list)
+    this.save()
   }
 
-  private save(eventsList: any) {
-    setTimeout(()=>{ 
+  private save() {
+    setTimeout(()=> { 
       localstoreService.set(this.keyName,{
-        eventsList,
-        count: this._list.length
+        list: this._list,
+        count: this._count
       })
     }, 10)
-    
   }
 
 }

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

@@ -20,8 +20,8 @@ constructor() {
   
   setTimeout(()=>{ 
     let restore = localstoreService.get(this.keyName, {})
-    this._list = restore.eventsList || []
-    this._count = this._list.length || 0
+    this._list = restore.list || []
+    this._count = parseInt(restore.count) || 0
   }, 10)
 
 }
@@ -30,25 +30,24 @@ get list() {
   return this._list || []
 }
 
-get count() {
-  return this._count
-}
+get count() { return this._count }
 set count(value: number) {
   this._count = value
+  this.save()
 }
 
 reset(eventsList: any) {
   this._list = eventsList
 
   this.count = this._list.length
-  this.save(this._list)
+  this.save()
 }
 
-private save(eventsList: any) {
+private save() {
   setTimeout(()=>{ 
     localstoreService.set(this.keyName,{
-      eventsList,
-      count: this._list
+      list: this._list,
+      count:this._count
     })
   }, 10)
   

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

@@ -8,12 +8,14 @@ import { AES, enc, SHA1 }  from  'crypto-js'
 export class EventoaprovacaoStoreService {
 
  // main data
- private _listpr: Event[] = []
- private _listmd: Event[] = []
+ private _listPr: any[] = []
+ private _listMd: any[] = []
  // local storage keyName
  private keyNamemd: string;
  private keyNamepr: string; 
  private _count = 0
+ _countPr = 0
+ _countMd = 0
 
   constructor() {
 
@@ -22,59 +24,67 @@ export class EventoaprovacaoStoreService {
     
     
     setTimeout(()=>{
-      let restoremd = localstoreService.get(this.keyNamemd, {})
-      let restorepr = localstoreService.get(this.keyNamepr, {})
+      let restoreMd = localstoreService.get(this.keyNamemd, {})
+      let restorePr = localstoreService.get(this.keyNamepr, {})
 
-      this._listpr = restorepr.eventsListpr || []
-      this._listmd = restoremd.eventsListmd || []
-      this._count = this._listpr.length + this._listmd.length || 0
+      this._listPr = restorePr.lisMd || []
+      this._listMd = restoreMd.listPr || []
+      this._countMd = parseInt(restoreMd.countListMd) || 0
+      this._countPr = parseInt(restoreMd.countListPr) || 0
+      this._count =  (this._countMd + this._countPr) || 0
     }, 10)
 
   }
 
-  get listpr() {
-    return this._listpr
-  }
-
-  get listmd() {
-    return this._listmd
-  }
+  get listpr() { return this._listPr }
+  get listmd() { return this._listMd }
   
-  get count() {
-    return this._count
-  }
-
+  get count() { return this._count }
   set count(value: number) {
     this._count = value
   }
 
-  resetpr(eventsList: any) {
-    this._listpr = eventsList
+  get countPr() { return this._countPr }
+  set countPr (value) {
+    this._countPr = value
+  }
 
-    this.count = this._listmd.length + this.listpr.length
-    this.savepr(this._listpr)
+  get countMd() { return this._countMd }
+  set countMd (value) {
+    this._countMd = value
+  }
+
+  resetpr(eventsList: any) {
+    this._listPr = eventsList
+
+    this.countPr = this._listPr.length
+    this.count = this.countPr + this.countMd
+
+    this.savePr()
   }
 
   resetmd(eventsList: any) {
-    this._listmd = eventsList
+    this._listMd = eventsList
 
-    this.count = this._listmd.length + this.listpr.length
-    this.savemd(this._listmd)
+    this.countMd = this._listMd.length
+    this.count = this.countPr + this.countMd
+    this.saveMd()
   }
 
-  private savemd(eventsListmd: any) {
+  private saveMd() {
     setTimeout(()=>{ 
       localstoreService.set(this.keyNamemd,{
-        eventsListmd,
+        lisMd: this._listMd,
+        countListMd: this._countMd
       })
     }, 10)
     
   }
-
-  private savepr(eventsListpr: any) {
+  private savePr() {
     setTimeout(()=>{ 
       localstoreService.set(this.keyNamepr,{
-        eventsListpr,
+        listPr: this._listPr,
+        countListPr: this._countPr
       })
     }, 10)
     

src/app/store/expediente-storage-service.service.ts

@@ -37,20 +37,21 @@ class ExpedienteStorageServiceService {
   }
   set count(value: number) {
     this._count = value
+    this.save()
   }
 
   reset(list: any) {
     this._list = list
 
     this.count = this._list.length
-    this.save(this._list)
+    this.save()
   }
 
-  private save(list: any) {
+  private save() {
     setTimeout(()=>{ 
       localstoreService.set(this.keyName, {
-        list: list,
-        count: this.count
+        list: this._list,
+        count: this._count
       })
     }, 10)
   }

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

@@ -17,10 +17,10 @@ export class ExpedientegdStoreService {
 
     this.keyName = (SHA1(this.constructor.name)).toString()
     
-    setTimeout(()=>{ 
+    setTimeout(()=> { 
       let restore = localstoreService.get(this.keyName, {})
-      this._list = restore.eventsList || []
-      this._count = this._list.length || 0
+      this._list = restore.list || []
+      this._count = parseInt(restore.count) || 0
     }, 10)
 
   }
@@ -33,19 +33,21 @@ export class ExpedientegdStoreService {
   }
   set count(value: number) {
     this._count = value
+    this.save()
   }
 
   reset(eventsList: any) {
     this._list = eventsList
 
     this.count = this._list.length
-    this.save(this._list)
+    this.save()
   }
 
-  private save(eventsList: any) {
+  private save() {
     setTimeout(()=>{ 
       localstoreService.set(this.keyName,{
-        eventsList,
+        list: this._list,
+        count: this._count
       })
     }, 10)
     

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

@@ -6,51 +6,48 @@ import { AES, enc, SHA1 }  from  'crypto-js'
   providedIn: 'root'
 })
 export class ExpedienteprStoreService {
-// main data
-private _list: [] = []
-// local storage keyName
-private keyName: string; 
-private _count = 0
+  // main data
+  private _list: [] = []
+  // local storage keyName
+  private keyName: string; 
+  private _count = 0
 
-constructor() {
+  constructor() {
 
-  this.keyName = (SHA1(this.constructor.name)).toString()
-  
-  
-  setTimeout(()=>{ 
-    let restore = localstoreService.get(this.keyName, {})
-    this._list = restore.eventsList || []
-    this._count = this._list.length || 0
-  }, 10)
+    this.keyName = (SHA1(this.constructor.name)).toString()
+    
+    setTimeout(()=>{ 
+      let restore = localstoreService.get(this.keyName, {})
+      this._list = restore.list || []
+      this._count = parseInt(restore.count) || 0
+    }, 10)
 
-}
+  }
 
-get list() {
-  return this._list || []
-}
+  get list() { return this._list || [] }
 
-get count() {
-  return this._count
-}
-set count(value: number) {
-  this._count = value
-}
+  get count() { return this._count }
+  set count(value: number) {
+    this._count = value
+    this.save()
+  }
 
-reset(eventsList: any) {
-  this._list = eventsList
+  reset(eventsList: any) {
+    this._list = eventsList
 
-  this.count = this._list.length
-  this.save(this._list)
-}
+    this.count = this._list.length
+    this.save()
+  }
 
-private save(eventsList: any) {
-  setTimeout(()=>{ 
-    localstoreService.set(this.keyName,{
-      eventsList,
-    })
-  }, 10)
-  
-}
+  private save() {
+    setTimeout(()=>{ 
+      localstoreService.set(this.keyName,{
+        list: this._list,
+        count: this._count
+      })
+    }, 10)
+    
+  }
 
 }
 

src/app/store/localstore.service.ts

@@ -6,7 +6,7 @@ import { AES, enc, SHA1 }  from  'crypto-js'
 })
 export class LocalstoreService {
 
-  private prefix = 'v13-'
+  private prefix = 'v14-'
 
   constructor() {
 
@@ -59,18 +59,16 @@ export class LocalstoreService {
 
 export const localstoreService = new LocalstoreService()
 
+// // Create WebSocket connection.
+// const socket = new WebSocket('ws://localhost:8080');
 
+// // Listen for messages
+// socket.addEventListener('message', function (event) {
+//   console.log('Message from server ', event.data); // Message from server mobile first é fraco
 
-/* // Create WebSocket connection.
-const socket = new WebSocket('ws://localhost:8080');
+//   var p = Promise.resolve(event.data);
+//   p.then(function(v) {
+//     console.log(v); // mobile first é fraco
+//   });
 
-// Listen for messages
-socket.addEventListener('message', function (event) {
-  console.log('Message from server ', event.data); // Message from server mobile first é fraco
-
-  var p = Promise.resolve(event.data);
-  p.then(function(v) {
-    console.log(v); // mobile first é fraco
-  });
-
-}); */
+// });

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

@@ -7,86 +7,89 @@ import { AES, enc, SHA1 }  from  'crypto-js'
 })
 export class PedidosStoreService {
 
-  private _listparecer: Event[] = []
-  private _listdeferimento: Event[] = []
+  private _listParecer: Event[] = []
+  private _listDeferimento: Event[] = []
   // local storage keyName
   private keyNameparecer: string;
   private keyNamedeferiemnto: string; 
   private _countparecer = 0
-  private _countdeferiemnto = 0
+  private _countDeferiemnto = 0
  
   constructor() {
  
     this.keyNameparecer = (SHA1(this.constructor.name+"parecer")).toString()
     this.keyNamedeferiemnto = (SHA1(this.constructor.name+"deferimneto")).toString()
     
-    
     setTimeout(()=>{ 
-      let restoreparecer = localstoreService.get(this.keyNameparecer, {})
-      let restoredeferimento = localstoreService.get(this.keyNamedeferiemnto, {})
+      let restoreParecer = localstoreService.get(this.keyNameparecer, {})
+      let restoreDeferimento = localstoreService.get(this.keyNamedeferiemnto, {})
       
-      this._listparecer = restoredeferimento.eventsListdeferimento || []
-      this._listdeferimento = restoreparecer.eventsListparecer || []
-      this._countparecer =  this._listparecer.length || 0
-      this._countdeferiemnto = this._listdeferimento.length || 0
+      this._listParecer = restoreDeferimento.listDeferimento || []
+      this._listDeferimento = restoreParecer.listParecer || []
+      this._countparecer =  parseInt(restoreParecer.count) || 0
+      this._countDeferiemnto = parseInt(restoreDeferimento.count) || 0
       
     }, 10)
  
   }
  
   get listparecer() {
-    return this._listparecer
+    return this._listParecer
   }
  
   get listdeferimento() {
-   return this._listdeferimento
- }
+   return this._listDeferimento
+  }
+
   get countparecer() {
     return this._countparecer
   }
   set countparecer(value: number) {
     this._countparecer = value
+    this.saveParecer()
   }
 
   get countdeferimento() {
-    return this._countdeferiemnto
+    return this._countDeferiemnto
   }
   set countdeferimento(value: number ) {
-    this._countdeferiemnto = value
+    this._countDeferiemnto = value
+    this.saveDeferimento()
   }
  
   resetparecer(eventsList: any) {
-    this._listparecer = eventsList
+    this._listParecer = eventsList
  
-    this.countparecer = this._listparecer.length
-    this.savedeferimento(this._listparecer)
+    this.countparecer = this._listParecer.length
+    this.saveDeferimento()
   }
  
-  resetdeferimento(eventsList: any) {
-    this._listdeferimento = eventsList
+  resetdeferimento(list: any) {
+    this._listDeferimento = list
  
-   this.countdeferimento =this._listdeferimento.length
-   this.saveparecer(this._listdeferimento)
- }
-  private saveparecer(eventsListparecer: any) {
+   this.countdeferimento =this._listDeferimento.length
+   this.saveParecer()
+  }
+
+  private saveParecer() {
     setTimeout(()=>{ 
       localstoreService.set(this.keyNameparecer,{
-        eventsListparecer,
-        count: this._listparecer,
+        listParecer: this._listParecer,
+        count: this._countparecer,
       })
     }, 10)
     
   }
  
-  private savedeferimento(eventsListdeferimento: any) {
-   setTimeout(()=>{ 
-     localstoreService.set(this.keyNamedeferiemnto,{
-       eventsListdeferimento,
-       count: this._listdeferimento,
-     })
-   }, 10)
-   
- }
+  private saveDeferimento() {
+    setTimeout(()=>{ 
+      localstoreService.set(this.keyNamedeferiemnto,{
+        listDeferimento: this._listParecer,
+        count: this._countDeferiemnto,
+      })
+    }, 10)
+    
+  }
 
 }
 

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

@@ -8,52 +8,53 @@ import { AES, enc, SHA1 }  from  'crypto-js'
 export class PendestesStoreService {
 
   // main data
-private _list = []
-// local storage keyName
-private keyName: string; 
-private _count = 0
+  private _list = []
+  // local storage keyName
+  private keyName: string; 
+  private _count = 0
 
-constructor() {
+  constructor() {
 
-  this.keyName = (SHA1(this.constructor.name)).toString()
+    this.keyName = (SHA1(this.constructor.name)).toString()
+    
+    
+    setTimeout(()=>{ 
+      let restore = localstoreService.get(this.keyName, {})
+      this._list = restore.list || []
+      this._count = parseInt(restore.count) || 0
+    }, 10)
+
+  }
   
-  
-  setTimeout(()=>{ 
-    let restore = localstoreService.get(this.keyName, {})
-    this._list = restore.eventsList || []
-    this._count = this._list.length || 0
-  }, 10)
+  get list() {
+    return this._list
+  }
 
-}
+  get count() {
+    return this._count
+    this.save()
+  }
+  set count(value) {
+    this._count = value
+  }
 
-get list() {
-  return this._list
-}
-get count() {
-  return this._count
-}
-set count(value) {
-  this._count = value
-}
+  reset(eventsList: any) {
+    this._list = eventsList
 
-reset(eventsList: any) {
-  this._list = eventsList
+    this.count = this._list.length
+    this.save()
+  }
 
-  this.count = this._list.length
-  this.save(this._list)
-}
-
-private save(eventsList: any) {
-  setTimeout(()=>{ 
-    localstoreService.set(this.keyName,{
-      eventsList,
-      count: this._list.length
-    })
-  }, 10)
-  
-}
+  private save() {
+    setTimeout(()=>{ 
+      localstoreService.set(this.keyName,{
+        list: this._list,
+        count: this._list.length
+      })
+    }, 10)
+    
+  }
 
 }
 
 export const PendentesStore = new PendestesStoreService()
-

src/app/store/presidential-actions-store.service.ts

@@ -17,9 +17,9 @@ export class PresidentialActionsStoreService {
 
     this.keyName = (SHA1(this.constructor.name+ 'presidentialActions/local')).toString()
 
-    setTimeout(()=>{ 
+    setTimeout(()=>{
       let restore = localstoreService.get(this.keyName, [])
-      this._list = restore
+      this._list = restore.list
     }, 10)
 
   }
@@ -36,7 +36,9 @@ export class PresidentialActionsStoreService {
 
   private save(list: Publication[]) {
     setTimeout(()=> { 
-      localstoreService.set(this.keyName, list)
+      localstoreService.set(this.keyName, {
+        list: this._list
+      })
     }, 10)
   }
 

src/app/store/publication-event-folder.service.ts

@@ -18,7 +18,7 @@ export class PublicationEventFolderService {
 
     setTimeout(()=>{
       let restore = localstoreService.get(this.keyName, [])
-      this._list = restore
+      this._list = restore.list
     }, 10)
 
   }
@@ -30,12 +30,14 @@ export class PublicationEventFolderService {
   reset(list: PublicationFolder[]) {
     this._list = list
 
-    this.save(this._list)
+    this.save()
   }
 
-  private save(list: PublicationFolder[]) {
+  private save() {
     setTimeout(()=> {
-      localstoreService.set(this.keyName, list)
+      localstoreService.set(this.keyName, {
+        list:  this._list
+      })
     }, 10)
   }
 }

src/app/store/publication-list.service.ts

@@ -19,7 +19,7 @@ export class PublicationListService {
 
     setTimeout(()=>{ 
       let restore = localstoreService.get(this.keyName, [])
-      this._document = restore
+      this._document = restore.document
     }, 10)
 
   }
@@ -36,7 +36,9 @@ export class PublicationListService {
     this._document[folderId] = document
 
     setTimeout(()=> { 
-      localstoreService.set(this.keyName, this._document)
+      localstoreService.set(this.keyName, {
+        document: this._document
+      })
     }, 100)
   }
 

src/app/store/publication-travel-folder.service.ts

@@ -20,7 +20,7 @@ export class PublicationTravelFolderService {
 
     setTimeout(()=>{ 
       let restore = localstoreService.get(this.keyName, [])
-      this._list = restore
+      this._list = restore.list
     }, 10)
 
   }
@@ -37,7 +37,9 @@ export class PublicationTravelFolderService {
 
   private save(list: PublicationFolder[]) {
     setTimeout(()=> { 
-      localstoreService.set(this.keyName, list)
+      localstoreService.set(this.keyName, {
+        list: this._list
+      })
     }, 10)
   }
 }

src/app/store/to-day-event-storage.service.ts

@@ -20,10 +20,10 @@ export class ToDayEventStorageService {
     this.keyName = (SHA1(this.constructor.name+ 'home/eventSource')).toString()
     
     
-    setTimeout(() => { 
+    setTimeout(() => {
       let restore = localstoreService.get(this.keyName, {})
       this._eventsList = restore.eventsList || []
-      this._count = this._eventsList.length || 0
+      this._count =  parseInt(restore.count) || 0
     }, 10)
 
   }
@@ -36,19 +36,20 @@ export class ToDayEventStorageService {
   }
   set count(value: number) {
     this._count = value
+    this.save()
   }
 
   reset(eventsList: Event[]) {
     this._eventsList = eventsList
 
     this.count = this._eventsList.length
-    this.save(this._eventsList)
+    this.save()
   }
 
-  private save(eventsList: Event[]) {
+  private save() {
     setTimeout(()=>{ 
       localstoreService.set(this.keyName,{
-        eventsList,
+        eventsList :this._eventsList,
         count: this._eventsList
       })
     }, 10)