From fcd518e8a3f7ee216c8092b655178d6d4b4b8054 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 15 Oct 2021 15:21:26 +0100 Subject: [PATCH 1/3] save --- package-lock.json | 101 ++++++------------ package.json | 5 +- src/app/app.module.ts | 5 +- .../expedient-task-modal.page.ts | 51 +++++---- src/app/services/auth.service.ts | 9 +- 5 files changed, 70 insertions(+), 101 deletions(-) diff --git a/package-lock.json b/package-lock.json index f5209fa97..d1536dc0e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17028,6 +17028,14 @@ } } }, + "ngx-cookie-service": { + "version": "12.0.3", + "resolved": "https://registry.npmjs.org/ngx-cookie-service/-/ngx-cookie-service-12.0.3.tgz", + "integrity": "sha512-F5xJBTrrreI2DERGOrO6U+L7s031HxTER+3Z4gDCwxdTl4AXmtWddMxxQVw7KflOLZ4InYEs6FjQsXmKU4HsJg==", + "requires": { + "tslib": "^2.0.0" + } + }, "ngx-socket-io": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/ngx-socket-io/-/ngx-socket-io-3.4.0.tgz", @@ -17147,11 +17155,6 @@ "integrity": "sha512-9/IECtNr8dXNmPWmFXepT0/7o5eolGesHUa3mtr0KlgnCvnZxwh2qensKL42JJY2vQKC3nIBXetFAqR+PW1CmA==", "dev": true }, - "noop-logger": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz", - "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=" - }, "nopt": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz", @@ -21186,43 +21189,29 @@ } }, "sharp": { - "version": "0.25.4", - "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.25.4.tgz", - "integrity": "sha512-umSzJJ1oBwIOfwFFt/fJ7JgCva9FvrEU2cbbm7u/3hSDZhXvkME8WE5qpaJqLIe2Har5msF5UG4CzYlEg5o3BQ==", + "version": "0.29.1", + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.29.1.tgz", + "integrity": "sha512-DpgdAny9TuS+oWCQ7MRS8XyY9x6q1+yW3a5wNx0J3HrGuB/Jot/8WcT+lElHY9iJu2pwtegSGxqMaqFiMhs4rQ==", "requires": { - "color": "^3.1.2", + "color": "^4.0.1", "detect-libc": "^1.0.3", - "node-addon-api": "^3.0.0", - "npmlog": "^4.1.2", - "prebuild-install": "^5.3.4", - "semver": "^7.3.2", - "simple-get": "^4.0.0", - "tar": "^6.0.2", + "node-addon-api": "^4.1.0", + "prebuild-install": "^6.1.4", + "semver": "^7.3.5", + "simple-get": "^3.1.0", + "tar-fs": "^2.1.1", "tunnel-agent": "^0.6.0" }, "dependencies": { "color": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", - "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/color/-/color-4.0.1.tgz", + "integrity": "sha512-rpZjOKN5O7naJxkH2Rx1sZzzBgaiWECc6BYXjeCE6kF0kcASJYbUq02u7JqIHwCb/j3NhV+QhRL2683aICeGZA==", "requires": { - "color-convert": "^1.9.3", + "color-convert": "^2.0.1", "color-string": "^1.6.0" } }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" - }, "decompress-response": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz", @@ -21236,38 +21225,19 @@ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz", "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==" }, - "prebuild-install": { - "version": "5.3.6", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.6.tgz", - "integrity": "sha512-s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg==", + "node-addon-api": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.2.0.tgz", + "integrity": "sha512-eazsqzwG2lskuzBqCGPi7Ac2UgOoMz8JVOXVhTvvPDYhthvNpefx8jWD8Np7Gv+2Sz0FlPWZk0nJV0z598Wn8Q==" + }, + "simple-get": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz", + "integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==", "requires": { - "detect-libc": "^1.0.3", - "expand-template": "^2.0.3", - "github-from-package": "0.0.0", - "minimist": "^1.2.3", - "mkdirp-classic": "^0.5.3", - "napi-build-utils": "^1.0.1", - "node-abi": "^2.7.0", - "noop-logger": "^0.1.1", - "npmlog": "^4.0.1", - "pump": "^3.0.0", - "rc": "^1.2.7", - "simple-get": "^3.0.3", - "tar-fs": "^2.0.0", - "tunnel-agent": "^0.6.0", - "which-pm-runs": "^1.0.0" - }, - "dependencies": { - "simple-get": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz", - "integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==", - "requires": { - "decompress-response": "^4.2.0", - "once": "^1.3.1", - "simple-concat": "^1.0.0" - } - } + "decompress-response": "^4.2.0", + "once": "^1.3.1", + "simple-concat": "^1.0.0" } } } @@ -25065,11 +25035,6 @@ "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" }, - "which-pm-runs": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz", - "integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=" - }, "wide-align": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", diff --git a/package.json b/package.json index 79c8f5d4b..30de89858 100644 --- a/package.json +++ b/package.json @@ -99,13 +99,14 @@ "lite-server": "^2.6.1", "moment": "^2.29.1", "ng2-pdf-viewer": "^7.0.1", + "ngx-cookie-service": "^12.0.3", "ngx-socket-io": "^3.2.0", "pdfjs": "^2.4.6", "pdfjs-dist": "^2.9.359", "puppeteer": "^10.1.0", "rxjs": "~6.6.3", "rxjs-compat": "^6.6.7", - "sharp": "^0.25.4", + "sharp": "^0.29.1", "socket.io-client": "^2.3.0", "ts-jest": "^27.0.3", "tslib": "^2.0.0", @@ -197,4 +198,4 @@ "url": "git+https://Kayaya@bitbucket.org/equilibriumito/gabinete-digital.git" }, "license": "ISC" -} \ No newline at end of file +} diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 5e03f2fc2..b3a8964f6 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -57,7 +57,7 @@ import { fab } from '@fortawesome/free-brands-svg-icons' import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx'; import { PdfViewerModule } from 'ng2-pdf-viewer'; import { SQLite } from '@ionic-native/sqlite/ngx'; - +import { CookieService } from 'ngx-cookie-service'; @NgModule({ declarations: [AppComponent], @@ -111,7 +111,8 @@ import { SQLite } from '@ionic-native/sqlite/ngx'; ScreenOrientation, Network, File, - SQLite + SQLite, + CookieService ], bootstrap: [AppComponent], schemas: [CUSTOM_ELEMENTS_SCHEMA] diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index 3e0fbc2db..62ccc0aee 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -184,7 +184,7 @@ export class ExpedientTaskModalPage implements OnInit { } runValidation() { - this.validateFrom = true + this.validateFrom = true; } injectValidation() { @@ -426,17 +426,22 @@ export class ExpedientTaskModalPage implements OnInit { } } - try { - this.taskResult = await this.despachoService.createDespacho(this.postData).toPromise(); - await this.toastService.successMessage('Processo efetuado'); - this.modalController.dismiss(action_despacho_pr); - } catch (error) { - await this.toastService.badRequest('Processo não efetuado') - } finally { - loader.remove() - } + if(this.postData.DispatchFolder.Message){ + try { + this.taskResult = await this.despachoService.createDespacho(this.postData).toPromise(); + await this.toastService.successMessage('Processo efetuado'); + this.modalController.dismiss(action_despacho_pr); + } catch (error) { - console.log('this.taskResult', this.taskResult); + await this.toastService.badRequest('Processo não efetuado') + } finally { + //loader.remove() + } + } + else{ + this.toastService.badRequest('Por favor adicione uma nota'); + } + loader.remove(); break; case '1': // parecer @@ -459,24 +464,16 @@ export class ExpedientTaskModalPage implements OnInit { } } - if(this.postData.DispatchFolder.Message){ - try { + try { + this.taskResult = await this.processes.postParecerPr(this.postData).toPromise(); + await this.toastService.successMessage('Pedido enviado'); + this.modalController.dismiss(action_parecer_pr); + } catch (error) { - this.taskResult = await this.processes.postParecerPr(this.postData).toPromise(); - await this.toastService.successMessage('Pedido enviado'); - this.modalController.dismiss(action_parecer_pr); - } catch (error) { - - await this.toastService.badRequest('Processo não efetuado') - } finally { - //loader.remove() - } + await this.toastService.badRequest('Processo não efetuado') + } finally { + loader.remove() } - else{ - this.toastService.badRequest('Por favor adicione uma nota'); - } - loader.remove(); - break; } diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index 0f7d6208c..dd4ca6e1d 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -9,6 +9,7 @@ import { AuthConnstants } from '../config/auth-constants'; import { AlertController } from '@ionic/angular'; import { SessionStore } from '../store/session.service'; import { AESEncrypt } from '../services/aesencrypt.service'; +import { CookieService } from 'ngx-cookie-service'; @Injectable({ providedIn: 'root' @@ -27,6 +28,7 @@ export class AuthService { private storageService:StorageService, public alertController: AlertController, private aesencrypt: AESEncrypt, + private cookieService: CookieService, ) { this.headers = new HttpHeaders(); @@ -102,8 +104,11 @@ export class AuthService { console.log('Login to Rocket chat OK'); this.ValidatedUserChat = responseChat; localStorage.setItem('userChat', JSON.stringify(responseChat)); - localStorage.setItem('Meteor.loginToken', JSON.stringify(responseChat['data'].authToken)); - localStorage.setItem('Meteor.userId', JSON.stringify(responseChat['data'].userId)); + localStorage.setItem('Meteor.loginToken', responseChat['data'].authToken); + localStorage.setItem('Meteor.userId',responseChat['data'].userId); + this.cookieService.set('rc_token', responseChat['data'].authToken); + this.cookieService.set('rc_uid', responseChat['data'].userId); + alert(this.cookieService.get('rc_uid')); this.storageService.store(AuthConnstants.AUTH, responseChat); return true; } From db15ad50e04dfec7739d4ee20c8e60fc3837168c Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 15 Oct 2021 16:01:51 +0100 Subject: [PATCH 2/3] save --- .../create-process/create-process.page.html | 46 +++++++++---------- .../create-process/create-process.page.scss | 12 ++--- .../create-process/create-process.page.ts | 4 +- 3 files changed, 32 insertions(+), 30 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index 95c645089..385eb23e1 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -13,15 +13,15 @@
-
+
- +
- +
@@ -29,11 +29,11 @@
- @@ -62,19 +62,19 @@
- - + @@ -135,21 +135,21 @@
Anexar Documentos -
+
-
+
-

