From ba3e03c323ab2219a301a76523e0ba9859fd6132 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 7 Jul 2021 15:46:09 +0100 Subject: [PATCH 1/3] save --- .../pedidos/pedidos.page.html | 2 +- .../gabinete-digital/pedidos/pedidos.page.ts | 12 ----- .../pages/publications/publications.page.html | 54 +++++++++++++++++-- .../pages/publications/publications.page.scss | 16 ++++++ 4 files changed, 67 insertions(+), 17 deletions(-) diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html index 4bdf3d3bd..586f92eed 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html @@ -77,7 +77,7 @@ diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts index 0681084a4..be6ebf908 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts @@ -165,18 +165,6 @@ export class PedidosPage implements OnInit { }, 2000); } - async viewPedidoDetail(serialNumber:any) { - - let navigationExtras: NavigationExtras = { - queryParams: { - enterAnimation: "", - serialNumber: serialNumber, - } - }; - this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras); - - } - } \ No newline at end of file diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 3c7eef106..9980dd39d 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -34,7 +34,32 @@
-
--> + + +
+ +
+
+

De {{viagem.DateBegin}} a {{viagem.DateEnd}}

+

{{viagem.Description}}

+

{{viagem.Detail}}

+
+
+ +
+ + + + + + + + + + + +
+ +
+
+ +

{{evento.DateBegin}}

+

{{evento.Description}}

