merge

config.xml

@@ -134,7 +134,7 @@
         </mfp:windows10>
         <mfp:appChecksum>0</mfp:appChecksum>
     </mfp:windows>
-    <mfp:platformVersion>8.0.0.00-20210214-154410</mfp:platformVersion>
+    <mfp:platformVersion>8.0.0.00-20210308-063916</mfp:platformVersion>
     <mfp:clientCustomInit enabled="false" />
     <mfp:server runtime="mfp" url="http://gpr-dev-10.gabinetedigital.local:9080" />
     <mfp:serverUri url="" />

package-lock.json

@@ -11294,6 +11294,28 @@
         "sjcl": "^1.0.8"
       }
     },
+    "ibm-mfp-web-sdk": {
+      "version": "8.0.2021021706",
+      "resolved": "https://registry.npmjs.org/ibm-mfp-web-sdk/-/ibm-mfp-web-sdk-8.0.2021021706.tgz",
+      "integrity": "sha512-lk87kZzmBow7Ie+wll5zXsQo0Dok3sj7DeltHUl3rOJ0ia+5sqYOfDGJAyky8pYagGfkAEHUAoleuv8S/GwPpw==",
+      "requires": {
+        "jssha": "2.2.0",
+        "promiz": "1.0.5",
+        "sjcl": "1.0.3"
+      },
+      "dependencies": {
+        "jssha": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/jssha/-/jssha-2.2.0.tgz",
+          "integrity": "sha1-h9z2CCHcO+xZPzhVu+vM0naqzBw="
+        },
+        "sjcl": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/sjcl/-/sjcl-1.0.3.tgz",
+          "integrity": "sha1-TtSGSY7Wt0K11KIZAiaBFvBUpwk="
+        }
+      }
+    },
     "ical.js": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/ical.js/-/ical.js-1.4.0.tgz",

package.json

@@ -66,6 +66,7 @@
     "date-fns": "^2.17.0",
     "depd": "^2.0.0",
     "ibm-mfp-web-push": "^8.0.2020052213",
+    "ibm-mfp-web-sdk": "^8.0.2021021706",
     "ionic-angular": "^3.9.10",
     "ionic-selectable": "^4.7.1",
     "ionic2-alpha-scroll": "^2.0.1",

src/app/home/home.page.ts

@@ -6,7 +6,7 @@ import { Event } from '../models/event.model';
 import { ProcessesService } from '../services/processes.service';
 import { NotificationsService } from '../services/notifications.service';
 import { ModalController, AlertController, AnimationController, Platform } from '@ionic/angular';
