dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15667
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-06-13 15:55:17 +0800
message:
  Add uid property in the last property in the details area for objects in Data set module.
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategory.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategoryOption.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroupSet.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataSet.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonSection.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/section.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.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-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategory.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategory.vm	2014-06-12 16:38:27 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategory.vm	2014-06-13 07:55:17 +0000
@@ -1,7 +1,7 @@
 { "dataElementCategory":
   {
-    "id":  "${dataElementCategory.id}",
-    "uid":  "${dataElementCategory.uid}",
+    "id":  "${dataElementCategory.id}" ,
+    "uid":  "${dataElementCategory.uid}" ,
     "name": "$!encoder.jsonEncode( ${dataElementCategory.name} )",
 	"categoryOptionCount": "${dataElementCategory.categoryOptions.size()}"
   }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategoryOption.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategoryOption.vm	2014-06-12 16:38:27 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategoryOption.vm	2014-06-13 07:55:17 +0000
@@ -1,7 +1,7 @@
 { "dataElementCategoryOption":
   {
-    "id":  "${dataElementCategoryOption.id}",
-    "uid":  "${dataElementCategoryOption.uid}",
+    "id":  "${dataElementCategoryOption.id}" ,
+    "uid":  "${dataElementCategoryOption.uid}" ,
     "name": "$!encoder.jsonEncode( ${dataElementCategoryOption.name} )",
     "startDate": "$!format.formatDate( ${dataElementCategoryOption.startDate} )",
     "endDate": "$!format.formatDate( ${dataElementCategoryOption.endDate} )",

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroupSet.vm	2014-06-12 16:38:27 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroupSet.vm	2014-06-13 07:55:17 +0000
@@ -1,7 +1,7 @@
 { "dataElementGroupSet":
   {
-    "id": "${dataElementGroupSet.id}",
-    "uid": "${dataElementGroupSet.uid}",
+    "id": "${dataElementGroupSet.id}" ,
+    "uid": "${dataElementGroupSet.uid}" ,
     "name": "$!encoder.jsonEncode( ${dataElementGroupSet.displayName} )",
 	"memberCount": "$dataElementGroupSet.members.size()"
   }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataSet.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataSet.vm	2012-03-06 03:17:52 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataSet.vm	2014-06-13 07:55:17 +0000
@@ -1,6 +1,7 @@
 { "dataSet": 
   {
     "id": $!{dataSet.id},
+    "uid": "$!{dataSet.uid}",
     "name": "$!encoder.jsonEncode( ${dataSet.displayName} )",
     "shortName": "$!encoder.jsonEncode( ${dataSet.displayShortName} )",
     "description": "$!encoder.jsonEncode( ${dataSet.description} )",

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonSection.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonSection.vm	2012-01-22 11:28:12 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonSection.vm	2014-06-13 07:55:17 +0000
@@ -1,6 +1,7 @@
 { "section":
   {
     "id": "$!{section.id}",
+    "uid": "$!{section.uid}",
     "name": "$!encoder.jsonEncode( ${section.displayName} )",
     "dataSet": "$!encoder.jsonEncode( ${section.dataSet.name} )",
     "categoryCombo": "$!encoder.jsonEncode( ${categoryCombo.name} )",

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties	2014-06-12 16:08:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties	2014-06-13 07:55:17 +0000
@@ -235,4 +235,4 @@
 confirm_delete_category_option_group_set = Are you sure you want to delete this category option group set?
 show_more_options=Show more options
 show_less_options=Show less options
-id = ID
\ No newline at end of file
+id=Id
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm	2014-03-02 06:45:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm	2014-06-13 07:55:17 +0000
@@ -75,6 +75,7 @@
 				<p><label>$i18n.getString( "frequency" ):</label><br/><span id="frequencyField"></span></p>
 				<p><label>$i18n.getString( "number_of_data_elements" ):</label><br/><span id="dataElementCountField"></span></p>
 				<p><label>$i18n.getString( "dataentryform" ):</label><br/><span id="dataEntryFormField"></span></p>
+				<p><label>$i18n.getString( "id" ):</label><br/><span id="idField"></span></p>
 			</div>
 			
       <div id="warningArea">

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js	2013-12-04 11:47:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js	2014-06-13 07:55:17 +0000
@@ -14,6 +14,7 @@
     setInnerHTML('frequencyField', json.dataSet.frequency);
     setInnerHTML('dataElementCountField', json.dataSet.dataElementCount);
     setInnerHTML('dataEntryFormField', json.dataSet.dataentryform);
+    setInnerHTML('idField', json.dataSet.uid);
 
     showDetails();
   });

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/section.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/section.js	2014-03-24 22:47:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/section.js	2014-06-13 07:55:17 +0000
@@ -17,6 +17,7 @@
 		setInnerHTML( 'dataSetField', json.section.dataSet );
 		setInnerHTML( 'categoryComboField', json.section.categoryCombo );
 		setInnerHTML( 'dataElementCountField', json.section.dataElementCount );  
+		setInnerHTML( 'idField', json.section.uid ); 
 		
 		showDetails();
 	} );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm	2013-12-04 11:47:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm	2014-06-13 07:55:17 +0000
@@ -84,6 +84,7 @@
 				<p><label>$i18n.getString( "dataset" ):</label><br/><span id="dataSetField"></span></p>
 				<p><label>$i18n.getString( "category_combo" ):</label><br/><span id="categoryComboField"></span></p>				
 				<p><label>$i18n.getString( "number_of_data_elements" ):</label><br/><span id="dataElementCountField"></span></p>
+				<p><label>$i18n.getString( "id" ):</label><br/><span id="idField"></span></p>
 			</div>
 
 		</td>