diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
index 7806b556e..7fb0feba0 100644
--- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
+++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
@@ -8,6 +8,7 @@ import { ImageModalPage } from '../../gallery/image-modal/image-modal.page';
import { NewPublicationPage } from '../../new-publication/new-publication.page';
import { Location } from '@angular/common';
import { ThemeService } from 'src/app/services/theme.service'
+import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
@Component({
@@ -122,7 +123,7 @@ export class PublicationDetailPage implements OnInit {
} finally {
loader.remove()
}
-
+
}
@@ -146,13 +147,17 @@ export class PublicationDetailPage implements OnInit {
});
}
- openPreview(imageUrl:string){
- this.modalController.create({
- component: ImageModalPage,
+ async openPreview(item) {
+ const modal = await this.modalController.create({
+ component: ViewMediaPage,
+ cssClass: 'modal modal-desktop',
componentProps: {
- imageUrl:imageUrl,
+ image: item.FileBase64,
+ username: item.Title,
+ _updatedAt: item.DatePublication
}
- }).then(modal => modal.present());
+ });
+ modal.present();
}
diff --git a/src/app/pages/publications/view-publications/view-publications.page.scss b/src/app/pages/publications/view-publications/view-publications.page.scss
index 77534f9d2..2eed91594 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.scss
+++ b/src/app/pages/publications/view-publications/view-publications.page.scss
@@ -45,8 +45,6 @@
width: 100%; /* 400px */
height: 100%;
font-family: Roboto;
- border-top-left-radius: 25px;
- border-top-right-radius: 25px;
background-color: #fff;
overflow:hidden;
padding: 25px 20px 0px 20px;
@@ -96,9 +94,11 @@
/* padding: 0!important; */
float: left;
margin: 2.5px 0 0 5px;
+ color: #000 !important;
}
.title{
font-size: 25px;
+ color: #000 !important;
}
.actions-icon{
@@ -126,7 +126,7 @@
}
.post-img{
width: 100%;
- height: 400px;
+ //height: 400px;
margin: 0 auto;
border-radius: 0px!important;
overflow: hidden;
diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts
index 3f25ff651..d95ba7411 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.ts
+++ b/src/app/pages/publications/view-publications/view-publications.page.ts
@@ -116,18 +116,12 @@ export class ViewPublicationsPage implements OnInit {
}
getPublicationDetail() {
-
- setTimeout(() => {
-
- let allActions = this.publicationEventFolderStorage.list.concat(this.publicationTravelFolderService.list)
- console.log('ACTION ACTION', this.publicationList)
- this.item = allActions.find((e) => e.ProcessId == this.folderId);
- this.publicationDitails = this.item
- console.log('item', this.item)
-
- }, 100);
-
+ this.publications.GetPresidentialAction(this.folderId).subscribe(res=>{
+ console.log(res);
+ this.item = res;
+ });
}
+
// goes to fork
// getPublicationsIds() {
@@ -178,14 +172,14 @@ export class ViewPublicationsPage implements OnInit {
this.showLoader = false;
/* this.publicationList = new Array();
-
+
res.forEach(element => {
console.log('getPublications', element)
let item: Publication = this.publicationPipe.itemList(element)
this.publicationList.push(item);
});
this.sqliteservice.updateactions(this.folderId, JSON.stringify(this.publicationList));
-
+
this.publicationListStorage.add(folderId, this.publicationList)
this.getpublication = this.publicationList; */
});
@@ -233,8 +227,8 @@ export class ViewPublicationsPage implements OnInit {
forkJoin([
this.getPublicationsIds(),
this.getPublications(),
-
-
+
+
]).subscribe(allResults =>{
this.publicationList = allResults[2]
})
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/services/functions/file.service.ts b/src/app/services/functions/file.service.ts
index 78f5c0a43..5973e67df 100644
--- a/src/app/services/functions/file.service.ts
+++ b/src/app/services/functions/file.service.ts
@@ -10,11 +10,9 @@ import { SearchList } from 'src/app/models/search-document';
import { ProcessesService } from '../processes.service';
import { ToastService } from '../toast.service';
import { Camera, CameraResultType, CameraSource, Photo} from '@capacitor/camera';
-import {
-FileSharer} from '@byteowls/capacitor-filesharer';
import { Filesystem, Directory } from '@capacitor/filesystem';
-import { Share } from '@capacitor/share';
-import { HttpClient } from '@angular/common/http';
+import { environment } from 'src/environments/environment';
+import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
const IMAGE_DIR = 'stored-images';
@@ -40,6 +38,8 @@ export class FileService {
photos: any[] = [];
idroom: any;
+ headers: HttpHeaders;
+
constructor(
private fileLoaderService: FileLoaderService,
private fileToBase64Service: FileToBase64Service,
@@ -50,9 +50,35 @@ export class FileService {
private toastService: ToastService,
private platform: Platform,
private loadingCtrl: LoadingController,
- private http: HttpClient
+ 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,
@@ -89,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 () => {
@@ -195,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 = {
@@ -236,11 +262,8 @@ export class FileService {
await this.saveImage(image,roomId)
}
- await Share.share({
- title: 'Check my image',
- url: image.path
- })
-
+ //this.capturedImage = this.capturedImage;
+
}
@@ -258,11 +281,6 @@ export class FileService {
await this.saveImage(capturedImage,roomId)
}
- await Share.share({
- title: 'Check my image',
- url: capturedImage.path
- })
-
/* const response = await fetch(capturedImage.webPath!);
const blob = await response.blob();
@@ -303,17 +321,17 @@ export class FileService {
reader.onloadend=()=>{
const result = reader.result as string
const base64Data = result.split(',')[1]
-
- FileSharer.share({
+
+ /* FileSharer.share({
filename:'any.pdf',
base64Data,
contentType: "application/pdf",
- })
+ }) */
reader.readAsDataURL(res)
}
-
+
})
-
+
}
addPictureToChat(roomId) {
@@ -335,10 +353,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 = {
@@ -350,8 +373,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,
+ }
}
}
@@ -359,10 +386,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/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..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
@@ -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;
@@ -187,6 +187,7 @@
.close-button {
display: none;
+ height: 20px;
}
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/publication/view-publications/publication-detail/publication-detail.page.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
index 0dc8d3c09..2890a9b3e 100644
--- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
+++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
@@ -8,6 +8,7 @@ import { ToastService } from 'src/app/services/toast.service';
import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { ThemeService } from 'src/app/services/theme.service'
+import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
@Component({
selector: 'app-publication-detail-shared',
@@ -32,7 +33,7 @@ export class PublicationDetailPage implements OnInit {
private toastService: ToastService,
public ThemeService: ThemeService
) {
-
+
/* this.folderId = this.navParams.get('folderIdId'); */
this.publication = {
DateIndex: null,
@@ -50,7 +51,7 @@ export class PublicationDetailPage implements OnInit {
ngOnInit() {
console.log(this.folderId);
-
+
/* console.log(this.publication.FileBase64); */
this.getPublicationDetail();
}
@@ -133,22 +134,26 @@ export class PublicationDetailPage implements OnInit {
}
- openPreview(imageUrl:string){
- this.modalController.create({
- component: ImageModalPage,
- componentProps: {
- imageUrl:imageUrl,
- }
- }).then(modal => modal.present());
- }
-
async goBack(){
this.goBackToViewPublications.emit();
}
+ async openPreview(item) {
+ const modal = await this.modalController.create({
+ component: ViewMediaPage,
+ cssClass: 'modal modal-desktop',
+ componentProps: {
+ image: item.FileBase64,
+ username: item.Title,
+ _updatedAt: item.DatePublication
+ }
+ });
+ modal.present();
+ }
+
+
-