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

src/app/services/events.service.ts

@@ -150,7 +150,6 @@ export class EventsService {
 
   getAllMdOficialEvents(startdate:string, enddate:string): any{
     let  geturl = environment.apiURL + 'calendar/md';
-    geturl = geturl.replace('/V4/','/V5/')
 
     let params = new HttpParams();
 
@@ -166,7 +165,6 @@ export class EventsService {
 
   getAllMdPessoalEvents(startdate:string, enddate:string): any{
     let geturl = environment.apiURL + 'calendar/md';
-    geturl = geturl.replace('/V4/','/V5/')
     
     let params = new HttpParams();
 

src/app/services/notifications.service.ts

@@ -41,12 +41,6 @@ export class NotificationsService {
     private activeroute: ActivatedRoute,
     private jsonstore: JsonStore) { 
 
-      this.callbacks.forEach(e=> {
-        if(e.type = 'Create Depacho') {
-          e.funx()
-        }
-      })
-
     }
 
 
@@ -222,9 +216,9 @@ export class NotificationsService {
               
               console.log(message);
               var data = JSON.parse(message.payload);
-              console.log(data.Service);
-              console.log(data.IdObject);
-              console.log(data.Object);
+              console.log('data.Service', data.Service); // module
+              console.log('data.IdObject', data.IdObject); // Object id
+              console.log('data.Object', data.Object); // details
     
               if(message.actionName){
                 this.notificatinsRoutes(data);
@@ -233,7 +227,13 @@ export class NotificationsService {
                //this.notificatinsRoutes(data);
                console.log(data)
               }
-    
+              
+              this.callbacks.forEach( e=> {
+                if(e.type == data.Object) {
+                  e.funx()
+                }
+              })
+
             }
           }, (error) => {
             console.log('Push notification recived: failure ' + error.responseText);

src/app/services/processes.service.ts

@@ -6,6 +6,7 @@ import { environment } from 'src/environments/environment';
 import { Observable } from 'rxjs';
 import { DocumentSetUpMeeting } from '../models/CallMeeting';
 import { Excludetask } from '../models/Excludetask';
+import { ExpedienteFullTask } from '../models/Expediente';
 
 @Injectable({
   providedIn: 'root'
@@ -38,6 +39,24 @@ export class ProcessesService {
     return this.http.get<any>(`${geturl}`, options);
   }
 
+  GetTaskListExpediente(onlycount1): Observable<ExpedienteFullTask[]> {
+    const processname = "Expediente"
+    const onlycount = false
+
+    const geturl = environment.apiURL + 'tasks/List';
+    let params = new HttpParams();
+
+    params = params.set("ProcessName", processname);
+    params = params.set("OnlyCount", onlycount.toString());
+
+    let options = {
+      headers: this.headers,
+      params: params
+    };
+
+    return this.http.get<ExpedienteFullTask[]>(`${geturl}`, options);
+  }
+
   GetTask(serialnumber:string): Observable<any>{
     const geturl = environment.apiURL + 'Tasks/FindTask';
     let params = new HttpParams();