diff --git a/.gitignore b/.gitignore index bf8107e10..99de21535 100644 --- a/.gitignore +++ b/.gitignore @@ -68,8 +68,10 @@ android/app/src/main/** android/app/src/main/res/** !android/app/src/main/res/drawable*** !android/app/src/main/res/mip*** +!android/app/src/main/res/values ___android/ _android/ _www/ -www2020 \ No newline at end of file +www2020 +android copy/ \ No newline at end of file diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index fbc650436..0a921fe6f 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.gpr.gabinetedigital"> diff --git a/android/app/src/main/res/drawable-land-ldpi/splash.png b/android/app/src/main/res/drawable-land-ldpi/splash.png deleted file mode 100644 index 8c2997fd8..000000000 Binary files a/android/app/src/main/res/drawable-land-ldpi/splash.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-port-ldpi/splash.png b/android/app/src/main/res/drawable-port-ldpi/splash.png deleted file mode 100644 index 343fc73b6..000000000 Binary files a/android/app/src/main/res/drawable-port-ldpi/splash.png and /dev/null differ diff --git a/readme.md b/readme.md index 5c297a3ef..42434a629 100644 --- a/readme.md +++ b/readme.md @@ -24,6 +24,8 @@ npm install jetifier --force && npx jetify --force ``` +## Envarioment Depedencies +Java version 11 ionic build && npx cap add android && diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 563ca3c39..71af3bee3 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -569,8 +569,8 @@ 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.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.despachoStore.list).concat(this.deplomasStore.DiplomaGerarList) + .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/login/login.page.ts b/src/app/pages/login/login.page.ts index a556ba3e8..246760293 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -95,9 +95,9 @@ export class LoginPage implements OnInit { } getToken() { - // this.notificatinsservice.requestPermissions(); - // this.notificatinsservice.registrationError(); - // this.notificatinsservice.getAndpostToken(this.username); + this.notificatinsservice.requestPermissions(); + this.notificatinsservice.registrationError(); + this.notificatinsservice.getAndpostToken(this.username); } async Login() { @@ -133,7 +133,7 @@ export class LoginPage implements OnInit { } this.changeProfileService.runLogin(); - // this.getToken(); + this.getToken(); SessionStore.setInativity(true); this.goback(); diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts index 691f552c3..a5a4d20ca 100644 --- a/src/app/services/chat/room.service.ts +++ b/src/app/services/chat/room.service.ts @@ -620,7 +620,6 @@ export class RoomService { this.RochetChatConnectorService.sendStreamNotifyRoom(this.id, SessionStore.user.UserName, 'typing', this.isTyping).catch((error) => console.error(error)); } - this.lastMessageTxt = this.message this.typingWatch() } @@ -712,7 +711,7 @@ export class RoomService { } } - setTimeout(()=> { + setTimeout(() => { this.scrollDown() }, 50) diff --git a/src/app/services/sqlite.service.ts b/src/app/services/sqlite.service.ts index 4078ef618..a21d6ae28 100644 --- a/src/app/services/sqlite.service.ts +++ b/src/app/services/sqlite.service.ts @@ -613,6 +613,8 @@ export class SqliteService { }); } + + //getEventBy id getEventById(id) { diff --git a/version/git-version.ts b/version/git-version.ts index 83917728c..403496fa6 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "58f9e7eac", - "SHA": "58f9e7eacd838ed7651df9fbc32863e774cccd6f", + "shortSHA": "9493179ef", + "SHA": "9493179efd417b23a44287121490522196f5e105", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Jan 9 17:07:02 2023 +0100'", - "lastCommitMessage": "save", - "lastCommitNumber": "4624", + "lastCommitTime": "'Thu Jan 12 15:27:09 2023 +0100'", + "lastCommitMessage": "save all", + "lastCommitNumber": "4625", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: android/app/src/main/AndroidManifest.xml\n\tmodified: android/app/src/main/res/drawable-land-hdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-land-mdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-land-xhdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-land-xxhdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-land-xxxhdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-port-hdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-port-mdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-port-xhdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-port-xxhdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-port-xxxhdpi/splash.png\n\tmodified: android/app/src/main/res/mipmap-hdpi/ic_launcher.png\n\tmodified: android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png\n\tmodified: android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png\n\tmodified: android/app/src/main/res/mipmap-mdpi/ic_launcher.png\n\tmodified: android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png\n\tmodified: android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png\n\tmodified: android/app/src/main/res/mipmap-xhdpi/ic_launcher.png\n\tmodified: android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png\n\tmodified: android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png\n\tmodified: android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png\n\tmodified: android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png\n\tmodified: android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png\n\tmodified: android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png\n\tmodified: android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png\n\tmodified: android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/Rules/aprove-event.service.ts\n\tmodified: src/app/Rules/deferimentos-service.service.ts\n\tmodified: src/app/Rules/deplomas-service.service.ts\n\tmodified: src/app/Rules/despacho-pr.service.ts\n\tmodified: src/app/Rules/despacho.service.ts\n\tmodified: src/app/Rules/expediente.service.ts\n\tmodified: src/app/Rules/parecer.service.ts\n\tmodified: src/app/Rules/pedido.service.ts\n\tmodified: src/app/Rules/pendentes.service.ts\n\tmodified: src/app/app.module.ts\n\tmodified: src/app/guards/auth.guard.ts\n\tmodified: src/app/guards/inactivity.guard.ts\n\tmodified: src/app/guards/login.guard.ts\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/modals/profile/edit-profile/edit-profile.page.html\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/inactivity/inactivity.page.html\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/app/services/auth.service.ts\n\tnew file: src/app/services/chat/change-message-queue.service.spec.ts\n\tnew file: src/app/services/chat/change-message-queue.service.ts\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/services/chat/viewed-message.service.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/services/inativity.service.ts\n\tmodified: src/app/services/permission.service.ts\n\tmodified: src/app/services/storage.service.ts\n\tmodified: src/app/services/theme.service.ts\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/app/store/calendar.service.ts\n\tmodified: src/app/store/chat/chat-message.service.ts\n\tmodified: src/app/store/chat/chat-user.service.ts\n\tmodified: src/app/store/deplomas.service.ts\n\tmodified: src/app/store/despacho-store.service.ts\n\tmodified: src/app/store/despachospr-store.service.ts\n\tmodified: src/app/store/eventoaprovacao-store.service.ts\n\tmodified: src/app/store/expedientegd-store.service.ts\n\tmodified: src/app/store/pedidos-store.service.ts\n\tmodified: src/app/store/pendestes-store.service.ts\n\tmodified: src/app/store/presidential-actions-store.service.ts\n\tmodified: src/app/store/session.service.ts\n\tmodified: src/app/store/to-day-event-storage.service.ts\n\tmodified: src/app/store/total-document.service.ts\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts\n\tmodified: src/index.html", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: .gitignore\n\tmodified: android/app/src/main/AndroidManifest.xml\n\tdeleted: android/app/src/main/res/drawable-land-ldpi/splash.png\n\tdeleted: android/app/src/main/res/drawable-port-ldpi/splash.png\n\tmodified: readme.md\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/services/sqlite.service.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file