dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #22073
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10586: (GIS) 'Show facility info' updated.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 10586 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-04-16 16:58:46 +0200
message:
(GIS) 'Show facility info' updated.
modified:
dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminFacilityInfo.vm
--
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-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties 2013-04-16 10:02:32 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties 2013-04-16 14:57:39 +0000
@@ -258,7 +258,7 @@
select_point_level=Select point level
level_is_higher_that_boundary_level=Level is higher than boundary level
select_new_location_on_map=Please select the new location on the map..
-show_information_sheet=Show information sheet
+show_information_sheet=Show information
relocate=Relocate
administrator_settings=Administrator settings
thematic_layer=Thematic layer
@@ -360,4 +360,5 @@
facility_layer_export_currently_not_supported=Facility layer export currently not supported
link_=Link
level_not_higher_than_parent_level=Organisation unit level cannot not be higher than parent level
-information=Information
\ No newline at end of file
+information=Information
+parent_unit=Parent unit
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.js 2013-04-16 14:28:29 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.js 2013-04-16 14:52:11 +0000
@@ -474,82 +474,39 @@
cls: 'gis-container-inner',
columnWidth: 0.4,
bodyStyle: 'padding-right:4px',
- items: [
- {
- html: GIS.i18n.name,
- cls: 'gis-panel-html-title'
- },
- {
- html: feature.attributes.name,
- cls: 'gis-panel-html'
- },
- {
- cls: 'gis-panel-html-separator'
- },
- {
- html: GIS.i18n.type,
- cls: 'gis-panel-html-title'
- },
- {
- html: ou.ty,
- cls: 'gis-panel-html'
- },
- {
- cls: 'gis-panel-html-separator'
- },
- {
- html: GIS.i18n.code,
- cls: 'gis-panel-html-title'
- },
- {
- html: ou.co,
- cls: 'gis-panel-html'
- },
- {
- cls: 'gis-panel-html-separator'
- },
- {
- html: GIS.i18n.address,
- cls: 'gis-panel-html-title'
- },
- {
- html: ou.ad,
- cls: 'gis-panel-html'
- },
- {
- cls: 'gis-panel-html-separator'
- },
- {
- html: GIS.i18n.contact_person,
- cls: 'gis-panel-html-title'
- },
- {
- html: ou.cp,
- cls: 'gis-panel-html'
- },
- {
- cls: 'gis-panel-html-separator'
- },
- {
- html: GIS.i18n.email,
- cls: 'gis-panel-html-title'
- },
- {
- html: ou.em,
- cls: 'gis-panel-html'
- },
- {
- cls: 'gis-panel-html-separator'
- },
- {
- html: GIS.i18n.phone_number,
- cls: 'gis-panel-html-title'
- },
- {
- html: ou.pn,
- cls: 'gis-panel-html'
- }
- ]
+ items: function() {
+ var a = [];
+
+ if (feature.attributes.name) {
+ a.push({html: GIS.i18n.name, cls: 'gis-panel-html-title'}, {html: feature.attributes.name, cls: 'gis-panel-html'}, {cls: 'gis-panel-html-separator'});
+ }
+
+ if (ou.pa) {
+ a.push({html: GIS.i18n.parent_unit, cls: 'gis-panel-html-title'}, {html: ou.pa, cls: 'gis-panel-html'}, {cls: 'gis-panel-html-separator'});
+ }
+
+ if (ou.ty) {
+ a.push({html: GIS.i18n.type, cls: 'gis-panel-html-title'}, {html: ou.ty, cls: 'gis-panel-html'}, {cls: 'gis-panel-html-separator'});
+ }
+
+ if (ou.co) {
+ a.push({html: GIS.i18n.code, cls: 'gis-panel-html-title'}, {html: ou.co, cls: 'gis-panel-html'}, {cls: 'gis-panel-html-separator'});
+ }
+
+ if (ou.ad) {
+ a.push({html: GIS.i18n.address, cls: 'gis-panel-html-title'}, {html: ou.ad, cls: 'gis-panel-html'}, {cls: 'gis-panel-html-separator'});
+ }
+
+ if (ou.em) {
+ a.push({html: GIS.i18n.email, cls: 'gis-panel-html-title'}, {html: ou.em, cls: 'gis-panel-html'}, {cls: 'gis-panel-html-separator'});
+ }
+
+ if (ou.pn) {
+ a.push({html: GIS.i18n.phone_number, cls: 'gis-panel-html-title'}, {html: ou.pn, cls: 'gis-panel-html'}, {cls: 'gis-panel-html-separator'});
+ }
+
+ return a;
+ }()
},
{
xtype: 'form',
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm 2013-04-16 10:02:32 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm 2013-04-16 14:52:11 +0000
@@ -384,5 +384,6 @@
facility_layer_export_currently_not_supported: '$encoder.jsEscape($i18n.getString( 'facility_layer_export_currently_not_supported' ) , "'")',
link_: '$encoder.jsEscape($i18n.getString( 'link_' ) , "'")',
level_not_higher_than_parent_level: '$encoder.jsEscape($i18n.getString( 'level_not_higher_than_parent_level' ) , "'")',
- information: '$encoder.jsEscape($i18n.getString( 'information' ) , "'")'
+ information: '$encoder.jsEscape($i18n.getString( 'information' ) , "'")',
+ parent_unit: '$encoder.jsEscape($i18n.getString( 'parent_unit' ) , "'")'
};
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminFacilityInfo.vm'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminFacilityInfo.vm 2011-12-02 13:24:16 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminFacilityInfo.vm 2013-04-16 14:52:11 +0000
@@ -1,1 +1,9 @@
-{"ty":"$!encoder.jsonEncode(${object.type})","co":"$!encoder.jsonEncode(${object.code})","cp":"$!encoder.jsonEncode(${object.contactPerson})","ad":"$!encoder.jsonEncode(${object.address})","em":"$!encoder.jsonEncode(${object.email})","pn":"$!encoder.jsonEncode(${object.phoneNumber})"}
\ No newline at end of file
+{
+ "ty":"$!encoder.jsonEncode(${object.type})",
+ "co":"$!encoder.jsonEncode(${object.code})",
+ "cp":"$!encoder.jsonEncode(${object.contactPerson})",
+ "ad":"$!encoder.jsonEncode(${object.address})",
+ "em":"$!encoder.jsonEncode(${object.email})",
+ "pn":"$!encoder.jsonEncode(${object.phoneNumber})",
+ "pa":"$!encoder.jsonEncode(${object.parent.name})"
+}
\ No newline at end of file
