verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 70 Releases Wiki Activity

timeControl calendar fixed #1623

This commit is contained in:
Joan Sanchez 2019-08-01 09:58:59 +02:00
parent 77d8ac82a5
commit 0a4e5dfe85
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
front/core/components/calendar/index.js
View File

@ -260,8 +260,9 @@ export default class Calendar extends Component {
*/ */
moveNext(skip = 1) { moveNext(skip = 1) {
let next = this.defaultDate.getMonth() + skip; let next = this.defaultDate.getMonth() + skip;
this.defaultDate.setDate(1);
this.defaultDate.setMonth(next); this.defaultDate.setMonth(next);
this.defaultDate.setHours(0, 0, 0, 0);
this.defaultDate.setDate(1);
this.repaint(); this.repaint();
this.emit('moveNext'); this.emit('moveNext');
@ -274,8 +275,11 @@ export default class Calendar extends Component {
*/ */
movePrevious(skip = 1) { movePrevious(skip = 1) {
let previous = this.defaultDate.getMonth() - skip; let previous = this.defaultDate.getMonth() - skip;
this.defaultDate.setDate(1);
this.defaultDate.setMonth(previous); this.defaultDate.setMonth(previous);
this.defaultDate.setHours(0, 0, 0, 0);
const lastDate = this.lastDay(this.defaultDate);
this.defaultDate.setDate(lastDate.getDate());
this.repaint(); this.repaint();
this.emit('movePrevious'); this.emit('movePrevious');

16
modules/worker/front/time-control/index.js
View File

@ -84,7 +84,7 @@ class Controller {
for (let i = 0; i < weekdays.length; i++) { for (let i = 0; i < weekdays.length; i++) {
const dated = new Date(); const dated = new Date();
dated.setHours(0, 0, 0, 0); dated.setHours(23, 59, 0, 0);
dated.setMonth(this.started.getMonth()); dated.setMonth(this.started.getMonth());
dated.setDate(this.started.getDate() + i); dated.setDate(this.started.getDate() + i);
@ -113,10 +113,10 @@ class Controller {
} }
get weekOffset() { get weekOffset() {
const currentDate = this.defaultDate; const timed = this.defaultDate;
const weekDay = currentDate.getDay() + 1; const weekDay = timed.getDay() == 0 ? 7 : timed.getDay();
return weekDay - 2; return weekDay - 1;
} }
/** /**
@ -125,8 +125,10 @@ class Controller {
*/ */
get started() { get started() {
const started = new Date(); const started = new Date();
const offset = this.weekOffset;
started.setMonth(this.defaultDate.getMonth()); started.setMonth(this.defaultDate.getMonth());
started.setDate(this.defaultDate.getDate() - this.weekOffset); started.setDate(this.defaultDate.getDate() - offset);
started.setHours(0, 0, 0, 0); started.setHours(0, 0, 0, 0);
return started; return started;
@ -202,8 +204,10 @@ class Controller {
onSelection(value) { onSelection(value) {
const selected = value[0].dated; const selected = value[0].dated;
this.defaultDate.setMonth(selected.getMonth()); this.defaultDate.setMonth(selected.getMonth());
this.defaultDate.setDate(selected.getDate() - 1); this.defaultDate.setDate(selected.getDate());
this.refresh(); this.refresh();
} }