dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1994
committer: <akash> neeraj-hisp@xxxxxxxxx
branch nick: dhis2
timestamp: Wed 2010-11-03 19:10:15 +0530
message:
  Fixed minor bug in Lilelisting module for Bangladesh
modified:
  local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llgroup/AddLineListGroupAction.java
  local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llgroup/UpdateLineListGroupAction.java
  local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/addLineListGroupForm.vm
  local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/updateLineListGroupForm.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 'local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llgroup/AddLineListGroupAction.java'
--- local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llgroup/AddLineListGroupAction.java	2010-10-20 06:14:25 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llgroup/AddLineListGroupAction.java	2010-11-03 13:40:15 +0000
@@ -39,6 +39,7 @@
 import org.hisp.dhis.linelisting.LineListElement;
 import org.hisp.dhis.linelisting.LineListGroup;
 import org.hisp.dhis.linelisting.LineListService;
+import org.hisp.dhis.period.OnChangePeriodType;
 import org.hisp.dhis.period.PeriodService;
 import org.hisp.dhis.period.PeriodStore;
 import org.hisp.dhis.period.PeriodType;
@@ -154,7 +155,10 @@
         // ---------------------------------------------------------------------
         // Create Line List Group
         // ---------------------------------------------------------------------
-        PeriodType periodType = periodService.getPeriodTypeByName( periodTypeSelect );
+        PeriodType periodType = new OnChangePeriodType();
+        
+        System.out.println("Period Type is :" + periodType + "PeriodType Select is:" + periodTypeSelect);
+        
         LineListGroup lineListGroup = new LineListGroup( name, shortName, description, periodType );
 
         List<String> columnNames = new ArrayList<String>();

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llgroup/UpdateLineListGroupAction.java'
--- local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llgroup/UpdateLineListGroupAction.java	2010-10-20 06:14:25 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llgroup/UpdateLineListGroupAction.java	2010-11-03 13:40:15 +0000
@@ -35,6 +35,7 @@
 import org.hisp.dhis.linelisting.LineListElement;
 import org.hisp.dhis.linelisting.LineListGroup;
 import org.hisp.dhis.linelisting.LineListService;
+import org.hisp.dhis.period.OnChangePeriodType;
 import org.hisp.dhis.period.PeriodService;
 import org.hisp.dhis.period.PeriodType;
 
@@ -199,35 +200,16 @@
 
         lineListGroup.getLineListElements().addAll( updatedDataElementList );
 
-       // if ( !( removeElementList.isEmpty()) && !( newElements.isEmpty() ) )
-        
-        
-    //    if ( !( removeElementList.isEmpty()) || !( newElements.isEmpty() ) )    
-      //  {
-           
-         //   boolean dataUpdated = dataBaseManagerInterface.updateTable( lineListGroup.getShortName(), removeElementList, newElements );
-          //  if ( dataUpdated )
-           // {
-                
-              //  if ( lineListGroup != null )
-               // {
-                   
-                    lineListGroup.setName( name );
-                    lineListGroup.setShortName( shortName );
-                    lineListGroup.setDescription( description );
-
-                    PeriodType periodType = periodService.getPeriodTypeByName( periodTypeSelect );
-                    lineListGroup.setPeriodType( periodService.getPeriodTypeByClass( periodType.getClass() ) );
-
-                    lineListService.updateLineListGroup( lineListGroup );
-                   /* 
-                    System.out.println("Line List Group name is : " + lineListGroup.getName() );
-                    System.out.println("Line List Group Short name is : " + lineListGroup.getShortName() );
-                    System.out.println("Line List Group Desc is : " + lineListGroup.getDescription() );
-                    */
-               // }
-            //}
-       // }
+        lineListGroup.setName( name );
+        lineListGroup.setShortName( shortName );
+        lineListGroup.setDescription( description );
+
+        PeriodType periodType = new OnChangePeriodType();
+        
+        lineListGroup.setPeriodType( periodService.getPeriodTypeByClass( periodType.getClass() ) );
+
+        lineListService.updateLineListGroup( lineListGroup );
+                 
 
         return SUCCESS;
     }

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/addLineListGroupForm.vm'
--- local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/addLineListGroupForm.vm	2010-10-20 06:14:25 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/addLineListGroupForm.vm	2010-11-03 13:40:15 +0000
@@ -16,16 +16,6 @@
         <td><input type="text" id="shortName" name="shortName" style="width:20em"></td>
     </tr>
     <tr>
-        <td><label for="periodType">$i18n.getString( "periodType" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-        <td>
-          <select id="periodTypeSelect" name="periodTypeSelect" style="min-width:20em">
-            #foreach ( $periodType in $periodTypes )
-              <option value="$periodType.name">$i18n.getString( $periodType.name )</option>
-            #end
-          </select>
-        </td>
-    </tr>
-    <tr>
         <td><label for="description">$i18n.getString( "description" )</label></td>
         <td><textarea id="description" name="description" style="width:20em; height:8em"></textarea></td>
     </tr>

=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/updateLineListGroupForm.vm'
--- local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/updateLineListGroupForm.vm	2010-10-20 06:14:25 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/updateLineListGroupForm.vm	2010-11-03 13:40:15 +0000
@@ -20,16 +20,6 @@
         <td><input type="text" id="shortName" name="shortName" value="$encoder.htmlEncode( $lineListGroup.shortName )" style="width:20em"></td>
     </tr>
     <tr>
-        <td><label for="periodType">$i18n.getString( "periodType" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-        <td>
-          <select id="periodTypeSelect" name="periodTypeSelect" style="min-width:20em">
-            #foreach ( $periodType in $periodTypes )
-              <option value="$periodType.name" #if($periodType.name.equals($periodTypeSelect)) selected #end>$i18n.getString( $periodType.name )</option>
-            #end
-          </select>
-        </td>
-    </tr>
-    <tr>
         <td><label for="description">$i18n.getString( "description" )</label></td>
         <td><textarea id="description" name="description" style="width:20em; height:8em">$!encoder.htmlEncode( $lineListGroup.description )</textarea></td>
     </tr>