diff --git a/package-lock.json b/package-lock.json index bd5026a0e..17725ccec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -155,6 +155,7 @@ "ngx-socket-io": "^3.2.0", "pdfjs": "^2.4.6", "pdfjs-dist": "^2.9.359", + "puppeteer": "^19.7.1", "rocket.chat.realtime.api.rxjs": "^2.1.1", "rxjs": "~6.6.3", "rxjs-compat": "^6.6.7", @@ -6912,9 +6913,9 @@ }, "node_modules/@types/yauzl": { "version": "2.10.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz", + "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==", "optional": true, - "peer": true, "dependencies": { "@types/node": "*" } @@ -11103,6 +11104,14 @@ "yarn": ">=1" } }, + "node_modules/cross-fetch": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", + "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==", + "dependencies": { + "node-fetch": "2.6.7" + } + }, "node_modules/cross-spawn": { "version": "7.0.3", "license": "MIT", @@ -12154,10 +12163,9 @@ } }, "node_modules/devtools-protocol": { - "version": "0.0.869402", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz", - "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==", - "peer": true + "version": "0.0.1094867", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1094867.tgz", + "integrity": "sha512-pmMDBKiRVjh0uKK6CT1WqZmM3hBVSgD+N2MrgyV1uNizAZMw4tx6i/RTc+/uCsKSCmg0xXx7arCP/OFcIwTsiQ==" }, "node_modules/di": { "version": "0.0.1", @@ -13393,8 +13401,8 @@ }, "node_modules/extract-zip": { "version": "2.0.1", - "license": "BSD-2-Clause", - "peer": true, + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", + "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", "dependencies": { "debug": "^4.1.1", "get-stream": "^5.1.0", @@ -13412,8 +13420,8 @@ }, "node_modules/extract-zip/node_modules/get-stream": { "version": "5.2.0", - "license": "MIT", - "peer": true, + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", "dependencies": { "pump": "^3.0.0" }, @@ -20664,7 +20672,6 @@ }, "node_modules/lines-and-columns": { "version": "1.1.6", - "dev": true, "license": "MIT" }, "node_modules/lite-server": { @@ -23323,7 +23330,6 @@ }, "node_modules/parse-json": { "version": "5.2.0", - "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.0.0", @@ -26201,34 +26207,44 @@ } }, "node_modules/puppeteer": { - "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", + "version": "19.7.1", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-19.7.1.tgz", + "integrity": "sha512-Hampj7jHlicySL1sSLHCwoFoRCi6RcEbnZmRE5brtbk0mp6Td33+9kWQD2eFs09772JIt00ybPKr50Gt7Y18Xg==", "hasInstallScript": true, - "peer": true, "dependencies": { - "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" + "cosmiconfig": "8.0.0", + "https-proxy-agent": "5.0.1", + "progress": "2.0.3", + "proxy-from-env": "1.1.0", + "puppeteer-core": "19.7.1" }, "engines": { - "node": ">=10.18.1" + "node": ">=14.1.0" + } + }, + "node_modules/puppeteer/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + }, + "node_modules/puppeteer/node_modules/cosmiconfig": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.0.0.tgz", + "integrity": "sha512-da1EafcpH6b/TD8vDRaWV7xFINlHlF6zKsGwS1TsuVJTZRkquaS5HTMq7uq6h31619QjbsYl21gVDOm32KM1vQ==", + "dependencies": { + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "parse-json": "^5.0.0", + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=14" } }, "node_modules/puppeteer/node_modules/debug": { "version": "4.3.4", - "license": "MIT", - "peer": true, + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dependencies": { "ms": "2.1.2" }, @@ -26241,6 +26257,83 @@ } } }, + "node_modules/puppeteer/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/puppeteer/node_modules/puppeteer-core": { + "version": "19.7.1", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.7.1.tgz", + "integrity": "sha512-4b5Go25IA+0xrUIw0Qtqi4nxc0qwdu/C7VT1+tFPl1W27207YT+7bxfANC3PjXMlS6bcbzinCf5YfGqMl8tfyQ==", + "dependencies": { + "cross-fetch": "3.1.5", + "debug": "4.3.4", + "devtools-protocol": "0.0.1094867", + "extract-zip": "2.0.1", + "https-proxy-agent": "5.0.1", + "proxy-from-env": "1.1.0", + "rimraf": "3.0.2", + "tar-fs": "2.1.1", + "unbzip2-stream": "1.4.3", + "ws": "8.11.0" + }, + "engines": { + "node": ">=14.1.0" + }, + "peerDependencies": { + "chromium-bidi": "0.4.3", + "typescript": ">= 4.7.4" + }, + "peerDependenciesMeta": { + "chromium-bidi": { + "optional": true + }, + "typescript": { + "optional": true + } + } + }, + "node_modules/puppeteer/node_modules/typescript": { + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "optional": true, + "peer": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/puppeteer/node_modules/ws": { + "version": "8.11.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz", + "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==", + "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", @@ -36575,8 +36668,8 @@ }, "node_modules/unbzip2-stream": { "version": "1.4.3", - "license": "MIT", - "peer": true, + "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", + "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", "dependencies": { "buffer": "^5.2.1", "through": "^2.3.8" @@ -43334,8 +43427,9 @@ }, "@types/yauzl": { "version": "2.10.0", + "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz", + "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==", "optional": true, - "peer": true, "requires": { "@types/node": "*" } @@ -46043,6 +46137,14 @@ "cross-spawn": "^7.0.1" } }, + "cross-fetch": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", + "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==", + "requires": { + "node-fetch": "2.6.7" + } + }, "cross-spawn": { "version": "7.0.3", "requires": { @@ -46692,10 +46794,9 @@ "version": "1.0.1" }, "devtools-protocol": { - "version": "0.0.869402", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz", - "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==", - "peer": true + "version": "0.0.1094867", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1094867.tgz", + "integrity": "sha512-pmMDBKiRVjh0uKK6CT1WqZmM3hBVSgD+N2MrgyV1uNizAZMw4tx6i/RTc+/uCsKSCmg0xXx7arCP/OFcIwTsiQ==" }, "di": { "version": "0.0.1", @@ -47537,7 +47638,8 @@ }, "extract-zip": { "version": "2.0.1", - "peer": true, + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", + "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", "requires": { "@types/yauzl": "^2.9.1", "debug": "^4.1.1", @@ -47547,7 +47649,8 @@ "dependencies": { "get-stream": { "version": "5.2.0", - "peer": true, + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", "requires": { "pump": "^3.0.0" } @@ -52524,8 +52627,7 @@ "version": "1.1.5" }, "lines-and-columns": { - "version": "1.1.6", - "dev": true + "version": "1.1.6" }, "lite-server": { "version": "2.6.1", @@ -54294,7 +54396,6 @@ }, "parse-json": { "version": "5.2.0", - "dev": true, "requires": { "@babel/code-frame": "^7.0.0", "error-ex": "^1.3.1", @@ -56120,31 +56221,78 @@ } }, "puppeteer": { - "version": "9.1.1", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-9.1.1.tgz", - "integrity": "sha512-W+nOulP2tYd/ZG99WuZC/I5ljjQQ7EUw/jQGcIb9eu8mDlZxNY2SgcJXTLG9h5gRvqA3uJOe4hZXYsd3EqioMw==", - "peer": true, + "version": "19.7.1", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-19.7.1.tgz", + "integrity": "sha512-Hampj7jHlicySL1sSLHCwoFoRCi6RcEbnZmRE5brtbk0mp6Td33+9kWQD2eFs09772JIt00ybPKr50Gt7Y18Xg==", "requires": { - "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" + "cosmiconfig": "8.0.0", + "https-proxy-agent": "5.0.1", + "progress": "2.0.3", + "proxy-from-env": "1.1.0", + "puppeteer-core": "19.7.1" }, "dependencies": { + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + }, + "cosmiconfig": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.0.0.tgz", + "integrity": "sha512-da1EafcpH6b/TD8vDRaWV7xFINlHlF6zKsGwS1TsuVJTZRkquaS5HTMq7uq6h31619QjbsYl21gVDOm32KM1vQ==", + "requires": { + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "parse-json": "^5.0.0", + "path-type": "^4.0.0" + } + }, "debug": { "version": "4.3.4", - "peer": true, + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "requires": { "ms": "2.1.2" } + }, + "js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "requires": { + "argparse": "^2.0.1" + } + }, + "puppeteer-core": { + "version": "19.7.1", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.7.1.tgz", + "integrity": "sha512-4b5Go25IA+0xrUIw0Qtqi4nxc0qwdu/C7VT1+tFPl1W27207YT+7bxfANC3PjXMlS6bcbzinCf5YfGqMl8tfyQ==", + "requires": { + "cross-fetch": "3.1.5", + "debug": "4.3.4", + "devtools-protocol": "0.0.1094867", + "extract-zip": "2.0.1", + "https-proxy-agent": "5.0.1", + "proxy-from-env": "1.1.0", + "rimraf": "3.0.2", + "tar-fs": "2.1.1", + "unbzip2-stream": "1.4.3", + "ws": "8.11.0" + } + }, + "typescript": { + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "optional": true, + "peer": true + }, + "ws": { + "version": "8.11.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz", + "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==", + "requires": {} } } }, @@ -63280,7 +63428,8 @@ }, "unbzip2-stream": { "version": "1.4.3", - "peer": true, + "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", + "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", "requires": { "buffer": "^5.2.1", "through": "^2.3.8" diff --git a/package.json b/package.json index 15eec859c..6a58989ec 100644 --- a/package.json +++ b/package.json @@ -165,6 +165,7 @@ "ngx-socket-io": "^3.2.0", "pdfjs": "^2.4.6", "pdfjs-dist": "^2.9.359", + "puppeteer": "^19.7.1", "rocket.chat.realtime.api.rxjs": "^2.1.1", "rxjs": "~6.6.3", "rxjs-compat": "^6.6.7", diff --git a/src/app/guards/auth.guard.ts b/src/app/guards/auth.guard.ts index e949a8633..316e0f30a 100644 --- a/src/app/guards/auth.guard.ts +++ b/src/app/guards/auth.guard.ts @@ -28,8 +28,8 @@ export class AuthGuard implements CanActivate { // if user not active or no session if(!SessionStore.user.Inactivity || !SessionStore.exist) { - console.log('no session', !SessionStore.user.Inactivity, !SessionStore.exist) - console.log(SessionStore.user) + // console.log('no session', !SessionStore.user.Inactivity, !SessionStore.exist) + // console.log(SessionStore.user) if(SessionStore.user.LoginPreference == 'Pin') { this.router.navigate(['/pin']); } else { diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index 82af13f40..79a942b9a 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -9,22 +9,20 @@ - -
-
-
- -
-
- -
-
-
- -
+
+
+
+ +
+
+ +
+
+
+
diff --git a/src/app/modals/create-process/create-process.page.scss b/src/app/modals/create-process/create-process.page.scss index f2b91b59a..9b2d13eb1 100644 --- a/src/app/modals/create-process/create-process.page.scss +++ b/src/app/modals/create-process/create-process.page.scss @@ -31,7 +31,6 @@ .ion-item-class-2{ //width: 360px; margin: 0px auto; - overflow: auto; } .ion-icon-class{ width: 45px; diff --git a/src/app/modals/dar-parecer/dar-parecer.page.html b/src/app/modals/dar-parecer/dar-parecer.page.html index e6a7af109..fc0f56259 100644 --- a/src/app/modals/dar-parecer/dar-parecer.page.html +++ b/src/app/modals/dar-parecer/dar-parecer.page.html @@ -9,7 +9,7 @@
-
+
diff --git a/src/app/modals/delegar/delegar.page.html b/src/app/modals/delegar/delegar.page.html index b18736918..598195891 100644 --- a/src/app/modals/delegar/delegar.page.html +++ b/src/app/modals/delegar/delegar.page.html @@ -37,7 +37,7 @@
- +
diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html index fa2cfd448..6c99b5a51 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html @@ -293,7 +293,7 @@
- +
diff --git a/src/app/modals/forward/forward.page.html b/src/app/modals/forward/forward.page.html index d74075d2d..f62586fe1 100644 --- a/src/app/modals/forward/forward.page.html +++ b/src/app/modals/forward/forward.page.html @@ -38,7 +38,7 @@
- +
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html index 694390ffe..d3cdbcc9e 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -285,7 +285,7 @@
- +
diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts index 12d6328fd..2b7d4caa7 100644 --- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts +++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts @@ -1,6 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { ModalController } from '@ionic/angular'; import { ThemeService } from 'src/app/services/theme.service' +import { ToastService } from 'src/app/services/toast.service'; @Component({ selector: 'app-emend-message-modal', @@ -12,7 +13,8 @@ export class EmendMessageModalPage implements OnInit { constructor( private modalController: ModalController, - public ThemeService: ThemeService + public ThemeService: ThemeService, + private toastService: ToastService, ) { this.emendMessage = ''; } @@ -24,7 +26,12 @@ export class EmendMessageModalPage implements OnInit { } save() { - this.modalController.dismiss({option:'save', note: this.emendMessage}); + if(this.emendMessage != '') { + this.modalController.dismiss({option:'save', note: this.emendMessage}); + } else { + this.toastService._badRequest('É necessário adicionar uma nota'); + } + } } diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts index 76159ab95..35cf864fa 100644 --- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts @@ -114,37 +114,42 @@ export class EventActionsPopoverPage implements OnInit { .then( async (res) => { - if(res.data.note !== ''){ - let body = { "serialNumber": this.serialNumber, - "action": "Emendar", - "dataFields": { - "ReviewUserComment": res.data, + if(res.data.option == 'save') { + if(res.data.note !== '') { + let body = { "serialNumber": this.serialNumber, + "action": "Emendar", + "dataFields": { + "ReviewUserComment": res.data, + } + } + + + const loader = this.toastService.loading() + + try { + await this.processes.PostTaskAction(body).toPromise(); + this.toastService._successMessage('Evento enviado para revisão'); + this.goBack(); + } catch (error) { + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Evento não enviado para revisão'); + } + this.toastService.badRequest(); + } + finally { + loader.remove() } } + else { + this.toastService._badRequest('É necessário adicionar uma nota'); + } + } else { + } - const loader = this.toastService.loading() - - try { - await this.processes.PostTaskAction(body).toPromise(); - this.toastService._successMessage('Evento enviado para revisão'); - this.goBack(); - } catch (error) { - if(error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - - this.toastService._badRequest('Evento não enviado para revisão'); - } - this.toastService.badRequest(); - } - finally { - loader.remove() - } - } - else{ - - } }); } diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index 279d22d2b..49c7991e4 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -264,7 +264,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts index e9a5c1d1e..064445d08 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts @@ -191,39 +191,41 @@ export class ApproveEventModalPage implements OnInit { await modal.present(); modal.onDidDismiss().then( async (res) => { - if(res.data.note !== '') { - let body = { - "serialNumber": serialNumber, - "action": "Emendar", - "dataFields": { - "ReviewUserComment": res.data, + if(res.data.option == 'save') { + if(res.data.note !== '') { + let body = { + "serialNumber": serialNumber, + "action": "Emendar", + "dataFields": { + "ReviewUserComment": res.data, + } } - } - // - const loader = this.toastService.loading() - - try { - await this.processes.PostTaskAction(body).toPromise() - this.router.navigate(['/home/gabinete-digital/event-list']); - this.toastService._successMessage('Evento enviado para revisão'); - } catch (error) { - if(error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - - this.toastService._badRequest('Evento não enviado para revisão'); + // + const loader = this.toastService.loading() + + try { + await this.processes.PostTaskAction(body).toPromise() + this.router.navigate(['/home/gabinete-digital/event-list']); + this.toastService._successMessage('Evento enviado para revisão'); + } catch (error) { + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Evento não enviado para revisão'); + } + this.router.navigate(['/home/gabinete-digital/event-list']); + } + finally { + loader.remove() } - this.router.navigate(['/home/gabinete-digital/event-list']); - } - finally { - loader.remove() - } - } - else { - //this.alertService.presentAlert('Operação cancelada!'); - } + } + else { + this.toastService._badRequest('É necessário adicionar uma nota'); + } + } }); } diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html index 0b10b0992..4c0b85228 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html @@ -108,7 +108,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index 8d9c5fda8..b34cf6c01 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -16,6 +16,7 @@ import { ThemeService } from 'src/app/services/theme.service' import { OfflineManagerService } from 'src/app/services/offline-manager.service'; import { RouteService } from 'src/app/services/route.service'; import { Storage } from '@ionic/storage'; +import config from 'capacitor.config'; @Component({ selector: 'app-approve-event', @@ -117,10 +118,14 @@ export class ApproveEventPage implements OnInit { this.loadedEvent = event - this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate); - - this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]); - + try { + this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate); + this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]); + } catch(error) { + console.log(this.loadedEvent) + throw(error) + } + this.loadedAttachments = this.loadedEvent.Documents; }) @@ -178,11 +183,15 @@ export class ApproveEventPage implements OnInit { this.loadedEvent = task - this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate); - - this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]); - this.loadedAttachments = this.loadedEvent.Documents; + + try { + this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate); + this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]); + } catch(error) { + console.log(this.loadedEvent) + throw(error) + } }) }) @@ -194,12 +203,17 @@ export class ApproveEventPage implements OnInit { async getTask() { this.processes.GetTask(this.serialNumber).subscribe(async res => { - this.loadedEvent = await this.processes.GetTask(this.serialNumber).toPromise(); + this.loadedEvent = res this.addProcessToDB(this.loadedEvent) - this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate); - - this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]); + try { + this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate); + this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]); + + } catch(error) { + console.log(this.loadedEvent) + throw(error) + } }, (error) => { this.getProcessFromDB(); @@ -247,40 +261,42 @@ export class ApproveEventPage implements OnInit { modal.onDidDismiss() .then(async (res) => { - - if (res.data !== '') { - let body = { - "serialNumber": serialNumber, - "action": "Emendar", - "dataFields": { - "ReviewUserComment": res.data, + if(res.data.option == 'save') { + if (res.data !== '') { + let body = { + "serialNumber": serialNumber, + "action": "Emendar", + "dataFields": { + "ReviewUserComment": res.data, + } } - } - + - const loader = this.toastService.loading() + const loader = this.toastService.loading() - try { - await this.processes.PostTaskAction(body).toPromise() - .catch(() => { + try { + await this.processes.PostTaskAction(body).toPromise() + .catch(() => { + + this.offlineManager.storeRequestData('event-listRever', body); + }); + this.toastService._successMessage('Evento enviado para revisão'); + this.goBack(); + } catch (error) { + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { - this.offlineManager.storeRequestData('event-listRever', body); - }); - this.toastService._successMessage('Evento enviado para revisão'); - this.goBack(); - } catch (error) { - if(error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - - this.toastService._badRequest('Evento não enviado para revisão'); + this.toastService._badRequest('Evento não enviado para revisão'); + } + } finally { + loader.remove() } - } finally { - loader.remove() - } - } - else { + } + else { + this.toastService._badRequest('É necessário adicionar uma nota'); + } } }); @@ -362,39 +378,44 @@ export class ApproveEventPage implements OnInit { modal.onDidDismiss().then(async (res) => { - - if (res.data.note !== '') { - let body = { - "serialNumber": serialNumber, - "action": "Emendar", - "dataFields": { - "ReviewUserComment": res.data, + if(res.data.option == 'save') { + if (res.data.note !== '') { + let body = { + "serialNumber": serialNumber, + "action": "Emendar", + "dataFields": { + "ReviewUserComment": res.data, + } } - } - - - const loader = this.toastService.loading() - - try { - await this.processes.PostTaskAction(body).toPromise(); - this.toastService._successMessage(); - this.goBack(); - this.toastService._successMessage('Evento enviado para revisão'); - } catch (error) { - if(error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - - this.toastService._badRequest('Evento não enviado para revisão'); + + + const loader = this.toastService.loading() + + try { + await this.processes.PostTaskAction(body).toPromise(); + this.toastService._successMessage(); + this.goBack(); + this.toastService._successMessage('Evento enviado para revisão'); + } catch (error) { + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Evento não enviado para revisão'); + } + } finally { + loader.remove() } - } finally { - loader.remove() + } + else { + this.toastService._badRequest('É necessário adicionar uma nota'); + } + } else { } - else { - //this.alertService.presentAlert('Operação cancelada!'); - } + + }); } diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html index 173ca0e50..3a31233c5 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html @@ -256,7 +256,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index 891d862d0..680cb56f7 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -32,7 +32,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss index 779ab1a8b..c555c4613 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss @@ -31,7 +31,6 @@ .ion-item-class-2{ //width: 360px; margin: 0px auto; - overflow: auto; } .ion-icon-class{ width: 45px; diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 36dcc6b4d..6805fa35b 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -253,7 +253,7 @@ export class EventsService { this.hasAnyCalendar = true if(sharedCalendar?.OwnerUserId) { this.GetCalendarName(sharedCalendar.OwnerUserId).subscribe((e)=> { - console.log('sharedCalendar.OwnerUserId',e) + this.calendarNames[sharedCalendar.CalendarId] = e.FullName this.myCalendarNames[sharedCalendar.CalendarId] = e.FullName diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html index 66fbb19d6..7c151d418 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.html +++ b/src/app/shared/agenda/approve-event/approve-event.page.html @@ -129,7 +129,7 @@ - +
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts index da1467b5a..851f58faa 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -187,37 +187,44 @@ export class ApproveEventPage implements OnInit { modal.onDidDismiss() .then( async (res) => { - - if(res.data.note !== '') { - let body = { "serialNumber": serialNumber, - "action": "Emendar", - "dataFields": { - "ReviewUserComment": res.data, - } - } - - const loader = this.toastService.loading(); - try { - await this.processes.PostTaskAction(body).toPromise(); - this.toastService._successMessage('Evento enviado para revisão'); - this.close(); - } catch (error) { - if(error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - - this.toastService._badRequest('Evento não enviado para revisão'); + if(res.data.option == 'save') { + + + if(res.data.note !== '') { + let body = { "serialNumber": serialNumber, + "action": "Emendar", + "dataFields": { + "ReviewUserComment": res.data, + } + } + + const loader = this.toastService.loading(); + + try { + await this.processes.PostTaskAction(body).toPromise(); + this.toastService._successMessage('Evento enviado para revisão'); + this.close(); + } catch (error) { + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Evento não enviado para revisão'); + } + } finally { + loader.remove() } - } finally { - loader.remove() } - } - else { - if(res.data.option == 'save') { - this.toastService._badRequest('É necessário adicionar uma nota'); + else { + if(res.data.option == 'save') { + this.toastService._badRequest('É necessário adicionar uma nota'); + } } + } else { + } + }); } diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html index 2976b4349..04622212f 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html @@ -324,7 +324,7 @@
- +
diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html index 4a2d4f487..df8c201b1 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -293,7 +293,7 @@
- +
diff --git a/src/app/shared/agenda/new-event/new-event.page.scss b/src/app/shared/agenda/new-event/new-event.page.scss index e22c8af89..ec0ef471e 100644 --- a/src/app/shared/agenda/new-event/new-event.page.scss +++ b/src/app/shared/agenda/new-event/new-event.page.scss @@ -175,7 +175,7 @@ .container-div { ion-textarea { - height: 81px; + // height: 81px; } } diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index f16b3c42c..7dfda5537 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -267,7 +267,7 @@
- +
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 38a854fa6..53f31b337 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -3,4 +3,4 @@ import { oaprProd } from './suport/oapr' import { doneITProd } from './suport/doneIt' -export const environment: Environment = doneITProd; \ No newline at end of file +export const environment: Environment = oaprProd; \ No newline at end of file diff --git a/src/global.scss b/src/global.scss index 88975c962..10ccde75f 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1431,10 +1431,12 @@ ngx-mat-datetime-content button.mat-stroked-button { pre { font-family: 'Roboto' !important; font-size: 12pt !important; + white-space: break-spaces; + word-break: break-word; } -ion-textarea textarea { +ion-textarea.heigh-200 textarea { min-height: 137px; line-height: 21px; } \ No newline at end of file diff --git a/version/git-version.ts b/version/git-version.ts index d9d89801b..7a6dbcd4c 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "39e2f775d", - "SHA": "39e2f775dbd168470f90f68d18c88ffb96ecb910", + "shortSHA": "93f167847", + "SHA": "93f1678472076b95b2b6ea911b92f95c11036ffd", "branch": "no_bug_movemente", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Fri Feb 17 12:24:25 2023 +0100'", - "lastCommitMessage": "git pull made", - "lastCommitNumber": "4805", + "lastCommitTime": "'Fri Feb 17 16:53:20 2023 +0100'", + "lastCommitMessage": "Bug solve displaing tabs os event to aprove", + "lastCommitNumber": "4806", "change": "", - "changeStatus": "On branch no_bug_movemente\nYour branch is up to date with 'origin/no_bug_movemente'.\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/shared/agenda/event-list/event-list.page.html\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html", + "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 1 and 5 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/guards/auth.guard.ts\n\tmodified: src/app/modals/create-process/create-process.page.html\n\tmodified: src/app/modals/create-process/create-process.page.scss\n\tmodified: src/app/modals/dar-parecer/dar-parecer.page.html\n\tmodified: src/app/modals/delegar/delegar.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/modals/forward/forward.page.html\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts\n\tmodified: src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.html\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.scss\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/global.scss", "changeAuthor": "eudes.inacio" } \ No newline at end of file