Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Apollo/api/application/config/routes.php

@@ -348,6 +348,9 @@ $route['report_examfee'] = 'Report/examfee';
 $route['report_balfee'] = 'Report/balfee';
 $route['report_lead'] = 'Report/lead';
 $route['insertUniversityfile'] = 'UniversityFile_Controller/insertUniversityfile'; 
+//Data correction
+$route['Stud_Merge'] = 'DataCorrection_Controller/StudMerge';
+$route['get_Mob'] = 'DataCorrection_Controller/getMob';
 
 //Application Form Details
 $route['getApplicationFromDetails'] = 'StatusUpdation_Controller/getApplicationFromDetails';
@@ -367,3 +370,4 @@ $route['addManualEnrolmentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/ad
 $route['getForFormIdDraftDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getForFormIdDraftDetails';
 $route['addForFormIdDraftDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/addForFormIdDraftDetails';
 $route['draftMovetoList'] = 'Receive_Enrolment_Fees_Univ_Controller/draftMovetoList';
+$route['editDraftFormIdFeesDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/editDraftFormIdFeesDetails';

Apollo/api/application/controllers/DataCorrection_Controller.php

@@ -35,9 +35,32 @@ class DataCorrection_Controller extends REST_Controller {
 
      public function StudMerge_post()
     {
-        $toDelete = $this->post('toDelete');
+        $name = $this->post('name');
-        $toMerge = $this->post('toMerge');
+        $getStatus = $this->Data_correction->Student_Merge($name);
-        $getStatus = $this->Data_correction->Student_Merge($toDelete,$toMerge);
+        //print_r($getStatus);
+        if ($getStatus)
+        {
+            $getStatus['status'] = REST_Controller::HTTP_OK;
+            // Set the response and exit
+            $this->response($getStatus, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+        }
+        else
+        {
+            // Set the response and exit
+            $this->response([
+                'message' => 'No records found!',
+                'status' => REST_Controller::HTTP_NOT_FOUND
+            ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+        }
+
+
+    }
+	
+	public function getMob_post()
+    {
+        $deleteNo = $this->post('deleteNo');
+		$mergeNo = $this->post('mergeNo');
+        $getStatus = $this->Data_correction->getMobile($deleteNo,$mergeNo);
         //print_r($getStatus);
         if ($getStatus)
         {

Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php

@@ -318,5 +318,24 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
         }
     }
 
+    public function editDraftFormIdFeesDetails_post(){
+        $reqBranch = $this->post('localDetails');
+        $details = $this->post('details');
+        $detailsID = $this->post('detailsID');
+
+        $details = $this->post('details');
+        $editDraftFormIdFeesDetails = $this->receive_model->editDraftFormIdFeesDetails($reqBranch, $details, $detailsID); // Check if the employee exist
+        if ($editDraftFormIdFeesDetails) {
+            $editDraftFormIdFeesDetails['status'] = REST_Controller::HTTP_OK;
+            // Set the response and exit
+            $this->response($editDraftFormIdFeesDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+            
+        } else {
+            // Set the response and exit
+            $this->response(['message' => 'No list were found', 'status' => REST_Controller::HTTP_NOT_FOUND], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+            
+        }
+    }
+
 
 }

Apollo/api/application/models/Data_correction.php

@@ -7,9 +7,15 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 
 class Data_Correction extends CI_Model
 {
-    Public function Student_Merge($toDelete=null,$toMerge=null)
+   Public function Student_Merge($name=null)
 	{
-	  $sql = "";
+	  $sql = "select scd.StudentID as Student_id,scd.CourseID as cid,Firstname as Student_name,std.MobileNumber as Phone_number,CourseName as Course_name,UniversityName as University 
+from T_Student_CourseDetails as scd
+left join T_StudentDetails as std on std.StudentID = scd.StudentID and std.IsActive = 1
+left join T_CourseMaster AS cm ON cm.CourseID = scd.CourseID 
+left join T_UniversityMaster as univ on univ.UniversityID = scd.UniversityID
+where Firstname like '".$name."' 
+group by Student_id,cid";
         $b=$this->db->query($sql);
         $batch = $b->result();
         if (count($batch) > 0) {
@@ -22,6 +28,26 @@ class Data_Correction extends CI_Model
         return $results;	
 	}
 	
+	 Public function getMobile($deleteNo=null,$mergeNo=null)
+	{
+	  $sql = "call SP_MERGE_STUDENT_DATA('".$deleteNo."','".$mergeNo."',@countRow);
+              ";
+	  $a=$this->db->query($sql);		  
+	  $sqlOut = " select @countRow as counts;";		  
+        $b=$this->db->query($sqlOut);
+        $batch = $b->result();
+		//echo $batch[0]->counts;
+        if ($batch[0]->counts > 0) {
+            $results['MergeStatus']      = true;
+            $results['after_Merge'] = $batch;
+			$results['message']      = 'Student details successfully merged';
+        } else {
+            $results['MergeStatus'] = false;
+            $results['message']      = 'Can not Merge';
+        }
+        return $results;	
+	}
+
 
 
     Public function GetAllCourseDetails($search)

Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php

@@ -443,9 +443,9 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
 
             if(count($queryDetails->result()) == 0){
                 $query = "INSERT INTO T_FormId_FeeDetails_Received_From_University 
-                (FormID, FormType, CentreCode,Session,Year,Semester,Student_Name,Father_Name,CourseCode, ActualCourseFee, CourseFee, ExamFee, EnrollmentFee, ProspectusFee, ReRegFee, CreditTransferFee, LateralEntryFee, DualSpclFee, OtherFee, NRIFEE, ProvisionalFee, MigrationFee, UrgentResultDMCFee, AdditionalFee, Amount, CreatedBy, CreatedOn, BranchCode, DraftStatus) 
+                (FormID, FormType, CentreCode,Session,Year,Semester,Student_Name,Father_Name,CourseCode, ActualCourseFee, CourseFee, ExamFee, EnrollmentFee, ProspectusFee, ReRegFee, CreditTransferFee, LateralEntryFee, DualSpclFee, OtherFee, NRIFEE, ProvisionalFee, MigrationFee, UrgentResultDMCFee, AdditionalFee, Amount, CreatedBy, CreatedOn, BranchCode, DraftStatus, EditStatus) 
                 VALUES 
-                ( '$formIds', '$formType', '$CentreCode','$Session','$Year','$Semester','$Student_Name','$Father_Name', '$CourseCode', '$ActualCourseFee', '$CourseFee', '$ExamFee', '$EnrollmentFee', '$ProspectusFee', '$ReRegFee', '$CreditTransferFee', '$LateralEntryFee', '$DualSpclFee', '$OtherFee', '$NRIFEE', '$ProvisionalFee', '$MigrationFee', '$UrgentResultDMCFee', '$AdditionalFee', '$Amount', '$localUserID', '$CreatedOn', '$localBranchID' , 0)";
+                ( '$formIds', '$formType', '$CentreCode','$Session','$Year','$Semester','$Student_Name','$Father_Name', '$CourseCode', '$ActualCourseFee', '$CourseFee', '$ExamFee', '$EnrollmentFee', '$ProspectusFee', '$ReRegFee', '$CreditTransferFee', '$LateralEntryFee', '$DualSpclFee', '$OtherFee', '$NRIFEE', '$ProvisionalFee', '$MigrationFee', '$UrgentResultDMCFee', '$AdditionalFee', '$Amount', '$localUserID', '$CreatedOn', '$localBranchID' , 0, 0)";
                 $queryDetails = $this->db->query($query);
             } else {
                 echo 'else con';
@@ -755,6 +755,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
         $this->db->select('UniversityID,UniversityName');
         $this->db->order_by('UniversityID','DESC');
         $this->db->where('IsActive','1');
+        $this->db->group_by('UniversityName');
        // $this->db->where('BranchCode',$branchID);
         $universityDetails = $this->db->get(UNIVERSITY);
         $universityResult=array();
@@ -966,9 +967,9 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
 
             if(count($queryDetails->result()) == 0){
                 $query = "INSERT INTO T_FormId_FeeDetails_Received_From_University 
-                (FormID, FormType, CentreCode,Session,Year,Semester,Student_Name,Father_Name,CourseCode, ActualCourseFee, CourseFee, ExamFee, EnrollmentFee, ProspectusFee, ReRegFee, CreditTransferFee, LateralEntryFee, DualSpclFee, OtherFee, NRIFEE, ProvisionalFee, MigrationFee, UrgentResultDMCFee, AdditionalFee, Amount, CreatedBy, CreatedOn, BranchCode, DraftStatus) 
+                (FormID, FormType, CentreCode,Session,Year,Semester,Student_Name,Father_Name,CourseCode, ActualCourseFee, CourseFee, ExamFee, EnrollmentFee, ProspectusFee, ReRegFee, CreditTransferFee, LateralEntryFee, DualSpclFee, OtherFee, NRIFEE, ProvisionalFee, MigrationFee, UrgentResultDMCFee, AdditionalFee, Amount, CreatedBy, CreatedOn, BranchCode, DraftStatus, EditStatus) 
                 VALUES 
-                ( '$formIds', '$formType', '$CentreCode','$Session','$Year','$Semester','$Student_Name','$Father_Name', '$CourseCode', '$ActualCourseFee', '$CourseFee', '$ExamFee', '$EnrollmentFee', '$ProspectusFee', '$ReRegFee', '$CreditTransferFee', '$LateralEntryFee', '$DualSpclFee', '$OtherFee', '$NRIFEE', '$ProvisionalFee', '$MigrationFee', '$UrgentResultDMCFee', '$AdditionalFee', '$Amount', '$localUserID', '$CreatedOn', '$localBranchID' , 1)";
+                ( '$formIds', '$formType', '$CentreCode','$Session','$Year','$Semester','$Student_Name','$Father_Name', '$CourseCode', '$ActualCourseFee', '$CourseFee', '$ExamFee', '$EnrollmentFee', '$ProspectusFee', '$ReRegFee', '$CreditTransferFee', '$LateralEntryFee', '$DualSpclFee', '$OtherFee', '$NRIFEE', '$ProvisionalFee', '$MigrationFee', '$UrgentResultDMCFee', '$AdditionalFee', '$Amount', '$localUserID', '$CreatedOn', '$localBranchID' , 1, 1)";
                 $queryDetails = $this->db->query($query);
 
                 if($queryDetails){
@@ -989,11 +990,9 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
         // print_r($details);exit();
 
         foreach($detail as $row) {
-            // echo $row['ID'];exit();
+            $ids = $row['ID'];
-             $data[] = array(
+            $updateQuery = 'UPDATE `T_FormId_FeeDetails_Received_From_University` SET `DraftStatus` = 0 WHERE `ID` = '.$ids;
-                'ID' => $row['ID'],
+            $queryDetails = $this->db->query($updateQuery);
-                'FormType'=> 'Hello'
-                );
         }
 
         // $data = array(
@@ -1007,16 +1006,81 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
         //     )
         // );
         // print_r($data);exit();
-    $this->db->update_batch('T_FormId_FeeDetails_Received_From_University', $data, 'ID'); 
+        // $this->db->update('T_FormId_FeeDetails_Received_From_University', $data, 'ID'); 
    
-        $detailsList = $details->result();
+        // $detailsList = $details->result();
-        if($detailsList){
+        $result['draftStatus'] = true;
-                    $result['draftStatus'] = true;
+        $result['draftDetailsMessagae'] = "Updated Successfully.";
-                    $result['draftDetailsMessagae'] = "Updated Successfully.";
+        return $result;
-        } else {
+    }
-                    $result['draftStatus'] = false;
+
-                    $result['draftDetailsMessagae'] = "Something went wrong.";
+    public function editDraftFormIdFeesDetails($reqBranch, $details, $detailsID){
-        }
+            $ids = $detailsID;
+            $formIds = $details['FormID'];
+            $formType = $details['FormType'];
+            $CentreCode = $details['CentreCode'];
+            $Session = $details['Session'];
+            $Year = $details['Year'];
+            $Semester = $details['Semester'];
+            $Student_Name = $details['Student_Name'];
+            $Father_Name = $details['Father_Name'];
+            $CourseCode = $details['CourseCode'];
+            $ActualCourseFee = $details['ActualCourseFee'];
+            $CourseFee = $details['CourseFee'];
+            $ExamFee = $details['ExamFee'];
+            $EnrollmentFee = $details['EnrollmentFee'];
+            $ProspectusFee = $details['ProspectusFee'];
+            $ReRegFee = $details['ReRegFee'];
+            $CreditTransferFee = $details['CreditTransferFee'];
+            $LateralEntryFee = $details['LateralEntryFee'];
+            $DualSpclFee = $details['DualSpclFee'];
+            $OtherFee = $details['OtherFee'];
+            $NRIFEE = $details['NRIFEE'];
+            $ProvisionalFee = $details['ProvisionalFee'];
+            $MigrationFee = $details['MigrationFee'];
+            $UrgentResultDMCFee = $details['UrgentResultDMCFee'];
+            $AdditionalFee = $details['AdditionalFee'];
+            $Amount = $details['Amount'];
+
+            $data = array( 
+                'FormID' => $formIds ,
+                'FormType' => $formType ,
+                'CentreCode'=> $CentreCode,
+                'Session' =>$Session,
+                'Year' =>$Year,                
+                'Semester' =>$Semester,
+                'Student_Name' =>$Student_Name ,
+                'Father_Name' =>$Father_Name,
+                'CourseCode' =>$CourseCode,
+                'ActualCourseFee' =>$ActualCourseFee,
+                'CourseFee' =>$CourseFee,
+                'ExamFee' =>$ExamFee,
+                'EnrollmentFee' =>$EnrollmentFee,
+                'ProspectusFee' =>$ProspectusFee,
+                'ReRegFee'=>$ReRegFee,
+                'CreditTransferFee' =>$CreditTransferFee,
+                'LateralEntryFee' =>$LateralEntryFee,
+                'DualSpclFee' =>$DualSpclFee,
+                'OtherFee' =>$OtherFee,
+                'NRIFEE' =>$NRIFEE ,
+                'ProvisionalFee' =>$ProvisionalFee,
+                'MigrationFee' =>$MigrationFee,
+                'UrgentResultDMCFee' =>$UrgentResultDMCFee,
+                'AdditionalFee' =>$AdditionalFee,
+                'Amount' => $Amount 
+            );
+
+            $this->db->where('ID', $detailsID);
+            $this->db->update('T_FormId_FeeDetails_Received_From_University', $data);
+        //  echo $this->db->affected_rows();exit();
+          if($this->db->affected_rows() > 0){
+$result['updatedraftStatus'] = true;
+        $result['updatedraftDetailsMessagae'] = "Updated Successfully.";
+          }else{
+$result['updatedraftStatus'] = false;
+        $result['updatedraftDetailsMessagae'] = "Something went wrong.";
+          }
+          return $result;
     }
 
 }

Apollo/assets/i18n/en.json

@@ -157,7 +157,8 @@
       },
       "entry": {
         "MAIN": "My Details",
-        "coursecorrection": "Course Details"
+        "coursecorrection": "Course Details",
+		"stud_merge": "Student Merge"
       },
       "announcement": {
         "MAIN": "ANNOUNCEMENT",

Apollo/assets/js/config.constant.js

@@ -237,12 +237,18 @@ app.constant('JS_REQUIRES', {
          'report_balfeeCtrl':'assets/js/controllers/report_balfeeCtrl.js',
 		 'report_leadCtrl':'assets/js/controllers/report_leadCtrl.js',
  
+         //Data Correction
+		 'studentMergeCtrl':'assets/js/controllers/studentMergeCtrl.js',
+		 
           /**
            * univesity sutdent fee compare details 
            */
 
            'student_university_fee_compareCtrl':'assets/js/controllers/student_university_fee_compare.js',
         'studentUnivFormIdFeeDetailsCtrl': 'assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js',
+        // university form payment details
+        'univFormPaymentCtrl': 'assets/js/controllers/univFormPaymentCtrl.js',
+
 
     },
     //*** angularJS Modules

Apollo/assets/js/config.router.js

@@ -807,6 +807,15 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
                     label: 'coursecorrection'
                 },
             
+            }).state('app.entry.stud_merge', {
+                url: '/studentMergeCtrl',
+                templateUrl: "assets/views/StudentMerge.html",
+                resolve: loadSequence('studentMergeCtrl','ngTable', 'ladda', 'angular-ladda'),
+                title: 'Student Merge',
+                ncyBreadcrumb: {
+                    label: 'Student Merge'
+                },
+            
             });
 
 //   $locationProvider.html5Mode(true);

Apollo/assets/js/controllers/studentMergeCtrl.js

@@ -0,0 +1,225 @@
+'use strict';
+/*** controller***/
+app.controller('studentMergeCtrl', ["$scope", "$filter","$rootScope", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', '$window',"dateListDescService","$modal",
+    function ($scope, $filter,$rootScope, apiPoint, $http, SweetAlert, $state, md5, ipCookie, $window, dateListDescService,$modal,$log) {
+
+       $scope.name = {
+            "studentName": "",
+            
+        };
+       
+      $scope.onSubmit = function (form) {
+			var firstError = null;
+            if (form.$invalid) {
+                var field = null, firstError = null;
+				$scope.show = true;
+                for (field in form) {
+                    if (field[0] != '$') {
+                        if (firstError === null && !form[field].$valid) {
+                            firstError = form[field].$studentName;
+                        }
+                        if (form[field].$pristine) {
+                            form[field].$dirty = true;
+                        }
+                    }
+                }
+                angular.element('.ng-invalid[batch=' + firstError + ']').focus();
+            }else {
+            //alert($scope.batch.name);
+			$scope.stud_merge = '';
+            $scope.message = '';
+            console.log($scope.stud_merge);
+            var response_data = {
+                method: 'POST',
+                url: apiPoint.url + 'Stud_Merge/',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                data: {
+                    name: $scope.name.studentName
+                   
+                }
+
+            };
+
+            $http(response_data).then(function (response) {
+                if (response.data.MergeStatus == true) {
+                    $scope.stud_merge = response.data.Stud_Merge;
+                } else {
+                    $scope.message = response.data.message;
+                }
+
+            });
+           
+        }
+		}
+       
+
+       //merge student
+    $scope.selectedStudentsID = [];
+	$scope.number1 = '';
+	$scope.number2 = '';
+	$scope.getMobile = '';
+	$scope.toDelete = '';
+	$scope.toMerge = '';
+	// $rootScope.num1 = '';
+    // $rootScope.num2 = '';
+    $scope.isCheckAll = function(e){
+        var val = (e.target.checked ? true : false);
+        if(val)
+    {
+       // $scope.disable = false;
+        var len =  $scope.Stud_Merge.length;
+        var i = 0;
+        for(i=0;i<len;i++)
+        {
+            if($scope.selectedStudentsID.indexOf($scope.Stud_Merge[i]) === -1)
+            {
+                
+                $scope.selectedStudentsID.push($scope.Stud_Merge[i]);
+            }
+        }
+    }
+    else
+    {
+       // $scope.disable = true;
+        $scope.selectedStudentsID = [];
+    }
+    if($scope.selectedStudentsID !=''){
+        $scope.disable = false;
+    }else{
+        $scope.disable = true;
+    }
+    console.log($scope.selectedStudentsID);
+    }
+    $scope.isClick = function(e){
+        var ide = e.target;
+    var val = (ide.checked ? true : false);
+    var sid = e.target.id;
+    angular.forEach($scope.Stud_Merge,function(value,key){
+        //console.log(value);
+        if(sid == value.Student_id)
+        {
+            console.log()
+            sid = value;
+        }
+    });
+    
+    var pos = $scope.selectedStudentsID.indexOf(sid);
+    //alert(val);
+    if(val)
+    {
+        if( pos == -1)
+        {
+           
+            console.log("PUSH");
+            $scope.selectedStudentsID.push(sid);
+        }
+        
+    }
+    else
+    {
+       
+        //console.log("POP");
+        $scope.selectedStudentsID.splice(pos,1);
+    }
+    //
+    if(val){
+        $scope.disable = false;
+    }else{
+        $scope.disable = true;
+    }
+    console.log($scope.selectedStudentsID);
+	console.log($scope.selectedStudentsID[0]);
+	console.log($scope.selectedStudentsID[1]);
+	$scope.number1 = $scope.selectedStudentsID[0];
+	$scope.number2 = $scope.selectedStudentsID[1];
+    }
+    $scope.merge = function(){
+        
+        //$rootScope.student = $scope.selectedStudentsID;
+        if($scope.selectedStudentsID ==''){
+            swal('Select Check box','','warning');
+			return false;
+        }else{
+        $scope.controller = 'ng-controller="studentMergeCtrl"';
+       
+       
+        $rootScope.num1 = $scope.number1;
+		$rootScope.num2 = $scope.number2;
+            
+            $rootScope.modalInstance = $modal.open({
+            templateUrl: 'assets/views/MergeStudentModal.html',
+            controller: 'studentMergeCtrl',
+            // size: size,
+           
+            
+        });
+
+            $rootScope.modalInstance.result.then(function (selectedItem) {
+            $scope.selected = selectedItem;
+        }, function () {
+            $log.info('Modal dismissed at: ' + new Date());
+        });
+        
+    
+    
+    
+        }
+    }
+
+    $scope.merge_student = {
+        submit: function (form, getMobile) {
+			//alert(getMobile);
+			if(getMobile=="option1"){
+				console.log("if");
+				$scope.toDelete = $rootScope.num1;
+	            $scope.toMerge = $rootScope.num2;
+				console.log($scope.toDelete);
+				console.log($scope.toMerge);
+			}else{
+				console.log("else");
+				$scope.toDelete = $rootScope.num2;
+	            $scope.toMerge = $rootScope.num1;
+				console.log($scope.toDelete);
+				console.log($scope.toMerge);
+			}
+			
+			 var toMerge = {
+                    method: 'POST',
+                    url: apiPoint.url + 'get_Mob/',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    },
+                    data: {
+                        deleteNo:$scope.toDelete,
+                        mergeNo: $scope.toMerge,
+                     }
+                };
+                $http(toMerge).then(function (response) {
+                    if (response.data.status==200 && response.data.MergeStatus == true) {
+                        $rootScope.modalInstance.close();
+                        swal(" ", response.data.message, "success");
+						$state.go($state.current, {}, { reload: true });
+                        
+                    } else {
+                        
+                        swal(" ", response.data.message, "error");
+                    }
+                });
+        },
+        
+    };
+    
+
+    //End of merge student
+        
+      
+   
+        
+
+    }]);
+
+
+
+

Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js

@@ -70,7 +70,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
     $scope.getUniversitySearchList = function () {
         var empListreq = {
             method: 'POST',
-            url: apiPoint.url + 'getUniversitySessionDetails/',
+            url: apiPoint.url + 'getUnivCourseFromFileDetails/',
             headers: {
                 'Content-Type': 'application/json'
             },
@@ -90,36 +90,26 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
 
     $scope.searchData = {
         "University": "",
-        "Session": "",
+        "Course": "",
         "Status": ""
     }
     $scope.myUnivSearch = "";
-    $scope.sessionData = "";
+    $scope.courseData = "";
+
     $scope.getUniveId = function (univ) {
         $scope.sessionData = "";
         if (univ === '') {
             $scope.myUnivSearch = "";
+            $scope.courseData = "";
             $scope.searchData.University = '';
-            // $scope.searchData.Course = '';
+            $scope.searchData.Course = '';
-            // $scope.searchData.Batch = '';
-            // $scope.courseData = name.Course;
-            // $scope.batchData = name.Batch;
-            $scope.searchData.Session = '';
-
-            $scope.OpenWindowStatus = false;
         } else {
             let name = JSON.parse(univ);
-            $scope.searchData.University = name.UniversityID;
+            $scope.searchData.University = name.univCode;
-            // $scope.searchData.Course = '';
+            $scope.courseData = name.univCourseDetails;
-            // $scope.searchData.Batch = '';
-            // $scope.courseData = name.Course;
-            // $scope.batchData = name.Batch;
-            $scope.searchData.Session = '';
-            $scope.sessionData = name.SessionDetails;
-            $scope.OpenWindowStatus = false;
         }
-
     };
+
     //For session dropdown
     $scope.filterSessionDetails = "";
     $scope.$watch('searchData.University', function (newValue, oldValue) {
@@ -140,7 +130,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
 
     $scope.onSubmit = function () {
         $scope.Searchloader = true;
-        if ($scope.searchData.University !== '' && $scope.searchData.Session !== '') {
+        if ($scope.searchData.University !== '' && $scope.searchData.Course !== '') {
             $scope.Searchloader = true;
             var empListreq = {
                 method: 'POST',
@@ -482,19 +472,51 @@ $scope.draftManualEntryDetails = {
                 };
                 $http(draftMoveToList).then(function (response) {
                     if (response.data.draftStatus == true) {
-                        // swal("", response.data.draftDetailsMessagae, "success");
+                        // alert();
-                        // getDraftFormIdDetails();
+                        swal("", response.data.draftDetailsMessagae, "success");
-                        // getEmptycall();
+                        getDraftFormIdDetails();
                     } else {
-                        // swal("", response.data.draftDetailsMessagae, "warning");
+                        swal("", response.data.draftDetailsMessagae, "warning");
-                        // getDraftFormIdDetails();
+                        
-                        // getEmptycall();
+                }});
-                    }
-                });
                 } else {
                 swal("Cancelled", "Your record not added to list :)", "error");
                 }
             });
     }
 
+    $scope.editId = -1;
+    $scope.leader = {};
+    $scope.editList = function(details, d){
+        $scope.leader = {};
+        angular.copy(d, $scope.leader);
+        $scope.editId = details;
+    }
+
+    $scope.updateFeeIDDetails = function(id, p){
+        var editDraftMoveToList = {
+            method: 'POST',
+            url: apiPoint.url + 'editDraftFormIdFeesDetails/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                localDetails: localDetail,
+                details : p,
+                detailsID: id
+            }
+        };
+        $http(editDraftMoveToList).then(function (response) {
+            if (response.data.updatedraftStatus == true) {
+                // alert();
+                swal("", response.data.updatedraftDetailsMessagae, "success");
+                getDraftFormIdDetails();
+                $scope.editId = -1;
+                  $scope.leader = {};
+            } else {
+                swal("", response.data.updatedraftDetailsMessagae, "warning");
+                
+        }});
+    }
+
 }]);

Apollo/assets/views/MergeStudentModal.html

@@ -0,0 +1,45 @@
+<div class="container-fluid container-fullw bg-white" controller>
+                    <form name="Form" id="form" novalidate ng-submit="merge_student.submit(Form, getMobile)" method="post">
+                        <div class="row">
+                            <!--<div class="col-md-6">
+                                <div class="padding-30">
+                                    <h2 class="StepTitle"><i
+                                            class="ti-face-smile fa-2x text-primary block margin-bottom-10"></i>
+                                        Enter Bus Stop Details</h2>
+                                </div>
+                            </div>-->
+                            <div class="col-md-12">
+                                <fieldset>
+                                    <legend>
+                                       Select Mobile number to merge
+                                    </legend>
+
+                                    
+                                    <div class="row">
+
+                                       
+                                       <input type="radio" class="with-gap" ng-model='getMobile' ng-value='"option1"'>&nbsp;&nbsp;{{num1}} to merge with {{num2}}
+                                       
+                                    </div>
+                                    <div class="row">
+                                      
+                                       <input type="radio" class="with-gap" ng-model='getMobile' ng-value='"option2"'>&nbsp;&nbsp;{{num2}} to merge with {{num1}}
+                                    </div>
+
+
+
+
+                                    <div class="col-md-12">
+                                        <div class="pull-right">
+                                            <button tabindex="13" type="submit" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in">
+                                                Submit
+                                            </button>
+                                            
+
+                                        </div>
+                                    </div>
+                                </fieldset>
+                            </div>
+                        </div>
+                    </form>
+                </div>

Apollo/assets/views/StudentMerge.html

@@ -0,0 +1,109 @@
+<section id="page-title">
+    <div class="row">
+        <div class="col-sm-8">
+            <h1 class="mainTitle">Student Merge</h1>
+        </div>
+        <!-- <div ncy-breadcrumb></div>   -->
+    </div>
+</section>
+<style>
+td,th {
+	  white-space: nowrap;
+	  }
+	  th{
+	  text-align:center;
+	  }
+	   .table>tbody>tr>td { padding: 2px; }
+    /* .sort-icon {
+        font-size: 9px;
+        margin-left: 5px;
+    }
+
+    th {
+        cursor: pointer;
+    } */
+</style>
+
+
+</script>
+<div class="container-fluid container-fullw bg-white">
+    <div ng-controller="studentMergeCtrl" ng-init="filters()">
+        <form name="Form" id="form" novalidate ng-submit="onSubmit(Form)" method="post">
+            <fieldset>
+                <div class="row">
+                    <div class="col-md-12">
+
+                        <div class="row">
+                           
+                             <div class="col-md-3">
+                                <label for="form-field-select-2">
+                                    Student Name
+                                </label>
+
+                               <input type="text" tabindex="1" class="form-control " placeholder="Student Name" ng-model="name.studentName" name="studentName" required="required" />
+                            </div>
+
+                            
+                            <div class="col-md-2" style="padding-top: 2.3%;">
+                                <div >
+
+                                    <button type="submit" class="btn btn-success btn-o" tabindex="8">
+                                        Submit
+                                    </button>
+
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </fieldset>
+
+        </form>
+        <!-- <pre>{{statusr | json}}</pre> -->
+        <div class="row" style="text-align: right;">
+                 
+                <button class="btn btn-success btn-o" ng-click="merge()">Merge</button>
+            
+        </div>
+        <div class="table-responsive">
+            <table  id="datatable"   class="table table-hover" style="font-size:0.9em;">
+                  
+                           
+                         
+                <thead>
+                   
+                    <tr>
+                           
+                        <th>Student Name</th>
+                        <th>Mobile Number</th>
+                        <th>Course Name</th>
+                        <th>University</th>
+						<th>Action</th>
+                       
+                        
+                 
+                    </tr>
+                </thead>
+                <tbody dir-paginate="p in stud_merge|filter:search:strict|itemsPerPage:10">
+                    <tr>
+                           
+                        <td>{{p.Student_name}}</td>
+                        <td>{{p.Phone_number}}</td>
+                        <td>{{p.Course_name}}</td>
+                        <td>{{p.University}}</td>
+						<td style="text-align:center;"><input type="checkbox" ng-checked="myModel.all" id="{{p.Phone_number}}" name="{{p.Phone_number}}" class="form-control" ng-click="isClick($event);" style="width:17px" /></td>
+                        
+                        
+                    </tr>
+                
+                </tbody>
+
+            </table>
+            <h3 style="text-align:center;">{{message}}</h3>
+
+        </div>
+
+        <dir-pagination-controls  direction-links="true" boundary-links="true">
+        </dir-pagination-controls>
+    </div>
+</div>

Apollo/assets/views/partials/nav.html

@@ -221,16 +221,16 @@
 					<span class="title" translate="sidebar.nav.student.STUDENTFEEDETAILCOMPARE"> University Form Enrolment </span>
 				</a>
 			</li>
-			<!--<li ui-sref-active="active">
+			<li ui-sref-active="active">
 				<a ui-sref="app.student.studentUnivFormIdFeeDetails" ng-click="checkSuperAdmin()">
 					<span class="title" translate="sidebar.nav.student.STUDENTFROMIDFEEDETAILS"> STUDENT FORMID FEE DETAILS </span>
 				</a>
-			</li>-->
+			</li>
-			<!--<li ui-sref-active="active">
+			<li ui-sref-active="active">
 				<a ui-sref="app.student.universityformpayment" ng-click="checkSuperAdmin()">
-					<span class="title" translate="sidebar.nav.student.STUDENTFROMIDFEEDETAILS"> STUDENT FORMID FEE DETAILS </span>
+					<span class="title" translate="sidebar.nav.student.UNIVERSITYFORMPAYMENT"> University Form Payment </span>
 				</a>
-			</li>-->
+			</li>
 		</ul>
 	</li>
 	<!--<li ng-class="{'active open':$state.includes('app.call')}">
@@ -555,6 +555,11 @@
 					<span class="title" translate="sidebar.nav.entry.coursecorrection">COURSECORRECTION</span>
 				</a>
 			</li>
+			<li ui-sref-active="active">
+				<a ui-sref="app.entry.stud_merge" ng-click="checkSuperAdmin()">
+					<span class="title" translate="sidebar.nav.entry.stud_merge">Student Merge</span>
+				</a>
+			</li>
 			
 		</ul>
 	</li>

Apollo/assets/views/student/UnivFormPaymentDetails.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>

Apollo/assets/views/student/studentUnivFormIdFeeDetails.html

@@ -58,22 +58,22 @@
                         </label>
                                     <select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="university" ng-model="myUnivSearch" ng-change="getUniveId(myUnivSearch)">
                         <option value="" disabled selected>Select University</option>
-                        <option  ng-repeat="item in universitySearchData" value="{{item}}">{{item.UniversityName}}</option>
+                        <option  ng-repeat="item in universitySearchData" value="{{item}}">{{item.univName}}</option>
                             </select>
                                 </div>
                                 <div class="col-md-3">
                                     <label for="form-field-select-2">
-                                               Session
+                                               Course
                         </label>
-                                    <select ui-select2 class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="session" ng-model="searchData.Session">
+                                    <select ui-select2 class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="session" ng-model="searchData.Course">
-                        <option value="" selected>Select Session</option>
+                        <option value="" selected>Select Course</option>
-                        <option ng-repeat="itemSession in sessionData"  value="{{itemSession.SessionID}}">{{itemSession.SessionName}}</option>
+                        <option ng-repeat="itemCourse in courseData"  value="{{itemCourse.CourseCode}}">{{itemCourse.CourseName}}</option>
                         </select>
                                 </div>
                                 <div class="col-md-2" style="padding-top: 2.3%;">
                                     <div class="pull-right">
 
-                                        <button ng-disabled="searchData.Session == '' || searchData.University == ''" type="submit" class="btn btn-success btn-o"
+                                        <button ng-disabled="searchData.Course == '' || searchData.University == ''" type="submit" class="btn btn-success btn-o"
                                             tabindex="8">
                                         Submit
                                     </button>
@@ -285,6 +285,7 @@
                                     <div ng-if="draftListDetails && !draftListDetailsLoading" class="table-responsive">
                                         <table class="table table-border table-hover">
                                             <thead>
+                                                <th>Action</th>
                                                 <th>FormID</th>
                                                 <th>FormType</th>
                                                 <th>CentreCode</th>
@@ -310,10 +311,14 @@
                                                 <th>UrgentResultDMCFee</th>
                                                 <th>AdditionalFee</th>
                                                 <th>Amount</th>
-                                                <th>Action</th>
+                                                
                                             </thead>
                                             <tbody dir-paginate="p in draftListDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
                                                 <tr>
+                                                    <td>
+                                                        <i class="ti-user" tooltip="Add To List" ng-click="addToList(p.ID);"></i>
+                                                        <i class="ti-user" tooltip="Add To List" ng-click="editList(p.ID, p);"></i>
+                                                    </td>
                                                     <td>{{p.FormID}}</td>
                                                     <td>{{p.FormType}}</td>
                                                     <td>{{p.CentreCode}}</td>
@@ -339,8 +344,184 @@
                                                     <td>{{p.UrgentResultDMCFee}}</td>
                                                     <td>{{p.AdditionalFee}}</td>
                                                     <td>{{p.Amount}}</td>
-                                                    <td>
+                                                </tr>
-                                                        <i class="ti-user" tooltip="Add To List" ng-click="addToList(p.ID);"></i>
+                                                <tr ng-show="editId === p.ID" ng-if="editId === p.ID" style="line-height: 1em;">
+                                                    <td colspan="20">
+                                                        <div class="container">
+                                                            <div class="row">
+                                                                <div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                                                    <label>
+                                                                        FormID 
+                                                                    </label>
+                                                                    <input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.FormID"/>
+                                                                </div>
+                                                                <div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                                                    <label>
+                                                                        FormType 
+                                                                    </label>
+                                                                    <input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.FormType"/>
+                                                                </div>
+                                                                <div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                                                    <label>
+                                                                        CentreCode 
+                                                                    </label>
+                                                                    <input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.CentreCode"/>
+                                                                </div>
+                                                                <div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                                                    <label>
+                                                                        Session 
+                                                                    </label>
+                                                                    <input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.Session"/>
+                                                                </div>
+                                                                 <div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                                                    <label>
+                                                                        Year 
+                                                                    </label>
+                                                                    <input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.Year"/>
+                                                                </div>
+                                                                <div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                                                    <label>
+                                                                        Semester 
+                                                                    </label>
+                                                                    <input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.Semester"/>
+                                                                </div>
+                                                            </div>
+                                                             <div class="row">
+                                                               
+                                                                <div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                                                    <label>
+                                                                        Student_Name 
+                                                                    </label>
+                                                                    <input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.Student_Name"/>
+                                                                </div>
+                                                                <div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                                                    <label>
+                                                                        Father_Name 
+                                                                    </label>
+                                                                    <input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.Father_Name"/>
+                                                                </div>
+                                                                <div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                                                    <label>
+                                                                        CourseCode 
+                                                                    </label>
+                                                                    <input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.CourseCode"/>
+                                                                </div>
+                                                                <div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                                                    <label>
+                                                                        ActualCourseFee 
+                                                                    </label>
+                                                                    <input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.ActualCourseFee"/>
+                                                                </div>
+                                                                <div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                                                    <label>
+                                                                        CourseFee 
+                                                                    </label>
+                                                                    <input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.CourseFee"/>
+                                                                </div>
+                                                                <div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                                                    <label>
+                                                                        ExamFee 
+                                                                    </label>
+                                                                    <input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.ExamFee"/>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                                                    <label>
+                                                                        EnrollmentFee 
+                                                                    </label>
+                                                                    <input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.EnrollmentFee"/>
+                                                                </div>
+                                                                <div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                                                    <label>
+                                                                        ProspectusFee 
+                                                                    </label>
+                                                                    <input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.ProspectusFee"/>
+                                                                </div>
+                                                                <div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                                                    <label>
+                                                                        ReRegFee 
+                                                                    </label>
+                                                                    <input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.ReRegFee"/>
+                                                                </div>
+                                                                <div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                                                    <label>
+                                                                        CreditTransferFee 
+                                                                    </label>
+                                                                    <input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.CreditTransferFee"/>
+                                                                </div>
+                                                                <div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                                                    <label>
+                                                                        LateralEntryFee 
+                                                                    </label>
+                                                                    <input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.LateralEntryFee"/>
+                                                                </div>
+                                                                <div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                                                    <label>
+                                                                        DualSpclFee 
+                                                                    </label>
+                                                                    <input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.DualSpclFee"/>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                
+                                                                <div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                                                    <label>
+                                                                        OtherFee 
+                                                                    </label>
+                                                                    <input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.OtherFee"/>
+                                                                </div>
+                                                                <div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                                                    <label>
+                                                                        NRIFEE 
+                                                                    </label>
+                                                                    <input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.NRIFEE"/>
+                                                                </div>
+                                                                 <div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                                                    <label>
+                                                                        ProvisionalFee 
+                                                                    </label>
+                                                                    <input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.ProvisionalFee"/>
+                                                                </div>
+                                                                <div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                                                    <label>
+                                                                        MigrationFee 
+                                                                    </label>
+                                                                    <input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.MigrationFee"/>
+                                                                </div>
+                                                                <div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                                                    <label>
+                                                                        UrgentResultDMCFee 
+                                                                    </label>
+                                                                    <input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.UrgentResultDMCFee"/>
+                                                                </div>
+                                                                <div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                                                    <label>
+                                                                        AdditionalFee 
+                                                                    </label>
+                                                                    <input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.AdditionalFee"/>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
+                                                                    <label>
+                                                                        Amount 
+                                                                    </label>
+                                                                    <input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.Amount"/>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="pull-right">
+                                                                    <button type="button" ng-disabled="editSaveButtonDisable" ladda="ldloading1.zoom_in" tabindex="2028" class="btn btn-wide btn-success"
+                                                                        data-style="zoom-in" ng-click="updateFeeIDDetails(p.ID, leader)">
+                                                                        <i class='fa fa-spinner fa-spin' ng-if="editSaveButtonDisable"> </i>   Save
+                                                                        </button>
+                                                                    <button type="reset" class="btn btn-warning btn-wide" tabindex="2029" ng-click="cancel()">
+                                                                            Cancel
+                                                                        </button>
+                                                                </div>
+                                                            </div>
+                                                        </div>
                                                     </td>
                                                 </tr>
                                             </tbody>