midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-5443 - Fix Date Range Filter Quick mode + update default version (#1547)

This commit is contained in:
Peter Takács 2022-10-31 18:12:35 +01:00 committed by GitHub
parent 84dc2b3f31
commit 17b31a14b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
View File

@ -57,6 +57,6 @@ Copyright (C) 2007 Ashley G Ramdass (ADempiere WebUI).
<!-- this js module doesn't actually exists and it is here for default theme version --> <!-- this js module doesn't actually exists and it is here for default theme version -->
<!-- since loading of js module is on demand, it doesn't cause any error as long as you don't try to load it --> <!-- since loading of js module is on demand, it doesn't cause any error as long as you don't try to load it -->
<javascript-module name="idempiere.theme.default" version="202210031130" /> <javascript-module name="idempiere.theme.default" version="202210311430" />
</language> </language>

8
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/DateRangePicker.java
View File

@ -541,11 +541,11 @@ public class DateRangePicker extends Popup implements EventListener<Event> {
c.setTime(new Date(System.currentTimeMillis())); c.setTime(new Date(System.currentTimeMillis()));
Div wrapperDiv1 = new Div(); Div wrapperDiv1 = new Div();
wrapperDiv1.setStyle("max-width: 420px; display: flex; border-top: 2px solid #CFCFCF;"); wrapperDiv1.setStyle("width: 420px; display: flex; border-top: 2px solid #CFCFCF;");
// Months // Months
Div wrapperDiv2 = new Div(); Div wrapperDiv2 = new Div();
wrapperDiv2.setStyle("max-width: 420px; display: flex;"); wrapperDiv2.setStyle("width: 420px; display: flex;");
Label label = new Label(Msg.getMsg(Env.getCtx(), "CurrentYearMonths")); Label label = new Label(Msg.getMsg(Env.getCtx(), "CurrentYearMonths"));
label.setSclass("date-picker-label"); label.setSclass("date-picker-label");
@ -563,7 +563,7 @@ public class DateRangePicker extends Popup implements EventListener<Event> {
while (monthIdx <= Calendar.DECEMBER) { while (monthIdx <= Calendar.DECEMBER) {
innerDiv = new Div(); innerDiv = new Div();
innerDiv.setSclass("date-picker-component"); innerDiv.setSclass("date-picker-component");
innerDiv.setStyle("margin: 5px 5px 16px 5px !important;"); innerDiv.setStyle("margin: 5px 5px 16px 5px !important; width: 33%;");
box = new Listbox(); box = new Listbox();
box.addEventListener(Events.ON_SELECT, this); box.addEventListener(Events.ON_SELECT, this);
@ -589,6 +589,7 @@ public class DateRangePicker extends Popup implements EventListener<Event> {
c = cNow; c = cNow;
innerDiv = new Div(); innerDiv = new Div();
innerDiv.setSclass("date-picker-component"); innerDiv.setSclass("date-picker-component");
innerDiv.setStyle("width: 50%;");
label = new Label(Msg.getMsg(Env.getCtx(), "CurrentYearQuarters")); label = new Label(Msg.getMsg(Env.getCtx(), "CurrentYearQuarters"));
label.setSclass("date-picker-label"); label.setSclass("date-picker-label");
innerDiv.appendChild(label); innerDiv.appendChild(label);
@ -614,6 +615,7 @@ public class DateRangePicker extends Popup implements EventListener<Event> {
// Year // Year
innerDiv = new Div(); innerDiv = new Div();
innerDiv.setSclass("date-picker-component"); innerDiv.setSclass("date-picker-component");
innerDiv.setStyle("width: 50%;");
label = new Label(Msg.getMsg(Env.getCtx(), "Year")); label = new Label(Msg.getMsg(Env.getCtx(), "Year"));
label.setSclass("date-picker-label"); label.setSclass("date-picker-label");
innerDiv.appendChild(label); innerDiv.appendChild(label);