diff --git a/src/app/modals/view-event/view-event.page.ts b/src/app/modals/view-event/view-event.page.ts index 2f95d921c..cf65032c3 100644 --- a/src/app/modals/view-event/view-event.page.ts +++ b/src/app/modals/view-event/view-event.page.ts @@ -162,7 +162,7 @@ export class ViewEventPage implements OnInit { alert.dismiss(); }, 1500); this.goBack(); - this.toastService.successMessage('Evento apagado'); + this.toastService._successMessage('Evento apagado'); }, () => { }, () => { loader.remove(); diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index a0c9b11b5..fa85b54f5 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -458,6 +458,7 @@ diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 994ae6cc2..a5a9765a6 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -3,7 +3,7 @@ import { CalendarComponent } from 'ionic2-calendar'; import { AlertController, ModalController, Platform } from '@ionic/angular'; import { EventsService } from 'src/app/services/events.service'; import { Event } from '../../models/event.model'; -import { Router, NavigationEnd } from '@angular/router'; +import { Router, NavigationEnd, NavigationExtras } from '@angular/router'; import { momentG } from 'src/plugin/momentG'; import { DomSanitizer } from "@angular/platform-browser"; import { EventPerson } from 'src/app/models/eventperson.model'; @@ -106,6 +106,7 @@ export class AgendaPage implements OnInit { selectedEvent: Event; selectedEventId: string | number; + selectedEventCalendarId : string | number; postEvent: any; // temporary data @@ -311,6 +312,7 @@ export class AgendaPage implements OnInit { this.viewingEventObject = event; this.selectedEventId = event.id; + this.selectedEventCalendarId = event?.['event']?.CalendarId; this.cloneAllmobileComponent(); @@ -1251,24 +1253,12 @@ export class AgendaPage implements OnInit { // open component async viewEventDetail(eventId: any) { - this.router.navigate(['/home/agenda', eventId, 'agenda']); - /* + const CalendarId = this.selectedEventCalendarId - const modal = await this.modalCtrl.create({ - component: ViewEventPage, - componentProps:{ - eventId: eventId, - adding: this.adding - }, - cssClass: 'modal modal-desktop', - backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss().then((res)=>{ - if(res){ - // this.viewEventDetailDismiss(res); - } - }); */ + let navigationExtras: NavigationExtras = { queryParams: { CalendarId } } + + this.router.navigate(['/home/agenda/',eventId,'agenda'], navigationExtras); + } // open component diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index 8b6d933ba..94d27aa35 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -40,6 +40,7 @@ export class ViewEventPage implements OnInit { profile: string; eventId: string; + CalendarId: string; caller: string; customDate: any; today: any; @@ -53,6 +54,7 @@ export class ViewEventPage implements OnInit { task: ExpedientTaskModalPageNavParamsTask; LoadedDocument: any = null; sesseionStora = SessionStore + constructor( private modalController: ModalController, /* private navParams: NavParams, */ @@ -71,12 +73,20 @@ export class ViewEventPage implements OnInit { private ionicStorage: Storage, private CalendarService: CalendarService ) { + this.isEventEdited = false; this.loadedEvent = new Event(); this.eventBody = { BodyType: "1", Text: "" }; this.loadedEvent.Body = this.eventBody; + this.activatedRoute.paramMap.subscribe(params => { this.eventId = params['params'].eventId; + + const urlParams = new URLSearchParams(window.location.search); + this.CalendarId = urlParams.get('CalendarId'); + + this.eventId = this.eventId.replace(' ', '') + if (params["params"].caller) { this.caller = (params["params"].caller); } @@ -176,13 +186,10 @@ export class ViewEventPage implements OnInit { this.loadedEvent = res; this.addEventToDb(res); - /* this.today = new Date(res.StartDate); - this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]); */ loader.remove() }, (error) => { - if (error.status === 0) { this.getFromDb(); } else { @@ -195,22 +202,15 @@ export class ViewEventPage implements OnInit { }); } else { - const event = this.CalendarService.eventSource.find((ele) => ele.id == this.eventId) - // - - if(event?.CalendarId) { - this.eventsService.genericGetEvent(this.eventId, event.CalendarId).subscribe(res => { + if(this.CalendarId) { + this.eventsService.genericGetEvent(this.eventId, this.CalendarId).subscribe(res => { this.loadedEvent = res; this.addEventToDb(res); - /* this.today = new Date(res.StartDate); - this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]); */ loader.remove() }, (error) => { - - if (error.status === 0) { this.getFromDb(); } else { @@ -225,8 +225,6 @@ export class ViewEventPage implements OnInit { } - - } deleteEvent() { 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 67b1abc81..f7ce3f7f9 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -45,11 +45,6 @@ -
@@ -78,29 +73,6 @@
- -
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index a1a812bed..75797766c 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -159,14 +159,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { this.wsChatMethodsService.getUserOfRoom(this.roomId).then((value) => { }) - //this.loadFiles(); VoiceRecorder.requestAudioRecordingPermission(); this.getChatMembers(); - /* Filesystem.mkdir({ - path: IMAGE_DIR, - directory: Directory.Data, - recursive: true - }); */ } ngAfterViewInit() { @@ -185,9 +179,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { onEnd: ev => { Haptics.impact({ style: ImpactStyle.Light }) this.stopRecording(); - /* setTimeout(() => { - this.loadFiles(); - }, 500); */ } }, true); longpress.enable(); diff --git a/src/app/pages/chat/new-group/new-group.page.ts b/src/app/pages/chat/new-group/new-group.page.ts index a8707d709..d3e904aab 100644 --- a/src/app/pages/chat/new-group/new-group.page.ts +++ b/src/app/pages/chat/new-group/new-group.page.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { ModalController, NavParams, PickerController, PopoverController } from '@ionic/angular'; import { GroupDurationPage } from 'src/app/shared/popover/group-duration/group-duration.page'; import { GroupContactsPage } from '../group-messages/group-contacts/group-contacts.page'; -import { ThemeService } from 'src/app/services/theme.service' +import { ThemeService } from 'src/app/services/theme.service'; import { ChatService } from 'src/app/services/chat.service'; import { ProcessesService } from 'src/app/services/processes.service'; import { WsChatMethodsService } from 'src/app/services/chat/ws-chat-methods.service'; @@ -35,8 +35,7 @@ export class NewGroupPage implements OnInit { private processesService: ProcessesService, public wsChatMethodsService: WsChatMethodsService, private authService: AuthService, - ) - { + ) { this.loggedUserChat = authService.ValidatedUserChat['data']; this.isGroupCreated = false; this.groupName = this.navParams.get('name'); @@ -71,9 +70,9 @@ export class NewGroupPage implements OnInit { let customFields = {} let res:any; - if(this.thedate){ + if(this.thedate) { let customFields = { - "countDownDate":this.thedate + "countDownDate": this.thedate } res = await this.wsChatMethodsService.createPrivateRoom(name, SessionStore.user.UserName, customFields); @@ -85,13 +84,14 @@ export class NewGroupPage implements OnInit { this.isGroupCreated = true; this.addContacts(res.result); - - this.wsChatMethodsService.subscribeToRoomUpdate(res.result.rid, res.result); - console.log(res.result.rid) + + setTimeout(() => { + this.wsChatMethodsService.subscribeToRoomUpdate(res.result.rid, res.result); + }, 10) } - async addContacts(room){ + async addContacts(room) { this.close(); let name = this.groupName.split(' ').join('-'); @@ -130,7 +130,7 @@ export class NewGroupPage implements OnInit { { text: 'Ok', cssClass: 'btn-cancel', - handler:(value:any)=>{ + handler:(value:any) => { let now = new Date(); this.thedate = new Date(now.getFullYear(), now.getMonth(), now.getDate() + value.days.value, now.getHours() + value.hours.value, now.getMinutes() + value.minutes.value, now.getSeconds(), now.getMilliseconds()); @@ -142,9 +142,9 @@ export class NewGroupPage implements OnInit { ] if(value.days.value != null && value.hours.value != null && value.minutes.value != null){ - if(value.days.value > 0){ - if(value.days.value == 1){ - if(value.hours.value == 1){ + if(value.days.value > 0) { + if(value.days.value == 1) { + if(value.hours.value == 1) { this.displayDuration = value.days.value + " day " + value.hours.value + " hora " + value.minutes.value + " minutos"; diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index e4353f3df..3dac7e75a 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts @@ -101,16 +101,13 @@ export class EventListPage implements OnInit { this.sqliteservice.getListOfEventAprove('Agenda Oficial MDGPR', 'Agenda Pessoal MDGPR').then((event: any[] = []) => { this.eventsMDGPRList = this.sortService.sortDate(this.transformaDataDB(event), 'taskStartDate') - //this.eventsMDGPRList = this.eventsMDGPRList.filter(element => element.interveners != null) - }) this.sqliteservice.getListOfEventAprove('Agenda Oficial PR', 'Agenda Pessoal PR').then((event: any[]) => { this.eventsPRList = this.sortService.sortDate(this.transformaDataDB(event), 'taskStartDate') - - }) + }) } diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index 2ab866c12..2a557ff6b 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -31,7 +31,7 @@ export class ExpedientePage implements OnInit { expedienteTaskPipe = new ExpedienteTaskPipe() onlinecheck: boolean; - listToPresent; + listToPresent= [] constructor( private processes: ProcessesService, private router: Router, diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index a835c6890..58b7d79ad 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -216,20 +216,6 @@

{{pedidosstore.countdeferimento}} Documentos

- - -
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 e44bba2cf..11a687578 100644 --- a/src/app/pages/publications/edit-action/edit-action.page.html +++ b/src/app/pages/publications/edit-action/edit-action.page.html @@ -3,16 +3,6 @@
Editar acção presidencial
-
diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 622dd150e..f42b34e44 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -24,6 +24,7 @@
Acções Presidenciais
+
+ + +
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index b167250cb..10ef64bf8 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -230,7 +230,7 @@ export class PublicationsPage implements OnInit { this.showLoader = false; }); }); - this.storage.get('actionsViagens').then((viagens) => { + this.storage.get('actionsViagens').then((viagens = []) => { viagens.forEach(data => { let folder: PublicationFolder = { diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index 90602818c..d8ad8cfb8 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -218,12 +218,6 @@ export class AuthService { let guid: any = await this.AttachmentsService.uploadFile(formData).toPromise() message.file.guid = guid.path - - // await this.storage.set(guid.path, message.file.image_url).then(() => { - // - // // message.getFileFromDb() - // }); - message.downloadFileMsg() return true @@ -235,14 +229,17 @@ export class AuthService { } else { try { const res = message.temporaryData + let url = await this.processesService.GetDocumentUrl(res.data.selected.Id, res.data.selected.ApplicationType).toPromise(); + let url_no_options: string = url.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); message.attachments[0].title_link = url_no_options message.attachments[0].message_link = url_no_options + return true } catch(e) { - + return false } } diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts index 73da5adcc..a2603d28c 100644 --- a/src/app/services/chat/message.service.ts +++ b/src/app/services/chat/message.service.ts @@ -8,9 +8,9 @@ import { WsChatService } from 'src/app/services/chat/ws-chat.service'; import { showDateDuration } from 'src/plugin/showDateDuration'; import { ChatStorageService } from './chat-storage.service' import { ChatMethodsService } from './chat-methods.service' -import { MessageModel, DeleteMessageModel } from '../../models/beast-orm' +import { MessageModel } from '../../models/beast-orm' import { AESEncrypt } from '../aesencrypt.service' -import { HttpClient, HttpEventType } from '@angular/common/http'; +import { HttpEventType } from '@angular/common/http'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { NetworkServiceService , ConnectionStatus} from 'src/app/services/network-service.service'; @@ -133,7 +133,11 @@ export class MessageService { if(!this.hasFile) { - const params = {roomId:this.rid, msg:this.msg, localReference: this.localReference} + const params = { + roomId:this.rid, + msg:this.msg, + localReference: this.localReference + } await this.sendRequest(params) @@ -153,13 +157,10 @@ export class MessageService { this.errorUploadingAttachment = false this.temporaryData = {} - const params = {roomId:this.rid, msg: this.msg, attachments: this.attachments, file: this.file, localReference: this.localReference} await this.sendRequest(params) - } else if(this.WsChatService.isLogin == false) { - this.WsChatService.registerCallback({ type: 'reConnect', funx: async ()=> { @@ -189,10 +190,6 @@ export class MessageService { } } - - - - if(this.NetworkServiceService.getCurrentNetworkStatus() == ConnectionStatus.Online) { this.WsChatService.send(params).then( @@ -243,13 +240,7 @@ export class MessageService { downloadFile = new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), ''); - } /* else if (this.file.type == 'application/audio') { - downloadFile = new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), ''); - } else if (this.file.type == 'application/vnd.openxmlformats-officedocument.wordprocessingml.document') { - downloadFile = new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), ''); - } */ - - + } this.attachments[0] = { image_url: downloadFile, diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts index e462da016..8f787e4d6 100644 --- a/src/app/services/chat/ws-chat-methods.service.ts +++ b/src/app/services/chat/ws-chat-methods.service.ts @@ -362,6 +362,15 @@ export class WsChatMethodsService { } } + + deleteRoom(roomId) { + delete this.group[roomId]; + + const index = this._group.findIndex((e)=> e.id == roomId); + + this._group = this._group.splice(index, 1); + } + roomExist(roomId) { return this.dm[roomId]?.id || this.group[roomId]?.id } diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts index 1b20755e1..8cf67a75b 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -45,6 +45,7 @@ export class ViewEventPage implements OnInit { @Input() profile:string; @Input() eventId: string; + @Input() CalendarId: string; @Output() viewEventDetailDismiss = new EventEmitter(); sesseionStora = SessionStore @@ -121,12 +122,12 @@ export class ViewEventPage implements OnInit { }); } else { - const event = this.CalendarService.eventSource.find((ele) => ele.id == this.eventId) + - if(event?.CalendarId) { + if(this.CalendarId) { - this.eventsService.genericGetEvent(this.eventId, event.CalendarId).subscribe(res => { + this.eventsService.genericGetEvent(this.eventId, this.CalendarId).subscribe(res => { this.loadedEvent = res; this.today = new Date(res.StartDate); this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]); @@ -162,10 +163,10 @@ export class ViewEventPage implements OnInit { }); } else { - const event = this.CalendarService.eventSource.find((ele) => ele.id == this.eventId) + - if(event?.CalendarId) { - this.eventsService.genericDeleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName, event?.CalendarId).subscribe(async () => { + if(this.CalendarId) { + this.eventsService.genericDeleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName, this.CalendarId).subscribe(async () => { this.toastService.successMessage('Evento apagado'); this.close(); },()=>{}, @@ -189,7 +190,7 @@ export class ViewEventPage implements OnInit { loader.remove(); }); } else { - this.eventsService.genericDeleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName, this.loadedEvent.CalendarId).subscribe(async () => { + this.eventsService.genericDeleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName, this.CalendarId).subscribe(async () => { this.toastService.successMessage('Evento apagado'); this.close(); },()=>{}, 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 aae449aab..a7e6989bb 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -359,7 +359,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe } async getChatMembers() { - //return await this.chatService.getMembers(roomId).toPromise(); + this.chatService.getAllUsers().subscribe(res => { // diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index af2f57df8..7efd240dc 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -606,17 +606,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy } - /* const popover = await this.popoverController.create({ - component: MessagesOptionsPage, - componentProps: { - roomId: this.dm._id, - }, - cssClass: 'messages-options', - event: ev, - translucent: true, - }); - return await popover.present(); */ - const modal = await this.modalController.create({ enterAnimation, leaveAnimation, @@ -631,7 +620,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy async takePictureMobile() { - console.log('take picture') + const roomId = this.roomId const file = await Camera.getPhoto({ diff --git a/src/app/shared/chat/new-group/new-group.page.ts b/src/app/shared/chat/new-group/new-group.page.ts index 72fb27529..f2f013e5d 100644 --- a/src/app/shared/chat/new-group/new-group.page.ts +++ b/src/app/shared/chat/new-group/new-group.page.ts @@ -1,15 +1,13 @@ -import { analyzeAndValidateNgModules } from '@angular/compiler'; import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; import { NavigationStart, Router } from '@angular/router'; import { ModalController, NavParams, PickerController, PopoverController } from '@ionic/angular'; import { AuthService } from 'src/app/services/auth.service'; -import { ChatService } from 'src/app/services/chat.service'; import { WsChatMethodsService } from 'src/app/services/chat/ws-chat-methods.service'; import { DataService } from 'src/app/services/data.service'; -import { ProcessesService } from 'src/app/services/processes.service'; import { GroupDurationPage } from 'src/app/shared/popover/group-duration/group-duration.page'; import { SessionStore } from 'src/app/store/session.service'; import { GroupContactsPage } from '../group-messages/group-contacts/group-contacts.page'; +import { ToastService } from 'src/app/services/toast.service'; @Component({ selector: 'app-new-group', @@ -25,7 +23,6 @@ export class NewGroupPage implements OnInit{ _day:any; selectedDuration = ['','','']; countDownTime:any; - //groupName:string; task:any; documents: any; loggedUserChat: any; @@ -41,11 +38,11 @@ export class NewGroupPage implements OnInit{ private router: Router, public wsChatMethodsService: WsChatMethodsService, private authService: AuthService, + private toastService: ToastService, ) { this.loggedUserChat = authService.ValidatedUserChat['data']; this.isGroupCreated = false; - //this.groupName = this.navParams.get('name'); } ngOnInit() { @@ -85,7 +82,7 @@ export class NewGroupPage implements OnInit{ this.addGroupMessage.emit(); } - async createGroup(){ + async createGroup() { let name = this.groupName.split(' ').join('-'); //Take out all special characters in string @@ -94,44 +91,61 @@ export class NewGroupPage implements OnInit{ let customFields = {} let res:any; - if(this.thedate){ + if(this.thedate) { let customFields = { "countDownDate":this.thedate } - res = await this.wsChatMethodsService.createPrivateRoom(name, SessionStore.user.UserName, customFields); - + res = await this.wsChatMethodsService.createPrivateRoom(name, SessionStore.user.UserName, customFields); } - else{ + else { res = await this.wsChatMethodsService.createPrivateRoom(name, SessionStore.user.UserName, customFields); + } + + + // FsId + // DocId + + if(res?.result?.rid) { + this.addGroupMessage.emit(res.result.rid); + await this.wsChatMethodsService.getAllRooms(); + + setTimeout(()=> { + this.documents.forEach(element => { + this.wsChatMethodsService.getGroupRoom(res.result.rid).send({ + file: { + "name": element.Assunto, + "type": "application/webtrix", + "ApplicationId": element.ApplicationId, + "DocId": element.DocId, + "Assunto": element.Assunto, + }, + temporaryData: { + data: { + selected: { + Id: element.DocId, + ApplicationType: element.ApplicationId + } + } + }, + attachments: [{ + "title": element.Assunto, + "description": element.Assunto, + "title_link_download": true, + "type": "webtrix", + "text": element.Assunto, + "thumb_url": "https://static.ichimura.ed.jp/uploads/2017/10/pdf-icon.png", + }], + }) + }); + + }, 500) + } else { + + this.toastService._badRequest('Existe um grupo com este nome!'); + } - this.wsChatMethodsService.subscribeToRoomUpdate(res.result.rid, res.result); - console.log(res.result.rid) - console.log(this.documents) - this.addGroupMessage.emit(res.result.rid); - this.documents.forEach(element => { - this.wsChatMethodsService.getGroupRoom(res.result.rid).send({ - file: { - "name": element.Assunto, - "type": "application/webtrix", - "ApplicationId": element.ApplicationId, - "DocId": element.DocId, - "Assunto": element.Assunto, - }, - temporaryData: res, - attachments: [{ - "title": element.Assunto, - "description": element.Assunto, - "title_link_download": true, - "type": "webtrix", - "text": element.Assunto, - "thumb_url": "https://static.ichimura.ed.jp/uploads/2017/10/pdf-icon.png", - }], - }) - }); - - this.wsChatMethodsService.getAllRooms() } async addContacts(){ @@ -177,28 +191,8 @@ export class NewGroupPage implements OnInit{ cssClass: 'btn-cancel', handler:(value:any)=>{ - - let now = new Date(); this.thedate = new Date(now.getFullYear(), now.getMonth(), now.getDate() + value.days.value, now.getHours() + value.hours.value, now.getMinutes() + value.minutes.value, now.getSeconds(), now.getMilliseconds()); - /* let timer = setInterval(() =>{ - - let difference = this.thedate.getTime() - new Date().getTime(); - this._day = Math.floor(difference/(1000*60*60*24)); - let c_day = Math.floor(difference/(1000*60*60*24)); - let c_hours = Math.floor((difference % (1000*60*60*24)) / (1000*60*60)); - let c_minutes = Math.floor((difference % (1000*60*60)) / (1000*60)); - let c_seconds = Math.floor((difference % (1000*60)) / 1000); - - this.countDownTime = c_day + ":" + c_hours + ":" + c_minutes + ":" + c_seconds ; - - if(difference < 0){ - clearInterval(timer); - this.countDownTime = "Expired"; - } - - }) */ - this.selectedDuration = [ value.days.value, @@ -297,7 +291,7 @@ export class NewGroupPage implements OnInit{ ] }); await picker.present(); - picker.onDidDismiss().then(async data =>{ + picker.onDidDismiss().then(async data => { let day = await picker.getColumn('days'); let hour = await picker.getColumn('hours'); let minutes = await picker.getColumn('minutes'); diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts index 80a36ef7e..5a8f58db4 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts @@ -32,7 +32,7 @@ export class DespachosPage implements OnInit { } } }); - } + } goToDespacho({ SerialNumber } : customTask) { this.router.navigate(['/home/gabinete-digital/despachos',SerialNumber,'gabinete-digital']); @@ -43,13 +43,9 @@ export class DespachosPage implements OnInit { this.skeletonLoader = true; await this.despachoRule.getList({updateStore: true}) - //this.skeletonLoader = false; + this.skeletonLoader = false; } - /* get skeletonLoader(): boolean { - return this.despachoRule.LoaderService.loading - } */ - doRefresh() { setTimeout(() => { this.LoadList(); diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts index d94f9e792..7891cd9f2 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts @@ -2,7 +2,6 @@ import { Component, Input, OnInit } from '@angular/core'; import { ActivatedRoute, NavigationStart, Router } from '@angular/router'; import { DailyWorkTask } from '../../../models/dailyworktask.model'; import { ProcessesService } from 'src/app/services/processes.service'; -import { ModalController } from '@ionic/angular'; import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; import { DeplomasStore } from 'src/app/store/deplomas.service'; import { ThemeService } from 'src/app/services/theme.service' diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.ts b/src/app/shared/popover/chat-popover/chat-popover.page.ts index b261064d2..4670a1537 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.ts +++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts @@ -78,6 +78,8 @@ export class ChatPopoverPage implements OnInit { let body = { "roomId":this.roomId, } let res:any = await this.wsChatMethodsService.leaveRoom(this.roomId); + this.wsChatMethodsService.deleteRoom(this.roomId) + diff --git a/src/app/shared/publication/edit-action/edit-action.page.html b/src/app/shared/publication/edit-action/edit-action.page.html index c09cbab66..c932bb657 100644 --- a/src/app/shared/publication/edit-action/edit-action.page.html +++ b/src/app/shared/publication/edit-action/edit-action.page.html @@ -3,16 +3,6 @@
Editar acção presidencial
-
diff --git a/src/app/shared/publication/edit-action/edit-action.page.ts b/src/app/shared/publication/edit-action/edit-action.page.ts index 05f6bc4f9..90192ca97 100644 --- a/src/app/shared/publication/edit-action/edit-action.page.ts +++ b/src/app/shared/publication/edit-action/edit-action.page.ts @@ -103,12 +103,12 @@ export class EditActionPage implements OnInit { await this.publicationsService.UpdatePresidentialAction(body).toPromise() this.close(); this.updateDesktopComponent.emit(); - this.toastService.successMessage('Acção presidencial atualizada') + this.toastService._successMessage('Acção presidencial atualizada') this.getActions.emit() } catch (error) { - this.toastService.badRequest('Não foi possivel atualizar a acção presidencial') - } finally { + this.toastService._badRequest('Não foi possivel atualizar a acção presidencial') + } finally { loader.remove() }