-
Agenda de {{loggeduser.FullName}}
+ Agenda de {{SessionStore.user.FullName}}
@@ -284,7 +284,7 @@
- {{eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId)}}
{{event.event.Subject}}
{{loggeduser.FullName}}
+ {{SessionStore.user.FullName}}
{{event.event.Subject}}
{{loggeduser.FullName}}
+ {{SessionStore.user.FullName}}
{{event.event.Subject}}
{{loggeduser.FullName}}
+ {{SessionStore.user.FullName}}
Tentar
Tentar
@@ -158,6 +160,7 @@
diff --git a/src/app/pages/chat/group-messages/group-messages.page.scss b/src/app/pages/chat/group-messages/group-messages.page.scss
index 89849c416..7ee672bb2 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.scss
+++ b/src/app/pages/chat/group-messages/group-messages.page.scss
@@ -387,3 +387,11 @@
.float-status-all {
font-size: 10pt !important;
}
+
+.try {
+ color: red;
+ background: #f3414159;
+ padding: 6px;
+ border-radius: 10px;
+ cursor: pointer;
+}
\ No newline at end of file
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index 745e00f99..427b039c6 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -60,10 +60,11 @@
Tentar
Tentar
Tentar
Tentar
diff --git a/src/app/pages/chat/messages/messages.page.scss b/src/app/pages/chat/messages/messages.page.scss
index 5283f4d58..d4f77f639 100644
--- a/src/app/pages/chat/messages/messages.page.scss
+++ b/src/app/pages/chat/messages/messages.page.scss
@@ -356,3 +356,11 @@ button::-moz-focus-inner {
.float-status-all {
font-size: 10pt !important;
}
+
+.try {
+ color: red;
+ background: #f3414159;
+ padding: 6px;
+ border-radius: 10px;
+ cursor: pointer;
+}
\ No newline at end of file
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index f87892e88..7adf49421 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -152,7 +152,9 @@ export class EventsPage implements OnInit {
console.error(error)
})
this.listToPresent = onwEvent;
- this.totalEvent = onwEvent.length;
+ if(onwEvent?.length) {
+ this.totalEvent = onwEvent.length;
+ }
this.showLoader = false;
this.showAgendaLoader = false;
} else {
@@ -280,9 +282,11 @@ export class EventsPage implements OnInit {
}
})
this.listToPresent = todayEvents
- this.totalEvent = this.listToPresent.length
- this.currentEvent = this.listToPresent[0].Subject
- this.currentHoursMinutes = this.listToPresent[0].StartDate
+ if(this.listToPresent?.length) {
+ this.totalEvent = this.listToPresent.length
+ this.currentEvent = this.listToPresent[0].Subject
+ this.currentHoursMinutes = this.listToPresent[0].StartDate
+ }
//
})
@@ -442,4 +446,6 @@ export class EventsPage implements OnInit {
}
}
+
+
}
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index f858e6094..5d120d2e9 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -34,7 +34,7 @@ import { DataService } from 'src/app/services/data.service';
import { Storage } from '@ionic/storage';
import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe';
import { SessionStore } from 'src/app/store/session.service';
-import { async } from '@angular/core/testing';
+
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index acdf23f28..8dfcd4bd5 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -16,7 +16,7 @@ import { RochetChatConnectorService } from 'src/app/services/chat/rochet-chat-co
import { ChatSystemService } from 'src/app/services/chat/chat-system.service';
import { ChatService } from 'src/app/services/chat.service';
import { Platform } from '@ionic/angular';
-
+import { FirstEnterService } from '../../services/first-enter.service';
@Component({
selector: 'app-login',
@@ -52,10 +52,13 @@ export class LoginPage implements OnInit {
public ChatSystemService: ChatSystemService,
private ChatService: ChatService,
private platform: Platform,
- ) {}
+ private FirstEnterService: FirstEnterService
+ ) {
+ console.log('constructor')
+ }
ngOnInit() {
-
+ console.log('ngOngInit')
}
togglePassword() {
@@ -69,7 +72,6 @@ export class LoginPage implements OnInit {
}
-
//Function to validade the login inputs
validateUsername() {
return (
@@ -91,6 +93,7 @@ export class LoginPage implements OnInit {
buttons: ['OK']
});
+
await alert.present();
}
@@ -133,7 +136,7 @@ export class LoginPage implements OnInit {
}
this.changeProfileService.runLogin();
- this.getToken();
+ // this.getToken();
SessionStore.setInativity(true);
this.goback();
@@ -159,7 +162,7 @@ export class LoginPage implements OnInit {
this.ChatSystemService.loadChat();
}
- this.getToken();
+ // this.getToken();
if(!this.platform.is('desktop') && !this.platform.is('mobileweb')) {
if(this.sessionStore.hasPin) {
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index 522d5fda5..27d0f9372 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -59,6 +59,7 @@ export class MessageService {
downloadAttachments = false;
downloadAttachmentsTemp = 0;
UploadAttachmentsTemp = 0;
+ manualRetry = false
constructor(
private NfService: NfService,
@@ -70,7 +71,7 @@ export class MessageService {
private ChatSystemService: ChatSystemService) {
}
- setData({customFields = {}, channels, mentions, msg ,rid ,ts, u, t, _id, id, _updatedAt, file, attachments, temporaryData, localReference , viewed = [], received = [], delate = false, delateRequest =false, from }:Message) {
+ setData({customFields = {}, channels, mentions, msg ,rid ,ts, u, t, _id, id, _updatedAt, file, attachments, temporaryData, localReference , viewed = [], received = [], delate = false, delateRequest =false, from, sendAttempt = 0 }:Message) {
this.channels = channels || []
this.mentions = mentions || []
@@ -87,6 +88,7 @@ export class MessageService {
this.id = id
this.delate = delate
this.delateRequest = delateRequest
+ this.sendAttempt = 0
if(this.attachments?.length >= 1 && attachments?.length >= 1) {
this.attachments[0] = Object.assign(this.attachments[0], attachments[0])
@@ -148,6 +150,7 @@ export class MessageService {
async send(): PromiseTentar
Tentar
Tentar
Tentar
Tentar
@@ -168,10 +170,11 @@
-
diff --git a/src/app/shared/chat/messages/messages.page.scss b/src/app/shared/chat/messages/messages.page.scss
index 2d4bb8fb7..9349b4c69 100644
--- a/src/app/shared/chat/messages/messages.page.scss
+++ b/src/app/shared/chat/messages/messages.page.scss
@@ -388,4 +388,13 @@ ion-footer {
.audioButtonPlay {
margin-bottom: 100%;
right: 50%;
+}
+
+
+.try {
+ color: red;
+ background: #f3414159;
+ padding: 6px;
+ border-radius: 10px;
+ cursor: pointer;
}
\ 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 9a9e9487f..ade54d692 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -32,7 +32,6 @@ 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 { Howl } from 'howler';
-import { runInThisContext } from 'vm';
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';
diff --git a/src/app/store/localstore.service.ts b/src/app/store/localstore.service.ts
index 0447da1c3..4051483dc 100644
--- a/src/app/store/localstore.service.ts
+++ b/src/app/store/localstore.service.ts
@@ -1,12 +1,13 @@
import { Injectable } from '@angular/core';
import { AES, enc, SHA1 } from 'crypto-js'
+import { environment } from 'src/environments/environment';
@Injectable({
providedIn: 'root'
})
export class LocalstoreService {
- private prefix = 'v18-';
+ private prefix = environment.version.lastCommitNumber+"-";
private previewPrefix = 'v17-';
constructor() {
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index afbd1a1eb..5fdf15904 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,21 +1,26 @@
+import { versionData } from '../../version/git-version'
export const environment = {
// apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
apiURL: 'https://gd-api.oapr.gov.ao/api/',
- //apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
-
- /* apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',
- apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket', */
- apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',
- apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',
+ //apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',
+ // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
+ // apiChatUrl: 'http://192.168.0.29:3000/api/v1/',
+ // apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',
+ apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',
+ apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
+ //apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',
+ //apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',
+ // apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',
+ // apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
/* apiChatUrl: 'https://www.tabularium.pt/api/v1/',
apiWsChatUrl: 'wss://www.tabularium.pt/websocket', */
// apiChatUrl: 'https://www.tabularium.pt/api/v1/',
production: true,
domain: 'gabinetedigital.local',
- defaultuser: "" /* 'paulo.pinto@gabinetedigital.local' */,//paulo.pinto paulo.pinto@gabinetedigital.local
- defaultuserpwd: '', //tabteste@006,
+ defaultuser: 'eqformacao@oapr.gov.ao',//paulo.pinto@gabinetedigital.local
+ defaultuserpwd: 'tabteste@006', //tabteste@006,
chatOffline: true,
presidencia: false,
- version: '1.0.1',
+ version: versionData,
sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712'
};
\ No newline at end of file
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index b14e21e0a..f643c390c 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -1,20 +1,24 @@
+import { versionData } from '../../version/git-version'
export const environment = {
// apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
- apiURL: 'https://gd-api.oapr.gov.ao/api/',
+ //apiURL: 'https://gd-api.oapr.gov.ao/api/',
+ apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',
// apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
// apiChatUrl: 'http://192.168.0.29:3000/api/v1/',
// apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',
- apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',
- apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',
+ //apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',
+ //apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',
+ apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',
+ apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
/* apiChatUrl: 'https://www.tabularium.pt/api/v1/',
apiWsChatUrl: 'wss://www.tabularium.pt/websocket', */
// apiChatUrl: 'https://www.tabularium.pt/api/v1/',
production: true,
- domain: 'gabinetedigital.local',
- defaultuser: 'eqformacao@oapr.gov.ao',//paulo.pinto paulo.pinto@gabinetedigital.local
- defaultuserpwd: 'M@p2022', //tabteste@006,
+ domain: 'paulo.pinto@gabinetedigital.local',
+ defaultuser: 'eqformacao@oapr.gov.ao',//paulo.pinto@gabinetedigital.local
+ defaultuserpwd: 'tabteste@006', //tabteste@006,
chatOffline: true,
presidencia: false,
- version: '1.0.1',
+ version: versionData,
sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712'
};
\ No newline at end of file
diff --git a/src/index.html b/src/index.html
index 78ba7271c..6460cdd92 100644
--- a/src/index.html
+++ b/src/index.html
@@ -6,7 +6,8 @@
Tentar