-
+ (click)="viewPublicationDetail(publication.ProcessId,publication.DocumentId)">
+
+
-
+
- {{publication.title}}
+ {{publication.Title}}
-
{{publication.date}}
+
{{publication.DatePublication | date: 'dd-MM-yy | h:mm'}}
-
{{publication.description}}
+
{{publication.Message}}
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 3d977d554..56275f153 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.scss
+++ b/src/app/pages/publications/view-publications/view-publications.page.scss
@@ -125,13 +125,13 @@
margin-top: 5px;
}
.post-title{
- width: 80%;
+ width: 60%;
float: left;
font-size: 15px;
color: #0d89d1;
}
.post-data{
- width: 20%;
+ width: 40%;
float: left;
font-size: 13px;
color: #797979;
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 37a568091..e8008887a 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.ts
+++ b/src/app/pages/publications/view-publications/view-publications.page.ts
@@ -12,6 +12,8 @@ import { PublicationDetailPage } from './publication-detail/publication-detail.p
styleUrls: ['./view-publications.page.scss'],
})
export class ViewPublicationsPage implements OnInit {
+ showLoader: boolean;
+
publicationList: Publication[];
item: PublicationFolder;
@@ -27,6 +29,13 @@ export class ViewPublicationsPage implements OnInit {
this.getPublications()
/* console.log(this.item); */
}
+ doRefresh(event) {
+ this.getPublications()
+
+ setTimeout(() => {
+ event.target.complete();
+ }, 2000);
+ }
close(){
this.modalController.dismiss();
}
@@ -43,15 +52,15 @@ export class ViewPublicationsPage implements OnInit {
format: 'png'
}
let item: Publication = {
- "publicationId":element.DocumentId,
- "processId":element.ProcessId,
- "title":element.Title,
- "description": element.Message,
- "date": element.DatePublication,
+ "DocumentId":element.DocumentId,
+ "ProcessId":element.ProcessId,
+ "Title":element.Title,
+ "Message": element.Message,
+ "DatePublication": element.DatePublication,
/* image:itemImage, */
- "imageUrl": "data:image/jpg;base64," + element.FileBase64,
- "imageTitle": '',
- "imageFormat": '',
+ "FileBase64": "data:image/jpg;base64," + element.FileBase64,
+ "OriginalFileName": '',
+ "FileExtension": '',
}
this.publicationList.push(item);
});
diff --git a/src/app/services/photo.service.spec.ts b/src/app/services/photo.service.spec.ts
new file mode 100644
index 000000000..00ab0b05d
--- /dev/null
+++ b/src/app/services/photo.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { PhotoService } from './photo.service';
+
+describe('PhotoService', () => {
+ let service: PhotoService;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({});
+ service = TestBed.inject(PhotoService);
+ });
+
+ it('should be created', () => {
+ expect(service).toBeTruthy();
+ });
+});
diff --git a/src/app/services/photo.service.ts b/src/app/services/photo.service.ts
new file mode 100644
index 000000000..fcfdcfda8
--- /dev/null
+++ b/src/app/services/photo.service.ts
@@ -0,0 +1,66 @@
+import { Injectable } from '@angular/core';
+
+import { Plugins, CameraResultType, Capacitor, FilesystemDirectory, CameraPhoto, CameraSource } from '@capacitor/core';
+import { Photo } from '../models/photo';
+import { Platform } from '@ionic/angular';
+import { Camera, CameraOptions } from '@ionic-native/camera/ngx';
+
+ /* const { Camera, Filesystem, Storage } = Plugins; */
+
+@Injectable({
+ providedIn: 'root'
+})
+export class PhotoService {
+ public photos: Photo[] = [];
+ private PHOTO_STORAGE: string = "photos";
+ private platform: Platform;
+
+ constructor(platform: Platform,
+ private camera:Camera) {
+ this.platform = platform;
+ }
+
+ async takePicture(){
+ const options: CameraOptions = {
+ quality: 100,
+ destinationType: this.camera.DestinationType.FILE_URI,
+ encodingType: this.camera.EncodingType.JPEG,
+ mediaType: this.camera.MediaType.PICTURE
+ }
+
+ this.camera.getPicture(options).then((imageData) => {
+ // imageData is either a base64 encoded string or a file URI
+ // If it's base64 (DATA_URL):
+ let base64Image = 'data:image/jpeg;base64,' + imageData;
+ return base64Image;
+ }, (err) => {
+ // Handle error
+ });
+
+ }
+
+
+ /* async addNewToGallery() {
+ // Take a photo using Capacitor
+ const capturedPhoto = await Camera.getPhoto({
+ resultType: CameraResultType.Base64,
+ source: CameraSource.Camera,
+ quality: 90,
+ width: 1080,
+ height: 720,
+ });
+
+ this.photos.unshift({
+ fileName: new Date().getTime() + '.png',
+ webviewPath: capturedPhoto.base64String,
+ fileFormat: capturedPhoto.format,
+ });
+
+ console.log(capturedPhoto);
+
+
+ console.log(this.photos[0]);
+
+ } */
+
+}
diff --git a/src/app/services/publications.service.ts b/src/app/services/publications.service.ts
index 840c3db7d..dd34bd26d 100644
--- a/src/app/services/publications.service.ts
+++ b/src/app/services/publications.service.ts
@@ -110,7 +110,7 @@ export class PublicationsService {
params = params.set("folderId", folderId);
let options = {
headers: this.headers,
- params: params
+ /* params: params */
};
return this.http.post
(`${geturl}`, body, options).toPromise().then(res =>{
console.log(res);
@@ -123,13 +123,29 @@ export class PublicationsService {
params = params.set("folderId", folderId);
let options = {
headers: this.headers,
- params: params
+ /* params: params */
};
return this.http.put(`${geturl}`, body, options).toPromise().then(res =>{
console.log(res);
});
}
+ DeletePublication(folderId:any,publicationId:any){
+ const geturl = environment.apiURL + 'presidentialActions/'+folderId+'/posts/'+publicationId;
+ let params = new HttpParams();
+ params = params.set("folderId", folderId);
+ params = params.set("id", publicationId);
+ let options = {
+ headers: this.headers,
+ /* params: params */
+ };
+ return this.http.delete(`${geturl}`, options).toPromise().then(res =>{
+ console.log(res);
+ });
+ }
+
+
+
}
