From 17b31a14b3f9f920a0f620863fc6161ad0193e73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Tak=C3=A1cs?=
<93127072+PeterTakacs300@users.noreply.github.com>
Date: Mon, 31 Oct 2022 18:12:35 +0100
Subject: [PATCH] IDEMPIERE-5443 - Fix Date Range Filter Quick mode + update
default version (#1547)
---
.../WEB-INF/src/metainfo/zk/lang-addon.xml | 2 +-
.../src/org/adempiere/webui/window/DateRangePicker.java | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml b/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
index 2849e1b978..f2f2106d3f 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
+++ b/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
@@ -57,6 +57,6 @@ Copyright (C) 2007 Ashley G Ramdass (ADempiere WebUI).
-
+
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/DateRangePicker.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/DateRangePicker.java
index a0675ee2d2..77de7be271 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/DateRangePicker.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/DateRangePicker.java
@@ -541,11 +541,11 @@ public class DateRangePicker extends Popup implements EventListener {
c.setTime(new Date(System.currentTimeMillis()));
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
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.setSclass("date-picker-label");
@@ -563,7 +563,7 @@ public class DateRangePicker extends Popup implements EventListener {
while (monthIdx <= Calendar.DECEMBER) {
innerDiv = new Div();
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.addEventListener(Events.ON_SELECT, this);
@@ -589,6 +589,7 @@ public class DateRangePicker extends Popup implements EventListener {
c = cNow;
innerDiv = new Div();
innerDiv.setSclass("date-picker-component");
+ innerDiv.setStyle("width: 50%;");
label = new Label(Msg.getMsg(Env.getCtx(), "CurrentYearQuarters"));
label.setSclass("date-picker-label");
innerDiv.appendChild(label);
@@ -614,6 +615,7 @@ public class DateRangePicker extends Popup implements EventListener {
// Year
innerDiv = new Div();
innerDiv.setSclass("date-picker-component");
+ innerDiv.setStyle("width: 50%;");
label = new Label(Msg.getMsg(Env.getCtx(), "Year"));
label.setSclass("date-picker-label");
innerDiv.appendChild(label);