dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #33093
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16851: DV EV initial explanation.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 16851 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-09-29 17:13:25 +0200
message:
DV EV initial explanation.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/en.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/en.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/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-apps/src/main/webapp/dhis-web-event-visualizer/i18n/en.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/en.properties 2014-09-16 00:11:41 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/en.properties 2014-09-29 15:12:43 +0000
@@ -98,14 +98,6 @@
data_element_group_sets_cannot_be_specified_together_with_data_sets=Data element group sets cannot be specified together with data sets
at_least_one_dimension_must_be_specified_as_row_or_column=At least one dimension must be specified as row or column
at_least_one_period_must_be_specified_as_column_row_or_filter=At least one period must be specified as column row or filter
-example1=Creating an event report
-example2=Select items from any of the dimensions in the left menu
-example3=Click Layout to arrange your dimensions on table rows and columns
-example4=Click Update to create your table
-example5=Working with an event report
-example6=Click Options to hide sub-totals or empty rows adjust font size and more
-example7=Click Favorites to save your table for later use
-example8=Click Download to save table data to your computer
layout=Layout
options=Options
download=Download
@@ -193,3 +185,11 @@
chart_options=Chart options
select_sub_units=Select sub-units
you_do_not_have_access_to_all_items_in_this_favorite=You do not have access to all items in this favorite
+example1=Creating a chart
+example2=Select items from any of the dimensions in the left menu
+example3=Click Layout to arrange your dimensions on table rows and columns
+example4=Click Update to create your table
+example5=Working with a chart
+example6=Click Options to show trend lines, target lines, axis titles and more
+example7=Click Favorites to save your chart for later use
+example8=Click Download to save chart graphics to your computer
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-09-26 16:14:03 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-09-29 15:12:43 +0000
@@ -5859,6 +5859,7 @@
// timing
ns.app.dateRender = new Date();
+ ns.app.centerRegion.update();
ns.app.centerRegion.removeAll(true);
ns.app.centerRegion.add(chart);
@@ -6596,7 +6597,24 @@
if (ns.app.xLayout && ns.app.chart) {
ns.app.chart.onViewportResize();
}
- }
+ },
+ afterrender: function(p) {
+ var liStyle = 'padding:3px 10px; color:#333',
+ html = '';
+
+ html += '<div style="padding:20px">';
+ html += '<div style="font-size:14px; padding-bottom:8px">' + NS.i18n.example1 + '</div>';
+ html += '<div style="' + liStyle + '">- ' + NS.i18n.example2 + '</div>';
+ html += '<div style="' + liStyle + '">- ' + NS.i18n.example3 + '</div>';
+ html += '<div style="' + liStyle + '">- ' + NS.i18n.example4 + '</div>';
+ html += '<div style="font-size:14px; padding-top:20px; padding-bottom:8px">' + NS.i18n.example5 + '</div>';
+ html += '<div style="' + liStyle + '">- ' + NS.i18n.example6 + '</div>';
+ html += '<div style="' + liStyle + '">- ' + NS.i18n.example7 + '</div>';
+ html += '<div style="' + liStyle + '">- ' + NS.i18n.example8 + '</div>';
+ html += '</div>';
+
+ p.update(html);
+ }
}
});
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/en.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/en.properties 2014-09-29 12:53:05 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/en.properties 2014-09-29 15:12:43 +0000
@@ -231,3 +231,11 @@
select_sub_units=Select sub-units
you_do_not_have_access_to_all_items_in_this_favorite=You do not have access to all items in this favorite
meter_chart=Meter chart
+example1=Creating a chart
+example2=Select items from any of the dimensions in the left menu
+example3=Click Layout to arrange your dimensions on table rows and columns
+example4=Click Update to create your table
+example5=Working with a chart
+example6=Click Options to show trend lines, target lines, axis titles and more
+example7=Click Favorites to save your chart for later use
+example8=Click Download to save chart graphics to your computer
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2014-09-29 12:53:05 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2014-09-29 15:12:43 +0000
@@ -2291,6 +2291,7 @@
ns.app.chart = ns.core.web.chart.createChart(ns);
// update viewport
+ ns.app.centerRegion.update();
ns.app.centerRegion.removeAll();
ns.app.centerRegion.add(ns.app.chart);
@@ -5731,7 +5732,24 @@
if (ns.app.xLayout && ns.app.chart) {
ns.app.chart.onViewportResize();
}
- }
+ },
+ afterrender: function(p) {
+ var liStyle = 'padding:3px 10px; color:#333',
+ html = '';
+
+ html += '<div style="padding:20px">';
+ html += '<div style="font-size:14px; padding-bottom:8px">' + NS.i18n.example1 + '</div>';
+ html += '<div style="' + liStyle + '">- ' + NS.i18n.example2 + '</div>';
+ html += '<div style="' + liStyle + '">- ' + NS.i18n.example3 + '</div>';
+ html += '<div style="' + liStyle + '">- ' + NS.i18n.example4 + '</div>';
+ html += '<div style="font-size:14px; padding-top:20px; padding-bottom:8px">' + NS.i18n.example5 + '</div>';
+ html += '<div style="' + liStyle + '">- ' + NS.i18n.example6 + '</div>';
+ html += '<div style="' + liStyle + '">- ' + NS.i18n.example7 + '</div>';
+ html += '<div style="' + liStyle + '">- ' + NS.i18n.example8 + '</div>';
+ html += '</div>';
+
+ p.update(html);
+ }
}
});
