Add messages

This commit is contained in:
Peter Maquiran
2021-05-25 13:38:46 +01:00
parent 0e96fb50f0
commit c124f9b2a4
22 changed files with 424 additions and 122 deletions
+38 -1
View File
@@ -2,6 +2,8 @@ import { Component, OnInit } from '@angular/core';
import { ModalController } from '@ionic/angular';
import { SearchDocument } from 'src/app/models/search-document';
import { SearchPage } from 'src/app/pages/search/search.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-add-note',
@@ -32,7 +34,8 @@ export class AddNotePage implements OnInit {
this.modalController.dismiss(body);
}
async getDoc(){
async getDoc() {
const modal = await this.modalController.create({
component: SearchPage,
cssClass: 'modal-width-100-width-background modal',
@@ -49,12 +52,46 @@ export class AddNotePage implements OnInit {
this.documents.push(data.selected);
}
});
}
removeAttachment(index: number){
this.documents = this.documents.filter( (e, i) => index != i);
}
async successMessage(message?: string) {
const modal = await this.modalController.create({
component: SuccessMessageComponent,
componentProps: {
message: message || 'Processo efetuado' ,
},
cssClass: 'modal modal-desktop'
});
modal.present()
setTimeout(()=>{
modal.dismiss()
},3000)
}
async badRequest(message?: string) {
const modal = await this.modalController.create({
component: BadRequestComponent,
componentProps: {
message: message || 'Processo não efetuado' ,
},
cssClass: 'modal modal-desktop'
});
modal.present()
setTimeout(()=>{
modal.dismiss()
},3000)
}
}
@@ -16,6 +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 { SearchDocument } from 'src/app/models/search-document';
import { SearchPage } from 'src/app/pages/search/search.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-create-process',
@@ -130,7 +132,7 @@ export class CreateProcessPage implements OnInit {
this.modalController.dismiss(null);
}
saveTask(){
async saveTask(){
if(this.postData.Priority=='99999861'){
this.dispatchFolder.DeadlineType = 'Normal';
@@ -174,7 +176,14 @@ export class CreateProcessPage implements OnInit {
DispatchFolder: this.dispatchFolder,
}
console.log('this.postData', this.postData, this.taskType);
this.processes.postDespatcho(this.postData);
try {
//await this.processes.postDespatcho(this.postData).toPromise()
this.successMessage()
} catch (error) {
this.badRequest()
}
break;
case '1':
this.postData = {
@@ -186,7 +195,15 @@ export class CreateProcessPage implements OnInit {
DispatchFolder: this.dispatchFolder,
}
console.log(this.postData);
this.processes.postParecer(this.postData);
await this.processes.postParecer(this.postData).toPromise()
try {
await this.processes.postParecer(this.postData).toPromise()
this.successMessage()
} catch (error) {
this.badRequest()
}
break;
case '2':
this.postData = {
@@ -198,7 +215,14 @@ export class CreateProcessPage implements OnInit {
DispatchFolder: this.dispatchFolder,
}
console.log(this.postData);
this.processes.postDeferimento(this.postData);
try {
await this.processes.postDeferimento(this.postData).toPromise()
this.successMessage()
} catch (error) {
this.badRequest()
}
break;
}
this.executado();
@@ -233,7 +257,6 @@ export class CreateProcessPage implements OnInit {
async addParticipants() {
/* console.log('HERES'); */
this.adding = "intervenient";
this.contacts = this.taskParticipants;
@@ -412,4 +435,39 @@ export class CreateProcessPage implements OnInit {
}
async successMessage(message?: string) {
const modal = await this.modalController.create({
component: SuccessMessageComponent,
componentProps: {
message: message || 'Processo efetuado' ,
},
cssClass: 'modal modal-desktop'
});
modal.present()
setTimeout(()=>{
modal.dismiss()
},3000)
}
async badRequest(message?: string) {
const modal = await this.modalController.create({
component: BadRequestComponent,
componentProps: {
message: message || 'Processo não efetuado' ,
},
cssClass: 'modal modal-desktop'
});
modal.present()
setTimeout(()=>{
modal.dismiss()
},3000)
}
}
@@ -34,7 +34,8 @@ export class DarParecerPage implements OnInit {
this.modalController.dismiss();
}
save(){
save() {
const DocumentToSave = this.documents.map((e) => {
return {
ApplicationId: e.ApplicationType,
@@ -43,11 +44,10 @@ export class DarParecerPage implements OnInit {
});
let docs = {
ProcessInstanceID: this.instanceId,
ProcessInstanceID: "",
Attachments: DocumentToSave,
}
let body = {
"serialNumber": this.serialNumber,
"action": "Registar",
+44
View File
@@ -11,6 +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 { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
import { AlertService } from 'src/app/services/alert.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';
@Component({
selector: 'app-delegar',
@@ -93,6 +95,10 @@ export class DelegarPage implements OnInit {
console.log(body);
this.processes.DelegateTask(body).subscribe(res=>{
console.log(res);
this.successMessage('Processo delegado')
},
(error)=>{
this.badRequest()
});
this.close();
}
@@ -164,4 +170,42 @@ export class DelegarPage implements OnInit {
this.taskParticipants = taskParticipants;
}
async successMessage(message?: string) {
const modal = await this.modalController.create({
component: SuccessMessageComponent,
componentProps: {
message: message || 'Processo efetuado' ,
},
cssClass: 'modal modal-desktop'
});
modal.present()
setTimeout(()=>{
modal.dismiss()
},3000)
}
async badRequest(message?: string) {
const modal = await this.modalController.create({
component: BadRequestComponent,
componentProps: {
message: message || 'Processo não efetuado' ,
},
cssClass: 'modal modal-desktop'
});
modal.present()
setTimeout(()=>{
modal.dismiss()
},3000)
}
}