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

Add component in aganda

Browse Source
This commit is contained in:
Peter Maquiran
2021-03-24 15:10:46 +01:00
parent f5ec384100
commit 35102b380d
15 changed files with 266 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+3 -3
View File
@@ -592,9 +592,9 @@
}
},
"@angular/language-service": {
"version": "11.2.2",
"resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-11.2.2.tgz",
"integrity": "sha512-H09s5pivJq8lip206NrNJ0cXLge9CfthtT3tY+OGXn5Xiyvjxs+dOkVytoGauHE3mdge/Wn/rxoGmm/oYKejNQ==",
"version": "11.2.6",
"resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-11.2.6.tgz",
"integrity": "sha512-jzIutEzUbfBZxLWftpi5oXusL3rwbe2P/6HnNd8NUeBos9+G859R7hCsstAQ61XPn41a2/Fbl+YOwYhdjoBQrw==",
"dev": true
},
"@angular/platform-browser": {
package.json
+1 -1
View File
@@ -68,7 +68,7 @@
"@angular/cli": "11.2.1",
"@angular/compiler": "~11.2.2",
"@angular/compiler-cli": "^11.2.2",
"@angular/language-service": "~11.2.2",
"@angular/language-service": "^11.2.6",
"@ionic/angular-toolkit": "^3.0.0",
"@ionic/lab": "3.1.7",
"@types/jasmine": "~3.6.0",
src/app/pages/agenda/agenda.module.ts
+5 -1
View File
@@ -18,6 +18,8 @@ import { EditEventComponent } from 'src/app/shared/agenda/edit-event/edit-event.
import { ViewEventPage } from 'src/app/shared/agenda/view-event/view-event.page';
import { EventListComponent } from "src/app/shared/agenda/event-list/event-list.component";
import { ApproveEventComponent } from "src/app/shared/agenda/approve-event/approve-event.component";
import { AttendeesPage } from 'src/app/shared/event/attendees/attendees.page';
import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page';
registerLocaleData(localeDe);
@@ -45,7 +47,9 @@ import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
EditEventComponent,
ViewEventPage,
EventListComponent,
ApproveEventComponent
ApproveEventComponent,
AttendeesPage,
AttendeeModalPage
],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
providers: [
src/app/pages/agenda/agenda.page.html
+18 -7
View File
@@ -288,8 +288,7 @@
</mwl-calendar-day-view>
</div>
<div [ngSwitch]="view" class="fs-timeline flex-grow-1 d-none d-md-block"
*ngIf="showTimelineMD">
<div [ngSwitch]="view" class="fs-timeline flex-grow-1 d-none d-md-block" *ngIf="showTimelineMD">
<mwl-calendar-day-view
*ngSwitchCase="'day'"
[viewDate]="viewDate"
@@ -299,8 +298,7 @@
</mwl-calendar-day-view>
</div>
<div [ngSwitch]="view" class="sd-timeline flex-grow-1 d-none d-md-block timeline-md"
*ngIf="showTimelinePR">
<div [ngSwitch]="view" class="sd-timeline flex-grow-1 d-none d-md-block timeline-md" *ngIf="showTimelinePR">
<mwl-calendar-day-view
*ngSwitchCase="'day'"
[viewDate]="viewDate"
@@ -323,7 +321,8 @@
mobileComponent.showEditEvent == false &&
mobileComponent.showEventDitails == false &&
mobileComponent.showEventList == false &&
mobileComponent.showEventToApprove == false
mobileComponent.showEventToApprove == false &&
mobileComponent.showAttendees == false
)
"
class="text-black nothing-to-show">
@@ -336,6 +335,7 @@
[selectedSegment]=segment
[selectedDate]="eventSelectedDate"
(onAddEvent)="openAddEventDismiss($event)"
(openAttendeesComponent)="openAttendeesComponent($event)"
></app-new-event>
<!-- Edit -->
@@ -344,11 +344,10 @@
[selectedSegment]="segment"
[postEvent]="postEvent"
(cloneAllmobileComponent)="cloneAllmobileComponent($event)"
></app-edit-event>
<!-- View -->
<app-view-event *ngIf="mobileComponent.showEventDitails"
<app-view-event *ngIf="mobileComponent.showEventDetails"
[profile]="profile"
[eventId]="selectedEventId"
(viewEventDetailDismiss)="viewEventDetailDismiss($event)"
@@ -372,7 +371,19 @@
</app-approve-event>
<app-attendees
class="d-flex flex-column height-100"
*ngIf="mobileComponent.showAttendees"
(openAttendeeModal)="openAttendeeModal()"
>
</app-attendees>
<app-attendee-modal
class="d-flex flex-column height-100"
*ngIf="mobileComponent.showAttendeeModal"
(openAttendeesComponent)="openAttendeesComponent($event)"
>
</app-attendee-modal>
</div>
src/app/pages/agenda/agenda.page.ts
+37 -12
View File
@@ -110,11 +110,13 @@ export class AgendaPage implements OnInit {
mobileComponent: any = {
showAddNewEvent: false,
showEditEvent: false,
showEventDitails: false,
showEventDetails: false,
showEventList: false,
transparentEventList: false,
transparentEventToApprove: false,
showEventToApprove: false
showEventToApprove: false,
showAttendees: false,
showAttendeeModal: false
}
eventToaprove: any = {
@@ -129,7 +131,7 @@ export class AgendaPage implements OnInit {
private modalCtrl: ModalController,
private eventService: EventsService,
private router: Router,
private alertCrontroller: AlertService,
private alertController: AlertService,
private sanitizer: DomSanitizer
) {
@@ -204,7 +206,7 @@ export class AgendaPage implements OnInit {
this.router.navigate(["/home/agenda", event.id, 'agenda']);
} else {
this.cloneAllmobileComponent();
this.mobileComponent.showEventDitails = true;
this.mobileComponent.showEventDetails = true;
}
}
@@ -369,7 +371,7 @@ export class AgendaPage implements OnInit {
timelineBoxCorrectHeight(timeout){
setTimeout(()=>{
this.eventSource.forEach((el, eventIndex)=>{
this.eventSource.forEach((el:any, eventIndex)=>{
const startEvent = new Date(el.startTime);
const endEvent = new Date(el.endTime);
@@ -382,16 +384,17 @@ export class AgendaPage implements OnInit {
if(ele.className.indexOf(`timeline-box-event-${eventIndex}`)>=0){
ele.setAttribute('style',`height:${minutes}px`);
}
if(`timeline-box-event-${eventIndex}` == `timeline-box-event-3`){
// this event has an contraction time
// if(`timeline-box-event-${eventIndex}` == `timeline-box-event-3`){
// alert(startEvent.toString()+' '+ endEvent.toString());
}
// }
});
});
},timeout)
setTimeout(()=>{
this.TimelinePR.forEach((el, eventIndex)=>{
this.eventSource.forEach((el, eventIndex)=>{
const startEvent = new Date(el['startTime']);
const endEvent = new Date(el['endTime']);
@@ -632,11 +635,14 @@ export class AgendaPage implements OnInit {
this.eventService.getAllMdEvents( momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59') ).subscribe(
response => {
this.TimelineMD = [];
this.eventsList = response;
// loop
this.eventsList.forEach((element, eventIndex) => {
this.eventSource.push({
index: eventIndex,
title: element.Subject,
startTime: new Date(element.StartDate),
endTime: new Date(element.EndDate),
@@ -647,11 +653,10 @@ export class AgendaPage implements OnInit {
});
});
this.events = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md');
this.TimelineMD = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md');
// this.eventSource = this.TimelineMD;
this.events = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md');
this.myCal.update();
this.myCal.loadEvents();
@@ -666,9 +671,13 @@ export class AgendaPage implements OnInit {
this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(
response => {
this.TimelinePR = [];
this.eventsList = response;
this.eventsList.forEach((element, eventIndex) => {
this.eventSource.push({
index: eventIndex,
title: element.Subject,
startTime: new Date(element.StartDate),
endTime: new Date(element.EndDate),
@@ -710,7 +719,7 @@ export class AgendaPage implements OnInit {
}, 250)
}
showAlert(){
this.alertCrontroller.presentAlert("Funcionalidade em desenvolvimento.");
this.alertController.presentAlert("Funcionalidade em desenvolvimento.");
}
changeProfile(){
@@ -777,6 +786,7 @@ export class AgendaPage implements OnInit {
this.cloneAllmobileComponent();
}
// open component
async viewEventDetail(eventId:any) {
console.log(this.profile);
@@ -796,6 +806,7 @@ export class AgendaPage implements OnInit {
});
}
// open component
async viewEventDetailDismiss(data){
await this.cloneAllmobileComponent()
@@ -871,7 +882,7 @@ export class AgendaPage implements OnInit {
this.mobileComponent= {
showAddNewEvent: false,
showEditEvent: false,
showEventDitails: false,
showEventDetails: false,
showEventList: false,
showEventToApprove: false
}
@@ -887,4 +898,18 @@ export class AgendaPage implements OnInit {
this.mobileComponent.showAddNewEvent = true;
}
// open component
async openAttendeesComponent(data){
console.log('open attendees component');
this.cloneAllmobileComponent();
this.mobileComponent.showAttendees = true;
}
async openAttendeeModal(){
this.cloneAllmobileComponent();
this.mobileComponent.showAttendeeModal = true;
}
}
src/app/shared/agenda/new-event/new-event.component.ts
+3 -19
View File
@@ -23,12 +23,12 @@ export class NewEventPage implements OnInit {
@Input() selectedDate: Date;
@Output() onAddEvent = new EventEmitter<any>();
@Output() openAttendeesComponent = new EventEmitter<any>();
minDate: string;
constructor(
private modalController: ModalController,
//private navParams: NavParams,
private eventService: EventsService,
) {
this.postEvent = new Event();
@@ -104,26 +104,10 @@ export class NewEventPage implements OnInit {
this.onAddEvent.emit(this.postEvent);
}
async openAttendees()
async openAttendees(data: any)
{
const modal = await this.modalController.create({
component: AttendeesPage,
componentProps: {
eventAttendees: this.postEvent.Attendees
},
cssClass: 'attendee',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then((data) => {
if (data['data'] != null)
{
let newattendees: EventPerson[] = data['data'];
this.postEvent.Attendees = newattendees;
}
});
this.openAttendeesComponent.emit();
}
}
src/app/shared/agenda/view-event/view-event.page.ts
+1
View File
@@ -36,6 +36,7 @@ export class ViewEventPage implements OnInit {
@Output() viewEventDetailDismiss = new EventEmitter<any>();
constructor(
private eventsService: EventsService,
private attachmentsService: AttachmentsService,
src/app/shared/event/attendee-modal/attendee-modal-routing.module.ts
+17
View File
@@ -0,0 +1,17 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { AttendeeModalPage } from './attendee-modal.page';
const routes: Routes = [
{
path: '',
component: AttendeeModalPage
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class AttendeeModalPageRoutingModule {}
src/app/shared/event/attendee-modal/attendee-modal.module.ts
+20
View File
@@ -0,0 +1,20 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { AttendeeModalPageRoutingModule } from './attendee-modal-routing.module';
import { AttendeeModalPage } from './attendee-modal.page';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
AttendeeModalPageRoutingModule
],
declarations: [AttendeeModalPage]
})
export class AttendeeModalPageModule {}
src/app/shared/event/attendee-modal/attendee-modal.page.html
+39
View File
@@ -0,0 +1,39 @@
<ion-header class="ion-no-border">
<ion-toolbar>
<ion-title>Adicionar intervenientes</ion-title>
</ion-toolbar>
<ion-searchbar (ionChange)="onChange($event)" placeholder="Pesquisar"></ion-searchbar><!-- [(ngModel)]="searchCountryString" -->
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
</ion-header>
<ion-content>
<ion-item-group>
<ion-list>
<ion-item-sliding>
<ion-item *ngFor="let attendee of contacts">
<ion-checkbox slot="end" (ionChange)="selectContact(attendee)"></ion-checkbox><!-- [disabled]="isCheckboxDisabled" -->
<ion-label>
<h3>{{ attendee.Name }}</h3>
<p>{{ attendee.EmailAddress }}</p>
</ion-label>
</ion-item>
</ion-item-sliding>
</ion-list>
</ion-item-group>
</ion-content>
<ion-footer class="ion-no-border">
<ion-toolbar class="width-100 d-flex justify-space-between px-20">
<ion-buttons slot="start">
<ion-button class="btn-cancel" fill="clear" color="#061b52" (click)="close()">
<ion-label>Cancelar</ion-label>
<ion-icon name="close" slot="start"></ion-icon>
</ion-button>
</ion-buttons>
<ion-buttons slot="end">
<ion-button class="btn-ok" fill="clear" color="#fff" (click)="save()">
<ion-label>Adicionar</ion-label>
<ion-icon name="checkmark" slot="start"></ion-icon>
</ion-button>
</ion-buttons>
</ion-toolbar>
</ion-footer>
src/app/shared/event/attendee-modal/attendee-modal.page.scss
+6
View File
@@ -0,0 +1,6 @@
ion-item-group{
margin: 15px;
}
ion-searchbar{
--border-radius: 20px;
}
src/app/shared/event/attendee-modal/attendee-modal.page.spec.ts
+24
View File
@@ -0,0 +1,24 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { AttendeeModalPage } from './attendee-modal.page';
describe('AttendeeModalPage', () => {
let component: AttendeeModalPage;
let fixture: ComponentFixture<AttendeeModalPage>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ AttendeeModalPage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(AttendeeModalPage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/shared/event/attendee-modal/attendee-modal.page.ts
+70
View File
@@ -0,0 +1,70 @@
import { Component, EventEmitter, OnInit, Output } from '@angular/core';
import { ModalController } from '@ionic/angular';
import { ContactsService } from 'src/app/services/contacts.service';
import { EventPerson } from 'src/app/models/eventperson.model';
import { ThrowStmt, removeSummaryDuplicates } from '@angular/compiler';
@Component({
selector: 'app-attendee-modal',
templateUrl: './attendee-modal.page.html',
styleUrls: ['./attendee-modal.page.scss'],
})
export class AttendeeModalPage implements OnInit {
contacts: EventPerson[];
showLoader: boolean = false;
eventPersons: EventPerson[];
constructor(private modalCtrl: ModalController, private contactsService: ContactsService) { }
@Output() openAttendeesComponent = new EventEmitter<any>();
ngOnInit() {
this.fetchContacts("");
}
save(){
this.modalCtrl.dismiss(
this.contacts.filter(function(contact) {
return contact.IsRequired == true;
})
);
}
close(){
// this.modalCtrl.dismiss(null);
this.openAttendeesComponent.emit();
}
onChange(evt: any) {
this.fetchContacts(evt.detail.value);
}
selectContact(itm: EventPerson){
itm.IsRequired = !itm.IsRequired;
}
async fetchContacts(filter: string) {
this.showLoader = true;
this.contactsService.getContacts(filter).subscribe(result =>
{
if (this.eventPersons != null)
{
this.eventPersons.forEach(attendee => {
const index: number = result.findIndex((cont) => {
return cont.EmailAddress == attendee.EmailAddress
});
result.splice(index, 1);
});
}
this.contacts = result;
this.showLoader = false;
}
);
}
}
src/app/shared/event/attendees/attendees.page.html
+1 -1
View File
@@ -39,7 +39,7 @@
<ion-footer class="ion-no-border">
<ion-toolbar class="btn-div">
<ion-toolbar class="width-100 d-flex justify-space-between px-20">
<ion-buttons slot="start">
<ion-button class="btn-cancel" fill="clear" color="#061b52" (click)="close()">
<ion-label>Cancelar</ion-label>
src/app/shared/event/attendees/attendees.page.ts
+15 -8
View File
@@ -1,8 +1,8 @@
import { Component, OnInit } from '@angular/core';
import { Component, EventEmitter, OnInit, Output } from '@angular/core';
import { EventPerson } from 'src/app/models/eventperson.model';
import { EventsService } from 'src/app/services/events.service';
import { ModalController, NavController } from '@ionic/angular';
import { AttendeeModalPage } from '../attendee-modal/attendee-modal.page';
// import { AttendeeModalPage } from '../attendee-modal/attendee-modal.page';
@Component({
selector: 'app-attendees',
@@ -17,6 +17,9 @@ export class AttendeesPage implements OnInit {
searchCountryString = ''; // initialize your searchCountryString string empty
@Output() openAttendeeModal = new EventEmitter<any>();
constructor(private eventService: EventsService, private modalCtrl: ModalController,
private navCtrl: NavController) {
}
@@ -26,11 +29,11 @@ export class AttendeesPage implements OnInit {
}
save(){
this.modalCtrl.dismiss(this.eventAttendees);
// this.modalCtrl.dismiss(this.eventAttendees);
}
close(){
this.modalCtrl.dismiss(null);
// this.modalCtrl.dismiss(null);
}
removeAttendee(attendee: EventPerson)
@@ -42,9 +45,12 @@ export class AttendeesPage implements OnInit {
this.eventAttendees.splice(index, 1);
}
async addAttendees()
{
const modal = await this.modalCtrl.create({
async addAttendees() {
console.log('Event Intervenient');
this.openAttendeeModal.emit();
/* const modal = await this.modalCtrl.create({
component: AttendeeModalPage,
componentProps: {
eventPersons: this.eventAttendees
@@ -73,7 +79,8 @@ export class AttendeesPage implements OnInit {
this.eventAttendees.push(att);
});
}
});
}); */
}
}