details: /erp/devel/pi/rev/68625a8b0a61
changeset: 9407:68625a8b0a61
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Mon Dec 27 13:09:35 2010 +0100
summary: [grid][style] Added 'avg' summary row style
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
| 2 +
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridSummary_bg_avg.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.css
| 13 ++++++++-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.js
| 3 +-
4 files changed, 15 insertions(+), 3 deletions(-)
diffs (62 lines):
diff -r 428ba66e7fc5 -r 68625a8b0a61
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
Mon Dec 27 12:51:58 2010 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
Mon Dec 27 13:09:35 2010 +0100
@@ -55,6 +55,8 @@
var field = this.getField(colNum);
if (field.summaryFunction === "sum" && this.summaryRowStyle_sum) {
return this.summaryRowStyle_sum;
+ } else if (field.summaryFunction === "avg" && this.summaryRowStyle_avg) {
+ return this.summaryRowStyle_avg
} else if (this.summaryRowStyle_other) {
return this.summaryRowStyle_other;
} else {
diff -r 428ba66e7fc5 -r 68625a8b0a61
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridSummary_bg_avg.png
Binary file
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridSummary_bg_avg.png
has changed
diff -r 428ba66e7fc5 -r 68625a8b0a61
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.css
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.css
Mon Dec 27 12:51:58 2010 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.css
Mon Dec 27 13:09:35 2010 +0100
@@ -144,13 +144,15 @@
.OBGridSummaryCell div,
.OBGridSummaryCell_other div,
-.OBGridSummaryCell_sum div {
+.OBGridSummaryCell_sum div,
+.OBGridSummaryCell_avg div {
width: auto !important;
}
.OBGridSummaryCell,
.OBGridSummaryCell_other,
-.OBGridSummaryCell_sum {
+.OBGridSummaryCell_sum,
+.OBGridSummaryCell_avg {
font-family: arial, sans-serif;
vertical-align: middle;
border-right: 1px solid #cdd7bb;
@@ -173,6 +175,13 @@
background-repeat: no-repeat;
}
+.OBGridSummaryCell_avg {
+ padding: 0px 4px 0px 14px;
+ background-image: url(./images/grid/gridSummary_bg_avg.png);
+ background-position: 4px center;
+ background-repeat: no-repeat;
+}
+
.OBGridLinkField,
.OBGridLinkFieldOver,
diff -r 428ba66e7fc5 -r 68625a8b0a61
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.js
Mon Dec 27 12:51:58 2010 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.js
Mon Dec 27 13:09:35 2010 +0100
@@ -42,7 +42,8 @@
summaryRowHeight: 22,
summaryRowStyle: "OBGridSummaryCell",
summaryRowStyle_other: "OBGridSummaryCell_other",
- summaryRowStyle_sum: "OBGridSummaryCell_sum"
+ summaryRowStyle_sum: "OBGridSummaryCell_sum",
+ summaryRowStyle_avg: "OBGridSummaryCell_avg"
});
isc.OBGrid.changeDefaults('filterEditorDefaults', {
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
