dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4512: Improved consistency in rporting module gui

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Sat, 03 Sep 2011 18:25:14 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 4512
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2011-09-03 20:23:12 +0200
message:
  Improved consistency in rporting module gui
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/loader/loader.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/pivot.js
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewOrgUnitDistribution.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.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/css/widgets.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2011-08-18 16:40:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2011-09-03 18:23:12 +0000
@@ -453,3 +453,23 @@
 {
 	padding-bottom:5px;
 }
+
+/*----------------------------------------------------------------------------*/
+/* Criteria                                                                   */
+/*----------------------------------------------------------------------------*/
+
+div.inputCriteria
+{
+  position: relative;
+  left: 2px;
+  width: 400px; /* Override this */
+  height: 400px; /* Override this */
+  border: 1px solid #a4d2a3;
+  background-color: #d5efd5;
+  padding-top: 5px;
+  padding-bottom: 5px;
+  padding-left: 20px;
+  margin-bottom: 15px;
+  border-radius: 3px;
+  -moz-border-radius: 3px; /* Firefox */
+}

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/loader/loader.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/loader/loader.vm	2010-11-18 13:53:54 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/loader/loader.vm	2011-09-03 18:23:12 +0000
@@ -10,6 +10,7 @@
   height: 230px;
   text-align: center;
   display: none;
+  border-radius: 3px;
 }
 
 </style>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm	2011-08-19 12:08:26 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm	2011-09-03 18:23:12 +0000
@@ -17,22 +17,6 @@
   margin-bottom: 15px;
 }
 
