mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 05:16:07 +00:00
Many changes
Edit event
This commit is contained in:
+22
-12
@@ -11,6 +11,7 @@ import { StorageService } from 'src/app/services/storage.service';
|
||||
import { AddParticipantsCcModalPage } from '../add-participants-cc-modal/add-participants-cc-modal.page';
|
||||
import { AddParticipantsModalPage } from '../add-participants-modal/add-participants-modal.page';
|
||||
import { environment } from 'src/environments/environment';
|
||||
import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
|
||||
|
||||
@Component({
|
||||
selector: 'app-expedient-task-modal',
|
||||
@@ -66,13 +67,14 @@ export class ExpedientTaskModalPage implements OnInit {
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
|
||||
this.task = this.navParams.get('task');
|
||||
this.taskDate = new Date(this.task.taskStartDate);
|
||||
/* this.authService.userData$.subscribe((res:any)=>{
|
||||
console.log(res);
|
||||
});
|
||||
console.log(this.user); */
|
||||
console.log(this.task)
|
||||
console.log(this.task.serialNumber);
|
||||
|
||||
}
|
||||
|
||||
close(){
|
||||
@@ -98,6 +100,7 @@ export class ExpedientTaskModalPage implements OnInit {
|
||||
}
|
||||
console.log(this.postData);
|
||||
this.processes.postDespatcho(this.postData);
|
||||
|
||||
break;
|
||||
case '1':
|
||||
this.postData = {
|
||||
@@ -122,8 +125,8 @@ export class ExpedientTaskModalPage implements OnInit {
|
||||
this.processes.postDeferimento(this.postData);
|
||||
break;
|
||||
}
|
||||
this.router.navigate(['/home/gabinete-digital/expediente']);
|
||||
this.modalController.dismiss(null);
|
||||
this.distartExpedientModal();
|
||||
this.close();
|
||||
}
|
||||
|
||||
async addParticipants(){
|
||||
@@ -135,14 +138,10 @@ export class ExpedientTaskModalPage implements OnInit {
|
||||
cssClass: 'add-participants-modal',
|
||||
backdropDismiss: false
|
||||
});
|
||||
|
||||
await modal.present();
|
||||
|
||||
modal.onDidDismiss().then((res) => {
|
||||
this.taskParticipants = res.data;
|
||||
|
||||
let newattendees: EventPerson[] = res['data'];
|
||||
|
||||
if(newattendees!= null){
|
||||
newattendees.forEach(newattendee => {
|
||||
let att = {
|
||||
@@ -159,6 +158,7 @@ export class ExpedientTaskModalPage implements OnInit {
|
||||
console.log(this.postData);
|
||||
});
|
||||
}
|
||||
|
||||
async addParticipantsCc(){
|
||||
const modal = await this.modalController.create({
|
||||
component: AddParticipantsCcModalPage,
|
||||
@@ -168,14 +168,10 @@ export class ExpedientTaskModalPage implements OnInit {
|
||||
cssClass: 'add-participants-cc-modal',
|
||||
backdropDismiss: false
|
||||
});
|
||||
|
||||
await modal.present();
|
||||
|
||||
modal.onDidDismiss().then((res) => {
|
||||
this.taskParticipantsCc = res.data;
|
||||
|
||||
let newattendees: EventPerson[] = res['data'];
|
||||
|
||||
if(newattendees!= null){
|
||||
newattendees.forEach(newattendee => {
|
||||
let att = {
|
||||
@@ -193,4 +189,18 @@ export class ExpedientTaskModalPage implements OnInit {
|
||||
});
|
||||
}
|
||||
|
||||
async distartExpedientModal(){
|
||||
const modal = await this.modalController.create({
|
||||
component: DiscartExpedientModalPage,
|
||||
componentProps: {
|
||||
serialNumber: this.task.serialNumber,
|
||||
},
|
||||
cssClass: 'discart-expedient-modal',
|
||||
backdropDismiss: false
|
||||
});
|
||||
|
||||
await modal.present();
|
||||
modal.onDidDismiss();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user