From 9fb66fc1fd8ebeee3f9890e743ead58d34725e3d Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 14 Jun 2021 14:16:16 +0100 Subject: [PATCH 1/2] Improve despacho options --- .../despachos/despacho/despacho.page.ts | 11 ++++++----- .../despachos-options.page.html | 19 ++++++++++++++++--- .../despachos-options.page.ts | 19 ++++++++++++++----- 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index 57dbf26c0..d54c89460 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -20,6 +20,7 @@ import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page'; +import { DespachosOptionsPage } from 'src/app/shared/popover/despachos-options/despachos-options.page'; @Component({ selector: 'app-despacho', @@ -90,11 +91,11 @@ export class DespachoPage implements OnInit { let navigationExtras: NavigationExtras = { queryParams: { // "serialNumber": serialNumber, - 'despachos': true + //'despachos': true } } - this.router.navigate(['/home/gabinete-digital'], navigationExtras); + this.router.navigate(['/home/gabinete-digital/despachos'], navigationExtras); } @@ -409,13 +410,14 @@ export class DespachoPage implements OnInit { } async openOptions(taskAction?: any) { + const popover = await this.popoverController.create({ - component: OptsExpedientePage, + component: DespachosOptionsPage, cssClass: 'exp-options', componentProps: { task: this.task, fulltask: this.fulltask, - taskAction:taskAction, + taskAction: taskAction, showEnviarPendentes: false }, translucent: true @@ -423,7 +425,6 @@ export class DespachoPage implements OnInit { return await popover.present(); } - async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.html b/src/app/shared/popover/despachos-options/despachos-options.page.html index 5158a629c..1ef3745fc 100644 --- a/src/app/shared/popover/despachos-options/despachos-options.page.html +++ b/src/app/shared/popover/despachos-options/despachos-options.page.html @@ -8,7 +8,16 @@
- +
+ + + +
+ +
+
+ +
@@ -17,10 +26,14 @@
- - + +
+ + +
+
diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts index fac026cb2..8a14c56d0 100644 --- a/src/app/shared/popover/despachos-options/despachos-options.page.ts +++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts @@ -5,7 +5,7 @@ import { EventsService } from 'src/app/services/events.service'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { formatDate } from '@angular/common'; -import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular'; +import { AnimationController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; import { momentG } from 'src/plugin/momentG' @@ -42,7 +42,13 @@ export class DespachosOptionsPage implements OnInit { private alertService: AlertService, public popoverController: PopoverController, private activatedRoute: ActivatedRoute, - private animationController: AnimationController) { } + private animationController: AnimationController, + private navParams: NavParams) { + + this.task = this.navParams.get('task') + this.fulltask = this.navParams.get('fulltask') + + } ngOnInit() { @@ -371,12 +377,15 @@ export class DespachosOptionsPage implements OnInit { goBack() { + alert(' goback') + let navigationExtras: NavigationExtras = { queryParams: { - "despachospr": true, + // "despachospr": true, } - }; - this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } + + this.router.navigate(['/home/gabinete-digital/despachos'], navigationExtras); // window.history.back() } From 9644cfb6b5ce368af1a897ebc7d5194117e8c6a2 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 15 Jun 2021 11:39:59 +0100 Subject: [PATCH 2/2] Improve attendies --- config.xml | 2 +- package-lock.json | 286 +++++++++++++++--- package.json | 2 + src/app/app.module.ts | 5 +- .../create-process/create-process.page.ts | 82 ++--- src/app/pages/agenda/agenda.module.ts | 11 +- src/app/pages/agenda/agenda.page.html | 6 +- src/app/pages/agenda/agenda.page.ts | 1 - .../agenda/edit-event/edit-event.page.html | 2 +- .../attendee-modal/attendee-modal.page.ts | 8 +- .../despachos/despacho/despacho.page.ts | 2 +- .../book-meeting-modal.module.ts | 3 - .../expedient-task-modal.module.ts | 2 - .../attendees/attendees-routing.module.ts | 12 - .../event/attendees/attendees.module.ts | 21 -- .../event/attendees/attendees.page.html | 57 ---- .../event/attendees/attendees.page.scss | 4 - .../event/attendees/attendees.page.spec.ts | 24 -- .../shared/event/attendees/attendees.page.ts | 93 ------ .../despachos-options.page.ts | 7 +- 20 files changed, 296 insertions(+), 334 deletions(-) delete mode 100644 src/app/shared/event/attendees/attendees-routing.module.ts delete mode 100644 src/app/shared/event/attendees/attendees.module.ts delete mode 100644 src/app/shared/event/attendees/attendees.page.html delete mode 100644 src/app/shared/event/attendees/attendees.page.scss delete mode 100644 src/app/shared/event/attendees/attendees.page.spec.ts delete mode 100644 src/app/shared/event/attendees/attendees.page.ts diff --git a/config.xml b/config.xml index 438ba0ed4..e9aeeda7b 100644 --- a/config.xml +++ b/config.xml @@ -135,7 +135,7 @@ 0 - 8.0.0.00-20210214-154410 + 8.0.0.00-20210308-063916 diff --git a/package-lock.json b/package-lock.json index 9623efb6e..58aca939c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -616,6 +616,138 @@ "integrity": "sha512-jzIutEzUbfBZxLWftpi5oXusL3rwbe2P/6HnNd8NUeBos9+G859R7hCsstAQ61XPn41a2/Fbl+YOwYhdjoBQrw==", "dev": true }, + "@angular/localize": { + "version": "11.2.14", + "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-11.2.14.tgz", + "integrity": "sha512-ssMuquxxqxA98LgEICEO/3JdmSflWxu5rlm/HPo28bnGiZ4IzDamZjJ1cu4S6RgsonJ1drB3Z8wkidXfEYZiWA==", + "requires": { + "@babel/core": "7.8.3", + "glob": "7.1.2", + "yargs": "^16.2.0" + }, + "dependencies": { + "@babel/core": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.3.tgz", + "integrity": "sha512-4XFkf8AwyrEG7Ziu3L2L0Cv+WyY47Tcsp70JFmpftbAA1K7YL/sgE9jh9HyNj08Y/U50ItUchpN0w6HxAoX1rA==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.8.3", + "@babel/helpers": "^7.8.3", + "@babel/parser": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/traverse": "^7.8.3", + "@babel/types": "^7.8.3", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.0", + "lodash": "^4.17.13", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" + } + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + }, + "string-width": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", + "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, + "y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" + }, + "yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "requires": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + } + }, + "yargs-parser": { + "version": "20.2.7", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz", + "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==" + } + } + }, "@angular/platform-browser": { "version": "11.2.2", "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-11.2.2.tgz", @@ -644,7 +776,6 @@ "version": "7.12.13", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz", "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==", - "dev": true, "requires": { "@babel/highlight": "^7.12.13" } @@ -708,6 +839,37 @@ } } }, + "@babel/generator": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.5.tgz", + "integrity": "sha512-y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA==", + "requires": { + "@babel/types": "^7.14.5", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + }, + "dependencies": { + "@babel/helper-validator-identifier": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz", + "integrity": "sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg==" + }, + "@babel/types": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.5.tgz", + "integrity": "sha512-M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg==", + "requires": { + "@babel/helper-validator-identifier": "^7.14.5", + "to-fast-properties": "^2.0.0" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + } + } + }, "@babel/helper-annotate-as-pure": { "version": "7.12.13", "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz", @@ -783,7 +945,6 @@ "version": "7.12.13", "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz", "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==", - "dev": true, "requires": { "@babel/helper-get-function-arity": "^7.12.13", "@babel/template": "^7.12.13", @@ -794,7 +955,6 @@ "version": "7.12.13", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz", "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==", - "dev": true, "requires": { "@babel/code-frame": "^7.12.13", "@babel/parser": "^7.12.13", @@ -807,7 +967,6 @@ "version": "7.12.13", "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz", "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==", - "dev": true, "requires": { "@babel/types": "^7.12.13" } @@ -935,7 +1094,6 @@ "version": "7.12.13", "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz", "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==", - "dev": true, "requires": { "@babel/types": "^7.12.13" } @@ -1055,7 +1213,6 @@ "version": "7.13.0", "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.0.tgz", "integrity": "sha512-aan1MeFPxFacZeSz6Ld7YZo5aPuqnKlD7+HZY75xQsueczFccP9A7V05+oe0XpLwHK3oLorPe9eaAUljL7WEaQ==", - "dev": true, "requires": { "@babel/template": "^7.12.13", "@babel/traverse": "^7.13.0", @@ -1141,7 +1298,6 @@ "version": "7.12.13", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz", "integrity": "sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==", - "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.12.11", "chalk": "^2.0.0", @@ -1151,8 +1307,7 @@ "@babel/parser": { "version": "7.13.4", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.4.tgz", - "integrity": "sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA==", - "dev": true + "integrity": "sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA==" }, "@babel/plugin-proposal-async-generator-functions": { "version": "7.13.5", @@ -1907,11 +2062,59 @@ "regenerator-runtime": "^0.13.4" } }, + "@babel/template": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz", + "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==", + "requires": { + "@babel/code-frame": "^7.14.5", + "@babel/parser": "^7.14.5", + "@babel/types": "^7.14.5" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz", + "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==", + "requires": { + "@babel/highlight": "^7.14.5" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz", + "integrity": "sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg==" + }, + "@babel/highlight": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz", + "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==", + "requires": { + "@babel/helper-validator-identifier": "^7.14.5", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.5.tgz", + "integrity": "sha512-TM8C+xtH/9n1qzX+JNHi7AN2zHMTiPUtspO0ZdHflW8KaskkALhMmuMHb4bCmNdv9VAPzJX3/bXqkVLnAvsPfg==" + }, + "@babel/types": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.5.tgz", + "integrity": "sha512-M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg==", + "requires": { + "@babel/helper-validator-identifier": "^7.14.5", + "to-fast-properties": "^2.0.0" + } + } + } + }, "@babel/traverse": { "version": "7.13.0", "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz", "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==", - "dev": true, "requires": { "@babel/code-frame": "^7.12.13", "@babel/generator": "^7.13.0", @@ -1928,7 +2131,6 @@ "version": "7.13.0", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.0.tgz", "integrity": "sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw==", - "dev": true, "requires": { "@babel/types": "^7.13.0", "jsesc": "^2.5.1", @@ -1938,8 +2140,7 @@ "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" } } }, @@ -3095,6 +3296,14 @@ "lodash": "^4.17.15" } }, + "@ng-bootstrap/ng-bootstrap": { + "version": "9.1.2", + "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-9.1.2.tgz", + "integrity": "sha512-oZt05AjwIY/oagS3QtST2GIlW9LQgTM7gX+wsuLQvHQt8bh9THOHAws8rDobeZi9fTUR3OvuxK56Mvj1jvyljw==", + "requires": { + "tslib": "^2.0.0" + } + }, "@ngtools/webpack": { "version": "11.2.1", "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-11.2.1.tgz", @@ -4173,8 +4382,7 @@ "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "base": { "version": "0.11.2", @@ -4434,7 +4642,6 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5223,8 +5430,7 @@ "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "concat-stream": { "version": "1.6.2", @@ -5309,7 +5515,6 @@ "version": "1.7.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", - "dev": true, "requires": { "safe-buffer": "~5.1.1" } @@ -8554,8 +8759,7 @@ "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "emojis-list": { "version": "3.0.0", @@ -8821,8 +9025,7 @@ "escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" }, "escape-html": { "version": "1.0.3", @@ -9581,8 +9784,7 @@ "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { "version": "2.3.2", @@ -9594,8 +9796,7 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "gauge": { "version": "2.7.4", @@ -9648,14 +9849,12 @@ "gensync": { "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==" }, "get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" }, "get-intrinsic": { "version": "1.1.1", @@ -9723,8 +9922,7 @@ "globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" }, "globby": { "version": "11.0.2", @@ -9776,7 +9974,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, "requires": { "function-bind": "^1.1.1" } @@ -10380,7 +10577,6 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, "requires": { "once": "^1.3.0", "wrappy": "1" @@ -10672,7 +10868,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz", "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==", - "dev": true, "requires": { "has": "^1.0.3" } @@ -11168,7 +11363,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, "requires": { "minimist": "^1.2.5" } @@ -12129,7 +12323,6 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, "requires": { "brace-expansion": "^1.1.7" } @@ -13328,8 +13521,7 @@ "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-is-inside": { "version": "1.0.2", @@ -13346,8 +13538,7 @@ "path-parse": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", - "dev": true + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" }, "path-to-regexp": { "version": "0.1.7", @@ -15746,8 +15937,7 @@ "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" }, "require-main-filename": { "version": "2.0.0", @@ -15765,7 +15955,6 @@ "version": "1.20.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", - "dev": true, "requires": { "is-core-module": "^2.2.0", "path-parse": "^1.0.6" @@ -17343,7 +17532,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, "requires": { "ansi-regex": "^5.0.0" }, @@ -17351,8 +17539,7 @@ "ansi-regex": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "dev": true + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" } } }, @@ -18862,7 +19049,8 @@ }, "ssri": { "version": "6.0.1", - "resolved": "", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", + "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", "dev": true, "requires": { "figgy-pudding": "^3.5.1" diff --git a/package.json b/package.json index b0ce55e7a..26d5f6e96 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "@angular/common": "^11.2.2", "@angular/core": "^11.2.2", "@angular/forms": "~11.2.2", + "@angular/localize": "^11.2.2", "@angular/platform-browser": "~11.2.2", "@angular/platform-browser-dynamic": "~11.2.2", "@angular/router": "~11.2.2", @@ -43,6 +44,7 @@ "@ionic/pwa-elements": "^3.0.2", "@ionic/storage": "^2.3.1", "@logisticinfotech/ionic4-datepicker": "^1.4.4", + "@ng-bootstrap/ng-bootstrap": "^9.1.2", "angular-calendar": "^0.28.22", "angular-tag-cloud-module": "^5.2.2", "cordova-plugin-camera": "^5.0.1", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 642a4a317..11c958951 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -26,10 +26,11 @@ import { FormsModule } from '@angular/forms'; import { CalendarModule, DateAdapter } from 'angular-calendar'; import { adapterFactory } from 'angular-calendar/date-adapters/date-fns'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations'; import { MessagesPage } from './pages/chat/messages/messages.page'; import { WebsocketService } from './services/websocket.service' -import { ChatService } from './services/chat.service' +import { ChatService } from './services/chat.service'; +import { NgbModule } from '@ng-bootstrap/ng-bootstrap' // import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx'; diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index ca879bbf0..be914e1cb 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -19,6 +19,7 @@ import { SearchPage } from 'src/app/pages/search/search.page'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page'; import { User } from 'src/app/models/user.model'; +import { AttendeesPage } from 'src/app/pages/events/attendees/attendees.page'; @Component({ selector: 'app-create-process', @@ -328,37 +329,37 @@ export class CreateProcessPage implements OnInit { this.adding = "intervenient"; this.contacts = this.taskParticipants; - if(window.innerWidth <=800){ + if(window.innerWidth <=800) { this.showAttendees=false; const modal = await this.modalController.create({ - component: AddParticipantsModalPage, - componentProps: { - eventPersons: this.participants + component: AttendeesPage, + componentProps: { + adding: this.adding, + taskParticipants: this.taskParticipants, + taskParticipantsCc: this.taskParticipantsCc }, - cssClass: 'add-participants-modal', + cssClass: 'attendee', backdropDismiss: false }); + await modal.present(); - modal.onDidDismiss().then((res) => { - this.taskParticipants = res.data; - let newattendees: EventPerson[] = res['data']; - if(newattendees!= null){ - newattendees.forEach(newattendee => { - let att = { - 'UserEmail': newattendee.EmailAddress, - 'UserType': 'I', - }; - if(this.participants == null){ - this.participants = new Array(); - } - this.participants.push(att); - }); + + modal.onDidDismiss().then((data) => { + + if(data) { + data = data['data']; + + const newAttendees: EventPerson[] = data['taskParticipants']; + const newAttendeesCC: EventPerson[] = data['taskParticipantsCc']; + + this.setIntervenient(newAttendees); + this.setIntervenientCC(newAttendeesCC); } - this.postData.UsersSelected = this.participants; - console.log(this.postData); }); + + } else { this.showAttendees=true } @@ -373,32 +374,31 @@ export class CreateProcessPage implements OnInit { this.showAttendees=false; const modal = await this.modalController.create({ - component: AddParticipantsCcModalPage, - componentProps: { - eventPersons: this.participants + component: AttendeesPage, + componentProps: { + adding: this.adding, + taskParticipants: this.taskParticipants, + taskParticipantsCc: this.taskParticipantsCc }, - cssClass: 'add-participants-cc-modal', + cssClass: 'attendee', backdropDismiss: false }); + await modal.present(); - modal.onDidDismiss().then((res) => { - this.taskParticipantsCc = res.data; - let newattendees: EventPerson[] = res['data']; - if(newattendees!= null){ - newattendees.forEach(newattendee => { - let att = { - 'UserEmail': newattendee.EmailAddress, - 'UserType': 'CC', - }; - if(this.participants == null){ - this.participants = new Array(); - } - this.participants.push(att); - }); + + modal.onDidDismiss().then((data) => { + + if(data) { + data = data['data']; + + const newAttendees: EventPerson[] = data['taskParticipants']; + const newAttendeesCC: EventPerson[] = data['taskParticipantsCc']; + + this.setIntervenient(newAttendees); + this.setIntervenientCC(newAttendeesCC); } - this.postData.UsersSelected = this.participants; - console.log(this.postData); }); + } else { this.showAttendees=true } diff --git a/src/app/pages/agenda/agenda.module.ts b/src/app/pages/agenda/agenda.module.ts index 06d3a91a7..2f445093c 100644 --- a/src/app/pages/agenda/agenda.module.ts +++ b/src/app/pages/agenda/agenda.module.ts @@ -12,14 +12,6 @@ import { CalModalPageModule } from '../cal-modal/cal-modal.module'; import { registerLocaleData } from '@angular/common'; import localeDe from '@angular/common/locales/pt'; -import { SharedModule } from 'src/app/shared/shared.module'; -import { NewEventPage } from "src/app/shared/agenda/new-event/new-event.page" -import { EditEventPage } from 'src/app/shared/agenda/edit-event/edit-event.page'; -import { ViewEventPage } from 'src/app/shared/agenda/view-event/view-event.page'; -import { EventListPage } from "src/app/shared/agenda/event-list/event-list.page"; -import { AttendeesPage } from 'src/app/shared/event/attendees/attendees.page'; -import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page'; - registerLocaleData(localeDe); @@ -28,7 +20,7 @@ import { adapterFactory } from 'angular-calendar/date-adapters/date-fns'; import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page'; import { ComponentsModule } from 'src/app/components/components.module'; -import { AttendeesPageModule } from '../events/attendees/attendees.module'; + import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module'; import { HeaderPageModule } from 'src/app/shared/header/header.module'; import { ViewEventPageModule } from 'src/app/shared/agenda/view-event/view-event.module'; @@ -58,7 +50,6 @@ import { EditEventPageModule } from 'src/app/shared/agenda/edit-event/edit-event // entryComponents HeaderPageModule, ViewEventPageModule, - AttendeesPageModule, AttendeeModalPageModule, EventsToApprovePageModule, ApproveEventPageModule, diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index b45fb6b51..d56fbeab8 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -213,7 +213,7 @@ --> -
+
@@ -256,7 +256,7 @@
-
+
@@ -297,7 +297,7 @@
-
+
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index d52189326..7458cf873 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -738,7 +738,6 @@ export class AgendaPage implements OnInit { case "Oficial": - alert('Oficial') //Inicializa o array eventSource this.eventsListOficial = []; 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 d56dcd8d8..2e86d039c 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -93,7 +93,7 @@
- +
diff --git a/src/app/pages/events/attendee-modal/attendee-modal.page.ts b/src/app/pages/events/attendee-modal/attendee-modal.page.ts index bd4ca69d2..3f2431d0e 100644 --- a/src/app/pages/events/attendee-modal/attendee-modal.page.ts +++ b/src/app/pages/events/attendee-modal/attendee-modal.page.ts @@ -21,15 +21,15 @@ export class AttendeeModalPage implements OnInit { this.fetchContacts(""); } - save(){ + save() { this.modalCtrl.dismiss( this.contacts.filter(function(contact) { - return contact.IsRequired == true; - }) + return contact.IsRequired == true; + }) ); } - close(){ + close() { this.modalCtrl.dismiss(null); } diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index d54c89460..49ae7cc44 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -63,7 +63,7 @@ export class DespachoPage implements OnInit { } }); - } + } ngOnInit() { this.profile = "mdgpr"; diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.module.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.module.ts index 2223c9033..004bdb6a2 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.module.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.module.ts @@ -8,7 +8,6 @@ import { BookMeetingModalPageRoutingModule } from './book-meeting-modal-routing. import { BookMeetingModalPage } from './book-meeting-modal.page'; import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page'; -import { AttendeesPageModule } from 'src/app/shared/event/attendees/attendees.module'; import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-container.module'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module'; @@ -19,8 +18,6 @@ import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/att FormsModule, IonicModule, BookMeetingModalPageRoutingModule, - // - // AttendeesPageModule, EmptyContainerPageModule, diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts index 10d4ca393..b1122467f 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts @@ -9,7 +9,6 @@ import { ExpedientTaskModalPageRoutingModule } from './expedient-task-modal-rout import { ExpedientTaskModalPage } from './expedient-task-modal.page'; import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page'; import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-container.page'; -import { AttendeesPageModule } from 'src/app/shared/event/attendees/attendees.module'; import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module'; import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-container.module'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @@ -21,7 +20,6 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn- IonicModule, ExpedientTaskModalPageRoutingModule, // - AttendeesPageModule, AttendeeModalPageModule, EmptyContainerPageModule, BtnModalDismissPageModule, diff --git a/src/app/shared/event/attendees/attendees-routing.module.ts b/src/app/shared/event/attendees/attendees-routing.module.ts deleted file mode 100644 index 9f8738216..000000000 --- a/src/app/shared/event/attendees/attendees-routing.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { AttendeesPage } from './attendees.page'; - -const routes: Routes = []; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class AttendeesPageRoutingModule {} diff --git a/src/app/shared/event/attendees/attendees.module.ts b/src/app/shared/event/attendees/attendees.module.ts deleted file mode 100644 index 36e9da0d5..000000000 --- a/src/app/shared/event/attendees/attendees.module.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { IonicModule } from '@ionic/angular'; - -import { AttendeesPageRoutingModule } from './attendees-routing.module'; - -import { AttendeesPage } from './attendees.page'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - AttendeesPageRoutingModule - ], - declarations: [AttendeesPage], - exports: [AttendeesPage] -}) -export class AttendeesPageModule {} diff --git a/src/app/shared/event/attendees/attendees.page.html b/src/app/shared/event/attendees/attendees.page.html deleted file mode 100644 index 4a71dcbc8..000000000 --- a/src/app/shared/event/attendees/attendees.page.html +++ /dev/null @@ -1,57 +0,0 @@ - - - Participantes - - - - - Intervenientes - - - Com Conhecimento - - - - - - - - Adicionar participantes - - - - - - - Apagar - - - - -

{{ attendee.Name }}

-

{{ attendee.EmailAddress }}

- - - - - - - - - - - - - Cancelar - - - - - - - OK - - - - - \ No newline at end of file diff --git a/src/app/shared/event/attendees/attendees.page.scss b/src/app/shared/event/attendees/attendees.page.scss deleted file mode 100644 index 853c08fcf..000000000 --- a/src/app/shared/event/attendees/attendees.page.scss +++ /dev/null @@ -1,4 +0,0 @@ - -ion-item{ - border-bottom:1px solid #ccc; -} diff --git a/src/app/shared/event/attendees/attendees.page.spec.ts b/src/app/shared/event/attendees/attendees.page.spec.ts deleted file mode 100644 index d2cb216ae..000000000 --- a/src/app/shared/event/attendees/attendees.page.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { AttendeesPage } from './attendees.page'; - -describe('AttendeesPage', () => { - let component: AttendeesPage; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ AttendeesPage ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(AttendeesPage); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/shared/event/attendees/attendees.page.ts b/src/app/shared/event/attendees/attendees.page.ts deleted file mode 100644 index 64a8dce6d..000000000 --- a/src/app/shared/event/attendees/attendees.page.ts +++ /dev/null @@ -1,93 +0,0 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { EventPerson } from 'src/app/models/eventperson.model'; -import { EventsService } from 'src/app/services/events.service'; -import { ModalController, NavController } from '@ionic/angular'; -// import { AttendeeModalPage } from '../attendee-modal/attendee-modal.page'; - -@Component({ - selector: 'app-attendees', - templateUrl: './attendees.page.html', - styleUrls: ['./attendees.page.scss'], -}) -export class AttendeesPage implements OnInit { - - - segment:string = "true"; - shouldShowCancel:boolean = true; - - searchCountryString = ''; // initialize your searchCountryString string empty - - @Output() openAttendeeModal = new EventEmitter(); - @Output() openAddEvent = new EventEmitter(); - @Input() eventAttendees: EventPerson[]; - @Output() GoBackEditOrAdd = new EventEmitter(); - - - constructor(private eventService: EventsService, private modalCtrl: ModalController, - private navCtrl: NavController) { - } - - - ngOnInit() { - } - - save(){ - this.GoBackEditOrAdd.emit(); - //this.openAddEvent.emit(); - // this.modalCtrl.dismiss(this.eventAttendees); - } - - close(){ - this.GoBackEditOrAdd.emit(); - // this.modalCtrl.dismiss(null); - //this.openAddEvent.emit(); - } - - removeAttendee(attendee: EventPerson) - { - let index: number = this.eventAttendees.findIndex((att) => { - return att.EmailAddress == attendee.EmailAddress - }); - - this.eventAttendees.splice(index, 1); - } - - async addAttendees() { - - console.log('Event Intervenient'); - this.openAttendeeModal.emit(); - - /* const modal = await this.modalCtrl.create({ - component: AttendeeModalPage, - componentProps: { - eventPersons: this.eventAttendees - }, - cssClass: 'attendee-modal', - backdropDismiss: false - }); - - await modal.present(); - - modal.onDidDismiss().then((data) => { - let newattendees: EventPerson[] = data['data']; - - if (newattendees != null) - { - newattendees.forEach(newattendee => { - let att = { - "EmailAddress": newattendee.EmailAddress, - "Name": newattendee.Name, - "IsRequired": (this.segment == "true") - }; - if (this.eventAttendees == null) - { - this.eventAttendees = new Array(); - } - this.eventAttendees.push(att); - }); - } - }); */ - - } - -} \ No newline at end of file diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts index 8a14c56d0..735f21371 100644 --- a/src/app/shared/popover/despachos-options/despachos-options.page.ts +++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts @@ -208,9 +208,7 @@ export class DespachosOptionsPage implements OnInit { modal.onDidDismiss().then(res => { console.log(res); - if(res.data){ - - + if(res.data) { const DocumentToSave = res.data.documents.map((e) => { return { @@ -244,7 +242,7 @@ export class DespachosOptionsPage implements OnInit { }); } - async arquivar(note:string, documents:any){ + async arquivar(note:string, documents:any) { let body = { "serialNumber": this.serialnumber, "action": "Arquivo", @@ -377,7 +375,6 @@ export class DespachosOptionsPage implements OnInit { goBack() { - alert(' goback') let navigationExtras: NavigationExtras = { queryParams: {