------------------------------------------------------------
revno: 355
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: trunk
timestamp: Wed 2009-06-03 13:54:07 +0200
message:
Unique value enforced from getMapOrganisationUnitRelation.
removed:
gis/dhis-web-mapping/src/main/webapp/mapping/geostat/geojson/pageload
added:
gis/dhis-web-mapping/src/main/webapp/mapping/geostat/geojson/init
modified:
dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapOrganisationUnitRelation.hbm.xml
gis/dhis-web-mapping/src/main/webapp/mapping/geostat/geostat.js
=== modified file
'dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapOrganisationUnitRelation.hbm.xml'
---
dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapOrganisationUnitRelation.hbm.xml
2009-04-23 11:51:19 +0000
+++
dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapOrganisationUnitRelation.hbm.xml
2009-06-03 11:54:07 +0000
@@ -11,10 +11,10 @@
<generator class="native"/>
</id>
- <many-to-one name="map" class="org.hisp.dhis.mapping.Map"
+ <many-to-one name="map" class="org.hisp.dhis.mapping.Map"
unique-key="key_maporganisationunitrelation"
column="mapid" not-null="true"
foreign-key="fk_maporganisationunitrelation_mapid"/>
- <many-to-one name="organisationUnit"
class="org.hisp.dhis.organisationunit.OrganisationUnit"
+ <many-to-one name="organisationUnit"
class="org.hisp.dhis.organisationunit.OrganisationUnit"
unique-key="key_maporganisationunitrelation"
column="organisationunitid" not-null="true"
foreign-key="fk_map_organisationunitid"/>
<property name="featureId" column="featureid"/>
=== added file
'gis/dhis-web-mapping/src/main/webapp/mapping/geostat/geojson/init'
--- gis/dhis-web-mapping/src/main/webapp/mapping/geostat/geojson/init
1970-01-01 00:00:00 +0000
+++ gis/dhis-web-mapping/src/main/webapp/mapping/geostat/geojson/init
2009-06-03 11:54:07 +0000
@@ -0,0 +1,1 @@
+{"type":"FeatureCollection","features":[]}
\ No newline at end of file
=== removed file
'gis/dhis-web-mapping/src/main/webapp/mapping/geostat/geojson/pageload'
--- gis/dhis-web-mapping/src/main/webapp/mapping/geostat/geojson/pageload
2009-05-29 15:39:03 +0000
+++ gis/dhis-web-mapping/src/main/webapp/mapping/geostat/geojson/pageload
1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-{
- "type":"FeatureCollection",
- "features":
- [
- {
- "type":"Feature",
- "id":"zn_roads.459",
- "geometry":{
- "type":"MultiLineString",
-
"coordinates":[[[39.739494,-4.94044],[39.738823,-4.935949],[39.727032,-4.91666],[39.724014,-4.907471]]]
- },
- "geometry_name":"the_geom",
- "properties":{"TRACK_ID":0,"ID":" ","RDLNTYPE":2}
- }
- ],
- "crs":{"type":"EPSG","properties":{"code":"4326"}},
- "bbox":[38.960568,-7.753602,39.785995,-4.907471]
-}
\ No newline at end of file
=== modified file
'gis/dhis-web-mapping/src/main/webapp/mapping/geostat/geostat.js'
--- gis/dhis-web-mapping/src/main/webapp/mapping/geostat/geostat.js
2009-06-02 17:10:54 +0000
+++ gis/dhis-web-mapping/src/main/webapp/mapping/geostat/geostat.js
2009-06-03 11:54:07 +0000
@@ -657,7 +657,7 @@
// { html: '<p style="padding-bottom:4px">Organisation unit:</p>'
}, multi, { html: '<br>' },
{ html: '<p style="padding-bottom:4px">Organisation unit
level:</p>' }, organisationUnitLevelComboBox, { html: '<br>' },
{ html: '<p style="padding-bottom:4px">Map name:</p>' },
newNameTextField, { html: '<br>' },
- { html: '<p style="padding-bottom:4px">Geoserver map layer
path:</p>' }, mapLayerPathTextField, { html: '<br>' },
+ { html: '<p style="padding-bottom:4px">Map file name:</p>' },
mapLayerPathTextField, { html: '<br>' },
{ html: '<p style="padding-bottom:4px">Unique column:</p>' },
newUniqueColumnTextField, { html: '<br>' },
{ html: '<p style="padding-bottom:4px">Name column:</p>' },
newNameColumnTextField, { html: '<br>' },
{ html: '<p style="padding-bottom:4px">Longitude:</p>' },
newLongitudeTextField, { html: '<br>' },
@@ -1377,7 +1377,7 @@
title: 'Thematic map',
nameAttribute: "NAME",
indicators: [['value', 'Indicator']],
- url: 'geojson/pageload',
+ url: 'geojson/init',
featureSelection: false,
loadMask: {msg: 'Loading shapefile...', msgCls: 'x-mask-loading'},
legendDiv: 'choroplethLegend',
@@ -1402,7 +1402,7 @@
title: 'Assign organisation units',
nameAttribute: 'NAME',
indicators: [['value', 'Indicator']],
- url: 'geojson/pageload',
+ url: 'geojson/init',
featureSelection: false,
loadMask: {msg: 'Loading shapefile...', msgCls: 'x-mask-loading'},
legendDiv: 'choroplethLegend',
--
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.
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
