=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentInstance.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentInstance.java	2012-04-17 12:28:23 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentInstance.java	2012-06-06 10:13:06 +0000
@@ -14,7 +14,7 @@
     
     private OrganisationUnit organisationUnit;
     
-    private boolean working = true;
+    private boolean working = false;
     
     private Set<EquipmentStatus> equipmentStatusUpdates;
     

=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/AddEquipmentAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/AddEquipmentAction.java	2012-05-15 10:33:46 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/AddEquipmentAction.java	2012-06-06 10:13:06 +0000
@@ -51,6 +51,13 @@
     
     private String message;
     
+    private Boolean workingStatus = false;
+    
+    public void setWorkingStatus( Boolean workingStatus )
+    {
+        this.workingStatus = workingStatus;
+    }
+
     // -------------------------------------------------------------------------
     // Action implementation
     // -------------------------------------------------------------------------
@@ -70,6 +77,7 @@
         
         equipmentInstance.setInventoryType( inventoryType );
         equipmentInstance.setOrganisationUnit( orgUnit );
+        equipmentInstance.setWorking( workingStatus );
         
         // -----------------------------------------------------------------------------
         // Preparing Equipment Details

=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/EquipmentSelectAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/EquipmentSelectAction.java	2012-05-15 10:33:46 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/EquipmentSelectAction.java	2012-06-06 10:13:06 +0000
@@ -79,7 +79,7 @@
         }
         else
         {
-            System.out.println("Organisationunit is not null" + orgUnitId);
+            System.out.println("Organisationunit is not null ---" + orgUnitId);
         }
         
         if( organisationUnit == null && orgUnitId != null )

=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowEquipmentStatusHistoryFormAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowEquipmentStatusHistoryFormAction.java	2012-05-02 09:18:42 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowEquipmentStatusHistoryFormAction.java	2012-06-06 10:13:06 +0000
@@ -53,7 +53,7 @@
     // -------------------------------------------------------------------------
     public String execute() throws Exception
     {
-        System.out.println("inside ShowEquipmentStatusHistoryFormAction ");
+        //System.out.println("inside ShowEquipmentStatusHistoryFormAction ");
         EquipmentInstance equipmentInstance = equipmentInstanceService.getEquipmentInstance( equipmentInstanceId );
         
         equipmentStatusHistory = new ArrayList<EquipmentStatus>( equipmentStatusService.getEquipmentStatusHistory( equipmentInstance ) );

=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/UpdateEquipmentStatusAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/UpdateEquipmentStatusAction.java	2012-04-30 08:30:00 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/UpdateEquipmentStatusAction.java	2012-06-06 10:13:06 +0000
@@ -45,6 +45,17 @@
     {
         EquipmentInstance equipmentInstance = equipmentInstanceService.getEquipmentInstance( equipmentInstanceId );
         
+        if( status.equalsIgnoreCase( "WORKING" ))
+        {
+            equipmentInstance.setWorking( true );
+            equipmentInstanceService.updateEquipmentInstance( equipmentInstance );
+        }
+        else
+        {
+            equipmentInstance.setWorking( false );
+            equipmentInstanceService.updateEquipmentInstance( equipmentInstance );
+        }
+        
         String storedBy = currentUserService.getCurrentUsername();
         
         EquipmentStatus equipmentStatus = new EquipmentStatus();
@@ -58,6 +69,7 @@
         
         equipmentStatusService.addEquipmentStatus( equipmentStatus );
         
+        
         return SUCCESS;
     }
 

=== modified file 'local/in/dhis-web-coldchain/src/main/resources/org/hisp/dhis/coldchain/i18n_module.properties'
--- local/in/dhis-web-coldchain/src/main/resources/org/hisp/dhis/coldchain/i18n_module.properties	2012-05-30 10:46:26 +0000
+++ local/in/dhis-web-coldchain/src/main/resources/org/hisp/dhis/coldchain/i18n_module.properties	2012-06-06 10:13:06 +0000
@@ -115,4 +115,5 @@
 ccem_entry = CCEM Entry
 ccem_reports = CCEM Reports
 upload_image = Upload image
-upload_catalog_image = Upload catalog image
\ No newline at end of file
+upload_catalog_image = Upload catalog image
+working_status = Working status
\ No newline at end of file

=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addEquipmentForm.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addEquipmentForm.vm	2012-05-16 07:06:15 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addEquipmentForm.vm	2012-06-06 10:13:06 +0000
@@ -45,6 +45,11 @@
 			<td>$i18n.getString( "inventorytype" ) : </th>
 			<td>$inventoryType.name</th>
 		</tr>
+		
+		<tr>
+			<td>$i18n.getString( "working_status" ) : </td>
+			<td><input type="checkbox"  id="workingStatus" name="workingStatus" checked="true" ></th>
+		</tr>	
 
 		<!-- InventoryType Attributes  -->
 		<tr><td>&nbsp;</td><td>&nbsp;</td></tr>

=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/util/DashBoardService.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/util/DashBoardService.java	2011-12-03 07:44:11 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/util/DashBoardService.java	2012-06-06 10:13:06 +0000
@@ -150,7 +150,7 @@
             throw new RuntimeException( "Illegal DataElement id", e );
         }
     }
-
+/*
     public String getPeriodIdForIDSPPopulation( )
     {
         String periodIdResult = "-1";
@@ -179,7 +179,7 @@
         return periodIdResult;
             
     }
-    
+*/    
     public Integer getConfirmedCount( String orgUnitIdsByComma, String dataSetId, String periodId )
     {
         Integer confirmedCount = 0;
@@ -207,7 +207,7 @@
         
         return confirmedCount;
     }
-    
+    /*
     public String getPeriodIdForIDSPOutBreak( )
     {
         String periodIdResult = "-1";
@@ -281,7 +281,7 @@
         System.out.println( "PeriodId : " +periodIdResult );
         return periodIdResult;
     }
-    
+    */
     public Integer getAggregatedData( String orgUnitIdsByComma, String deIdsByComma, String periodId )
     {
         Integer aggData = 0;