dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 13125 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-12-03 12:16:11 +0100
message:
  (PT) Sorting fix for detailed data elements + (DV) Minor integration fix.
modified:
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js	2013-12-02 16:23:55 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js	2013-12-03 11:12:47 +0000
@@ -1874,7 +1874,7 @@
 				};
 
 				doSortableColumnHeaders = function() {
-					return (xRowAxis && xRowAxis.dims === 1);// && !doSubTotals(
+					return (xRowAxis && xRowAxis.dims === 1);
 				};
 
 				getColAxisHtmlArray = function() {
@@ -1912,9 +1912,9 @@
 							obj.hidden = !(obj.rowSpan || obj.colSpan);
 							obj.htmlValue = service.layout.getItemName(xLayout, xResponse, obj.id, true);
 
-							// sortable column headers. only if last dim and no subtotals.
+							// sortable column headers. last dim only.
 							if (i === xColAxis.dims - 1 && doSortableColumnHeaders()) {
-								condoId = xColAxis.ids[j];
+								condoId = xColAxis.ids[j].split('-').join('');
 							}
 
 							dimHtml.push(getTdHtml(obj, condoId));

=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css	2013-12-02 16:40:37 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css	2013-12-03 11:12:47 +0000
@@ -153,6 +153,12 @@
 	background-position: right center;
 	padding-right: 15px !important;
 }
+.td-sortable-asc {
+	background-image: url('../images/arrowup.png');
+}
+.td-sortable-desc {
+	background-image: url('../images/arrowdown.png');
+}
 
 .text-weak {
 	color: #303038;
@@ -209,7 +215,7 @@
 	text-align: right;
 }
 .pivot-value.highlighted {
-	background-color: #f5f5f5;
+	background-color: #f3f3f3;
 }
 
 .pivot-value-subtotal {

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2013-11-29 11:52:49 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2013-12-03 09:32:56 +0000
@@ -4529,7 +4529,7 @@
 									},
 									'-',
 									{
-										text: 'Open this table as pivot table' + '&nbsp;&nbsp;', //i18n
+										text: 'Open this chart as pivot table' + '&nbsp;&nbsp;', //i18n
 										cls: 'ns-menu-item-noicon',
 										disabled: !(NS.isSessionStorage && ns.app.layout),
 										handler: function() {
@@ -4542,7 +4542,7 @@
 									{
 										text: 'Open last pivot table' + '&nbsp;&nbsp;', //i18n
 										cls: 'ns-menu-item-noicon',
-										disabled: !(NS.isSessionStorage && JSON.parse(sessionStorage.getItem('dhis2')) && JSON.parse(sessionStorage.getItem('dhis2'))['chart']),
+										disabled: !(NS.isSessionStorage && JSON.parse(sessionStorage.getItem('dhis2')) && JSON.parse(sessionStorage.getItem('dhis2'))['table']),
 										handler: function() {
 											window.location.href = ns.core.init.contextPath + '/dhis-web-pivot/app/index.html?s=chart';
 										}