From 28c483ff0bf965e506ad8bbb604fa0528a4fc6a5 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 30 Jun 2021 15:48:37 +0100 Subject: [PATCH 1/2] save --- .../pages/publications/publications.page.html | 4 +- .../pages/publications/publications.page.scss | 4 ++ .../pages/publications/publications.page.ts | 39 ++++++++++++++----- src/app/services/publications.service.ts | 10 ++--- .../actions-options/actions-options.page.ts | 17 +++++++- 5 files changed, 54 insertions(+), 20 deletions(-) diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 7996ac0ee..257096e4b 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -44,7 +44,7 @@

{{viagem.Description}}

{{viagem.Detail}}

-
+
@@ -60,7 +60,7 @@

{{evento.Description}}

-
+
diff --git a/src/app/pages/publications/publications.page.scss b/src/app/pages/publications/publications.page.scss index 80e4c2259..51eddcc14 100644 --- a/src/app/pages/publications/publications.page.scss +++ b/src/app/pages/publications/publications.page.scss @@ -157,6 +157,7 @@ ion-toolbar{ } .item-options{ + width: 25px; font-size: 20px; } @@ -174,4 +175,7 @@ ion-toolbar{ .aside-left{ width: 35%; } + .item-options{ + display: block !important; + } } diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index d678eb14f..877c2aefd 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -277,20 +277,41 @@ export class PublicationsPage implements OnInit { } } - async openOptions(taskAction?: any) { - - const popover = await this.modalController.create({ + async openOptions(id?: string) { + const enterAnimation = (baseEl: any) => { + const backdropAnimation = this.animationController.create() + .addElement(baseEl.querySelector('ion-backdrop')!) + .fromTo('opacity', '0.01', 'var(--backdrop-opacity)'); + + const wrapperAnimation = this.animationController.create() + .addElement(baseEl.querySelector('.modal-wrapper')!) + .keyframes([ + { offset: 0, opacity: '1', right: '-100%' }, + { offset: 1, opacity: '1', right: '0px' } + ]); + + return this.animationController.create() + .addElement(baseEl) + .easing('ease-out') + .duration(500) + .addAnimation([backdropAnimation, wrapperAnimation]); + } + + const leaveAnimation = (baseEl: any) => { + return enterAnimation(baseEl).direction('reverse'); + } + + const modal = await this.modalController.create({ + enterAnimation, + leaveAnimation, component: ActionsOptionsPage, - cssClass: 'model aside-modal', + cssClass: 'model profile-modal search-submodal', componentProps: { - /* task: this.task, - fulltask: this.fulltask, */ - taskAction: taskAction, - showEnviarPendentes: false + id: id, }, //translucent: true }); - return await popover.present(); + return await modal.present(); } } \ No newline at end of file diff --git a/src/app/services/publications.service.ts b/src/app/services/publications.service.ts index 84f2e7483..989b3e1eb 100644 --- a/src/app/services/publications.service.ts +++ b/src/app/services/publications.service.ts @@ -58,15 +58,11 @@ export class PublicationsService { }); } - DeletePublicationFolderById(id:any){ - const geturl = environment.apiURL + 'presidentialActions'; - let params = new HttpParams(); - - params = params.set("id", id); - + DeletePresidentialAction(id:any){ + const geturl = environment.apiURL + 'presidentialActions/'+id; + let options = { headers: this.headers, - params: params }; return this.http.delete(`${geturl}`, options); } diff --git a/src/app/shared/popover/actions-options/actions-options.page.ts b/src/app/shared/popover/actions-options/actions-options.page.ts index 0bef4bc5e..95f8a71b3 100644 --- a/src/app/shared/popover/actions-options/actions-options.page.ts +++ b/src/app/shared/popover/actions-options/actions-options.page.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { ModalController, PopoverController } from '@ionic/angular'; +import { ModalController, NavParams, PopoverController } from '@ionic/angular'; +import { PublicationsService } from 'src/app/services/publications.service'; @Component({ selector: 'app-actions-options', @@ -8,12 +9,20 @@ import { ModalController, PopoverController } from '@ionic/angular'; }) export class ActionsOptionsPage implements OnInit { + id:string; + constructor( private popoverController: PopoverController, private modalController: ModalController, - ) { } + private navParams: NavParams, + private publicationsService: PublicationsService, + ) { + this.id = this.navParams.get('id'); + } ngOnInit() { + console.log(this.id); + } close () { @@ -23,7 +32,11 @@ export class ActionsOptionsPage implements OnInit { editAction(){} deleteAction(){ + console.log('HEY'); + console.log(this.id); + this.publicationsService.DeletePresidentialAction(this.id).toPromise(); + this.close(); } } From 8feb2a4f6e895586c642cb0d9fe1dbe299635718 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 30 Jun 2021 16:12:47 +0100 Subject: [PATCH 2/2] save --- src/app/app-routing.module.ts | 4 + .../pages/publications/publications.module.ts | 2 + .../pages/publications/publications.page.html | 4 + .../pages/publications/publications.page.ts | 7 +- .../actions-options/actions-options.page.ts | 7 +- .../edit-action/edit-action-routing.module.ts | 17 +++ .../edit-action/edit-action.module.ts | 21 +++ .../edit-action/edit-action.page.html | 95 +++++++++++++ .../edit-action/edit-action.page.scss | 128 ++++++++++++++++++ .../edit-action/edit-action.page.spec.ts | 24 ++++ .../edit-action/edit-action.page.ts | 46 +++++++ 11 files changed, 350 insertions(+), 5 deletions(-) create mode 100644 src/app/shared/publication/edit-action/edit-action-routing.module.ts create mode 100644 src/app/shared/publication/edit-action/edit-action.module.ts create mode 100644 src/app/shared/publication/edit-action/edit-action.page.html create mode 100644 src/app/shared/publication/edit-action/edit-action.page.scss create mode 100644 src/app/shared/publication/edit-action/edit-action.page.spec.ts create mode 100644 src/app/shared/publication/edit-action/edit-action.page.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 4ff1bdf49..73dc21b82 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -143,6 +143,10 @@ const routes: Routes = [ path: 'actions-options', loadChildren: () => import('./shared/popover/actions-options/actions-options.module').then( m => m.ActionsOptionsPageModule) }, + { + path: 'edit-action', + loadChildren: () => import('./shared/publication/edit-action/edit-action.module').then( m => m.EditActionPageModule) + }, diff --git a/src/app/pages/publications/publications.module.ts b/src/app/pages/publications/publications.module.ts index 6439f05ae..245306b66 100644 --- a/src/app/pages/publications/publications.module.ts +++ b/src/app/pages/publications/publications.module.ts @@ -18,6 +18,7 @@ import { NewPublicationPageModule } from 'src/app/shared/publication/new-publica import { NewActionPageModule } from 'src/app/shared/publication/new-action/new-action.module'; import { PublicationDetailPageModule } from 'src/app/shared/publication/view-publications/publication-detail/publication-detail.module'; import { HeaderPageModule } from 'src/app/shared/header/header.module'; +import { EditActionPageModule } from 'src/app/shared/publication/edit-action/edit-action.module'; @NgModule({ @@ -32,6 +33,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; NewPublicationPageModule, PublicationDetailPageModule, NewActionPageModule, + EditActionPageModule, ], declarations: [ PublicationsPage, diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 257096e4b..f86d374aa 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -120,6 +120,10 @@ class="height-100 d-flex flex-column overflow-hidden background-white flex-grow-1" (closeDesktopComponent)="closeDesktopComponent($event)" > + + + + diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index 877c2aefd..86d31af4a 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -311,7 +311,12 @@ export class PublicationsPage implements OnInit { }, //translucent: true }); - return await modal.present(); + await modal.present(); + modal.onDidDismiss().then(res =>{ + if(res['data']=='edit'){ + this.desktopComponent.showAddActions = true; + } + }); } } \ No newline at end of file diff --git a/src/app/shared/popover/actions-options/actions-options.page.ts b/src/app/shared/popover/actions-options/actions-options.page.ts index 95f8a71b3..3db4d14ca 100644 --- a/src/app/shared/popover/actions-options/actions-options.page.ts +++ b/src/app/shared/popover/actions-options/actions-options.page.ts @@ -29,12 +29,11 @@ export class ActionsOptionsPage implements OnInit { this.modalController.dismiss(); } - editAction(){} + editAction(){ + this.modalController.dismiss('edit'); + } deleteAction(){ - console.log('HEY'); - - console.log(this.id); this.publicationsService.DeletePresidentialAction(this.id).toPromise(); this.close(); } diff --git a/src/app/shared/publication/edit-action/edit-action-routing.module.ts b/src/app/shared/publication/edit-action/edit-action-routing.module.ts new file mode 100644 index 000000000..1cc787832 --- /dev/null +++ b/src/app/shared/publication/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/shared/publication/edit-action/edit-action.module.ts b/src/app/shared/publication/edit-action/edit-action.module.ts new file mode 100644 index 000000000..87961f035 --- /dev/null +++ b/src/app/shared/publication/edit-action/edit-action.module.ts @@ -0,0 +1,21 @@ +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 + ], + exports: [EditActionPage], + declarations: [EditActionPage] +}) +export class EditActionPageModule {} diff --git a/src/app/shared/publication/edit-action/edit-action.page.html b/src/app/shared/publication/edit-action/edit-action.page.html new file mode 100644 index 000000000..e8fba430a --- /dev/null +++ b/src/app/shared/publication/edit-action/edit-action.page.html @@ -0,0 +1,95 @@ + +
+
+ Editar acção presidencial +
+ + +
+ + + +
+ +
+ +
+ +
+
+
+ +
+
+ + +
+
+
+ +
+
+
+ +
+
+ + +
+
+
+ +
+
+
+ +
+
+ +
+
+
+
+ + + + + + + + + + Cancelar + + + + + Criar + + + + diff --git a/src/app/shared/publication/edit-action/edit-action.page.scss b/src/app/shared/publication/edit-action/edit-action.page.scss new file mode 100644 index 000000000..9cbe53718 --- /dev/null +++ b/src/app/shared/publication/edit-action/edit-action.page.scss @@ -0,0 +1,128 @@ +:host{ + background: #fff; + } + ion-content{ + --background: transparent; + transform: translate3d(0, 5px, 0); + --border-radius: 30px; + } + ion-footer{ + background: #fff; + } + ion-toolbar{ + /* --background:#0782c9; */ + border-width: 0 !important; + } + .div-top-header{ + margin: 0 auto; + background-color: #0782c9; + overflow: auto; + padding-top: 15px; + border: 0!important; + } + .div-search{ + font-size: 45px; + float: left; + margin: 0 0 0 10px + } + .div-logo{ + background: transparent; + width: 140px; + margin: 5px 0 0px 71px; + float: left; + } + .div-logo img{ + width: 100%; + } + .div-profile{ + font-size: 45px; + float: right; + margin-right: 10px; + } + .content-top{ + background: #f3f2f2; + height: 20px; + margin: 0 auto; + border-top-left-radius: 25px; + border-top-right-radius: 25px; + } + .content-container{ + width: 100%; + margin:0 auto; + border-top-left-radius: 25px; + border-top-right-radius: 25px; + background: #ffffff; + height: 100%; + padding: 25px 20px 0 20px; + overflow: auto; + } + .title-content{ + margin: 0px auto; + overflow: auto; + padding: 0 !important; + } + .div-title{ + width: 180px; + /* padding: 0!important; */ + float: left; + margin: 2.5px 0 0 5px; + } + .title{ + font-size: 25px; + } + .container-div{ + margin-bottom: 15px; + overflow: auto; + } + .ion-item-container{ + margin: 15px auto; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 10px; + } + .ion-item-container-no-border{ + width: 100%; + margin: 0px auto; + padding: 0 !important; + overflow: auto; + } + .ion-item-class-2{ + margin: 0px auto; + } + .ion-icon-class{ + width: 45px; + height: 45px; + float: left; + padding: 10px; + font-size: 25px; + } + .ion-input-class{ + height: auto; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 5px; + padding-right: 10px; + float: left; + } + .ion-textarea-class{ + width: 315px; + height: auto; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 5px; + padding-right: 10px; + float: left; + } + .ion-input-class-no-height{ + border: 1px solid #ebebeb; + border-radius: 5px; + overflow: auto; + } + .actionType{ + float: right; + overflow: auto; + border-radius: 30px; + } + .ion-segment{ + --background: #0782c9; + } \ No newline at end of file diff --git a/src/app/shared/publication/edit-action/edit-action.page.spec.ts b/src/app/shared/publication/edit-action/edit-action.page.spec.ts new file mode 100644 index 000000000..402bd92ed --- /dev/null +++ b/src/app/shared/publication/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/shared/publication/edit-action/edit-action.page.ts b/src/app/shared/publication/edit-action/edit-action.page.ts new file mode 100644 index 000000000..14ce5e68b --- /dev/null +++ b/src/app/shared/publication/edit-action/edit-action.page.ts @@ -0,0 +1,46 @@ +import { Component, EventEmitter, OnInit, Output } from '@angular/core'; +import { PublicationFolder } from 'src/app/models/publicationfolder'; + +@Component({ + selector: 'app-edit-action', + templateUrl: './edit-action.page.html', + styleUrls: ['./edit-action.page.scss'], +}) +export class EditActionPage implements OnInit { + + folder: PublicationFolder; + @Output() closeDesktopComponent= new EventEmitter(); + + constructor() { + this.folder = new PublicationFolder(); + } + + ngOnInit() { + } + + close(){ + this.closeDesktopComponent.emit(); + } + + save(){ + /* this.folder = { + ProcessId: null, + Description: this.folder.Description, + Detail: this.folder.Detail, + DateBegin: this.folder.DateBegin, + DateEnd: this.folder.DateEnd, + ActionType: this.segment, + } + console.log(this.folder); + + try { + await this.publication.CreatePublicationFolder(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') + } */ + + } + +}