Add modal message

This commit is contained in:
Peter Maquiran
2021-05-24 16:49:25 +01:00
parent 9fb2239652
commit 0e96fb50f0
34 changed files with 1171 additions and 441 deletions
+1 -1
View File
@@ -170,7 +170,7 @@ export class AgendaPage implements OnInit {
if(this.loggeduser.Profile == 'MDGPR') {
this.mobileComponent.showEventList = true;
}
}
ngOnInit() {
@@ -5,6 +5,8 @@ import { Event } from 'src/app/models/event.model';
import { AlertService } from 'src/app/services/alert.service';
import { AttachmentsService } from 'src/app/services/attachments.service';
import { ProcessesService } from 'src/app/services/processes.service';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component';
import { EmendMessageModalPage } from '../emend-message-modal/emend-message-modal.page';
import { EventActionsPopoverPage } from '../event-actions-popover/event-actions-popover.page';
@@ -69,29 +71,51 @@ export class ApproveEventModalPage implements OnInit {
})
}
approveTask(serialNumber:string){
async approveTask(serialNumber:string){
let body = {
"serialNumber": serialNumber,
"action": "Aprovar"
}
this.processes.PostTaskAction(body);
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
try {
await this.processes.PostTaskAction(body);
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
this.successMessage()
} catch (error) {
this.badRequest()
}
}
emendTask(serialNumber:string){
this.menu.close();
this.openEmendMessageModal(serialNumber);
this.modalController.dismiss(null);
async emendTask(serialNumber:string){
try {
await this.openEmendMessageModal(serialNumber);
this.modalController.dismiss(null);
this.menu.close();
} catch (error) {
}
}
rejectTask(serialNumber:string){
async rejectTask(serialNumber:string){
let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
this.processes.PostTaskAction(body);
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
try {
await this.processes.PostTaskAction(body);
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
this.successMessage()
} catch (error) {
this.badRequest()
}
}
getAttachments(){
this.attachmentsService.getAttachmentsBySerial(this.serialNumber).subscribe(res=>{
this.loadedAttachments = res;
@@ -108,36 +132,72 @@ export class ApproveEventModalPage implements OnInit {
});
return await popover.present();
}
openMenu() {
this.menu.open();
}
async openEmendMessageModal(serialNumber:string) {
const modal = await this.modalController.create({
component: EmendMessageModalPage,
componentProps:{
},
cssClass: 'emend-message-modal',
backdropDismiss: false
});
}
await modal.present();
async openEmendMessageModal(serialNumber:string) {
const modal = await this.modalController.create({
component: EmendMessageModalPage,
componentProps:{
},
cssClass: 'emend-message-modal',
backdropDismiss: false
});
modal.onDidDismiss().then(res => {
if(res.data !== ''){
let body = { "serialNumber": serialNumber,
"action": "Emendar",
"dataFields": {
"ReviewerUseComment": res.data,
}
await modal.present();
modal.onDidDismiss().then(res => {
if(res.data !== ''){
let body = { "serialNumber": serialNumber,
"action": "Emendar",
"dataFields": {
"ReviewerUseComment": res.data,
}
}
this.processes.PostTaskAction(body);
this.router.navigate(['/home/gabinete-digital/event-list']);
}
this.processes.PostTaskAction(body);
this.router.navigate(['/home/gabinete-digital/event-list']);
}
else{
//this.alertService.presentAlert('Operação cancelada!');
}
});
}
else{
//this.alertService.presentAlert('Operação cancelada!');
}
});
}
async successMessage() {
const modal = await this.modalController.create({
component: SuccessMessageComponent,
componentProps: {
message: 'hello',
},
cssClass: 'modal modal-desktop'
});
modal.present()
setTimeout(()=>{
modal.dismiss()
},1000)
}
async badRequest() {
const modal = await this.modalController.create({
component: BadRequestComponent,
componentProps: {
message: 'hello',
},
cssClass: 'modal modal-desktop'
});
modal.present()
setTimeout(()=>{
modal.dismiss()
},1000)
}
}
@@ -6,6 +6,8 @@ import { EventPerson } from 'src/app/models/eventperson.model';
import { AlertService } from 'src/app/services/alert.service';
import { AttachmentsService } from 'src/app/services/attachments.service';
import { EventsService } from 'src/app/services/events.service';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component';
import { Event } from '../../../models/event.model';
import { AttendeesPage } from '../../events/attendees/attendees.page';
import { SearchPage } from '../../search/search.page';
@@ -101,16 +103,27 @@ export class EditEventPage implements OnInit {
this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc)
this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
/* const alert = await this.alertController.create({
cssClass: 'my-custom-class',
header: 'Evento actualizado',
buttons: ['OK']
try{
this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
/* const alert = await this.alertController.create({
cssClass: 'my-custom-class',
header: 'Evento actualizado',
buttons: ['OK']
});
await alert.present(); */
this.successMessage()
}, error => {
this.badRequest()
});
await alert.present(); */
});
this.isEventEdited = true;
this.modalController.dismiss(this.isEventEdited);
this.isEventEdited = true;
this.modalController.dismiss(this.isEventEdited);
} catch (error) {
this.badRequest()
}
}
async openAttendees() {
@@ -220,4 +233,38 @@ export class EditEventPage implements OnInit {
});
}
async successMessage() {
const modal = await this.modalController.create({
component: SuccessMessageComponent,
componentProps: {
message: 'Processo realizado com sucesso',
},
cssClass: 'modal modal-desktop'
});
modal.present()
setTimeout(()=>{
modal.dismiss()
},3000)
}
async badRequest() {
const modal = await this.modalController.create({
component: BadRequestComponent,
componentProps: {
message: 'Processo não realizado com sucesso',
},
cssClass: 'modal modal-desktop'
});
modal.present()
setTimeout(()=>{
modal.dismiss()
},3000)
}
}
@@ -6,6 +6,8 @@ import { EventPerson } from 'src/app/models/eventperson.model';
import { SearchDocument } from 'src/app/models/search-document';
import { AttachmentsService } from 'src/app/services/attachments.service';
import { EventsService } from 'src/app/services/events.service';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component';
import { Event } from '../../../models/event.model';
import { AttendeesPage } from '../../events/attendees/attendees.page';
import { SearchPage } from '../../search/search.page';
@@ -50,7 +52,7 @@ export class NewEventPage implements OnInit {
ngOnInit() {
/* console.log(this.profile); */
/* console.log(this.profile); */
let selectedStartdDate = this.selectedDate;
let selectedEndDate = new Date(this.selectedDate);
@@ -112,6 +114,7 @@ export class NewEventPage implements OnInit {
close(){
this.modalController.dismiss();
}
async save() {
/* console.log(this.postEvent);
console.log(this.profile); */
@@ -121,37 +124,83 @@ export class NewEventPage implements OnInit {
}
let eventId: string;
if(this.profile=='mdgpr'){
eventId = await this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).toPromise();
}
else if(this.profile=='pr'){
eventId = await this.eventService.postEventPr(this.postEvent, this.postEvent.CalendarName).toPromise();
try {
if(this.profile=='mdgpr') {
eventId = await this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).toPromise();
}
else if(this.profile=='pr'){
eventId = await this.eventService.postEventPr(this.postEvent, this.postEvent.CalendarName).toPromise();
}
const DocumentToSave: EventAttachment[] = this.documents.map((e) => {
return {
SourceTitle: e.Assunto,
ParentId: eventId,
Source: '1',
SourceId: e.Id,
ApplicationId: e.ApplicationType.toString(),
Id: '',
Link: '',
SerialNumber: ''
};
});
await DocumentToSave.forEach( async (attachments, i) => {
try {
await this.attachmentsService.setEventAttachmentById(attachments).toPromise();
} catch(error) {
alert('document error')
}
});
this.successMessage()
this.modalController.dismiss(this.postEvent);
} catch (error) {
this.badRequest()
}
const DocumentToSave: EventAttachment[] = this.documents.map((e) => {
return {
SourceTitle: e.Assunto,
ParentId: eventId,
Source: '1',
SourceId: e.Id,
ApplicationId: e.ApplicationType.toString(),
Id: '',
Link: '',
SerialNumber: ''
};
});
await DocumentToSave.forEach( async (attachments, i) => {
this.attachmentsService.setEventAttachmentById(attachments).toPromise();
});
this.modalController.dismiss(this.postEvent);
}
async successMessage() {
const modal = await this.modalController.create({
component: SuccessMessageComponent,
componentProps: {
message: 'Processo realizado com sucesso',
},
cssClass: 'modal modal-desktop'
});
modal.present()
setTimeout(()=>{
modal.dismiss()
},3000)
}
async badRequest() {
const modal = await this.modalController.create({
component: BadRequestComponent,
componentProps: {
message: 'Processo não realizado com sucesso',
},
cssClass: 'modal modal-desktop'
});
modal.present()
setTimeout(()=>{
modal.dismiss()
},3000)
}
async openAttendees() {
@@ -202,7 +251,6 @@ export class NewEventPage implements OnInit {
}
async getDoc(){
const modal = await this.modalController.create({
component: SearchPage,
@@ -227,6 +275,4 @@ export class NewEventPage implements OnInit {
this.documents = this.documents.filter( (e, i) => index != i);
}
}
@@ -18,6 +18,8 @@ import { CreateProcessPage } from 'src/app/modals/create-process/create-process.
import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component';
@Component({
selector: 'app-despacho-pr',
@@ -81,7 +83,7 @@ export class DespachoPrPage implements OnInit {
goBack(){
let navigationExtras: NavigationExtras = {
queryParams: {
"despachospr": true,
"despachospr": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
@@ -167,7 +169,8 @@ export class DespachoPrPage implements OnInit {
this.menu.open();
this.modalController.dismiss();
}
executado(note:string, documents:any){
async executado(note:string, documents:any){
let body = {
"serialNumber": this.serialnumber,
"action": "Conhecimento",
@@ -177,10 +180,17 @@ export class DespachoPrPage implements OnInit {
},
"AttachmentList" :documents,
}
this.processes.CompleteTask(body);
this.close();
try {
await this.processes.CompleteTask(body);
this.close();
this.successMessage()
} catch(error) {
this.badRequest()
}
}
arquivar(note:string, documents:any){
async arquivar(note:string, documents:any){
let body = {
"serialNumber": this.serialnumber,
"action": "Arquivo",
@@ -190,10 +200,17 @@ export class DespachoPrPage implements OnInit {
},
"AttachmentList" :documents,
}
this.processes.CompleteTask(body);
this.close();
try {
await this.processes.CompleteTask(body);
this.successMessage()
this.close();
} catch (error) {
this.badRequest()
}
}
generateDiploma(note:string, documents:any){
async generateDiploma(note:string, documents:any){
let body = {
"serialNumber": this.serialnumber,
"action": "Reencaminhar",
@@ -203,8 +220,15 @@ export class DespachoPrPage implements OnInit {
},
"AttachmentList" :documents,
}
this.processes.CompleteTask(body);
this.close();
try {
await this.processes.CompleteTask(body);
this.successMessage()
this.close();
} catch (error) {
this.badRequest()
}
}
sendExpedienteToPending(){
@@ -370,5 +394,38 @@ export class DespachoPrPage implements OnInit {
});
return await popover.present();
}
async successMessage() {
const modal = await this.modalController.create({
component: SuccessMessageComponent,
componentProps: {
message: 'hello',
},
cssClass: 'modal modal-desktop'
});
modal.present()
setTimeout(()=>{
modal.dismiss()
},1000)
}
async badRequest() {
const modal = await this.modalController.create({
component: BadRequestComponent,
componentProps: {
message: 'hello',
},
cssClass: 'modal modal-desktop'
});
modal.present()
setTimeout(()=>{
modal.dismiss()
},1000)
}
}
@@ -18,6 +18,8 @@ import { CreateProcessPage } from 'src/app/modals/create-process/create-process.
import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component';
@Component({
selector: 'app-despacho',
@@ -82,7 +84,7 @@ export class DespachoPage implements OnInit {
goBack(){
let navigationExtras: NavigationExtras = {
queryParams: {
"despachos": true,
"despachos": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
@@ -168,7 +170,8 @@ export class DespachoPage implements OnInit {
this.menu.open();
this.modalController.dismiss();
}
executado(note:string, documents:any){
async executado(note:string, documents:any){
let body = {
"serialNumber": this.serialnumber,
"action": "Conhecimento",
@@ -178,10 +181,17 @@ export class DespachoPage implements OnInit {
},
"AttachmentList" :documents,
}
this.processes.CompleteTask(body);
this.close();
try {
await this.processes.CompleteTask(body);
this.close();
this.successMessage()
} catch(error) {
this.badRequest()
}
}
arquivar(note:string, documents:any){
async arquivar(note:string, documents:any){
let body = {
"serialNumber": this.serialnumber,
"action": "Arquivo",
@@ -191,10 +201,17 @@ export class DespachoPage implements OnInit {
},
"AttachmentList" :documents,
}
this.processes.CompleteTask(body);
this.close();
try {
await this.processes.CompleteTask(body);
this.successMessage()
this.close();
} catch (error) {
this.badRequest()
}
}
reexecute(note:string, documents:any){
async reexecute(note:string, documents:any){
let body = {
"serialNumber": this.serialnumber,
"action": "Reencaminhar",
@@ -204,14 +221,25 @@ export class DespachoPage implements OnInit {
},
"AttachmentList" :documents,
}
this.processes.CompleteTask(body);
this.close();
try {
await this.processes.CompleteTask(body);
this.close();
this.successMessage()
} catch (error) {
this.badRequest()
}
}
sendExpedienteToPending(){
this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
console.log(res);
this.close();
this.successMessage()
},
error => {
this.badRequest()
});
}
@@ -372,4 +400,38 @@ export class DespachoPage implements OnInit {
return await popover.present();
}
async successMessage() {
const modal = await this.modalController.create({
component: SuccessMessageComponent,
componentProps: {
message: 'hello',
},
cssClass: 'modal modal-desktop'
});
modal.present()
setTimeout(()=>{
modal.dismiss()
},1000)
}
async badRequest() {
const modal = await this.modalController.create({
component: BadRequestComponent,
componentProps: {
message: 'hello',
},
cssClass: 'modal modal-desktop'
});
modal.present()
setTimeout(()=>{
modal.dismiss()
},1000)
}
}
@@ -20,133 +20,135 @@ import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/
templateUrl: './despachos.page.html',
styleUrls: ['./despachos.page.scss'],
})
export class DespachosPage implements OnInit {
//profile:string;
//profile:string;
@ViewChild(CalendarComponent) myCal: CalendarComponent;
@ViewChild(CalendarComponent) myCal: CalendarComponent;
taskslist:DailyWorkTask[];
despachoList:any[] = [];
deferimentoList:DailyWorkTask[] = [];
taskslist:DailyWorkTask[];
despachoList:any[] = [];
deferimentoList:DailyWorkTask[] = [];
taskList:tasksList[] = [];
taskList:tasksList[] = [];
taskType: string;
serialNumber:string;
totalDocs:any;
taskType: string;
serialNumber:string;
totalDocs:any;
@Input() profile:string;
segment:string;
@Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
@Input() profile:string;
segment:string;
@Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
loadedAttachments:any;
dicIndex = 0;
inicial = false
loadedAttachments:any;
dicIndex = 0;
inicial = false
constructor (
private processes:ProcessesService,
private modalController: ModalController,
private alertService: AlertService,
private authService: AuthService,
) {
this.profile = 'mdgpr';
constructor (
private processes:ProcessesService,
private modalController: ModalController,
private alertService: AlertService,
private authService: AuthService,
) {
this.profile = 'mdgpr';
// alert('nice!')
}
ngOnInit() {
//Inicializar segment
this.segment = "despachos";
this.LoadList();
this.authService.userData$.subscribe((res:any)=>{
console.log(res);
});
}
segmentChanged(ev: any) {
this.LoadList();
}
ngOnInit() {
//Inicializar segment
this.segment = "despachos";
this.LoadList();
this.authService.userData$.subscribe((res:any)=>{
console.log(res);
});
}
segmentChanged(ev: any) {
this.LoadList();
}
notImplemented(){
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
notImplemented(){
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
openExpedientDetailPage(data){
console.log(data);
this.openExpedientDetail.emit(data);
}
openExpedientDetailPage(data){
console.log(data);
this.openExpedientDetail.emit(data);
}
async LoadList() {
async LoadList(){
let result = await this.processes.GetTasksList("Despacho", false).toPromise();
//let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
this.despachoList = new Array();
console.log(result);
let result = await this.processes.GetTasksList("Despacho", false).toPromise();
//let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
console.log(result);
await result.forEach( (element, index) => {
let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": '',
"DocId": element.workflowInstanceDataFields.DocId,
"WorkflowName": element.workflowDisplayName,
"FolderID": element.workflowInstanceDataFields.FolderID,
"activityInstanceName": element.activityInstanceName,
}
this.despachoList.push(task)
});
await result.forEach( (element, index) => {
let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": '',
"DocId": element.workflowInstanceDataFields.DocId,
"WorkflowName": element.workflowDisplayName,
"FolderID": element.workflowInstanceDataFields.FolderID,
"activityInstanceName": element.activityInstanceName,
}
this.despachoList.push(task)
});
this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
this.despachoList.forEach( (element, index) => {
// let aplicationId = element.workflowInstanceDataFields.SourceSecFsID;
let FolderID = element['FolderID'];
this.despachoList.forEach( (element, index) => {
// let aplicationId = element.workflowInstanceDataFields.SourceSecFsID;
let FolderID = element['FolderID'];
this.processes.GetDocumentDetails(FolderID, '361').subscribe(res=>{
element.DocumentsQty = res.DocumentsTotal
})
this.processes.GetDocumentDetails(FolderID, '361').subscribe(res=>{
element.DocumentsQty = res.DocumentsTotal
})
});
});
}
}
sortArrayISODate(myArray: any){
return myArray.sort(function(a, b) {
return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
});
}
sortArrayISODate(myArray: any){
return myArray.sort(function(a, b) {
return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
});
}
doRefresh(event) {
this.LoadList();
setTimeout(() => {
event.target.complete();
}, 2000);
}
async viewExpedientDetail(serialNumber:any) {
console.log(this.profile);
const modal = await this.modalController.create({
component: DespachoPage,
componentProps:{
enterAnimation: "",
serialNumber: serialNumber,
profile: this.profile,
},
cssClass: 'modal modal-desktop',
});
await modal.present();
modal.onDidDismiss().then((res)=>{
console.log('refresh list');
doRefresh(event) {
this.LoadList();
});
}
setTimeout(() => {
event.target.complete();
}, 2000);
}
async viewExpedientDetail(serialNumber:any) {
console.log(this.profile);
const modal = await this.modalController.create({
component: DespachoPage,
componentProps:{
enterAnimation: "",
serialNumber: serialNumber,
profile: this.profile,
},
cssClass: 'modal modal-desktop',
});
await modal.present();
modal.onDidDismiss().then((res)=>{
console.log('refresh list');
this.LoadList();
});
}
// old
async openExpedientActionsModal(taskAction: any, task: any) {
@@ -8,6 +8,8 @@ import { momentG } from 'src/plugin/momentG';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component';
@Component({
selector: 'app-diploma',
@@ -53,7 +55,7 @@ export class DiplomaPage implements OnInit {
goBack(){
let navigationExtras: NavigationExtras = {
queryParams: {
"diplomas": true,
"diplomas": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
@@ -134,7 +136,7 @@ export class DiplomaPage implements OnInit {
})
}
askSignature(note:string, documents:any){
async askSignature(note:string, documents:any){
let body = {
"serialNumber": this.serialnumber,
"action": "Aprovar",
@@ -144,11 +146,16 @@ export class DiplomaPage implements OnInit {
},
"AttachmentList" :documents,
}
this.processes.CompleteTask(body);
this.close();
try {
await this.processes.CompleteTask(body);
this.close();
this.successMessage()
} catch (error) {
this.badRequest()
}
}
askToChange(note:string, documents:any){
async askToChange(note:string, documents:any){
let body = {
"serialNumber": this.serialnumber,
"action": "Retificar",
@@ -158,8 +165,14 @@ export class DiplomaPage implements OnInit {
},
"AttachmentList" :documents,
}
this.processes.CompleteTask(body);
this.close();
try {
await this.processes.CompleteTask(body);
this.close();
this.successMessage()
} catch (error) {
this.badRequest()
}
}
async openAddNoteModal(actionName:string) {
@@ -216,4 +229,38 @@ export class DiplomaPage implements OnInit {
this.modalController.dismiss();
}
async successMessage() {
const modal = await this.modalController.create({
component: SuccessMessageComponent,
componentProps: {
message: 'hello',
},
cssClass: 'modal modal-desktop'
});
modal.present()
setTimeout(()=>{
modal.dismiss()
}, 3000)
}
async badRequest() {
const modal = await this.modalController.create({
component: BadRequestComponent,
componentProps: {
message: 'hello',
},
cssClass: 'modal modal-desktop'
});
modal.present()
setTimeout(()=>{
modal.dismiss()
}, 3000)
}
}
@@ -6,10 +6,11 @@ import { AlertService } from 'src/app/services/alert.service';
import { AttachmentsService } from 'src/app/services/attachments.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 { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component';
import { EmendMessageModalPage } from '../../../agenda/emend-message-modal/emend-message-modal.page';
import { EventActionsPopoverPage } from '../../../agenda/event-actions-popover/event-actions-popover.page';
@Component({
selector: 'app-approve-event-modal',
templateUrl: './approve-event-modal.page.html',
@@ -55,7 +56,6 @@ export class ApproveEventModalPage implements OnInit {
this.getTask();
this.getAttachments();
}
@@ -100,18 +100,25 @@ export class ApproveEventModalPage implements OnInit {
this.modalController.dismiss(null);
}
rejectTask(serialNumber:string){
console.log('rejectTask: ',serialNumber)
async rejectTask(serialNumber:string) {
// console.log('rejectTask: ',serialNumber)
let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
console.log(body);
this.processes.PostTaskAction(body);
this.router.navigate(['/home/gabinete-digital/event-list']);
// console.log(body);
try {
await this.processes.PostTaskAction(body);
this.router.navigate(['/home/gabinete-digital/event-list']);
this.successMessage()
} catch (error) {
this.badRequest()
}
this.modalController.dismiss(null);
}
async getAttachments(){
async getAttachments() {
this.loadedAttachments = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise();
}
async openOptions(ev:any) {
@@ -123,40 +130,49 @@ export class ApproveEventModalPage implements OnInit {
});
return await popover.present();
}
openMenu() {
this.menu.open();
}
async openEmendMessageModal(serialNumber:string) {
const modal = await this.modalController.create({
component: EmendMessageModalPage,
componentProps:{
},
cssClass: 'emend-message-modal',
backdropDismiss: false
});
}
await modal.present();
async openEmendMessageModal(serialNumber:string) {
const modal = await this.modalController.create({
component: EmendMessageModalPage,
componentProps:{
},
cssClass: 'emend-message-modal',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then( async (res) => {
if(res.data !== '') {
let body = {
"serialNumber": serialNumber,
"action": "Emendar",
"dataFields": {
"ReviewerUseComment": res.data,
}
}
//console.log(body);
try {
await this.processes.PostTaskAction(body);
this.router.navigate(['/home/gabinete-digital/event-list']);
this.successMessage()
} catch (error) {
this.badRequest()
this.router.navigate(['/home/gabinete-digital/event-list']);
}
modal.onDidDismiss().then(res => {
if(res.data !== ''){
let body = { "serialNumber": serialNumber,
"action": "Emendar",
"dataFields": {
"ReviewerUseComment": res.data,
}
}
console.log(body);
this.processes.PostTaskAction(body);
this.router.navigate(['/home/gabinete-digital/event-list']);
}
else{
//this.alertService.presentAlert('Operação cancelada!');
}
});
}
else {
//this.alertService.presentAlert('Operação cancelada!');
}
});
}
async editar(serialNumber: string) {
@@ -177,5 +193,39 @@ export class ApproveEventModalPage implements OnInit {
});
}
async successMessage() {
const modal = await this.modalController.create({
component: SuccessMessageComponent,
componentProps: {
message: 'hello',
},
cssClass: 'modal modal-desktop'
});
modal.present()
setTimeout(()=>{
modal.dismiss()
},1000)
}
async badRequest() {
const modal = await this.modalController.create({
component: BadRequestComponent,
componentProps: {
message: 'hello',
},
cssClass: 'modal modal-desktop'
});
modal.present()
setTimeout(()=>{
modal.dismiss()
},1000)
}
}
@@ -180,7 +180,7 @@ export class ApproveEventPage implements OnInit {
goToEventsToApprove(){
let navigationExtras: NavigationExtras = {
queryParams: {
"events": true,
"events": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
@@ -12,6 +12,8 @@ import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart
import { AttachmentsService } from 'src/app/services/attachments.service';
import { SearchPage } from 'src/app/pages/search/search.page';
import { SearchDocument } from 'src/app/models/search-document';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component';
@Component({
selector: 'app-book-meeting-modal',
@@ -115,15 +117,30 @@ export class BookMeetingModalPage implements OnInit {
}
console.log(this.postData);
if(this.task.FsId == '8'){
this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId);
this.distartExpedientModal();
if(this.task.FsId == '8') {
try {
this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId);
this.distartExpedientModal();
this.successMessage()
} catch (error) {
this.badRequest()
}
}
else if(this.task.FsId == '361'){
this.calendarService.createTaskEvent(this.task.FolderId, this.postData, "md",this.task.SerialNumber, this.task.FsId);
else if(this.task.FsId == '361') {
try {
this.calendarService.createTaskEvent(this.task.FolderId, this.postData, "md",this.task.SerialNumber, this.task.FsId);
this.successMessage()
this.close();
} catch (error) {
this.badRequest()
}
}
this.close();
}
async addParticipants(){
@@ -263,4 +280,40 @@ export class BookMeetingModalPage implements OnInit {
this.taskParticipantsCc = taskParticipantsCc;
}
async successMessage() {
const modal = await this.modalController.create({
component: SuccessMessageComponent,
componentProps: {
message: 'hello',
},
cssClass: 'modal modal-desktop'
});
modal.present()
setTimeout(()=>{
modal.dismiss()
},1000)
}
async badRequest() {
const modal = await this.modalController.create({
component: BadRequestComponent,
componentProps: {
message: 'hello',
},
cssClass: 'modal modal-desktop'
});
modal.present()
setTimeout(()=>{
modal.dismiss()
},1000)
}
}
@@ -51,14 +51,14 @@ export class PedidoPage implements OnInit {
this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) {
this.serialnumber = params["serialNumber"];
console.log(params["serialNumber"]);
// console.log(params["serialNumber"]);
}
});
}
ngOnInit() {
this.profile = "mdgpr";
console.log(this.serialnumber);
// console.log(this.serialnumber);
this.LoadTaskDetail(this.serialnumber);
}
@@ -66,7 +66,7 @@ export class PedidoPage implements OnInit {
goBack(){
let navigationExtras: NavigationExtras = {
queryParams: {
"pedidos": true,
"pedidos": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
@@ -147,7 +147,7 @@ export class PedidoPage implements OnInit {
getDocumentDetails(forlderId:string, applicationId:string){
this.processes.GetDocumentDetails(forlderId,applicationId).subscribe(res=>{
this.attachments = res.Documents;
console.log(res['Documents']);
// console.log(res['Documents']);
console.log(this.attachments);
})
}
@@ -165,7 +165,8 @@ export class PedidoPage implements OnInit {
this.menu.open();
this.modalController.dismiss();
}
repreciar(note:string, documents:any){
repreciar(note:string, documents:any) {
let body = {
"serialNumber": this.serialnumber,
"action": "Reapreciação",
@@ -179,7 +180,7 @@ export class PedidoPage implements OnInit {
this.close();
}
arquivar(note:string, documents:any){
arquivar(note:string, documents:any) {
let body = {
"serialNumber": this.serialnumber,
"action": "Arquivo",
@@ -46,6 +46,7 @@ export class PendentesPage implements OnInit {
console.log(res);
});
}
segmentChanged(ev: any) {
this.LoadList();
}