This commit is contained in:
tiago.kayaya
2021-06-08 16:48:59 +01:00
54 changed files with 2354 additions and 482 deletions
+8
View File
@@ -127,7 +127,15 @@ const routes: Routes = [
{ {
path: 'approve-event', path: 'approve-event',
loadChildren: () => import('./shared/agenda/approve-event/approve-event.module').then( m => m.ApproveEventPageModule) loadChildren: () => import('./shared/agenda/approve-event/approve-event.module').then( m => m.ApproveEventPageModule)
},
{
path: 'bad-request',
loadChildren: () => import('./shared/popover/bad-request/bad-request.module').then( m => m.BadRequestPageModule) loadChildren: () => import('./shared/popover/bad-request/bad-request.module').then( m => m.BadRequestPageModule)
},
{
path: 'success-message',
loadChildren: () => import('./shared/popover/success-message/success-message.module').then( m => m.SuccessMessagePageModule)
},
/* { /* {
+61 -8
View File
@@ -1,9 +1,9 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { ModalController } from '@ionic/angular'; import { AnimationController, ModalController } from '@ionic/angular';
import { SearchDocument } from 'src/app/models/search-document'; import { SearchDocument } from 'src/app/models/search-document';
import { SearchPage } from 'src/app/pages/search/search.page'; import { SearchPage } from 'src/app/pages/search/search.page';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
@Component({ @Component({
selector: 'app-add-note', selector: 'app-add-note',
@@ -17,6 +17,7 @@ export class AddNotePage implements OnInit {
constructor( constructor(
private modalController: ModalController, private modalController: ModalController,
private animationController: AnimationController,
) { ) {
this.note = ''; this.note = '';
} }
@@ -62,12 +63,38 @@ export class AddNotePage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -79,12 +106,38 @@ export class AddNotePage implements OnInit {
} }
async badRequest(message?: string) { async badRequest(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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: message || 'Processo não efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { ModalController, NavParams } from '@ionic/angular'; import { AnimationController, ModalController, NavParams } from '@ionic/angular';
import { Despacho } from 'src/app/models/despacho.model'; import { Despacho } from 'src/app/models/despacho.model';
import { EventPerson } from 'src/app/models/eventperson.model'; import { EventPerson } from 'src/app/models/eventperson.model';
import { Participant } from 'src/app/models/participant.model'; import { Participant } from 'src/app/models/participant.model';
@@ -16,8 +16,8 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar
import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'; import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
import { SearchDocument } from 'src/app/models/search-document'; import { SearchDocument } from 'src/app/models/search-document';
import { SearchPage } from 'src/app/pages/search/search.page'; import { SearchPage } from 'src/app/pages/search/search.page';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { User } from 'src/app/models/user.model'; import { User } from 'src/app/models/user.model';
@Component({ @Component({
@@ -71,6 +71,7 @@ export class CreateProcessPage implements OnInit {
private alertController: AlertService, private alertController: AlertService,
private authService: AuthService, private authService: AuthService,
private userAuth: AuthService, private userAuth: AuthService,
private animationController: AnimationController,
) { ) {
this.loggeduser = userAuth.ValidatedUser; this.loggeduser = userAuth.ValidatedUser;
this.user = environment.defaultuser +'@'+ environment.domain; this.user = environment.defaultuser +'@'+ environment.domain;
@@ -505,12 +506,38 @@ export class CreateProcessPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -522,12 +549,38 @@ export class CreateProcessPage implements OnInit {
} }
async badRequest(message?: string) { async badRequest(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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: message || 'Processo não efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
+62 -9
View File
@@ -1,10 +1,10 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { ModalController, NavParams } from '@ionic/angular'; import { AnimationController, ModalController, NavParams } from '@ionic/angular';
import { SearchDocument } from 'src/app/models/search-document'; import { SearchDocument } from 'src/app/models/search-document';
import { SearchPage } from 'src/app/pages/search/search.page'; import { SearchPage } from 'src/app/pages/search/search.page';
import { ProcessesService } from 'src/app/services/processes.service'; import { ProcessesService } from 'src/app/services/processes.service';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
@Component({ @Component({
selector: 'app-dar-parecer', selector: 'app-dar-parecer',
@@ -21,6 +21,7 @@ export class DarParecerPage implements OnInit {
private processes: ProcessesService, private processes: ProcessesService,
private modalController: ModalController, private modalController: ModalController,
private navParams: NavParams, private navParams: NavParams,
private animationController: AnimationController,
) { ) {
this.serialNumber = this.navParams.get('serialNumber'); this.serialNumber = this.navParams.get('serialNumber');
this.instanceId = this.navParams.get('ProcessInstanceID'); this.instanceId = this.navParams.get('ProcessInstanceID');
@@ -98,12 +99,38 @@ export class DarParecerPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -114,13 +141,39 @@ export class DarParecerPage 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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: 'hello', message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
+61 -8
View File
@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { AlertController, ModalController, NavParams } from '@ionic/angular'; import { AlertController, AnimationController, ModalController, NavParams } from '@ionic/angular';
import { Event } from 'src/app/models/event.model' import { Event } from 'src/app/models/event.model'
import { EventBody } from 'src/app/models/eventbody.model'; import { EventBody } from 'src/app/models/eventbody.model';
import { ProcessesService } from 'src/app/services/processes.service'; import { ProcessesService } from 'src/app/services/processes.service';
@@ -11,8 +11,8 @@ import { AddParticipantsModalPage } from 'src/app/pages/gabinete-digital/expedie
import { AddParticipantsCcModalPage } from 'src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page'; import { AddParticipantsCcModalPage } from 'src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page';
import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
import { AlertService } from 'src/app/services/alert.service'; import { AlertService } from 'src/app/services/alert.service';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
@Component({ @Component({
selector: 'app-delegar', selector: 'app-delegar',
@@ -47,6 +47,7 @@ export class DelegarPage implements OnInit {
private calendarService: EventsService, private calendarService: EventsService,
public alertController: AlertController, public alertController: AlertController,
private alertService: AlertService, private alertService: AlertService,
private animationController: AnimationController,
) { ) {
this.task = this.navParams.get('task'); this.task = this.navParams.get('task');
this.postData = new Event(); this.postData = new Event();
@@ -175,12 +176,38 @@ export class DelegarPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -192,12 +219,38 @@ export class DelegarPage implements OnInit {
} }
async badRequest(message?: string) { async badRequest(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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: message || 'Processo não efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -1,13 +1,13 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { AlertController, ModalController, NavParams } from '@ionic/angular'; import { AlertController, AnimationController, ModalController, NavParams } from '@ionic/angular';
import { Attachment } from 'src/app/models/attachment.model'; import { Attachment } from 'src/app/models/attachment.model';
import { EventBody } from 'src/app/models/eventbody.model'; import { EventBody } from 'src/app/models/eventbody.model';
import { EventPerson } from 'src/app/models/eventperson.model'; import { EventPerson } from 'src/app/models/eventperson.model';
import { AlertService } from 'src/app/services/alert.service'; import { AlertService } from 'src/app/services/alert.service';
import { AttachmentsService } from 'src/app/services/attachments.service'; import { AttachmentsService } from 'src/app/services/attachments.service';
import { EventsService } from 'src/app/services/events.service'; import { EventsService } from 'src/app/services/events.service';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { Event } from '../../../models/event.model'; import { Event } from '../../../models/event.model';
import { AttendeesPage } from '../../events/attendees/attendees.page'; import { AttendeesPage } from '../../events/attendees/attendees.page';
import { SearchPage } from '../../search/search.page'; import { SearchPage } from '../../search/search.page';
@@ -46,6 +46,7 @@ export class EditEventPage implements OnInit {
private eventsService: EventsService, private eventsService: EventsService,
public alertController: AlertController, public alertController: AlertController,
private attachmentsService: AttachmentsService, private attachmentsService: AttachmentsService,
private animationController: AnimationController,
) { ) {
this.isEventEdited = false; this.isEventEdited = false;
this.postEvent = this.navParams.get('event'); this.postEvent = this.navParams.get('event');
@@ -235,12 +236,38 @@ export class EditEventPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -251,13 +278,39 @@ export class EditEventPage 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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
componentProps: { leaveAnimation,
message: 'Processo não realizado com sucesso', component: BadRequestPage,
componentProps: {
message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -1,10 +1,10 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { ModalController, NavParams, PopoverController } from '@ionic/angular'; import { AnimationController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { ProcessesService } from 'src/app/services/processes.service'; import { ProcessesService } from 'src/app/services/processes.service';
import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page'; import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
@Component({ @Component({
selector: 'app-event-actions-popover', selector: 'app-event-actions-popover',
@@ -20,7 +20,8 @@ export class EventActionsPopoverPage implements OnInit {
private processes:ProcessesService, private processes:ProcessesService,
private router:Router, private router:Router,
private modalController: ModalController, private modalController: ModalController,
private popoverController: PopoverController,) { private popoverController: PopoverController,
private animationController: AnimationController,) {
this.serialNumber = this.navParams.get('serialNumber'); this.serialNumber = this.navParams.get('serialNumber');
this.instanceId = this.navParams.get('InstanceId'); this.instanceId = this.navParams.get('InstanceId');
} }
@@ -93,12 +94,38 @@ export class EventActionsPopoverPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -110,12 +137,38 @@ export class EventActionsPopoverPage implements OnInit {
} }
async badRequest(message?: string) { async badRequest(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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: message || 'Processo não efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -1,13 +1,13 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { ModalController, NavParams } from '@ionic/angular'; import { AnimationController, ModalController, NavParams } from '@ionic/angular';
import { EventAttachment } from 'src/app/models/attachment.model'; import { EventAttachment } from 'src/app/models/attachment.model';
import { EventBody } from 'src/app/models/eventbody.model'; import { EventBody } from 'src/app/models/eventbody.model';
import { EventPerson } from 'src/app/models/eventperson.model'; import { EventPerson } from 'src/app/models/eventperson.model';
import { SearchDocument } from 'src/app/models/search-document'; import { SearchDocument } from 'src/app/models/search-document';
import { AttachmentsService } from 'src/app/services/attachments.service'; import { AttachmentsService } from 'src/app/services/attachments.service';
import { EventsService } from 'src/app/services/events.service'; import { EventsService } from 'src/app/services/events.service';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { Event } from '../../../models/event.model'; import { Event } from '../../../models/event.model';
import { AttendeesPage } from '../../events/attendees/attendees.page'; import { AttendeesPage } from '../../events/attendees/attendees.page';
import { SearchPage } from '../../search/search.page'; import { SearchPage } from '../../search/search.page';
@@ -39,7 +39,8 @@ export class NewEventPage implements OnInit {
private modalController: ModalController, private modalController: ModalController,
private navParams: NavParams, private navParams: NavParams,
private eventService: EventsService, private eventService: EventsService,
private attachmentsService: AttachmentsService private attachmentsService: AttachmentsService,
private animationController: AnimationController,
) { ) {
this.postEvent = new Event(); this.postEvent = new Event();
this.eventBody = { BodyType : "1", Text : ""}; this.eventBody = { BodyType : "1", Text : ""};
@@ -170,12 +171,38 @@ export class NewEventPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -186,13 +213,39 @@ export class NewEventPage 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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
componentProps: { leaveAnimation,
message: 'Processo não realizado com sucesso', component: BadRequestPage,
componentProps: {
message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -7,7 +7,7 @@ import { DailyWorkTask } from '../../../../models/dailyworktask.model';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { formatDate } from '@angular/common'; import { formatDate } from '@angular/common';
import { Event } from '../../../../models/event.model'; import { Event } from '../../../../models/event.model';
import { MenuController, ModalController, PopoverController } from '@ionic/angular'; import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service'; import { AlertService } from 'src/app/services/alert.service';
import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
import { momentG } from 'src/plugin/momentG' import { momentG } from 'src/plugin/momentG'
@@ -18,8 +18,8 @@ import { CreateProcessPage } from 'src/app/modals/create-process/create-process.
import { DelegarPage } from 'src/app/modals/delegar/delegar.page'; import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
import { AddNotePage } from 'src/app/modals/add-note/add-note.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 { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { DespachosPrOptionsPage } from 'src/app/shared/popover/despachos-pr-options/despachos-pr-options.page'; import { DespachosPrOptionsPage } from 'src/app/shared/popover/despachos-pr-options/despachos-pr-options.page';
@Component({ @Component({
@@ -52,7 +52,8 @@ export class DespachoPrPage implements OnInit {
private modalController: ModalController, private modalController: ModalController,
private alertService: AlertService, private alertService: AlertService,
public popoverController: PopoverController, public popoverController: PopoverController,
private activatedRoute: ActivatedRoute,) { private activatedRoute: ActivatedRoute,
private animationController: AnimationController) {
this.activatedRoute.queryParams.subscribe(params => { this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) { if(params["serialNumber"]) {
this.serialnumber = params["serialNumber"]; this.serialnumber = params["serialNumber"];
@@ -463,12 +464,38 @@ export class DespachoPrPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
componentProps: { leaveAnimation,
component: SuccessMessagePage,
componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -476,16 +503,41 @@ export class DespachoPrPage implements OnInit {
setTimeout(()=>{ setTimeout(()=>{
modal.dismiss() modal.dismiss()
},3000) },3000)
} }
async badRequest(message?: string) { 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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
componentProps: { leaveAnimation,
message: message || 'Processo não efetuado' , component: BadRequestPage,
componentProps: {
message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -7,7 +7,7 @@ import { DailyWorkTask } from '../../../../models/dailyworktask.model';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { formatDate } from '@angular/common'; import { formatDate } from '@angular/common';
import { Event } from '../../../../models/event.model'; import { Event } from '../../../../models/event.model';
import { MenuController, ModalController, PopoverController } from '@ionic/angular'; import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service'; import { AlertService } from 'src/app/services/alert.service';
import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
import { momentG } from 'src/plugin/momentG' import { momentG } from 'src/plugin/momentG'
@@ -18,8 +18,8 @@ import { CreateProcessPage } from 'src/app/modals/create-process/create-process.
import { DelegarPage } from 'src/app/modals/delegar/delegar.page'; import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
import { AddNotePage } from 'src/app/modals/add-note/add-note.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 { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
@Component({ @Component({
selector: 'app-despacho', selector: 'app-despacho',
@@ -52,6 +52,7 @@ export class DespachoPage implements OnInit {
public popoverController: PopoverController, public popoverController: PopoverController,
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,
private router: Router, private router: Router,
private animationController: AnimationController,
) { ) {
this.activatedRoute.queryParams.subscribe(params => { this.activatedRoute.queryParams.subscribe(params => {
@@ -415,12 +416,38 @@ export class DespachoPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -432,12 +459,38 @@ export class DespachoPage implements OnInit {
} }
async badRequest(message?: string) { async badRequest(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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: message || 'Processo não efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
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 { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { ProcessesService } from 'src/app/services/processes.service'; import { ProcessesService } from 'src/app/services/processes.service';
import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page'; import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
@@ -8,8 +8,8 @@ import { momentG } from 'src/plugin/momentG';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page'; import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { DeplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page'; import { DeplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page';
@Component({ @Component({
@@ -37,6 +37,7 @@ export class DiplomaAssinarPage implements OnInit {
private iab: InAppBrowser, private iab: InAppBrowser,
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,
private router: Router, private router: Router,
private animationController: AnimationController,
) { ) {
this.activatedRoute.queryParams.subscribe(params => { this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) { if(params["serialNumber"]) {
@@ -156,12 +157,38 @@ export class DiplomaAssinarPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -173,12 +200,38 @@ export class DiplomaAssinarPage implements OnInit {
} }
async badRequest(message?: string) { async badRequest(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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: message || 'Processo não efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
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 { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { ProcessesService } from 'src/app/services/processes.service'; import { ProcessesService } from 'src/app/services/processes.service';
import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page'; import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
@@ -8,8 +8,8 @@ import { momentG } from 'src/plugin/momentG';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page'; import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { DeplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page'; import { DeplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page';
@Component({ @Component({
@@ -38,6 +38,7 @@ export class DiplomaPage implements OnInit {
private iab: InAppBrowser, private iab: InAppBrowser,
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,
private router: Router, private router: Router,
private animationController: AnimationController
) { ) {
this.activatedRoute.queryParams.subscribe(params => { this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) { if(params["serialNumber"]) {
@@ -272,12 +273,38 @@ export class DiplomaPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -289,12 +316,38 @@ export class DiplomaPage implements OnInit {
} }
async badRequest(message?: string) { async badRequest(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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: message || 'Processo não efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -1,13 +1,13 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular'; import { AnimationController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { Event } from 'src/app/models/event.model'; import { Event } from 'src/app/models/event.model';
import { AlertService } from 'src/app/services/alert.service'; import { AlertService } from 'src/app/services/alert.service';
import { AttachmentsService } from 'src/app/services/attachments.service'; import { AttachmentsService } from 'src/app/services/attachments.service';
import { ProcessesService } from 'src/app/services/processes.service'; import { ProcessesService } from 'src/app/services/processes.service';
import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page'; import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { EmendMessageModalPage } from '../../../agenda/emend-message-modal/emend-message-modal.page'; import { EmendMessageModalPage } from '../../../agenda/emend-message-modal/emend-message-modal.page';
import { EventActionsPopoverPage } from '../../../agenda/event-actions-popover/event-actions-popover.page'; import { EventActionsPopoverPage } from '../../../agenda/event-actions-popover/event-actions-popover.page';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
@@ -40,6 +40,7 @@ export class ApproveEventModalPage implements OnInit {
private alertService: AlertService, private alertService: AlertService,
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,
private iab: InAppBrowser, private iab: InAppBrowser,
private animationController: AnimationController,
) { ) {
@@ -215,12 +216,38 @@ export class ApproveEventModalPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -232,12 +259,38 @@ export class ApproveEventModalPage implements OnInit {
} }
async badRequest(message?: string) { async badRequest(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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: message || 'Processo não efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -1,6 +1,6 @@
import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core'; import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular'; import { AnimationController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { Event } from 'src/app/models/event.model'; import { Event } from 'src/app/models/event.model';
import { AlertService } from 'src/app/services/alert.service'; import { AlertService } from 'src/app/services/alert.service';
import { AttachmentsService } from 'src/app/services/attachments.service'; import { AttachmentsService } from 'src/app/services/attachments.service';
@@ -9,8 +9,8 @@ import { EmendMessageModalPage } from 'src/app/pages/agenda/emend-message-modal/
import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page'; import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page'; import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
@Component({ @Component({
selector: 'app-approve-event', selector: 'app-approve-event',
@@ -45,7 +45,8 @@ export class ApproveEventPage implements OnInit {
private popoverController: PopoverController, private popoverController: PopoverController,
private menu: MenuController, private menu: MenuController,
private alertService: AlertService, private alertService: AlertService,
private iab: InAppBrowser private iab: InAppBrowser,
private animationController: AnimationController
) { ) {
this.activatedRoute.queryParams.subscribe(params => { this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) { if(params["serialNumber"]) {
@@ -232,12 +233,38 @@ export class ApproveEventPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -249,12 +276,38 @@ export class ApproveEventPage implements OnInit {
} }
async badRequest(message?: string) { async badRequest(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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: message || 'Processo não efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { ModalController, NavParams } from '@ionic/angular'; import { AnimationController, ModalController, NavParams } from '@ionic/angular';
import { AddParticipantsCcModalPage } from '../add-participants-cc-modal/add-participants-cc-modal.page'; import { AddParticipantsCcModalPage } from '../add-participants-cc-modal/add-participants-cc-modal.page';
import { AddParticipantsModalPage } from '../add-participants-modal/add-participants-modal.page'; import { AddParticipantsModalPage } from '../add-participants-modal/add-participants-modal.page';
import { Event } from 'src/app/models/event.model' import { Event } from 'src/app/models/event.model'
@@ -12,8 +12,8 @@ import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart
import { AttachmentsService } from 'src/app/services/attachments.service'; import { AttachmentsService } from 'src/app/services/attachments.service';
import { SearchPage } from 'src/app/pages/search/search.page'; import { SearchPage } from 'src/app/pages/search/search.page';
import { SearchDocument } from 'src/app/models/search-document'; import { SearchDocument } from 'src/app/models/search-document';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { User } from 'src/app/models/user.model'; import { User } from 'src/app/models/user.model';
import { AuthService } from 'src/app/services/auth.service'; import { AuthService } from 'src/app/services/auth.service';
@@ -52,6 +52,7 @@ export class BookMeetingModalPage implements OnInit {
private attachmentsService: AttachmentsService, private attachmentsService: AttachmentsService,
private calendarService: EventsService, private calendarService: EventsService,
authService: AuthService, authService: AuthService,
private animationController: AnimationController
) { ) {
this.loggeduser = authService.ValidatedUser; this.loggeduser = authService.ValidatedUser;
this.task = this.navParams.get('task'); this.task = this.navParams.get('task');
@@ -306,12 +307,38 @@ export class BookMeetingModalPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -324,12 +351,38 @@ export class BookMeetingModalPage implements OnInit {
} }
async badRequest(message?: string) { async badRequest(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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
componentProps: { leaveAnimation,
message: message || 'Processo não efetuado' , component: BadRequestPage,
}, componentProps: {
cssClass: 'modal modal-desktop' message: message || 'Processo não efetuado' ,
},
cssClass: 'modal modal-desktop'
}); });
modal.present() modal.present()
@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { ModalController, NavParams } from '@ionic/angular'; import { AnimationController, ModalController, NavParams } from '@ionic/angular';
import { Despacho } from 'src/app/models/despacho.model'; import { Despacho } from 'src/app/models/despacho.model';
import { EventPerson } from 'src/app/models/eventperson.model'; import { EventPerson } from 'src/app/models/eventperson.model';
import { Participant } from 'src/app/models/participant.model'; import { Participant } from 'src/app/models/participant.model';
@@ -18,8 +18,8 @@ import { SearchPage } from 'src/app/pages/search/search.page';
import { SearchDocument } from 'src/app/models/search-document'; import { SearchDocument } from 'src/app/models/search-document';
import { EventAttachment } from 'src/app/models/attachment.model'; import { EventAttachment } from 'src/app/models/attachment.model';
import { User } from 'src/app/models/user.model'; import { User } from 'src/app/models/user.model';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
@Component({ @Component({
selector: 'app-expedient-task-modal', selector: 'app-expedient-task-modal',
@@ -75,7 +75,8 @@ export class ExpedientTaskModalPage implements OnInit {
private navParams: NavParams, private navParams: NavParams,
private alertController: AlertService, private alertController: AlertService,
private authService: AuthService, private authService: AuthService,
private userAuth: AuthService) { private userAuth: AuthService,
private animationController: AnimationController) {
this.loggeduser = userAuth.ValidatedUser; this.loggeduser = userAuth.ValidatedUser;
@@ -529,12 +530,38 @@ export class ExpedientTaskModalPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -546,12 +573,38 @@ export class ExpedientTaskModalPage implements OnInit {
} }
async badRequest(message?: string) { async badRequest(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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: message || 'Processo não efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -7,7 +7,7 @@ import { DailyWorkTask } from '../../../../models/dailyworktask.model';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { formatDate } from '@angular/common'; import { formatDate } from '@angular/common';
import { Event } from '../../../../models/event.model'; import { Event } from '../../../../models/event.model';
import { MenuController, ModalController, PopoverController } from '@ionic/angular'; import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service'; import { AlertService } from 'src/app/services/alert.service';
import { ExpedientTaskModalPage } from '../expedient-task-modal/expedient-task-modal.page'; import { ExpedientTaskModalPage } from '../expedient-task-modal/expedient-task-modal.page';
import { BookMeetingModalPage } from '../book-meeting-modal/book-meeting-modal.page'; import { BookMeetingModalPage } from '../book-meeting-modal/book-meeting-modal.page';
@@ -15,8 +15,8 @@ import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
import { momentG } from 'src/plugin/momentG' import { momentG } from 'src/plugin/momentG'
import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page'; import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page'; import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { ToastService } from 'src/app/services/toast.service'; import { ToastService } from 'src/app/services/toast.service';
@Component({ @Component({
@@ -51,6 +51,7 @@ export class ExpedienteDetailPage implements OnInit {
public popoverController: PopoverController, public popoverController: PopoverController,
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,
private toastService: ToastService, private toastService: ToastService,
private animationController: AnimationController
) { ) {
this.activatedRoute.queryParams.subscribe(params => { this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) { if(params["serialNumber"]) {
@@ -342,12 +343,38 @@ export class ExpedienteDetailPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -359,12 +386,38 @@ export class ExpedienteDetailPage implements OnInit {
} }
async badRequest(message?: string) { async badRequest(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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: message || 'Processo não efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -7,7 +7,7 @@ import { DailyWorkTask } from '../../../../models/dailyworktask.model';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { formatDate } from '@angular/common'; import { formatDate } from '@angular/common';
import { Event } from '../../../../models/event.model'; import { Event } from '../../../../models/event.model';
import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular'; import { AnimationController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service'; import { AlertService } from 'src/app/services/alert.service';
import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
import { momentG } from 'src/plugin/momentG' import { momentG } from 'src/plugin/momentG'
@@ -18,8 +18,8 @@ import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-m
import { User } from 'src/app/models/user.model'; import { User } from 'src/app/models/user.model';
import { AuthService } from 'src/app/services/auth.service'; import { AuthService } from 'src/app/services/auth.service';
import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { OptsExpedientePrPage } from 'src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page'; import { OptsExpedientePrPage } from 'src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page';
@Component({ @Component({
@@ -54,7 +54,9 @@ export class ExpedientePrPage implements OnInit {
private alertService: AlertService, private alertService: AlertService,
public popoverController: PopoverController, public popoverController: PopoverController,
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,
private userAuth: AuthService private userAuth: AuthService,
private animationController: AnimationController,
) { ) {
this.loggeduser = userAuth.ValidatedUser; this.loggeduser = userAuth.ValidatedUser;
this.activatedRoute.queryParams.subscribe(params => { this.activatedRoute.queryParams.subscribe(params => {
@@ -440,12 +442,38 @@ export class ExpedientePrPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -456,13 +484,39 @@ export class ExpedientePrPage 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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: 'hello', message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -7,7 +7,7 @@ import { DailyWorkTask } from '../../../../models/dailyworktask.model';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { formatDate } from '@angular/common'; import { formatDate } from '@angular/common';
import { Event } from '../../../../models/event.model'; import { Event } from '../../../../models/event.model';
import { MenuController, ModalController, PopoverController } from '@ionic/angular'; import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service'; import { AlertService } from 'src/app/services/alert.service';
import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
import { momentG } from 'src/plugin/momentG' import { momentG } from 'src/plugin/momentG'
@@ -22,8 +22,8 @@ import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-
import { RequestOptionsPage } from 'src/app/shared/popover/request-options/request-options.page'; import { RequestOptionsPage } from 'src/app/shared/popover/request-options/request-options.page';
import { AuthService } from 'src/app/services/auth.service'; import { AuthService } from 'src/app/services/auth.service';
import { User } from 'src/app/models/user.model'; import { User } from 'src/app/models/user.model';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
@Component({ @Component({
selector: 'app-pedido', selector: 'app-pedido',
@@ -55,7 +55,8 @@ export class PedidoPage implements OnInit {
private modalController: ModalController, private modalController: ModalController,
private alertService: AlertService, private alertService: AlertService,
public popoverController: PopoverController, public popoverController: PopoverController,
authService: AuthService) { authService: AuthService,
private animationController: AnimationController) {
this.loggeduser = authService.ValidatedUser; this.loggeduser = authService.ValidatedUser;
this.activatedRoute.queryParams.subscribe(params => { this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) { if(params["serialNumber"]) {
@@ -415,12 +416,38 @@ export class PedidoPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -431,13 +458,39 @@ export class PedidoPage 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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: 'hello', message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
-1
View File
@@ -67,4 +67,3 @@
</div> </div>
</ion-content> </ion-content>
+65 -10
View File
@@ -4,15 +4,15 @@ import { AuthService } from 'src/app/services/auth.service';
import { User, UserForm } from 'src/app/models/user.model'; import { User, UserForm } from 'src/app/models/user.model';
import { ToastService } from 'src/app/services/toast.service'; import { ToastService } from 'src/app/services/toast.service';
import { environment } from 'src/environments/environment'; import { environment } from 'src/environments/environment';
import { AlertController, ModalController } from '@ionic/angular'; import { AlertController, AnimationController, ModalController } from '@ionic/angular';
import { StorageService } from 'src/app/services/storage.service'; import { StorageService } from 'src/app/services/storage.service';
import { AuthConnstants } from 'src/app/config/auth-constants'; import { AuthConnstants } from 'src/app/config/auth-constants';
import { PhotoService } from 'src/app/services/photo.service'; import { PhotoService } from 'src/app/services/photo.service';
import { NotificationsService } from 'src/app/services/notifications.service'; import { NotificationsService } from 'src/app/services/notifications.service';
import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
import crypto from 'crypto-js' import crypto from 'crypto-js'
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
//import { Token } from '../../models/token.model'; //import { Token } from '../../models/token.model';
//import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx'; //import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
@@ -48,7 +48,8 @@ export class LoginPage implements OnInit {
private toastService: ToastService, private toastService: ToastService,
private photoService: PhotoService, private photoService: PhotoService,
public alertController: AlertController, public alertController: AlertController,
private modalController: ModalController private modalController: ModalController,
private animationController: AnimationController,
//private fcm: FCM //private fcm: FCM
) { ) {
@@ -170,7 +171,7 @@ export class LoginPage implements OnInit {
//this.successMessage() //this.successMessage()
this.router.navigate(['/home/events']); this.router.navigate(['/home/events']);
} else { } else {
this.badRequest() this.badRequest('Pin incorreto')
this.code = [] this.code = []
} }
@@ -189,12 +190,38 @@ export class LoginPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -206,17 +233,45 @@ export class LoginPage implements OnInit {
} }
async badRequest(message?: string) { async badRequest(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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: message || 'Processo não efetuado' , message: message || 'Processo não efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
setTimeout(()=>{ setTimeout(()=> {
modal.dismiss() modal.dismiss()
},3000) },3000)
} }
@@ -1,9 +1,9 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { ModalController } from '@ionic/angular'; import { AnimationController, ModalController } from '@ionic/angular';
import { PublicationFolder } from 'src/app/models/publicationfolder'; import { PublicationFolder } from 'src/app/models/publicationfolder';
import { PublicationsService } from 'src/app/services/publications.service'; import { PublicationsService } from 'src/app/services/publications.service';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
@Component({ @Component({
selector: 'app-new-action', selector: 'app-new-action',
@@ -17,7 +17,9 @@ export class NewActionPage implements OnInit {
constructor( constructor(
private modalController: ModalController, private modalController: ModalController,
private publication: PublicationsService private publication: PublicationsService,
private animationController: AnimationController,
) { ) {
this.folder = new PublicationFolder(); this.folder = new PublicationFolder();
} }
@@ -56,12 +58,38 @@ export class NewActionPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -73,8 +101,34 @@ export class NewActionPage implements OnInit {
} }
async badRequest() { async badRequest() {
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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: 'Processo não realizado com sucesso', message: 'Processo não realizado com sucesso',
}, },
@@ -1,9 +1,9 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { ModalController, NavParams } from '@ionic/angular'; import { AnimationController, ModalController, NavParams } from '@ionic/angular';
import { Publication } from 'src/app/models/publication'; import { Publication } from 'src/app/models/publication';
import { PublicationsService } from 'src/app/services/publications.service'; import { PublicationsService } from 'src/app/services/publications.service';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { ImageModalPage } from '../gallery/image-modal/image-modal.page'; import { ImageModalPage } from '../gallery/image-modal/image-modal.page';
import { NewPublicationPage } from '../new-publication/new-publication.page'; import { NewPublicationPage } from '../new-publication/new-publication.page';
@@ -23,6 +23,7 @@ export class PublicationDetailPage implements OnInit {
private modalController: ModalController, private modalController: ModalController,
private navParams:NavParams, private navParams:NavParams,
private publications:PublicationsService, private publications:PublicationsService,
private animationController: AnimationController
) { ) {
this.publicationId = this.navParams.get('publicationId'); this.publicationId = this.navParams.get('publicationId');
/* this.folderId = this.navParams.get('folderIdId'); */ /* this.folderId = this.navParams.get('folderIdId'); */
@@ -123,12 +124,38 @@ export class PublicationDetailPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -140,8 +167,34 @@ export class PublicationDetailPage implements OnInit {
} }
async badRequest() { async badRequest() {
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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: 'Processo não realizado com sucesso', message: 'Processo não realizado com sucesso',
}, },
@@ -1,9 +1,9 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { ModalController, NavParams } from '@ionic/angular'; import { AnimationController, ModalController, NavParams } from '@ionic/angular';
import { Publication } from 'src/app/models/publication'; import { Publication } from 'src/app/models/publication';
import { PublicationsService } from 'src/app/services/publications.service'; import { PublicationsService } from 'src/app/services/publications.service';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { ImageModalPage } from '../../gallery/image-modal/image-modal.page'; import { ImageModalPage } from '../../gallery/image-modal/image-modal.page';
import { NewPublicationPage } from '../../new-publication/new-publication.page'; import { NewPublicationPage } from '../../new-publication/new-publication.page';
@@ -22,6 +22,7 @@ export class PublicationDetailPage implements OnInit {
private modalController: ModalController, private modalController: ModalController,
private navParams:NavParams, private navParams:NavParams,
private publications:PublicationsService, private publications:PublicationsService,
private animationController: AnimationController
) { ) {
this.publicationId = this.navParams.get('publicationId'); this.publicationId = this.navParams.get('publicationId');
this.folderId = this.navParams.get('folderId'); this.folderId = this.navParams.get('folderId');
@@ -125,12 +126,38 @@ export class PublicationDetailPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -142,8 +169,34 @@ export class PublicationDetailPage implements OnInit {
} }
async badRequest() { async badRequest() {
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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: 'Processo não realizado com sucesso', message: 'Processo não realizado com sucesso',
}, },
@@ -1,6 +1,6 @@
import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core'; import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core';
import { NavigationExtras, Router } from '@angular/router'; import { NavigationExtras, Router } from '@angular/router';
import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular'; import { AnimationController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { Event } from 'src/app/models/event.model'; import { Event } from 'src/app/models/event.model';
import { AlertService } from 'src/app/services/alert.service'; import { AlertService } from 'src/app/services/alert.service';
import { AttachmentsService } from 'src/app/services/attachments.service'; import { AttachmentsService } from 'src/app/services/attachments.service';
@@ -9,8 +9,8 @@ import { EmendMessageModalPage } from 'src/app/pages/agenda/emend-message-modal/
import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page'; import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { EditEventToApproveComponent } from '../../gabinete-digital/edit-event-to-approve/edit-event.page'; import { EditEventToApproveComponent } from '../../gabinete-digital/edit-event-to-approve/edit-event.page';
import { BadRequestComponent } from '../../popover/bad-request/bad-request.component'; import { BadRequestPage } from '../../popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from '../../popover/success-message/success-message.component'; import { SuccessMessagePage} from '../../popover/success-message/success-message.page';
@Component({ @Component({
@@ -46,7 +46,8 @@ export class ApproveEventPage implements OnInit {
private popoverController: PopoverController, private popoverController: PopoverController,
private menu: MenuController, private menu: MenuController,
private alertService: AlertService, private alertService: AlertService,
private iab: InAppBrowser private iab: InAppBrowser,
private animationController: AnimationController
) { ) {
// $$$ // $$$
} }
@@ -236,12 +237,38 @@ export class ApproveEventPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -253,12 +280,38 @@ export class ApproveEventPage implements OnInit {
} }
async badRequest(message?: string) { async badRequest(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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: message || 'Processo não efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -4,13 +4,13 @@ import { EventPerson } from 'src/app/models/eventperson.model';
import { EventsService } from 'src/app/services/events.service'; import { EventsService } from 'src/app/services/events.service';
import { AttachmentsService } from 'src/app/services/attachments.service'; import { AttachmentsService } from 'src/app/services/attachments.service';
import { Event } from 'src/app/models/event.model'; import { Event } from 'src/app/models/event.model';
import { ModalController } from '@ionic/angular'; import { AnimationController, ModalController } from '@ionic/angular';
import { removeDuplicate } from 'src/plugin/removeDuplicate.js' import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
import { SearchPage } from 'src/app/pages/search/search.page'; import { SearchPage } from 'src/app/pages/search/search.page';
import { SearchDocument } from "src/app/models/search-document"; import { SearchDocument } from "src/app/models/search-document";
import { EventAttachment } from 'src/app/models/attachment.model'; import { EventAttachment } from 'src/app/models/attachment.model';
import { BadRequestComponent } from '../../popover/bad-request/bad-request.component'; import { BadRequestPage } from '../../popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from '../../popover/success-message/success-message.component'; import { SuccessMessagePage} from '../../popover/success-message/success-message.page';
@Component({ @Component({
@@ -47,7 +47,9 @@ export class NewEventPage implements OnInit {
constructor( constructor(
private modalController: ModalController, private modalController: ModalController,
private eventService: EventsService, private eventService: EventsService,
private attachmentsService: AttachmentsService private attachmentsService: AttachmentsService,
private animationController: AnimationController,
) {} ) {}
ngOnInit() { ngOnInit() {
@@ -315,12 +317,38 @@ export class NewEventPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -332,8 +360,34 @@ export class NewEventPage implements OnInit {
} }
async badRequest() { async badRequest() {
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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: 'Processo não realizado com sucesso', message: 'Processo não realizado com sucesso',
}, },
+64 -12
View File
@@ -1,8 +1,8 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { ModalController } from '@ionic/angular'; import { AnimationController, ModalController } from '@ionic/angular';
import { BadRequestComponent } from '../popover/bad-request/bad-request.component'; import { BadRequestPage } from '../popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from '../popover/success-message/success-message.component'; import { SuccessMessagePage } from '../popover/success-message/success-message.page';
import { FingerprintAIO } from '@ionic-native/fingerprint-aio'; // import { FingerprintAIO } from '@ionic-native/fingerprint-aio';
@Component({ @Component({
selector: 'app-fingerprint', selector: 'app-fingerprint',
@@ -11,9 +11,9 @@ import { FingerprintAIO } from '@ionic-native/fingerprint-aio';
}) })
export class FingerprintPage implements OnInit { export class FingerprintPage implements OnInit {
constructor( constructor( private modalController: ModalController,
private modalController: ModalController, //private faio: FingerprintAIO
private faio: FingerprintAIO, private animationController: AnimationController
) { ) {
} }
@@ -71,12 +71,38 @@ export class FingerprintPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -90,12 +116,38 @@ export class FingerprintPage implements OnInit {
} }
async badRequest(message?: string) { async badRequest(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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: message || 'Processo não efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { AlertController, ModalController, NavParams } from '@ionic/angular'; import { AlertController, AnimationController, ModalController, NavParams } from '@ionic/angular';
import { Attachment } from 'src/app/models/attachment.model'; import { Attachment } from 'src/app/models/attachment.model';
import { EventPerson } from 'src/app/models/eventperson.model'; import { EventPerson } from 'src/app/models/eventperson.model';
import { SearchDocument } from 'src/app/models/search-document'; import { SearchDocument } from 'src/app/models/search-document';
@@ -9,8 +9,8 @@ import { AttachmentsService } from 'src/app/services/attachments.service';
import { EventsService } from 'src/app/services/events.service'; import { EventsService } from 'src/app/services/events.service';
import { ProcessesService } from 'src/app/services/processes.service'; import { ProcessesService } from 'src/app/services/processes.service';
import { Event, EventToApproveEdit } from '../../../models/event.model'; import { Event, EventToApproveEdit } from '../../../models/event.model';
import { BadRequestComponent } from '../../popover/bad-request/bad-request.component'; import { BadRequestPage } from '../../popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from '../../popover/success-message/success-message.component'; import { SuccessMessagePage} from '../../popover/success-message/success-message.page';
@Component({ @Component({
selector: 'app-edit-event', selector: 'app-edit-event',
@@ -140,6 +140,7 @@ export class EditEventToApproveComponent implements OnInit {
public alertController: AlertController, public alertController: AlertController,
private attachmentsService: AttachmentsService, private attachmentsService: AttachmentsService,
private processes:ProcessesService, private processes:ProcessesService,
private animationController: AnimationController
) { ) {
this.serialNumber = this.navParams.get('serialNumber'); this.serialNumber = this.navParams.get('serialNumber');
@@ -408,12 +409,38 @@ export class EditEventToApproveComponent implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -425,12 +452,38 @@ export class EditEventToApproveComponent implements OnInit {
} }
async badRequest(message?: string) { async badRequest(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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: message || 'Processo não efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
+63 -10
View File
@@ -1,7 +1,7 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { ModalController } from '@ionic/angular'; import { AnimationController, ModalController } from '@ionic/angular';
import { BadRequestComponent } from '../popover/bad-request/bad-request.component'; import { BadRequestPage } from '../popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from '../popover/success-message/success-message.component'; import { SuccessMessagePage } from '../popover/success-message/success-message.page';
import crypto from 'crypto-js' import crypto from 'crypto-js'
@Component({ @Component({
selector: 'app-pin', selector: 'app-pin',
@@ -11,7 +11,8 @@ import crypto from 'crypto-js'
export class PinPage implements OnInit { export class PinPage implements OnInit {
code = [] code = []
constructor( private modalController: ModalController,) { } constructor( private modalController: ModalController,
private animationController: AnimationController) { }
ngOnInit() { ngOnInit() {
} }
@@ -55,12 +56,38 @@ export class PinPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -70,12 +97,38 @@ export class PinPage implements OnInit {
} }
async badRequest(message?: string) { async badRequest(message?: string) {
let modal = await this.modalController.create({ const enterAnimation = (baseEl: any) => {
component: BadRequestComponent, 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: BadRequestPage,
componentProps: { componentProps: {
message: message || 'Processo não efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -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 { .message {
padding-top: 150px; font-size: 12pt;
font-size: 16pt;
} }
@@ -1,19 +1,19 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular'; import { IonicModule } from '@ionic/angular';
import { BadRequestComponent } from './bad-request.component'; import { BadRequestPage } from './bad-request.page';
describe('BadRequestComponent', () => { describe('BadRequestPage', () => {
let component: BadRequestComponent; let component: BadRequestPage;
let fixture: ComponentFixture<BadRequestComponent>; let fixture: ComponentFixture<BadRequestPage>;
beforeEach(waitForAsync(() => { beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ BadRequestComponent ], declarations: [ BadRequestPage ],
imports: [IonicModule.forRoot()] imports: [IonicModule.forRoot()]
}).compileComponents(); }).compileComponents();
fixture = TestBed.createComponent(BadRequestComponent); fixture = TestBed.createComponent(BadRequestPage);
component = fixture.componentInstance; component = fixture.componentInstance;
fixture.detectChanges(); fixture.detectChanges();
})); }));
@@ -3,10 +3,10 @@ import { NavParams } from '@ionic/angular';
@Component({ @Component({
selector: 'app-bad-request', selector: 'app-bad-request',
templateUrl: './bad-request.component.html', templateUrl: './bad-request.page.html',
styleUrls: ['./bad-request.component.scss'], styleUrls: ['./bad-request.page.scss'],
}) })
export class BadRequestComponent implements OnInit { export class BadRequestPage implements OnInit {
message: string message: string
@@ -16,5 +16,4 @@ export class BadRequestComponent implements OnInit {
} }
ngOnInit() {} ngOnInit() {}
} }
@@ -1,11 +1,11 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router'; 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 { 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 { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
import { ProcessesService } from 'src/app/services/processes.service'; import { ProcessesService } from 'src/app/services/processes.service';
import { BadRequestComponent } from '../bad-request/bad-request.component'; import { BadRequestPage } from '../bad-request/bad-request.page';
import { SuccessMessageComponent } from '../success-message/success-message.component'; import { SuccessMessagePage } from '../success-message/success-message.page';
@Component({ @Component({
selector: 'app-deploma-options', selector: 'app-deploma-options',
@@ -24,7 +24,8 @@ export class DeplomaOptionsPage implements OnInit {
constructor(public popoverController: PopoverController, constructor(public popoverController: PopoverController,
private modalController: ModalController, private modalController: ModalController,
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,
private processes: ProcessesService,) { private processes: ProcessesService,
private animationController: AnimationController) {
this.activatedRoute.queryParams.subscribe(params => { this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) { if(params["serialNumber"]) {
this.serialnumber = params["serialNumber"]; this.serialnumber = params["serialNumber"];
@@ -124,7 +125,7 @@ export class DeplomaOptionsPage implements OnInit {
modal.onDidDismiss(); modal.onDidDismiss();
} }
async askSignature(note:string, documents:any){ async askSignature(note:string, documents:any) {
let body = { let body = {
"serialNumber": this.serialnumber, "serialNumber": this.serialnumber,
"action": "Aprovar", "action": "Aprovar",
@@ -146,12 +147,37 @@ export class DeplomaOptionsPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -164,11 +190,11 @@ export class DeplomaOptionsPage implements OnInit {
async badRequest(message?: string) { async badRequest(message?: string) {
const modal = await this.modalController.create({ const modal = await this.modalController.create({
component: BadRequestComponent, component: BadRequestPage,
componentProps: { componentProps: {
message: message || 'Processo não efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -5,7 +5,7 @@ import { EventsService } from 'src/app/services/events.service';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { formatDate } from '@angular/common'; 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 { AlertService } from 'src/app/services/alert.service';
import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
import { momentG } from 'src/plugin/momentG' 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 { DelegarPage } from 'src/app/modals/delegar/delegar.page';
import { AddNotePage } from 'src/app/modals/add-note/add-note.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 { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; 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 { 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'; 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 modalController: ModalController,
private alertService: AlertService, private alertService: AlertService,
public popoverController: PopoverController, public popoverController: PopoverController,
private activatedRoute: ActivatedRoute) { } private activatedRoute: ActivatedRoute,
private animationController: AnimationController) { }
ngOnInit() { ngOnInit() {
@@ -282,12 +283,38 @@ export class DespachosOptionsPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -300,11 +327,11 @@ export class DespachosOptionsPage implements OnInit {
async badRequest(message?: string) { async badRequest(message?: string) {
const modal = await this.modalController.create({ const modal = await this.modalController.create({
component: BadRequestComponent, component: BadRequestPage,
componentProps: { componentProps: {
message: message || 'Processo não efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -5,7 +5,7 @@ import { EventsService } from 'src/app/services/events.service';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { formatDate } from '@angular/common'; 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 { AlertService } from 'src/app/services/alert.service';
import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
import { momentG } from 'src/plugin/momentG' 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 { DelegarPage } from 'src/app/modals/delegar/delegar.page';
import { AddNotePage } from 'src/app/modals/add-note/add-note.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 { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; 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 { 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'; 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 modalController: ModalController,
private alertService: AlertService, private alertService: AlertService,
public popoverController: PopoverController, public popoverController: PopoverController,
private activatedRoute: ActivatedRoute) { } private activatedRoute: ActivatedRoute,
private animationController: AnimationController) { }
ngOnInit() { ngOnInit() {
@@ -283,12 +284,38 @@ export class DespachosPrOptionsPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -301,11 +328,11 @@ export class DespachosPrOptionsPage implements OnInit {
async badRequest(message?: string) { async badRequest(message?: string) {
const modal = await this.modalController.create({ const modal = await this.modalController.create({
component: BadRequestComponent, component: BadRequestPage,
componentProps: { componentProps: {
message: message || 'Processo não efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; 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 { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { User } from 'src/app/models/user.model'; import { User } from 'src/app/models/user.model';
import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; 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 { AuthService } from 'src/app/services/auth.service';
import { EventsService } from 'src/app/services/events.service'; import { EventsService } from 'src/app/services/events.service';
import { ProcessesService } from 'src/app/services/processes.service'; import { ProcessesService } from 'src/app/services/processes.service';
import { BadRequestComponent } from '../bad-request/bad-request.component'; import { BadRequestPage } from '../bad-request/bad-request.page';
import { SuccessMessageComponent } from '../success-message/success-message.component'; import { SuccessMessagePage } from '../success-message/success-message.page';
@Component({ @Component({
selector: 'app-opts-expediente-pr', selector: 'app-opts-expediente-pr',
@@ -42,6 +42,7 @@ export class OptsExpedientePrPage implements OnInit {
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,
private userAuth: AuthService, private userAuth: AuthService,
private navParams: NavParams, private navParams: NavParams,
private animationController: AnimationController
) { ) {
this.task = this.navParams.get('task'); this.task = this.navParams.get('task');
@@ -288,12 +289,38 @@ export class OptsExpedientePrPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -306,7 +333,7 @@ export class OptsExpedientePrPage implements OnInit {
async badRequest() { async badRequest() {
const modal = await this.modalController.create({ const modal = await this.modalController.create({
component: BadRequestComponent, component: BadRequestPage,
componentProps: { componentProps: {
message: 'hello', message: 'hello',
}, },
@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router'; 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 { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { DarParecerPage } from 'src/app/modals/dar-parecer/dar-parecer.page'; import { DarParecerPage } from 'src/app/modals/dar-parecer/dar-parecer.page';
import { DelegarPage } from 'src/app/modals/delegar/delegar.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 { 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 { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
import { ProcessesService } from 'src/app/services/processes.service'; import { ProcessesService } from 'src/app/services/processes.service';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
@Component({ @Component({
@@ -31,6 +31,7 @@ export class RequestOptionsPage implements OnInit {
private navParams: NavParams, private navParams: NavParams,
private processes: ProcessesService, private processes: ProcessesService,
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,
private animationController: AnimationController
) { ) {
this.task = this.navParams.get('task'); this.task = this.navParams.get('task');
this.fulltask = this.navParams.get('fulltask'); this.fulltask = this.navParams.get('fulltask');
@@ -286,12 +287,38 @@ export class RequestOptionsPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() 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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: 'hello', message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() 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; align-items: center;
display: flex; display: flex;
justify-content: center; 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-size: 686px 674px;
background-position: center; background-position: center;
background-position-y: 0px; background-position-y: 0px;
@@ -11,6 +11,5 @@
} }
.message { .message {
padding-top: 150px; font-size: 12pt;
font-size: 16pt;
} }
@@ -1,19 +1,19 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular'; import { IonicModule } from '@ionic/angular';
import { SuccessMessageComponent } from './success-message.component'; import { SuccessMessagePage } from './success-message.page';
describe('SuccessMessageComponent', () => { describe('SuccessMessagePage', () => {
let component: SuccessMessageComponent; let component: SuccessMessagePage;
let fixture: ComponentFixture<SuccessMessageComponent>; let fixture: ComponentFixture<SuccessMessagePage>;
beforeEach(waitForAsync(() => { beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ SuccessMessageComponent ], declarations: [ SuccessMessagePage ],
imports: [IonicModule.forRoot()] imports: [IonicModule.forRoot()]
}).compileComponents(); }).compileComponents();
fixture = TestBed.createComponent(SuccessMessageComponent); fixture = TestBed.createComponent(SuccessMessagePage);
component = fixture.componentInstance; component = fixture.componentInstance;
fixture.detectChanges(); fixture.detectChanges();
})); }));
@@ -3,10 +3,10 @@ import { NavParams } from '@ionic/angular';
@Component({ @Component({
selector: 'app-success-message', selector: 'app-success-message',
templateUrl: './success-message.component.html', templateUrl: './success-message.page.html',
styleUrls: ['./success-message.component.scss'], styleUrls: ['./success-message.page.scss'],
}) })
export class SuccessMessageComponent implements OnInit { export class SuccessMessagePage implements OnInit {
message: string message: string
@@ -16,5 +16,4 @@ export class SuccessMessageComponent implements OnInit {
} }
ngOnInit() {} ngOnInit() {}
} }
@@ -1,9 +1,9 @@
import { Component, EventEmitter, OnInit, Output } from '@angular/core'; import { Component, EventEmitter, OnInit, Output } from '@angular/core';
import { ModalController } from '@ionic/angular'; import { AnimationController, ModalController } from '@ionic/angular';
import { PublicationFolder } from 'src/app/models/publicationfolder'; import { PublicationFolder } from 'src/app/models/publicationfolder';
import { PublicationsService } from 'src/app/services/publications.service'; import { PublicationsService } from 'src/app/services/publications.service';
import { BadRequestComponent } from '../../popover/bad-request/bad-request.component'; import { BadRequestPage } from '../../popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from '../../popover/success-message/success-message.component'; import { SuccessMessagePage} from '../../popover/success-message/success-message.page';
@Component({ @Component({
selector: 'app-new-action', selector: 'app-new-action',
@@ -19,7 +19,8 @@ export class NewActionPage implements OnInit {
constructor( constructor(
private modalController: ModalController, private modalController: ModalController,
private publication: PublicationsService private publication: PublicationsService,
private animationController: AnimationController
) { ) {
this.folder = new PublicationFolder(); this.folder = new PublicationFolder();
} }
@@ -60,12 +61,38 @@ export class NewActionPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -77,8 +104,34 @@ export class NewActionPage implements OnInit {
} }
async badRequest() { async badRequest() {
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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: 'Processo não realizado com sucesso', message: 'Processo não realizado com sucesso',
}, },
@@ -1,5 +1,5 @@
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
import { AlertController, ModalController, NavParams } from '@ionic/angular'; import { AlertController, AnimationController, ModalController, NavParams } from '@ionic/angular';
/* import {Plugins, CameraResultType, CameraSource} from '@capacitor/core'; */ /* import {Plugins, CameraResultType, CameraSource} from '@capacitor/core'; */
import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser'; import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
@@ -16,8 +16,8 @@ import { Camera, CameraOptions } from '@ionic-native/camera/ngx';
import { PublicationFolder } from 'src/app/models/publicationfolder'; import { PublicationFolder } from 'src/app/models/publicationfolder';
import { ViewPublicationsPage } from '../view-publications/view-publications.page'; import { ViewPublicationsPage } from '../view-publications/view-publications.page';
import { LoadingService } from 'src/app/services/loading.service'; import { LoadingService } from 'src/app/services/loading.service';
import { BadRequestComponent } from '../../popover/bad-request/bad-request.component'; import { BadRequestPage } from '../../popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from '../../popover/success-message/success-message.component'; import { SuccessMessagePage} from '../../popover/success-message/success-message.page';
@Component({ @Component({
selector: 'app-new-publication', selector: 'app-new-publication',
@@ -57,6 +57,7 @@ export class NewPublicationPage implements OnInit {
public photoService: PhotoService, public photoService: PhotoService,
private publications: PublicationsService, private publications: PublicationsService,
private camera: Camera, private camera: Camera,
private animationController: AnimationController
) { ) {
this.publicationTitle = 'Nova Publicação'; this.publicationTitle = 'Nova Publicação';
} }
@@ -276,12 +277,38 @@ export class NewPublicationPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -293,8 +320,34 @@ export class NewPublicationPage implements OnInit {
} }
async badRequest() { async badRequest() {
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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: 'Processo não realizado com sucesso', message: 'Processo não realizado com sucesso',
}, },
@@ -1,11 +1,11 @@
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
import { ModalController, NavParams } from '@ionic/angular'; import { AnimationController, ModalController, NavParams } from '@ionic/angular';
import { Publication } from 'src/app/models/publication'; import { Publication } from 'src/app/models/publication';
import { ImageModalPage } from 'src/app/pages/publications/gallery/image-modal/image-modal.page'; import { ImageModalPage } from 'src/app/pages/publications/gallery/image-modal/image-modal.page';
import { NewPublicationPage } from 'src/app/pages/publications/new-publication/new-publication.page'; import { NewPublicationPage } from 'src/app/pages/publications/new-publication/new-publication.page';
import { PublicationsService } from 'src/app/services/publications.service'; import { PublicationsService } from 'src/app/services/publications.service';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
@Component({ @Component({
selector: 'app-publication-detail-shared', selector: 'app-publication-detail-shared',
@@ -26,6 +26,7 @@ export class PublicationDetailPage implements OnInit {
constructor( constructor(
private modalController: ModalController, private modalController: ModalController,
private publications:PublicationsService, private publications:PublicationsService,
private animationController: AnimationController
) { ) {
/* this.folderId = this.navParams.get('folderIdId'); */ /* this.folderId = this.navParams.get('folderIdId'); */
@@ -142,12 +143,38 @@ export class PublicationDetailPage implements OnInit {
async successMessage(message?: string) { 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({ const modal = await this.modalController.create({
component: SuccessMessageComponent, enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: { componentProps: {
message: message || 'Processo efetuado' , message: message || 'Processo efetuado' ,
}, },
cssClass: 'modal modal-desktop' cssClass: 'notification-modal'
}); });
modal.present() modal.present()
@@ -159,8 +186,34 @@ export class PublicationDetailPage implements OnInit {
} }
async badRequest() { async badRequest() {
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({ const modal = await this.modalController.create({
component: BadRequestComponent, enterAnimation,
leaveAnimation,
component: BadRequestPage,
componentProps: { componentProps: {
message: 'Processo não realizado com sucesso', message: 'Processo não realizado com sucesso',
}, },
File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 10 KiB

+7
View File
@@ -0,0 +1,7 @@
<svg width="62" height="62" viewBox="0 0 62 62" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.4 12.3261H31.6889V13.6957H12.4V12.3261Z" fill="white"/>
<path d="M19.2889 16.4348C20.8107 16.4348 22.0444 15.2084 22.0444 13.6957C22.0444 12.1829 20.8107 10.9565 19.2889 10.9565C17.767 10.9565 16.5333 12.1829 16.5333 13.6957C16.5333 15.2084 17.767 16.4348 19.2889 16.4348Z" fill="white"/>
<path d="M31 61.6304C48.1208 61.6304 62 47.834 62 30.8152C62 13.7964 48.1208 0 31 0C13.8792 0 0 13.7964 0 30.8152C0 47.834 13.8792 61.6304 31 61.6304Z" fill="#FFE0E0"/>
<path d="M20.4854 19.6784L42.8928 41.9522" stroke="#C80B0B" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M42.8928 19.6784L20.4854 41.9522" stroke="#C80B0B" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
</svg>

After

Width:  |  Height:  |  Size: 866 B

+23
View File
@@ -376,6 +376,29 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
} }
} }
.notification-modal {
ion-backdrop {
display: none;
}
.modal-wrapper {
position: absolute;
top: 23px;
right: 0px;
height: 87px;
max-width: 400px;
border-radius: 9px;
-webkit-border-radius: 9px;
-moz-border-radius: 9px;
-ms-border-radius: 9px;
-o-border-radius: 9px;
}
.ion-page {
box-shadow: 0 28px 48px rgba(0, 0, 0, 0.2) !important;
}
}
.hide-footer{ .hide-footer{
ion-footer{ ion-footer{
display: none !important; display: none !important;