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

Improve agenda

Browse Source
This commit is contained in:
Peter Maquiran
2021-02-09 16:49:15 +01:00
parent d0248df80a
commit c29b6ac688
6 changed files with 64 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.html
+11 -4
View File
@@ -55,7 +55,8 @@
</table>
<calendar class="calendar-component"
<calendar
class="calendar-component"
[eventSource]="eventSource"
[calendarMode]="calendar.mode"
[currentDate]="calendar.currentDate"
@@ -118,7 +119,8 @@
</thead>
</table>
<calendar class="calendar-component"
<calendar
class="calendar-component"
[eventSource]="eventSource"
[calendarMode]="calendar.mode"
[currentDate]="calendar.currentDate"
@@ -183,7 +185,8 @@
</thead>
</table>
<calendar class="calendar-component"
<calendar
class="calendar-component"
[eventSource]="eventSource"
[calendarMode]="calendar.mode"
[currentDate]="calendar.currentDate"
@@ -217,7 +220,11 @@
<!-- Calendar currente date -->
<ion-row class="ion-justify-content-between ion-align-items-center currente-date-timelien">
<ion-row class="timeline-date">
<ion-row class="timeline-date align-center">
<!-- <ion-icon *ngIf="showCalendar" (click)="showCalendar=false" class="collaps" src="assets/images/icons-add-new-event.svg" >1</ion-icon>
<ion-icon *ngIf="!showCalendar" (click)="showCalendar=true" class="collaps" src="assets/images/icons-add-new-event.svg" >2</ion-icon> -->
<span *ngIf="timelineIsCurrentDate()">Hoje, &nbsp;</span> {{ timelineDate }}
</ion-row>
<ion-row class="filter ion-align-items-center">
src/app/pages/agenda/agenda.page.scss
+8
View File
@@ -416,6 +416,10 @@ td.monthview-primary-with-event {
font-size: 15px;
font-weight: bold;
}
.collaps{
font-size: 28px;
padding-right: 8px;
}
.filter{
font-size: 15px;
font-weight: normal;
@@ -454,3 +458,7 @@ td.monthview-primary-with-event {
}
}
.showcalendar{
display: none;
}
src/app/pages/agenda/agenda.page.ts
+16 -13
View File
@@ -51,6 +51,10 @@ export class AgendaPage implements OnInit {
this.view = view;
}
// calendar
showCalendar: boolean;
// timeline
monthList = [
{ name: 'Janeiro', id: 'Jan' },
{ name: 'Fevereiro', id: 'Feb' },
@@ -66,13 +70,12 @@ export class AgendaPage implements OnInit {
{ name: 'Dezembro', id: 'Dec' }
]
showTimeline: boolean= false;
// for timeline
events: CalendarEvent[] = [];
// timeline filter
timelineFilterState: string = 'Todos';
showTimelineFilterState: boolean= false;
showTimelineFilterState: boolean;
showTimeline: boolean;
/* List of events of our calendar */
eventSource = [];
@@ -119,11 +122,9 @@ export class AgendaPage implements OnInit {
private alertCrontroller: AlertService
) {
this.showCalendar = true;
this.timelineDate = momentG(new Date(),'dd MMMM yyyy');
function setCookie(cname, cvalue, exdays) {
var d = new Date();
d.setTime(d.getTime() + (exdays*24*60*60*1000));
@@ -135,6 +136,8 @@ export class AgendaPage implements OnInit {
setCookie('searchModalAPPType','0', 99999999);
this.showLoader = false;
this.showTimelineFilterState = false;
this.showTimeline = false;
}
@@ -416,9 +419,9 @@ export class AgendaPage implements OnInit {
//Inicializa o array eventSource
this.eventSource=[];
if(this.profile == "mdgpr"){
this.eventService.getAllMdEvents(new Date(startTime).toLocaleString(), new Date(endTime).toLocaleString()).subscribe(
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.eventsList = response;
// loop
@@ -449,7 +452,7 @@ export class AgendaPage implements OnInit {
}
else{
this.eventService.getAllPrEvents(new Date(startTime).toLocaleString(), new Date(endTime).toLocaleString()).subscribe(
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.eventsList = response;
this.eventsList.forEach((element, eventIndex) => {
@@ -482,7 +485,7 @@ export class AgendaPage implements OnInit {
//Inicializa o array eventSource
this.eventSource=[];
if(this.profile == "mdgpr"){
this.eventService.getAllMdEvents(new Date(startTime).toLocaleString(), new Date(endTime).toLocaleString()).subscribe(response => {
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.eventsListPessoal = response.filter(data => data.CalendarName == "Pessoal");
this.eventsListPessoal.forEach(element => {
this.eventSource.push({
@@ -499,7 +502,7 @@ export class AgendaPage implements OnInit {
});
}
else{
this.eventService.getAllPrEvents(new Date(startTime).toLocaleString(), new Date(endTime).toLocaleString()).subscribe(response => {
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.eventsListPessoal = response.filter(data => data.CalendarName == "Pessoal");
this.eventsListPessoal.forEach(element => {
this.eventSource.push({
@@ -521,7 +524,7 @@ export class AgendaPage implements OnInit {
//Inicializa o array eventSource
this.eventSource=[];
if(this.profile == "mdgpr"){
this.eventService.getAllMdEvents(new Date(startTime).toLocaleString(), new Date(endTime).toLocaleString()).subscribe(res => {
this.eventService.getAllMdEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(res => {
this.eventsListOficial = res.filter(data => data.CalendarName == "Oficial");
this.eventsListOficial.forEach(element => {
this.eventSource.push({
@@ -537,7 +540,7 @@ export class AgendaPage implements OnInit {
this.showLoader = false;
});
}else{
this.eventService.getAllPrEvents(new Date(startTime).toLocaleString(), new Date(endTime).toLocaleString()).subscribe(res => {
this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(res => {
this.eventsListOficial = res.filter(data => data.CalendarName == "Oficial");
this.eventsListOficial.forEach(element => {
this.eventSource.push({
src/app/pages/events/events.page.html
+8 -3
View File
@@ -40,8 +40,10 @@
(click)="viewEventDetail(event.EventId)">
<div class="d-flex content-{{profile}}-{{event.CalendarName}}">
<div class="schedule-time">
<div class="time-start">{{event.StartDate | date: 'hh:mm'}}</div>
<div class="time-end">{{event.EndDate | date: 'hh:mm'}}</div>
</div>
<div class="schedule-details">
<div class="location">{{event.Location}}</div>
@@ -62,7 +64,7 @@
-->
</div>
</div>
<div class="schedule">
<div class="schedule-header">
<div class="title">
@@ -80,8 +82,11 @@
>
<div class="d-flex">
<div class="schedule-date">
<div class="time-end">{{task.CreateDate | date: 'd/M/yy'}}</div>
<div class="time-start">{{task.CreateDate | date: 'hh:mm'}}</div>
<div class="time-start">{{ momentGG(task.CreateDate,'dd/MM/yy')}}</div>
<div class="time-start">{{ momentGG(task.CreateDate,'HH:mm')}}</div>
</div>
<div class="schedule-details pointer">
<div class="description">{{ task.Folio }}</div>
src/app/pages/events/events.page.ts
+6 -4
View File
@@ -4,7 +4,6 @@ import { Event } from '../../models/event.model';
import { EventsService } from 'src/app/services/events.service';
import { Router } from '@angular/router';
import { ActivatedRoute, NavigationEnd } from '@angular/router';
import { formatDate } from '@angular/common';
import { AlertService } from 'src/app/services/alert.service';
import { AuthService } from 'src/app/services/auth.service';
import { StorageService } from 'src/app/services/storage.service';
@@ -17,6 +16,7 @@ import { DailyWorkTask } from '../../models/dailyworktask.model';
import { ViewEventPage } from '../agenda/view-event/view-event.page';
import { ExpedientePage } from '../gabinete-digital/expediente/expediente.page';
import { ExpedienteDetailPage } from '../gabinete-digital/expediente/expediente-detail/expediente-detail.page';
import { momentG } from 'src/plugin/momentG'
@Component({
selector: 'app-events',
@@ -72,7 +72,7 @@ export class EventsPage implements OnInit {
// update hours and minutes
setInterval(()=> {
this.currentHoursMinutes = formatDate(new Date(), 'HH:MM', 'pt');
this.currentHoursMinutes = momentG(new Date(), 'HH:MM', 'pt');
}, 1000);
// list
@@ -127,6 +127,9 @@ export class EventsPage implements OnInit {
}
momentGG(date, fomate, UTC ){
return momentG(date, fomate, UTC);
}
doRefresh(event) {
this.RefreshEvents();
@@ -287,9 +290,8 @@ export class EventsPage implements OnInit {
AllResult.push(task);
});
console.log(AllResult);
this.taskslist = this.sortArrayISODate(AllResult).reverse()
this.taskslist = AllResult.reverse()
});
}
src/plugin/momentG.js
+15 -7
View File
@@ -18,21 +18,29 @@ class momentG {
if(typeof date.getMonth != 'function') {
date = new Date(date)
if(! date instanceof Date){
throw new UserException('Invalid date formate momentG');
}
}
var e = {
mm : ((date.getMinutes()).toString()).padStart("2","0"),
dd : ((date.getDate()).toString()).padStart("2","0"),
MM : ((date.getMonth()+1).toString()).padStart("2","0"),
HH : date.getHours(),
EEEE : week[date.getDay()].padStart("2","0"),
d : (date.getDate()).toString() ,
M : (date.getMonth()).toString() ,
ss : (date.getSeconds().toString()).padStart(2,"0"),
mm : (date.getMinutes().toString()).padStart(2,"0") ,
dd : (date.getDate()).toString().padStart(2,"0") ,
MM : (date.getMonth()+1).toString().padStart(2,"0"),
HH : date.getHours().toString().padStart(2,"0"),
yy: date.getFullYear().toString().slice(2,4).padStart(2,"0") ,
EEEE : week[date.getDay()].padStart(2,"0") ,
MMMM : month[date.getMonth()],
yyyy : date.getFullYear(),
yyyy : date.getFullYear() ,
}
Object.keys(e).reverse().forEach(element => {
var reg = new RegExp(element,'g')
formate = formate.replace(reg,e[element])
formate = formate.replace(reg,e[element] )
});
return formate