+ +
+
+ +
+ + + Apagar + + +
diff --git a/src/app/pages/publications/publications.page.scss b/src/app/pages/publications/publications.page.scss index 51eddcc14..544157edd 100644 --- a/src/app/pages/publications/publications.page.scss +++ b/src/app/pages/publications/publications.page.scss @@ -162,6 +162,22 @@ ion-toolbar{ font-size: 20px; } } + + ion-item-option{ + display: flex; + background: #ffe0e0; + align-items: center; + align-content: center; + } + + .delete{ + padding: 7px; + font-size: 21px; + color:#d30a0a; + border-radius: 20px; + margin: 10px; + border: 1px solid #d30a0a; + } From 49d09e3593d065ed2bceaeaf939e84495fbf3ee6 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 7 Jul 2021 16:25:36 +0100 Subject: [PATCH 2/3] Improve form validation --- .../expedient-task-modal.page.html | 6 ++--- .../expedient-task-modal.page.ts | 22 +++++++++++++++--- .../new-action/new-action.page.ts | 7 ++++++ src/app/services/toast.service.ts | 21 +++++++++++++++++ .../shared/agenda/new-event/new-event.page.ts | 6 +++++ .../publication/new-action/new-action.page.ts | 2 +- src/assets/images/Blocks-loader.gif | Bin 0 -> 55081 bytes src/global.scss | 15 ++++++++++++ 8 files changed, 72 insertions(+), 7 deletions(-) create mode 100644 src/assets/images/Blocks-loader.gif diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index 2c071472b..339796b63 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -128,12 +128,12 @@ -
+
-
+
@@ -154,7 +154,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index d2fb6c86f..6aa2de511 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -206,9 +206,9 @@ export class ExpedientTaskModalPage implements OnInit { // IsRecurring: new FormControl(this.postEvent.IsRecurring, [ // Validators.required // ]), - // participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [ - // Validators.required - // ]), + participantes: new FormControl(this.taskParticipantsCc, [ + Validators.required + ]), }) } @@ -236,6 +236,7 @@ export class ExpedientTaskModalPage implements OnInit { else if(this.postData.Priority=='99999864') { this.dispatchFolder.DeadlineType = 'Urgentíssimo'; } + let attendees = this.taskParticipants.concat(this.taskParticipantsCc); attendees = attendees.map(function(val) { return { @@ -261,6 +262,8 @@ export class ExpedientTaskModalPage implements OnInit { this.selectedTypes = this.toppingsValues } + let loader = this.toastService.loading() + this.dispatchFolder.SubjectTypes = this.selectedTypes; switch (this.loggeduser.Profile) { @@ -289,10 +292,13 @@ export class ExpedientTaskModalPage implements OnInit { console.log(this.postData); this.taskResult = await this.processes.postDespatcho(this.postData).toPromise(); + + loader.remove() await this.toastService.successMessage('Processo efetuado'); this.modalController.dismiss(); } catch (error) { + loader.remove() await this.toastService.badRequest('Processo não efetuado') } console.log('this.taskResult', this.taskResult); @@ -319,10 +325,12 @@ export class ExpedientTaskModalPage implements OnInit { } } this.taskResult = await this.processes.postParecer(this.postData).toPromise(); + loader.remove() await this.toastService.successMessage('Pedido enviado'); this.modalController.dismiss(action_parecer); } catch (error) { + loader.remove() await this.toastService.badRequest('Processo não efetuado') } break; @@ -347,9 +355,12 @@ export class ExpedientTaskModalPage implements OnInit { } } this.taskResult = await this.processes.postDeferimento(this.postData).toPromise(); + + loader.remove() await this.toastService.successMessage('Processo efetuado'); this.modalController.dismiss(action_deferimento); } catch (error) { + loader.remove() await this.toastService.badRequest('Processo não efetuado') } console.log('this.taskResult', this.taskResult); @@ -382,12 +393,15 @@ export class ExpedientTaskModalPage implements OnInit { "Note": "", } } + + loader.remove() this.taskResult = await this.processes.postDespatchoPr(this.postData).toPromise(); await this.toastService.successMessage('Processo efetuado'); this.modalController.dismiss(action_despacho_pr); } catch (error) { + loader.remove() await this.toastService.badRequest('Processo não efetuado') } console.log('this.taskResult', this.taskResult); @@ -413,12 +427,14 @@ export class ExpedientTaskModalPage implements OnInit { "Note": "", } } + loader.remove() this.taskResult = await this.processes.postParecerPr(this.postData).toPromise(); await this.toastService.badRequest('Processo não efetuado'); this.modalController.dismiss(action_parecer_pr); } catch (error) { + loader.remove() await this.toastService.badRequest('Processo não efetuado') } break; diff --git a/src/app/pages/publications/new-action/new-action.page.ts b/src/app/pages/publications/new-action/new-action.page.ts index 3758b8ada..2ded95628 100644 --- a/src/app/pages/publications/new-action/new-action.page.ts +++ b/src/app/pages/publications/new-action/new-action.page.ts @@ -123,11 +123,18 @@ export class NewActionPage implements OnInit { ActionType: this.segment, } + + let loader = this.toastService.loading() + try { await this.publication.CreatePublicationFolder(this.folder).toPromise(); + + loader.remove() this.toastService.successMessage("Ação presidencial criado"); this.close(); } catch (error) { + + loader.remove() this.toastService.badRequest("Ação presidencial não criado"); } diff --git a/src/app/services/toast.service.ts b/src/app/services/toast.service.ts index 2ef9fc097..3b5032634 100644 --- a/src/app/services/toast.service.ts +++ b/src/app/services/toast.service.ts @@ -125,4 +125,25 @@ export class ToastService { } + + loading() : HTMLDivElement { + let loader: HTMLDivElement = document.createElement('div') + loader.innerHTML = ` + +
+
+ +
+
+ ` + + document.body.append(loader) + + loader.addEventListener('click', ()=>{ + // loader.remove() + }) + return loader + + } + } diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index 073538d0a..1cce4baee 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -342,9 +342,13 @@ export class NewEventPage implements OnInit { console.log(this.postEvent); + let loader = this.toastService.loading() + this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).subscribe( async (id) => { + loader.remove() + this.showLoader = false const eventId: any = id; @@ -382,6 +386,8 @@ export class NewEventPage implements OnInit { }, error => { + + loader.remove() this.showLoader = false this.toastService.badRequest('Evento não criado') }); diff --git a/src/app/shared/publication/new-action/new-action.page.ts b/src/app/shared/publication/new-action/new-action.page.ts index c86bce7d4..d8f4a15fe 100644 --- a/src/app/shared/publication/new-action/new-action.page.ts +++ b/src/app/shared/publication/new-action/new-action.page.ts @@ -70,7 +70,7 @@ export class NewActionPage implements OnInit { } get dateValid() { - if (window.innerWidth <= 800) { + if (window.innerWidth >= 800) { return this.folder.DateBegin < this.folder.DateEnd? ['ok']: [] } else { return ['ok'] diff --git a/src/assets/images/Blocks-loader.gif b/src/assets/images/Blocks-loader.gif new file mode 100644 index 0000000000000000000000000000000000000000..b2a98465bfcfb8ee0994339e1388d52e681a434a GIT binary patch literal 55081 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 HuE75RcW&{~ literal 0 HcmV?d00001 diff --git a/src/global.scss b/src/global.scss index 14f917116..17792315c 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1036,4 +1036,19 @@ ngx-mat-datetime-content{ .mat-form-field-infix, .mat-form-field-wrapper { padding: 0px !important; +} + + +.loading-blocker { + position: absolute; + width: 100%; + height: 100%; + display: flex; + justify-content: center; + align-items: center; + background-color: #0000006b; + + .loading-blocker-container { + + } } \ No newline at end of file From f8a7a54eaa3f6a33f994426b2ec4a04f28e0aff3 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 7 Jul 2021 16:34:01 +0100 Subject: [PATCH 3/3] save --- .../edit-action/edit-action-routing.module.ts | 17 ++++ .../edit-action/edit-action.module.ts | 20 +++++ .../edit-action/edit-action.page.html | 9 ++ .../edit-action/edit-action.page.scss | 0 .../edit-action/edit-action.page.spec.ts | 24 ++++++ .../edit-action/edit-action.page.ts | 15 ++++ .../publications-routing.module.ts | 84 ++++++++++--------- .../pages/publications/publications.page.html | 7 +- .../pages/publications/publications.page.ts | 28 +++++++ 9 files changed, 163 insertions(+), 41 deletions(-) create mode 100644 src/app/pages/publications/edit-action/edit-action-routing.module.ts create mode 100644 src/app/pages/publications/edit-action/edit-action.module.ts create mode 100644 src/app/pages/publications/edit-action/edit-action.page.html create mode 100644 src/app/pages/publications/edit-action/edit-action.page.scss create mode 100644 src/app/pages/publications/edit-action/edit-action.page.spec.ts create mode 100644 src/app/pages/publications/edit-action/edit-action.page.ts 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();