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

confit

Browse Source
This commit is contained in:
Peter Maquiran
2021-02-26 16:09:53 +01:00
parent ef948763db 942d9528e4
commit 25ffc18a45
1567 changed files with 517137 additions and 4836 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.ts
+31 -10
View File
@@ -1,16 +1,21 @@
import { Component, OnInit, ViewChild, Inject, LOCALE_ID, Input } from '@angular/core';
import { CalendarComponent } from 'ionic2-calendar';
import { AlertController, ModalController } from '@ionic/angular';
import { formatDate } from '@angular/common';
import { CalModalPage } from '../cal-modal/cal-modal.page';
import { EventsService } from 'src/app/services/events.service';
import { Event } from '../../models/event.model';
import { Router, NavigationEnd } from '@angular/router';
import { AlertService } from 'src/app/services/alert.service';
<<<<<<< HEAD
import { NewEventPage } from './new-event/new-event.page';
import { ViewEventPage } from './view-event/view-event.page';
import { momentG } from 'src/plugin/momentG';
import { DomSanitizer } from "@angular/platform-browser";
=======
import { momentG } from 'src/plugin/momentG'
>>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67
// showTimeline
import { setHours, setMinutes } from 'date-fns';
import {
@@ -19,8 +24,15 @@ import {
CalendarView,
DAYS_OF_WEEK,
} from 'angular-calendar';
<<<<<<< HEAD
import { CustomDateFormatter } from './custom-date-formatter.provider';
=======
>>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67
import { EventListPage } from '../gabinete-digital/event-list/event-list.page';
import { CustomDateFormatter } from './custom-date-formatter.provider';
import { ViewEventPage } from './view-event/view-event.page';
import { NewEventPage } from './new-event/new-event.page';
@Component({
selector: 'app-agenda',
@@ -55,7 +67,6 @@ export class AgendaPage implements OnInit {
showCalendar: boolean;
calendarHeight: string;
// for timeline
events: CalendarEvent[] = [];
// timeline filter
@@ -101,6 +112,7 @@ export class AgendaPage implements OnInit {
startTime: Date;
endTime: Date;
<<<<<<< HEAD
mobileComponent: any = {
showAddNewEvent: false,
@@ -117,6 +129,8 @@ export class AgendaPage implements OnInit {
saveData: {}
}
=======
>>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67
constructor(
private alertCtrl: AlertController,
@Inject(LOCALE_ID) private locale: string,
@@ -211,7 +225,7 @@ export class AgendaPage implements OnInit {
onCurrentChanged = (ev: Date) => {
// timeline change date
this.timelineDate = momentG(new Date(ev),'dd MMMM yyyy');
this.timelineDate = new Date(ev).toLocaleString();
this.viewDate = new Date(ev);
// calendar change date
this.eventSelectedDate = new Date(ev);
@@ -222,15 +236,22 @@ export class AgendaPage implements OnInit {
// changedate
dropDownChangeDate(id: string){
const currentCandarDayYear = momentG(this.eventSelectedDate,'dd -- yyyy', 'pt');
/* const currentCandarDayYear = formatDate(this.eventSelectedDate,'dd -- yyyy', 'pt');
const newDate = new Date(currentCandarDayYear.replace('--',id));
this.onCurrentChanged(newDate);
this.onCurrentChanged(newDate); */
}
<<<<<<< HEAD
onTimeSelected = (ev: { selectedTime: Date, events: any[] }) => {
console.log('Selected time: ' + ev.selectedTime + ', hasEvents: ' + (ev.events !== undefined && ev.events.length !== 0));
this.eventSelectedDate2 = ev.selectedTime;
};
=======
/* onTimeSelected = (ev: { selectedTime: Date, events: any[] }) => {
console.log('Selected time: ' + ev.selectedTime + ', hasEvents: ' + (ev.events !== undefined && ev.events.length !== 0));
this.eventSelectedDate2 = ev.selectedTime;
}; */
>>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67
onRangeChanged (ev: { startTime: Date, endTime: Date }) {
this.rangeStartDate = ev.startTime;
@@ -389,11 +410,11 @@ export class AgendaPage implements OnInit {
this.eventsList.forEach((element, eventIndex) => {
// timeline start
const startHours = momentG(new Date(element.StartDate), 'HH', 'pt');
const EndHours = momentG(new Date(element.EndDate), 'HH', 'pt');
const startHours = new Date(element.StartDate).getHours().toLocaleString();
const EndHours = new Date(element.EndDate).getHours().toLocaleString();
const startHoursOtherFormate = momentG(new Date(element.StartDate), 'HH:mm', 'pt');
const EndHoursOtherFormate = momentG(new Date(element.EndDate), 'HH:mm', 'pt');
const startHoursOtherFormate = new Date(element.StartDate).getHours().toLocaleString()+':'+new Date(element.StartDate).getMinutes().toLocaleString();
const EndHoursOtherFormate = formatDate(new Date(element.EndDate), 'HH:mm', 'pt');
if (element.CalendarName == calendarName) {
this.events.push({
@@ -458,7 +479,7 @@ export class AgendaPage implements OnInit {
});
});
this.timelineFilter(this.timelineFilterState);
// this.timelineFilter(this.timelineFilterState);
this.myCal.update();
this.myCal.loadEvents();
@@ -491,7 +512,7 @@ export class AgendaPage implements OnInit {
});
this.timelineFilter(this.timelineFilterState);
// this.timelineFilter(this.timelineFilterState);
this.myCal.update();
this.myCal.loadEvents();