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

Improve add event and edit event

Browse Source
This commit is contained in:
Peter Maquiran
2021-04-07 11:52:28 +01:00
parent 9718a9f98d
commit b7b5533260
9 changed files with 277 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.ts
+3 -6
View File
@@ -112,7 +112,6 @@ export class AgendaPage implements OnInit {
// this will make toggle add event and.
showEventEditOrOpen: "edit" | "add" | "" = ""
prEventList: Event[];
mdEventList: Event[]
@@ -894,7 +893,8 @@ export class AgendaPage implements OnInit {
const modal = await this.modalCtrl.create({
component: ViewEventPage,
componentProps:{
eventId: eventId
eventId: eventId,
adding: this.adding
},
cssClass: 'modal modal-desktop',
backdropDismiss: false
@@ -986,7 +986,6 @@ export class AgendaPage implements OnInit {
}
async AproveEventEditEvent(data){
console.log(data)
this.postEvent =data;
this.mobileComponent.transparentEventToApprove= true;
this.mobileComponent.showAddNewEvent = true;
@@ -997,9 +996,7 @@ export class AgendaPage implements OnInit {
if(Array.isArray(data)){
if(data.length >= 1){
console.log('save!!!',data.length);
console.log(data);
this.contacts = data ;
}
}
src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts
+2 -7
View File
@@ -34,10 +34,9 @@ export class ApproveEventModalPage implements OnInit {
private popoverController: PopoverController,
private menu: MenuController,
private alertService: AlertService,
)
{
) {
this.serialNumber = this.navParams.get('serialNumber');
}
}
ngOnInit() {
this.getTask();
@@ -72,7 +71,6 @@ export class ApproveEventModalPage implements OnInit {
}
approveTask(serialNumber:string){
let body = { "serialNumber": serialNumber, "action": "Aprovar" }
console.log(body);
this.processes.PostTaskAction(body);
this.alertService.presentAlert('Operação realizada com sucesso!');
this.router.navigate(['/home/gabinete-digital/event-list']);
@@ -80,7 +78,6 @@ export class ApproveEventModalPage implements OnInit {
}
emendTask(serialNumber:string){
/* console.log('Emendar'); */
this.menu.close();
this.openEmendMessageModal(serialNumber);
this.modalController.dismiss(null);
@@ -89,7 +86,6 @@ export class ApproveEventModalPage implements OnInit {
rejectTask(serialNumber:string){
let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
console.log(body);
this.processes.PostTaskAction(body);
this.alertService.presentAlert('Operação realizada com sucesso!');
this.router.navigate(['/home/gabinete-digital/event-list']);
@@ -134,7 +130,6 @@ export class ApproveEventModalPage implements OnInit {
"ReviewerComments": res.data,
}
}
console.log(body);
this.processes.PostTaskAction(body);
this.router.navigate(['/home/gabinete-digital/event-list']);
this.alertService.presentAlert('Operação realizada com sucesso!');
src/app/pages/agenda/edit-event/edit-event.page.html
+3 -3
View File
@@ -144,7 +144,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="!taskParticipants" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngIf="taskParticipants.length == 0" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
@@ -164,7 +164,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="!taskParticipantsCc" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngIf="taskParticipantsCc.length == 0" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
@@ -224,7 +224,7 @@
[taskParticipants]="taskParticipants"
[taskParticipantsCc]="taskParticipantsCc"
[adding]="adding"
(dynamicSetIntervenient)="dynamicSetIntervenient($event)"
></app-attendee-modal>
</div>
src/app/pages/agenda/edit-event/edit-event.page.ts
+18 -18
View File
@@ -71,9 +71,11 @@ export class EditEventPage implements OnInit {
};
}
close(){
this.modalController.dismiss();
}
save(){
this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
@@ -90,13 +92,13 @@ export class EditEventPage implements OnInit {
async openAttendees() {
this.adding = 'intervenient';
if(window.innerWidth <= 1024) {
const modal = await this.modalController.create({
component: AttendeesPage,
componentProps: {
eventAttendees: this.postEvent.Attendees
adding: this.adding,
taskParticipants: this.taskParticipants,
taskParticipantsCc: this.taskParticipantsCc
},
cssClass: 'attendee',
backdropDismiss: false
@@ -105,41 +107,39 @@ export class EditEventPage implements OnInit {
await modal.present();
modal.onDidDismiss().then((data) => {
if (data['data'] != null)
{
let newattendees: EventPerson[] = data['data'];
this.setIntervenient(newattendees);
if(data){
data = data['data'];
const newAttendees: EventPerson[] = data['taskParticipants'];
const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
this.setIntervenient(newAttendees);
this.setIntervenientCC(newAttendeesCC);
}
});
}
}
async dynamicSetIntervenient(data){
this.taskParticipants = data['taskParticipants'];
this.taskParticipantsCc = data['taskParticipantsCc'];
}
async setIntervenient(data){
setIntervenient(data){
this.taskParticipants = data;
this.postEvent.Attendees = data;
}
async setIntervenientCC(data){
setIntervenientCC(data){
this.taskParticipantsCc = data;
}
async addParticipants(){
addParticipants(){
this.adding = 'intervenient'
this.openAttendees();
}
async addParticipantsCC(){
addParticipantsCC(){
this.adding = 'CC'
this.openAttendees();
}
async closeComponent(){}
}
src/app/pages/agenda/new-event/new-event.page.html
+24 -10
View File
@@ -15,7 +15,6 @@
<div class="ion-item-container">
<ion-input placeholder="Assunto" [(ngModel)]="postEvent.Subject"></ion-input>
</div>
<div class="container-div">
<div class="ion-item-class-2">
<div class="ion-icon-class">
@@ -130,22 +129,30 @@
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
</div>
<div (click)="openAttendees()" class="ion-input-class-no-height">
<div class="ion-input-class-no-height">
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label class="list-people-title">Adicionar participantes</ion-label>
<ion-label hidden >Text</ion-label>
</ion-list>
<ion-label *ngIf="taskParticipants.length == 0" class="list-people-title">Adicionar interveniente</ion-label>
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
</div>
</ion-list>
</ion-item>
</div>
<div class="add-people">
<div (click)="addParticipants()" class="add-people">
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
</div>
</div>
</div>
</div>
<!-- HIDDEN -->
<div hidden class="container-div">
<div class="ion-item-class-2">
<div class="ion-icon-class">
@@ -155,12 +162,19 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label class="list-people-title">Com conhecimento</ion-label>
<ion-label hidden >Text</ion-label>
</ion-list>
<ion-label class="list-people-title">Com conhecimento</ion-label>
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="!taskParticipants" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
</div>
</ion-list>
</ion-item>
</div>
<div class="add-people">
<div (click)="addParticipantsCC()" class="add-people">
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
</div>
</div>
src/app/pages/agenda/new-event/new-event.page.ts
+43 -14
View File
@@ -11,6 +11,7 @@ import { AttendeesPage } from '../../events/attendees/attendees.page';
templateUrl: './new-event.page.html',
styleUrls: ['./new-event.page.scss'],
})
export class NewEventPage implements OnInit {
postEvent: Event;
eventBody: EventBody;
@@ -21,6 +22,11 @@ export class NewEventPage implements OnInit {
selectedDate: Date;
minDate: string;
adding: "intervenient" | "CC";
taskParticipants: any = [];
taskParticipantsCc: any = [];
constructor(
private modalController: ModalController,
private navParams: NavParams,
@@ -28,7 +34,7 @@ export class NewEventPage implements OnInit {
) {
this.postEvent = new Event();
this.eventBody = { BodyType : "1", Text : ""};
this.postEvent.Body = this.eventBody;
this.postEvent.Body = this.eventBody;
this.profile = this.navParams.get('profile');
this.selectedSegment = this.navParams.get('segment');
@@ -88,21 +94,19 @@ export class NewEventPage implements OnInit {
};
}
window.onresize = (event) => {
// if not mobile remove all component
if( window.innerWidth >= 1024){
this.modalController.dismiss();
}
};
}
close(){
this.modalController.dismiss();
}
save(){
console.log(this.postEvent);
console.log(this.profile);
/* console.log(this.postEvent);
console.log(this.profile); */
if(this.profile=='mdgpr'){
@@ -114,12 +118,13 @@ export class NewEventPage implements OnInit {
this.modalController.dismiss(this.postEvent);
}
async openAttendees()
{
async openAttendees() {
const modal = await this.modalController.create({
component: AttendeesPage,
componentProps: {
eventAttendees: this.postEvent.Attendees
eventAttendees: this.postEvent.Attendees,
adding: this.adding,
taskParticipants: this.taskParticipants
},
cssClass: 'attendee',
backdropDismiss: false
@@ -128,12 +133,36 @@ export class NewEventPage implements OnInit {
await modal.present();
modal.onDidDismiss().then((data) => {
if (data['data'] != null)
{
let newattendees: EventPerson[] = data['data'];
this.postEvent.Attendees = newattendees;
if(data){
data = data['data'];
const newAttendees: EventPerson[] = data['taskParticipants'];
const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
this.setIntervenient(newAttendees);
this.setIntervenientCC(newAttendeesCC);
}
});
}
}
}
setIntervenient(data){
this.taskParticipants = data;
this.postEvent.Attendees = data;
}
setIntervenientCC(data){
this.taskParticipantsCc = data;
}
addParticipants(){
this.adding = 'intervenient'
this.openAttendees();
}
addParticipantsCC(){
this.adding = 'CC'
this.openAttendees();
}
}