peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 05:16:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add messages

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+12 -11
View File
@@ -87,7 +87,7 @@ export class BookMeetingModalPage implements OnInit {
cancelTask(){
this.modalController.dismiss(null);
}
saveTask(){
async saveTask(){
// issue12323423
let Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
@@ -120,9 +120,9 @@ export class BookMeetingModalPage implements OnInit {
if(this.task.FsId == '8') {
try {
this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId);
await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise()
this.distartExpedientModal();
this.successMessage()
this.successMessage('Reunião criada')
} catch (error) {
this.badRequest()
}
@@ -131,8 +131,8 @@ export class BookMeetingModalPage implements OnInit {
}
else if(this.task.FsId == '361') {
try {
this.calendarService.createTaskEvent(this.task.FolderId, this.postData, "md",this.task.SerialNumber, this.task.FsId);
this.successMessage()
await this.calendarService.createTaskEvent(this.task.FolderId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise()
this.successMessage('Reunião criada')
this.close();
} catch (error) {
this.badRequest()
@@ -282,12 +282,12 @@ export class BookMeetingModalPage implements OnInit {
async successMessage() {
async successMessage(message?: string) {
const modal = await this.modalController.create({
component: SuccessMessageComponent,
componentProps: {
message: 'hello',
message: message || 'Processo efetuado' ,
},
cssClass: 'modal modal-desktop'
});
@@ -296,15 +296,15 @@ export class BookMeetingModalPage implements OnInit {
setTimeout(()=>{
modal.dismiss()
},1000)
},3000)
}
async badRequest() {
async badRequest(message?: string) {
const modal = await this.modalController.create({
component: BadRequestComponent,
componentProps: {
message: 'hello',
message: message || 'Processo não efetuado' ,
},
cssClass: 'modal modal-desktop'
});
@@ -313,7 +313,8 @@ export class BookMeetingModalPage implements OnInit {
setTimeout(()=>{
modal.dismiss()
},1000)
},3000)
}
}
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+74 -11
View File
@@ -18,6 +18,8 @@ import { SearchPage } from 'src/app/pages/search/search.page';
import { SearchDocument } from 'src/app/models/search-document';
import { EventAttachment } from 'src/app/models/attachment.model';
import { User } from 'src/app/models/user.model';
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-expedient-task-modal',
@@ -184,6 +186,7 @@ export class ExpedientTaskModalPage implements OnInit {
this.dispatchFolder.SubjectTypes = this.selectedTypes;
if(this.taskParticipants.length > 0) {
switch (this.taskType) {
case '0':
@@ -198,8 +201,16 @@ export class ExpedientTaskModalPage implements OnInit {
//SubjectTypes: [],
}
console.log('this.postData', this.postData, this.taskType);
this.taskResult = await this.processes.postDespatcho(this.postData);
// console.log('this.postData', this.postData, this.taskType);
try {
this.taskResult = await this.processes.postDespatcho(this.postData).toPromise()
await this.successMessage('Processo efetuado')
} catch (error) {
await this.badRequest('Processo não efetuado')
}
console.log('this.taskResult', this.taskResult);
let action_despacho = {
@@ -210,6 +221,7 @@ export class ExpedientTaskModalPage implements OnInit {
"Note": "",
}
}
this.modalController.dismiss(action_despacho);
break;
@@ -223,9 +235,17 @@ export class ExpedientTaskModalPage implements OnInit {
DispatchFolder: this.dispatchFolder,
AttachmentList: docs
}
console.log(this.postData);
this.taskResult = await this.processes.postParecer(this.postData);
console.log('this.taskResult', this.taskResult);
//console.log(this.postData);
try {
this.taskResult = await this.processes.postParecer(this.postData).toPromise()
await this.successMessage('Processo efetuado')
} catch (error) {
await this.badRequest('Processo não efetuado')
}
// console.log('this.taskResult', this.taskResult);
let action_parecer = {
"serialNumber": this.task.serialNumber,
@@ -247,9 +267,17 @@ export class ExpedientTaskModalPage implements OnInit {
DispatchFolder: this.dispatchFolder,
AttachmentList: docs
}
console.log(this.postData);
this.taskResult = await this.processes.postDeferimento(this.postData);
//console.log(this.postData);
try {
this.taskResult = await this.processes.postDeferimento(this.postData).toPromise()
await this.successMessage('Processo efetuado')
} catch (error) {
await this.badRequest('Processo não efetuado')
}
console.log('this.taskResult', this.taskResult);
let action_deferimento = {
@@ -263,10 +291,10 @@ export class ExpedientTaskModalPage implements OnInit {
this.modalController.dismiss(action_deferimento);
break;
}
}
else {
this.alertController.presentAlert("Lista de intervenientes vazia. Por favor, adicione 1 ou mais intervenientes.");
}
}
else {
this.alertController.presentAlert("Lista de intervenientes vazia. Por favor, adicione 1 ou mais intervenientes.");
}
}
@@ -457,4 +485,39 @@ export class ExpedientTaskModalPage 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)
}
}
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+44
View File
@@ -15,6 +15,8 @@ import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
import { momentG } from 'src/plugin/momentG'
import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.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 { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component';
@Component({
selector: 'app-expediente-detail',
@@ -88,7 +90,12 @@ export class ExpedienteDetailPage implements OnInit {
sendExpedienteToPending(){
this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
console.log(res);
this.successMessage('Processo enviado para pendentes')
this.close();
},
(error)=>{
this.badRequest()
});
}
@@ -305,4 +312,41 @@ export class ExpedienteDetailPage implements OnInit {
});
return await popover.present();
}
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)
}
}