Skip to content
Code-Schnipsel Gruppen Projekte
Commit 115b8671 erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

feat: #64

Übergeordneter 2103492b
No related branches found
No related tags found
Keine zugehörigen Merge Requests gefunden
Leerzeichenänderungen ausblenden
Inline Nebeneinander
bin/backend/controls/elements/TimeFilter.css
+ 1
− 0
Zeige Datei @ 115b8671
......@@ -78,6 +78,7 @@
}
.timefilter-user-select-right {
padding-top: 10px;
width: calc(100% - 160px);
}
......
bin/backend/controls/elements/TimeFilter.js
+ 78
− 14
Zeige Datei @ 115b8671
......@@ -165,6 +165,7 @@ define('package/quiqqer/erp/bin/backend/controls/elements/TimeFilter', [
text = text + ' ' + this.$Current.getFullYear();
break;
case 'user':
case 'period':
this.$Prev.disable();
this.$Next.disable();
......@@ -700,6 +701,9 @@ define('package/quiqqer/erp/bin/backend/controls/elements/TimeFilter', [
}
},
/**
* Display user select
*/
showUserSelect: function () {
var self = this,
elmPosition = this.getElm().getPosition(),
......@@ -729,16 +733,16 @@ define('package/quiqqer/erp/bin/backend/controls/elements/TimeFilter', [
html : '' +
'<div class="timefilter-user-select-left">' +
' <div class="timefilter-user-select-left-select" data-value="today">' +
' Heute' +
QUILocale.get(lg, 'user.filter.today') +
' </div>' +
' <div class="timefilter-user-select-left-select" data-value="yesterday">' +
' Gestern' +
QUILocale.get(lg, 'user.filter.yesterday') +
' </div>' +
' <div class="timefilter-user-select-left-select" data-value="month">' +
' Aktueller Monat' +
QUILocale.get(lg, 'user.filter.month') +
' </div>' +
' <div class="timefilter-user-select-left-select" data-value="lastMonth">' +
' Letzter Monat' +
QUILocale.get(lg, 'user.filter.lastMonth') +
' </div>' +
'</div>' +
'<div class="timefilter-user-select-right"></div>',
......@@ -777,6 +781,9 @@ define('package/quiqqer/erp/bin/backend/controls/elements/TimeFilter', [
Scheduler.loadExtension('minical').then(function () {
var Handler = Scheduler.getScheduler();
var CurrentDate = null;
var currentType = 'today';
var Ghost = new Element('div', {
html: '<div class="dhx_cal_navline">' +
'<div class="dhx_cal_date"></div>' +
......@@ -794,42 +801,99 @@ define('package/quiqqer/erp/bin/backend/controls/elements/TimeFilter', [
date : new window.Date(),
navigation: true,
handler : function (date) {
CurrentDate = date;
}
});
Container.getElement('[data-value="today"]').addEvent('click', function () {
Handler.updateCalendar(Calendar, new window.Date());
Handler.markCalendar(Calendar, new window.Date(), 'dhx_calendar_click active');
var D = new window.Date();
Handler.updateCalendar(Calendar, new Date(D.getTime()));
Handler.markCalendar(Calendar, new Date(D.getTime()), 'dhx_calendar_click active');
currentType = 'today';
CurrentDate = D;
});
Container.getElement('[data-value="yesterday"]').addEvent('click', function () {
var D = new window.Date();
D.setDate(D.getDate() - 1);
Handler.updateCalendar(Calendar, new window.Date());
Handler.markCalendar(Calendar, D, 'dhx_calendar_click active');
Handler.updateCalendar(Calendar, new Date(D.getTime()));
Handler.markCalendar(Calendar, new Date(D.getTime()), 'dhx_calendar_click active');
currentType = 'yesterday';
CurrentDate = D;
});
Container.getElement('[data-value="month"]').addEvent('click', function () {
Handler.updateCalendar(Calendar, new window.Date());
Handler.markCalendar(Calendar, new window.Date(), 'dhx_calendar_click active');
var D = new window.Date();
Handler.updateCalendar(Calendar, new Date(D.getTime()));
Handler.markCalendar(Calendar, new Date(D.getTime()), 'dhx_calendar_click active');
currentType = 'month';
CurrentDate = D;
});
Container.getElement('[data-value="lastMonth"]').addEvent('click', function () {
var D = new window.Date();
D.setMonth(D.getMonth() - 1);
Handler.updateCalendar(Calendar, D);
Handler.markCalendar(Calendar, D, 'dhx_calendar_click active');
Handler.updateCalendar(Calendar, new Date(D.getTime()));
Handler.markCalendar(Calendar, new Date(D.getTime()), 'dhx_calendar_click active');
currentType = 'lastMonth';
CurrentDate = D;
});
Container.getElement('[data-value="today"]').click();
var Accept = new QUIButton({
text : QUILocale.get('quiqqer/system', 'accept'),
styles: {
'float': 'right',
margin : '10px 10px 0 0'
}
}).inject(Container.getElement('.timefilter-user-select-right'));
Accept.getElm().addEvent('mousedown', function (e) {
switch (currentType) {
case 'today':
case 'yesterday':
self.$Current = CurrentDate;
self.$To = CurrentDate;
break;
case 'month':
case 'lastMonth':
var FirstDay = new Date(
CurrentDate.getFullYear(),
CurrentDate.getMonth(),
1
);
var LastDay = new Date(
CurrentDate.getFullYear(),
CurrentDate.getMonth() + 1,
0
);
self.$Current = FirstDay;
self.$To = LastDay;
break;
}
self.$triggerChange();
});
});
});
Container.getElement('[data-value="today"]')
.addClass('timefilter-user-select-left-select--active');
//Container.focus();
Container.focus();
}
});
});
locale.xml
+ 17
− 0
Zeige Datei @ 115b8671
......@@ -893,6 +893,23 @@
<en><![CDATA[4th quarter]]></en>
</locale>
<locale name="user.filter.today">
<de><![CDATA[Heute]]></de>
<en><![CDATA[Today]]></en>
</locale>
<locale name="user.filter.yesterday">
<de><![CDATA[Gestern]]></de>
<en><![CDATA[Yesterday]]></en>
</locale>
<locale name="user.filter.month">
<de><![CDATA[Aktueller Monat]]></de>
<en><![CDATA[Current month]]></en>
</locale>
<locale name="user.filter.lastMonth">
<de><![CDATA[Letzter Monat]]></de>
<en><![CDATA[Last month]]></en>
</locale>
<locale name="halfYear.1">
<de><![CDATA[1 Halbjahr]]></de>
<en><![CDATA[1 half year]]></en>
......
0% oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren

PCSG & QUIQQER support and DEV System - GitLab