diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index b21e9a287..54e4ef780 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -124,6 +124,7 @@ diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index 2f9b573d1..cfae7d49f 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -280,6 +280,7 @@ export class PublicationsPage implements OnInit { } async openOptions(id?: string) { + this.folderId = id; const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() .addElement(baseEl.querySelector('ion-backdrop')!) 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 92f9c3776..d41e65fac 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.ts +++ b/src/app/pages/publications/view-publications/view-publications.page.ts @@ -66,7 +66,7 @@ export class ViewPublicationsPage implements OnInit { } getPublicationDetail(){ - this.publications.PresidentialAction(this.folderId).subscribe(res=>{ + this.publications.GetPresidentialAction(this.folderId).subscribe(res=>{ console.log(res); this.item = res; }); diff --git a/src/app/services/publications.service.ts b/src/app/services/publications.service.ts index b8ce40165..12da5c2fa 100644 --- a/src/app/services/publications.service.ts +++ b/src/app/services/publications.service.ts @@ -29,7 +29,16 @@ export class PublicationsService { return this.http.get(`${geturl}`, options); } - PresidentialAction(id:any){ + GetPresidentialAction(id:any){ + const geturl = environment.apiURL + 'presidentialActions/'+id; + + let options = { + headers: this.headers, + }; + return this.http.get(`${geturl}`, options); + } + + UpdatePresidentialAction(id:any){ const geturl = environment.apiURL + 'presidentialActions/'+id; let options = { diff --git a/src/app/shared/publication/edit-action/edit-action.page.scss b/src/app/shared/publication/edit-action/edit-action.page.scss index 9cbe53718..260338602 100644 --- a/src/app/shared/publication/edit-action/edit-action.page.scss +++ b/src/app/shared/publication/edit-action/edit-action.page.scss @@ -62,14 +62,13 @@ padding: 0 !important; } .div-title{ - width: 180px; - /* padding: 0!important; */ - float: left; - margin: 2.5px 0 0 5px; + width: fit-content; + float: left; + margin: 2.5px 0 0 5px; } .title{ - font-size: 25px; - } + font-size: 25px; + } .container-div{ margin-bottom: 15px; overflow: auto; 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 80c87a862..a1beb5c0b 100644 --- a/src/app/shared/publication/edit-action/edit-action.page.ts +++ b/src/app/shared/publication/edit-action/edit-action.page.ts @@ -1,6 +1,7 @@ -import { Component, EventEmitter, OnInit, Output } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { PublicationFolder } from 'src/app/models/publicationfolder'; import { PublicationsService } from 'src/app/services/publications.service'; +import { ToastService } from 'src/app/services/toast.service'; @Component({ selector: 'app-edit-action', @@ -9,48 +10,55 @@ import { PublicationsService } from 'src/app/services/publications.service'; }) export class EditActionPage implements OnInit { - folderId:string; + @Input() folderId: string; folder: PublicationFolder; + segment:string; @Output() closeDesktopComponent= new EventEmitter(); constructor( private publicationsService: PublicationsService, + private toastService: ToastService, ) { this.folder = new PublicationFolder(); } ngOnInit() { + console.log(this.folderId); + + this.getPublicationDetail(); } close(){ this.closeDesktopComponent.emit(); } - getPublicationDetail() { - this.publicationsService.PresidentialAction(this.folderId).subscribe(res=>{ - console.log(res); + getPublicationDetail(){ + this.publicationsService.GetPresidentialAction(this.folderId).subscribe(res=>{ + this.folder = res; }); } - save(){ - /* this.folder = { + async save(){ + console.log(this.folder); + + this.folder = { ProcessId: null, Description: this.folder.Description, Detail: this.folder.Detail, DateBegin: this.folder.DateBegin, DateEnd: this.folder.DateEnd, - ActionType: this.segment, + ActionType: this.folder.ActionType, } console.log(this.folder); - try { - await this.publication.CreatePublicationFolder(this.folder).toPromise() + /* try { + await this.publicationsService.UpdatePresidentialAction(this.folder).toPromise() this.close(); this.toastService.successMessage('Acção presidencial criada') } catch (error) { this.toastService.badRequest('Não foi possivel criar a acção presidencial') - } */ - + } + */ } } diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts index a0c8fdf05..f1f44a37c 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.ts +++ b/src/app/shared/publication/view-publications/view-publications.page.ts @@ -65,7 +65,7 @@ export class ViewPublicationsPage implements OnInit { } getPublicationDetail() { - this.publications.PresidentialAction(this.folderId).subscribe(res=>{ + this.publications.GetPresidentialAction(this.folderId).subscribe(res=>{ console.log(res); this.item = res; });