dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4156
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-07-18 12:22:08 +0200
message:
  Cleanup
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SaveValueAction.java
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responsePeriods.vm
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm
  resources/sql/integritychecks.sql


--
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-dataentry/src/main/java/org/hisp/dhis/de/action/SaveValueAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SaveValueAction.java	2011-04-19 09:45:10 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SaveValueAction.java	2011-07-18 10:22:08 +0000
@@ -45,7 +45,6 @@
 
 /**
  * @author Abyot Asalefew
- * @version $Id$
  */
 public class SaveValueAction
     implements Action
@@ -97,7 +96,7 @@
     }
 
     // -------------------------------------------------------------------------
-    // Input/output
+    // Input
     // -------------------------------------------------------------------------
 
     private String value;
@@ -114,11 +113,6 @@
         this.dataElementId = dataElementId;
     }
 
-    public int getDataElementId()
-    {
-        return dataElementId;
-    }
-
     private int organisationUnitId;
 
     public void setOrganisationUnitId( int organisationUnitId )
@@ -133,10 +127,9 @@
         this.optionComboId = optionComboId;
     }
 
-    public int getOptionComboId()
-    {
-        return optionComboId;
-    }
+    // -------------------------------------------------------------------------
+    // Output
+    // -------------------------------------------------------------------------
 
     private int statusCode = 0;
 
@@ -145,18 +138,6 @@
         return statusCode;
     }
 
-    private String inputId;
-
-    public String getInputId()
-    {
-        return inputId;
-    }
-
-    public void setInputId( String inputId )
-    {
-        this.inputId = inputId;
-    }
-
     // -------------------------------------------------------------------------
     // Action implementation
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responsePeriods.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responsePeriods.vm	2011-07-14 11:24:48 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responsePeriods.vm	2011-07-18 10:22:08 +0000
@@ -2,10 +2,7 @@
 { "periods": [
 #foreach( $period in $periods )
   {
-    "startDate": "$!format.formatDate( ${period.startDate} )",
-    "endDate": "$!format.formatDate( ${period.endDate} )",
-    "name": "$!format.formatPeriod( ${period} )",
-    "externalId": "$!{period.externalId}"
+    "name": "$!format.formatPeriod( ${period} )"
   }#if( $velocityCount < $size1 ),#end
 #end ],
   "periodValid": ${periodValid}

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm	2011-07-14 10:31:16 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm	2011-07-18 10:22:08 +0000
@@ -33,8 +33,7 @@
 
 <div id="currentSelection">
 	<span style="float:left;cursor:pointer;margin-right:5px;"><img src="../images/hide.png" title="$i18n.getString( 'close' )" onclick="closeCurrentSelection()"></span>
-	<span id="currentOrganisationUnit">$i18n.getString( "no_organisationunit_selected" )</span> -
-	<span id="currentPeriod">$i18n.getString( "no_period_selected" )</span/><br>
+	<span id="currentOrganisationUnit">$i18n.getString( "no_organisationunit_selected" )</span> - <span id="currentPeriod">$i18n.getString( "no_period_selected" )</span/><br>
 	<span id="currentDataElement">$i18n.getString( "no_dataelement_selected" )</span>
 </div>
 

=== modified file 'resources/sql/integritychecks.sql'
--- resources/sql/integritychecks.sql	2011-07-07 20:49:32 +0000
+++ resources/sql/integritychecks.sql	2011-07-18 10:22:08 +0000
@@ -91,3 +91,9 @@
 
 select * from categorycombo where categorycomboid not in (select distinct categorycomboid from categorycombos_categories);
 
+-- Get category options present in more than one category
+
+select categoryoptionid, (
+select count(categoryoptionid) from categories_categoryoptions where categoryoptionid=cc.categoryoptionid )
+as categorycount from categories_categoryoptions as cc order by categorycount desc;
+