Skip to content

Commit

Permalink
IDEMPIERE-6127 : Improve Report Process Parameter for Mobile Screen (#…
Browse files Browse the repository at this point in the history
…2334)

* IDEMPIERE-6127 : Improve Report Process Parameter for Mobile Screen

* apply patch from hengsin

- Combine summary checkbox and label into one component
- update default theme version
  • Loading branch information
uthadehikaru committed Apr 30, 2024
1 parent 5134623 commit 7f12735
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@ Copyright (C) 2007 Ashley G Ramdass (ADempiere WebUI).

<!-- 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 -->
<javascript-module name="idempiere.theme.default" version="202404071000" />
<javascript-module name="idempiere.theme.default" version="202404261000" />

</language>
Original file line number Diff line number Diff line change
Expand Up @@ -511,10 +511,9 @@ protected void reportOptionLayout(HtmlBasedComponent bottomParameterLayout) {
//summary option
chbIsSummary = new Checkbox();
chbIsSummary.setSclass("option-input-parameter");
chbIsSummary.setLabel(Msg.translate(Env.getCtx(), "Summary"));
Label lPrintFormat = new Label(Msg.translate(Env.getCtx(), "AD_PrintFormat_ID"));
lPrintFormat.setSclass("option-input-parameter print-format-label");
Label lIsSummary = new Label(Msg.translate(Env.getCtx(), "Summary"));
lIsSummary.setSclass("option-input-parameter");

//print formats
MClient client = MClient.get(m_ctx);
Expand All @@ -531,7 +530,6 @@ protected void reportOptionLayout(HtmlBasedComponent bottomParameterLayout) {
}
fPrintFormat.getComponent().setSclass("option-input-parameter print-format-list");
fPrintFormat.getComponent().setPlaceholder(lPrintFormat.getValue());
reportOptionLayout.appendChild(lIsSummary);
reportOptionLayout.appendChild(chbIsSummary);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,14 @@ when detect side effect, fix to only apply for parameter window*/
}

.report-option-container {
overflow-x: auto;
display: flex;
flex-wrap: wrap;
flex-direction: row;
align-items: center;
}

.report-option-container div {
padding: 2px;
}

/* Chromium based browsers + Safari */
Expand Down

0 comments on commit 7f12735

Please sign in to comment.