Add success message

This commit is contained in:
Peter Maquiran
2021-06-08 15:59:06 +01:00
parent 8ff7458b98
commit 1089628ef3
54 changed files with 2351 additions and 478 deletions
@@ -0,0 +1,17 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { BadRequestPage } from './bad-request.page';
const routes: Routes = [
{
path: '',
component: BadRequestPage
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class BadRequestPageRoutingModule {}
@@ -1,7 +0,0 @@
<div class="main-content">
<p class="message">
{{ message }}
</p>
</div>
@@ -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 { BadRequestPageRoutingModule } from './bad-request-routing.module';
import { BadRequestPage } from './bad-request.page';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
BadRequestPageRoutingModule
],
declarations: [BadRequestPage]
})
export class BadRequestPageModule {}
@@ -0,0 +1,9 @@
<div class="main-content width-100 pa-20">
<p class="message d-flex align-center">
<ion-icon slot="end" class="title-icon pr-10" src="/assets/images/notification-error.svg"></ion-icon>
{{ message }}
</p>
</div>
@@ -11,6 +11,5 @@
}
.message {
padding-top: 150px;
font-size: 16pt;
font-size: 12pt;
}
@@ -1,19 +1,19 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { BadRequestComponent } from './bad-request.component';
import { BadRequestPage } from './bad-request.page';
describe('BadRequestComponent', () => {
let component: BadRequestComponent;
let fixture: ComponentFixture<BadRequestComponent>;
describe('BadRequestPage', () => {
let component: BadRequestPage;
let fixture: ComponentFixture<BadRequestPage>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ BadRequestComponent ],
declarations: [ BadRequestPage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(BadRequestComponent);
fixture = TestBed.createComponent(BadRequestPage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
@@ -3,10 +3,10 @@ import { NavParams } from '@ionic/angular';
@Component({
selector: 'app-bad-request',
templateUrl: './bad-request.component.html',
styleUrls: ['./bad-request.component.scss'],
templateUrl: './bad-request.page.html',
styleUrls: ['./bad-request.page.scss'],
})
export class BadRequestComponent implements OnInit {
export class BadRequestPage implements OnInit {
message: string
@@ -16,5 +16,4 @@ export class BadRequestComponent implements OnInit {
}
ngOnInit() {}
}
@@ -1,11 +1,11 @@
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { ModalController, PopoverController } from '@ionic/angular';
import { AnimationController, ModalController, PopoverController } from '@ionic/angular';
import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
import { ProcessesService } from 'src/app/services/processes.service';
import { BadRequestComponent } from '../bad-request/bad-request.component';
import { SuccessMessageComponent } from '../success-message/success-message.component';
import { BadRequestPage } from '../bad-request/bad-request.page';
import { SuccessMessagePage } from '../success-message/success-message.page';
@Component({
selector: 'app-deploma-options',
@@ -24,7 +24,8 @@ export class DeplomaOptionsPage implements OnInit {
constructor(public popoverController: PopoverController,
private modalController: ModalController,
private activatedRoute: ActivatedRoute,
private processes: ProcessesService,) {
private processes: ProcessesService,
private animationController: AnimationController) {
this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) {
this.serialnumber = params["serialNumber"];
@@ -124,7 +125,7 @@ export class DeplomaOptionsPage implements OnInit {
modal.onDidDismiss();
}
async askSignature(note:string, documents:any){
async askSignature(note:string, documents:any) {
let body = {
"serialNumber": this.serialnumber,
"action": "Aprovar",
@@ -146,12 +147,37 @@ export class DeplomaOptionsPage implements OnInit {
async successMessage(message?: 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({
component: SuccessMessageComponent,
enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: {
message: message || 'Processo efetuado' ,
},
cssClass: 'modal modal-desktop'
cssClass: 'notification-modal'
});
modal.present()
@@ -164,11 +190,11 @@ export class DeplomaOptionsPage implements OnInit {
async badRequest(message?: string) {
const modal = await this.modalController.create({
component: BadRequestComponent,
component: BadRequestPage,
componentProps: {
message: message || 'Processo não efetuado' ,
message: message || 'Processo efetuado' ,
},
cssClass: 'modal modal-desktop'
cssClass: 'notification-modal'
});
modal.present()
@@ -5,7 +5,7 @@ import { EventsService } from 'src/app/services/events.service';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { formatDate } from '@angular/common';
import { MenuController, ModalController, PopoverController } from '@ionic/angular';
import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
import { momentG } from 'src/plugin/momentG'
@@ -13,8 +13,8 @@ import { CreateProcessPage } from 'src/app/modals/create-process/create-process.
import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component';
import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
@@ -41,7 +41,8 @@ export class DespachosOptionsPage implements OnInit {
private modalController: ModalController,
private alertService: AlertService,
public popoverController: PopoverController,
private activatedRoute: ActivatedRoute) { }
private activatedRoute: ActivatedRoute,
private animationController: AnimationController) { }
ngOnInit() {
@@ -282,12 +283,38 @@ export class DespachosOptionsPage implements OnInit {
async successMessage(message?: 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({
component: SuccessMessageComponent,
enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: {
message: message || 'Processo efetuado' ,
},
cssClass: 'modal modal-desktop'
cssClass: 'notification-modal'
});
modal.present()
@@ -300,11 +327,11 @@ export class DespachosOptionsPage implements OnInit {
async badRequest(message?: string) {
const modal = await this.modalController.create({
component: BadRequestComponent,
component: BadRequestPage,
componentProps: {
message: message || 'Processo não efetuado' ,
message: message || 'Processo efetuado' ,
},
cssClass: 'modal modal-desktop'
cssClass: 'notification-modal'
});
modal.present()
@@ -5,7 +5,7 @@ import { EventsService } from 'src/app/services/events.service';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { formatDate } from '@angular/common';
import { MenuController, ModalController, PopoverController } from '@ionic/angular';
import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
import { momentG } from 'src/plugin/momentG'
@@ -13,8 +13,8 @@ import { CreateProcessPage } from 'src/app/modals/create-process/create-process.
import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component';
import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
@@ -42,7 +42,8 @@ export class DespachosPrOptionsPage implements OnInit {
private modalController: ModalController,
private alertService: AlertService,
public popoverController: PopoverController,
private activatedRoute: ActivatedRoute) { }
private activatedRoute: ActivatedRoute,
private animationController: AnimationController) { }
ngOnInit() {
@@ -283,12 +284,38 @@ export class DespachosPrOptionsPage implements OnInit {
async successMessage(message?: 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({
component: SuccessMessageComponent,
enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: {
message: message || 'Processo efetuado' ,
},
cssClass: 'modal modal-desktop'
cssClass: 'notification-modal'
});
modal.present()
@@ -301,11 +328,11 @@ export class DespachosPrOptionsPage implements OnInit {
async badRequest(message?: string) {
const modal = await this.modalController.create({
component: BadRequestComponent,
component: BadRequestPage,
componentProps: {
message: message || 'Processo não efetuado' ,
message: message || 'Processo efetuado' ,
},
cssClass: 'modal modal-desktop'
cssClass: 'notification-modal'
});
modal.present()
@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { AnimationController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { User } from 'src/app/models/user.model';
import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
@@ -11,8 +11,8 @@ import { AttachmentsService } from 'src/app/services/attachments.service';
import { AuthService } from 'src/app/services/auth.service';
import { EventsService } from 'src/app/services/events.service';
import { ProcessesService } from 'src/app/services/processes.service';
import { BadRequestComponent } from '../bad-request/bad-request.component';
import { SuccessMessageComponent } from '../success-message/success-message.component';
import { BadRequestPage } from '../bad-request/bad-request.page';
import { SuccessMessagePage } from '../success-message/success-message.page';
@Component({
selector: 'app-opts-expediente-pr',
@@ -42,6 +42,7 @@ export class OptsExpedientePrPage implements OnInit {
private activatedRoute: ActivatedRoute,
private userAuth: AuthService,
private navParams: NavParams,
private animationController: AnimationController
) {
this.task = this.navParams.get('task');
@@ -288,12 +289,38 @@ export class OptsExpedientePrPage implements OnInit {
async successMessage(message?: 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({
component: SuccessMessageComponent,
enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: {
message: message || 'Processo efetuado' ,
},
cssClass: 'modal modal-desktop'
cssClass: 'notification-modal'
});
modal.present()
@@ -306,7 +333,7 @@ export class OptsExpedientePrPage implements OnInit {
async badRequest() {
const modal = await this.modalController.create({
component: BadRequestComponent,
component: BadRequestPage,
componentProps: {
message: 'hello',
},
@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { ModalController, NavParams, PopoverController } from '@ionic/angular';
import { AnimationController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { DarParecerPage } from 'src/app/modals/dar-parecer/dar-parecer.page';
import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
@@ -8,8 +8,8 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar
import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
import { ProcessesService } from 'src/app/services/processes.service';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component';
import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
@Component({
@@ -31,6 +31,7 @@ export class RequestOptionsPage implements OnInit {
private navParams: NavParams,
private processes: ProcessesService,
private activatedRoute: ActivatedRoute,
private animationController: AnimationController
) {
this.task = this.navParams.get('task');
this.fulltask = this.navParams.get('fulltask');
@@ -286,12 +287,38 @@ export class RequestOptionsPage implements OnInit {
async successMessage(message?: 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({
component: SuccessMessageComponent,
enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: {
message: message || 'Processo efetuado' ,
},
cssClass: 'modal modal-desktop'
cssClass: 'notification-modal'
});
modal.present()
@@ -302,13 +329,39 @@ export class RequestOptionsPage implements OnInit {
}
async badRequest() {
async badRequest(message?) {
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({
component: BadRequestComponent,
enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: {
message: 'hello',
message: message || 'Processo efetuado' ,
},
cssClass: 'modal modal-desktop'
cssClass: 'notification-modal'
});
modal.present()
@@ -0,0 +1,17 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { SuccessMessagePage } from './success-message.page';
const routes: Routes = [
{
path: '',
component: SuccessMessagePage
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class SuccessMessagePageRoutingModule {}
@@ -1,7 +0,0 @@
<div class="main-content">
<p class="message">
{{ message }}
</p>
</div>
@@ -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 { SuccessMessagePageRoutingModule } from './success-message-routing.module';
import { SuccessMessagePage } from './success-message.page';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
SuccessMessagePageRoutingModule
],
declarations: [SuccessMessagePage]
})
export class SuccessMessagePageModule {}
@@ -0,0 +1,8 @@
<div class="main-content width-100 pa-20">
<p class="message d-flex align-center">
<ion-icon slot="end" class="title-icon pr-10" src="/assets/images/nofitication-success.svg"></ion-icon>
{{ message }}
</p>
</div>
@@ -3,7 +3,7 @@
align-items: center;
display: flex;
justify-content: center;
background-image: url("/assets/background/background-circle-check.svg");
background-image: url("/assets/background/background-circle-negative.svg");
background-size: 686px 674px;
background-position: center;
background-position-y: 0px;
@@ -11,6 +11,5 @@
}
.message {
padding-top: 150px;
font-size: 16pt;
font-size: 12pt;
}
@@ -1,19 +1,19 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { SuccessMessageComponent } from './success-message.component';
import { SuccessMessagePage } from './success-message.page';
describe('SuccessMessageComponent', () => {
let component: SuccessMessageComponent;
let fixture: ComponentFixture<SuccessMessageComponent>;
describe('SuccessMessagePage', () => {
let component: SuccessMessagePage;
let fixture: ComponentFixture<SuccessMessagePage>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ SuccessMessageComponent ],
declarations: [ SuccessMessagePage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(SuccessMessageComponent);
fixture = TestBed.createComponent(SuccessMessagePage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
@@ -3,10 +3,10 @@ import { NavParams } from '@ionic/angular';
@Component({
selector: 'app-success-message',
templateUrl: './success-message.component.html',
styleUrls: ['./success-message.component.scss'],
templateUrl: './success-message.page.html',
styleUrls: ['./success-message.page.scss'],
})
export class SuccessMessageComponent implements OnInit {
export class SuccessMessagePage implements OnInit {
message: string
@@ -16,5 +16,4 @@ export class SuccessMessageComponent implements OnInit {
}
ngOnInit() {}
}