improve

.gitignore

@@ -59,6 +59,7 @@ android/**
 !android/app/
 android/app/**
 !android/app/src
+!android/app/google-services.json
 android/app/src/**
 !android/app/src/build.gradle
 !android/app/src/main
@@ -74,4 +75,6 @@ ___android/
 _android/
 _www/
 www2020
-android copy/
+android copy/
+report.*
+src/plugin/src/

android/app/google-services.json

@@ -0,0 +1,40 @@
+{
+  "project_info": {
+    "project_number": "800733765231",
+    "firebase_url": "https://gabinete-digital-2020.firebaseio.com",
+    "project_id": "gabinete-digital-2020",
+    "storage_bucket": "gabinete-digital-2020.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:800733765231:android:e7ffc0b310037d9f13779a",
+        "android_client_info": {
+          "package_name": "com.gpr.gabinetedigital"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "800733765231-92oa7ib62ob0pkouphb5i5sp01vkalid.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyD0pfW45DLoW6mqvZRklJdbfSTskW22Fok"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "800733765231-92oa7ib62ob0pkouphb5i5sp01vkalid.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

android/app/src/main/AndroidManifest.xml

@@ -39,4 +39,5 @@
     <!-- Permissions -->
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 </manifest>

package-lock.json

@@ -30,7 +30,7 @@
         "@awesome-cordova-plugins/file": "^5.41.0",
         "@awesome-cordova-plugins/file-opener": "^5.41.0",
         "@awesome-cordova-plugins/multiple-document-picker": "^5.40.0",
-        "@capacitor/android": "^4.6.1",
+        "@capacitor/android": "^4.6.2",
         "@capacitor/app": "^4.1.1",
         "@capacitor/browser": "^4.1.0",
         "@capacitor/camera": "^4.1.4",
@@ -151,7 +151,6 @@
         "ngx-socket-io": "^3.2.0",
         "pdfjs": "^2.4.6",
         "pdfjs-dist": "^2.9.359",
-        "puppeteer": "^15.1.1",
         "rocket.chat.realtime.api.rxjs": "^2.1.1",
         "rxjs": "~6.6.3",
         "rxjs-compat": "^6.6.7",
@@ -3254,9 +3253,9 @@
       "license": "MIT"
     },
     "node_modules/@capacitor/android": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-4.6.1.tgz",
-      "integrity": "sha512-Hnh1tmUr1SP67U6D6ry5I5BEBSN/1nkBAIjQIqf5tF82WNxKbpbC6GfkHE4hMJZinRTrCf36LkrdP8srh7SxoA==",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-4.6.2.tgz",
+      "integrity": "sha512-PQpOJnMi0i/d4UrT8bPdfkwlKAlQLgsyo2YKj+iUYjEIu8sKQvqDirLYnpeKhj4cflIG2u9mh/eFncooA+u2gw==",
       "peerDependencies": {
         "@capacitor/core": "^4.6.0"
       }
@@ -6783,6 +6782,7 @@
       "version": "2.10.0",
       "license": "MIT",
       "optional": true,
+      "peer": true,
       "dependencies": {
         "@types/node": "*"
       }
@@ -10966,13 +10966,6 @@
         "yarn": ">=1"
       }
     },
-    "node_modules/cross-fetch": {
-      "version": "3.1.5",
-      "license": "MIT",
-      "dependencies": {
-        "node-fetch": "2.6.7"
-      }
-    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "license": "MIT",
@@ -12024,8 +12017,10 @@
       }
     },
     "node_modules/devtools-protocol": {
-      "version": "0.0.1011705",
-      "license": "BSD-3-Clause"
+      "version": "0.0.869402",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
+      "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
+      "peer": true
     },
     "node_modules/di": {
       "version": "0.0.1",
@@ -13262,6 +13257,7 @@
     "node_modules/extract-zip": {
       "version": "2.0.1",
       "license": "BSD-2-Clause",
+      "peer": true,
       "dependencies": {
         "debug": "^4.1.1",
         "get-stream": "^5.1.0",
@@ -13280,6 +13276,7 @@
     "node_modules/extract-zip/node_modules/get-stream": {
       "version": "5.2.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "pump": "^3.0.0"
       },
@@ -26065,30 +26062,34 @@
       }
     },
     "node_modules/puppeteer": {
-      "version": "15.3.0",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-9.1.1.tgz",
+      "integrity": "sha512-W+nOulP2tYd/ZG99WuZC/I5ljjQQ7EUw/jQGcIb9eu8mDlZxNY2SgcJXTLG9h5gRvqA3uJOe4hZXYsd3EqioMw==",
+      "deprecated": "< 18.1.0 is no longer supported",
       "hasInstallScript": true,
-      "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
-        "cross-fetch": "3.1.5",
-        "debug": "4.3.4",
-        "devtools-protocol": "0.0.1011705",
-        "extract-zip": "2.0.1",
-        "https-proxy-agent": "5.0.1",
-        "pkg-dir": "4.2.0",
-        "progress": "2.0.3",
-        "proxy-from-env": "1.1.0",
-        "rimraf": "3.0.2",
-        "tar-fs": "2.1.1",
-        "unbzip2-stream": "1.4.3",
-        "ws": "8.8.0"
+        "debug": "^4.1.0",
+        "devtools-protocol": "0.0.869402",
+        "extract-zip": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "node-fetch": "^2.6.1",
+        "pkg-dir": "^4.2.0",
+        "progress": "^2.0.1",
+        "proxy-from-env": "^1.1.0",
+        "rimraf": "^3.0.2",
+        "tar-fs": "^2.0.0",
+        "unbzip2-stream": "^1.3.3",
+        "ws": "^7.2.3"
       },
       "engines": {
-        "node": ">=14.1.0"
+        "node": ">=10.18.1"
       }
     },
     "node_modules/puppeteer/node_modules/debug": {
       "version": "4.3.4",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -26101,25 +26102,6 @@
         }
       }
     },
-    "node_modules/puppeteer/node_modules/ws": {
-      "version": "8.8.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/q": {
       "version": "1.5.1",
       "license": "MIT",
@@ -36454,6 +36436,7 @@
     "node_modules/unbzip2-stream": {
       "version": "1.4.3",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "buffer": "^5.2.1",
         "through": "^2.3.8"
@@ -40534,9 +40517,9 @@
       "version": "0.2.3"
     },
     "@capacitor/android": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-4.6.1.tgz",
-      "integrity": "sha512-Hnh1tmUr1SP67U6D6ry5I5BEBSN/1nkBAIjQIqf5tF82WNxKbpbC6GfkHE4hMJZinRTrCf36LkrdP8srh7SxoA==",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-4.6.2.tgz",
+      "integrity": "sha512-PQpOJnMi0i/d4UrT8bPdfkwlKAlQLgsyo2YKj+iUYjEIu8sKQvqDirLYnpeKhj4cflIG2u9mh/eFncooA+u2gw==",
       "requires": {}
     },
     "@capacitor/app": {
@@ -43074,6 +43057,7 @@
     "@types/yauzl": {
       "version": "2.10.0",
       "optional": true,
+      "peer": true,
       "requires": {
         "@types/node": "*"
       }
@@ -45776,12 +45760,6 @@
         "cross-spawn": "^7.0.1"
       }
     },
-    "cross-fetch": {
-      "version": "3.1.5",
-      "requires": {
-        "node-fetch": "2.6.7"
-      }
-    },
     "cross-spawn": {
       "version": "7.0.3",
       "requires": {
@@ -46431,7 +46409,10 @@
       "version": "1.0.1"
     },
     "devtools-protocol": {
-      "version": "0.0.1011705"
+      "version": "0.0.869402",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
+      "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
+      "peer": true
     },
     "di": {
       "version": "0.0.1",
@@ -47273,6 +47254,7 @@
     },
     "extract-zip": {
       "version": "2.0.1",
+      "peer": true,
       "requires": {
         "@types/yauzl": "^2.9.1",
         "debug": "^4.1.1",
@@ -47282,6 +47264,7 @@
       "dependencies": {
         "get-stream": {
           "version": "5.2.0",
+          "peer": true,
           "requires": {
             "pump": "^3.0.0"
           }
@@ -55848,31 +55831,31 @@
       }
     },
     "puppeteer": {
-      "version": "15.3.0",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-9.1.1.tgz",
+      "integrity": "sha512-W+nOulP2tYd/ZG99WuZC/I5ljjQQ7EUw/jQGcIb9eu8mDlZxNY2SgcJXTLG9h5gRvqA3uJOe4hZXYsd3EqioMw==",
+      "peer": true,
       "requires": {
-        "cross-fetch": "3.1.5",
-        "debug": "4.3.4",
-        "devtools-protocol": "0.0.1011705",
-        "extract-zip": "2.0.1",
-        "https-proxy-agent": "5.0.1",
-        "pkg-dir": "4.2.0",
-        "progress": "2.0.3",
-        "proxy-from-env": "1.1.0",
-        "rimraf": "3.0.2",
-        "tar-fs": "2.1.1",
-        "unbzip2-stream": "1.4.3",
-        "ws": "8.8.0"
+        "debug": "^4.1.0",
+        "devtools-protocol": "0.0.869402",
+        "extract-zip": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "node-fetch": "^2.6.1",
+        "pkg-dir": "^4.2.0",
+        "progress": "^2.0.1",
+        "proxy-from-env": "^1.1.0",
+        "rimraf": "^3.0.2",
+        "tar-fs": "^2.0.0",
+        "unbzip2-stream": "^1.3.3",
+        "ws": "^7.2.3"
       },
       "dependencies": {
         "debug": {
           "version": "4.3.4",
+          "peer": true,
           "requires": {
             "ms": "2.1.2"
           }
-        },
-        "ws": {
-          "version": "8.8.0",
-          "requires": {}
         }
       }
     },
@@ -63007,6 +62990,7 @@
     },
     "unbzip2-stream": {
       "version": "1.4.3",
+      "peer": true,
       "requires": {
         "buffer": "^5.2.1",
         "through": "^2.3.8"

package.json

@@ -14,7 +14,8 @@
     "dev:share": "lite-server --baseDir=share",
     "install:chromium": "node node_modules/puppeteer/install.js",
     "build:version": "node ./version/git-version.js",
-    "ionic-build": "ionic cap run android --prod"
+    "ionic-build": "ionic cap run android --prod",
+    "prepare": "husky install"
   },
   "private": true,
   "dependencies": {
@@ -39,7 +40,7 @@
     "@awesome-cordova-plugins/file": "^5.41.0",
     "@awesome-cordova-plugins/file-opener": "^5.41.0",
     "@awesome-cordova-plugins/multiple-document-picker": "^5.40.0",
-    "@capacitor/android": "^4.6.1",
+    "@capacitor/android": "^4.6.2",
     "@capacitor/app": "^4.1.1",
     "@capacitor/browser": "^4.1.0",
     "@capacitor/camera": "^4.1.4",
@@ -160,7 +161,6 @@
     "ngx-socket-io": "^3.2.0",
     "pdfjs": "^2.4.6",
     "pdfjs-dist": "^2.9.359",
-    "puppeteer": "^15.1.1",
     "rocket.chat.realtime.api.rxjs": "^2.1.1",
     "rxjs": "~6.6.3",
     "rxjs-compat": "^6.6.7",

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

@@ -236,7 +236,7 @@
                 </div>
               </div>
   
-              <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openDiplomasPage('validar'); selectedElement='DiplomasPorValidar'" [class.active]="selectedElement == 'DiplomasPorValidar'" class="box-hover exp-card d-flex flex-column justify-center">
+              <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks, p.permissionList.Gabinete.pr_tasks])" (click)="openDiplomasPage('validar'); selectedElement='DiplomasPorValidar'" [class.active]="selectedElement == 'DiplomasPorValidar'" class="box-hover exp-card d-flex flex-column justify-center">
                 <div class="d-flex justify-center">
                   <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-diploma.svg"></ion-icon>
                   <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasPorValidar' " src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>

src/environments/environment.ts

@@ -1,16 +1,16 @@
 import { versionData } from '../../version/git-version'
 export const environment = {
   // apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
-  //apiURL: 'https://gd-api.oapr.gov.ao/api/',
-  apiURL: 'https://API.DONEIT.CO.AO/api/',
+  apiURL: 'https://gd-api.oapr.gov.ao/api/',
+  //apiURL: 'https://API.DONEIT.CO.AO/api/',
   //apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',
   // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
   // apiChatUrl: 'http://192.168.0.29:3000/api/v1/',
   // apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',
   //apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',
-  //apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
-  apiChatUrl: 'https://CHAT.DONEIT.CO.AO/api/v1/',
-  apiWsChatUrl: 'wss://CHAT.DONEIT.CO.AO/websocket',
+  apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
+  //apiChatUrl: 'https://CHAT.DONEIT.CO.AO/api/v1/',
+  //apiWsChatUrl: 'wss://CHAT.DONEIT.CO.AO/websocket',
   /* apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',
   apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket', */
   production: false,

tsconfig.worker.json

@@ -0,0 +1,14 @@
+{
+    "extends": "./tsconfig.json",
+    "compilerOptions": {
+      "outDir": "./out-tsc/worker",
+      "lib": [
+        "es2018",
+        "webworker"
+      ],
+      "types": []
+    },
+    "include": [
+      "src/**/*.worker.ts"
+    ]
+  }