dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6074
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-02-21 20:20:15 +0100
message:
  Fixed minor bug with add/update dataset
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.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-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java	2012-02-05 13:27:40 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java	2012-02-21 19:20:15 +0000
@@ -105,9 +105,9 @@
         this.code = code;
     }
 
-    private Integer expiryDays;
+    private int expiryDays;
 
-    public void setExpiryDays( Integer expiryDays )
+    public void setExpiryDays( int expiryDays )
     {
         this.expiryDays = expiryDays;
     }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java	2012-02-05 13:27:40 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java	2012-02-21 19:20:15 +0000
@@ -108,9 +108,9 @@
         this.code = code;
     }
 
-    private Integer expiryDays;
+    private int expiryDays;
 
-    public void setExpiryDays( Integer expiryDays )
+    public void setExpiryDays( int expiryDays )
     {
         this.expiryDays = expiryDays;
     }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties	2012-02-21 11:39:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties	2012-02-21 19:20:15 +0000
@@ -35,7 +35,7 @@
 dataentryform_details=Data entry form details
 dataentryform_design=Design data entry form
 delete=Delete this form
-dataset=Dataset
+dataset=Data set
 dataentryform_confirm_delete=Are you sure you want to delete this data entry form?
 unable_delete=Unable to delete data entry form
 insert=Insert

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm	2011-03-18 14:20:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm	2012-02-21 19:20:15 +0000
@@ -5,9 +5,9 @@
 
 <h3>$i18n.getString( "section_grey_field_managment" ) #openHelp( "grey_field" )</h3>
   
-<table id="detailsList">
-	<col/> ## Labels
-	<col/> ## Input
+<table id="detailsList" style="margin-bottom:15px">
+	<col/>
+	<col/>
 	<thead>
 		<tr>
 			<th colspan="2">$i18n.getString( "section_details" )</th>
@@ -16,25 +16,21 @@
 
 	<tbody>
 		<tr>
-			<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-			<td><b>$section.name</b></td>        
-		</tr>
-		<tr>
-			<td><label>$i18n.getString( "dataset" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-			<td><b>$section.dataSet.name</b></td>
-		</tr>
-		<tr>
-	    <td><label>$i18n.getString( "category_combo" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-	        <td><b>$categoryCombo.name</b></td>
+			<td><label>$i18n.getString( "name" ):</label></td>
+			<td>$section.name</td>        
+		</tr>
+		<tr>
+			<td><label>$i18n.getString( "dataset" ):</label></td>
+			<td>$section.dataSet.name</td>
+		</tr>
+		<tr>
+	    <td><label>$i18n.getString( "category_combo" ):</label></td>
+	        <td>$categoryCombo.name</td>
 		</tr>
     </tbody>    
 </table>
 
-<br/>
-<hr style="clear:both"/>
-<br/> 
-
-<div style="border:1px solid #808080;width:98%">
+<div style="border:1px solid #cccccc; width:95%; padding:10px; margin-bottom:15px; border-radius:3px;">
 	#if( $sectionIsMultiDimensional == "true" )    
     	#parse( "/dhis-web-maintenance-dataset/sectionMultiDimensionalDataElement.vm" )
 	#else
@@ -42,10 +38,6 @@
 	#end	
 </div>
 
-<br/>
-<hr style="clear:both"/>
-<br/>
-	
 <p>
-	<input type="button" onclick="window.location.href='section.action'" value="$i18n.getString( 'done' )"/>
+	<input type="button" onclick="window.location.href='section.action'" value="$i18n.getString( 'done' )" style="width:120px"/>
 </p>