dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1435
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-02-16 14:47:02 +0100
message:
  Removed OrganiastionUnit.type property, not in use.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/UpdateOrganisationUnitAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.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-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java	2010-01-15 11:32:18 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java	2010-02-16 13:47:02 +0000
@@ -54,8 +54,6 @@
 
     private boolean active;
     
-    private String type;
-
     private String comment;
     
     private String geoCode;
@@ -277,16 +275,6 @@
         this.active = active;
     }
 
-    public String getType()
-    {
-        return type;
-    }
-
-    public void setType( String type )
-    {
-        this.type = type;
-    }
-
     public String getComment()
     {
         return comment;

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml	2010-02-15 12:29:14 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml	2010-02-16 13:47:02 +0000
@@ -39,8 +39,6 @@
 		
     <property name="active"/>
     
-    <property name="type"/>
-		
     <property name="comment" length="360"/>
     
     <property name="geoCode"/>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java	2009-09-09 03:20:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java	2010-02-16 13:47:02 +0000
@@ -103,13 +103,6 @@
         this.openingDate = openingDate;
     }
     
-    private String type;
-
-    public void setType( String type )
-    {
-        this.type = type;
-    }
-
     private String comment;
 
     public void setComment( String comment )
@@ -165,7 +158,6 @@
     {
         code = nullIfEmpty( code );
         comment = nullIfEmpty( comment );
-        type = nullIfEmpty( type );
         polygonCoordinates = nullIfEmpty( polygonCoordinates );
         latitude = nullIfEmpty( latitude );
         longitude = nullIfEmpty( longitude );
@@ -196,7 +188,6 @@
         OrganisationUnit organisationUnit = new OrganisationUnit( name, shortName, 
             code, date, null, true, comment );
         
-        organisationUnit.setType( type );
         organisationUnit.setPolygonCoordinates( polygonCoordinates );
         organisationUnit.setLatitude( latitude );
         organisationUnit.setLongitude( longitude );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/UpdateOrganisationUnitAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/UpdateOrganisationUnitAction.java	2009-11-18 15:19:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/UpdateOrganisationUnitAction.java	2010-02-16 13:47:02 +0000
@@ -115,13 +115,6 @@
         this.closedDate = closedDate;
     }
 
-    private String type;
-
-    public void setType( String type )
-    {
-        this.type = type;
-    }
-
     private String comment;
 
     public void setComment( String comment )
@@ -166,7 +159,6 @@
     {
         code = nullIfEmpty( code );
         comment = nullIfEmpty( comment );
-        type = nullIfEmpty( type );
         polygonCoordinates = nullIfEmpty( polygonCoordinates );
         latitude = nullIfEmpty( latitude );
         longitude = nullIfEmpty( longitude );
@@ -193,7 +185,6 @@
         organisationUnit.setActive( active.booleanValue() );
         organisationUnit.setOpeningDate( oDate );
         organisationUnit.setClosedDate( cDate );
-        organisationUnit.setType( type );
         organisationUnit.setComment( comment );
         organisationUnit.setPolygonCoordinates( polygonCoordinates );
         organisationUnit.setLatitude( latitude );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm	2010-02-09 09:10:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm	2010-02-16 13:47:02 +0000
@@ -53,10 +53,6 @@
             button         :    "getOpeningDate"   // trigger for the calendar (button ID)
         });
   	</script>
-    <tr>
-        <td><label for="type">$i18n.getString( "type" )</label></td>
-        <td><input type="text" id="type" name="type" style="width:20em" ></td>
-    </tr>
 	<tr>
 		<td><label for="comment">$i18n.getString( "comment" )</label></td>
 		<td><textarea id="comment" name="comment" style="width:20em; height:5em"></textarea></td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm	2010-02-09 09:10:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm	2010-02-16 13:47:02 +0000
@@ -71,10 +71,6 @@
 			</select>
 		</td>
 	</tr>
-    <tr>
-        <td><label for="type">$i18n.getString( "type" )</label></td>
-        <td><input type="text" id="type" name="type" value="$!encoder.htmlEncode( $organisationUnit.type )" style="width:20em" maxlength="255" class="{validate:{maxlength:255}}"></td>
-    </tr>
 	<tr>
 		<td><label for="comment">$i18n.getString( "comment" )</label></td>
 		<td><textarea id="comment" name="comment" style="width:20em; height:5em">$!encoder.htmlEncode( $organisationUnit.comment )</textarea></td>