diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 06f92a11e..ce6843661 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -11,7 +11,7 @@ - + Agenda @@ -25,7 +25,7 @@ - + Ações diff --git a/src/app/home/home.page.scss b/src/app/home/home.page.scss index 0fb5539e4..2126a0282 100644 --- a/src/app/home/home.page.scss +++ b/src/app/home/home.page.scss @@ -50,4 +50,5 @@ ion-badge {/* */ ion-tab-button.active{ color: #061b52; + font-weight: 650; } diff --git a/src/app/modals/add-note/add-note.page.html b/src/app/modals/add-note/add-note.page.html index b936f5b07..da7a5fd29 100644 --- a/src/app/modals/add-note/add-note.page.html +++ b/src/app/modals/add-note/add-note.page.html @@ -5,7 +5,7 @@
- +
diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index 509950761..71b55eb62 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -5,7 +5,7 @@ {{modalTitle[taskType]}}
- +
@@ -14,7 +14,7 @@
- +
diff --git a/src/app/modals/dar-parecer/dar-parecer.page.html b/src/app/modals/dar-parecer/dar-parecer.page.html index 4f0a85a26..71f7cfca7 100644 --- a/src/app/modals/dar-parecer/dar-parecer.page.html +++ b/src/app/modals/dar-parecer/dar-parecer.page.html @@ -10,7 +10,7 @@
- +
diff --git a/src/app/modals/delegar/delegar.page.html b/src/app/modals/delegar/delegar.page.html index 8f28822ef..3e096eb03 100644 --- a/src/app/modals/delegar/delegar.page.html +++ b/src/app/modals/delegar/delegar.page.html @@ -36,7 +36,7 @@
- +
@@ -49,7 +49,7 @@
Anexar Documentos -
+ @@ -72,11 +72,11 @@ - +
- - +
- +
@@ -34,7 +34,7 @@
- +
@@ -202,7 +202,7 @@
- + - +
@@ -237,9 +237,9 @@ > --> - + - + - + @@ -311,7 +311,7 @@
- +
diff --git a/src/app/modals/forward/forward.page.html b/src/app/modals/forward/forward.page.html index 0f6ae2d18..37e6f9f0d 100644 --- a/src/app/modals/forward/forward.page.html +++ b/src/app/modals/forward/forward.page.html @@ -37,7 +37,7 @@
- +
@@ -58,11 +58,11 @@ - +
- - - -
diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html index 2641e0c53..37eeaa3d5 100644 --- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html +++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html @@ -15,7 +15,7 @@
- +
diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index 81d39f838..494eb4a21 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -15,11 +15,11 @@
- +
- +
@@ -57,7 +57,7 @@
- +
@@ -142,7 +142,7 @@ placeholder="Início*" [(ngModel)]="postEvent.StartDate" displayFormat="D MMM YYYY H:mm" - minuteValues="0,15,30,45" + minuteValues="0,5,10,15,20,25,30,35,40,45,50,55" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" max="2025" > @@ -162,7 +162,7 @@ placeholder="Fim*" [(ngModel)]="postEvent.EndDate" displayFormat="D MMM YYYY H:mm" - minuteValues="0,15,30,45" + minuteValues="0,5,10,15,20,25,30,35,40,45,50,55" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" max="2025" @@ -272,7 +272,7 @@
- +
diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 24b903f75..770139c39 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -17,11 +17,11 @@ Chat
- - diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 199875f71..b0c731cdb 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -151,9 +151,6 @@ export class ChatPage implements OnInit { this.authService.userData$.subscribe((res: any) => { this.loggedUser = res; console.log(this.loggedUser); - - this.getDirectMessagesDB(); - this.getGroupsDB() }); this.hideRefreshButton(); diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html index a9c0cb157..8f9430043 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -112,8 +112,8 @@
- TTTT - image + File + image
@@ -220,7 +220,7 @@
- + diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index cae360ff0..b79707ff9 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -748,6 +748,11 @@ downloadFileMsg(msg) { this.downloadFile = 'data:image/jpeg;base64,' + btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), '')); console.log('FILE TYPE 44', this.downloadFile) + msg.file = { + guid: msg.file.guid, + image_url: this.downloadFile, + type: msg.file.type + } this.sqlservice.updateChatMsg(msg._id, this.downloadFile); } }); @@ -755,22 +760,24 @@ downloadFileMsg(msg) { } } - async openPreview(msg) { - if(msg.image_url != null) { - const modal = await this.modalController.create({ - component: ViewMediaPage, - cssClass: 'modal modal-desktop', - componentProps: { - image: msg.image_url, - username: msg.u.name, - _updatedAt: msg._updatedAt, - } - }); - modal.present(); - } else { - this.downloadFileMsg(msg); - } - +async openPreview(msg) { + + if (msg.file.image_url === null || msg.file.image_url === '' ) { + this.downloadFileMsg(msg) + + } else { + const modal = await this.modalController.create({ + component: ViewMediaPage, + cssClass: 'modal modal-desktop', + componentProps: { + image: msg.file.image_url, + username: msg.u.name, + _updatedAt: msg._updatedAt + } + }); + modal.present(); } + +} } diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index 4989a7946..d9027acc9 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -61,7 +61,8 @@
- image + + image
@@ -92,7 +93,7 @@
-
+
@@ -111,8 +112,10 @@
-
- image +
+ + File + image
@@ -209,8 +212,8 @@
- - + + diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index 52e8bd2e5..b5742811f 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -30,6 +30,7 @@ import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page'; import { HttpEventType } from '@angular/common/http'; import { ViewEventPage } from 'src/app/modals/view-event/view-event.page'; import { WsChatMethodsService } from 'src/app/services/chat/ws-chat-methods.service' +import { MessageService } from 'src/app/services/chat/message.service'; const IMAGE_DIR = 'stored-images'; @@ -131,7 +132,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { directory: Directory.Data, recursive: true }); - this.getRoomMessageDB(this.roomId); } ngAfterViewInit() { @@ -782,7 +782,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { card.el.style['z-index'] = 11; } - downloadFileMsg(msg) { + downloadFileMsg(msg: MessageService) { console.log('FILE TYPE', msg.file.type) this.downloadFile = ""; if (msg.file.type == "application/img") { @@ -795,30 +795,39 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { console.log('FILE TYPE 33', msg.file.type) } else if (event.type === HttpEventType.Response) { this.downloadFile = 'data:image/jpeg;base64,' + btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), '')); - console.log('FILE TYPE 44', this.downloadFile) + msg.file = { + guid: msg.file.guid, + image_url: this.downloadFile, + type: msg.file.type + } this.sqlservice.updateChatMsg(msg._id, this.downloadFile); } + }); - console.log('FILE TYPE 44', this.downloadFile) + } + } async openPreview(msg) { - if(msg.image_url != null) { + + if (msg.file.image_url === null || msg.file.image_url === '' ) { + this.downloadFileMsg(msg) + + } else { const modal = await this.modalController.create({ component: ViewMediaPage, cssClass: 'modal modal-desktop', componentProps: { - image: msg.image_url, + image: msg.file.image_url, username: msg.u.name, - _updatedAt: msg._updatedAt, + _updatedAt: msg._updatedAt } }); modal.present(); - } else { - this.downloadFileMsg(msg); } + } diff --git a/src/app/pages/events/edit-event/edit-event.page.html b/src/app/pages/events/edit-event/edit-event.page.html index 401201dbc..50a9723c8 100644 --- a/src/app/pages/events/edit-event/edit-event.page.html +++ b/src/app/pages/events/edit-event/edit-event.page.html @@ -51,13 +51,13 @@ Data Início Data Fim diff --git a/src/app/pages/events/event-detail-modal/event-detail-modal.page.html b/src/app/pages/events/event-detail-modal/event-detail-modal.page.html index 35866cd52..565af41d2 100644 --- a/src/app/pages/events/event-detail-modal/event-detail-modal.page.html +++ b/src/app/pages/events/event-detail-modal/event-detail-modal.page.html @@ -53,13 +53,13 @@ Data Início Data Fim diff --git a/src/app/pages/events/event-detail/event-detail.page.html b/src/app/pages/events/event-detail/event-detail.page.html index 3f8023e69..15f9c7920 100644 --- a/src/app/pages/events/event-detail/event-detail.page.html +++ b/src/app/pages/events/event-detail/event-detail.page.html @@ -53,13 +53,13 @@ Data Início Data Fim diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts index 56971f1d4..11887369d 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts @@ -450,7 +450,7 @@ export class DespachoPrPage implements OnInit { else if (actionName == 'Reexecução') { await this.reexecutar(res.data.note, docs); } - + this.goBack(); } }); @@ -459,7 +459,7 @@ export class DespachoPrPage implements OnInit { async openExpedientActionsModal(taskAction: any, task: any) { //this.modalController.dismiss(); let classs; - if (window.innerWidth <= 800) { + if (window.innerWidth <= 700) { classs = 'modal modal-desktop' } else { classs = 'modal modal-desktop showAsideOptions' 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 9c6228718..8c81e2375 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 @@ -10,7 +10,7 @@
- +
@@ -30,7 +30,7 @@
- +
@@ -132,7 +132,7 @@ placeholder="Início*" [(ngModel)]="postData.StartDate" displayFormat="D MMM YYYY H:mm" - minuteValues="0,15,30,45" + minuteValues="0,5,10,15,20,25,30,35,40,45,50,55" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="{{ionicMinDate}}" max="2025" @@ -171,7 +171,7 @@ placeholder="Fim*" [(ngModel)]="postData.EndDate" displayFormat="D MMM YYYY H:mm" - minuteValues="0,15,30,45" + minuteValues="0,5,10,15,20,25,30,35,40,45,50,55" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="{{ionicMinDate}}" max="2025" diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index baea578cf..43177e2d1 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -6,7 +6,7 @@
- +
@@ -29,7 +29,7 @@
- +
diff --git a/src/app/pages/publications/edit-action/edit-action.page.html b/src/app/pages/publications/edit-action/edit-action.page.html index b946d4cca..e44bba2cf 100644 --- a/src/app/pages/publications/edit-action/edit-action.page.html +++ b/src/app/pages/publications/edit-action/edit-action.page.html @@ -13,7 +13,7 @@
--> - +
@@ -35,26 +35,26 @@ [(ngModel)]="folder.DateBegin" placeholder="Início" displayFormat="D MMM YYYY H:mm" - minuteValues="0,15,30,45" + minuteValues="0,5,10,15,20,25,30,35,40,45,50,55" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" - min="{{minDate}}" + min="{{minDate}}" max="2025" class="d-block d-md-none"> - - @@ -70,29 +70,29 @@
- - - @@ -113,7 +113,7 @@
- + 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 163dc3300..647d570dd 100644 --- a/src/app/pages/publications/new-action/new-action.page.html +++ b/src/app/pages/publications/new-action/new-action.page.html @@ -5,7 +5,7 @@
Nova Acção
-
+
- +
@@ -33,7 +33,7 @@ class="d-block d-md-none" placeholder="Início" displayFormat="D MMM YYYY H:mm" - minuteValues="0,15,30,45" + minuteValues="0,5,10,15,20,25,30,35,40,45,50,55" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="{{minDate}}" max="2025"> @@ -72,7 +72,7 @@ [(ngModel)]="folder.DateEnd" placeholder="Fim" displayFormat="D MMM YYYY H:mm" - minuteValues="0,15,30,45" + minuteValues="0,5,10,15,20,25,30,35,40,45,50,55" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="{{minDate}}" max="2025"> @@ -106,7 +106,7 @@
- +
diff --git a/src/app/pages/publications/new-action/new-action.page.ts b/src/app/pages/publications/new-action/new-action.page.ts index b81efd8d9..86c03aae3 100644 --- a/src/app/pages/publications/new-action/new-action.page.ts +++ b/src/app/pages/publications/new-action/new-action.page.ts @@ -80,7 +80,7 @@ export class NewActionPage implements OnInit { } ngOnInit() { - this.segment = "Viagem"; + this.segment = "Evento"; this.setDefaultTime() } diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html index d4026c395..bcf84ef03 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.html +++ b/src/app/pages/publications/new-publication/new-publication.page.html @@ -9,7 +9,7 @@
- +
@@ -18,7 +18,7 @@
- +
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 f83d7f522..479be1a7c 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -151,7 +151,7 @@ export class NewPublicationPage implements OnInit { }); - async laodPicture() { + /* async laodPicture() { const capturedImage = await Camera.getPhoto({ resultType: CameraResultType.Uri, source: CameraSource.Photos, @@ -170,9 +170,9 @@ export class NewPublicationPage implements OnInit { this.capturedImage = await this.convertBlobToBase64(blob); this.capturedImageTitle = new Date().getTime() + '.jpeg'; - } + } */ - /* laodPicture() { + laodPicture() { const input = this.fileLoaderService.createInput({ accept: ['image/apng', 'image/jpeg', 'image/png'] }) @@ -187,7 +187,7 @@ export class NewPublicationPage implements OnInit { console.log(this.capturedImage) }; - } */ + } diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 860ddbca9..c53244711 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -40,7 +40,7 @@
- - + -->
- +
@@ -124,7 +124,7 @@
- +
@@ -135,7 +135,7 @@
- +
@@ -146,7 +146,7 @@
- +
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts index aada27c11..5ff6b23be 100644 --- a/src/app/services/chat/room.service.ts +++ b/src/app/services/chat/room.service.ts @@ -6,6 +6,8 @@ import { showDateDuration } from 'src/plugin/showDateDuration' import { ToastsService } from '../toast.service'; import { chatHistory, ChatMessage } from 'src/app/models/chatMethod' import { Storage } from '@ionic/storage'; +import { Platform } from '@ionic/angular'; +import { SqliteService } from 'src/app/services/sqlite.service'; @Injectable({ providedIn: 'root' }) @@ -33,6 +35,8 @@ export class RoomService { public WsChatService: WsChatService, private MessageService: MessageService, private storage: Storage, + private platform: Platform, + private sqlservice: SqliteService, ) { } setData({ customFields, id, name, t, lastMessage, _updatedAt }) { @@ -85,10 +89,55 @@ export class RoomService { this.WsChatService.send(this.id, msg) } + getMsgFromDBMobile() { + console.log('ALL MSG DBBB', this.id) + this.sqlservice.getAllChatMSG(this.id).then((msg: any = []) => { + let ad = []; + ad = msg + console.log('ALL MSG DBBB', ad.length) + msg.map(element => { + console.log('CHANNEL ELEMENT', element) + let msgChat = { + _id: element.Id, + attachments: this.isJson(element.Attachments), + channels: this.isJson(element.Channels), + file: { + guid: this.isJson(element.File).guid, + image_url: this.isJson(element.image_url), + type: this.isJson(element.File).type + + }, + mentions: this.isJson(element.Mentions), + msg: element.Msg, + rid: element.Rid, + ts: element.Ts, + u: this.isJson(element.U), + _updatedAt: this.isJson(element.UpdatedAt), + } + + let mmessage = this.fix_updatedAt(msgChat) + console.log('FROM DB WEB', mmessage) + const wewMessage = new MessageService() + wewMessage.setData(mmessage) + this.massages.push(wewMessage) + console.log('loadHistory 222', this.massages) + }); + }); + } + + isJson(str) { + try { + JSON.parse(str); + } catch (e) { + return ""; + } + return JSON.parse(str); + } + getMsgFromDB() { - + this.storage.get('chatmsg' + this.id).then((message) => { - + message.forEach(message => { if (message.file) { @@ -110,37 +159,45 @@ export class RoomService { }) } + + // runs onces only loadHistory(limit = 100) { if (this.hasLoadHistory) { return false } - // ionic store + /* this.WsChatService.loadHistory(this.id, limit).then((chatHistory:chatHistory) => { + console.log('loadHistory', chatHistory) - - // websocket - this.WsChatService.loadHistory(this.id, limit).then(async (chatHistory: chatHistory) => { - - //await this.transformData(chatHistory.result.messages.reverse()); - //console.log('loadHistory 111', chatHistory.result.messages.reverse()) - const mgsArray = chatHistory.result.messages.reverse(); - await this.storage.remove('chatmsg' + this.id).then(() => { - console.log('MSG REMOVE ON STORAGE') - }) - await this.storage.set('chatmsg' + this.id, mgsArray).then((value) => { - console.log('MSG SAVED ON STORAGE', value) - this.getMsgFromDB() - }); - - /* chatHistory.result.messages.reverse().forEach(message => { + chatHistory.result.messages.reverse().forEach(message => { message = this.fix_updatedAt(message) - console.log('loadHistory', message) - this.storageMessage.push(message) const wewMessage = new MessageService() wewMessage.setData(message) this.massages.push(wewMessage) - }); */ + }); + + + }) */ + + this.WsChatService.loadHistory(this.id, limit).then(async (chatHistory: chatHistory) => { + + const mgsArray = chatHistory.result.messages.reverse(); + if (this.platform.is('desktop') || this.platform.is('mobileweb')) { + await this.storage.remove('chatmsg' + this.id).then(() => { + console.log('MSG REMOVE ON STORAGE') + }) + await this.storage.set('chatmsg' + this.id, mgsArray).then((value) => { + console.log('MSG SAVED ON STORAGE', value) + this.getMsgFromDB() + }); + } else { + mgsArray.forEach((element) => { + console.log('SQLITE WEBSOCKET', element) + this.sqlservice.addChatMSG(element) + }) + this.getMsgFromDBMobile() + } }) diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts index 1636585c3..70625d0af 100644 --- a/src/app/services/chat/ws-chat-methods.service.ts +++ b/src/app/services/chat/ws-chat-methods.service.ts @@ -6,6 +6,8 @@ import { SessionStore } from 'src/app/store/session.service'; import { capitalizeTxt } from 'src/plugin/text' import { Rooms, Update as room } from 'src/app/models/chatMethod'; import { Storage } from '@ionic/storage'; +import { Platform } from '@ionic/angular'; +import { SqliteService } from 'src/app/services/sqlite.service'; @Injectable({ providedIn: 'root' @@ -24,7 +26,9 @@ export class WsChatMethodsService { constructor( private WsChatService: WsChatService, - private storage: Storage + private storage: Storage, + private platform: Platform, + private sqlservice: SqliteService, ) { (async()=>{ await this.getAllRooms(); @@ -47,7 +51,7 @@ export class WsChatMethodsService { //console.log(roomData); - room = new RoomService(this.WsChatService, new MessageService(), this.storage) + room = new RoomService(this.WsChatService, new MessageService(), this.storage, this.platform, this.sqlservice) room.setData({ customFields: roomData.customFields, id: this.getRoomId(roomData), diff --git a/src/app/services/events/edit-event/edit-event.page.html b/src/app/services/events/edit-event/edit-event.page.html index 401201dbc..50a9723c8 100644 --- a/src/app/services/events/edit-event/edit-event.page.html +++ b/src/app/services/events/edit-event/edit-event.page.html @@ -51,13 +51,13 @@ Data Início Data Fim diff --git a/src/app/services/events/event-detail-modal/event-detail-modal.page.html b/src/app/services/events/event-detail-modal/event-detail-modal.page.html index 35866cd52..565af41d2 100644 --- a/src/app/services/events/event-detail-modal/event-detail-modal.page.html +++ b/src/app/services/events/event-detail-modal/event-detail-modal.page.html @@ -53,13 +53,13 @@ Data Início Data Fim diff --git a/src/app/services/events/event-detail/event-detail.page.html b/src/app/services/events/event-detail/event-detail.page.html index 3f8023e69..15f9c7920 100644 --- a/src/app/services/events/event-detail/event-detail.page.html +++ b/src/app/services/events/event-detail/event-detail.page.html @@ -53,13 +53,13 @@ Data Início Data Fim diff --git a/src/app/services/sqlite.service.ts b/src/app/services/sqlite.service.ts index 2457f5fb0..37638c4c0 100644 --- a/src/app/services/sqlite.service.ts +++ b/src/app/services/sqlite.service.ts @@ -280,7 +280,7 @@ export class SqliteService { console.log('INSIDE DB CHAT MSG',data,) this.dbInstance.executeSql(` INSERT OR IGNORE INTO ${this.chatmsg} (Id,Attachments,Channels,File,Mentions,Msg,Rid, Ts ,U, UpdatedAt) - VALUES ('${data._id}','${JSON.stringify(data.attachments)}','${JSON.stringify(data.channels)}','${JSON.stringify(data.file)}','${JSON.stringify(data.mentions)}','${data.msg}','${data.rid}','${data.ts}','${JSON.stringify(data.u)}','${data._updatedAt}')`, []) + VALUES ('${data._id}','${JSON.stringify(data.attachments)}','${JSON.stringify(data.channels)}','${JSON.stringify(data.file)}','${JSON.stringify(data.mentions)}','${data.msg}','${data.rid}','${data.ts}','${JSON.stringify(data.u)}','${JSON.stringify(data._updatedAt)}')`, []) .then(() => { console.log("chat msg add with Success"); diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html index 7ccf43a4b..4dd30336a 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html @@ -17,7 +17,7 @@
- +
@@ -37,7 +37,7 @@
- +
@@ -93,7 +93,7 @@
- + Conferência Encontro - - + + @@ -123,8 +123,8 @@ - - + +
@@ -132,7 +132,7 @@
- Adicionar participant. + Adicionar participante
@@ -148,7 +148,7 @@ placeholder="Início" [(ngModel)]="eventProcess.workflowInstanceDataFields.StartDate" displayFormat="D MMM YYYY H:mm" - minuteValues="0,15,30,45" + minuteValues="0,5,10,15,20,25,30,35,40,45,50,55" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="{{minDate}}" max="2025" @@ -186,7 +186,7 @@ placeholder="Fim" [(ngModel)]="eventProcess.workflowInstanceDataFields.EndDate" displayFormat="D MMM YYYY H:mm" - minuteValues="0,15,30,45" + minuteValues="0,5,10,15,20,25,30,35,40,45,50,55" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="{{minDate}}" max="2025" @@ -325,7 +325,7 @@
- +
@@ -364,7 +364,7 @@
- + diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html index a215c8d49..00c2e0949 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -14,7 +14,7 @@
- +
@@ -33,7 +33,7 @@
- +
@@ -268,7 +268,7 @@
- +
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 d7e9a5d7f..ba4135ca2 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -15,7 +15,7 @@
- +
@@ -45,7 +45,7 @@ Meu calendário - + @@ -60,7 +60,7 @@
- +
@@ -311,7 +311,7 @@
- +
diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html index e2ed656ff..c5c126e57 100644 --- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html +++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html @@ -3,7 +3,7 @@
- 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 317bcac3d..6987139d8 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -6,13 +6,13 @@ {{wsChatMethodsService.getGroupRoom(roomId).name}}
-
-
+
@@ -240,7 +240,7 @@ - + @@ -261,7 +261,7 @@
- + @@ -272,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 e5d94daee..cb4f414a9 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -25,6 +25,7 @@ import { ViewEventPage } from 'src/app/modals/view-event/view-event.page'; import { HttpEventType } from '@angular/common/http'; import { Storage } from '@ionic/storage'; import { WsChatMethodsService } from 'src/app/services/chat/ws-chat-methods.service'; +import { MessageService } from 'src/app/services/chat/message.service'; /* import * as pdfjsLib from 'pdfjs-dist'; @@ -108,6 +109,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe this.getRoomInfo(); //this.scrollToBottom(); this.wsChatMethodsService.getGroupRoom(this.roomId).loadHistory(); + this.wsChatMethodsService.getGroupRoom(this.roomId).getMsgFromDB(); console.log('MESSAGES'+this.wsChatMethodsService.getGroupRoom(this.roomId).massages); this.wsChatMethodsService.getGroupRoom(this.roomId).scrollDown = this.scrollToBottomClicked @@ -285,88 +287,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe } } - getMessageDB() { - this.storage.get('chatmsg').then((msg) => { - console.log('GROUP FROM DB WEB', msg) - let msgArray = []; - msgArray = msg; - msgArray.filter(data => data._id != this.roomId); - this.messages = msgArray.reverse(); - console.log("GROUP MSG CHAT WEB", this.messages) - }) - - } - - async transformData(res) { - let mgsArray = []; - res.map(async element => { - - if (element.file) { - if (element.file.guid) { - await this.storage.get(element.file.guid).then((image) => { - let chatmsg = { - _id: element._id, - attachments: element.attachments, - channels: element.channels, - file: { - guid: element.file.guid, - image_url: image, - type: element.file.type - }, - mentions: element.mentions, - msg: element.msg, - rid: element.rid, - ts: element.ts, - u: element.u, - _updatedAt: element._updatedAt, - - } - - mgsArray.push(chatmsg) - - }) - } else { - let chatmsg = { - _id: element._id, - attachments: element.attachments, - channels: element.channels, - file: element.file, - mentions: element.mentions, - msg: element.msg, - rid: element.rid, - ts: element.ts, - u: element.u, - _updatedAt: element._updatedAt, - } - - mgsArray.push(chatmsg) - } - } else { - let chatmsg = { - _id: element._id, - attachments: element.attachments, - channels: element.channels, - mentions: element.mentions, - msg: element.msg, - rid: element.rid, - ts: element.ts, - u: element.u, - _updatedAt: element._updatedAt, - } - - mgsArray.push(chatmsg) - } - - }); - await this.storage.remove('chatmsg').then(() => { - console.log('GROUP MSG REMOVE FROM STORAGE') - }); - await this.storage.set('chatmsg', mgsArray).then((value) => { - console.log('GROUP MSG SAVED ON STORAGE', value) - }); - - } - loadGroupMessages(roomId) { //console.log('here'+room.t); @@ -380,8 +300,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe let msgOnly = res['messages'].filter(data => data.t != 'au'); //this.messages = msgOnly.reverse(); //console.log(res); - this.transformData(msgOnly.reverse()) - this.getMessageDB(); this.showLoader = false; }); @@ -876,7 +794,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe card.el.style['z-index'] = 11; } - downloadFileMsg(msg) { + downloadFileMsg(msg: MessageService) { console.log('FILE TYPE', msg.file.type) this.downloadFile = ""; if (msg.file.type == "application/img") { @@ -889,8 +807,16 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe console.log('FILE TYPE 33', msg.file.type) } else if (event.type === HttpEventType.Response) { this.downloadFile = 'data:image/jpeg;base64,' + btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), '')); + + msg.file = { + guid: msg.file.guid, + image_url: this.downloadFile, + type: msg.file.type + } - this.storage.set(msg.file.guid, this.downloadFile); + await this.storage.set(msg.file.guid, this.downloadFile).then(() => { + console.log('IMAGE SAVED') + }); } }); @@ -900,21 +826,23 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe } async openPreview(msg) { - if (msg.file.image_url != null) { + + if (msg.file.image_url === null || msg.file.image_url === '' ) { + this.downloadFileMsg(msg) + + } else { const modal = await this.modalController.create({ component: ViewMediaPage, cssClass: 'modal modal-desktop', componentProps: { - image: msg.attachments[0].image_url, + image: msg.file.image_url, username: msg.u.name, - _updatedAt: msg._updatedAt, + _updatedAt: msg._updatedAt } }); modal.present(); - - } else { - this.downloadFileMsg(msg) } + } } diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index a1bc9bcb1..b33993df5 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -7,7 +7,7 @@
@@ -21,7 +22,6 @@
-
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html index 000a6c40e..1c5f4c7fb 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -1,4 +1,5 @@ +
Despachos Presidenciais @@ -21,12 +22,12 @@ refreshingText="A actualizar..."> - + - + diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html index a0ea8b3b6..5d0fbd523 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.html +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html @@ -1,8 +1,9 @@ +
Despachos
-
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.scss b/src/app/shared/gabinete-digital/despachos/despachos.page.scss index 713fb7149..3c095e7f0 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.scss +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.scss @@ -1,11 +1,8 @@ @import '~src/function.scss'; /* CONTENT */ -ion-header { - padding: 30px 20px 0 20px !important; - margin: 0; -} .title{ + padding: 30px 20px 0 20px !important; font-family: Roboto; font-size: 25px; color:#000; @@ -26,7 +23,7 @@ ion-header { } .ion-item-class{ padding: 0; - + } .label-text{ width: 100%; @@ -76,7 +73,7 @@ ion-item{ .div-icon ion-icon{ display: block; margin: 0 auto; - + } .div-content-expediente p, .div-content-pendentes p{ font-size: 14pt; @@ -157,7 +154,7 @@ ion-item{ .exp-workflow{ float: left; margin: 0 !important; - + .label{ border-radius: 15px; background: #ffb703; @@ -220,4 +217,4 @@ ion-item{ font-size: 45px; float: right; margin-right: 10px; -} \ No newline at end of file +} diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts index 2e3c2892f..80a36ef7e 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts @@ -12,6 +12,7 @@ import { DespachoService } from 'src/app/Rules/despacho.service'; export class DespachosPage implements OnInit { despachoStore = DespachoStore; + skeletonLoader = true; constructor ( private router: Router, @@ -39,12 +40,15 @@ export class DespachosPage implements OnInit { async LoadList() { + this.skeletonLoader = true; + await this.despachoRule.getList({updateStore: true}) + //this.skeletonLoader = false; } - get skeletonLoader(): boolean { + /* get skeletonLoader(): boolean { return this.despachoRule.LoaderService.loading - } + } */ doRefresh() { setTimeout(() => { @@ -52,4 +56,10 @@ export class DespachosPage implements OnInit { }, 1000); } + refreshing() { + setTimeout(() => { + this.LoadList(); + }, 1000); + } + } diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html index b95886a47..6d881195e 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html @@ -1,4 +1,5 @@ +
Diplomas
@@ -19,8 +20,8 @@ -
- +
+
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss index bb4b9df27..8d76ee6cd 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss @@ -1,10 +1,13 @@ @import '~src/function.scss'; /* CONTENT */ -:host{ +/* :host{ padding: 30px 20px 0 20px !important; margin: 0; -} + border: 1px solid red; +} */ + .title{ + padding: 30px 20px 0 20px !important; font-family: Roboto; font-size: 25px; color:#000; @@ -34,6 +37,11 @@ color: #0d89d1 !important; } } + .main-container{ + padding: 0px 20px 0 20px !important; + margin: 0; + color:#000; + } .item-list-small{ font-size: 11px; overflow: hidden; diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html index a48a48400..e327e5694 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html @@ -1,4 +1,5 @@ +
Diplomas
@@ -20,8 +21,7 @@ -
- +
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss b/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss index e27734267..ddde8b525 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss @@ -1,10 +1,11 @@ @import '~src/function.scss'; /* CONTENT */ -:host{ +/* :host{ padding: 30px 20px 0 20px !important; margin: 0; -} +} */ .title{ + padding: 30px 20px 0 20px !important; font-family: Roboto; font-size: 25px; color:#000; @@ -19,6 +20,11 @@ float: right; } } + .main-container{ + padding: 0px 20px 0 20px !important; + margin: 0; + color:#000; +} .item-list-small{ font-size: 11px; overflow: hidden; diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts index 452d7a033..b46dc541c 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts @@ -42,7 +42,7 @@ constructor( ngOnInit() { // update list this.LoadList() - + this.router.events.forEach((event) => { if (event instanceof NavigationStart && '/home/gabinete-digital?diplomas=true'.startsWith(event.url)) { if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { @@ -53,7 +53,7 @@ constructor( } }); - + } segmentChanged(ev: any) { @@ -69,7 +69,8 @@ constructor( } async LoadList() { - + this.skeletonLoader = true; + let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); this.diplomasList = []; diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index 5e55f3555..f08dabfa3 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -74,7 +74,7 @@
- + Conferência Encontro - - + + @@ -104,8 +104,8 @@ - - + +
@@ -121,7 +121,7 @@ placeholder="Início" [(ngModel)]="startDate" displayFormat="D MMM YYYY H:mm" - minuteValues="0,15,30,45" + minuteValues="0,5,10,15,20,25,30,35,40,45,50,55" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="{{minDate}}" max="2022" @@ -160,7 +160,7 @@ placeholder="Fim" [(ngModel)]="endDate" displayFormat="D MMM YYYY H:mm" - minuteValues="0,15,30,45" + minuteValues="0,5,10,15,20,25,30,35,40,45,50,55" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="{{minDate}}" max="2025" @@ -241,7 +241,7 @@ placeholder="Última ocorrência" [(ngModel)]="eventProcess.workflowInstanceDataFields.LastOccurrence" displayFormat="D MMM YYYY H:mm" - minuteValues="0,15,30,45" + minuteValues="0,5,10,15,20,25,30,35,40,45,50,55" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="2021" max="2025" diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html index 5d96dfe12..eff4cab69 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html @@ -1,4 +1,5 @@ +
@@ -25,7 +26,6 @@
-
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html index 3abb6d9de..d3fec01bd 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html @@ -1,4 +1,5 @@ +
Expediente
@@ -12,7 +13,6 @@
-
+
Expediente
@@ -20,7 +21,7 @@
- +
-
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html index 229a688e4..6c4a7ea7f 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html @@ -1,4 +1,5 @@ - + +
Pedidos
@@ -28,8 +29,8 @@ -
- +
+
- +
@@ -21,7 +21,7 @@
- +
@@ -35,26 +35,26 @@ [(ngModel)]="folder.DateBegin" placeholder="Início" displayFormat="D MMM YYYY H:mm" - minuteValues="0,15,30,45" + minuteValues="0,5,10,15,20,25,30,35,40,45,50,55" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" - min="{{minDate}}" + min="{{minDate}}" max="2025" class="d-block d-md-none"> - - @@ -70,29 +70,29 @@
- - - @@ -107,13 +107,13 @@
- +
- + diff --git a/src/app/shared/publication/new-action/new-action.page.html b/src/app/shared/publication/new-action/new-action.page.html index 2ec2fb816..b46192da2 100644 --- a/src/app/shared/publication/new-action/new-action.page.html +++ b/src/app/shared/publication/new-action/new-action.page.html @@ -3,7 +3,7 @@
Nova Acção
-
+
@@ -21,7 +21,7 @@
- +
@@ -35,7 +35,7 @@ [(ngModel)]="folder.DateBegin" placeholder="Início" displayFormat="D MMM YYYY H:mm" - minuteValues="0,15,30,45" + minuteValues="0,5,10,15,20,25,30,35,40,45,50,55" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" max="2025"> @@ -72,7 +72,7 @@ [(ngModel)]="folder.DateEnd" placeholder="Fim" displayFormat="D MMM YYYY H:mm" - minuteValues="0,15,30,45" + minuteValues="0,5,10,15,20,25,30,35,40,45,50,55" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" max="2025"> @@ -101,7 +101,7 @@
- +
diff --git a/src/app/shared/publication/new-action/new-action.page.ts b/src/app/shared/publication/new-action/new-action.page.ts index 9fee8eedf..2fff042a3 100644 --- a/src/app/shared/publication/new-action/new-action.page.ts +++ b/src/app/shared/publication/new-action/new-action.page.ts @@ -62,7 +62,7 @@ export class NewActionPage implements OnInit { } ngOnInit() { - this.segment = "Viagem"; + this.segment = "Evento"; } segmentChanged(ev: any) { diff --git a/src/app/shared/publication/new-publication/new-publication.page.html b/src/app/shared/publication/new-publication/new-publication.page.html index 8732e0f57..f4179ea8c 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.html +++ b/src/app/shared/publication/new-publication/new-publication.page.html @@ -13,7 +13,7 @@
- +
@@ -22,7 +22,7 @@
- +
diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html index 56d47eab9..7bf80680b 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.html +++ b/src/app/shared/publication/view-publications/view-publications.page.html @@ -40,7 +40,6 @@
-
@@ -70,7 +69,7 @@
- + diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts index 3be412f5e..16a833aa2 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.ts +++ b/src/app/shared/publication/view-publications/view-publications.page.ts @@ -102,10 +102,9 @@ export class ViewPublicationsPage implements OnInit { getPublications() { this.showLoader = true; const folderId = this.folderId + this.publicationList = new Array(); this.publications.GetPublications(folderId).subscribe(res=> { - this.publicationList = new Array(); - res.forEach(element => { let item: Publication = this.publicationPipe.itemList(element) this.publicationList.push(item); diff --git a/src/assets/images/icons-nav-agenda-active.svg b/src/assets/images/icons-nav-agenda-active.svg deleted file mode 100644 index c1a5e00b6..000000000 --- a/src/assets/images/icons-nav-agenda-active.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/images/nav-hover/icons-nav-actions-active.svg b/src/assets/images/nav-hover/icons-nav-actions-active.svg new file mode 100644 index 000000000..c8da4a261 --- /dev/null +++ b/src/assets/images/nav-hover/icons-nav-actions-active.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/images/nav-hover/icons-nav-agenda-active.svg b/src/assets/images/nav-hover/icons-nav-agenda-active.svg new file mode 100644 index 000000000..73d7dd655 --- /dev/null +++ b/src/assets/images/nav-hover/icons-nav-agenda-active.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/images/nav-hover/icons-nav-agenda-inactive.svg b/src/assets/images/nav-hover/icons-nav-agenda-inactive.svg deleted file mode 100644 index 07bb69f11..000000000 --- a/src/assets/images/nav-hover/icons-nav-agenda-inactive.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/images/nav-hover/icons-nav-calendar-active.svg b/src/assets/images/nav-hover/icons-nav-calendar-active.svg deleted file mode 100644 index 09ce7870f..000000000 --- a/src/assets/images/nav-hover/icons-nav-calendar-active.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/images/nav-hover/icons-nav-chat-active.svg b/src/assets/images/nav-hover/icons-nav-chat-active.svg index 54f038f34..c4d7bba4e 100644 --- a/src/assets/images/nav-hover/icons-nav-chat-active.svg +++ b/src/assets/images/nav-hover/icons-nav-chat-active.svg @@ -1,4 +1,4 @@ - - - + + + diff --git a/src/assets/images/nav-hover/icons-nav-gabinete-active.svg b/src/assets/images/nav-hover/icons-nav-gabinete-active.svg index 09ce7870f..6aecf9cad 100644 --- a/src/assets/images/nav-hover/icons-nav-gabinete-active.svg +++ b/src/assets/images/nav-hover/icons-nav-gabinete-active.svg @@ -1,4 +1,4 @@ - - - + + + diff --git a/src/assets/images/nav-hover/icons-nav-home-active.svg b/src/assets/images/nav-hover/icons-nav-home-active.svg index fa2b1fd71..26c5fbacb 100644 --- a/src/assets/images/nav-hover/icons-nav-home-active.svg +++ b/src/assets/images/nav-hover/icons-nav-home-active.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/assets/images/theme/gov/icons-nav-actions-active.svg b/src/assets/images/theme/gov/icons-nav-actions-active.svg new file mode 100644 index 000000000..c8da4a261 --- /dev/null +++ b/src/assets/images/theme/gov/icons-nav-actions-active.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/images/theme/gov/icons-nav-agenda-active.svg b/src/assets/images/theme/gov/icons-nav-agenda-active.svg new file mode 100644 index 000000000..73d7dd655 --- /dev/null +++ b/src/assets/images/theme/gov/icons-nav-agenda-active.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/images/theme/gov/icons-nav-chat-active.svg b/src/assets/images/theme/gov/icons-nav-chat-active.svg new file mode 100644 index 000000000..c4d7bba4e --- /dev/null +++ b/src/assets/images/theme/gov/icons-nav-chat-active.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/images/theme/gov/icons-nav-gabinete-active.svg b/src/assets/images/theme/gov/icons-nav-gabinete-active.svg new file mode 100644 index 000000000..6aecf9cad --- /dev/null +++ b/src/assets/images/theme/gov/icons-nav-gabinete-active.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/images/theme/gov/icons-nav-home-active.svg b/src/assets/images/theme/gov/icons-nav-home-active.svg new file mode 100644 index 000000000..26c5fbacb --- /dev/null +++ b/src/assets/images/theme/gov/icons-nav-home-active.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/global.scss b/src/global.scss index 32773b846..585fca574 100644 --- a/src/global.scss +++ b/src/global.scss @@ -872,15 +872,15 @@ ion-icon{ @media only screen and (max-width: 500px) { ::-webkit-scrollbar { - width: 5px !important; - height: 5px !important; + width: 7px !important; + height: 7px !important; } } ::-webkit-scrollbar { - width: 7px; - height: 7px; + width: 10px; + height: 10px; } /* Track */