dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15673
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-06-13 17:11:39 +0800
message:
  Add uid property in the last property in the details area for objects in dhis-web-reporting module.
modified:
  dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/report.js
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/jsonReport.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.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-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties	2014-06-06 19:29:39 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties	2014-06-13 09:11:39 +0000
@@ -271,4 +271,5 @@
 confirm_unaccept=Are you sure you want to unaccept this data set approval?
 approval_entity=Approval entity
 approval_status=Approval status
-please_make_selection=Please make a selection below
\ No newline at end of file
+please_make_selection=Please make a selection below
+id=Id
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/report.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/report.js	2013-12-06 13:03:52 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/report.js	2014-06-13 09:11:39 +0000
@@ -51,6 +51,7 @@
 function showReportDetails( context ) {
   jQuery.get('getReport.action', { "id": context.id }, function( json ) {
     setInnerHTML('nameField', json.report.name);
+	setInnerHTML('idField', json.report.uid);
 
     var reportTableName = json.report.reportTableName;
     setInnerHTML('reportTableNameField', reportTableName ? reportTableName : '[' + i18n_none + ']');

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/jsonReport.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/jsonReport.vm	2012-07-19 07:37:36 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/jsonReport.vm	2014-06-13 09:11:39 +0000
@@ -1,6 +1,7 @@
 { "report": 
   {
     "id": $!{report.id},
+    "uid": "$!{report.uid}",
     "name": "$!encoder.jsonEncode( ${report.displayName} )",
     "reportTableName": "$!encoder.jsonEncode( ${report.reportTable.displayName} )",
     "orgGroupSets": "$!{report.usingOrgUnitGroupSets}"

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm	2013-12-06 13:03:52 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm	2014-06-13 09:11:39 +0000
@@ -44,7 +44,6 @@
 			</table>
       <table class="listTable" id="listTable">
         <col>
-        <col width="150px">
         <thead>
           <tr>
             <th>$i18n.getString( "name" )</th>
@@ -72,10 +71,11 @@
           <div id="hideDetailsArea">
            <a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
   				</div>
-          <p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
-          <p><label>$i18n.getString( "report_table" ):</label><br/><span id="reportTableNameField"></span></p>
-          <p><label>$i18n.getString( "include_organisation_unit_group_sets" ):</label><br/><span id="orgGroupSetsField"></span></p>
-  			</div>
+					<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
+					<p><label>$i18n.getString( "report_table" ):</label><br/><span id="reportTableNameField"></span></p>
+					<p><label>$i18n.getString( "include_organisation_unit_group_sets" ):</label><br/><span id="orgGroupSetsField"></span></p>
+					<p><label>$i18n.getString( "id" ):</label><br/><span id="idField"></span></p>
+				</div>
 			<div id="warningArea">
 				<div id="hideDetailsArea">
 					<a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/hide.png" alt=$i18n.getString( "hide_warning" )'></a>