diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 3ebb7d4de..2d4f24bca 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -134,6 +134,7 @@ [folderId]="folderId" class="height-100 d-flex flex-column overflow-hidden flex-grow-1" (addNewPublication)="addNewPublication($event)" + (editPublication)="editPublication($event)" (openPublicationDetails)="openPublicationDetails($event)" (goBacktoPublicationDetails)="goBacktoPublicationDetails()" (goBackToViewPublications)="goBackToViewPublications()" diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index 671e6a488..fb589b982 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -237,9 +237,7 @@ export class PublicationsPage implements OnInit { } async deleteAction(id?: string) { - const loader = this.toastService.loading(); - try { await this.publications.DeletePresidentialAction(id).toPromise(); this.toastService._successMessage() @@ -249,7 +247,6 @@ export class PublicationsPage implements OnInit { finally { loader.remove() } - this.refreshing() } @@ -378,10 +375,14 @@ export class PublicationsPage implements OnInit { } this.publication = publication; - this.desktopComponent.showAddNewPublication = true; } + async editPublication(foolderId:string){ + this.closeDesktopComponent(); + this.desktopComponent.showEditActions = true; + } + async openPublicationDetails(publicationId: string) { this.publicationId = publicationId; @@ -404,6 +405,7 @@ export class PublicationsPage implements OnInit { showAddActions: false, showEditActions: false, } + this.idSelected = ""; } async openOptions(id?: string) { diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html index 3b7dfd51b..58dbe2f59 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.html +++ b/src/app/shared/publication/view-publications/view-publications.page.html @@ -1,24 +1,37 @@
-
+
-
- {{item.Description}} +
+
+ {{item.Description}} +
+ +
+ + + + + +
+
+

{{item.Detail}}

{{ item.DateBegin | date: 'dd-MM-yy | HH:mm'}}

-
- - - -
+
@@ -57,5 +70,5 @@

{{error}}

-
+ diff --git a/src/app/shared/publication/view-publications/view-publications.page.scss b/src/app/shared/publication/view-publications/view-publications.page.scss index 184ac8243..6091c5695 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.scss +++ b/src/app/shared/publication/view-publications/view-publications.page.scss @@ -61,7 +61,6 @@ overflow:hidden; padding: 25px 20px 0px 20px; color:#000; - } .main-container{ width: 100%; @@ -86,22 +85,30 @@ .back-icon{ float: left; font-size: 35px; - + } .div-title{ /* padding: 0!important; */ float: left; - margin: 2.5px 0 0 5px; + margin: 2.5px 0 0 0; + overflow: auto; + } + .div-body{ + overflow: auto; } .title{ + width: fit-content; font-size: 25px; + float: left; } - + .actions-icon{ display: flex; + width: fit-content; align-items: top; justify-content: flex-end; padding: 0 !important; + float: right; } .actions-icon ion-icon{ margin-left: 5px; 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 e7b3590b6..3be412f5e 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.ts +++ b/src/app/shared/publication/view-publications/view-publications.page.ts @@ -11,6 +11,8 @@ import { PublicationEventFolderStorage } from 'src/app/store/publication-event-f import { PublicationTravelFolderStore } from 'src/app/store/publication-travel-folder.service'; import { PublicationPipe } from 'src/app/pipes/publication.pipe'; import { ThemeService } from 'src/app/services/theme.service' +import { ToastService } from 'src/app/services/toast.service'; +import { EditActionPage } from 'src/app/pages/publications/edit-action/edit-action.page'; @Component({ selector: 'app-view-publications', @@ -28,6 +30,7 @@ export class ViewPublicationsPage implements OnInit { @Input() folderId: string; @Output() addNewPublication = new EventEmitter(); + @Output() editPublication = new EventEmitter(); @Output() openPublicationDetails= new EventEmitter(); @Output() goBackToViewPublications = new EventEmitter(); @Output() closeDesktopComponent = new EventEmitter(); @@ -45,7 +48,8 @@ export class ViewPublicationsPage implements OnInit { private loadingController: LoadingService, private modalController: ModalController, private publications: PublicationsService, - public ThemeService: ThemeService + public ThemeService: ThemeService, + private toastService: ToastService, ) { this.item = new PublicationFolder(); } @@ -149,6 +153,39 @@ export class ViewPublicationsPage implements OnInit { } + async openEditPublication(folderId?:any){ + if( window.innerWidth < 701) { + const modal = await this.modalController.create({ + component: EditActionPage, + componentProps: { + folderId: folderId, + }, + cssClass: 'new-action modal modal-desktop', + backdropDismiss: true + }); + await modal.present(); + modal.onDidDismiss().then(() => { + //Do nothing + }); + } + else{ + this.editPublication.emit(folderId); + } + } + + async deletePublication(folderId?:any){ + const loader = this.toastService.loading(); + try { + await this.publications.DeletePresidentialAction(folderId).toPromise(); + this.toastService._successMessage() + } catch (e) { + this.toastService._badRequest() + } + finally { + loader.remove() + } + } + async viewPublicationDetail(publicationId:string) { diff --git a/src/assets/images/theme/gov/icons-delete.svg b/src/assets/images/theme/gov/icons-delete.svg new file mode 100644 index 000000000..531880103 --- /dev/null +++ b/src/assets/images/theme/gov/icons-delete.svg @@ -0,0 +1,4 @@ + + + +