-import { NavigationExtras,Router } from '@angular/router';
+import { NavigationExtras,Router,ActivatedRoute } from '@angular/router';
 import { ToastService } from '../services/toast.service';
 
 @Component({
@@ -53,7 +53,8 @@ export class HomePage implements OnInit {
     private toastService: ToastService,
     private animationController: AnimationController,
     private notificatinsservice: NotificationsService,
-    private platform: Platform) {
+    private platform: Platform,
+    private activeroute: ActivatedRoute) {
 
     this.router.events.subscribe((val) => {
       document.querySelectorAll('ion-modal').forEach((e: any) => e.remove())
@@ -66,6 +67,7 @@ export class HomePage implements OnInit {
   }
 
   ngOnInit() {
+    console.log('Active route ',this.router.url)
     if(this.platform.is('desktop') || this.platform.is('mobileweb')) {
       console.log('Notifications not supported')
     } else {

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

@@ -124,6 +124,7 @@ export class DespachosPage implements OnInit {
   }
 
   async GoToDespacho(serialNumber:any) {
+    console.log('Despachos serial',serialNumber)
     this.router.navigate(['/home/gabinete-digital/despachos',serialNumber,'gabinete-digital']);
   }
 

src/app/pages/publications/publications.page.html

@@ -35,7 +35,7 @@
   
       <div class="aside overflow-y-auto d-flex  flex-wrap width-100">
         <!-- <ion-list class="width-100"> -->
-          <ion-item-sliding class="item width-100" 
+          <ion-item-sliding disabled="{{showSlidingOptions}}" class="item width-100" 
           *ngFor="let viagem of publicationsTravelFolderList">
             <ion-item lines="none"
             class="width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
@@ -79,7 +79,7 @@
               <ion-icon src="assets/images/icons-menu.svg"></ion-icon>
             </div>
         </div> -->
-        <ion-item-sliding class="item width-100"
+        <ion-item-sliding disabled="{{showSlidingOptions}}" class="item width-100"
         *ngFor="let evento of publicationsEventFolderList">
           <ion-item lines="none"
           class="width-100 d-flex ion-no-border ion-no-margin ion-no-padding"

src/app/pages/publications/publications.page.ts

@@ -52,6 +52,7 @@ export class PublicationsPage implements OnInit {
   // from publication details
   //publication: object;
   hideRefreshBtn = true;
+  showSlidingOptions = true;
 
   constructor(
     private router: Router, 
@@ -63,7 +64,6 @@ export class PublicationsPage implements OnInit {
     ) {
       this.months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
       this.days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
-
     }
 
   ngOnInit() {
@@ -80,14 +80,20 @@ export class PublicationsPage implements OnInit {
     window.onresize = (event) => {
       if( window.innerWidth < 801) {
         this.hideRefreshBtn = false;
+        this.showSlidingOptions = false;
       }
       else{
         this.hideRefreshBtn = true;
+        this.showSlidingOptions = true;
       }
     }
     if(window.innerWidth < 801){
-      console.log('YASS');
       this.hideRefreshBtn = false;
+      this.showSlidingOptions = false;
+    }
+    else{
+      this.hideRefreshBtn = true;
+      this.showSlidingOptions = true;
     }
   }
 

src/app/services/notifications.service.ts

@@ -1,5 +1,6 @@
 ///<reference path="../../../plugins/cordova-plugin-mfp-push/typings/mfppush.d.ts" />
-import { Inject, Injectable, NgZone } from '@angular/core';
+import { Injectable, NgZone } from '@angular/core';
+import { ActivatedRoute } from '@angular/router'
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { environment } from 'src/environments/environment';
 import { StorageService } from 'src/app/services/storage.service';
@@ -27,7 +28,8 @@ export class NotificationsService {
     private platform: Platform,
      private router: Router,
     private toastService: ToastService,
-    private zone: NgZone) { }
+    private zone: NgZone,
+    private activeroute: ActivatedRoute) { }
 
   getTokenByUserIdAndId(user, userID) {
     const geturl = environment.apiURL + 'notifications/user/' + userID;
@@ -42,11 +44,11 @@ export class NotificationsService {
 
       const geturl = environment.apiURL + 'notifications/token';
 
-       window['WLAuthorizationManager'].obtainAccessToken("push.mobileclient").then(
+      window['WLAuthorizationManager'].obtainAccessToken("push.mobileclient").then(
         (token) => {
           console.log('Push Notification: Success ' + token);
 
-          MFPPush.initialize(
+          window['MFPPush'].initialize(
             function (successResponse) {
               console.log("Push notification Successfully Service intialized: " + successResponse);
             },
@@ -55,7 +57,7 @@ export class NotificationsService {
             }
           );
 
-          MFPPush.registerDevice(null, (successResponse) => {
+          window['MFPPush'].registerDevice(null, (successResponse) => {
             console.log("Successfully registered: " + JSON.stringify(successResponse));
             console.log('token: ', successResponse.deviceId)
             this.storageService.store(username, successResponse.deviceId);
@@ -95,10 +97,10 @@ export class NotificationsService {
       (token) => {
         console.log('Push Notification: Success ' + token);
 
-        MFPPush.initialize(
+        window['MFPPush'].initialize(
           function (successResponse) {
             console.log("Push notification Successfully intialized: " + successResponse);
-            MFPPush.registerNotificationsCallback(notificationReceived);
+            window['MFPPush'].registerNotificationsCallback(notificationReceived);
           },
           function (failureResponse) {
             console.log("Push notification failure intialized: " + failureResponse);
@@ -135,30 +137,25 @@ export class NotificationsService {
     else if (data.Service === "gabinete-digital" && data.Object === "event-list") {
       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/event-list/approve-event',data.IdObject, 'gabinete-digital']));
     }else if (data.Service === "gabinete-digital" && data.Object === "despachos") {
+      
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos',data.IdObject,'gabinete-digital'],{replaceUrl: true}));
+    }
+    else if (data.Service === "gabinete-digital" && data.Object === "parecer") {
+
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos',data.IdObject,'gabinete-digital']));
+    }
+    else if (data.Service === "gabinete-digital" && data.Object === "deferimento") {
+      
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos',data.IdObject,'gabinete-digital']));
+    }
+    else if (data.Service === "gabinete-digital" && data.Object === "despachos-pr") {
+      
       let navigationExtras: NavigationExtras = {
         queryParams: {
           "serialNumber": data.IdObject,
-          }
-        };
-      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras));
-    }
-    else if (data.Service === "gabinete-digital" && data.Object === "parecer") {
-      let navigationExtras: NavigationExtras = {
-        queryParams: {
-          enterAnimation: "",
-          serialNumber: data.IdObject,
         }
       };
-      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras));
+      this.zone.run(() =>this.router.navigate(['/home/gabinete-digital/despachos-pr/despacho-pr'], navigationExtras));
-    }
-    else if (data.Service === "gabinete-digital" && data.Object === "deferimento") {
-      let navigationExtras: NavigationExtras = {
-        queryParams: {
-          enterAnimation: "",
-          serialNumber: data.IdObject,
-        }
-      };
-      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras));
     }
     else if (data.Service === "accoes" && data.Object === "accao") {
       this.zone.run(() => this.router.navigate(['/home/publications',data.IdObject]));
@@ -166,6 +163,20 @@ export class NotificationsService {
     else if (data.Service === "accoes" && data.Object === "publicacao") {
       this.zone.run(() => this.router.navigate(['/home/publications/view-publications',data.FolderId,data.IdObject]));
     }
+    else if (data.Service === "gabinete-digital" && data.Object === "diplomas") {
+      this.zone.run(() =>this.router.navigate(['/home/gabinete-digital/diplomas', data.IdObject, 'gabinete-digital']));
+    }
+    else if (data.Service === "gabinete-digital" && data.Object === "diplomas-assinar") {
+      let navigationExtras: NavigationExtras = {
+        queryParams: {
+            "serialNumber": data.IdObject,
+        }
+      };
+      this.zone.run(() =>this.router.navigate(['/home/gabinete-digital/diplomas-assinar/diploma-assinar'], navigationExtras));
+    }
+    else if (data.Service === "gabinete-digital" && data.Object === "expedientes-pr") {
+      this.zone.run(() =>this.router.navigate(['/home/gabinete-digital/expedientes-pr',data.IdObject,'gabinete-digital']));
+    }
   }
 
   platformVerify() {

src/app/services/webnotifications.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { WebNotificationsService } from './webnotifications.service';
+
+describe('WebNotificationsService', () => {
+  let service: WebNotificationsService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(WebNotificationsService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

src/app/services/webnotifications.service.ts

@@ -0,0 +1,230 @@
+import { Injectable, NgZone } from '@angular/core';
+import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
+import { environment } from 'src/environments/environment';
+import { StorageService } from 'src/app/services/storage.service';
+import { AuthConnstants } from 'src/app/config/auth-constants';
+import { Token } from '../models/token.model';
+import { ModalController, AlertController, AnimationController, Platform } from '@ionic/angular';
+import { NavigationExtras,Router } from '@angular/router';
+import { ToastService } from './toast.service';
+import MFPPush from 'ibm-mfp-web-push';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class WebNotificationsService {
+
+  adding: "intervenient" | "CC" = "intervenient";
+  folderId: string;
+
+  constructor(
+    private http: HttpClient,
+    private storageService: StorageService,
+    private modalController: ModalController,
+    public modalCtrl: AlertController,
+    private animationController: AnimationController,
+    private platform: Platform,
+    private router: Router,
+    private toastService: ToastService,
+    private zone: NgZone) { }
+
+
+  webconnection() {
+
+    
+      MFPPush.initialize({
+        appId: "com.gpr.gabinetedigital",
+        mfpContextRoot: "/mfp",
+      });
+    
+      MFPPush.registerDevice()
+        .then((res) => {
+          alert("WEB Successfully Registered Device...");
+        })
+        .catch((err) => {
+          console.log("WEB Registration Failed" + err);
+        });
+  }
+
+async onReceviNotificationWeb() {
+  window['WLAuthorizationManager'].obtainAccessToken("push.mobileclient").then(
+    (token) => {
+      console.log('Push Notification: Success ' + token);
+
+      MFPPush.initialize(
+        function (successResponse) {
+          console.log("Push notification Successfully intialized: " + successResponse);
+          MFPPush.registerNotificationsCallback(notificationReceived);
+        },
+        function (failureResponse) {
+          console.log("Push notification failure intialized: " + failureResponse);
+        }
+      );
+      var notificationReceived = (message) => {
+        console.log(message);
+        var data = JSON.parse(message.payload);
+        console.log(data.Service);
+        console.log(data.IdObject);
+        console.log(data.Object);
+
+        if(message.actionName){
+          //this.notificatinsRoutes(data);
+        } else {
+          //this.toastService.notificationMessage(message.alert,this.notificatinsRoutes, data);
+        }
+
+      }
+    }, (error) => {
+      console.log('Push notification recived: failure ' + error.responseText);
+      console.log(JSON.stringify(error));
+    }
+  );
+}
+
+  /* getTokenByUserIdAndId(user, userID) {
+    const geturl = environment.apiURL + 'notifications/user/' + userID;
+
+    return this.http.get<Token[]>(`${geturl}`);
+  } */
+
+  /* getAndpostToken(username) {
+    if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+      console.log('Notifications not supported')
+    } else {
+
+      const geturl = environment.apiURL + 'notifications/token'; */
+/* 
+      window['WLAuthorizationManager'].obtainAccessToken("push.mobileclient").then(
+        (token) => {
+          console.log('Push Notification: Success ' + token);
+
+          MFPPush.initialize(
+            function (successResponse) {
+              console.log("Push notification Successfully Service intialized: " + successResponse);
+            },
+            function (failureResponse) {
+              console.log("Push notification failure Service intialized: " + failureResponse);
+            }
+          );
+
+          MFPPush.registerDevice(null, (successResponse) => {
+            console.log("Successfully registered: " + JSON.stringify(successResponse));
+            console.log('token: ', successResponse.deviceId)
+            this.storageService.store(username, successResponse.deviceId);
+            this.storageService.get(username).then(value => {
+              console.log('STORAGE TOKEN', value)
+              this.storageService.get(AuthConnstants.USER).then(res => {
+                console.log('USERID', res);
+                const headers = { 'Authorization': 'Basic cGF1bG8ucGludG9AZ2FiaW5ldGVkaWdpdGFsLmxvY2FsOnRhYnRlc3RlQDAwNg==' };
+                const body = {
+                  UserId: res.UserId,
+                  TokenId: successResponse.deviceId,
+                  Status: 1,
+                  Service: 1
+                };
+                this.http.post<Token>(`${geturl}`, body, { headers }).subscribe(data => {
+                  console.log('TOKEN USER MIDLE', data);
+                })
+              });
+
+            });
+          },
+            function (failureResponse) {
+              console.log("Successfully failue: " + JSON.stringify(failureResponse));
+            }
+          );
+        }, (error) => {
+          console.log('Push notification recived: failure ' + error.responseText);
+          console.log(JSON.stringify(error));
+        }
+      );
+    }
+
+  } */
+/* 
+  async onReceviNotification() {
+    window['WLAuthorizationManager'].obtainAccessToken("push.mobileclient").then(
+      (token) => {
+        console.log('Push Notification: Success ' + token);
+
+        MFPPush.initialize(
+          function (successResponse) {
+            console.log("Push notification Successfully intialized: " + successResponse);
+            MFPPush.registerNotificationsCallback(notificationReceived);
+          },
+          function (failureResponse) {
+            console.log("Push notification failure intialized: " + failureResponse);
+          }
+        );
+        var notificationReceived = (message) => {
+          console.log(message);
+          var data = JSON.parse(message.payload);
+          console.log(data.Service);
+          console.log(data.IdObject);
+          console.log(data.Object);
+
+          if(message.actionName){
+            this.notificatinsRoutes(data);
+          } else {
+            this.toastService.notificationMessage(message.alert,this.notificatinsRoutes, data);
+          }
+
+        }
+      }, (error) => {
+        console.log('Push notification recived: failure ' + error.responseText);
+        console.log(JSON.stringify(error));
+      }
+    );
+  } */
+
+  /* notificatinsRoutes = (data) => {
+    if (data.Service === "agenda") {
+      this.zone.run(() => this.router.navigate(['/home/agenda', data.IdObject, 'agenda']));
+    }
+    else if (data.Service === "gabinete-digital" && data.Object === "expediente") {
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expediente',data.IdObject,'gabinete-digital']));
+    }
+    else if (data.Service === "gabinete-digital" && data.Object === "event-list") {
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/event-list/approve-event',data.IdObject, 'gabinete-digital']));
+    }else if (data.Service === "gabinete-digital" && data.Object === "despachos") {
+      let navigationExtras: NavigationExtras = {
+        queryParams: {
+          "serialNumber": data.IdObject,
+          }
+        };
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras));
+    }
+    else if (data.Service === "gabinete-digital" && data.Object === "parecer") {
+      let navigationExtras: NavigationExtras = {
+        queryParams: {
+          enterAnimation: "",
+          serialNumber: data.IdObject,
+        }
+      };
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras));
+    }
+    else if (data.Service === "gabinete-digital" && data.Object === "deferimento") {
+      let navigationExtras: NavigationExtras = {
+        queryParams: {
+          enterAnimation: "",
+          serialNumber: data.IdObject,
+        }
+      };
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras));
+    }
+    else if (data.Service === "accoes" && data.Object === "accao") {
+      this.zone.run(() => this.router.navigate(['/home/publications',data.IdObject]));
+    }
+    else if (data.Service === "accoes" && data.Object === "publicacao") {
+      this.zone.run(() => this.router.navigate(['/home/publications/view-publications',data.FolderId,data.IdObject]));
+    }
+  }
+
+  platformVerify() {
+
+    if (this.platform.is('cordova')) {
+    } else {
+    }
+  } */
+
+}

src/index.html

@@ -7,9 +7,11 @@
 
   <base href="/" />
 
+  <!-- <script type="text/javascript" src="node_modules/ibm-mfp-web-sdk/ibmmfpfanalytics.js"></script> -->
+  <!-- <script type="text/javascript" src="node_modules/ibm-mfp-web-sdk/ibmmfpf.js"></script> -->
   <!-- <script src="assets/js/index.js"></script> -->
   <script src="assets/js/wldirectudpate.js"></script>
-  <script>
+  <!-- <script>
     if (navigator.serviceWorker) {
         navigator.serviceWorker.register("assets/js/MFPPushServiceWorker.js").then(function(reg) {
             window.pushReg = reg;
@@ -37,7 +39,7 @@
     } else {
         console.info("Service workers aren't supported in this browser.");
     }
-  </script>
+  </script> -->
 
   <meta name="color-scheme" content="light dark" />
   <meta name="viewport" content="viewport-fit=cover, width=device-width, height=device-hight, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />