=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/DeleteRelationshipAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/DeleteRelationshipAction.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/DeleteRelationshipAction.java	2012-09-24 06:51:00 +0000
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2004-2012, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ *   be used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.light.namebaseddataentry.action;
+
+import org.hisp.dhis.patient.Patient;
+import org.hisp.dhis.patient.PatientService;
+import org.hisp.dhis.program.ProgramInstanceService;
+import org.hisp.dhis.relationship.Relationship;
+import org.hisp.dhis.relationship.RelationshipService;
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author Nguyen Kim Lai
+ * 
+ * @version $ DeleteRelationshipAction.java Sep 21, 2012 $
+ */
+public class DeleteRelationshipAction
+    implements Action
+{
+    private static final String REDIRECT = "redirect";
+
+    // -------------------------------------------------------------------------
+    // Input & Output
+    // -------------------------------------------------------------------------
+    private int relationshipTypeId;
+
+    public int getRelationshipTypeId()
+    {
+        return relationshipTypeId;
+    }
+
+    public void setRelationshipTypeId( int relationshipTypeId )
+    {
+        this.relationshipTypeId = relationshipTypeId;
+    }
+
+    private int currentPatientId;
+
+    public int getCurrentPatientId()
+    {
+        return currentPatientId;
+    }
+
+    public void setCurrentPatientId( int currentPatientId )
+    {
+        this.currentPatientId = currentPatientId;
+    }
+
+    // -------------------------------------------------------------------------
+    // Dependencies
+    // -------------------------------------------------------------------------
+    private RelationshipService relationshipService;
+
+    public void setRelationshipService( RelationshipService relationshipService )
+    {
+        this.relationshipService = relationshipService;
+    }
+
+    private PatientService patientService;
+
+    public void setPatientService( PatientService patientService )
+    {
+        this.patientService = patientService;
+    }
+
+    public PatientService getPatientService()
+    {
+        return patientService;
+    }
+
+    @Override
+    public String execute()
+        throws Exception
+    {
+        Relationship relationship = relationshipService.getRelationship( this.relationshipTypeId );
+
+        relationshipService.deleteRelationship( relationship );
+
+        return REDIRECT;
+    }
+
+}

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetPatientProgramListAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetPatientProgramListAction.java	2012-09-24 03:28:31 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetPatientProgramListAction.java	2012-09-24 06:51:00 +0000
@@ -193,19 +193,6 @@
         this.enrollmentProgramList = enrollmentProgramList;
     }
     
-    //Use for add relationship
-    
-    /*private Map<String,Patient> relatedPeople;
-
-    public Map<String, Patient> getRelatedPeople()
-    {
-        return relatedPeople;
-    }
-
-    public void setRelatedPeople( Map<String, Patient> relatedPeople )
-    {
-        this.relatedPeople = relatedPeople;
-    }*/
     private Map<Relationship,Patient> relatedPeople;
     
     public Map<Relationship, Patient> getRelatedPeople()
@@ -253,6 +240,13 @@
     {
         this.patientIdentifiers = patientIdentifiers;
     }
+    
+    private List<ProgramInstance> listOfCompletedProgram;
+    
+    public List<ProgramInstance> getListOfCompletedProgram()
+    {
+        return listOfCompletedProgram;
+    }
 
     @Override
     public String execute()
@@ -277,19 +271,31 @@
         {
             if ( relationship.getPatientA().getId() != patient.getId() )
             {
-                //relatedPeople.put( relationship.getRelationshipType().getName(), relationship.getPatientA() );
                 relatedPeople.put( relationship, relationship.getPatientA());
             }
 
             if ( relationship.getPatientB().getId() != patient.getId() )
             {
-                //relatedPeople.put( relationship.getRelationshipType().getName(), relationship.getPatientB() );
                 relatedPeople.put( relationship, relationship.getPatientB());
             }
         }
         
         relationshipTypes = relationshipTypeService.getAllRelationshipTypes();
+        
         patientIdentifiers = patientIdentifierService.getPatientIdentifiers( patient );
+        
+        Collection<ProgramInstance> listOfProgramInstance = programInstanceService.getProgramInstances( patient );
+        
+        this.listOfCompletedProgram = new ArrayList<ProgramInstance>();
+        
+        for( ProgramInstance each: listOfProgramInstance )
+        {
+            if( each.isCompleted() )
+            {
+                this.listOfCompletedProgram.add( each );
+            }
+        }
+        
         return SUCCESS;
     }
 

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryProgramList.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryProgramList.vm	2012-09-24 03:28:31 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryProgramList.vm	2012-09-24 06:51:00 +0000
@@ -30,7 +30,16 @@
         #end
 	</ul>
 </p>
-
+<h2>Completed Programs</h2>
+<p>
+	<ul>
+		#if( $listOfCompletedProgram.size() != 0 )
+			#foreach( $programInstance in $listOfCompletedProgram )
+				$programInstance.program().name()
+			#end
+		#end
+	</ul>
+</p>
 <h2>$i18n.getString("details")</h2>
 <p>
 	<ul>