diff --git a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php
index 39ebe638..b89a2e01 100644
--- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php
+++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php
@@ -64,7 +64,10 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
         $updatedDetails = $this->receive_model->updateEnrolmentDetails($enrolmentDetails,$fromDetails);// Check if the users data store contains users (in case the database result returns NULL)
         if ($updatedDetails['status'])
         {
-            $updatedDetails['status'] = true;
+            // Set the response and exit
+            $this->response($updatedDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+        }
+        else if($updatedDetails['status']==false){
             // Set the response and exit
             $this->response($updatedDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
         }
diff --git a/Apollo/api/application/models/Employee_model.php b/Apollo/api/application/models/Employee_model.php
index 5caefdef..605098d5 100755
--- a/Apollo/api/application/models/Employee_model.php
+++ b/Apollo/api/application/models/Employee_model.php
@@ -675,14 +675,14 @@ class Employee_model extends CI_Model
                     $FinanceModuleAccess = $req['FinanceModuleAccess'];
                     $sql = "UPDATE ".LOGIN." SET ListCode ='$listCode'  WHERE StaffID='$empFor'";
                     if ($this->db->query($sql) == '1') {
-                        $sql1 = "UPDATE ".STAFF." SET BranchCode='$branchCode', JobResponsibility='$roleResponsibility', FinanceModuleAccess= '$FinanceModuleAccess' WHERE StaffID='$empFor'";
-                        if ($this->db->query($sql1) == '1') {
-                            $result['updateEmpbranchStatus'] = true;
-                            $result['message']               = "Successfully employee branch details Updated";
-                        } else {
-                            $result['updateEmpbranchStatus'] = false;
-                            $result['message']               = "Something Went Wrong.";
-                        }
+                        // $sql1 = "UPDATE ".STAFF." SET BranchCode='$branchCode', JobResponsibility='$roleResponsibility', FinanceModuleAccess= '$FinanceModuleAccess' WHERE StaffID='$empFor'";
+                        // if ($this->db->query($sql1) == '1') {
+                        //     $result['updateEmpbranchStatus'] = true;
+                        //     $result['message']               = "Successfully employee branch details Updated";
+                        // } else {
+                        //     $result['updateEmpbranchStatus'] = false;
+                        //     $result['message']               = "Something Went Wrong.";
+                        // }
                     } else {
                         $result['updateEmpbranchStatus'] = false;
                         $result['message']               = "Something Went Wrong.";
diff --git a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php
index 1eec9e85..ad14832f 100644
--- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php
+++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php
@@ -309,6 +309,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
          }
 
         }
+
         if(sizeof($get_data)>0) {
             // check form id exit in table for insert / update
             $formIDData = $this->db->select('FormID')->order_by('SubmitID', 'ASC')->get(ENROLMENTRECEIVEDFROMUNIV)->result_array();
@@ -320,15 +321,16 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
                 if(sizeof($get_data)>0){
 
                     $matchedKey = array_search($fvalue['FormID'], array_column($get_data, 'FormID'));
-                    if ($matchedKey!='') {
+                    if ($matchedKey!== false) {
                        // $updateForms[count($updateForms)] = $get_data[$matchedKey];
                         // $form_ids[]=$fvalue['FormID'];
-                        array_splice($get_data, 0, 1);
+                        array_splice($get_data, $matchedKey, 1);
 
                     }
                 }
 
             endforeach;
+
             if (sizeof($get_data) > 0) {
                 $this->db->insert_batch(ENROLMENTRECEIVEDFROMUNIV, $get_data);
                 if ($this->db->affected_rows() > 0) {
@@ -339,7 +341,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
                     return $finalArray;
                 } else {
                     $finalArray['status'] = false;
-                    $finalArray['message'] = "Insert failed please check data.";
+                    $finalArray['message'] = "Please check file data.";
                     $finalArray['insertedRows'] = $this->db->affected_rows();
                     $finalArray['details'] = $errorArray;
                     return $finalArray;
@@ -347,7 +349,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
 
             } else {
                 $finalArray['status'] = false;
-                $finalArray['message'] = "Updated Successfully.";;
+                $finalArray['message'] = "Please check file data.";;
                 $finalArray['details'] = $errorArray;
 
             }
@@ -358,12 +360,11 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
         }
         else{
             $finalArray['status'] = false;
-            $finalArray['message'] = "Insert failed please check data.";
+            $finalArray['message'] = "Please check file data.";
             $finalArray['insertedRows'] = $this->db->affected_rows();
             $finalArray['details'] = $errorArray;
             return $finalArray;
         }
-
         return $finalArray;
     }
 
diff --git a/Apollo/api/application/models/Student_model.php b/Apollo/api/application/models/Student_model.php
index b3dfd5e8..639a8d87 100755
--- a/Apollo/api/application/models/Student_model.php
+++ b/Apollo/api/application/models/Student_model.php
@@ -1024,6 +1024,8 @@ class Student_model extends CI_Model {
                 
                 $this->db->group_by('t1.StaffID');
                 $this->db->where('t1.BranchCode', $loginBranchId);
+                $this->db->where('t1.IsActive','1');
+                $this->db->where('t2.IsActive','1');
                 // $this->db->where('t1.ListCode', EMPLOYEE);
                 $this->db->order_by('t1.CreatedOn', 'DESC');
                 $empDetails = $this->db->get();
diff --git a/Apollo/assets/js/controllers/student_university_fee_compare.js b/Apollo/assets/js/controllers/student_university_fee_compare.js
index 53856499..85bd0ebd 100644
--- a/Apollo/assets/js/controllers/student_university_fee_compare.js
+++ b/Apollo/assets/js/controllers/student_university_fee_compare.js
@@ -238,7 +238,7 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
         $scope.error = function (e) {
             /* DO SOMETHING WHEN ERROR IS THROWN */
             //console.log(e);
-        }
+        };
 
     }
 
@@ -247,6 +247,7 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
             swal("Warning", "No data found for insert ", "warning");
         }
         else{
+            $scope.uniqueDetails =  $filter('unique')(details,'Form Id');
             var updateUniversityEnrolment = {
                 method: 'POST',
                 url: apiPoint.url + 'receiveEnrolmentFromUniv/',
@@ -255,7 +256,7 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
                 },
                 data: {
                     localDetails: localDetail,
-                    details: details,
+                    details: $scope.uniqueDetails,
                     universityID: angular.fromJson(uploadForDetails.university).UniversityID,
                     universityName: angular.fromJson(uploadForDetails.university).UniversityName,
 
@@ -266,7 +267,11 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
                 if (response.data.status == true) {
                     swal("", "Updated Successfully", "success");
                     $state.go($state.current, {}, {reload: true});
-                } else {
+                }
+                else if(response.data.status == false){
+                    swal("", response.data.message, "error");
+                }
+                else {
                     swal("", "Failed", "error");
                 }
             });
@@ -481,7 +486,7 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
             });
         }
 
-    }
+    };
 
 
 }]);