From 227ad7190a90e06ce26a513081670172d0c1072f Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 9 Nov 2021 18:06:10 +0100 Subject: [PATCH 01/13] save --- .../publication/new-publication/new-publication.page.html | 6 ++++-- .../publication/new-publication/new-publication.page.ts | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) 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 8b2e040d5..d3f327380 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.html +++ b/src/app/shared/publication/new-publication/new-publication.page.html @@ -61,7 +61,8 @@
- + +
Tirar Fotografia @@ -72,7 +73,8 @@
- + +
Anexar Fotografia diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts index 50c3a3d32..f270cef56 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -8,6 +8,7 @@ import { ToastService } from 'src/app/services/toast.service'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { FileLoaderService } from 'src/app/services/file/file-loader.service' import { FileToBase64Service } from 'src/app/services/file/file-to-base64.service'; +import { ThemeService } from 'src/app/services/theme.service'; import { Camera, CameraResultType, CameraSource, Photo} from '@capacitor/camera'; @Component({ selector: 'app-new-publication', @@ -50,7 +51,8 @@ export class NewPublicationPage implements OnInit { private publications: PublicationsService, private toastService: ToastService, private fileLoaderService: FileLoaderService, - private fileToBase64Service: FileToBase64Service + private fileToBase64Service: FileToBase64Service, + public ThemeService: ThemeService ) { this.publicationTitle = 'Nova Publicação'; } From 94550db0eb0e6ed67006ae038badf3f56792cae2 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 10 Nov 2021 11:32:36 +0100 Subject: [PATCH 02/13] save --- package.json | 4 +-- .../pedidos/pedido/pedido.page.html | 5 ++- .../pedidos/pedido/pedido.page.ts | 31 ++++++++++++++++++- src/app/shared/header/header.page.html | 2 +- src/app/shared/header/header.page.ts | 2 +- .../request-options/request-options.page.html | 3 ++ .../request-options/request-options.page.ts | 31 ++++++++++++++++++- 7 files changed, 71 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index f11eabe0a..503a89ac7 100644 --- a/package.json +++ b/package.json @@ -35,11 +35,11 @@ "@capacitor/app": "^1.0.5", "@capacitor/camera": "^1.2.0", "@capacitor/core": "^3.3.0", + "@capacitor/filesystem": "^1.0.6", "@capacitor/haptics": "^1.1.2", + "@capacitor/ios": "3.3.0", "@capacitor/keyboard": "^1.1.2", "@capacitor/network": "^1.0.6", - "@capacitor/filesystem": "^1.0.6", - "@capacitor/ios": "3.3.0", "@capacitor/push-notifications": "^1.0.7", "@fortawesome/angular-fontawesome": "^0.9.0", "@fortawesome/fontawesome-free": "^5.15.3", diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index b83ec04b7..286865bd8 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -63,7 +63,7 @@
Documentos Anexados
- Marcar Reunião
+
+ +
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index a3bd8e8f7..0bc8b92a9 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -26,6 +26,8 @@ import { BackgroundService } from 'src/app/services/background.service'; import { PermissionService } from 'src/app/services/worker/permission.service'; import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; import { ThemeService } from 'src/app/services/theme.service' +import { DataService } from 'src/app/services/data.service'; +import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page'; @Component({ @@ -66,7 +68,8 @@ export class PedidoPage implements OnInit { private sqliteservice: SqliteService, private backgroundservices: BackgroundService, private platform: Platform, - public ThemeService: ThemeService + public ThemeService: ThemeService, + private dataService: DataService, ) { this.loggeduser = authService.ValidatedUser; @@ -477,6 +480,32 @@ export class PedidoPage implements OnInit { modal.onDidDismiss(); } + openNewGroupPage(){ + this.router.navigate(['/home/chat']); + this.dataService.set("newGroup", true); + + if( window.innerWidth < 801){ + this.newGroup(); + } + else{ + this.dataService.set("newGroup", true); + /* this.closeAllDesktopComponents(); + this.showNewGroup=true; */ + } + } + + async newGroup(){ + const modal = await this.modalController.create({ + component: NewGroupPage, + cssClass: 'modal modal-desktop', + componentProps: { + name: this.task.Folio, + }, + }); + await modal.present(); + modal.onDidDismiss(); + } + // async viewEventDetail(eventId: any) { // const modal = await this.modalController.create({ diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index abe6a5226..ad92feb8b 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -20,7 +20,7 @@ - {{loggeduser.Profile}} +
diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index 9633211b2..3a7671340 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -51,7 +51,7 @@ export class HeaderPage implements OnInit { ngOnInit() { this.hideSearch(); this.update() - /* this.notificationLengthData(); + /* this.notificationLengthData(); this.eventrigger.getObservable().subscribe(async (data) => { if (data.notification === "delete" || "recive") { await this.notificationLengthData(); diff --git a/src/app/shared/popover/request-options/request-options.page.html b/src/app/shared/popover/request-options/request-options.page.html index 31045eda0..7105f2577 100644 --- a/src/app/shared/popover/request-options/request-options.page.html +++ b/src/app/shared/popover/request-options/request-options.page.html @@ -54,5 +54,8 @@ +
+ +
diff --git a/src/app/shared/popover/request-options/request-options.page.ts b/src/app/shared/popover/request-options/request-options.page.ts index ed59e7c99..5cc63ba03 100644 --- a/src/app/shared/popover/request-options/request-options.page.ts +++ b/src/app/shared/popover/request-options/request-options.page.ts @@ -10,6 +10,8 @@ import { ProcessesService } from 'src/app/services/processes.service'; import { ToastService } from 'src/app/services/toast.service'; import { PedidoService } from 'src/app/Rules/pedido.service'; import { PermissionService } from 'src/app/services/worker/permission.service'; +import { DataService } from 'src/app/services/data.service'; +import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page'; @Component({ @@ -34,7 +36,8 @@ export class RequestOptionsPage implements OnInit { private toastService: ToastService, private router: Router, public p: PermissionService, - private pedidoService: PedidoService + private pedidoService: PedidoService, + private dataService: DataService, ) { this.task = this.navParams.get('task'); this.fulltask = this.navParams.get('fulltask'); @@ -109,6 +112,32 @@ export class RequestOptionsPage implements OnInit { modal.onDidDismiss(); } + openNewGroupPage(){ + this.router.navigate(['/home/chat']); + this.dataService.set("newGroup", true); + + if( window.innerWidth < 801){ + this.newGroup(); + } + else{ + this.dataService.set("newGroup", true); + /* this.closeAllDesktopComponents(); + this.showNewGroup=true; */ + } + } + + async newGroup(){ + const modal = await this.modalController.create({ + component: NewGroupPage, + cssClass: 'modal modal-desktop', + componentProps: { + name: this.task.Folio, + }, + }); + await modal.present(); + modal.onDidDismiss(); + } + async openExpedientActionsModal(taskAction: any, task: any) { //this.modalController.dismiss(); From f4f7976a6d90f3623631ff7d0d060270f39b8ba9 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 1 Dec 2021 15:11:54 +0100 Subject: [PATCH 03/13] save --- src/app/pages/chat/chat.page.ts | 6 +++--- src/app/pages/chat/messages/messages.page.ts | 4 ++++ .../expediente-detail.page.html | 2 +- .../expediente-detail.page.ts | 7 ++++--- .../pedidos/pedido/pedido.page.html | 2 +- .../pedidos/pedido/pedido.page.ts | 7 ++++--- .../group-messages/group-messages.page.ts | 2 +- .../shared/chat/new-group/new-group.page.ts | 20 ++++++++++++++++--- 8 files changed, 35 insertions(+), 15 deletions(-) diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 9056c7ef8..b6b265601 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -153,14 +153,14 @@ export class ChatPage implements OnInit { console.log(t); this.setStatus('away'); - if(this.dataService.get("newGroup")){ + /* if(this.dataService.get("newGroup")){ this.openNewGroupPage(); - } + } */ this.router.events.forEach((event) => { if (event instanceof NavigationStart && event.url.startsWith('/home/chat')) { if (window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/chat')) { - alert('OIII') + //alert('OIII') } else { if(this.dataService.get("newGroup")){ this.openNewGroupPage(); diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index 7d14e8fcd..aac84926d 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -583,4 +583,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { }); } + openPreview(){ + + } + } diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index 5e500863d..25b9444c2 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -118,7 +118,7 @@ - + diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 4adf39246..1307cae28 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -615,7 +615,7 @@ export class ExpedienteDetailPage implements OnInit { return await popover.present(); } - openNewGroupPage(){ + openNewGroupPage(task?:any){ this.router.navigate(['/home/chat']); this.dataService.set("newGroup", true); @@ -624,8 +624,8 @@ export class ExpedienteDetailPage implements OnInit { } else{ this.dataService.set("newGroup", true); - /* this.closeAllDesktopComponents(); - this.showNewGroup=true; */ + this.dataService.set("task", this.task); + this.dataService.set("newGroupName", this.task.Folio); } } @@ -635,6 +635,7 @@ export class ExpedienteDetailPage implements OnInit { cssClass: 'modal modal-desktop', componentProps: { name: this.task.Folio, + task: this.task }, }); await modal.present(); diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index 286865bd8..65578e163 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -131,7 +131,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 0bc8b92a9..e931d8802 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -480,7 +480,7 @@ export class PedidoPage implements OnInit { modal.onDidDismiss(); } - openNewGroupPage(){ + openNewGroupPage(task?:any){ this.router.navigate(['/home/chat']); this.dataService.set("newGroup", true); @@ -489,8 +489,8 @@ export class PedidoPage implements OnInit { } else{ this.dataService.set("newGroup", true); - /* this.closeAllDesktopComponents(); - this.showNewGroup=true; */ + this.dataService.set("task", this.task); + this.dataService.set("newGroupName", this.task.Folio); } } @@ -500,6 +500,7 @@ export class PedidoPage implements OnInit { cssClass: 'modal modal-desktop', componentProps: { name: this.task.Folio, + task: this.task }, }); await modal.present(); 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 9e57e30e8..9c9d56edb 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -553,7 +553,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe 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"); console.log(url_no_options); - console.log('Oie'); + //console.log('Oie'); let body = { "message": 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 1c183a0cd..afcdba940 100644 --- a/src/app/shared/chat/new-group/new-group.page.ts +++ b/src/app/shared/chat/new-group/new-group.page.ts @@ -1,7 +1,8 @@ import { analyzeAndValidateNgModules } from '@angular/compiler'; -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; import { ModalController, NavParams, PickerController, PopoverController } from '@ionic/angular'; import { ChatService } from 'src/app/services/chat.service'; +import { DataService } from 'src/app/services/data.service'; import { GroupDurationPage } from 'src/app/shared/popover/group-duration/group-duration.page'; import { GroupContactsPage } from '../group-messages/group-contacts/group-contacts.page'; @@ -10,7 +11,7 @@ import { GroupContactsPage } from '../group-messages/group-contacts/group-contac templateUrl: './new-group.page.html', styleUrls: ['./new-group.page.scss'], }) -export class NewGroupPage implements OnInit { +export class NewGroupPage implements OnInit{ isGroupCreated:boolean; showLoader: boolean; displayDuration: any; @@ -20,6 +21,7 @@ export class NewGroupPage implements OnInit { selectedDuration = ['','','']; countDownTime:any; //groupName:string; + task:any; @Input() groupName:string; @Output() addGroupMessage:EventEmitter = new EventEmitter(); @@ -29,16 +31,28 @@ export class NewGroupPage implements OnInit { private popoverController: PopoverController, private modalController: ModalController, private chatService: ChatService, - //private navParams: NavParams, + private dataService:DataService, ) { this.isGroupCreated = false; //this.groupName = this.navParams.get('name'); + } ngOnInit() { + if(this.dataService.get("newGroup")){ + this.task = this.dataService.get("task"); + this.groupName = this.task.Folio; + } + console.log(this.task); } + /* ngOnDestroy(){ + alert('Destroy') + this.dataService.set("newGroup", false); + this.dataService.set("task", null); + this.dataService.set("newGroupName", ''); + } */ _ionChange(event){ console.log(event); console.log(event.detail.checked); From 1a804bae15319cfeb00cf14711dcce9e98d090bc Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 1 Dec 2021 15:17:07 +0100 Subject: [PATCH 04/13] save --- src/app/pages/chat/messages/messages.page.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index 971268b39..214c66532 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -25,7 +25,7 @@ import { VoiceRecorder, VoiceRecorderPlugin, RecordingData, GenericResponse, Cur import { Haptics, ImpactStyle } from '@capacitor/haptics'; import { PreviewCameraPage } from 'src/app/modals/preview-camera/preview-camera.page'; // import { SocialSharing } from '@ionic-native/social-sharing/ngx'; -//import { Share } from '@capacitor/share'; +import { Share } from '@capacitor/share'; const IMAGE_DIR = 'stored-images'; From 1c9b3ba36afc6fae78f670ed96b0397dd91aaa5a Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 6 Dec 2021 16:00:57 +0100 Subject: [PATCH 05/13] save --- .../group-messages/group-messages.module.ts | 5 +- .../group-messages/group-messages.page.html | 6 +- src/app/services/functions/file.service.ts | 63 +++++++++++++++---- src/app/services/processes.service.ts | 13 ++++ src/app/shared/chat/messages/messages.page.ts | 25 +++++--- 5 files changed, 85 insertions(+), 27 deletions(-) diff --git a/src/app/pages/chat/group-messages/group-messages.module.ts b/src/app/pages/chat/group-messages/group-messages.module.ts index cc970708b..d5c64132d 100644 --- a/src/app/pages/chat/group-messages/group-messages.module.ts +++ b/src/app/pages/chat/group-messages/group-messages.module.ts @@ -19,15 +19,14 @@ import { AngularCropperjsModule } from 'angular-cropperjs'; @NgModule({ imports: [ CommonModule, - BrowserModule, FormsModule, FontAwesomeModule, IonicModule, GroupMessagesPageRoutingModule, ChatPopoverPageModule, BtnModalDismissPageModule, - ImageCropperModule, - AngularCropperjsModule + /* ImageCropperModule, + AngularCropperjsModule */ ], declarations: [GroupMessagesPage] 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 fe648ee08..f521c4176 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -53,7 +53,7 @@
- Esta conversa passou a grupo
+ Esta conversa passou a grupo TIAGO
A conversa original mantêm-se como chat individual
@@ -90,9 +90,9 @@
- + - + {{last ? scrollToBottom() : ''}} diff --git a/src/app/services/functions/file.service.ts b/src/app/services/functions/file.service.ts index 146f8cb91..90f969fdf 100644 --- a/src/app/services/functions/file.service.ts +++ b/src/app/services/functions/file.service.ts @@ -12,6 +12,8 @@ import { ToastService } from '../toast.service'; import { Camera, CameraResultType, CameraSource, Photo} from '@capacitor/camera'; import { Filesystem, Directory } from '@capacitor/filesystem'; +import { environment } from 'src/environments/environment'; +import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; const IMAGE_DIR = 'stored-images'; @@ -36,6 +38,8 @@ export class FileService { photos: any[] = []; idroom: any; + headers: HttpHeaders; + constructor( private fileLoaderService: FileLoaderService, private fileToBase64Service: FileToBase64Service, @@ -45,9 +49,36 @@ export class FileService { private processesService: ProcessesService, private toastService: ToastService, private platform: Platform, - private loadingCtrl: LoadingController + private loadingCtrl: LoadingController, + private http: HttpClient, ) { } + uploadFile(formData:any){ + alert('OIEE') + + //const geturl = environment.apiURL + 'Tasks/DelegateTask'; + const geturl = environment.apiURL + 'lakefs/UploadFiles'; + + let options = { + headers: this.headers + }; + + return this.http.post(`${geturl}`, formData, options); + } + + getFile(guid:any){ + const geturl = environment.apiURL + 'lakefs/StreamFile'; + let params = new HttpParams(); + + params = params.set("path", guid); + + let options = { + headers: this.headers, + params: params + }; + return this.http.get(`${geturl}`, options); + } + async takePicture() { const capturedImage = await Camera.getPhoto({ quality: 90, @@ -84,9 +115,9 @@ export class FileService { reader.readAsDataURL(blob); }); - loadPicture() { + async loadPicture() { const input = this.fileLoaderService.createInput({ - accept: ['image/apng', 'image/jpeg', 'image/png'] + accept: ['image/apng', 'image/jpeg', 'image/png', '.pdf'] }) input.onchange = async () => { @@ -190,7 +221,7 @@ export class FileService { console.log('ALL IMAGE', this.images) this.capturedImage = this.images[0].data - + this.capturedImageTitle = new Date().getTime() + '.jpeg'; let body = { @@ -239,7 +270,7 @@ export class FileService { }); */ //this.capturedImage = this.capturedImage; - + } @@ -309,10 +340,15 @@ export class FileService { const file = this.fileLoaderService.getFirstFile(input) console.log(file); - const loader = this.toastService.loading(); - const imageData = await this.fileToBase64Service.convert(file) - this.capturedImage = imageData; + + const formData = new FormData(); + formData.append("blobFile", file); + let guid: any = await this.uploadFile(formData).toPromise() + console.log(guid.path); + + /* const imageData = await this.fileToBase64Service.convert(file) + this.capturedImage = imageData; */ this.capturedImageTitle = file.name; let body = { @@ -324,8 +360,12 @@ export class FileService { //"title": this.capturedImageTitle , //"text": "description", "title_link_download": false, - "image_url": this.capturedImage, - }] + //"image_url": this.capturedImage, + }], + "file":{ + "type": "application/img", + "guid": guid.path, + } } } @@ -333,10 +373,9 @@ export class FileService { console.log(this.capturedImage) this.chatService.sendMessage(body).subscribe(res=> { - loader.remove(); + //console.log(res); },(error) => { - loader.remove(); }); //console.log(this.capturedImage) }; diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index 24404944e..0385d53b5 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -43,6 +43,19 @@ export class ProcessesService { this.headers = this.headers.set('Authorization', this.loggeduser.BasicAuthKey); } + uploadFile(formData:any){ + alert('OIEE') + + //const geturl = environment.apiURL + 'Tasks/DelegateTask'; + const geturl = environment.apiURL + 'lakefs/UploadFiles'; + + let options = { + headers: this.headers + }; + + return this.http.post(`${geturl}`, formData, options); + } + GetTasksList(processname: typeof GetTasksListType, onlycount:boolean): Observable { const geturl = environment.apiURL + 'tasks/List'; diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index b3eec13c2..d48d45c12 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -246,7 +246,12 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy } viewDocument(file:any, url?:string){ - if(file.type == "application/webtrix") { + if(file.type == "application/img"){ + console.log(file); + + //this.fileService.getFile().toPromise(); + } + else if(file.type == "application/webtrix") { this.openViewDocumentModal(file); } else{ @@ -428,8 +433,10 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy this.fileService.addCameraPictureToChat(roomId); } addImage(){ - const roomId = this.roomId + const roomId = this.roomId; this.fileService.addPictureToChat(roomId); + //this.fileService.loadPicture(); + //this.fileService.addPictureToChat(roomId); } addFile(){ this.fileService.addDocumentToChat(this.roomId); @@ -563,7 +570,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy }; zoomActive = false; zoomScale = 1; - + sliderZoomOpts = { allowSlidePrev: false, allowSlideNext: false, @@ -571,27 +578,27 @@ sliderZoomOpts = { maxRatio: 5 }, on: { - zoomChange: (scale, imageEl, slideEl) => { + zoomChange: (scale, imageEl, slideEl) => { this.zoomActive = true; this.zoomScale = scale/5; - this.changeDetectorRef.detectChanges(); + this.changeDetectorRef.detectChanges(); } } } - + async touchEnd(zoomslides: IonSlides, card) { // Zoom back to normal const slider = await zoomslides.getSwiper(); const zoom = slider.zoom; zoom.out(); - + // Card back to normal card.el.style['z-index'] = 9; - + this.zoomActive = false; this.changeDetectorRef.detectChanges(); } - + touchStart(card) { // Make card appear above backdrop card.el.style['z-index'] = 11; From 303e78f336c7d99245277eaf0a63c50716343765 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 7 Dec 2021 10:59:12 +0100 Subject: [PATCH 06/13] save --- src/app/shared/chat/messages/messages.page.html | 4 ++-- src/app/shared/chat/messages/messages.page.ts | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index 8f1fe149b..1913cd9c6 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -37,7 +37,7 @@
-
+
@@ -57,7 +57,7 @@
-
+
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index d48d45c12..3cd9f78ef 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -245,14 +245,16 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy }) } - viewDocument(file:any, url?:string){ - if(file.type == "application/img"){ - console.log(file); + async viewDocument(msg:any, url?:string){ + if(msg.file.type == "application/img"){ + let response:any = await this.fileService.getFile(msg.file.guid).toPromise(); + console.log(response); + + //this.openPreview(msg); - //this.fileService.getFile().toPromise(); } - else if(file.type == "application/webtrix") { - this.openViewDocumentModal(file); + else if(msg.file.type == "application/webtrix") { + this.openViewDocumentModal(msg.file); } else{ let fullUrl; From d4f44cb4a983920a9a22178255cdeedd7061789e Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 7 Dec 2021 15:03:19 +0100 Subject: [PATCH 07/13] background --- src/app/pages/events/edit-event/edit-event.page.scss | 2 +- src/app/services/events/edit-event/edit-event.page.scss | 2 +- .../edit-event-to-approve/edit-event-to-approve.page.scss | 4 ++-- src/app/shared/agenda/edit-event/edit-event.page.scss | 2 +- .../edit-event-to-approve/edit-event.page.scss | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/pages/events/edit-event/edit-event.page.scss b/src/app/pages/events/edit-event/edit-event.page.scss index c19854413..4fa564390 100644 --- a/src/app/pages/events/edit-event/edit-event.page.scss +++ b/src/app/pages/events/edit-event/edit-event.page.scss @@ -105,7 +105,7 @@ .attach-title-item{ width: 100%; font-size: 15px; - color:#0d89d1; + color:var(--title-text-color); } /* SPAN */ .span-left{ diff --git a/src/app/services/events/edit-event/edit-event.page.scss b/src/app/services/events/edit-event/edit-event.page.scss index c19854413..4fa564390 100644 --- a/src/app/services/events/edit-event/edit-event.page.scss +++ b/src/app/services/events/edit-event/edit-event.page.scss @@ -105,7 +105,7 @@ .attach-title-item{ width: 100%; font-size: 15px; - color:#0d89d1; + color:var(--title-text-color); } /* SPAN */ .span-left{ diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss index 2073e52d8..6b06a4193 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss @@ -105,7 +105,7 @@ .attach-title-item{ width: 100%; font-size: 15px; - color:#0d89d1; + color:var(--title-text-color); } /* SPAN */ .span-left{ @@ -168,7 +168,7 @@ .app-name{ - background: #42b9f2; + background: var(--title-text-color); border-radius: 18px; text-align: center; display: flex; diff --git a/src/app/shared/agenda/edit-event/edit-event.page.scss b/src/app/shared/agenda/edit-event/edit-event.page.scss index 4ef1fdcce..d04552bf2 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.scss +++ b/src/app/shared/agenda/edit-event/edit-event.page.scss @@ -172,7 +172,7 @@ ion-content{ .app-name{ - background: #42b9f2; + background: var(--title-text-color); border-radius: 18px; text-align: center; display: flex; diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss index 143d807e0..9d2c5aef8 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss @@ -105,7 +105,7 @@ .attach-title-item{ width: 100%; font-size: 15px; - color:#0d89d1; + color:var(--title-text-color); } /* SPAN */ .span-left{ @@ -168,7 +168,7 @@ .app-name{ - background: #42b9f2; + background: var(--title-text-color); border-radius: 18px; text-align: center; display: flex; From a14a1aa46814a1e6061dea8e49a5c80d837feacb Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 7 Dec 2021 15:34:39 +0100 Subject: [PATCH 08/13] Improve --- src/app/shared/agenda/edit-event/edit-event.page.html | 1 + src/app/shared/agenda/edit-event/edit-event.page.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 f0a6432c6..a215c8d49 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -285,6 +285,7 @@
+
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index 609cc47d9..0c25fa514 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -143,7 +143,7 @@ export class EditEventPage implements OnInit { } ngOnChanges(changes: any): void { - // this.loadedEventAttachments = this.loadedEventAttachments.concat(this.postEvent.Attachments) + this.loadedEventAttachments = this.loadedEventAttachments.concat(this.postEvent.Attachments) } close() { From 1801ea9b6abdc5a465224cf171466b45aa7dbc19 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 7 Dec 2021 16:07:01 +0100 Subject: [PATCH 09/13] Improve --- .../modals/create-process/create-process.page.scss | 2 ++ .../document-set-up-meeting.page.scss | 2 ++ .../pages/agenda/edit-event/edit-event.page.scss | 2 ++ src/app/pages/agenda/new-event/new-event.page.scss | 1 + .../approve-event-modal.page.scss | 14 ++++++++------ .../book-meeting-modal.page.scss | 1 + .../expedient-task-modal.page.scss | 1 + .../edit-event-to-approve.page.scss | 1 + .../shared/agenda/edit-event/edit-event.page.scss | 2 ++ .../shared/agenda/new-event/new-event.page.scss | 1 + .../edit-event-to-approve/edit-event.page.scss | 1 + 11 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.scss b/src/app/modals/create-process/create-process.page.scss index c557abb39..272d39b0a 100644 --- a/src/app/modals/create-process/create-process.page.scss +++ b/src/app/modals/create-process/create-process.page.scss @@ -133,6 +133,7 @@ .close-button { display: none; + height: 20px; } @@ -144,6 +145,7 @@ .close-button { display: block !important; + height: 20px; } } diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.scss b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.scss index d3709536d..6f8e92996 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.scss +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.scss @@ -194,6 +194,7 @@ .close-button { display: none; + height: 20px; } @@ -205,6 +206,7 @@ .close-button { display: block !important; + height: 20px; } } \ No newline at end of file diff --git a/src/app/pages/agenda/edit-event/edit-event.page.scss b/src/app/pages/agenda/edit-event/edit-event.page.scss index 49c63f67d..d4d458299 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.scss +++ b/src/app/pages/agenda/edit-event/edit-event.page.scss @@ -188,6 +188,7 @@ .close-button { display: none; + height: 20px; } @@ -199,5 +200,6 @@ .close-button { display: block !important; + height: 20px; } } \ No newline at end of file diff --git a/src/app/pages/agenda/new-event/new-event.page.scss b/src/app/pages/agenda/new-event/new-event.page.scss index bcebc9bd3..32661e0e6 100644 --- a/src/app/pages/agenda/new-event/new-event.page.scss +++ b/src/app/pages/agenda/new-event/new-event.page.scss @@ -199,6 +199,7 @@ ion-content{ .close-button { display: none; + height: 20px; } diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss index 347959730..ca453b2a7 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss @@ -163,18 +163,20 @@ ion-menu{ .close-button { display: none; +height: 20px; } .list:hover { -.app-name { - display: none; -} + .app-name { + display: none; + } -.close-button { - display: block !important; -} + .close-button { + display: block !important; + height: 20px; + } } .attach-title-item{ diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss index b3bd9e3ef..3cf19e5e9 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss @@ -193,6 +193,7 @@ .close-button { display: none; + height: 20px; } diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss index 29fe12990..d2ead195f 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss @@ -173,6 +173,7 @@ font-size: 13px; .close-button { display: none; + height: 20px; } diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss index 6b06a4193..1785b7fb2 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss @@ -187,6 +187,7 @@ .close-button { display: none; + height: 20px; } diff --git a/src/app/shared/agenda/edit-event/edit-event.page.scss b/src/app/shared/agenda/edit-event/edit-event.page.scss index d04552bf2..a9fe5b41b 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.scss +++ b/src/app/shared/agenda/edit-event/edit-event.page.scss @@ -191,6 +191,7 @@ ion-content{ .close-button { display: none; + height: 20px; } .list:hover { @@ -201,6 +202,7 @@ ion-content{ .close-button { display: block !important; + height: 20px; } } diff --git a/src/app/shared/agenda/new-event/new-event.page.scss b/src/app/shared/agenda/new-event/new-event.page.scss index b0b302e16..8e09e036d 100644 --- a/src/app/shared/agenda/new-event/new-event.page.scss +++ b/src/app/shared/agenda/new-event/new-event.page.scss @@ -199,6 +199,7 @@ .close-button { display: none; + height: 20px; } .list:hover { diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss index 9d2c5aef8..c43334586 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss @@ -187,6 +187,7 @@ .close-button { display: none; + height: 20px; } From f645256388575926d44918426e0124e3a9599962 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 7 Dec 2021 17:25:04 +0100 Subject: [PATCH 10/13] Fix visual bug --- src/app/modals/create-process/create-process.page.scss | 2 +- .../document-set-up-meeting/document-set-up-meeting.page.scss | 2 +- src/app/pages/agenda/edit-event/edit-event.page.scss | 2 +- src/app/pages/agenda/new-event/new-event.page.scss | 2 +- .../approve-event-modal/approve-event-modal.page.scss | 2 +- .../book-meeting-modal/book-meeting-modal.page.scss | 2 +- .../expedient-task-modal/expedient-task-modal.page.scss | 4 ++-- src/app/shared/agenda/new-event/new-event.page.scss | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.scss b/src/app/modals/create-process/create-process.page.scss index 272d39b0a..f2b91b59a 100644 --- a/src/app/modals/create-process/create-process.page.scss +++ b/src/app/modals/create-process/create-process.page.scss @@ -151,7 +151,7 @@ .app-name{ - background: #42b9f2; + background: var(--title-text-color); border-radius: 18px; text-align: center; display: flex; diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.scss b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.scss index 6f8e92996..0b163bcef 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.scss +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.scss @@ -175,7 +175,7 @@ .app-name{ - background: #42b9f2; + background: var(--title-text-color); border-radius: 18px; text-align: center; display: flex; diff --git a/src/app/pages/agenda/edit-event/edit-event.page.scss b/src/app/pages/agenda/edit-event/edit-event.page.scss index d4d458299..872268000 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.scss +++ b/src/app/pages/agenda/edit-event/edit-event.page.scss @@ -169,7 +169,7 @@ .app-name{ - background: #42b9f2; + background: var(--title-text-color); border-radius: 18px; text-align: center; display: flex; diff --git a/src/app/pages/agenda/new-event/new-event.page.scss b/src/app/pages/agenda/new-event/new-event.page.scss index 32661e0e6..905df261e 100644 --- a/src/app/pages/agenda/new-event/new-event.page.scss +++ b/src/app/pages/agenda/new-event/new-event.page.scss @@ -180,7 +180,7 @@ ion-content{ .app-name{ - background: #42b9f2; + background: var(--title-text-color); border-radius: 18px; text-align: center; display: flex; diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss index ca453b2a7..30a0b66e6 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss @@ -144,7 +144,7 @@ ion-menu{ .app-name{ - background: #42b9f2; + background: var(--title-text-color); border-radius: 18px; text-align: center; display: flex; diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss index 3cf19e5e9..a27d6e083 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss @@ -174,7 +174,7 @@ .app-name{ - background: #42b9f2; + background: var(--title-text-color); border-radius: 18px; text-align: center; display: flex; diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss index d2ead195f..779ab1a8b 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss @@ -154,7 +154,7 @@ font-size: 13px; .app-name{ - background: #42b9f2; + background: var(--title-text-color); border-radius: 18px; text-align: center; display: flex; @@ -190,7 +190,7 @@ font-size: 13px; .app-name{ - background: #42b9f2; + background: var(--title-text-color); border-radius: 18px; text-align: center; display: flex; diff --git a/src/app/shared/agenda/new-event/new-event.page.scss b/src/app/shared/agenda/new-event/new-event.page.scss index 8e09e036d..3a2b56399 100644 --- a/src/app/shared/agenda/new-event/new-event.page.scss +++ b/src/app/shared/agenda/new-event/new-event.page.scss @@ -180,7 +180,7 @@ } .app-name{ - background: #42b9f2; + background: var(--title-text-color); border-radius: 18px; text-align: center; display: flex; From 5846acd629dafe9618755064fb62b9a88811c992 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 7 Dec 2021 17:25:09 +0100 Subject: [PATCH 11/13] fix media preview for tablet and desktop --- src/app/app-routing.module.ts | 4 ++ .../view-media/view-media-routing.module.ts | 17 +++++ .../modals/view-media/view-media.module.ts | 22 ++++++ .../modals/view-media/view-media.page.html | 22 ++++++ .../modals/view-media/view-media.page.scss | 70 +++++++++++++++++++ .../modals/view-media/view-media.page.spec.ts | 24 +++++++ src/app/modals/view-media/view-media.page.ts | 30 ++++++++ .../pages/chat/messages/messages.page.html | 6 +- src/app/pages/chat/messages/messages.page.ts | 5 +- .../view-publications.page.scss | 6 +- .../view-publications.page.ts | 23 +++--- .../shared/chat/messages/messages.page.html | 5 +- src/app/shared/chat/messages/messages.page.ts | 5 +- 13 files changed, 214 insertions(+), 25 deletions(-) create mode 100644 src/app/modals/view-media/view-media-routing.module.ts create mode 100644 src/app/modals/view-media/view-media.module.ts create mode 100644 src/app/modals/view-media/view-media.page.html create mode 100644 src/app/modals/view-media/view-media.page.scss create mode 100644 src/app/modals/view-media/view-media.page.spec.ts create mode 100644 src/app/modals/view-media/view-media.page.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index db3b417bf..69db837c9 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -223,6 +223,10 @@ const routes = [ path: 'custom-image-cache', loadChildren: () => import('./services/file/custom-image-cache/custom-image-cache.module').then( m => m.CustomImageCachePageModule) }, + { + path: 'view-media', + loadChildren: () => import('./modals/view-media/view-media.module').then( m => m.ViewMediaPageModule) + }, diff --git a/src/app/modals/view-media/view-media-routing.module.ts b/src/app/modals/view-media/view-media-routing.module.ts new file mode 100644 index 000000000..e21bc8eb9 --- /dev/null +++ b/src/app/modals/view-media/view-media-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { ViewMediaPage } from './view-media.page'; + +const routes: Routes = [ + { + path: '', + component: ViewMediaPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class ViewMediaPageRoutingModule {} diff --git a/src/app/modals/view-media/view-media.module.ts b/src/app/modals/view-media/view-media.module.ts new file mode 100644 index 000000000..7a78f5148 --- /dev/null +++ b/src/app/modals/view-media/view-media.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { ViewMediaPageRoutingModule } from './view-media-routing.module'; + +import { ViewMediaPage } from './view-media.page'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + FontAwesomeModule, + ViewMediaPageRoutingModule + ], + declarations: [ViewMediaPage] +}) +export class ViewMediaPageModule {} diff --git a/src/app/modals/view-media/view-media.page.html b/src/app/modals/view-media/view-media.page.html new file mode 100644 index 000000000..75b8f918e --- /dev/null +++ b/src/app/modals/view-media/view-media.page.html @@ -0,0 +1,22 @@ + +
+
+ +
+
+
+ {{name}}, {{_updatedAt | date}} + +
+
+
+ + +
+
+ +
+
+ diff --git a/src/app/modals/view-media/view-media.page.scss b/src/app/modals/view-media/view-media.page.scss new file mode 100644 index 000000000..527acab31 --- /dev/null +++ b/src/app/modals/view-media/view-media.page.scss @@ -0,0 +1,70 @@ +.main-header{ + width: 100%; /* 400px */ + height: 100%; + font-family: Roboto; + border-top-left-radius: 25px; + border-top-right-radius: 25px; + background-color: #fff; + overflow:hidden; + padding: 30px 20px 5px 20px; + color:#000; + transform: translate3d(0, 1px, 0); + + .left{ + width: fit-content; + float: left; + //font-size: 35px; + overflow: hidden; + + .header-top-btn{ + background: transparent; + font-size: 25px !important; + font-weight: 100 !important; + /* color: #0782c9; */ + color: #42b9fe; + } + } + + .middle-container{ + overflow: auto; + width:calc(100% - 45px); + height: auto; + + .middle{ + padding: 0!important; + float: left; + width:calc(100% - 77px); + margin: 0px 0 0 10px; + display: flex; + align-items: center; + + .title{ + font-size: 25px; + white-space: nowrap; + overflow: hidden !important; + text-overflow: ellipsis !important; + float: left; + } + } + } +} + +.media { + background-color: #ebebeb; + padding: 10px !important; + height: 100% !important; + overflow: auto !important; + + .media-content{ + height: 100% !important; + overflow: auto !important; + img{ + width: fit-content !important; + height: 100% !important; + } + } +} + + + + diff --git a/src/app/modals/view-media/view-media.page.spec.ts b/src/app/modals/view-media/view-media.page.spec.ts new file mode 100644 index 000000000..8759d3bdb --- /dev/null +++ b/src/app/modals/view-media/view-media.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { ViewMediaPage } from './view-media.page'; + +describe('ViewMediaPage', () => { + let component: ViewMediaPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ ViewMediaPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(ViewMediaPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/modals/view-media/view-media.page.ts b/src/app/modals/view-media/view-media.page.ts new file mode 100644 index 000000000..a5754085b --- /dev/null +++ b/src/app/modals/view-media/view-media.page.ts @@ -0,0 +1,30 @@ +import { Component, OnInit } from '@angular/core'; +import { ModalController, NavParams } from '@ionic/angular'; + +@Component({ + selector: 'app-view-media', + templateUrl: './view-media.page.html', + styleUrls: ['./view-media.page.scss'], +}) +export class ViewMediaPage implements OnInit { + + image: any; + name: string + _updatedAt: string + + constructor( + private modalController: ModalController, + private navParams:NavParams, + ) { + this.image = this.navParams.get('image') + this.name = this.navParams.get('username') + this._updatedAt = this.navParams.get('_updatedAt') + } + + ngOnInit() { + } + + close(){ + this.modalController.dismiss() + } +} diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index cf14f59d9..c90e3e349 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -60,7 +60,9 @@ {{msg.msg}}
- image +
+ image +
@@ -138,7 +140,7 @@ -->
- +