diff --git a/src/app/pages/publications/edit-action/edit-action-routing.module.ts b/src/app/pages/publications/edit-action/edit-action-routing.module.ts new file mode 100644 index 000000000..1cc787832 --- /dev/null +++ b/src/app/pages/publications/edit-action/edit-action-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { EditActionPage } from './edit-action.page'; + +const routes: Routes = [ + { + path: '', + component: EditActionPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class EditActionPageRoutingModule {} diff --git a/src/app/pages/publications/edit-action/edit-action.module.ts b/src/app/pages/publications/edit-action/edit-action.module.ts new file mode 100644 index 000000000..99e36907b --- /dev/null +++ b/src/app/pages/publications/edit-action/edit-action.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { EditActionPageRoutingModule } from './edit-action-routing.module'; + +import { EditActionPage } from './edit-action.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + EditActionPageRoutingModule + ], + declarations: [EditActionPage] +}) +export class EditActionPageModule {} diff --git a/src/app/pages/publications/edit-action/edit-action.page.html b/src/app/pages/publications/edit-action/edit-action.page.html new file mode 100644 index 000000000..3abd6d729 --- /dev/null +++ b/src/app/pages/publications/edit-action/edit-action.page.html @@ -0,0 +1,9 @@ + + + edit-action + + + + + + diff --git a/src/app/pages/publications/edit-action/edit-action.page.scss b/src/app/pages/publications/edit-action/edit-action.page.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/pages/publications/edit-action/edit-action.page.spec.ts b/src/app/pages/publications/edit-action/edit-action.page.spec.ts new file mode 100644 index 000000000..402bd92ed --- /dev/null +++ b/src/app/pages/publications/edit-action/edit-action.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { EditActionPage } from './edit-action.page'; + +describe('EditActionPage', () => { + let component: EditActionPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ EditActionPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(EditActionPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/publications/edit-action/edit-action.page.ts b/src/app/pages/publications/edit-action/edit-action.page.ts new file mode 100644 index 000000000..c1b0fe866 --- /dev/null +++ b/src/app/pages/publications/edit-action/edit-action.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-edit-action', + templateUrl: './edit-action.page.html', + styleUrls: ['./edit-action.page.scss'], +}) +export class EditActionPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/pages/publications/publications-routing.module.ts b/src/app/pages/publications/publications-routing.module.ts index 46e9a3d95..56e6828d2 100644 --- a/src/app/pages/publications/publications-routing.module.ts +++ b/src/app/pages/publications/publications-routing.module.ts @@ -1,42 +1,46 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { PublicationsPage } from './publications.page'; - -const routes: Routes = [ - { - path: '', - component: PublicationsPage - }, - { - path: 'new-publication', - loadChildren: () => import('./new-publication/new-publication.module').then( m => m.NewPublicationPageModule) - }, - { - path: 'gallery', - loadChildren: () => import('./gallery/gallery.module').then( m => m.GalleryPageModule) - }, - { - path: 'new-action', - loadChildren: () => import('./new-action/new-action.module').then( m => m.NewActionPageModule) - }, - { - path: 'view-publications', - children: [ - { - path:'', - loadChildren: ()=> import('./view-publications/view-publications.module').then(m => m.ViewPublicationsPageModule) - }, - { - path:'publication-detail', - loadChildren: ()=> import('./view-publications/publication-detail/publication-detail.module').then(m => m.PublicationDetailPageModule) - }, - ] +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { PublicationsPage } from './publications.page'; + +const routes: Routes = [ + { + path: '', + component: PublicationsPage + }, + { + path: 'new-publication', + loadChildren: () => import('./new-publication/new-publication.module').then( m => m.NewPublicationPageModule) + }, + { + path: 'gallery', + loadChildren: () => import('./gallery/gallery.module').then( m => m.GalleryPageModule) + }, + { + path: 'new-action', + loadChildren: () => import('./new-action/new-action.module').then( m => m.NewActionPageModule) + }, + { + path: 'view-publications', + children: [ + { + path:'', + loadChildren: ()=> import('./view-publications/view-publications.module').then(m => m.ViewPublicationsPageModule) + }, + { + path:'publication-detail', + loadChildren: ()=> import('./view-publications/publication-detail/publication-detail.module').then(m => m.PublicationDetailPageModule) + }, + ] + }, { + path: 'edit-action', + loadChildren: () => import('./edit-action/edit-action.module').then( m => m.EditActionPageModule) } -]; -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class PublicationsPageRoutingModule {} +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class PublicationsPageRoutingModule {} diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 9980dd39d..dafecd572 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -51,7 +51,12 @@ - + + diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index 4781abae5..37a3727ac 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -12,6 +12,7 @@ import { LoadingController } from '@ionic/angular'; import { LoadingService } from 'src/app/services/loading.service'; import { Publication } from 'src/app/models/publication'; import { ActionsOptionsPage } from 'src/app/shared/popover/actions-options/actions-options.page'; +import { EditActionPage } from './edit-action/edit-action.page'; @Component({ @@ -89,6 +90,12 @@ export class PublicationsPage implements OnInit { this.hideRefreshBtn = false; } } + + refreshing() { + setTimeout(() => { + this.getActions(); + }, 1500); + } doRefresh(event) { this.getActions(); @@ -131,6 +138,27 @@ export class PublicationsPage implements OnInit { }); } + async editAction(id?: string){ + const modal = await this.modalController.create({ + component: EditActionPage, + componentProps:{ + item: id, + }, + cssClass: 'new-action modal modal-desktop', + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss().then(()=>{ + this.getActions(); + }); + //this.refreshing() + } + + deleteAction(id?: string){ + this.publications.DeletePresidentialAction(id).toPromise(); + this.refreshing() + } + async AddPublicationFolder(item?:any) { this.closeDesktopComponent();