From fbd50137f32a1154a8d04324ea6f8147e206b422 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 24 Jan 2023 15:56:47 +0100 Subject: [PATCH] merge --- report.20230116.142547.31280.0.001.json | 465 ++++++++++++++ src/app/app-routing.module.ts | 549 ++++++++--------- src/app/guards/login.guard.ts | 6 +- src/app/home/home.page.html | 2 +- src/app/home/home.page.ts | 1 - .../document-set-up-meeting.page.html | 4 +- .../document-set-up-meeting.page.ts | 66 +- .../edit-profile/edit-profile.page.html | 8 +- src/app/modals/profile/profile.page.html | 9 +- src/app/modals/profile/profile.page.ts | 12 +- .../view-document/view-document.page.ts | 29 +- src/app/modals/view-event/view-event.page.ts | 4 +- src/app/models/beast-orm.ts | 3 +- src/app/models/chatMethod.ts | 1 + src/app/models/message.model.ts | 1 + src/app/models/notifications.ts | 3 +- src/app/pages/agenda/agenda.page.html | 27 +- src/app/pages/agenda/agenda.page.scss | 11 +- src/app/pages/agenda/agenda.page.ts | 18 +- .../agenda/new-event/new-event.page.html | 2 +- .../pages/agenda/new-event/new-event.page.ts | 64 +- src/app/pages/chat/chat.page.ts | 12 +- .../group-messages/group-messages.page.html | 35 +- .../pages/chat/messages/messages.page.html | 52 +- src/app/pages/chat/messages/messages.page.ts | 25 +- .../pages/events/attendees/attendees.page.ts | 19 +- src/app/pages/events/events.page.html | 2 +- .../book-meeting-modal.page.html | 4 +- .../book-meeting-modal.page.ts | 63 +- .../gabinete-digital.page.html | 13 +- .../gabinete-digital/gabinete-digital.page.ts | 178 +++--- src/app/pages/gabinete-digital/list.worker.js | 10 + src/app/pages/inactivity/inactivity.page.html | 4 +- src/app/pages/login/login.page.html | 4 +- src/app/pages/login/login.page.ts | 1 + .../edit-action/edit-action.page.ts | 2 +- .../new-action/new-action.page.html | 4 +- .../new-action/new-action.page.ts | 48 +- .../new-publication/new-publication.page.ts | 2 +- .../pages/publications/publications.page.html | 2 +- .../pages/publications/publications.page.ts | 15 +- src/app/pages/search/search.page.html | 31 +- src/app/pages/search/search.page.ts | 201 +++++- src/app/pipes/expediente-task.pipe.ts | 2 +- src/app/services/attachments.service.ts | 18 +- src/app/services/auth.service.ts | 8 +- src/app/services/chat/chat-methods.service.ts | 1 + src/app/services/chat/chat-system.service.ts | 33 +- src/app/services/chat/message.service.ts | 44 +- .../chat/rochet-chat-connector.service.ts | 57 ++ src/app/services/chat/room.service.ts | 30 +- .../services/chat/viewed-message.service.ts | 8 +- src/app/services/contacts.service.ts | 14 +- src/app/services/events.service.ts | 148 ++--- src/app/services/first-enter.service.ts | 1 - src/app/services/notifications.service.ts | 213 ++++--- src/app/services/organic-entity.service.ts | 14 +- src/app/services/publications.service.ts | 14 +- src/app/services/search.service.ts | 42 +- .../edit-event-to-approve.page.ts | 2 +- .../agenda/new-event/new-event.page.html | 2 +- .../shared/agenda/new-event/new-event.page.ts | 38 +- .../group-messages/group-messages.page.html | 35 +- .../group-messages/group-messages.page.ts | 2 + .../shared/chat/messages/messages.page.html | 37 +- .../shared/chat/messages/messages.page.scss | 5 + src/app/shared/chat/messages/messages.page.ts | 4 + .../attendee-modal/attendee-modal.page.html | 2 +- .../attendee-modal/attendee-modal.page.ts | 7 +- .../all-processes/all-processes.page.html | 9 +- .../all-processes/all-processes.page.ts | 24 +- .../edit-event-to-approve/edit-event.page.ts | 10 +- src/app/shared/header/header.page.html | 30 +- .../chat-options-popover.page.html | 3 +- .../chat-options-popover.page.ts | 25 +- .../event-details-documents-options.page.html | 2 +- .../opts-expediente/opts-expediente.page.html | 2 - .../opts-expediente/opts-expediente.page.ts | 14 +- .../edit-action/edit-action.page.ts | 2 +- .../new-action/new-action.page.html | 4 +- .../publication/new-action/new-action.page.ts | 45 +- src/app/store/localstore.service.ts | 22 + src/assets/images/theme/blue/search.svg | 1 + src/assets/images/theme/gov/search.svg | 1 + src/assets/images/theme/tribunal/search.svg | 1 + src/environments/environment.prod.ts | 10 +- src/environments/environment.ts | 10 +- src/global.scss | 8 + src/index.html | 2 +- src/main.ts | 7 - src/plugin/src/connection/dbSwtich.d.ts | 5 + src/plugin/src/connection/dbSwtich.js | 29 + .../src/connection/indexedDb/connector.d.ts | 7 + .../src/connection/indexedDb/connector.js | 57 ++ .../connection/indexedDb/dynamicChange.d.ts | 3 + .../src/connection/indexedDb/dynamicChange.js | 31 + .../src/connection/indexedDb/indexedb.d.ts | 39 ++ .../src/connection/indexedDb/indexedb.js | 366 +++++++++++ src/plugin/src/connection/intreface.d.ts | 2 + src/plugin/src/connection/intreface.js | 1 + src/plugin/src/connection/worker.d.ts | 1 + src/plugin/src/connection/worker.js | 17 + src/plugin/src/connection/worker.queue.d.ts | 19 + src/plugin/src/connection/worker.queue.js | 51 ++ src/plugin/src/index.d.ts | 27 + src/plugin/src/index.js | 9 + src/plugin/src/models/field/allFields.d.ts | 140 +++++ src/plugin/src/models/field/allFields.js | 253 ++++++++ src/plugin/src/models/field/field.d.ts | 17 + src/plugin/src/models/field/field.js | 32 + src/plugin/src/models/field/fields.d.ts | 19 + .../src/models/field/fields.interface.d.ts | 10 + .../src/models/field/fields.interface.js | 33 + src/plugin/src/models/field/fields.js | 40 ++ src/plugin/src/models/field/interface.d.ts | 97 +++ src/plugin/src/models/field/interface.js | 1 + src/plugin/src/models/mode-migrations.d.ts | 8 + src/plugin/src/models/mode-migrations.js | 31 + src/plugin/src/models/model-from.d.ts | 0 src/plugin/src/models/model-from.js | 0 src/plugin/src/models/model-manager.d.ts | 14 + src/plugin/src/models/model-manager.js | 39 ++ src/plugin/src/models/model.d.ts | 49 ++ src/plugin/src/models/model.interface.d.ts | 10 + src/plugin/src/models/model.interface.js | 11 + src/plugin/src/models/model.js | 305 ++++++++++ src/plugin/src/models/model.reader.d.ts | 11 + src/plugin/src/models/model.reader.js | 34 ++ src/plugin/src/models/register-model.d.ts | 29 + src/plugin/src/models/register-model.js | 277 +++++++++ .../Operators/Object-condition-operator.d.ts | 10 + .../Operators/Object-condition-operator.js | 33 + .../src/sql/Operators/args-attributes.d.ts | 22 + .../src/sql/Operators/args-attributes.js | 118 ++++ .../src/sql/Operators/object-operator.d.ts | 478 +++++++++++++++ .../src/sql/Operators/object-operator.js | 107 ++++ src/plugin/src/sql/Operators/operators.d.ts | 258 ++++++++ src/plugin/src/sql/Operators/operators.js | 576 ++++++++++++++++++ .../src/sql/Operators/query-bulder.d.ts | 0 src/plugin/src/sql/Operators/query-bulder.js | 0 src/plugin/src/sql/methods/filter.d.ts | 11 + src/plugin/src/sql/methods/filter.js | 28 + src/plugin/src/sql/methods/methods.d.ts | 14 + src/plugin/src/sql/methods/methods.js | 7 + src/plugin/src/sql/query/interface.d.ts | 12 + src/plugin/src/sql/query/interface.js | 14 + src/plugin/src/sql/sqlObject/sql.d.ts | 3 + src/plugin/src/sql/sqlObject/sql.js | 3 + src/plugin/src/sql/sqlObject/sqlObject.d.ts | 17 + src/plugin/src/sql/sqlObject/sqlObject.js | 31 + src/plugin/src/utils.d.ts | 7 + src/plugin/src/utils.js | 34 ++ version/git-version.ts | 18 +- 153 files changed, 5997 insertions(+), 953 deletions(-) create mode 100644 report.20230116.142547.31280.0.001.json create mode 100644 src/app/pages/gabinete-digital/list.worker.js create mode 100644 src/assets/images/theme/blue/search.svg create mode 100644 src/assets/images/theme/gov/search.svg create mode 100644 src/assets/images/theme/tribunal/search.svg create mode 100644 src/plugin/src/connection/dbSwtich.d.ts create mode 100644 src/plugin/src/connection/dbSwtich.js create mode 100644 src/plugin/src/connection/indexedDb/connector.d.ts create mode 100644 src/plugin/src/connection/indexedDb/connector.js create mode 100644 src/plugin/src/connection/indexedDb/dynamicChange.d.ts create mode 100644 src/plugin/src/connection/indexedDb/dynamicChange.js create mode 100644 src/plugin/src/connection/indexedDb/indexedb.d.ts create mode 100644 src/plugin/src/connection/indexedDb/indexedb.js create mode 100644 src/plugin/src/connection/intreface.d.ts create mode 100644 src/plugin/src/connection/intreface.js create mode 100644 src/plugin/src/connection/worker.d.ts create mode 100644 src/plugin/src/connection/worker.js create mode 100644 src/plugin/src/connection/worker.queue.d.ts create mode 100644 src/plugin/src/connection/worker.queue.js create mode 100644 src/plugin/src/index.d.ts create mode 100644 src/plugin/src/index.js create mode 100644 src/plugin/src/models/field/allFields.d.ts create mode 100644 src/plugin/src/models/field/allFields.js create mode 100644 src/plugin/src/models/field/field.d.ts create mode 100644 src/plugin/src/models/field/field.js create mode 100644 src/plugin/src/models/field/fields.d.ts create mode 100644 src/plugin/src/models/field/fields.interface.d.ts create mode 100644 src/plugin/src/models/field/fields.interface.js create mode 100644 src/plugin/src/models/field/fields.js create mode 100644 src/plugin/src/models/field/interface.d.ts create mode 100644 src/plugin/src/models/field/interface.js create mode 100644 src/plugin/src/models/mode-migrations.d.ts create mode 100644 src/plugin/src/models/mode-migrations.js create mode 100644 src/plugin/src/models/model-from.d.ts create mode 100644 src/plugin/src/models/model-from.js create mode 100644 src/plugin/src/models/model-manager.d.ts create mode 100644 src/plugin/src/models/model-manager.js create mode 100644 src/plugin/src/models/model.d.ts create mode 100644 src/plugin/src/models/model.interface.d.ts create mode 100644 src/plugin/src/models/model.interface.js create mode 100644 src/plugin/src/models/model.js create mode 100644 src/plugin/src/models/model.reader.d.ts create mode 100644 src/plugin/src/models/model.reader.js create mode 100644 src/plugin/src/models/register-model.d.ts create mode 100644 src/plugin/src/models/register-model.js create mode 100644 src/plugin/src/sql/Operators/Object-condition-operator.d.ts create mode 100644 src/plugin/src/sql/Operators/Object-condition-operator.js create mode 100644 src/plugin/src/sql/Operators/args-attributes.d.ts create mode 100644 src/plugin/src/sql/Operators/args-attributes.js create mode 100644 src/plugin/src/sql/Operators/object-operator.d.ts create mode 100644 src/plugin/src/sql/Operators/object-operator.js create mode 100644 src/plugin/src/sql/Operators/operators.d.ts create mode 100644 src/plugin/src/sql/Operators/operators.js create mode 100644 src/plugin/src/sql/Operators/query-bulder.d.ts create mode 100644 src/plugin/src/sql/Operators/query-bulder.js create mode 100644 src/plugin/src/sql/methods/filter.d.ts create mode 100644 src/plugin/src/sql/methods/filter.js create mode 100644 src/plugin/src/sql/methods/methods.d.ts create mode 100644 src/plugin/src/sql/methods/methods.js create mode 100644 src/plugin/src/sql/query/interface.d.ts create mode 100644 src/plugin/src/sql/query/interface.js create mode 100644 src/plugin/src/sql/sqlObject/sql.d.ts create mode 100644 src/plugin/src/sql/sqlObject/sql.js create mode 100644 src/plugin/src/sql/sqlObject/sqlObject.d.ts create mode 100644 src/plugin/src/sql/sqlObject/sqlObject.js create mode 100644 src/plugin/src/utils.d.ts create mode 100644 src/plugin/src/utils.js diff --git a/report.20230116.142547.31280.0.001.json b/report.20230116.142547.31280.0.001.json new file mode 100644 index 000000000..ddf61ca87 --- /dev/null +++ b/report.20230116.142547.31280.0.001.json @@ -0,0 +1,465 @@ + +{ + "header": { + "reportVersion": 1, + "event": "Allocation failed - JavaScript heap out of memory", + "trigger": "FatalError", + "filename": "report.20230116.142547.31280.0.001.json", + "dumpEventTime": "2023-01-16T14:25:47Z", + "dumpEventTimeStamp": "1673875547220", + "processId": 31280, + "cwd": "C:\\Users\\peter.maquiran\\Documents\\project\\gabinete-digital-fo", + "commandLine": [ + "node", + "C:\\Users\\peter.maquiran\\Documents\\project\\gabinete-digital-fo\\node_modules\\.bin\\\\..\\@angular\\cli\\bin\\ng", + "run", + "app:serve:production", + "--host=localhost", + "--port=8101" + ], + "nodejsVersion": "v12.14.1", + "wordSize": 64, + "arch": "x64", + "platform": "win32", + "componentVersions": { + "node": "12.14.1", + "v8": "7.7.299.13-node.16", + "uv": "1.33.1", + "zlib": "1.2.11", + "brotli": "1.0.7", + "ares": "1.15.0", + "modules": "72", + "nghttp2": "1.40.0", + "napi": "5", + "llhttp": "2.0.1", + "http_parser": "2.8.0", + "openssl": "1.1.1d", + "cldr": "35.1", + "icu": "64.2", + "tz": "2019c", + "unicode": "12.1" + }, + "release": { + "name": "node", + "lts": "Erbium", + "headersUrl": "https://nodejs.org/download/release/v12.14.1/node-v12.14.1-headers.tar.gz", + "sourceUrl": "https://nodejs.org/download/release/v12.14.1/node-v12.14.1.tar.gz", + "libUrl": "https://nodejs.org/download/release/v12.14.1/win-x64/node.lib" + }, + "osName": "Windows_NT", + "osRelease": "10.0.18363", + "osVersion": "Windows 10 Pro", + "osMachine": "x86_64", + "cpus": [ + { + "model": "Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz", + "speed": 1992, + "user": 11330625, + "nice": 0, + "sys": 14678953, + "idle": 150967375, + "irq": 5472781 + }, + { + "model": "Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz", + "speed": 1992, + "user": 7800796, + "nice": 0, + "sys": 5484906, + "idle": 163690671, + "irq": 306109 + }, + { + "model": "Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz", + "speed": 1992, + "user": 12714203, + "nice": 0, + "sys": 8063375, + "idle": 156198781, + "irq": 161593 + }, + { + "model": "Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz", + "speed": 1992, + "user": 9228578, + "nice": 0, + "sys": 5652046, + "idle": 162095734, + "irq": 117578 + }, + { + "model": "Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz", + "speed": 1992, + "user": 11003906, + "nice": 0, + "sys": 7387171, + "idle": 158585281, + "irq": 182406 + }, + { + "model": "Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz", + "speed": 1992, + "user": 7991453, + "nice": 0, + "sys": 5380921, + "idle": 163603984, + "irq": 125500 + }, + { + "model": "Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz", + "speed": 1992, + "user": 11477265, + "nice": 0, + "sys": 7271046, + "idle": 158228046, + "irq": 171921 + }, + { + "model": "Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz", + "speed": 1992, + "user": 8419921, + "nice": 0, + "sys": 5617531, + "idle": 162938906, + "irq": 116265 + } + ], + "networkInterfaces": [ + { + "name": "vEthernet (Wifi)", + "internal": false, + "mac": "74:d8:3e:d0:3c:bb", + "address": "fe80::2c4a:fffd:f4ea:f439", + "netmask": "ffff:ffff:ffff:ffff::", + "family": "IPv6", + "scopeid": 23 + }, + { + "name": "vEthernet (Wifi)", + "internal": false, + "mac": "74:d8:3e:d0:3c:bb", + "address": "192.168.0.58", + "netmask": "255.255.255.0", + "family": "IPv4" + }, + { + "name": "Loopback Pseudo-Interface 1", + "internal": true, + "mac": "00:00:00:00:00:00", + "address": "::1", + "netmask": "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", + "family": "IPv6", + "scopeid": 0 + }, + { + "name": "Loopback Pseudo-Interface 1", + "internal": true, + "mac": "00:00:00:00:00:00", + "address": "127.0.0.1", + "netmask": "255.0.0.0", + "family": "IPv4" + }, + { + "name": "vEthernet (Default Switch)", + "internal": false, + "mac": "00:15:5d:0a:6a:e5", + "address": "fe80::a5a5:d9f3:9284:7c1c", + "netmask": "ffff:ffff:ffff:ffff::", + "family": "IPv6", + "scopeid": 36 + }, + { + "name": "vEthernet (Default Switch)", + "internal": false, + "mac": "00:15:5d:0a:6a:e5", + "address": "192.168.188.97", + "netmask": "255.255.255.240", + "family": "IPv4" + } + ], + "host": "LAPTOP-66" + }, + "javascriptStack": { + "message": "No stack.", + "stack": [ + "Unavailable." + ] + }, + "nativeStack": [ + { + "pc": "0x00007ff6d4561759", + "symbol": "std::basic_ostream >::operator<<+10873" + }, + { + "pc": "0x00007ff6d4565b7c", + "symbol": "std::basic_ostream >::operator<<+28316" + }, + { + "pc": "0x00007ff6d4564b38", + "symbol": "std::basic_ostream >::operator<<+24152" + }, + { + "pc": "0x00007ff6d465433b", + "symbol": "v8::base::CPU::has_sse+37723" + }, + { + "pc": "0x00007ff6d4e58c5e", + "symbol": "v8::Isolate::ReportExternalAllocationLimitReached+94" + }, + { + "pc": "0x00007ff6d4e40ca1", + "symbol": "v8::SharedArrayBuffer::Externalize+833" + }, + { + "pc": "0x00007ff6d4d0e56c", + "symbol": "v8::internal::Heap::EphemeronKeyWriteBarrierFromCode+1436" + }, + { + "pc": "0x00007ff6d4d19910", + "symbol": "v8::internal::Heap::ProtectUnprotectedMemoryChunks+1312" + }, + { + "pc": "0x00007ff6d4d16444", + "symbol": "v8::internal::Heap::PageFlagsAreConsistent+3204" + }, + { + "pc": "0x00007ff6d4d0bcd3", + "symbol": "v8::internal::Heap::CollectGarbage+1283" + }, + { + "pc": "0x00007ff6d4d0a4a4", + "symbol": "v8::internal::Heap::AddRetainedMap+2356" + }, + { + "pc": "0x00007ff6d4d2b775", + "symbol": "v8::internal::Factory::NewFillerObject+53" + }, + { + "pc": "0x00007ff6d4a97a49", + "symbol": "v8::internal::interpreter::JumpTableTargetOffsets::iterator::operator=+4057" + }, + { + "pc": "0x00007ff6d528463d", + "symbol": "v8::internal::SetupIsolateDelegate::SetupHeap+567949" + }, + { + "pc": "0x000002be85bcfe95", + "symbol": "" + } + ], + "javascriptHeap": { + "totalMemory": 2167566336, + "totalCommittedMemory": 2167566336, + "usedMemory": 2064602904, + "availableMemory": 72200776, + "memoryLimit": 2197815296, + "heapSpaces": { + "read_only_space": { + "memorySize": 262144, + "committedMemory": 262144, + "capacity": 261872, + "used": 32296, + "available": 229576 + }, + "new_space": { + "memorySize": 33554432, + "committedMemory": 33554432, + "capacity": 16759808, + "used": 3605840, + "available": 13153968 + }, + "old_space": { + "memorySize": 1884401664, + "committedMemory": 1884401664, + "capacity": 1839520176, + "used": 1829345824, + "available": 10174352 + }, + "code_space": { + "memorySize": 15892480, + "committedMemory": 15892480, + "capacity": 15142912, + "used": 13508800, + "available": 1634112 + }, + "map_space": { + "memorySize": 19402752, + "committedMemory": 19402752, + "capacity": 5107360, + "used": 5107360, + "available": 0 + }, + "large_object_space": { + "memorySize": 213430272, + "committedMemory": 213430272, + "capacity": 212452384, + "used": 212452384, + "available": 0 + }, + "code_large_object_space": { + "memorySize": 622592, + "committedMemory": 622592, + "capacity": 550400, + "used": 550400, + "available": 0 + }, + "new_large_object_space": { + "memorySize": 0, + "committedMemory": 0, + "capacity": 16759808, + "used": 0, + "available": 16759808 + } + } + }, + "resourceUsage": { + "userCpuSeconds": 1784.05, + "kernelCpuSeconds": 125.39, + "cpuConsumptionPercent": 29.3579, + "maxRss": 2669527040, + "pageFaults": { + "IORequired": 3606280, + "IONotRequired": 0 + }, + "fsActivity": { + "reads": 48626, + "writes": 7136 + } + }, + "libuv": [ + ], + "environmentVariables": { + " c:\\program files\\nodejs\\node_modules\\npm": "npm", + "=C:": "C:\\Users\\peter.maquiran\\Documents\\project\\gabinete-digital-fo", + "allusersprofile": "C:\\ProgramData", + "android_sdk_root": "C:\\Users\\peter.maquiran\\Documents\\android-sdk", + "appdata": "C:\\Users\\peter.maquiran\\AppData\\Roaming", + "asl.log": "Destination=file", + "brb": "C:\\Program Files\\HP\\Sure Click\\bin", + "BROWSERSLIST_IGNORE_OLD_DATA": "1", + "brs": "C:\\Program Files\\HP\\Sure Click\\servers", + "chocolateyinstall": "C:\\ProgramData\\chocolatey", + "chocolateylastpathupdate": "132689116989769711", + "chrome_crashpad_pipe_name": "\\\\.\\pipe\\LOCAL\\crashpad_456_JCFUHUHYVFNGTFZP", + "colorterm": "truecolor", + "commonprogramfiles": "C:\\Program Files\\Common Files", + "commonprogramfiles(x86)": "C:\\Program Files (x86)\\Common Files", + "commonprogramw6432": "C:\\Program Files\\Common Files", + "computername": "LAPTOP-66", + "comspec": "C:\\windows\\system32\\cmd.exe", + "dp0": "C:\\Users\\peter.maquiran\\Documents\\project\\gabinete-digital-fo\\node_modules\\.bin\\", + "driverdata": "C:\\Windows\\System32\\Drivers\\DriverData", + "exepath": "C:\\Program Files\\Git\\bin", + "force_color": "1", + "fps_browser_app_profile_string": "Internet Explorer", + "fps_browser_user_profile_string": "Default", + "grandle_home": "C:\\Gradle\\gradle-7.6\\bin", + "home": "C:\\Users\\peter.maquiran", + "homedrive": "C:", + "homepath": "\\Users\\peter.maquiran", + "ionic_cli_bin": "C:\\Users\\peter.maquiran\\AppData\\Roaming\\npm\\node_modules\\@ionic\\cli\\bin\\ionic", + "ionic_cli_lib": "C:\\Users\\peter.maquiran\\AppData\\Roaming\\npm\\node_modules\\@ionic\\cli", + "ionic_cli_local_error": "LOCAL_CLI_NOT_FOUND", + "java_home": "C:\\Program Files\\Java\\jdk-11.0.8", + "jre_home": "C:\\Program Files\\Java\\jre-11.0.8.10-hotspot", + "lang": "en_US.UTF-8", + "localappdata": "C:\\Users\\peter.maquiran\\AppData\\Local", + "logonserver": "\\\\VM-SRV-01", + "msystem": "MINGW64", + "number_of_processors": "8", + "nvm_home": "C:\\Users\\peter.maquiran\\AppData\\Roaming\\nvm", + "nvm_symlink": "C:\\Program Files\\nodejs", + "onedrive": "C:\\Users\\peter.maquiran\\OneDrive", + "onlineservices": "Online Services", + "original_xdg_current_desktop": "undefined", + "os": "Windows_NT", + "path": "C:\\Users\\peter.maquiran\\Documents\\project\\gabinete-digital-fo\\node_modules\\.bin;C:\\Program Files\\Git\\mingw64\\bin;C:\\Program Files\\Git\\usr\\bin;C:\\Users\\peter.maquiran\\bin;C:\\Program Files\\java\\jre-11.0.8.10-hotspot\\bin;C:\\Users\\peter.maquiran\\AppData\\Roaming\\nvm;C:\\Program Files\\nodejs;C:\\Users\\peter.maquiran\\AppData\\Local\\Programs\\Python\\Python39\\Scripts;C:\\Users\\peter.maquiran\\AppData\\Local\\Programs\\Python\\Python39;C:\\Users\\peter.maquiran\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Users\\peter.maquiran\\AppData\\Local\\Programs\\Microsoft VS Code\\bin;C:\\Program Files\\wkhtmltopdf\\bin;C:\\Program Files\\heroku\\bin;C:\\Program Files\\TestProject Agent;C:\\Program Files (x86)\\Android\\android-sdk;C:\\Users\\peter.maquiran\\Documents\\flutter_windows_2.2.3-stable\\flutter\\bin;C:\\Program Files\\php-7.3.33;C:\\Users\\peter.maquiran\\AppData\\Local\\ComposerSetup\\bin;C:\\Users\\peter.maquiran\\AppData\\Roaming\\Composer\\vendor\\bin;C:\\Users\\peter.maquiran\\.dotnet\\tools;C:\\Program Files\\Azure Data Studio\\bin;C:\\Gradle\\gradle-7.6\\bin;C:\\Users\\peter.maquiran\\AppData\\Roaming\\npm;C:\\Users\\peter.maquiran\\AppData\\Roaming\\nvm;C:\\Program Files\\nodejs;C:\\Program Files\\Java\\jdk-11.0.8\\bin", + "pathext": ".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JSE;.WSF;.WSH;.MSC;.PY;.PYW", + "platformcode": "AN", + "plink_protocol": "ssh", + "processor_architecture": "AMD64", + "processor_identifier": "Intel64 Family 6 Model 142 Stepping 12, GenuineIntel", + "processor_level": "6", + "processor_revision": "8e0c", + "programdata": "C:\\ProgramData", + "programfiles": "C:\\Program Files", + "programfiles(x86)": "C:\\Program Files (x86)", + "programw6432": "C:\\Program Files", + "PROMPT": "$P$G", + "psmodulepath": "C:\\Program Files\\WindowsPowerShell\\Modules;C:\\windows\\system32\\WindowsPowerShell\\v1.0\\Modules;C:\\Program Files (x86)\\Microsoft SQL Server\\150\\Tools\\PowerShell\\Modules\\;C:\\Program Files\\Veeam\\Backup and Replication\\Explorers\\Exchange\\;C:\\Program Files\\Veeam\\Backup and Replication\\Explorers\\SQL\\;C:\\Program Files\\Veeam\\Backup and Replication\\Explorers\\ActiveDirectory\\;C:\\Program Files\\Veeam\\Backup and Replication\\Explorers\\Oracle\\;C:\\Program Files\\Veeam\\Backup and Replication\\Explorers\\SharePoint\\", + "ptsminstallpath": "c:\\Program Files\\HP\\HP ProtectTools Security Manager\\Bin\\", + "ptsminstallpath_x86": "c:\\Program Files (x86)\\HP\\HP ProtectTools Security Manager\\Bin\\", + "public": "C:\\Users\\Public", + "pwd": "C:/Users/peter.maquiran/Documents/project/gabinete-digital-fo", + "regioncode": "EMEA", + "sessionname": "Console", + "shlvl": "1", + "systemdrive": "C:", + "systemroot": "C:\\windows", + "temp": "C:\\Users\\PETER~1.MAQ\\AppData\\Local\\Temp", + "term": "xterm-256color", + "term_program": "vscode", + "term_program_version": "1.74.3", + "tmp": "C:\\Users\\PETER~1.MAQ\\AppData\\Local\\Temp", + "userdnsdomain": "EQUILIBRIUM.LOCAL", + "userdomain": "EQUILIBRIUM", + "userdomain_roamingprofile": "EQUILIBRIUM", + "username": "peter.maquiran", + "userprofile": "C:\\Users\\peter.maquiran", + "vs110comntools": "C:\\Program Files (x86)\\Microsoft Visual Studio 11.0\\Common7\\Tools\\", + "vs120comntools": "C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\Common7\\Tools\\", + "vs140comntools": "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\Tools\\", + "vscode_git_ipc_handle": "\\\\.\\pipe\\vscode-git-763e312aff-sock", + "WEBPACK_DEV_SERVER": "true", + "windir": "C:\\windows", + "_prog": "node" + }, + "sharedObjects": [ + "C:\\Program Files\\nodejs\\node.exe", + "C:\\windows\\SYSTEM32\\ntdll.dll", + "C:\\windows\\System32\\KERNEL32.DLL", + "C:\\windows\\System32\\KERNELBASE.dll", + "C:\\windows\\System32\\WS2_32.dll", + "C:\\windows\\System32\\RPCRT4.dll", + "C:\\windows\\SYSTEM32\\dbghelp.dll", + "C:\\windows\\System32\\ADVAPI32.dll", + "C:\\windows\\System32\\msvcrt.dll", + "C:\\windows\\System32\\ucrtbase.dll", + "C:\\windows\\System32\\sechost.dll", + "C:\\windows\\System32\\USER32.dll", + "C:\\windows\\System32\\win32u.dll", + "C:\\windows\\System32\\GDI32.dll", + "C:\\windows\\System32\\gdi32full.dll", + "C:\\windows\\System32\\msvcp_win.dll", + "C:\\windows\\System32\\PSAPI.DLL", + "C:\\windows\\System32\\CRYPT32.dll", + "C:\\windows\\System32\\MSASN1.dll", + "C:\\windows\\System32\\bcrypt.dll", + "C:\\windows\\SYSTEM32\\IPHLPAPI.DLL", + "C:\\windows\\SYSTEM32\\USERENV.dll", + "C:\\windows\\System32\\profapi.dll", + "C:\\windows\\SYSTEM32\\WINMM.dll", + "C:\\windows\\SYSTEM32\\winmmbase.dll", + "C:\\windows\\System32\\cfgmgr32.dll", + "C:\\windows\\System32\\bcryptPrimitives.dll", + "C:\\windows\\System32\\IMM32.DLL", + "C:\\windows\\System32\\powrprof.dll", + "C:\\windows\\System32\\UMPDC.dll", + "C:\\windows\\SYSTEM32\\CRYPTBASE.DLL", + "C:\\windows\\system32\\uxtheme.dll", + "C:\\windows\\System32\\combase.dll", + "C:\\windows\\system32\\mswsock.dll", + "C:\\windows\\System32\\kernel.appcore.dll", + "C:\\windows\\System32\\NSI.dll", + "C:\\windows\\SYSTEM32\\dhcpcsvc6.DLL", + "C:\\windows\\SYSTEM32\\dhcpcsvc.DLL", + "C:\\windows\\SYSTEM32\\DNSAPI.dll", + "C:\\Windows\\System32\\rasadhlp.dll", + "C:\\windows\\System32\\fwpuclnt.dll", + "C:\\windows\\system32\\napinsp.dll", + "C:\\windows\\system32\\pnrpnsp.dll", + "C:\\windows\\System32\\winrnr.dll", + "C:\\windows\\system32\\NLAapi.dll", + "C:\\windows\\system32\\wshbth.dll" + ] +} \ No newline at end of file diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index b9e22b1b0..8bb4acc3d 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,255 +1,256 @@ -import { NgModule } from '@angular/core'; -import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; - -const routes = [ - { - path: '', - loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule) - }, - { - path: '', - loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) - }, - { - path: 'empty-chat', - loadChildren: () => import('./shared/chat/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule) - }, - { - path: 'empty-container', - loadChildren: () => import('./shared/empty-container/empty-container.module').then( m => m.EmptyContainerPageModule) - }, - { - path: 'events-to-approve', - loadChildren: () => import('./shared/gabinete-digital/events-to-approve/events-to-approve.module').then( m => m.EventsToApprovePageModule) - }, - { - path: 'expedients', - loadChildren: () => import('./shared/gabinete-digital/expedients/expedients.module').then( m => m.ExpedientsPageModule) - }, - { - path: 'document-detail', - loadChildren: () => import('./modals/document-detail/document-detail.module').then( m => m.DocumentDetailPageModule) - }, - { - path: 'edit-group', - loadChildren: () => import('./shared/chat/edit-group/edit-group.module').then( m => m.EditGroupPageModule) - }, - { - path: 'pedidos', - loadChildren: () => import('./shared/gabinete-digital/pedidos/pedidos.module').then( m => m.PedidosPageModule) - }, - { - path: 'event-list', - loadChildren: () => import('./pages/gabinete-digital/event-list/event-list.module').then(m =>m.EventListPageModule) - }, - { - path: 'despachos', - loadChildren: () => import('./shared/gabinete-digital/despachos/despachos.module').then( m => m.DespachosPageModule) - }, - { - path: 'create-process', - loadChildren: () => import('./modals/create-process/create-process.module').then( m => m.CreateProcessPageModule) - }, - { - path: 'pendentes', - loadChildren: () => import('./shared/gabinete-digital/pendentes/pendentes.module').then( m => m.PendentesPageModule) - }, - { - path: 'delegar', - loadChildren: () => import('./modals/delegar/delegar.module').then( m => m.DelegarPageModule) - }, - { - path: 'add-note', - loadChildren: () => import('./modals/add-note/add-note.module').then( m => m.AddNotePageModule) - }, - { - path: 'dar-parecer', - loadChildren: () => import('./modals/dar-parecer/dar-parecer.module').then( m => m.DarParecerPageModule) - }, - { - path: 'opts-expediente', - loadChildren: () => import('./shared/popover/opts-expediente/opts-expediente.module').then( m => m.OptsExpedientePageModule) - }, - { - path: 'despachos-pr', - loadChildren: () => import('./shared/gabinete-digital/despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule) - }, - { - path: 'diplomas', - loadChildren: () => import('./shared/gabinete-digital/diplomas/diplomas.module').then( m => m.DiplomasPageModule) - }, - { - path: 'expedientes-pr', - loadChildren: () => import('./shared/gabinete-digital/expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule) - }, - { - path: 'diplomas-assinar', - loadChildren: () => import('./shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule) - }, - { - path: 'opts-expediente-pr', - loadChildren: () => import('./shared/popover/opts-expediente-pr/opts-expediente-pr.module').then( m => m.OptsExpedientePrPageModule) - }, - { - path: 'despachos-options', - loadChildren: () => import('./shared/popover/despachos-options/despachos-options.module').then( m => m.DespachosOptionsPageModule) - }, - { - path: 'despachos-pr-options', - loadChildren: () => import('./shared/popover/despachos-pr-options/despachos-pr-options.module').then( m => m.DespachosPrOptionsPageModule) - }, - { - path: 'deploma-options', - loadChildren: () => import('./shared/popover/deploma-options/deploma-options.module').then( m => m.DeplomaOptionsPageModule) - }, - { - path: 'pin', - loadChildren: () => import('./shared/pin/pin.module').then( m => m.PinPageModule) - }, - { - path: 'fingerprint', - loadChildren: () => import('./shared/fingerprint/fingerprint.module').then( m => m.FingerprintPageModule) - }, - { - path: 'new-event', - loadChildren: () => import('./shared/agenda/new-event/new-event.module').then( m => m.NewEventPageModule) - }, - { - path: 'event-list', - loadChildren: () => import('./shared/agenda/event-list/event-list.module').then( m => m.EventListPageModule) - }, - { - path: 'approve-event', - loadChildren: () => import('./shared/agenda/approve-event/approve-event.module').then( m => m.ApproveEventPageModule) - }, - { - path: 'bad-request', - loadChildren: () => import('./shared/popover/bad-request/bad-request.module').then( m => m.BadRequestPageModule) - }, - { - path: 'success-message', - loadChildren: () => import('./shared/popover/success-message/success-message.module').then( m => m.SuccessMessagePageModule) - }, - { - path: 'forward', - loadChildren: () => import('./modals/forward/forward.module').then( m => m.ForwardPageModule) - }, - { - path: 'edit-event-to-approve', - loadChildren: () => import('./shared/agenda/edit-event-to-approve/edit-event-to-approve.module').then( m => m.EditEventToApprovePageModule) - }, - { - path: 'actions-options', - loadChildren: () => import('./shared/popover/actions-options/actions-options.module').then( m => m.ActionsOptionsPageModule) - }, - { - path: 'edit-action', - loadChildren: () => import('./shared/publication/edit-action/edit-action.module').then( m => m.EditActionPageModule) - }, - { - path: 'eliminate-event', - loadChildren: () => import('./modals/eliminate-event/eliminate-event.module').then( m => m.EliminateEventPageModule) - }, - { - path: 'inactivity', - loadChildren: () => import('./pages/inactivity/inactivity.module').then( m => m.InactivityPageModule) - }, - { - path: 'document-set-up-meeting', - loadChildren: () => import('./modals/document-set-up-meeting/document-set-up-meeting.module').then( m => m.DocumentSetUpMeetingPageModule) - }, - { - path: 'profile', - loadChildren: () => import('./modals/profile/profile.module').then( m => m.ProfilePageModule) - }, - { - path: 'all-processes', - loadChildren: () => import('./shared/gabinete-digital/all-processes/all-processes.module').then( m => m.AllProcessesPageModule) - }, - { - path: 'searched-document-options', - loadChildren: () => import('./shared/popover/searched-document-options/searched-document-options.module').then( m => m.SearchedDocumentOptionsPageModule) - }, - { - path: 'task-list', - loadChildren: () => import('./shared/gabinete-digital/generic/task-list/task-list.module').then( m => m.TaskListPageModule) - }, - { - path: 'task-list', - loadChildren: () => import('./shared/gabinete-digital/generic/task-list/task-list.module').then( m => m.TaskListPageModule) - }, - { - path: 'task-detailde', - loadChildren: () => import('./shared/gabinete-digital/generic/task-detailde/task-detailde.module').then( m => m.TaskDetaildePageModule) - }, - { - path: 'task-details', - loadChildren: () => import('./shared/gabinete-digital/generic/task-details/task-details.module').then( m => m.TaskDetailsPageModule) - }, - { - path: 'chat-options-features', - loadChildren: () => import('./modals/chat-options-features/chat-options-features.module').then( m => m.ChatOptionsFeaturesPageModule) - }, - { - path: 'document-viewer', - loadChildren: () => import('./modals/document-viewer/document-viewer.module').then( m => m.DocumentViewerPageModule) - }, - { - path: 'view-document', - loadChildren: () => import('./modals/view-document/view-document.module').then( m => m.ViewDocumentPageModule) - }, - { - path: 'event-details-documents-options', - loadChildren: () => import('./shared/popover/event-details-documents-options/event-details-documents-options.module').then( m => m.EventDetailsDocumentsOptionsPageModule) - }, - { - path: 'preview-camera', - loadChildren: () => import('./modals/preview-camera/preview-camera.module').then( m => m.PreviewCameraPageModule) - }, - { - path: 'group-icons', - loadChildren: () => import('./modals/group-icons/group-icons.module').then( m => m.GroupIconsPageModule) - }, - { - path: 'video-allowed', - loadChildren: () => import('./modals/video-allowed/video-allowed.module').then( m => m.VideoAllowedPageModule) - }, - { - path: 'preview-photo', - loadChildren: () => import('./modals/preview-photo/preview-photo.module').then( m => m.PreviewPhotoPageModule) - }, - { - path: 'custom-image-cache', - loadChildren: () => import('./services/file/custom-image-cache/custom-image-cache.module').then( m => m.CustomImageCachePageModule) - }, - { - path: 'view-media', - loadChildren: () => import('./modals/view-media/view-media.module').then( m => m.ViewMediaPageModule) - }, - { - path: 'view-event', - loadChildren: () => import('./modals/view-event/view-event.module').then( m => m.ViewEventPageModule) - }, - { - path: 'previewer', - loadChildren: () => import('./modals/previewer/previewer.module').then( m => m.PreviewerPageModule) - }, - { - path: 'set-room-owner', - loadChildren: () => import('./modals/set-room-owner/set-room-owner.module').then( m => m.SetRoomOwnerPageModule) - }, - { - path: 'diplomas-gerar', - loadChildren: () => import('./shared/gabinete-digital/diplomas-gerar/diplomas-gerar.module').then( m => m.DiplomasGerarPageModule) - }, - { - path: 'diplomas-gerar-options', - loadChildren: () => import('./shared/popover/diplomas-gerar-options/diplomas-gerar-options.module').then( m => m.DiplomasGerarOptionsPageModule) - }, - { - path: 'chat-debugging', - loadChildren: () => import('./shared/popover/chat-debugging/chat-debugging.module').then( m => m.ChatDebuggingPageModule) - }, { +import { NgModule } from '@angular/core'; +import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; + +const routes = [ + { + path: '', + loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule) + }, + { + path: '', + loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) + }, + { + path: 'empty-chat', + loadChildren: () => import('./shared/chat/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule) + }, + { + path: 'empty-container', + loadChildren: () => import('./shared/empty-container/empty-container.module').then( m => m.EmptyContainerPageModule) + }, + { + path: 'events-to-approve', + loadChildren: () => import('./shared/gabinete-digital/events-to-approve/events-to-approve.module').then( m => m.EventsToApprovePageModule) + }, + { + path: 'expedients', + loadChildren: () => import('./shared/gabinete-digital/expedients/expedients.module').then( m => m.ExpedientsPageModule) + }, + { + path: 'document-detail', + loadChildren: () => import('./modals/document-detail/document-detail.module').then( m => m.DocumentDetailPageModule) + }, + { + path: 'edit-group', + loadChildren: () => import('./shared/chat/edit-group/edit-group.module').then( m => m.EditGroupPageModule) + }, + { + path: 'pedidos', + loadChildren: () => import('./shared/gabinete-digital/pedidos/pedidos.module').then( m => m.PedidosPageModule) + }, + { + path: 'event-list', + loadChildren: () => import('./pages/gabinete-digital/event-list/event-list.module').then(m =>m.EventListPageModule) + }, + { + path: 'despachos', + loadChildren: () => import('./shared/gabinete-digital/despachos/despachos.module').then( m => m.DespachosPageModule) + }, + { + path: 'create-process', + loadChildren: () => import('./modals/create-process/create-process.module').then( m => m.CreateProcessPageModule) + }, + { + path: 'pendentes', + loadChildren: () => import('./shared/gabinete-digital/pendentes/pendentes.module').then( m => m.PendentesPageModule) + }, + { + path: 'delegar', + loadChildren: () => import('./modals/delegar/delegar.module').then( m => m.DelegarPageModule) + }, + { + path: 'add-note', + loadChildren: () => import('./modals/add-note/add-note.module').then( m => m.AddNotePageModule) + }, + { + path: 'dar-parecer', + loadChildren: () => import('./modals/dar-parecer/dar-parecer.module').then( m => m.DarParecerPageModule) + }, + { + path: 'opts-expediente', + loadChildren: () => import('./shared/popover/opts-expediente/opts-expediente.module').then( m => m.OptsExpedientePageModule) + }, + { + path: 'despachos-pr', + loadChildren: () => import('./shared/gabinete-digital/despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule) + }, + { + path: 'diplomas', + loadChildren: () => import('./shared/gabinete-digital/diplomas/diplomas.module').then( m => m.DiplomasPageModule) + }, + { + path: 'expedientes-pr', + loadChildren: () => import('./shared/gabinete-digital/expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule) + }, + { + path: 'diplomas-assinar', + loadChildren: () => import('./shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule) + }, + { + path: 'opts-expediente-pr', + loadChildren: () => import('./shared/popover/opts-expediente-pr/opts-expediente-pr.module').then( m => m.OptsExpedientePrPageModule) + }, + { + path: 'despachos-options', + loadChildren: () => import('./shared/popover/despachos-options/despachos-options.module').then( m => m.DespachosOptionsPageModule) + }, + { + path: 'despachos-pr-options', + loadChildren: () => import('./shared/popover/despachos-pr-options/despachos-pr-options.module').then( m => m.DespachosPrOptionsPageModule) + }, + { + path: 'deploma-options', + loadChildren: () => import('./shared/popover/deploma-options/deploma-options.module').then( m => m.DeplomaOptionsPageModule) + }, + { + path: 'pin', + loadChildren: () => import('./shared/pin/pin.module').then( m => m.PinPageModule) + }, + { + path: 'fingerprint', + loadChildren: () => import('./shared/fingerprint/fingerprint.module').then( m => m.FingerprintPageModule) + }, + { + path: 'new-event', + loadChildren: () => import('./shared/agenda/new-event/new-event.module').then( m => m.NewEventPageModule) + }, + { + path: 'event-list', + loadChildren: () => import('./shared/agenda/event-list/event-list.module').then( m => m.EventListPageModule) + }, + { + path: 'approve-event', + loadChildren: () => import('./shared/agenda/approve-event/approve-event.module').then( m => m.ApproveEventPageModule) + }, + { + path: 'bad-request', + loadChildren: () => import('./shared/popover/bad-request/bad-request.module').then( m => m.BadRequestPageModule) + }, + { + path: 'success-message', + loadChildren: () => import('./shared/popover/success-message/success-message.module').then( m => m.SuccessMessagePageModule) + }, + { + path: 'forward', + loadChildren: () => import('./modals/forward/forward.module').then( m => m.ForwardPageModule) + }, + { + path: 'edit-event-to-approve', + loadChildren: () => import('./shared/agenda/edit-event-to-approve/edit-event-to-approve.module').then( m => m.EditEventToApprovePageModule) + }, + { + path: 'actions-options', + loadChildren: () => import('./shared/popover/actions-options/actions-options.module').then( m => m.ActionsOptionsPageModule) + }, + { + path: 'edit-action', + loadChildren: () => import('./shared/publication/edit-action/edit-action.module').then( m => m.EditActionPageModule) + }, + { + path: 'eliminate-event', + loadChildren: () => import('./modals/eliminate-event/eliminate-event.module').then( m => m.EliminateEventPageModule) + }, + { + path: 'inactivity', + loadChildren: () => import('./pages/inactivity/inactivity.module').then( m => m.InactivityPageModule) + }, + { + path: 'document-set-up-meeting', + loadChildren: () => import('./modals/document-set-up-meeting/document-set-up-meeting.module').then( m => m.DocumentSetUpMeetingPageModule) + }, + { + path: 'profile', + loadChildren: () => import('./modals/profile/profile.module').then( m => m.ProfilePageModule) + }, + { + path: 'all-processes', + loadChildren: () => import('./shared/gabinete-digital/all-processes/all-processes.module').then( m => m.AllProcessesPageModule) + }, + { + path: 'searched-document-options', + loadChildren: () => import('./shared/popover/searched-document-options/searched-document-options.module').then( m => m.SearchedDocumentOptionsPageModule) + }, + { + path: 'task-list', + loadChildren: () => import('./shared/gabinete-digital/generic/task-list/task-list.module').then( m => m.TaskListPageModule) + }, + { + path: 'task-list', + loadChildren: () => import('./shared/gabinete-digital/generic/task-list/task-list.module').then( m => m.TaskListPageModule) + }, + { + path: 'task-detailde', + loadChildren: () => import('./shared/gabinete-digital/generic/task-detailde/task-detailde.module').then( m => m.TaskDetaildePageModule) + }, + { + path: 'task-details', + loadChildren: () => import('./shared/gabinete-digital/generic/task-details/task-details.module').then( m => m.TaskDetailsPageModule) + }, + { + path: 'chat-options-features', + loadChildren: () => import('./modals/chat-options-features/chat-options-features.module').then( m => m.ChatOptionsFeaturesPageModule) + }, + { + path: 'document-viewer', + loadChildren: () => import('./modals/document-viewer/document-viewer.module').then( m => m.DocumentViewerPageModule) + }, + { + path: 'view-document', + loadChildren: () => import('./modals/view-document/view-document.module').then( m => m.ViewDocumentPageModule) + }, + { + path: 'event-details-documents-options', + loadChildren: () => import('./shared/popover/event-details-documents-options/event-details-documents-options.module').then( m => m.EventDetailsDocumentsOptionsPageModule) + }, + { + path: 'preview-camera', + loadChildren: () => import('./modals/preview-camera/preview-camera.module').then( m => m.PreviewCameraPageModule) + }, + { + path: 'group-icons', + loadChildren: () => import('./modals/group-icons/group-icons.module').then( m => m.GroupIconsPageModule) + }, + { + path: 'video-allowed', + loadChildren: () => import('./modals/video-allowed/video-allowed.module').then( m => m.VideoAllowedPageModule) + }, + { + path: 'preview-photo', + loadChildren: () => import('./modals/preview-photo/preview-photo.module').then( m => m.PreviewPhotoPageModule) + }, + { + path: 'custom-image-cache', + loadChildren: () => import('./services/file/custom-image-cache/custom-image-cache.module').then( m => m.CustomImageCachePageModule) + }, + { + path: 'view-media', + loadChildren: () => import('./modals/view-media/view-media.module').then( m => m.ViewMediaPageModule) + }, + { + path: 'view-event', + loadChildren: () => import('./modals/view-event/view-event.module').then( m => m.ViewEventPageModule) + }, + { + path: 'previewer', + loadChildren: () => import('./modals/previewer/previewer.module').then( m => m.PreviewerPageModule) + }, + { + path: 'set-room-owner', + loadChildren: () => import('./modals/set-room-owner/set-room-owner.module').then( m => m.SetRoomOwnerPageModule) + }, + { + path: 'diplomas-gerar', + loadChildren: () => import('./shared/gabinete-digital/diplomas-gerar/diplomas-gerar.module').then( m => m.DiplomasGerarPageModule) + }, + { + path: 'diplomas-gerar-options', + loadChildren: () => import('./shared/popover/diplomas-gerar-options/diplomas-gerar-options.module').then( m => m.DiplomasGerarOptionsPageModule) + }, + { + path: 'chat-debugging', + loadChildren: () => import('./shared/popover/chat-debugging/chat-debugging.module').then( m => m.ChatDebuggingPageModule) + }, + { path: 'chat-message-debugging', loadChildren: () => import('./shared/popover/chat-message-debugging/chat-message-debugging.module').then( m => m.ChatMessageDebuggingPageModule) }, @@ -260,25 +261,29 @@ const routes = [ { path: 'information', loadChildren: () => import('./modals/information/information.module').then( m => m.InformationPageModule) + }, + { + path: 'chat-options-popover', + loadChildren:() => import('./shared/popover/chat-options-popover/chat-options-popover.module').then( m => m.ChatOptionsPopoverPageModule) } - - /* - path: 'chat', - component: ChatPage - } */ - - /* - path: 'chat', - component: ChatPage - } */ - -]; -@NgModule({ - imports: [ - RouterModule.forRoot(routes, - { preloadingStrategy: PreloadAllModules }) - ], - exports: [RouterModule] -}) -export class AppRoutingModule {} + + /* + path: 'chat', + component: ChatPage + } */ + + /* + path: 'chat', + component: ChatPage + } */ + +]; +@NgModule({ + imports: [ + RouterModule.forRoot(routes, + { preloadingStrategy: PreloadAllModules }) + ], + exports: [RouterModule] +}) +export class AppRoutingModule {} diff --git a/src/app/guards/login.guard.ts b/src/app/guards/login.guard.ts index 2987806a8..a8f1790f3 100644 --- a/src/app/guards/login.guard.ts +++ b/src/app/guards/login.guard.ts @@ -4,6 +4,7 @@ import { Observable } from 'rxjs'; import { SessionStore } from '../store/session.service'; import { Platform } from '@ionic/angular'; import { RouteService } from 'src/app/services/route.service' +import { FirstEnterService } from 'src/app/services/first-enter.service' @Injectable({ providedIn: 'root' @@ -12,7 +13,8 @@ export class LoginGuard implements CanActivate { constructor( private router:Router, private platform: Platform, - private RouteService: RouteService ) { + private RouteService: RouteService, + private FirstEnterService: FirstEnterService ) { } canActivate( @@ -24,7 +26,7 @@ export class LoginGuard implements CanActivate { if(SessionStore.exist && SessionStore.user.Inactivity && SessionStore.user.LoginPreference != 'Pin' ) { // enter app - this.router.navigate(['/home/events']); + this.FirstEnterService.enter() return false } else if(SessionStore.exist && !SessionStore.user.Inactivity && SessionStore.user.LoginPreference == 'Pin' && SessionStore.forceToLoginWithForceToLogInWithPassword && this.platform.is('mobile')) { // login with password while has pin diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 508ad8347..f4287e966 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -27,7 +27,7 @@ - Ações + Acções diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 954089660..f9d675478 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -39,7 +39,6 @@ export class HomePage implements OnInit { toDayEventStorage = ToDayEventStorage totalDocumentStore = TotalDocumentStore expedienteGdStore = ExpedienteGdStore - adding: "intervenient" | "CC" = "intervenient"; mobileComponent = { showAddNewEvent: false, 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 5c9718ad4..c6f63a9d0 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 @@ -171,7 +171,7 @@ [(ngModel)]="postData.StartDate" [disabled]="disabled" > - + - + 52 ? (hours === 23 ? 0 : ++hours) : hours; + + if (m == 0) { + if(minutes > m){ + m = m + 15; + } + timeToReturn.setHours(h); + timeToReturn.setMinutes(m); + }else{ + if(minutes > m){ + + m = m + 15; + + timeToReturn.setHours(h); + timeToReturn.setMinutes(m); + }else { + timeToReturn.setHours(h); + timeToReturn.setMinutes(m); + } + } + + // console.log("AFTER IF MINUTES: " +m); + // console.log("AFTER HOURS: " +h); + + return timeToReturn; + } + + setStartDate(){ + this.postData.StartDate = this.roundTimeQuarterHour(); + } + + setEndDate(){ + this.postData.EndDate = this.postData.StartDate; + } + } diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.html b/src/app/modals/profile/edit-profile/edit-profile.page.html index 26565e73d..a48593245 100644 --- a/src/app/modals/profile/edit-profile/edit-profile.page.html +++ b/src/app/modals/profile/edit-profile/edit-profile.page.html @@ -3,14 +3,14 @@
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index 6a26f2b97..f626c951b 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -60,10 +60,12 @@ - - - - + Enviado + + + + + Lido
Tentar
 @@ -97,10 +99,12 @@ image - - - - + Enviado + + + + + Lido
Tentar
 @@ -160,13 +164,13 @@ - - - - - - - + + Enviado + + + + + Lido
Tentar
 @@ -194,24 +198,6 @@ -
-
- {{msg.u.name}} criou esta reunião
-
- - De {{showDateDuration(msg.file.start_date)}} a - {{showDateDuration(msg.file.end_date)}} -
- - - {{msg.file.venue}} -
-
- {{last ? scrollToBottom() : ''}} -
-
Apagou a mensagem
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index fb0689084..dae0950b1 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -11,7 +11,6 @@ import { ChatService } from 'src/app/services/chat.service'; import { FileService } from 'src/app/services/functions/file.service'; import { ProcessesService } from 'src/app/services/processes.service'; import { ToastService } from 'src/app/services/toast.service'; -import { NewEventPage } from 'src/app/shared/agenda/new-event/new-event.page'; import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page'; import { MessagesOptionsPage } from 'src/app/shared/popover/messages-options/messages-options.page'; import { ChatMessageStore } from 'src/app/store/chat/chat-message.service'; @@ -41,6 +40,7 @@ import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page'; import { File } from '@awesome-cordova-plugins/file/ngx'; import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx'; import { Filesystem, Directory } from '@capacitor/filesystem'; +import { NewEventPage } from '../../agenda/new-event/new-event.page'; const IMAGE_DIR = 'stored-images'; @@ -331,6 +331,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { async goToEvent(event: any) { + // console.log(event) + let classs; if (window.innerWidth < 701) { classs = 'modal modal-desktop' @@ -584,7 +586,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { } async bookMeeting() { - this.attendees = this.members.map((val) => { + let attendees = this.ChatSystemService.getDmRoom(this.roomId).members.map((val) => { return { Name: val.name, EmailAddress: val.username + "@" + environment.domain, @@ -597,15 +599,30 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { const modal = await this.modalController.create({ component: NewEventPage, componentProps: { - attendees: this.attendees, + attendees: attendees, + roomId: this.roomId }, cssClass: 'modal modal-desktop', backdropDismiss: false }); await modal.present(); modal.onDidDismiss().then((data) => { - if (data) { + if (data?.data && data.data.id) { + // const roomId = this.roomId + + // this.ChatSystemService.getDmRoom(roomId).send({ + // file: { + // "type": "application/meeting", + // "subject": data.data.Subject, + // "start_date": data.data.StartDate, + // "end_date": data.data.EndDate, + // "venue": data.data.venue, + // "id": data.data.id, + // "calendarId": data.data.CalendarId + // }, + // temporaryData: {} + // }) } }); } diff --git a/src/app/pages/events/attendees/attendees.page.ts b/src/app/pages/events/attendees/attendees.page.ts index e00eb85f4..8689d453a 100644 --- a/src/app/pages/events/attendees/attendees.page.ts +++ b/src/app/pages/events/attendees/attendees.page.ts @@ -81,9 +81,9 @@ export class AttendeesPageModal implements OnInit { } - remove(itm: EventPerson){ + remove(itm: EventPerson) { - if(this.adding == "intervenient"){ + if(this.adding == "intervenient") { this.taskParticipants = this.taskParticipants.filter((contact, index) =>{ @@ -135,10 +135,23 @@ export class AttendeesPageModal implements OnInit { }); } - this.contacts = result; + this.contacts = this.sort(result as any); this.showLoader = false; } ); } + + sort(data: []) { + return data.sort(function (a: any, b: any) { + if (a.Name > b.Name) { + return -1; + } + if (b.Name > a.Name) { + return 1; + } + return 0; + }).reverse() + } + } \ No newline at end of file diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index f74da62f6..527beb5dc 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -125,7 +125,7 @@ (click)="goToExpediente(task.SerialNumber)">
-
{{task.taskStartDate | date: 'dd-MM-yyyy'}}
+
{{task.taskStartDate | date: 'dd-MM-yy'}}
{{task.taskStartDate | date: 'HH:mm'}}
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 68058bd0c..4e7d0f496 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 @@ -147,7 +147,7 @@ [min]="minDate" [disabled]="disabled" > - + - + 52 ? (hours === 23 ? 0 : ++hours) : hours; + + if (m == 0) { + if(minutes > m){ + m = m + 15; + } + timeToReturn.setHours(h); + timeToReturn.setMinutes(m); + }else{ + if(minutes > m){ + + m = m + 15; + + timeToReturn.setHours(h); + timeToReturn.setMinutes(m); + }else { + timeToReturn.setHours(h); + timeToReturn.setMinutes(m); + } + } + + // console.log("AFTER IF MINUTES: " +m); + // console.log("AFTER HOURS: " +h); + + return timeToReturn; + } + + setStartDate(){ + this.postData.StartDate = this.roundTimeQuarterHour(); + } + + setEndDate(){ + this.postData.EndDate = this.postData.StartDate; + } + } diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 355a8c3f9..6c6e6ea80 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -71,7 +71,8 @@
- Agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} do Presidente da República + + Agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} do Titular A sua agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} @@ -227,14 +228,15 @@
-

Despacho do Presidente da República

+ +

Despacho do Titular

Despachos criados por mim

{{ despachoprstore.count }} Documentos

- +
@@ -372,7 +374,6 @@
- diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 71af3bee3..1d21c855d 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -106,6 +106,8 @@ export class GabineteDigitalPage implements OnInit { AllProcess = [] + // workerList : Worker + @ViewChild(ExpedientsPage) expedientesPage: ExpedientsPage; @ViewChild(PendentesPage) pendentesListPage: PendentesPage; @ViewChild(EventsToApprovePage) eventsToApprove: EventsToApprovePage; @@ -126,6 +128,12 @@ export class GabineteDigitalPage implements OnInit { public NotificationsService: NotificationsService ) { + // this.workerList = new Worker(new URL('./list.worker.js', import.meta.url)); + + // this.workerList.onmessage = (oEvent) => { + // this.AllProcess = oEvent.data + // } + window.onresize = (event) => { // if not mobile remove all component if (window.innerWidth < 701) { @@ -157,8 +165,8 @@ export class GabineteDigitalPage implements OnInit { } const pathname = window.location.pathname - this.router.events.forEach((event) => { - if (event instanceof NavigationEnd && event.url == pathname) { + //this.router.events.forEach((event) => { + //if (event instanceof NavigationEnd && event.url == pathname) { this.waitForDomService.selector({ selector: 'app-gabinete-digital ion-content .aside-wrapper', callback: () => { @@ -171,88 +179,96 @@ export class GabineteDigitalPage implements OnInit { } } }) - } - }); + //} + //}); this.hideRefreshButton(); - this.waitForDomService.selector({ - selector: 'app-gabinete-digital ion-content .aside-wrapper', - callback: () => { - // console.log('SECOND CALL') - this.loadAllProcesses(); - } - }) + // this.waitForDomService.selector({ + // selector: 'app-gabinete-digital ion-content .aside-wrapper', + // callback: () => { + // // console.log('SECOND CALL') + // this.loadAllProcesses(); + // } + // }) this.backgroundservice.registerBackService('Online', () => { // this.loadAllProcesses(); }); - this.NotificationsService.registerCallback( - 'despachos', - () => { - this.LoadCounts(); - console.log('refresh with notification') - } - ) - this.NotificationsService.registerCallback( - 'despachos-pr', - () => { - this.LoadCounts(); - console.log('refresh with notification') - } - ) - this.NotificationsService.registerCallback( - 'expediente', - () => { - this.LoadCounts(); - console.log('refresh with notification') - } - ) - this.NotificationsService.registerCallback( - 'gabinete-digital', - () => { - this.LoadCounts(); - console.log('refresh with notification') - } - ) - this.NotificationsService.registerCallback( - 'parecer', - () => { - this.LoadCounts(); - console.log('refresh with notification') - } - ) - this.NotificationsService.registerCallback( - 'deferimento', - () => { - this.LoadCounts(); - console.log('refresh with notification') - } - ) - this.NotificationsService.registerCallback( - 'diplomas-assinar', - () => { - this.LoadCounts(); - console.log('refresh with notification') - } - ) - this.NotificationsService.registerCallback( - 'diplomas', - () => { - this.LoadCounts(); - console.log('refresh with notification') - } - ) - this.NotificationsService.registerCallback( - 'expedientes-pr', - () => { - this.LoadCounts(); - console.log('refresh with notification') - } - ) + // this.NotificationsService.registerCallback({ + // type:'despachos', + // funx:() => { + // // this.loadCount(); + // console.log('refresh with notification') + // } + // }) + // this.NotificationsService.registerCallback({ + // type:'*', + // funx:() => { + // // this.LoadCounts(); + // console.log('refresh with notification *') + // } + // }) + + // this.NotificationsService.registerCallback({ + // type:'despachos-pr', + // funx:() => { + // // this.LoadCounts(); + // console.log('refresh with notification') + // } + // }) + // this.NotificationsService.registerCallback({ + // type:'expediente', + // funx: () => { + // this.LoadCounts(); + // console.log('refresh with notification') + // } + // }) + // this.NotificationsService.registerCallback({ + // type:'gabinete-digital', + // funx:() => { + // this.LoadCounts(); + // console.log('refresh with notification') + // } + // }) + // this.NotificationsService.registerCallback({ + // type:'parecer', + // funx: () => { + // this.LoadCounts(); + // console.log('refresh with notification') + // } + // }) + // this.NotificationsService.registerCallback({ + // type: 'deferimento', + // funx: () => { + // this.LoadCounts(); + // console.log('refresh with notification') + // } + // }) + // this.NotificationsService.registerCallback({ + // type: 'diplomas-assinar', + // funx: () => { + // this.LoadCounts(); + // console.log('refresh with notification') + // } + // }) + // this.NotificationsService.registerCallback({ + // type: 'diplomas', + // funx: () => { + // this.LoadCounts(); + // console.log('refresh with notification') + // } + // }) + // this.NotificationsService.registerCallback({ + // type: 'expedientes-pr', + // funx: () => { + // this.LoadCounts(); + // console.log('refresh with notification') + // } + // }) } @@ -570,7 +586,19 @@ export class GabineteDigitalPage implements OnInit { updateAllProcess() { this.AllProcess = this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento) .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr).concat(this.despachoStore.list) - // .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList) + .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList).concat(this.pendentesstore.list) + + // try{ + // this.workerList.postMessage([ + // this.expedientegbstore.list,this.pedidosstore.listparecer,this.pedidosstore.listdeferimento, + // this.despachoprstore.list, this.eventoaprovacaostore.listmd, this.eventoaprovacaostore.listpr, this.despachoStore.list, + // this.deplomasStore.diplomasParaAssinarList, this.deplomasStore.diplomasAssinadoList, this.deplomasStore.DiplomaGerarList + // ]) + // } catch (e) { + // this.AllProcess = this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento) + // .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr).concat(this.despachoStore.list) + // .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList) + // } } get getAllProcessCount() { diff --git a/src/app/pages/gabinete-digital/list.worker.js b/src/app/pages/gabinete-digital/list.worker.js new file mode 100644 index 000000000..adcecfb94 --- /dev/null +++ b/src/app/pages/gabinete-digital/list.worker.js @@ -0,0 +1,10 @@ +onmessage = function(oEvent) { + + + const list = Event.data + var a = [] + postMessage( + a.concat.apply([], [list]) + ); + +}; \ No newline at end of file diff --git a/src/app/pages/inactivity/inactivity.page.html b/src/app/pages/inactivity/inactivity.page.html index 9357d666e..88a12aaf3 100644 --- a/src/app/pages/inactivity/inactivity.page.html +++ b/src/app/pages/inactivity/inactivity.page.html @@ -7,8 +7,8 @@
diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html index 60acee88b..0513e99e6 100644 --- a/src/app/pages/login/login.page.html +++ b/src/app/pages/login/login.page.html @@ -7,9 +7,9 @@
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 246760293..fa40f36f4 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -123,6 +123,7 @@ export class LoginPage implements OnInit { if (attempt.UserId == SessionStore.user.UserId) { await this.authService.SetSession(attempt, this.userattempt); + this.changeProfileService.run(); if(attempt.ChatData) { diff --git a/src/app/pages/publications/edit-action/edit-action.page.ts b/src/app/pages/publications/edit-action/edit-action.page.ts index 59517d6af..714f77c3c 100644 --- a/src/app/pages/publications/edit-action/edit-action.page.ts +++ b/src/app/pages/publications/edit-action/edit-action.page.ts @@ -25,7 +25,7 @@ export class EditActionPage implements OnInit { public minDate = new Date().toISOString() public maxDate: any; public stepHour = 1; - public stepMinute = 5; + public stepMinute = 15; public stepSecond = 5; public dateControlStart = new FormControl(moment("DD MM YYYY hh")); public dateControlEnd = new FormControl(moment("DD MM YYYY hh")); diff --git a/src/app/pages/publications/new-action/new-action.page.html b/src/app/pages/publications/new-action/new-action.page.html index e1410f6c7..853c838b8 100644 --- a/src/app/pages/publications/new-action/new-action.page.html +++ b/src/app/pages/publications/new-action/new-action.page.html @@ -44,7 +44,7 @@ [formControl]="dateControlStart" [disabled]="disabled" > - + - + this.currentDate.getTime())) { + if ((this.folder.DateBegin < this.folder.DateEnd)) { validado = true; - }else{ + } else { validado = false; } return validado == true ? ['ok']: []; @@ -111,8 +111,8 @@ export class NewActionPage implements OnInit { runValidation() { this.validateFrom = true; - if(new Date(this.folder.DateBegin).toISOString() > new Date(this.folder.DateEnd).toISOString()){ - this.toastService.badRequest("A data de início não pode ser superior a data de fim"); + if(new Date(this.folder.DateBegin).getTime() > new Date(this.folder.DateEnd).getTime()){ + this.toastService._badRequest("A data de início não pode ser superior a data de fim"); } } @@ -171,4 +171,42 @@ export class NewActionPage implements OnInit { this.modalController.dismiss(); } + + roundTimeQuarterHour() { + var timeToReturn = new Date(); + var minutes = timeToReturn.getMinutes(); + var hours = timeToReturn.getHours(); + + var m = (Math.round(minutes/15) * 15) % 60; + var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours; + + if (m == 0) { + if(minutes > m){ + m = m + 15; + } + timeToReturn.setHours(h); + timeToReturn.setMinutes(m); + }else{ + if(minutes > m) { + + m = m + 15; + + timeToReturn.setHours(h); + timeToReturn.setMinutes(m); + }else { + timeToReturn.setHours(h); + timeToReturn.setMinutes(m); + } + } + + return timeToReturn; + } + + setStartDate(){ + this.dateControlStart = new FormControl(moment(this.roundTimeQuarterHour())); + } + + setEndDate(){ + this.dateControlEnd = this.dateControlStart; + } } diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index e08e53da1..baf605d77 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -44,7 +44,7 @@ export class NewPublicationPage implements OnInit { public minDate = new Date().toISOString().slice(0, 10) public endMinDate = new Date(new Date().getTime() + 15 * 60000); public stepHour = 1; - public stepMinute = 5; + public stepMinute = 15; public stepSecond = 5; public color: ThemePalette = 'primary'; diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 43c3d51b6..ed4d18038 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -15,7 +15,7 @@
- +
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index 6762f50a2..a8ffc6082 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -24,7 +24,7 @@ import { PermissionService } from 'src/app/services/permission.service'; styleUrls: ['./publications.page.scss'], }) export class PublicationsPage implements OnInit { - showLoader: boolean; + showLoader: boolean = false publicationFolder: PublicationFolder; publication: Publication; @@ -57,7 +57,6 @@ export class PublicationsPage implements OnInit { hideRefreshBtn = true; showSlidingOptions = true; idSelected: string; - skeletonLoader: boolean; constructor( private router: Router, @@ -138,13 +137,10 @@ export class PublicationsPage implements OnInit { return this.theDate.getDate() + " de " + (this.months[this.theDate.getMonth()]) + " de " + this.theDate.getFullYear() } - loadList = false getActions() { - if(this.loadList == false) { - this.loadList = true + if(this.showLoader == false) { this.showLoader = true; - this.skeletonLoader = true; this.publications.GetPublicationFolderList().subscribe(async res => { const folders: PublicationFolder[] = this.getPublicationFolderMap(res) @@ -162,13 +158,9 @@ export class PublicationsPage implements OnInit { } this.showLoader = false; - this.skeletonLoader = false; - this.loadList = false }, (error) => { this.showLoader = false; - this.skeletonLoader = false; - this.loadList = false }); } @@ -268,8 +260,9 @@ export class PublicationsPage implements OnInit { } finally { loader.remove() + this.refreshing() } - this.refreshing() + } async AddPublicationFolder(item?: any) { diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index c6e78e75d..c9785f51b 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -27,29 +27,35 @@
-
- +
-
+ +
-
+ + +
+ + +
@@ -102,7 +108,14 @@
-
+ +
+ + Todos + {{ searchDocuments.length }} +
+ +
{{ category.Name }} {{ category.Qtd }} diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index b06bcb2c8..e7a892237 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -11,6 +11,7 @@ import { DocumentDetailPage } from 'src/app/modals/document-detail/document-deta import { SearchCategory, SearchList } from 'src/app/models/search-document'; import { ThemeService } from 'src/app/services/theme.service' import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; +import { Router } from '@angular/router'; @Component({ selector: 'app-search', @@ -62,7 +63,8 @@ export class SearchPage implements OnInit { private search: SearchService, private modalCtrl: ModalController, private navParams: NavParams, - public ThemeService: ThemeService) + public ThemeService: ThemeService, + private router: Router) { this.ordinance = "recent"; this.currentPath= window.location.pathname; @@ -166,9 +168,7 @@ export class SearchPage implements OnInit { wordCloud() { - this.search.mostSeachWord("15").subscribe(res=>{ - - console.log('LOAD LIST'); + this.search.mostSeachWord("15").subscribe( res => { const highest= res[0].Hits; const lowest = res[res.length-1].Hits; @@ -191,7 +191,6 @@ export class SearchPage implements OnInit { }); this.list = list - console.log('set list') const elem = document.documentElement.querySelector('.most-searched-word-container'); @@ -213,7 +212,7 @@ export class SearchPage implements OnInit { loadWordCloud() { - setTimeout(()=>{ + setTimeout(() => { const elem = document.documentElement.querySelector('.most-searched-word-container'); WordCloud( @@ -386,7 +385,7 @@ export class SearchPage implements OnInit { let counter = 0; this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender - ,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{ + ,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res => { res.Categories.forEach( e => { e['Active'] = false; this.searchCategories.push(e) @@ -426,7 +425,7 @@ export class SearchPage implements OnInit { }); this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender - ,this.searchOrganicEntiry, this.searchDocTypeId, '361').subscribe(res=>{ + ,this.searchOrganicEntiry, this.searchDocTypeId, '361').subscribe(res => { res.Categories.forEach( e => { e['Active'] = false; @@ -442,7 +441,7 @@ export class SearchPage implements OnInit { this.reorderList(this.ordinance); // hide show document - if(this.searchDocuments.length >= 1){ + if(this.searchDocuments.length >= 1) { this.showDocuments = true; } else { this.showDocuments = false @@ -544,7 +543,7 @@ export class SearchPage implements OnInit { counter++; - if(counter ==2){ + if(counter ==2) { this.showLoader = false; } @@ -552,7 +551,7 @@ export class SearchPage implements OnInit { },error => { counter++; - if(counter ==2){ + if(counter ==2) { this.showLoader = false; } this.searchResult = "Registo não encontrado" @@ -561,9 +560,13 @@ export class SearchPage implements OnInit { } } - else if (this.type == "AccoesPresidenciais"){ + else if (this.type == "AccoesPresidenciais") { + + let counter = 0; this.showLoader = true; + this.searchCategories = [] + this.searchDocuments = [] this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender ,this.searchOrganicEntiry, this.searchDocTypeId, '386').subscribe(res=>{ @@ -571,12 +574,18 @@ export class SearchPage implements OnInit { res.Categories.forEach( e => { e['Active'] = false; + e['Name'] = "Publicações" }); // bind respose - this.searchCategories = res.Categories; + for ( const a of res.Categories) { + this.searchCategories.push(a); + } - this.searchDocuments = this.sortArrayISODate(res.Documents); + for ( const a of this.sortArrayISODate(res.Documents)) { + a.DocTypeDesc = "Publicações" + this.searchDocuments.push(a); + } this.reorderList(this.ordinance); @@ -587,13 +596,71 @@ export class SearchPage implements OnInit { this.showDocuments = false } - this.showLoader = false; + counter++; + + if(counter ==2){ + this.showLoader = false; + } + this.loadWordCloud(); },error => { - this.showLoader = false; + counter++; + + if(counter ==2){ + this.showLoader = false; + } this.searchResult = "Registo não encontrado" console.log(error) }); + + + + this.search.basicSearchPublication(this.searchSubject, this.searchDocumentDate, this.searchSender + ,this.searchOrganicEntiry, this.searchDocTypeId, '386').subscribe(res => { + + + res.Categories.forEach( e => { + e['Active'] = false; + e['Name'] = "Acções" + }); + + // bind respose + for ( const a of res.Categories) { + this.searchCategories.push(a); + } + + + + for ( const a of this.sortArrayISODate(res.Documents)) { + a.DocTypeDesc = "Acções" + this.searchDocuments.push(a); + } + + this.reorderList(this.ordinance); + + // hide show document + if(this.searchDocuments.length >= 1) { + this.showDocuments = true; + } else { + this.showDocuments = false + } + + counter++; + + if(counter ==2) { + this.showLoader = false; + } + this.loadWordCloud(); + }, error => { + counter++; + + if(counter ==2) { + this.showLoader = false; + } + this.searchResult = "Registo não encontrado" + console.log(error) + }); + } } @@ -636,7 +703,7 @@ export class SearchPage implements OnInit { } } - clearInputRemetente(){ + clearInputRemetente() { this.searchSender = ""; } @@ -704,6 +771,7 @@ export class SearchPage implements OnInit { } + TodosCategory = true async filterDocList(categoryName:string){ // show all category @@ -716,6 +784,27 @@ export class SearchPage implements OnInit { } this.showCategory = categoryName; + + for(let category of this.searchCategories) { + if(category['Active']) { + this.TodosCategory = false + return false + } + } + + this.TodosCategory = true + + } + + + noFilter() { + this.TodosCategory = true + let n = 0 + for(let category of this.searchCategories) { + this.searchCategories[n]['Active'] = false + n++ + } + this.showSearchDocuments = this.searchDocuments; } @@ -735,6 +824,7 @@ export class SearchPage implements OnInit { const ApplicationType = searchDocument.ApplicationType.toString() const Id = searchDocument.Id const CalendarId = searchDocument.ApplicationName.split(':')[1] + const DocTypeDesc = searchDocument.DocTypeDesc if(this.select == false) { if(this.type == "Agenda") { @@ -754,31 +844,41 @@ export class SearchPage implements OnInit { } else if(this.type == "AccoesPresidenciais") { - this.viewPublicationDetail(Id); + this.viewPublicationDetail(Id, DocTypeDesc); } else if(this.type == "AccoesPresidenciais & ArquivoDespachoElect") { - if(ApplicationType == '8' || ApplicationType == '361') { - + // 361 + if(ApplicationType == '8') { this.viewDocumentDetail(Id, ApplicationType); + } else if (ApplicationType == '361') { + this.viewDocumentModal(searchDocument) } } } } - async viewPublicationDetail(publicationId:string) { - const modal = await this.modalController.create({ - component: PublicationDetailPage, - componentProps:{ - publicationId: publicationId, - isModal: true - }, - cssClass: 'publication-detail modal modal-desktop ', - //backdropDismiss: false - }); + async viewPublicationDetail(publicationId:string, DocTypeDesc) { + // validation my friend + + if(DocTypeDesc == 'Acções') { + this.router.navigate(['/home/publications', publicationId]); + } else if( DocTypeDesc == 'Publicações') { + const modal = await this.modalController.create({ + component: PublicationDetailPage, + componentProps:{ + publicationId: publicationId, + isModal: true + }, + cssClass: 'publication-detail modal modal-desktop ', + //backdropDismiss: false + }); + + await modal.present(); + modal.onDidDismiss().then(()=>{}); + } + - await modal.present(); - modal.onDidDismiss().then(()=>{}); } @@ -805,4 +905,41 @@ export class SearchPage implements OnInit { } + + async viewDocumentModal(LoadedDocument) { + + let task = { + serialNumber: '', + taskStartDate: '', + isEvent: true, + workflowInstanceDataFields: { + FolderID: '', + Subject: LoadedDocument.SourceName || LoadedDocument.Assunto, + SourceSecFsID: LoadedDocument.ApplicationId || LoadedDocument.ApplicationType, + SourceType: 'DOC', + SourceID: LoadedDocument.Id || LoadedDocument.Id, + DispatchNumber: '' + } + } + + const modal = await this.modalController.create({ + component: ViewDocumentPage, + componentProps: { + trustedUrl: '', + file: { + title: task.workflowInstanceDataFields.Subject, + url: '', + title_link: '', + }, + Document: LoadedDocument, + applicationId: task.workflowInstanceDataFields.SourceSecFsID, + docId: task.workflowInstanceDataFields.SourceID , + folderId: '', + task: task + }, + cssClass: 'modal modal-desktop' + }); + await modal.present(); + } + } diff --git a/src/app/pipes/expediente-task.pipe.ts b/src/app/pipes/expediente-task.pipe.ts index e5dc66e06..39d756770 100644 --- a/src/app/pipes/expediente-task.pipe.ts +++ b/src/app/pipes/expediente-task.pipe.ts @@ -9,7 +9,7 @@ export class ExpedienteTaskPipe implements PipeTransform { transform(fullTask: ExpedienteFullTask): ExpedienteTask { let date = new Date(fullTask.taskStartDate); - date.setMonth(date.getMonth() + 1); + date.setMonth(date.getMonth()); let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); return { diff --git a/src/app/services/attachments.service.ts b/src/app/services/attachments.service.ts index fd67ce1ee..a0671c00d 100644 --- a/src/app/services/attachments.service.ts +++ b/src/app/services/attachments.service.ts @@ -24,22 +24,16 @@ export class AttachmentsService { private changeProfileService: ChangeProfileService) { this.changeProfileService.registerCallback(() => { - this.loggeduser = SessionStore.user - this.headers = new HttpHeaders(); - - this.headers = this.headers.set('Authorization', SessionStore.user.BasicAuthKey); - }) - this.changeProfileService.registerLoginCallback(() => { - this.loggeduser = SessionStore.user - this.headers = new HttpHeaders(); - - this.headers = this.headers.set('Authorization', SessionStore.user.BasicAuthKey); - }) + this.setHeader() + }); + this.setHeader() + } + + setHeader() { this.loggeduser = SessionStore.user this.headers = new HttpHeaders(); this.headers = this.headers.set('Authorization', SessionStore.user.BasicAuthKey); - } uploadFile(formData:any) { diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index 8238ca1b8..b1184a9a1 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -25,7 +25,7 @@ import { ChatSystemService } from 'src/app/services/chat/chat-system.service'; export class AuthService { userData$ = new BehaviorSubject(''); userId$ = new BehaviorSubject(''); - headers: HttpHeaders; + headers: HttpHeaders = new HttpHeaders(); public wsValidatedUserChat:any; public isWsAuthenticated: boolean = false; opts:any; @@ -43,9 +43,7 @@ export class AuthService { private storage: Storage, private initialsService: InitialsService, public p: PermissionService, - public ChatSystemService: ChatSystemService, ) { - - this.headers = new HttpHeaders(); + public ChatSystemService: ChatSystemService) { if (SessionStore.exist) { if(this.p.userPermission(this.p.permissionList.Chat.access) == true ) { @@ -82,6 +80,8 @@ export class AuthService { } + // async UpdateLogin() {} + SetSession(response: LoginUserRespose, user:UserForm) { const session: UserSession = Object.assign(SessionStore.user, response) diff --git a/src/app/services/chat/chat-methods.service.ts b/src/app/services/chat/chat-methods.service.ts index 379d048b5..abb25e3a4 100644 --- a/src/app/services/chat/chat-methods.service.ts +++ b/src/app/services/chat/chat-methods.service.ts @@ -25,6 +25,7 @@ export class ChatMethodsService { "end_date": data.end, "venue": data.venue, "id": data.id, + "calendarId": data.calendarId } } } diff --git a/src/app/services/chat/chat-system.service.ts b/src/app/services/chat/chat-system.service.ts index 07c820cfb..37a5d0d16 100644 --- a/src/app/services/chat/chat-system.service.ts +++ b/src/app/services/chat/chat-system.service.ts @@ -18,7 +18,6 @@ import { ChatMethodsService } from './chat-methods.service'; import { AESEncrypt } from '../aesencrypt.service' import { AttachmentsService } from 'src/app/services/attachments.service'; import { NetworkServiceService} from 'src/app/services/network-service.service'; -import { JsonStore } from '../jsonStore.service'; import { ViewedMessageService } from './viewed-message.service' @Injectable({ providedIn: 'root' @@ -97,7 +96,7 @@ export class ChatSystemService { } loadChat() { - if(SessionStore.user.ChatData) { + if(SessionStore.user?.ChatData?.data) { this.ReLoadChat() } } @@ -185,14 +184,18 @@ export class ChatSystemService { async getAllRooms () { this.loadingWholeList = true var rooms; - try { - rooms = await this.RochetChatConnectorService.getRooms(); - } catch (error) { - console.error('chatgetrooms',error) - } + + if(this.RochetChatConnectorService.isLogin) { try { - await this.storage.remove('Rooms'); - } catch(e) {} + rooms = await this.RochetChatConnectorService.getRooms(); + } catch (error) { + this.loadingWholeList = false + console.error('chatgetrooms',error) + } + try { + await this.storage.remove('Rooms'); + } catch(e) {} + } let index = 0 @@ -317,8 +320,12 @@ export class ChatSystemService { this.defaultSubtribe(id) } - this.RochetChatConnectorService.streamNotifyLogged().then((subscription=>{ - + this.RochetChatConnectorService.streamNotifyLogged().then((subscription => { + console.log(subscription) + })) + + this.RochetChatConnectorService.subStreamMessageUser().then((subscription => { + console.log(subscription) })) } @@ -407,7 +414,7 @@ export class ChatSystemService { let roomId = this.getRoomId(roomData); - if (setData.name != 'Rocket Cat') { + if (setData.name != 'Rocket Cat' && setData.name != 'general' ) { // create room if(!this.roomExist(roomId)) { let room:RoomService = new RoomService(this.RochetChatConnectorService, new MessageService(this.NfService, this.RochetChatConnectorService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService, this.NetworkServiceService, this), this.storage, this.platform, this.sqlservice, this.NativeNotificationService, this.sortService, this.ChatService, this.NfService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService, this.NetworkServiceService, this, this.ViewedMessageService) @@ -615,7 +622,7 @@ export class ChatSystemService { return !roomData.fname } - getUsers = () =>{ + getUsers = () => { return this.users } diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts index 5926dbdee..6e8231bce 100644 --- a/src/app/services/chat/message.service.ts +++ b/src/app/services/chat/message.service.ts @@ -61,6 +61,9 @@ export class MessageService { downloadAttachmentsTemp = 0; UploadAttachmentsTemp = 0; manualRetry = false + origin: 'history' | 'stream' | 'local' + + rowInstance: MessageModel constructor( private NfService: NfService, @@ -72,7 +75,7 @@ export class MessageService { private ChatSystemService: ChatSystemService) { } - setData({customFields = {}, channels, mentions, msg ,rid ,ts, u, t, _id, id, _updatedAt, file, attachments, temporaryData, localReference = 'out-'+uuidv4() , viewed = [], received = [], delate = false, delateRequest =false, from, sendAttempt = 0 }:Message) { + setData({customFields = {}, channels, mentions, msg ,rid ,ts, u, t, _id, id, _updatedAt, file, attachments, temporaryData, localReference = 'out-'+uuidv4() , viewed = [], received = [], delate = false, delateRequest =false, from, sendAttempt = 0, origin }:Message) { this.channels = channels || [] this.mentions = mentions || [] @@ -90,6 +93,7 @@ export class MessageService { this.delate = delate this.delateRequest = delateRequest this.sendAttempt = 0 + this.origin = origin if(this.attachments?.length >= 1 && attachments?.length >= 1) { this.attachments[0] = Object.assign(this.attachments[0], attachments[0]) @@ -257,6 +261,7 @@ export class MessageService { } catch (error) { this.uploadingFile = false this.errorUploadingAttachment = true + this.UploadAttachmentsTemp++ console.error('beforeSendAttachment error:', error) } @@ -441,9 +446,11 @@ export class MessageService { async delateDB() { - const message = await MessageModel.get({id: this.id}) - await message.delete() + if(!this.rowInstance) { + this.rowInstance = await this.getRowInstance() + } + await this.rowInstance.delete() } @@ -467,6 +474,7 @@ export class MessageService { u: this.u, _id: this._id, id: this.id, + origin: this.origin, _updatedAt: this._updatedAt, messageSend: this.messageSend, offline: this.offline, @@ -489,6 +497,7 @@ export class MessageService { delete message.id const createdMessage = await MessageModel.create(message) + this.rowInstance = createdMessage this.id = createdMessage.id if(this.earlySave) { @@ -497,8 +506,8 @@ export class MessageService { } } - async saveChanges() { + async getRowInstance () { if(this.save) { const message = this.getChatObj() @@ -516,12 +525,29 @@ export class MessageService { a = await MessageModel.get({id: this.id}) } - if(a) { - for( const [name, value] of Object.entries(message)) { - a[name] = value - } - await a.save() + return a + } + + } + + async saveChanges() { + + if(!this.rowInstance) { + this.rowInstance = await this.getRowInstance() + } + + if(this.save && this.rowInstance) { + const message = this.getChatObj() + + if(!message.id) { + delete message.id } + + for( const [name, value] of Object.entries(message)) { + this.rowInstance[name] = value + } + + await this.rowInstance.save() } else { this.earlySave = true diff --git a/src/app/services/chat/rochet-chat-connector.service.ts b/src/app/services/chat/rochet-chat-connector.service.ts index 449c65b97..c4832f22b 100644 --- a/src/app/services/chat/rochet-chat-connector.service.ts +++ b/src/app/services/chat/rochet-chat-connector.service.ts @@ -437,6 +437,63 @@ export class RochetChatConnectorService { } + + subStreamNotifyUser(param?: any) { + + const requestId = uuidv4() + + let message = { + msg: "sub", + id: requestId, + name: "stream-notify-user", + params:[ + `${SessionStore.user.ChatData.data.userId}/notification`, + param + ] + } + + + this.ws.send({message, requestId}) + + return new Promise((resolve, reject) => { + this.ws.registerCallback({type:'Onmessage', funx:(message)=>{ + if(message.id == requestId ) { // same request send + resolve(message) + return true + } + }}) + }); + + } + + subStreamMessageUser(param?: any) { + + const requestId = uuidv4() + + let message = { + msg: "sub", + id: requestId, + name: "stream-notify-user", + params:[ + `${SessionStore.user.ChatData.data.userId}/message`, + param + ] + } + + + this.ws.send({message, requestId}) + + return new Promise((resolve, reject) => { + this.ws.registerCallback({type:'Onmessage', funx:(message)=>{ + if(message.id == requestId ) { // same request send + resolve(message) + return true + } + }}) + }); + + } + receiveStreamNotifyRoom(funx: Function) { this.ws.registerCallback({ diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts index a5a4d20ca..982ee860d 100644 --- a/src/app/services/chat/room.service.ts +++ b/src/app/services/chat/room.service.ts @@ -275,18 +275,25 @@ export class RoomService { if(message.fields.eventName == this.id+'/'+'typing') { const args = message.fields.args - + if (typeof args[1] != 'object') { this.userThatIsTyping = this.usernameToDisplayName(args[0]) this.isTyping = args[1] this.otherUserType = args[1] - this.readAllMessage() + const user = args[0] + if(SessionStore.user.UserName != user) { + this.readAllMessage() + } } else if(args[0]?.method == 'viewMessage' || args[1]?.method == 'viewMessage') { - - this.readAllMessage() + const user = args[0] + + if(SessionStore.user.UserName != user) { + this.readAllMessage() + } + } else if(args[0]?.method == 'deleteMessage' || args[1]?.method == 'deleteMessage') { this.deleteMessage(args[1]?.method?._id) @@ -295,7 +302,6 @@ export class RoomService { } - } else if (message.fields.eventName == this.id+'/'+'deleteMessage') {} }) @@ -313,6 +319,7 @@ export class RoomService { if(!found) { + ChatMessage.origin = 'stream' const message = await this.prepareCreate({message: ChatMessage, save: true}); this.registerSendMessage(message) @@ -445,7 +452,13 @@ export class RoomService { "stream-notify-room", async (ChatMessage) => { const DeletedMessageId = ChatMessage.fields.args[0]._id; - this.deleteMessage(DeletedMessageId) + + const message = this.messages.find((e) => e._id == DeletedMessageId) + + if(message.delate == false) { + this.deleteMessage(DeletedMessageId) + } + } ) } @@ -556,7 +569,8 @@ export class RoomService { attachments, file, temporaryData, - localReference + localReference, + origin: 'local' } this.message= '' @@ -657,6 +671,7 @@ export class RoomService { // this.typing(this.message) this.chatOpen = true this.messageUnread = false + this.sendReadMessage() } @@ -737,6 +752,7 @@ export class RoomService { for(let message of chatHistory.result.messages.reverse()) { if (!messagesId.includes(message._id)) { + message.origin = 'history' const messagesToSave = await this.prepareMessageCreateIfNotExist({message: message}); if(messagesToSave != null) { diff --git a/src/app/services/chat/viewed-message.service.ts b/src/app/services/chat/viewed-message.service.ts index 7266b57ae..9411d766d 100644 --- a/src/app/services/chat/viewed-message.service.ts +++ b/src/app/services/chat/viewed-message.service.ts @@ -27,9 +27,9 @@ export class ViewedMessageService { for(let id of membersIds) { if(message.addReceived(id)) { n++ - setTimeout(async() => { + // setTimeout(async() => { await message.saveChanges() - }, 100 * n) + // }, 100 * n) } } } @@ -56,9 +56,9 @@ export class ViewedMessageService { if(message.addViewed(id)) { message.addReceived(id) n++ - setTimeout(async() => { + // setTimeout(async() => { await message.saveChanges() - }, 100 * n) + // }, 100 * n) } } diff --git a/src/app/services/contacts.service.ts b/src/app/services/contacts.service.ts index 55ce44b25..f555d9605 100644 --- a/src/app/services/contacts.service.ts +++ b/src/app/services/contacts.service.ts @@ -6,6 +6,7 @@ import { environment } from 'src/environments/environment'; import { AuthService } from '../services/auth.service'; import { LoginUserRespose } from '../models/user.model'; import { SessionStore } from '../store/session.service'; +import { ChangeProfileService } from './change-profile.service'; @Injectable({ providedIn: 'root' @@ -16,7 +17,18 @@ export class ContactsService { loggeduser: LoginUserRespose; headers: HttpHeaders; - constructor(private http: HttpClient, user: AuthService) { + constructor( + private http: HttpClient, + user: AuthService, + private changeProfileService: ChangeProfileService) { + + this.setHeader() + this.changeProfileService.registerCallback(() => { + this.setHeader() + }) + } + + setHeader() { this.loggeduser = SessionStore.user; this.headers = new HttpHeaders(); this.headers = this.headers.set('Authorization', this.loggeduser.BasicAuthKey); diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index c098c7df7..4681e0123 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -4,7 +4,6 @@ import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; import { Observable, from } from 'rxjs'; import { environment } from 'src/environments/environment'; import { AuthService } from '../services/auth.service'; -import { UserSession } from '../models/user.model'; import { EventList } from '../models/agenda/AgendaEventList'; import { ChangeProfileService } from './change-profile.service'; import { OfflineManagerService } from 'src/app/services/offline-manager.service'; @@ -20,7 +19,6 @@ import { SessionStore } from '../store/session.service'; export class EventsService { authheader = {}; - loggeduser: UserSession; headers: HttpHeaders; headersPrOficial: HttpHeaders; @@ -37,25 +35,17 @@ export class EventsService { headersSharedOficial: HttpHeaders; headersSharedPessoal: HttpHeaders; - - hasSharedCalendar = false - hasOwnCalendar = false - - + calendarIds = [] usersCalendarIds = [] + hasSharedCalendar = false; hasSharedOficial: boolean = false; hasSharedPessoal: boolean = false; + hasOwnOficial: boolean = false; hasOwnPessoal: boolean = false; - - - - userCalendarNameSharedOficial = ''; - userCalendarNameSharedPessoal = ''; - userCalendarNameOwnOficial = ''; - userCalendarNameOwnPessoal = ''; + hasOwnCalendar = false calendarNames = {} @@ -73,7 +63,14 @@ export class EventsService { private storage: Storage, private backgroundservice: BackgroundService) { - this.loggeduser = SessionStore.user; + this.setHeader() + this.changeProfileService.registerCallback(() => { + this.setHeader() + }) + + } + + async setHeader () { this.headers = new HttpHeaders(); this.headersMdOficial = new HttpHeaders(); @@ -92,16 +89,14 @@ export class EventsService { this.headerSharedOficial= new HttpHeaders(); this.headerSharedPessoal= new HttpHeaders(); + this.headers = this.headers.set('Authorization', SessionStore.user.BasicAuthKey); - this.setHeader() - this.changeProfileService.registerCallback(() => { - this.loggeduser = SessionStore.user; - this.setHeader() - }) - - } - - async setHeader () { + this.usersCalendarIds = []; + this.calendarNames = {} + this.calendarIds = [] + + this.calendarNamesAry = [] + this.calendarNamesType = {} this.hasSharedCalendar = false this.hasSharedOficial = false @@ -110,32 +105,11 @@ export class EventsService { this.hasOwnCalendar = false this.hasOwnOficial = false this.hasOwnPessoal = false - - this.headers = new HttpHeaders(); - this.headerOwnOficial= new HttpHeaders(); - this.headerOwnPessoal= new HttpHeaders(); - - this.headerSharedOficial= new HttpHeaders(); - this.headerSharedPessoal= new HttpHeaders(); + if (SessionStore.user) { + if (SessionStore.user.Profile == 'MDGPR') { - this.headers = this.headers.set('Authorization', this.loggeduser.BasicAuthKey); - - this.userCalendarNameSharedOficial = ''; - this.userCalendarNameSharedPessoal = ''; - this.userCalendarNameOwnOficial = ''; - this.userCalendarNameOwnPessoal = ''; - - this.usersCalendarIds = []; - this.calendarNames = {} - - this.calendarNamesAry = [] - this.calendarNamesType = {} - - if (this.loggeduser) { - if (this.loggeduser.Profile == 'MDGPR') { - - for (let calendar of this.loggeduser.OwnerCalendars) { + for (let calendar of SessionStore.user.OwnerCalendars) { this.hasAnyCalendar = false if (calendar.CalendarName == 'Oficial') { @@ -143,7 +117,7 @@ export class EventsService { this.hasOwnOficial = true - this.headersMdOficial = this.headersMdOficial.set('Authorization', this.loggeduser.BasicAuthKey); + this.headersMdOficial = this.headersMdOficial.set('Authorization', SessionStore.user.BasicAuthKey); this.headersMdOficial = this.headersMdOficial.set('CalendarId', calendar.CalendarId); this.headersMdOficial = this.headersMdOficial.set('CalendarRoleId', calendar.CalendarRoleId); } @@ -151,21 +125,21 @@ export class EventsService { this.hasOwnPessoal = true - this.headersMdPessoal = this.headersMdPessoal.set('Authorization', this.loggeduser.BasicAuthKey); + this.headersMdPessoal = this.headersMdPessoal.set('Authorization', SessionStore.user.BasicAuthKey); this.headersMdPessoal = this.headersMdPessoal.set('CalendarId', calendar.CalendarId); this.headersMdPessoal = this.headersMdPessoal.set('CalendarRoleId', calendar.CalendarRoleId); } } - for (let sharedCalendar of this.loggeduser.SharedCalendars) { + for (let sharedCalendar of SessionStore.user.SharedCalendars) { this.hasAnyCalendar = false if (sharedCalendar.CalendarName == 'Oficial') { this.hasSharedOficial = true - this.headersSharedOficial = this.headersSharedOficial.set('Authorization', this.loggeduser.BasicAuthKey); + this.headersSharedOficial = this.headersSharedOficial.set('Authorization', SessionStore.user.BasicAuthKey); this.headersSharedOficial = this.headersSharedOficial.set('CalendarId', sharedCalendar.CalendarId); this.headersSharedOficial = this.headersSharedOficial.set('CalendarRoleId', sharedCalendar.CalendarRoleId); } @@ -173,7 +147,7 @@ export class EventsService { this.hasSharedPessoal = true - this.headersSharedPessoal = this.headersSharedPessoal.set('Authorization', this.loggeduser.BasicAuthKey); + this.headersSharedPessoal = this.headersSharedPessoal.set('Authorization', SessionStore.user.BasicAuthKey); this.headersSharedPessoal = this.headersSharedPessoal.set('CalendarId', sharedCalendar.CalendarId); this.headersSharedPessoal = this.headersSharedPessoal.set('CalendarRoleId', sharedCalendar.CalendarRoleId); } @@ -181,15 +155,15 @@ export class EventsService { } - else if (this.loggeduser.Profile == 'PR') { + else if (SessionStore.user.Profile == 'PR') { - for (let calendar of this.loggeduser.OwnerCalendars) { + for (let calendar of SessionStore.user.OwnerCalendars) { this.hasAnyCalendar = false if (calendar.CalendarName == 'Oficial') { this.hasOwnOficial = true - this.headersPrOficial = this.headersPrOficial.set('Authorization', this.loggeduser.BasicAuthKey); + this.headersPrOficial = this.headersPrOficial.set('Authorization', SessionStore.user.BasicAuthKey); this.headersPrOficial = this.headersPrOficial.set('CalendarId', calendar.CalendarId); this.headersPrOficial = this.headersPrOficial.set('CalendarRoleId', calendar.CalendarRoleId); } @@ -197,7 +171,7 @@ export class EventsService { this.hasOwnPessoal = true - this.headersPrPessoal = this.headersPrPessoal.set('Authorization', this.loggeduser.BasicAuthKey); + this.headersPrPessoal = this.headersPrPessoal.set('Authorization', SessionStore.user.BasicAuthKey); this.headersPrPessoal = this.headersPrPessoal.set('CalendarId', calendar.CalendarId); this.headersPrPessoal = this.headersPrPessoal.set('CalendarRoleId', calendar.CalendarRoleId); @@ -206,7 +180,7 @@ export class EventsService { } - for (let calendar of this.loggeduser.OwnerCalendars) { + for (let calendar of SessionStore.user.OwnerCalendars) { this.hasAnyCalendar = false if(!this.usersCalendarIds.includes(calendar.OwnerUserId)) { this.usersCalendarIds.push(calendar.OwnerUserId) @@ -222,7 +196,7 @@ export class EventsService { this.hasOwnOficial = true - this.headerOwnOficial = this.headerOwnOficial.set('Authorization', this.loggeduser.BasicAuthKey); + this.headerOwnOficial = this.headerOwnOficial.set('Authorization', SessionStore.user.BasicAuthKey); this.headerOwnOficial = this.headerOwnOficial.set('CalendarId', calendar.CalendarId); this.headerOwnOficial = this.headerOwnOficial.set('CalendarRoleId', calendar.CalendarRoleId); this.headerOwnOficial = this.headerOwnOficial.set('CalendarName', calendar.CalendarName); @@ -231,14 +205,14 @@ export class EventsService { this.hasOwnPessoal = true - this.headerOwnPessoal = this.headerOwnPessoal.set('Authorization', this.loggeduser.BasicAuthKey); + this.headerOwnPessoal = this.headerOwnPessoal.set('Authorization', SessionStore.user.BasicAuthKey); this.headerOwnPessoal =this.headerOwnPessoal.set('CalendarId', calendar.CalendarId); this.headerOwnPessoal =this.headerOwnPessoal.set('CalendarRoleId', calendar.CalendarRoleId); this.headerOwnPessoal = this.headerOwnPessoal.set('CalendarName', calendar.CalendarName); } } - for (let sharedCalendar of this.loggeduser.SharedCalendars) { + for (let sharedCalendar of SessionStore.user.SharedCalendars) { this.hasAnyCalendar = false if(!this.usersCalendarIds.includes(sharedCalendar.OwnerUserId)) { @@ -254,7 +228,7 @@ export class EventsService { if (sharedCalendar.CalendarName == 'Oficial') { this.hasSharedOficial = true - this.headerSharedOficial = this.headerSharedOficial.set('Authorization',this.loggeduser.BasicAuthKey); + this.headerSharedOficial = this.headerSharedOficial.set('Authorization',SessionStore.user.BasicAuthKey); this.headerSharedOficial = this.headerSharedOficial.set('CalendarId', sharedCalendar.CalendarId); this.headerSharedOficial = this.headerSharedOficial.set('CalendarRoleId', sharedCalendar.CalendarRoleId); this.headerSharedOficial = this.headerSharedOficial.set('CalendarName', sharedCalendar.CalendarName); @@ -263,7 +237,7 @@ export class EventsService { this.hasSharedPessoal = true - this.headerSharedPessoal = this.headerSharedPessoal.set('Authorization',this.loggeduser.BasicAuthKey); + this.headerSharedPessoal = this.headerSharedPessoal.set('Authorization',SessionStore.user.BasicAuthKey); this.headerSharedPessoal = this.headerSharedPessoal.set('CalendarId', sharedCalendar.CalendarId); this.headerSharedPessoal = this.headerSharedPessoal.set('CalendarRoleId', sharedCalendar.CalendarRoleId); this.headerSharedPessoal = this.headerSharedPessoal.set('CalendarName', sharedCalendar.CalendarName); @@ -271,7 +245,7 @@ export class EventsService { } - for (let sharedCalendar of this.loggeduser.SharedCalendars) { + for (let sharedCalendar of SessionStore.user.SharedCalendars) { this.hasAnyCalendar = false if(sharedCalendar?.OwnerUserId) { this.GetCalendarName(sharedCalendar.OwnerUserId).subscribe((e)=> { @@ -291,7 +265,7 @@ export class EventsService { } - for (let sharedCalendar of this.loggeduser.OwnerCalendars) { + for (let sharedCalendar of SessionStore.user.OwnerCalendars) { this.hasAnyCalendar = false this.calendarNames[sharedCalendar.CalendarId] = 'Meu calendario' @@ -326,13 +300,13 @@ export class EventsService { isMyEvent(event: any) { - for (let calendar of this.loggeduser.OwnerCalendars) { + for (let calendar of SessionStore.user.OwnerCalendars) { if(event.CalendarId == calendar.CalendarId) { return true } } - for (let sharedCalendar of this.loggeduser.SharedCalendars) { + for (let sharedCalendar of SessionStore.user.SharedCalendars) { if(event.CalendarId == sharedCalendar.CalendarId) { return false } @@ -438,12 +412,18 @@ export class EventsService { let prO = [], prP = []; - for (let calendar of this.loggeduser.OwnerCalendars) { + for (let calendar of SessionStore.user.OwnerCalendars) { if (calendar.CalendarName == 'Oficial') { prO = await this.getAllMdOficialEvents(startdate, enddate).toPromise(); + if(!Array.isArray(prO)) { + prO = [] + } } if(calendar.CalendarName == 'Pessoal') { prP = await this.getAllMdPessoalEvents(startdate, enddate).toPromise(); + if(!Array.isArray(prP)) { + prP = [] + } } } @@ -462,10 +442,16 @@ export class EventsService { if(this.hasOwnOficial) { ownO = await this.getAllOwnOficialEvents(startdate, enddate).toPromise(); + if(!Array.isArray(ownO)) { + ownO = [] + } } if(this.hasOwnPessoal) { ownP = await this.getAllOwnPessoalEvents(startdate, enddate).toPromise(); + if(!Array.isArray(ownP)) { + ownP = [] + } } const resFinal = ownO.concat(ownP); @@ -509,10 +495,10 @@ export class EventsService { let result = [] - for (let sharedCalendar of this.loggeduser.SharedCalendars) { + for (let sharedCalendar of SessionStore.user.SharedCalendars) { var header = new HttpHeaders(); - header = header.set('Authorization', this.loggeduser.BasicAuthKey); + header = header.set('Authorization', SessionStore.user.BasicAuthKey); header = header.set('CalendarId', sharedCalendar.CalendarId); header = header.set('CalendarRoleId', sharedCalendar.CalendarRoleId); header = header.set('CalendarName', sharedCalendar.CalendarName); @@ -579,7 +565,7 @@ export class EventsService { let prO = [], prP = []; - for(let calendar of this.loggeduser.SharedCalendars) { + for(let calendar of SessionStore.user.SharedCalendars) { if (calendar.CalendarName == 'Oficial') { prO = await this.getAllSharedOficialEvents(startdate, enddate).toPromise(); } @@ -596,8 +582,6 @@ export class EventsService { }); } - - getAllSharedOficialEvents(startdate: string, enddate: string): Observable { let geturl = environment.apiURL + 'calendar/pr'; geturl = geturl.replace('/V4/', '/V5/') @@ -733,10 +717,10 @@ export class EventsService { this.headers['CalendarName'] = event.CalendarName if (event.CalendarName == 'Oficial') { - if (this.loggeduser.Profile == 'MDGPR') { + if (SessionStore.user.Profile == 'MDGPR') { this.headers = this.headersMdOficial; } - else if (this.loggeduser.Profile == 'PR') { + else if (SessionStore.user.Profile == 'PR') { this.headers = this.headersPrOficial; } else { @@ -755,10 +739,10 @@ export class EventsService { } } else { - if (this.loggeduser.Profile == 'MDGPR') { + if (SessionStore.user.Profile == 'MDGPR') { this.headers = this.headersMdPessoal; } - else if (this.loggeduser.Profile == 'PR') { + else if (SessionStore.user.Profile == 'PR') { this.headers = this.headersPrPessoal; } else { @@ -904,7 +888,7 @@ export class EventsService { let options; - switch (this.loggeduser.Profile) { + switch (SessionStore.user.Profile) { case 'MDGPR': if (calendarName == 'Pessoal') { options = { @@ -962,7 +946,7 @@ export class EventsService { let options; - if(this.loggeduser.Profile == 'MDGPR') { + if(SessionStore.user.Profile == 'MDGPR') { if (calendarName == 'Pessoal') { options = { headers: this.headersMdPessoal, @@ -976,7 +960,7 @@ export class EventsService { }; } } - else if (this.loggeduser.Profile == 'PR') { + else if (SessionStore.user.Profile == 'PR') { if (calendarName == 'Pessoal') { options = { headers: this.headersPrPessoal, @@ -1038,7 +1022,7 @@ export class EventsService { params = params.set("SerialNumber", serialNumber); params = params.set("applicationID", applicationID); - switch (this.loggeduser.Profile) { + switch (SessionStore.user.Profile) { case 'MDGPR': if (body.CalendarName == 'Pessoal') { options = { @@ -1109,7 +1093,7 @@ export class EventsService { params = params.set("SerialNumber", serialNumber); params = params.set("applicationID", applicationID); - switch (this.loggeduser.Profile) { + switch (SessionStore.user.Profile) { case 'MDGPR': if (body.CalendarName == 'Pessoal') { options = { diff --git a/src/app/services/first-enter.service.ts b/src/app/services/first-enter.service.ts index 8560d8bf4..55acf2dca 100644 --- a/src/app/services/first-enter.service.ts +++ b/src/app/services/first-enter.service.ts @@ -11,7 +11,6 @@ import { SessionStore } from '../store/session.service'; export class FirstEnterService { constructor(private router:Router, - private platform: Platform, public p: PermissionService, private alertController: AlertController) { } diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts index 4aee0d3f3..0cadbc568 100644 --- a/src/app/services/notifications.service.ts +++ b/src/app/services/notifications.service.ts @@ -1,22 +1,17 @@ /* eslint-disable */ /* tslint:disable */ import { Injectable, NgZone } from '@angular/core'; -import { ActivatedRoute } from '@angular/router' import { HttpClient } from '@angular/common/http'; import { environment } from 'src/environments/environment'; import { StorageService } from 'src/app/services/storage.service'; import { AuthConnstants } from 'src/app/config/auth-constants'; import { Tokenn } from '../models/token.model'; -import { ModalController, AlertController, AnimationController, Platform } from '@ionic/angular'; -import { NavigationExtras, Router } from '@angular/router'; -import { ToastService } from '../services/toast.service'; -import { BackgroundService } from './background.service'; -import { v4 as uuidv4 } from 'uuid'; +import { AlertController, Platform } from '@ionic/angular'; +import { Router } from '@angular/router'; import { EventTrigger } from '../services/eventTrigger.service'; import { SessionStore } from '../store/session.service'; -// import { ActionPerformed, PushNotificationSchema, PushNotifications, Token, } from '@capacitor/push-notifications'; -import { IdObject } from '../models/notifications'; -/* import { Events } from 'ionic-angular' */ +import { ActionPerformed, PushNotificationSchema, PushNotifications, Token, } from '@capacitor/push-notifications'; +import { notificationObject } from '../models/notifications'; @Injectable({ providedIn: 'root' @@ -27,52 +22,59 @@ export class NotificationsService { folderId: string; DataArray = new Array(); - callbacks: { - type: string, + + callbacks: {[key: string]: { + type: notificationObject, funx: Function id: string - }[] = [] + }} = {} active = false constructor( private http: HttpClient, private storageService: StorageService, - private modalController: ModalController, public modalCtrl: AlertController, - private animationController: AnimationController, private platform: Platform, private router: Router, - private toastService: ToastService, private zone: NgZone, - private activeroute: ActivatedRoute, - private eventtrigger: EventTrigger, - private backgroundservice: BackgroundService, - /* private eventTriger: Events, */ - /* private fcm: FCM */) { + private eventtrigger: EventTrigger,) { } - registerCallback(type: IdObject, funx: Function, object: any = {}) { - const id = uuidv4() - this.callbacks.push({ type, funx, id }) - if (!object.hasOwnProperty('desktop') && object['desktop'] != false) { - this.backgroundservice.registerBackService('Notification', funx, type) - } - return id; - } + // registerCallback({type, funx, id = uuidv4()} : { + // type: notificationObject, + // funx: Function + // id?: string + // }) { + // this.callbacks[id] = { funx, id, type} + // return id; + // } - deleteCallback(id) { - this.callbacks.forEach((e, index) => { - if (e.id == id) { - if (index > -1) { - this.callbacks.splice(index, 1); - } - } - }) - } + // private async runNotificationCallback(notification) { + + // for (const [key, value] of Object.entries(this.callbacks)) { + // if(value.type == notification.data.Object) { + + // const dontRepeat = await value.funx(notification) + + // if(dontRepeat) { + // delete this.callbacks[key] + // } + + // } else if (value.type == '*') { + // const dontRepeat = await value.funx(notification) + + // if(dontRepeat) { + // delete this.callbacks[key] + // } + // } + + // } + + // } getTokenByUserIdAndId(user, userID) { // const geturl = environment.apiURL + 'notifications/user/' + userID; @@ -81,14 +83,14 @@ export class NotificationsService { } requestPermissions() { - // PushNotifications.requestPermissions().then(result => { - // if (result.receive === 'granted') { - // // Register with Apple / Google to receive push via APNS/FCM - // PushNotifications.register(); - // } else { - // // Show some error - // } - // }); + PushNotifications.requestPermissions().then(result => { + if (result.receive === 'granted') { + // Register with Apple / Google to receive push via APNS/FCM + PushNotifications.register(); + } else { + // Show some error + } + }); } getAndpostToken(username) { @@ -96,86 +98,77 @@ export class NotificationsService { } else { const geturl = environment.apiURL + 'notifications/token'; - // PushNotifications.addListener('registration', - // (token: Token) => { + PushNotifications.addListener('registration', + (token: Token) => { + const headers = { 'Authorization': SessionStore.user.BasicAuthKey }; + const body = { + UserId: SessionStore.user.UserId, + TokenId: token.value, + Status: 1, + Service: 1 + }; - // this.active = false - // this.storageService.store(username, token.value); - // this.storageService.get(username).then(value => { - - // this.storageService.get(AuthConnstants.USER).then(res => { - - // const headers = { 'Authorization': SessionStore.user.BasicAuthKey }; - // const body = { - // UserId: res.UserId, - // TokenId: token.value, - // Status: 1, - // Service: 1 - // }; - - // this.http.post(`${geturl}`, body, { headers }).subscribe(data => { - // //console.log(data) - // }, (error) => { - // //console.log(error) - // }) - // }).catch((error) => { - // console.error('storage authorization', error) - // });; - - // }).catch((error) => { - // console.error('storage getAndPostToken', error) - // }); - // } - // ); + this.http.post(`${geturl}`, body, { headers }).subscribe(data => { + this.active = true + console.log(data) + }, (error) => { + console.log(error) + }) + } + ); } } registrationError() { - // PushNotifications.addListener('registrationError', - // (error: any) => { - // this.active = false - // } - // ); + PushNotifications.addListener('registrationError', + (error: any) => { + this.active = false + } + ); } onReciveForeground() { - // PushNotifications.addListener('pushNotificationReceived', - // (notification: PushNotificationSchema) => { - // console.log(notification) - // //this.DataArray.push(notification) - // //console.log(this.DataArray) + PushNotifications.addListener('pushNotificationReceived', + (notification: PushNotificationSchema) => { + this.active = true + console.log(notification) + //this.DataArray.push(notification) + //console.log(this.DataArray) - // this.storageService.get("Notifications").then((store) => { - // store.push(notification) - // this.storageService.store("Notifications", store) - // }).catch((error) => { - // if(!error) { - // this.storageService.store("Notifications", [notification]) - // } - // }) + this.storageService.get("Notifications").then((store) => { + store.push(notification) + this.storageService.store("Notifications", store) + }).catch((error) => { + if(!error) { + this.storageService.store("Notifications", [notification]) + } + }) - // /* this.eventTriger.publish('notificatioRecive') */ - // this.eventtrigger.publishSomeData({ - // notification: "recive" - // }) - // } - // ); + // this.runNotificationCallback(notification) + /* this.eventTriger.publish('notificatioRecive') */ + this.eventtrigger.publishSomeData({ + notification: "recive" + }) + } + ); } onReciveBackground() { - // PushNotifications.addListener('pushNotificationActionPerformed', - // (notification: ActionPerformed) => { - // console.log(notification) - // /* this.DataArray.push(notification.notification) + PushNotifications.addListener('pushNotificationActionPerformed', + (notification: ActionPerformed) => { + this.active = true + console.log(notification) + /* this.DataArray.push(notification.notification) - // this.storageService.store("Notifications", this.DataArray) - // this.eventtrigger.publishSomeData({ - // notification: "recive" - // }) */ - // this.notificatinsRoutes(notification) - // } - // ); + this.storageService.store("Notifications", this.DataArray) + this.eventtrigger.publishSomeData({ + notification: "recive" + }) */ + this.notificatinsRoutes(notification) + // this.runNotificationCallback(notification) + } + ); } tempClearArray(data) { diff --git a/src/app/services/organic-entity.service.ts b/src/app/services/organic-entity.service.ts index 30fc583f5..2a5e6c512 100644 --- a/src/app/services/organic-entity.service.ts +++ b/src/app/services/organic-entity.service.ts @@ -7,6 +7,7 @@ import { AuthService } from '../services/auth.service'; import { LoginUserRespose } from '../models/user.model'; import { OrganicEntity } from 'src/app/models/organic-entity.model'; import { SessionStore } from '../store/session.service'; +import { ChangeProfileService } from './change-profile.service'; @Injectable({ providedIn: 'root' @@ -17,7 +18,18 @@ export class OrganicEntityService { loggeduser: LoginUserRespose; headers: HttpHeaders; - constructor(private http: HttpClient, user: AuthService) { + constructor( + private http: HttpClient, + user: AuthService, + private changeProfileService: ChangeProfileService) { + + this.setHeader() + this.changeProfileService.registerCallback(() => { + this.setHeader() + }) + } + + setHeader() { this.loggeduser = SessionStore.user; this.headers = new HttpHeaders(); this.headers = this.headers.set('Authorization', this.loggeduser.BasicAuthKey); diff --git a/src/app/services/publications.service.ts b/src/app/services/publications.service.ts index c429d3482..55e813247 100644 --- a/src/app/services/publications.service.ts +++ b/src/app/services/publications.service.ts @@ -9,6 +9,7 @@ import { Publication } from '../models/publication'; import { getUrl } from 'ionicons/dist/types/components/icon/utils'; import { ActivatedRoute, Router } from '@angular/router'; import { SessionStore } from '../store/session.service'; +import { ChangeProfileService } from './change-profile.service'; @Injectable({ providedIn: 'root' @@ -23,11 +24,20 @@ export class PublicationsService { constructor(private http: HttpClient, user: AuthService, private activatedRoute: ActivatedRoute, - private router: Router) { + private router: Router, + private changeProfileService: ChangeProfileService,) { + + this.setHeader() + this.changeProfileService.registerCallback(() => { + this.setHeader() + }) + + } + + setHeader () { this.loggeduser = SessionStore.user; this.headers = new HttpHeaders(); this.headers = this.headers.set('Authorization', this.loggeduser.BasicAuthKey); - } GetPublicationFolderList(){ diff --git a/src/app/services/search.service.ts b/src/app/services/search.service.ts index 31d198c87..71acc268a 100644 --- a/src/app/services/search.service.ts +++ b/src/app/services/search.service.ts @@ -8,6 +8,7 @@ import { LoginUserRespose } from '../models/user.model'; import { EventSearch } from "src/app/models/event-search"; import { TopSearch } from 'src/app/models/top-search'; import { SessionStore } from '../store/session.service'; +import { ChangeProfileService } from './change-profile.service'; @Injectable({ providedIn: 'root' @@ -21,7 +22,20 @@ export class SearchService { categories= Array; // setup - constructor(private http: HttpClient, user: AuthService) { + constructor( + private http: HttpClient, + user: AuthService, + private changeProfileService: ChangeProfileService) { + + this.setHeader(); + + this.changeProfileService.registerCallback(() => { + this.setHeader() + }) + } + + + setHeader() { this.loggeduser = SessionStore.user; this.headers = new HttpHeaders(); this.headers = this.headers.set('Authorization', this.loggeduser.BasicAuthKey); @@ -52,6 +66,32 @@ export class SearchService { return this.http.get(`${geturl}`, options); } + + basicSearchPublication(subject:string, date:string = null, sender:string = null, organicEntity:string = null, docTypeId:string = null, applicationType:string): Observable{ + // Endpoint + const geturl = environment.apiURL + 'search'; + // store params + let params = new HttpParams(); + // set https params + + + params = params.set("assunto", subject); + params = params.set("data", date); + params = params.set("remetente", sender); + params = params.set("entidadeOrganica", organicEntity); + params = params.set("docTypeId", docTypeId); + params = params.set("applicationType", applicationType); + params = params.set("listOnlyFolders", true) + + + const options = { + headers: this.headers, + params: params + }; + + return this.http.get(`${geturl}`, options); + } + mostSeachWord(size:string):Observable{ // Endpoint diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts index c913efd2b..9aa8aff42 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts @@ -45,7 +45,7 @@ export class EditEventToApprovePage implements OnInit { public endMinDate = new Date(new Date().getTime() + 15 * 60000); public maxDate: any; public stepHour = 1; - public stepMinute = 5; + public stepMinute = 15; public stepSecond = 5; public dateControlStart = new FormControl(moment("DD MM YYYY hh")); public dateControlEnd = new FormControl(moment("DD MM YYYY hh")); 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 34b8207b2..0be3e0bc3 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -41,7 +41,7 @@
Agenda de {{calendars}}
-
Agenda de {{loggeduser.FullName}}
+
Agenda de {{loggeduser.FullName}}
diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index 5b5a67ed9..3fd33a44e 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -68,10 +68,12 @@ export class NewEventPage implements OnInit { recurringTypes = [] selectedRecurringType: any; + @Input() attendees: [] @Input() profile:string; @Input() roomId:string; @Input() selectedSegment: string; @Input() selectedDate: Date; + @Input() CalendarDate: Date; @Input() taskParticipants: EventPerson[] = []; @Input() taskParticipantsCc: any = []; @@ -140,13 +142,13 @@ export class NewEventPage implements OnInit { if(!this.CalendarName) { if(this.eventService.calendarNamesAry.includes('Meu calendario')) { this.CalendarName = 'Meu calendario'; - } else if(this.eventService.calendarNamesAry.length == 1 ) { + } else { this.CalendarName = this.eventService.calendarNamesAry[0] } } this.getRecurrenceTypes(); - if(!this.restoreTemporaryData()){ + if(!this.restoreTemporaryData()) { // clear this.eventBody = { BodyType : "1", Text : ""}; this.postEvent.Body = this.eventBody; @@ -162,7 +164,7 @@ export class NewEventPage implements OnInit { StartDate: this.autoStartTime, EndDate: this.autoEndTime, EventType: 'Reunião', - Attendees: null, + Attendees: this.attendees || null, IsMeeting: false, IsRecurring: false, AppointmentState: 0, @@ -184,7 +186,7 @@ export class NewEventPage implements OnInit { StartDate: this.autoStartTime, EndDate: this.autoEndTime, EventType: 'Reunião', - Attendees: null, + Attendees: this.attendees || null, IsMeeting: false, IsRecurring: false, AppointmentState: 0, @@ -217,11 +219,18 @@ export class NewEventPage implements OnInit { this.date = new Date(2021,9,4,5,6,7); this.injectValidation(); + this.setDefaultTime(); } - roundTimeQuarterHour() { - var timeToReturn = new Date(); + setDefaultTime() { + console.log(this.CalendarDate) + this.postEvent.StartDate = this.roundTimeQuarterHour(this.CalendarDate); + this.postEvent.EndDate = this.postEvent.StartDate; + } + + roundTimeQuarterHour(timeToReturn?) { + var timeToReturn = timeToReturn || new Date(); // var minutes = timeToReturn.getMinutes(); var minutes = timeToReturn.getMinutes(); var hours = timeToReturn.getHours(); @@ -259,11 +268,11 @@ export class NewEventPage implements OnInit { } setStartDate(){ - this.postEvent.StartDate = this.roundTimeQuarterHour(); + // this.postEvent.StartDate = this.roundTimeQuarterHour(); } setEndDate(){ - this.postEvent.EndDate = this.postEvent.StartDate; + // this.postEvent.EndDate = this.postEvent.StartDate; } runValidation() { @@ -361,7 +370,7 @@ export class NewEventPage implements OnInit { } } - async getDoc(){ + async getDoc() { const modal = await this.modalController.create({ component: SearchPage, cssClass: 'modal-width-100-width-background modal', @@ -372,7 +381,7 @@ export class NewEventPage implements OnInit { } }); await modal.present(); - modal.onDidDismiss().then((res)=>{ + modal.onDidDismiss().then((res) => { if(res){ const data = res.data; this.documents.push(data.selected); @@ -496,12 +505,12 @@ export class NewEventPage implements OnInit { }); await DocumentToSave.forEach((attachments, i) => { this.attachmentsService.setEventAttachmentById(attachments).subscribe((res) =>{ - if(DocumentToSave.length == (i+1)){ + if(DocumentToSave.length == (i+1)) { this.afterSave(); } }); }); - if(DocumentToSave.length == 0){ + if(DocumentToSave.length == 0) { this.afterSave(); } this.toastService._successMessage('Evento criado'); @@ -585,7 +594,6 @@ export class NewEventPage implements OnInit { this.postEvent.CalendarName - const CalendarId = this.selectedCalendarId() let loader = this.toastService.loading(); @@ -645,13 +653,15 @@ export class NewEventPage implements OnInit { selectedCalendarId () { if (this.eventService.calendarNamesType[this.CalendarName]?.['Oficial'] && this.postEvent.CalendarName == 'Oficial') { + console.log('1') return this.eventService.calendarNamesType[this.CalendarName]['OficialId'] } else if (this.eventService.calendarNamesType[this.CalendarName]?.['Pessoal'] && this.postEvent.CalendarName == 'Pessoal') { - + console.log('2') return this.eventService.calendarNamesType[this.CalendarName]['PessoalId'] } else { + console.log('1:1',this.eventService.calendarNamesType,'2', this.CalendarName) return '11:11' } } diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html index f41950b82..36dbc6172 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -59,10 +59,12 @@ - - - - + Enviado + + + + + Lido
Tentar
 {{last ? scrollToBottom() : ''}} @@ -105,11 +107,14 @@ image - - - - -
Tentar
+ + Enviado + + + + + Lido +
Tentar
@@ -160,10 +165,12 @@ - - - - + Enviado + + + + + Lido
Tentar
@@ -265,7 +272,7 @@ - + diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index 7384b96a6..804a7e9fc 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -28,6 +28,7 @@ import { File } from '@awesome-cordova-plugins/file/ngx'; import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx'; import { SessionStore } from 'src/app/store/session.service'; import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page'; +import { PermissionService } from 'src/app/services/permission.service'; @Component({ selector: 'app-group-messages', @@ -103,6 +104,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe private file: File, private platform: Platform, private fileOpener: FileOpener, + public p: PermissionService, ) { this.loggedUserChat = SessionStore.user.ChatData['data']; diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index 584c6c4e3..0662e54b7 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -60,11 +60,12 @@ - - - - - + Enviado + + + + + Lido
Tentar
 {{last ? scrollToBottom() : ''}} @@ -104,11 +105,13 @@
image - {{ msg.viewed }} - - - - + + Enviado + + + + + Lido
Tentar
@@ -170,11 +173,13 @@ - {{ msg.viewed }} - - - - + + Enviado + + + + + Lido
Tentar
@@ -248,7 +253,7 @@ - + diff --git a/src/app/shared/chat/messages/messages.page.scss b/src/app/shared/chat/messages/messages.page.scss index 388f21c6c..a4b4e2997 100644 --- a/src/app/shared/chat/messages/messages.page.scss +++ b/src/app/shared/chat/messages/messages.page.scss @@ -404,4 +404,9 @@ ion-footer { } .red { color: red !important; +} + + +.lido, .enviado { + font-size: 11px; } \ No newline at end of file diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index f74cb4955..0cc310ac2 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -34,6 +34,7 @@ import { SessionStore } from 'src/app/store/session.service'; import { Howl } from 'howler'; import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page'; import { ChatMessageDebuggingPage } from 'src/app/shared/popover/chat-message-debugging/chat-message-debugging.page'; +import { PermissionService } from 'src/app/services/permission.service'; const IMAGE_DIR = 'stored-images'; @@ -121,6 +122,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy private file: File, private platform: Platform, private fileOpener: FileOpener, + public p: PermissionService, ) { // update this.checkAudioPermission() @@ -385,6 +387,8 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy } async goToEvent(event: any) { + console.log(event.id) + console.log(event.calendarId) let classs; if (window.innerWidth < 701) { classs = 'modal modal-desktop' diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.html b/src/app/shared/event/attendee-modal/attendee-modal.page.html index 39a0817c6..b81cf0951 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.html +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.html @@ -2,7 +2,7 @@ Adicionar intervenientes - + diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.ts b/src/app/shared/event/attendee-modal/attendee-modal.page.ts index 6184e6692..04f5f5ce3 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.ts +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.ts @@ -4,6 +4,8 @@ import { ContactsService } from 'src/app/services/contacts.service'; import { EventPerson } from 'src/app/models/eventperson.model'; import { removeDuplicate } from 'src/plugin/removeDuplicate.js' import { ThemeService } from 'src/app/services/theme.service' +import { ViewChild } from '@angular/core'; +import { Searchbar } from 'ionic-angular'; @Component({ selector: 'app-attendee-modal', @@ -31,6 +33,8 @@ export class AttendeePage implements OnInit { @Input() footer: boolean; + @ViewChild('Searchbar') searchbar: Searchbar; + LtaskParticipants: EventPerson[] = []; LtaskParticipantsCc: EventPerson[] = []; @@ -70,6 +74,7 @@ export class AttendeePage implements OnInit { this.setIntervenient.emit(removeDuplicate(this.LtaskParticipants)); this.setIntervenientCC.emit(removeDuplicate(this.LtaskParticipantsCc)); + this.searchbar.value = null; this.closeComponent.emit(); } @@ -87,7 +92,7 @@ export class AttendeePage implements OnInit { } - async selectContact(itm: EventPerson){ + async selectContact(itm: EventPerson) { if(this.adding == "intervenient") { diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html index 1bc3ba743..9d63acd23 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html @@ -1,5 +1,5 @@ - +
Todas as tarefas
@@ -61,7 +61,8 @@
- Agenda {{task.Agenda}} do Presidente da República + + Agenda {{task.Agenda}} do Titular A sua agenda {{task.Agenda}} @@ -119,6 +120,4 @@
- - - + \ No newline at end of file diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts index 12c4d4d7c..20e77969e 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts @@ -20,7 +20,7 @@ import { SessionStore } from 'src/app/store/session.service'; }) export class AllProcessesPage implements OnInit { - skeletonLoader = true; + skeletonLoader = false; allProcessesList: any[] = []; loggeduser: LoginUserRespose; @@ -34,7 +34,8 @@ export class AllProcessesPage implements OnInit { totalDocumentStore = TotalDocumentStore deplomasStore = DeplomasStore - + AllProcess = [] + constructor( private router: Router, public ThemeService: ThemeService @@ -45,10 +46,11 @@ export class AllProcessesPage implements OnInit { ngOnInit() { // this.loadAllProcesses(); + this.updateAllProcess() this.router.events.forEach((event) => { if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital')) { - if (window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { + if (window.location.pathname.startsWith('/home/gabinete-digital')) { this.refreshing(); } else { // this.loadAllProcesses(); @@ -60,25 +62,21 @@ export class AllProcessesPage implements OnInit { doRefresh() { setTimeout(() => { - + this.updateAllProcess(); }, 1000); } refreshing() { setTimeout(() => { - // this.loadAllProcesses(); + this.updateAllProcess(); }, 1000); } - - get AllProcess() { - setTimeout(() => { - this.skeletonLoader = false; - }, 5000); - return this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento) - .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr) - .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.despachoStore.list) + updateAllProcess() { + this.AllProcess = this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento) + .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr).concat(this.despachoStore.list) + .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList).concat(this.pendentesstore.list) } get getAllProcessCount() { diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index 86e1b0ea0..d023e5b6a 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -47,7 +47,7 @@ export class EditEventToApproveComponent implements OnInit { public endMinDate = new Date(new Date().getTime() + 15 * 60000); public maxDate: any; public stepHour = 1; - public stepMinute = 5; + public stepMinute = 15; public stepSecond = 5; recurringTypes: any; selectedRecurringType: any; @@ -364,12 +364,8 @@ export class EditEventToApproveComponent implements OnInit { const newAttendees: EventPerson[] = data['taskParticipants']; const newAttendeesCC: EventPerson[] = data['taskParticipantsCc']; - if(newAttendees.length) { - this.setIntervenient(newAttendees); - } - if(newAttendeesCC) { - this.setIntervenientCC(newAttendeesCC); - } + this.setIntervenient(newAttendees); + this.setIntervenientCC(newAttendeesCC); } }); diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index 4dbf7f3aa..7e0cad845 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -5,28 +5,29 @@
- +