-div#criteria
-{
-  position: relative;
-  left: 2px;
-  width: 372px;
-  height: 434px;
-  border: 1px solid #b0b0b0;
-  background-color: #d9ece1;
-  padding-top: 5px;
-  padding-bottom: 5px;
-  padding-left: 20px;
-  margin-bottom: 6px;
-  border-radius: 3px;
-  -moz-border-radius: 3px; /* Firefox */
-}
-
 div.inputSection
 {
   padding-top: 7px;
@@ -42,13 +26,13 @@
 <h3>$i18n.getString( "dataset_report" )</h3>
 
 <div id="control">
-<input type="button" value='$i18n.getString( "data" )' style="width:80px" onclick="showCriteria()" />
+<input type="button" value='$i18n.getString( "data" )' style="width:120px" onclick="showCriteria()" />
 </div>
 
-<div id="criteria">
+<div id="criteria" class="inputCriteria" style="width:372px;height:434px;">
 <div class="inputSection">
 <label>$i18n.getString( "dataset" )</label><br>
-<select id="dataSetId" name="dataSetId" style="width:325px">
+<select id="dataSetId" name="dataSetId" style="width:280px">
   <option value="">[ $i18n.getString( "select" ) ]</option>
   #foreach( $dataSet in $dataSets )
   <option value="$dataSet.id">$encoder.htmlEncode( $dataSet.name )</option>
@@ -58,7 +42,7 @@
 
 <div class="inputSection">
 <label>$i18n.getString( "report_period" )</label><br>
-<select id="periodType" name="periodType" style="min-width:222px" onchange="getPeriods( 'periodType', 'periodId', 'periodId', '0' )">
+<select id="periodType" name="periodType" style="min-width:170px" onchange="getPeriods( 'periodType', 'periodId', 'periodId', '0' )">
   <option value="">[ $i18n.getString( "select_period_type" ) ]</option>
   #foreach ( $type in $periodTypes )
   <option value="$type.name">$i18n.getString( $type.name )</option>
@@ -67,7 +51,7 @@
 <input type="button" style="width:50px" value="$i18n.getString( 'prev' )" onclick="getAvailablePeriods( 'periodType', 'periodId', 'periodId', '-1' )" />
 <input type="button" style="width:50px" value="$i18n.getString( 'next' )" onclick="getAvailablePeriods( 'periodType', 'periodId', 'periodId', '1' )" /><br>
 
-<select id="periodId" name="periodId" style="width:325px" disabled="disabled">
+<select id="periodId" name="periodId" style="width:280px" disabled="disabled">
 </select>
 </div>
 
@@ -78,12 +62,12 @@
 
 <div class="inputSection">
 <label>$i18n.getString( "report_organisation_unit" )</label><br>
-<div id="selectionTree" style="width:350px;height:200px;overflow:auto;border:1px solid #cccccc"></div>
+<div id="selectionTree" style="width:280px;height:200px;overflow:auto;border:1px solid #cccccc"></div>
 </div>
 
 <div class="inputSection">
-<input type="button" value='$i18n.getString( "get_report" )' style="width:115px" onclick="validateDataSetReport()">
-<input type="button" value='$i18n.getString( "cancel" )' style="width:80px" onclick="hideCriteria()">
+<input type="button" value='$i18n.getString( "get_report" )' style="width:120px" onclick="validateDataSetReport()">
+<input type="button" value='$i18n.getString( "cancel" )' style="width:120px" onclick="hideCriteria()">
 </div>
 </div>
 

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/pivot.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/pivot.js	2011-08-19 08:01:56 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/pivot.js	2011-09-03 18:23:12 +0000
@@ -561,6 +561,7 @@
 
 function showCriteria()
 {
+	$( "div#pivot" ).hide();
     $( "div#criteria" ).show( "fast" );
 }
 
@@ -571,6 +572,7 @@
 
 function showPivot()
 {
+	$( "div#criteria" ).hide();
     $( "div#pivot" ).show( "fast" );
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm	2011-07-01 08:11:03 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm	2011-09-03 18:23:12 +0000
@@ -12,15 +12,16 @@
 
 <h3>$i18n.getString( "data_completeness_report" )</h3>
 
+<div id="critiera" class="inputCriteria" style="width:620px;height:310px;">
 <table>
-    <col width="330">
+    <col width="300">
     <col>
     <tr>
-    	<th>$i18n.getString( "select_org_unit" )</th>
-    	<td></td>
+    	<td><label>$i18n.getString( "report_organisation_unit" )</label></td>
+    	</td></td>
     </tr>
     <tr>
-	    <td><div id="selectionTree" style="width:325px; height:270px"></div></td>
+	    <td><div id="selectionTree" style="width:280px; height:270px"></div></td>
         <td valign="bottom">
             <input type="radio" name="criteria" id="registrationRadio" value="registration" checked="checked"/>
             <label for="registrationRadio">$i18n.getString( 'based_on_registration' )</label><br/>
@@ -31,7 +32,7 @@
             
             <!-- DataSet -->
             
-        	<select id="dataSetId" name="dataSetId" style="width:348px">
+        	<select id="dataSetId" name="dataSetId" style="width:280px">
 			<option value="0">[ $i18n.getString( "select_dataset_all" ) ]</option>
 			#foreach( $dataSet in $dataSets )
 				<option value="$dataSet.id">$dataSet.name</option>
@@ -40,34 +41,32 @@
             
             <!-- PeriodType -->
 
-			<select id="periodTypeId" style="min-width:223px" onchange="getPeriods( 'periodTypeId', 'periodId', 'periodId', '0' )">
+			<select id="periodTypeId" style="min-width:170px" onchange="getPeriods( 'periodTypeId', 'periodId', 'periodId', '0' )">
 				<option value="0">[ $i18n.getString( "select_period_type" ) ]</option>
 				#foreach ( $type in $periodTypes )
 					<option value="$type.name">$i18n.getString( $type.name )</option>
 				#end
 			</select>
 
-			<input type="button" style="width:60px" value="$i18n.getString( 'prev' )" onclick="getPeriods( 'periodTypeId', 'periodId', 'periodId', '-1' )" />
-			<input type="button" style="width:60px" value="$i18n.getString( 'next' )" onclick="getPeriods( 'periodTypeId', 'periodId', 'periodId', '1' )" /><br><br>
+			<input type="button" style="width:50px" value="$i18n.getString( 'prev' )" onclick="getPeriods( 'periodTypeId', 'periodId', 'periodId', '-1' )" />
+			<input type="button" style="width:50px" value="$i18n.getString( 'next' )" onclick="getPeriods( 'periodTypeId', 'periodId', 'periodId', '1' )" /><br>
 
 			<!-- Period -->
 			
-            <select id="periodId" name="periodId" style="width:348px" disabled="disabled">
+            <select id="periodId" name="periodId" style="width:280px" disabled="disabled">
             </select><br><br>
             
-            <input type="button" value="$i18n.getString( 'get_report' )" style="width:140px" onclick="displayCompleteness()"/><br><br>
+            <input type="button" value="$i18n.getString( 'get_report' )" style="width:135px" onclick="displayCompleteness()"/><br><br>
             
             <!-- Export -->
             
-        	<input type="button" value="$i18n.getString( 'get_report_as_pdf' )" style="width:140px" onclick="getCompleteness( 'pdf' )"/>
-            <input type="button" value="$i18n.getString( 'get_report_as_xls' )" style="width:140px" onclick="getCompleteness( 'xls' )"/><br>
-        	<input type="button" value="$i18n.getString( 'get_report_as_csv' )" style="width:140px" onclick="getCompleteness( 'csv' )"/>
+        	<input type="button" value="$i18n.getString( 'get_report_as_pdf' )" style="width:135px" onclick="getCompleteness( 'pdf' )"/>
+            <input type="button" value="$i18n.getString( 'get_report_as_xls' )" style="width:135px" onclick="getCompleteness( 'xls' )"/><br>
+        	<input type="button" value="$i18n.getString( 'get_report_as_csv' )" style="width:135px" onclick="getCompleteness( 'csv' )"/>
         </td>
     </tr>
-    <tr>
-    	<td colspan="2" height="20px"></td>
-    </tr>
 </table>
+</div>
 
 #parse( "dhis-web-commons/loader/loader.vm" )
 

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewOrgUnitDistribution.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewOrgUnitDistribution.vm	2011-03-28 20:09:32 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewOrgUnitDistribution.vm	2011-09-03 18:23:12 +0000
@@ -14,17 +14,25 @@
 
 <!-- Criteria -->
 
+<div id="criteria" class="inputCriteria" style="width:620px;height:240px;">
 <table>
 
-<tr><th>$i18n.getString( "select_org_unit" )</th></tr>
-
-<tr>
-<td>
-<div id="selectionTree" style="width:325px; height:200px"></div>
+<col width="300">
+<col>
+
+<tr>
+<td>
+<label>$i18n.getString( "report_organisation_unit" )</label>
+</td>
+</tr>
+
+<tr>
+<td>
+<div id="selectionTree" style="width:280px; height:200px"></div>
 </td>
 
 <td valign="bottom">
-<select id="groupSetId" name="groupSetId" style="width:281px">
+<select id="groupSetId" name="groupSetId" style="width:280px">
 <option value="0">[ $i18n.getString( "select_group_set" ) ]</option>
 #foreach( $groupSet in $groupSets )
 <option value="$groupSet.id"
@@ -33,19 +41,18 @@
 #end
 </select><br><br>
 
-<input type="button" value="$i18n.getString( 'get_report' )" style="width:140px" onclick="displayOrgUnitDistribution( 'html' )" />
-<input type="button" value="$i18n.getString( 'get_chart' )" style="width:140px" onclick="displayOrgUnitDistributionChart()" /><br><br>
+<input type="button" value="$i18n.getString( 'get_report' )" style="width:135px" onclick="displayOrgUnitDistribution( 'html' )" />
+<input type="button" value="$i18n.getString( 'get_chart' )" style="width:135px" onclick="displayOrgUnitDistributionChart()" /><br><br>
 
-<input type="button" value="$i18n.getString( 'get_report_as_pdf' )" style="width:140px" onclick="getOrgUnitDistribution( 'pdf' )" />
-<input type="button" value="$i18n.getString( 'get_report_as_xls' )" style="width:140px" onclick="getOrgUnitDistribution( 'xls' )" /><br>
-<input type="button" value="$i18n.getString( 'get_report_as_csv' )" style="width:140px" onclick="getOrgUnitDistribution( 'csv' )" />
+<input type="button" value="$i18n.getString( 'get_report_as_pdf' )" style="width:135px" onclick="getOrgUnitDistribution( 'pdf' )" />
+<input type="button" value="$i18n.getString( 'get_report_as_xls' )" style="width:135px" onclick="getOrgUnitDistribution( 'xls' )" /><br>
+<input type="button" value="$i18n.getString( 'get_report_as_csv' )" style="width:135px" onclick="getOrgUnitDistribution( 'csv' )" />
 
 </td>
 </tr>
 
-<tr><td style="height:10px"></td></tr>
-
 </table>
+</div>
 
 #parse( "dhis-web-commons/loader/loader.vm" )
 

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm	2011-08-19 12:08:26 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm	2011-09-03 18:23:12 +0000
@@ -34,21 +34,7 @@
   margin-bottom: 15px;
 }
 
-div#criteria
-{
-  position: relative;
-  left: 2px;
-  width: 265px;
-  height: 520px;
-  border: 1px solid #b0b0b0;
-  background-color: #d9ece1;
-  padding-left: 20px;
-  margin-bottom: 6px;
-  border-radius: 3px;
-  -moz-border-radius: 3px; /* Firefox */
-}
-
-div#pivot
+div#pivot222
 {
   position: relative;
   left: 2px;
@@ -100,18 +86,18 @@
 <!-- Control panel -->
 
 <div id="control">
-<input type="button" value='$i18n.getString( "data" )' style="width:80px" onclick="showCriteria()" />
-<input type="button" value='$i18n.getString( "pivot" )' style="width:80px" onclick="showPivot()" />&nbsp;
+<input type="button" value='$i18n.getString( "data" )' style="width:120px" onclick="showCriteria()" />
+<input type="button" value='$i18n.getString( "pivot" )' style="width:120px" onclick="showPivot()" />&nbsp;
 <label id="dataLabel" style="color:#606060"></label>
 </div>
 
 <!-- Criteria -->
 
-<div id="criteria">
+<div id="criteria" class="inputCriteria" style="width:302px;height:520px;">
 
 <div class="inputSection">
 <label>$i18n.getString( "data_type" )</label>
-<select id="dataType" style="width:250px" onchange="toggleDataType()">
+<select id="dataType" style="width:280px" onchange="toggleDataType()">
   <option value="0">$i18n.getString( "indicator" )</option>
   <option value="1">$i18n.getString( "data_element" )</option>
 </select>
@@ -119,7 +105,7 @@
 
 <div id="indicatorGroupDiv" class="inputSection">
 <label>$i18n.getString( "indicator_group" )</label>
-<select id="indicatorGroup" style="width:250px">
+<select id="indicatorGroup" style="width:280px">
   <option value="-1">[ All ]</option>
   #foreach( $group in $indicatorGroups )
   <option value="${group.id}">$encoder.htmlEncode( $group.name )</option>
@@ -129,7 +115,7 @@
 
 <div id="dataElementGroupDiv" class="inputSection" style="display:none">
 <label>$i18n.getString( "data_element_group" )</label>
-<select id="dataElementGroup" style="width:250px">
+<select id="dataElementGroup" style="width:280px">
   <option value="-1">[ All ]</option>
   #foreach( $group in $dataElementGroups )
   <option value="${group.id}">$encoder.htmlEncode( $group.name )</option>
@@ -139,35 +125,35 @@
 
 <div class="inputSection">
 <label>$i18n.getString( "start_date" ) ($i18n.getString( "format.date.label" ))</label><br>
-<input type="text" id="startDate" style="width:210px">
+<input type="text" id="startDate" style="width:240px">
 </div>
 
 <div class="inputSection">
 <label>$i18n.getString( "end_date" ) ($i18n.getString( "format.date.label" ))</label><br>
-<input type="text" id="endDate" style="width:210px">
+<input type="text" id="endDate" style="width:240px">
 </div>
 
 <div class="inputSection">
 <label>$i18n.getString( "period_type" )</label>
-<select id="periodType" style="width:250px">
+<select id="periodType" style="width:280px">
   #foreach( $type in $periodTypes )
   <option value="${type.name}" #if( $type.name == "Monthly" )selected="selected"#end>$i18n.getString(  $type.name )</option>
   #end
 </select>
 </div>
 
-<div id="selectionTree" style="width:250px; height:200px"></div>
+<div id="selectionTree" style="width:280px; height:200px"></div>
 
 <div class="inputSection">
-<input type="button" value='$i18n.getString( "get_data" )' style="width:80px" onclick="getData()">
-<input type="button" value='$i18n.getString( "cancel" )' style="width:80px" onclick="hideDivs()">
+<input type="button" value='$i18n.getString( "get_data" )' style="width:120px" onclick="getData()">
+<input type="button" value='$i18n.getString( "cancel" )' style="width:120px" onclick="hideDivs()">
 </div>
 
 </div>
  
 <!-- Pivot -->
 
-<div id="pivot" style="display:none">
+<div id="pivot" class="inputCriteria" style="width:302px;height:137px;display:none;">
 
 <div class="inputSection">
 <table>
@@ -187,8 +173,8 @@
 </div>
 
 <div class="inputSection">
-	<input type="button" value='$i18n.getString( "pivot" )' style="width:80px" onclick="pivotData()" />
-	<input type="button" value='$i18n.getString( "cancel" )' style="width:80px" onclick="hideDivs()" />
+	<input type="button" value='$i18n.getString( "pivot" )' style="width:120px" onclick="pivotData()" />
+	<input type="button" value='$i18n.getString( "cancel" )' style="width:120px" onclick="hideDivs()" />
 </div>
 
 </div>