dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17068
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-10-13 12:23:17 +0200
message:
  Added dxf tools file
added:
  resources/xml/
  resources/xml/dxf-meta-tools.xml
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/GeoFeatureController.java
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js
  resources/sql/div.sql


--
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-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/GeoFeatureController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/GeoFeatureController.java	2014-10-08 21:49:29 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/GeoFeatureController.java	2014-10-13 10:23:17 +0000
@@ -72,15 +72,12 @@
 {
     public static final String RESOURCE_PATH = "/geoFeatures";
 
-    private static final Map<String, Integer> FEATURE_TYPE_MAP = new HashMap<String, Integer>()
-    {
-        {
-            put( OrganisationUnit.FEATURETYPE_POINT, GeoFeature.TYPE_POINT );
-            put( OrganisationUnit.FEATURETYPE_MULTIPOLYGON, GeoFeature.TYPE_POLYGON );
-            put( OrganisationUnit.FEATURETYPE_POLYGON, GeoFeature.TYPE_POLYGON );
-            put( null, 0 );
-        }
-    };
+    private static final Map<String, Integer> FEATURE_TYPE_MAP = new HashMap<String, Integer>() { {
+        put( OrganisationUnit.FEATURETYPE_POINT, GeoFeature.TYPE_POINT );
+        put( OrganisationUnit.FEATURETYPE_MULTIPOLYGON, GeoFeature.TYPE_POLYGON );
+        put( OrganisationUnit.FEATURETYPE_POLYGON, GeoFeature.TYPE_POLYGON );
+        put( null, 0 );
+    } };
 
     @Autowired
     private AnalyticsService analyticsService;
@@ -121,7 +118,7 @@
         {
             GeoFeature feature = new GeoFeature();
             feature.setId( unit.getUid() );
-            feature.setNa( unit.getDisplayName() );
+            feature.setNa( unit.getDisplayName() ); //TODO short name
             feature.setHcd( unit.hasChildrenWithCoordinates() );
             feature.setHcu( unit.hasCoordinatesUp() );
             feature.setLe( unit.getLevel() );

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2014-10-11 19:29:38 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2014-10-13 10:23:17 +0000
@@ -1288,6 +1288,8 @@
 
 /**
  * Tests to see if a category option is valid during a period.
+ * 
+ * TODO proper date comparison
  */
 dhis2.de.optionValidWithinPeriod = function( option, period )
 {

=== modified file 'resources/sql/div.sql'
--- resources/sql/div.sql	2014-10-06 22:28:17 +0000
+++ resources/sql/div.sql	2014-10-13 10:23:17 +0000
@@ -206,10 +206,14 @@
 on (cc.categoryoptioncomboid=co.categoryoptioncomboid)
 where categorycomboid=12414 );
 
--- (Write) Reset password to "district" for account with given username
+-- (Write) MD5 set password to "district" for admin user
 
 update users set password='48e8f1207baef1ef7fe478a57d19f2e5' where username='admin';
 
+-- (Write) Bcrypt set password to "district" for admin user
+
+update users set password='$2a$10$wjLPViry3bkYEcjwGRqnYO1bT2Kl.ZY0kO.fwFDfMX53hitfx5.3C' where username='admin';
+
 -- (Write) Generate random coordinates based on org unit location for events
 
 update programstageinstance psi

=== added directory 'resources/xml'
=== added file 'resources/xml/dxf-meta-tools.xml'
--- resources/xml/dxf-meta-tools.xml	1970-01-01 00:00:00 +0000
+++ resources/xml/dxf-meta-tools.xml	2014-10-13 10:23:17 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metaData xmlns="http://dhis2.org/schema/dxf/2.0"; created="2014-10-13T10:15:00.082+0000">
+  <sqlViews>
+    <sqlView name="Code list category option combos" created="2014-10-12T08:44:27.792+0000" lastUpdated="2014-10-13T10:14:08.790+0000" id="YOaOY605rzh">
+      <description>Code list category option combos</description>
+      <sqlQuery>SELECT ccn.categoryoptioncomboname as name, coc.code as code, coc.uid as id from _categoryoptioncomboname ccn inner join categoryoptioncombo coc on ccn.categoryoptioncomboid=coc.categoryoptioncomboid order by ccn.categoryoptioncomboname;</sqlQuery>
+    </sqlView>
+    <sqlView name="Code list data elements" created="2014-10-12T08:39:24.083+0000" lastUpdated="2014-10-13T10:14:22.686+0000" id="GCZ01m3pIRd">
+      <description>Code list data elements</description>
+      <sqlQuery>SELECT name, code, uid as id from dataelement de order by de.name</sqlQuery>
+    </sqlView>
+    <sqlView name="Code list data sets" created="2014-10-12T08:42:36.066+0000" lastUpdated="2014-10-13T10:14:32.519+0000" id="cOfhJIFGqhP">
+      <description>Code list data sets</description>
+      <sqlQuery>SELECT name, code, uid as id from dataset ds order by ds.name;</sqlQuery>
+    </sqlView>
+    <sqlView name="Code list organisation units" created="2014-10-12T08:42:05.694+0000" lastUpdated="2014-10-13T10:14:38.436+0000" id="w3UxFykyHFy">
+      <description>Code list organisation units</description>
+      <sqlQuery>select ou.name as orgunit_name, parent.name as orgunit_parent, ous.level as orgunit_level, ou.code as orgunit_code, ou.uid as orgunit_id from organisationunit ou inner join organisationunit parent on ou.parentid=parent.organisationunitid inner join _orgunitstructure ous on ou.organisationunitid=ous.organisationunitid order by ous.level, ou.name;</sqlQuery>
+    </sqlView>
+  </sqlViews>
+</metaData>