Add intervenientes

This commit is contained in:
Peter Maquiran
2021-04-05 15:00:14 +01:00
parent 5dc84bfffc
commit 3727e73c1d
10 changed files with 73 additions and 29 deletions
+6
View File
@@ -334,6 +334,7 @@
<app-new-event *ngIf="mobileComponent.showAddNewEvent"
[profile]="profile"
[selectedSegment]=segment
[taskParticipants]="taskParticipants"
[selectedDate]="eventSelectedDate"
(onAddEvent)="openAddEventDismiss($event)"
(openAttendeesComponent)="openAttendeesComponent($event)"
@@ -385,6 +386,11 @@
[eventAttendees]="contacts"
(closeComponent)="GoBackEditOrAdd()"
(setContact)="setContact($event)"
[adding]="adding"
[taskParticipants]="taskParticipants"
[taskParticipantsCc]="taskParticipantsCc"
(setIntervenient)="setIntervenient($event)"
(setIntervenientCC)="setIntervenientCC($event)"
>
</app-attendee-modal>
+17 -11
View File
@@ -94,6 +94,11 @@ export class AgendaPage implements OnInit {
selectedEventId: string | number;
postEvent: any;
taskParticipants: any = [];
taskParticipantsCc: any = [];
adding: "intervenient" | "CC" = "intervenient";
@ViewChild(CalendarComponent) myCal: CalendarComponent;
segment: "Combinado" | "Pessoal" | "Oficial";
@@ -259,14 +264,14 @@ export class AgendaPage implements OnInit {
onTimeSelected = (ev: { selectedTime: Date, events: any[] }) => {
console.log('Selected time: ' + ev.selectedTime + ', hasEvents: ' + (ev.events !== undefined && ev.events.length !== 0));
this.eventSelectedDate2 = ev.selectedTime;
};
}
onRangeChanged (ev: { startTime: Date, endTime: Date }) {
this.rangeStartDate = ev.startTime;
this.rangeEndDate = ev.endTime;
this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
};
}
async openCalModal() {
const modal = await this.modalCtrl.create({
@@ -912,10 +917,6 @@ export class AgendaPage implements OnInit {
this.selectedEvent = data.event;
this.postEvent = data.event;
console.log(this.selectedEvent);
console.log(this.postEvent);
this.mobileComponent.showEditEvent = true;
}
@@ -945,8 +946,6 @@ export class AgendaPage implements OnInit {
}
approveEventDismiss({saveData, serialNumber, action}){
console.log(saveData);
if(action == 'Aprovar'){
this.eventToaprove = {
@@ -996,7 +995,6 @@ export class AgendaPage implements OnInit {
// open component
async openAttendeesComponent(data){
if(Array.isArray(data)){
if(data.length >= 1){
@@ -1027,7 +1025,6 @@ export class AgendaPage implements OnInit {
async GoBackEditOrAdd(){
if(this.showEventEditOrOpen == "edit"){
this.cloneAllmobileComponent();
@@ -1042,7 +1039,6 @@ export class AgendaPage implements OnInit {
}
//
async closeComponentEditEventOrAdd(){
if(this.IsEvent ='edit') {
@@ -1053,4 +1049,14 @@ export class AgendaPage implements OnInit {
}
async setIntervenient(data){
this.taskParticipants = data;
this.postEvent
}
async setIntervenientCC(data){
this.taskParticipantsCc = data;
}
}
@@ -1,6 +1,7 @@
<ion-content class="height-100">
<div class="main-content d-flex height-100">
<div class="content d-flex flex-column width-100">
<div class="main-header">
<div class="title-content">
<div class="middle">
@@ -8,6 +9,7 @@
</div>
</div>
</div>
<div class="ion-item-container width-100">
<ion-input placeholder="Assunto" [(ngModel)]="postEvent.Subject"></ion-input>
</div>
@@ -14,7 +14,6 @@
.title-content{
margin: 0px auto;
overflow: auto;
padding: 0 !important;
background: #fff;
.middle{
@@ -38,12 +37,10 @@
width: 100%;
margin: 0px auto;
padding: 0 !important;
overflow: auto;
}
.container-div{
margin-bottom: 15px;
float: left;
overflow: auto;
}
.ion-item-class-2{
margin: 0px auto;
@@ -71,10 +68,8 @@
.ion-input-class-no-height{
border: 1px solid #ebebeb;
border-radius: 5px;
overflow: auto;
}
.list-people{
//width: 256px;
float: left;
}
@@ -8,6 +8,7 @@ import { EventsService } from 'src/app/services/events.service';
import { Event } from '../../../models/event.model';
import { EditEventPage } from '../edit-event/edit-event.page';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { EventEditPage } from '../../events/edit-event/edit-event.component';
@Component({
selector: 'app-view-event',
@@ -102,6 +103,26 @@ export class ViewEventPage implements OnInit {
});
}
async editEventDetail() {
let classs;
if( window.innerWidth <= 800){
classs = 'modal'
} else {
classs = 'modal modal-desktop'
}
const modal = await this.modalController.create({
component: EventEditPage,
componentProps: {
eventId: this.loadedEvent.EventId,
profile: this.profile,
},
cssClass: classs,
});
}
async editEvent() {
let classs;