- {{document.Assunto}} - {{document.appName}} +

+ {{document.Assunto}} + {{document.appName}} -

+

{{document.EntidadeOrganicaNome}} {{document.Data | date: 'dd-MM-yyyy HH:mm'}}

@@ -158,11 +158,11 @@
- +
- Cancelar
- \ No newline at end of file + diff --git a/src/app/modals/create-process/create-process.page.scss b/src/app/modals/create-process/create-process.page.scss index e2a954f25..317b25399 100644 --- a/src/app/modals/create-process/create-process.page.scss +++ b/src/app/modals/create-process/create-process.page.scss @@ -2,7 +2,7 @@ padding: 30px 20px 0 20px !important; margin: 0; float: left; - + .title{ font-family: Roboto; font-size: 25px; @@ -61,7 +61,7 @@ .list-people{ width: 256px; float: left; - + } .add-people{ width: 45px; @@ -78,7 +78,7 @@ font-size: 15px; color: #0d89d1; } - + .attach-title-item{ width: 100%; font-size: 15px; @@ -127,7 +127,7 @@ } } - + .close-button { @@ -140,13 +140,13 @@ .app-name { display: none; } - + .close-button { display: block !important; } } - + .app-name{ background: #42b9f2; border-radius: 18px; diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 506f78753..f1dfce511 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -73,7 +73,8 @@ export class CreateProcessPage implements OnInit { profile: string; Form: FormGroup; - validateFrom = false + validateFrom = false; + validateField = false; emptyTextDescription = "Sem intervenientes selecionados"; showEmptyContainer = true; @@ -380,6 +381,7 @@ export class CreateProcessPage implements OnInit { } } else{ + this.validateField = true; this.toastService.badRequest('Por favor adicione uma nota'); } loader.remove(); From ba2c3c3543ebfbb23fdd8de3856dad7b13437c42 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 15 Oct 2021 16:07:30 +0100 Subject: [PATCH 3/3] save --- .../expedient-task-modal/expedient-task-modal.page.html | 2 +- .../expedient-task-modal/expedient-task-modal.page.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) 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 b689adf57..0f833aa42 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 @@ -50,7 +50,7 @@
-
+