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

Apollo/api/application/config/routes.php

@@ -379,4 +379,6 @@ $route['getUniversityCodeForFormDetailsGet'] = 'Receive_Enrolment_Fees_Univ_Cont
 $route['getUnmatchedFormIdFeesDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getUnmatchedFormIdFeesDetails';
 $route['addToAccountStateList'] = 'Receive_Enrolment_Fees_Univ_Controller/addToAccountStateList';
 $route['addUniversityPaymentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/addUniversityPaymentDetails';
+$route['updateUniversityPaymentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/updateUniversityPaymentDetails';
+
 

Apollo/api/application/controllers/HallTickets_Controller.php

@@ -320,13 +320,33 @@ class HallTickets_Controller extends REST_Controller {
 		  $branchId = $this->post('branchId');
 		  $Cdate = new DateTime('now',new DateTimeZone('Asia/Kolkata'));
 		  $CreatedOn = $Cdate->format('Y-m-d H:i:s');
-/////////check semcoursemapping////
+		  $fileArray = array();
-       // $data['subjectDetails'] = $this->Hallticket_model->getSubjectDetails($universityID,$tempCourseArray,$branchId);
+		  foreach($filedetails  as $filedetailsarray)
-          $data['subjectDetails'] = $this->Hallticket_model->getExistDetailsfileupload($university,$courseArray,$branchId);
+		      {
-		// print_r( $data['subjectDetails']);
+				  $fileArray[]=$filedetailsarray['SubjectID'];
-		  if($data['subjectDetails'] == 1 )
+			  }
+		 // print_r( $fileArray);
+		   $data['subjectDetails'] = $this->Hallticket_model->getExistDetailsfileupload($university,$courseArray,$branchId);
+        //  print_r( $data['subjectDetails']);
+		   if($data['subjectDetails'] == 1 )
 		{
-			 foreach($courseArray  as $CourseDatialArray)
+		
+			       $data['SubjectMappingDetails'] = $this->Hallticket_model->getSubjectMappingDetails($university,$courseArray,$branchId);
+                   $maparray=array();
+							foreach ( $data['SubjectMappingDetails'] as $object)
+								         {
+								$maparray[]=$object->SubjectCode;
+								      }
+									//  $a1=$fileArray;
+									//  $b1=$maparray;
+									//   print_r($maparray);
+									 $result=array_diff($fileArray,$maparray);
+									$unmatched= sizeof($result);
+									
+		             if ($unmatched == 0 )
+								{
+									
+								 foreach($courseArray  as $CourseDatialArray)
 		      {
 		    $course=$CourseDatialArray;
 			$schedulemaster = array('UniversityID'=>$university,'CourseID'=>$course,'BranchCode'=>$branchId,'CreatedBy'=>$requestedBy,'CreatedOn'=>$CreatedOn);
@@ -357,24 +377,31 @@ class HallTickets_Controller extends REST_Controller {
 			
         }
 		}
+		else
+		{
+			$this->response([
+                'message' => 'Records Do Not Match With Mapped Subjects!',
+                'status' => REST_Controller::HTTP_NOT_FOUND
+            ], REST_Controller::HTTP_NOT_FOUND); 	
+		}	
+		}
 		
 	//	else if($data['subjectDetails'] == 0)
 	else 
 	      {
 				$this->response([
-                'message' => 'Please Mapping the course supject!',
+                'message' => ' Course Mapping for the Subject Not Found !',
                 'status' => REST_Controller::HTTP_NOT_FOUND
             ], REST_Controller::HTTP_NOT_FOUND); 	
 		}
-		// else{
 		
-		// 	$this->response([
-        //         'message' => 'No records found!',
-        //         'status' => REST_Controller::HTTP_NOT_FOUND
-        //     ], REST_Controller::HTTP_NOT_FOUND); 	
          
-		// }
+         
-/////////////////////
+	 
+	
+		
+		 
+		 
 		
 		 
        }

Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php

@@ -38,6 +38,7 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
 
         $this->methods['addManualEnrolmentDetails_post']['limit'] = 1000;
         $this->methods['addUniversityPaymentDetails_post']['limit'] = 1000;
+        $this->methods['updateUniversityPaymentDetails_post']['limit'] = 1000;
 
         // load the model
         $this->load->model('Receive_Enrolment_Fees_Univ_model', 'receive_model');
@@ -135,12 +136,12 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
         $formData['EnrolmentNo'] = $this->post('enrolmentId');;
 
         $getDetails = $this->receive_model->getFormIDFeeDetails($formData);
-        if ($getDetails['status']=true)
+        if ($getDetails['formTypeStatus']=true)
         {
             // Set the response and exit
             $this->response($getDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
         }
-        else if($getDetails['status']=false){
+        else if($getDetails['formTypeStatus']=false){
             $this->response([
                 'message' => $getDetails['Message'],
             ], REST_Controller::HTTP_OK); // NOT_FOUND (404) being the HTTP response code
@@ -150,7 +151,7 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
             // Set the response and exit
             $this->response([
                 'message' => 'Something went wrong.please try again!',
-                'status' => false
+                'formTypeStatus' => false
             ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
         }
     }
@@ -159,9 +160,13 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
  
         $getDetailsFor = $this->post('getDetailsFor');
         $getUnmatchedFormDetails = $this->receive_model->getUnmatchedFormDetails($getDetailsFor);// Check if the users data store contains users (in case the database result returns NULL)
-        if ($getUnmatchedFormDetails)
+        if ($getUnmatchedFormDetails['unMatchedRecordStatus'])
+        {
+            // Set the response and exit
+            $this->response($getUnmatchedFormDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+        }
+       else if ($getUnmatchedFormDetails['unMatchedRecordStatus']==false)
         {
-            $getUnmatchedFormDetails['status'] = REST_Controller::HTTP_OK;
             // Set the response and exit
             $this->response($getUnmatchedFormDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
         }
@@ -170,7 +175,7 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
             // Set the response and exit
             $this->response([
                 'message' => 'Something went wrong.please try again!',
-                'status' => REST_Controller::HTTP_NOT_FOUND
+                'formTypeStatus' => false
             ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
         }
     }
@@ -277,7 +282,9 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
     // kdk
     public function getForFormIdDraftDetails_post(){
         $reqBranch = $this->post('localDetails');
-        $getForFormIdDraftDetails = $this->receive_model->getForFormIdDraftDetails(); // Check if the employee exist
+        $getDetailsFor = $this->post('getDetailsFor');
+
+        $getForFormIdDraftDetails = $this->receive_model->getForFormIdDraftDetails($getDetailsFor); // Check if the employee exist
         if ($getForFormIdDraftDetails) {
             $getForFormIdDraftDetails['status'] = REST_Controller::HTTP_OK;
             // Set the response and exit
@@ -517,6 +524,42 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
 
         }
     }
+    /*
+     * update university payment details*/
+    public function updateUniversityPaymentDetails_post(){
+        $now = new DateTime();
+        $now->setTimezone(new DateTimezone('Asia/Kolkata'));
+        $details=$this->post('details');
+        $localData=$this->post('localDetails');
+        $update['ID']=$details['ID'];
+        $update['PaymentID']=$details['paymentID'];
+        $payment['BillNo']=$details['billNo'];
+        $payment['ReceiptNo']=$details['receiptNo'];
+        $payment['Amount']=$details['billAmount'];
+        $payment['ApprovedDate']=$details['date'];
+        $payment['Remarks']=$details['comments'];
+        $payment['BranchCode']=$localData['localBranchID'];
+        $payment['updatedBy']=$localData['localUserID'];
+        $payment['updatedOn']=$now->format('Y-m-d H:i:s');
+        // debit array
+        $debit['DebitAmount']=$details['billAmount'];
+        $debit['ApprovedDate']=$details['date'];
+        $debit['BranchCode']=$localData['localBranchID'];
+        $debit['updatedBy']=$localData['localUserID'];
+        $debit['updatedOn']=$now->format('Y-m-d H:i:s');
+        $updatePaymentDetails=$this->receive_model->updatePaymentDetails($update,$payment,$debit);
+        if($updatePaymentDetails['status']==true){
+            $this->response($updatePaymentDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
 
+        }
+        else if($updatePaymentDetails['status']==false){
+            $this->response($updatePaymentDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+
+        }
+        else{
+            $this->response(['message' => 'Try again', 'status' => false], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+
+        }
+    }
 
 }

Apollo/api/application/models/Hallticket_model.php

@@ -135,8 +135,8 @@ group by semchild.SubjectID,semchild.MapID";
 		$this->db->select('T_Batch_Schedule_Child.SchId,T_Batch_Schedule_Child.SubjectID,T_Batch_Schedule_Child.ScheduleDate,T_Batch_Schedule_Child.FromTime,T_Batch_Schedule_Child.ToTime,T_Batch_Schedule_Child.SchChildId,T_Batch_Schedule_Child.SchId');
 		$this->db->from('T_Batch_Schedule_Master SCM');
         $this->db->join('T_Batch_Schedule_Child','T_Batch_Schedule_Child.SchId = SCM.SchId');
-		//$this->db->where('SCM.BranchCode',$branchcode);
+		$this->db->where('SCM.BranchCode',$branchcode);
-       // $this->db->where('T_Batch_Schedule_Child.SchId',$mapid);
+        $this->db->where('T_Batch_Schedule_Child.SchId',$mapid);
 		$this->db->where('T_Batch_Schedule_Child.SubjectID',$row->SubjectID);
         $existsheduledetails = $this->db->get();
 		//print_r($existsheduledetails);
@@ -200,16 +200,16 @@ group by semchild.SubjectID,semchild.MapID";
 public function getExistDetailsfileupload($universityID,$courseIDS,$branchId)
 	{
 		
-//	print_r($courseIDS);
+
-//	echo $universityID;
 		$i=0;
 		foreach($courseIDS as $c)
 		{
 				
 				//	$tempCourseArray= $c['CourseID'];
 				
-				 $this->db->select ('count(*) as count');
+				 $this->db->select ('count(*) as count,T_SemSubMap_Child.SubjectID');
 				$this->db->from('T_SemSubMap_Master');
+				$this->db->join('T_SemSubMap_Child','T_SemSubMap_Child.MapID=T_SemSubMap_Master.MapID');
 				$this->db->where('UniversityID',$universityID);
 				$this->db->where('CourseID',$c);
 				$result = $this->db->get();	
@@ -235,6 +235,35 @@ public function getExistDetailsfileupload($universityID,$courseIDS,$branchId)
      * @params university id and CourseID
      * created by Bala
      * */
+public function getSubjectMappingDetails($universityID,$courseIDS,$branchId)
+	{
+		
+
+	   
+		foreach($courseIDS as $c)
+		{
+				
+				//	$tempCourseArray= $c['CourseID'];
+				
+				 $this->db->select ('T_SubjectMaster.SubjectCode');
+				$this->db->from('T_SemSubMap_Master');
+				$this->db->join('T_SemSubMap_Child','T_SemSubMap_Child.MapID=T_SemSubMap_Master.MapID');
+				$this->db->join('T_SubjectMaster','T_SubjectMaster.SubjectID=T_SemSubMap_Child.SubjectID');
+				$this->db->where('T_SemSubMap_Master.UniversityID',$universityID);
+				$this->db->where('T_SemSubMap_Master.CourseID',$c);
+				$this->db->where('T_SubjectMaster.BranchCode',$branchId);
+				$result = $this->db->get();	
+				
+				
+		}
+			return $result->result();
+		
+	}
+     /*
+     * check existing data,only batchschedule.
+     * @params university id and CourseID
+     * created by Bala
+     * */
 
 	public function getExistDetails($universityID,$courseIDS,$branchId)
 	{

Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php

@@ -549,7 +549,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
         } else {
             $resultArr['studentFeeCompareDetails'] = [];
             $resultArr['formTypeStatus'] = false;
-            $resultArr['message'] = "No record found";
+            $resultArr['message'] = "No record found...";
         }
         return $resultArr;
     }
@@ -734,7 +734,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
                         $resultArr['unMatchedRecordDetails'] = $mergeFormDetails;
                         $resultArr['unMatchedRecordStatus'] = false;
                         $resultArr['unMatchedRecordFor'] = 'EnrolmentIDFile';
-                        $resultArr['message'] = "Successfully data generated";
+                        $resultArr['message'] = "No record found...";
                     }
 
 
@@ -743,7 +743,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
                     $resultArr['unMatchedRecordDetails'] = [];
                     $resultArr['unMatchedRecordStatus'] = false;
                     $resultArr['unMatchedRecordFor'] = 'EnrolmentIDFile';
-                    $resultArr['message'] = "Successfully data generated";
+                    $resultArr['message'] = "No record found...";
                 }
 
             
@@ -893,8 +893,10 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
 
     // get formid draft mode list details
     // kdk
-    public function getForFormIdDraftDetails(){
+    public function getForFormIdDraftDetails($getUnivDetails){
-        $selectQuery = "SELECT * FROM T_FormId_FeeDetails_Received_From_University WHERE DraftStatus = 1";
+        $selectUniv = $getUnivDetails['univCode'];
+
+        $selectQuery = "SELECT * FROM T_FormId_FeeDetails_Received_From_University WHERE UniversityID = '$selectUniv' AND DraftStatus = 1";
         $details = $this->db->query($selectQuery);
         $detailsList = $details->result();
         if($detailsList) {
@@ -1100,7 +1102,8 @@ $result['updatedraftStatus'] = false;
 
         $this->db->select('FUD.*, concat(ST.FirstName," ", ST.Lastname) as app_StudentName, IF(concat(ST.FirstName," " , ST.Lastname) = FUD.Student_Name, "YES", "NO") as StudentNameStatus ,
                           ST.Fathername as app_FatherName, IF(ST.Fathername = FUD.Father_Name, "YES", "NO") as FathernameStatus,
-                          CM.CourseCode as app_CourseCode, IF(CM.CourseCode = FUD.CourseCode, "YES", "NO" ) as CourseCodeStatus');
+                          CM.CourseCode as app_CourseCode, IF(CM.CourseCode = FUD.CourseCode, "YES", "NO" ) as CourseCodeStatus,
+                          IF(ENU.SemesterYear = FUD.Semester, "YES", "NO" ) as SemesterStatus');
         $this->db->from('T_FormId_FeeDetails_Received_From_University as FUD');
         $this->db->join(ENROLMENTRECEIVEDFROMUNIV.' as ENU', 'FUD.FormID = ENU.FormID' );
         $this->db->join(STUDENTCOURSE.' as STC', 'STC.EnrollmentID = ENU.EnrolmentNo');
@@ -1352,7 +1355,7 @@ $result['updatedraftStatus'] = false;
     * created by kms
     * */
     public function getPaymentVerificationDetails($search){
-        $this->db->select('UNCD.ID,UNCD.FormMapID,UNCD.PaymentMapID,UNCD.FormID,UNCD.CreditAmount,UNCD.DebitAmount,UNCD.ApprovedDate,UNCD.UniversityCode,UNCD.UniversityName,UNCD.TypeID,ENU.EnrolmentNo,UNP.BillNo,UNP.PID as PaymentID');
+        $this->db->select('UNCD.ID,UNCD.FormMapID,UNCD.PaymentMapID,UNCD.FormID,UNCD.CreditAmount,UNCD.DebitAmount,DATE_FORMAT(UNCD.ApprovedDate, "%d-%m-%Y") as FormatDate,UNCD.ApprovedDate,UNCD.UniversityCode,UNCD.UniversityName,UNCD.TypeID,ENU.EnrolmentNo,UNP.BillNo,UNP.PID as PaymentID,UNP.Amount,UNP.ReceiptNo,UNP.Remarks');
         $this->db->from(UNIVERSITYCREDITDEBIY.' as UNCD');
         $this->db->join(FORMFEESRECEIVEDFROMUNIV.' as UNFR', 'UNFR.ID = UNCD.FormMapID','left');
         $this->db->join(UNIVERSITYPAYMENT.' as UNP', 'UNP.PID = UNCD.PaymentMapID','left');
@@ -1467,4 +1470,77 @@ $result['updatedraftStatus'] = false;
         return $resultArray;
 
     }
+    /*
+    * update payment details
+    * created by kms
+    * */
+    public function updatePaymentDetails($update=null,$payment=null,$debit=null){
+        $resultArray=array();
+        $this->db->where('UNP.BillNo', $payment['BillNo']);
+        $this->db->where('UNP.PID != ', $update['PaymentID']);
+        $this->db->select('UNP.BillNo');
+        $this->db->from(UNIVERSITYPAYMENT.' as UNP');
+        $billExist = $this->db->get();
+        if($billExist->num_rows()<=0){
+            if($payment['ReceiptNo']!='' AND $payment['ReceiptNo']!=null){
+                $this->db->where('UNP1.ReceiptNo', $payment['ReceiptNo']);
+                $this->db->where('UNP1.PID != ', $update['PaymentID']);
+                $this->db->select('UNP1.ReceiptNo');
+                $this->db->from(UNIVERSITYPAYMENT.' as UNP1');
+                $receiptExist = $this->db->get();
+                if($receiptExist->num_rows()<=0){
+                    $this->db->where('PID', $update['PaymentID']);
+                    $this->db->update(UNIVERSITYPAYMENT, $payment);
+                    if ($this->db->affected_rows() > 0) {
+                        $this->db->where('ID', $update['ID']);
+                        $this->db->update(UNIVERSITYCREDITDEBIY, $debit);
+                        if ($this->db->affected_rows() > 0) {
+                            $resultArray['status']=true;
+                            $resultArray['message']="Payment update successfully";
+                        }
+                        else{
+                            $resultArray['status']=false;
+                            $resultArray['message']="Payment update failed.try again";
+                        }
+
+                    } else {
+                        $resultArray['status']=false;
+                        $resultArray['message']="Payment failed.Try again";
+                    }
+                }
+                else{
+                    $resultArray['status']=false;
+                    $resultArray['message']="Receipt no is already exist..";
+                }
+            }
+            else{
+                $this->db->where('PID', $update['PaymentID']);
+                $this->db->update(UNIVERSITYPAYMENT, $payment);
+                if ($this->db->affected_rows() > 0) {
+                    $this->db->where('ID', $update['ID']);
+                        $this->db->update(UNIVERSITYCREDITDEBIY, $debit);
+                        if ($this->db->affected_rows() > 0) {
+                            $resultArray['status']=true;
+                            $resultArray['message']="Payment update successfully";
+                        }
+                        else{
+                            $resultArray['status']=false;
+                            $resultArray['message']="Payment update failed.try again";
+                        }
+
+
+                } else {
+                    $resultArray['status']=false;
+                    $resultArray['message']="Payment failed.Try again";
+                }
+
+            }
+        }
+        else {
+            $resultArray['status']=false;
+            $resultArray['message']="Bill no is already exist..";
+        }
+        return $resultArray;
+
+    }
 }

Apollo/assets/i18n/en.json

@@ -118,6 +118,13 @@
           "APPLICATION": "Application"
         }
       },
+      "formupload": {
+        "MAIN": "UNIVERSITY FORMS",
+        "ENROLLMENT": "Enrollment",
+        "STUDENTFEEDETAILCOMPARE": "Form Enrolment",
+        "STUDENTFROMIDFEEDETAILS": "Form Fees",
+        "UNIVERSITYFORMPAYMENT": "Payment"
+      },
       "status": {
         "MAIN": "STATUS",
         "APPLICATION": "Application",

Apollo/assets/js/config.router.js

@@ -307,30 +307,14 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
                 ncyBreadcrumb: {
                     label: 'Manage Details'
                 }
-            }).state('app.student.UnivFormEnroment', {
+            })
-                url: '/univformenrolment',
+            .state('app.formupload', {
-                templateUrl: "assets/views/student/studentUnivFeeCompareDetails.html",
+                url: '/student',
-                resolve: loadSequence('ui.select', 'spin', 'ui.mask',  'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'student_university_fee_compareCtrl', 'ngTable'),
+                template: '<div ui-view class="fade-in-up"> <div style="margin: auto; width: 50%;padding: 10px;"> STUDENT DETAILS </div> </div>',
-                title: 'University Form Enrolment',
+                title: 'Student',
                 ncyBreadcrumb: {
-                    label: 'University Form Enrolment'
+                    label: 'Student'
                 }
-            }).state('app.student.studentUnivFormIdFeeDetails', {
-                url: '/studentUnivFormIdFeeDetails',
-                templateUrl: "assets/views/student/studentUnivFormIdFeeDetails.html",
-                resolve: loadSequence('ui.select', 'spin', 'ui.mask',  'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'studentUnivFormIdFeeDetailsCtrl', 'ngTable'),
-                title: 'Student FormId Fees Details',
-                ncyBreadcrumb: {
-                    label: 'Student FormId Fees Details'
-                }
-            }).state('app.student.universityformpayment', {
-            url: '/univformpayment',
-            templateUrl: "assets/views/student/UnivFormPaymentDetails.html",
-            resolve: loadSequence('ui.select', 'spin', 'ui.mask',  'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'univFormPaymentCtrl', 'ngTable'),
-            title: 'University Form Payment Details',
-            ncyBreadcrumb: {
-                label: 'University Form Payment Details'
-            }
             }).state('app.student.status', {
                 url: '/status',
                 template: '<div ui-view class="fade-in-up"> <div style="margin: auto; width: 50%;padding: 10px;"> STUDENT STATUS UPDATE </div> </div>',
@@ -816,7 +800,31 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
                     label: 'Student Merge'
                 },
             
-            });
+            }).state('app.formupload.UnivFormEnroment', {
+            url: '/univformenrolment',
+            templateUrl: "assets/views/student/studentUnivFeeCompareDetails.html",
+            resolve: loadSequence('ui.select', 'spin', 'ui.mask',  'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'student_university_fee_compareCtrl', 'ngTable'),
+            title: 'University Form Enrolment',
+            ncyBreadcrumb: {
+                label: 'University Form Enrolment'
+            }
+        }).state('app.formupload.studentUnivFormIdFeeDetails', {
+            url: '/studentUnivFormIdFeeDetails',
+            templateUrl: "assets/views/student/studentUnivFormIdFeeDetails.html",
+            resolve: loadSequence('ui.select', 'spin', 'ui.mask',  'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'studentUnivFormIdFeeDetailsCtrl', 'ngTable'),
+            title: 'Student FormId Fees Details',
+            ncyBreadcrumb: {
+                label: 'Student FormId Fees Details'
+            }
+        }).state('app.formupload.universityformpayment', {
+            url: '/univformpayment',
+            templateUrl: "assets/views/student/UnivFormPaymentDetails.html",
+            resolve: loadSequence('ui.select', 'spin', 'ui.mask',  'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'univFormPaymentCtrl', 'ngTable'),
+            title: 'University Form Payment Details',
+            ncyBreadcrumb: {
+                label: 'University Form Payment Details'
+            }
+        });
 
 //   $locationProvider.html5Mode(true);
 

Apollo/assets/js/controllers/entrycorrectionCtrl.js

@@ -146,6 +146,10 @@ $scope.universitySearchData = '';
 
  $scope.OpenWindowStatus = false;      
     $scope.editId = -1;
+    $scope.courselist ='';
+    $scope.loadfee='';
+    $scope.feecheck=false;
+
     $scope.setEditId = function (P) 
     {    //alert(JSON.stringify(P));
       
@@ -173,11 +177,16 @@ $scope.universitySearchData = '';
                     $scope.feeInfo=response.data.details;
                    console.log($scope.feeInfo);
                     $scope.editId = P.ID;
+                    $scope.courselist =true;
+                     $scope.feecheck=false;
+
                     
                 } else {
                     $scope.feeInfo="";
                      $scope.loadfee = "No Records Found";
-
+                     $scope.courselist =false;
+                      $scope.feecheck=true;
+                      $scope.editId = P.ID;
                 }
                
             });

Apollo/assets/js/controllers/schCtrl.js

@@ -384,7 +384,7 @@ $scope.UploadFileData = function (FileDetails,myModel,courseDetails) {
                 swal("", "Saved Successfully", "success");
                 $state.go($state.current, {}, {reload: true});
             } else {
-                swal("", "Please Mapping the course supject", "error");
+                swal("",response.data.message, "error");
 				 $state.go($state.current, {}, {reload: true});
             }
         },function(error){

Apollo/assets/js/controllers/studentCtrl.js

@@ -721,12 +721,15 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
     $scope.editId = -1;
     $scope.editCourseId = -1;
     $scope.setEditId = function (unique_id, id) {
+
+       // alert()
         $scope.editId = unique_id;
         $scope.editCourseId = -1;
         $scope.studentViewPage = -1;
     }
 
     $scope.setEditCourseId = function (unique_id,id) {
+
         $scope.list = false;
         $scope.getStudentCourseList(id);
         $scope.currentStudentId = id;
@@ -837,6 +840,8 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
 
     // get Student Course List
     $scope.getStudentCourseList = function (studentId) {
+
+        console.log('in')
         $scope.courseEditLoading = true;
         $scope.list = true;
         $scope.courseEdit = false;
@@ -1740,11 +1745,15 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl
     $scope.editId = -1;
     $scope.editCourseId = -1;
     $scope.setEditId = function (uniqe_id ,id) {
+
+       // alert()
         $scope.editId = uniqe_id;
         $scope.editCourseId = -1;
     }
 
     $scope.setEditCourseId = function (uniqe_id ,id) {
+
+        //alert('1');
         $scope.list = false;
         $scope.getStudentCourseList(id);
         $scope.currentStudentId = id;
@@ -1752,6 +1761,7 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl
         $scope.editCourseId = uniqe_id;
         $scope.editId = -1;
         $scope.courseEditLoading = true;
+        $scope.courselist = true;
     }
 
 
@@ -1879,6 +1889,9 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl
                 $scope.studentCourseList = response.data.course_details;
                 // $scope.stucour =  $scope.studentCourse[0];
             } else {
+
+                $scope.courselist = false;
+                $scope.courseEditLoading='';
             }
         });
     }

Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js

@@ -129,9 +129,10 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
 
     $scope.Searchloader = false;
     $scope.studentData = false;
-
+    $scope.formIdListNoRecordFound = false;
     $scope.onSubmit = function () {
         $scope.Searchloader = true;
+        $scope.formIdListNoRecordFound = false;
         if ($scope.searchData.University !== '' && $scope.searchData.Course !== '') {
             $scope.Searchloader = true;
             var empListreq = {
@@ -151,11 +152,13 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
                     $scope.studentData = true;
                     $scope.data = response.data.studentFeeCompareDetails;
                     $scope.studentListLength = $scope.data.length;
+                    $scope.formIdListNoRecordFound = false;
                     // $scope.statusMessage = $scope.data.message;
                 } else {
+                    $scope.formIdListNoRecordFound = true;
                     $scope.Searchloader = false;
                     $scope.studentData = false;
-                    $scope.statusMessage = $scope.data.message;
+                    $scope.statusMessage = response.data.message;
                 }
             });
         } else {
@@ -190,9 +193,8 @@ $scope.exportData = function () {
     }
 
     $scope.myObjErr = {
-        "text-decoration": "underline",
+        "color": "red",
-        "text-decoration-color": "red",
+        "font-size": "inherit",
-        "font-size": "inherit"
     }
 
     $scope.editId = -1;
@@ -376,6 +378,7 @@ $scope.exportDataTab3 = function () {
     // get subtab details for the formid fee details get form the university
 
     $scope.subTabActive = function (tab) {
+        $scope.subTabactive = tab;
         if (tab == 'subTabactive2') {
             getDraftFormIdDetails();
         }
@@ -411,6 +414,7 @@ $scope.exportDataTab3 = function () {
     }
 
 
+
     $scope.draftListDetails = '';
     $scope.draftListDetailsNoRecordFound = false;
     $scope.draftListDetailsLoading = false;
@@ -426,7 +430,8 @@ $scope.exportDataTab3 = function () {
                 'Content-Type': 'application/json'
             },
             data: {
-                localDetails: localDetail
+                localDetails: localDetail,
+                getDetailsFor: $scope.formUploadUnivSelectID
             }
         };
         $http(getFormIdDraftDetailsList).then(function (response) {

Apollo/assets/js/controllers/student_university_fee_compare.js

@@ -146,10 +146,10 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
 
     $scope.Searchloader = false;
     $scope.studentData = false;
-  
+    $scope.statusMessage="";
     $scope.onSubmit = function(){
-        $scope.Searchloader = true;
         if($scope.searchData.University !== '' && $scope.searchData.Session !==''){
+            $scope.statusMessage="";
             $scope.Searchloader = true;
             var empListreq = {
                 method: 'POST',
@@ -168,15 +168,14 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
                     $scope.studentData = true;
                     $scope.data = response.data.studentFeeCompareDetails;
                     $scope.studentListLength = $scope.data.length;
-                    // $scope.statusMessage = $scope.data.message;
+                    $scope.statusMessage="";
                 } else {
                     $scope.Searchloader = false;
                     $scope.studentData = false;
-                    $scope.statusMessage = $scope.data.message;
+                    $scope.statusMessage = response.data.message;
+                    $scope.data="";
                 }
             });
-        }else {
-
         }
     }
     //export excel

Apollo/assets/js/controllers/univFormPaymentCtrl.js

@@ -176,6 +176,152 @@ app.controller('univFormPaymentCtrl', ["$scope","$rootScope","$filter", "ngTable
         };
         $rootScope.addError="";
     };
+    /*
+    * update university payment details
+    * created by kms
+    * */
+    $rootScope.updatePaymentModel = {
+        'ID':"",
+        'billNo':"",
+        'date':"",
+        'billAmount':"",
+        'receiptNo':"",
+        'comments':"",
+        'universityCode':"",
+        'universityName':"",
+        'paymentID':""
+
+    };
+    $rootScope.viewPayment = function (values) {
+        var updateDate=new Date(values.ApprovedDate).toDateString();
+        $rootScope.updateError="";
+        $rootScope.updatePaymentModel = {
+            'ID': values.ID,
+            'billNo':values.BillNo,
+            'date':$filter('date')(new Date(updateDate), 'yyyy-MM-dd'),
+            'billAmount':values.DebitAmount,
+            'receiptNo':values.ReceiptNo,
+            'comments':values.Remarks,
+            'universityCode':values.UniversityCode,
+            'universityName':values.UniversityName,
+            'paymentID':values.PaymentID
+        };
+        $rootScope.updatePaymentModal = $modal.open({
+            templateUrl: 'assets/views/student/updateUniversityPaymentModal.html',
+            // controller: 'univFormPaymentCtrl',
+            // size: size,
+            resolve: {
+                items: function () {
+                    return  $rootScope.updatePaymentModel;
+                }
+            }
+        });
+
+        $rootScope.updatePaymentModal.result.then(function (selectedItem) {
+        }, function () {
+            $rootScope.updatePaymentModal.close();
+            $rootScope.updatePaymentModel = {
+                'ID':"",
+                'billNo':"",
+                'date':"",
+                'billAmount':"",
+                'receiptNo':"",
+                'comments':"",
+                'universityCode':"",
+                'universityName':"",
+                'paymentID':""
+
+            };
+        });
+
+    }
+
+    $rootScope.updateError="";
+    $rootScope.updateUnivPayment = function (form,updateDetails) {
+        $rootScope.updateError="";
+        var firstError = null;
+        if (form.$invalid) {
+
+            var field = null, firstError = null;
+            for (field in form) {
+                if (field[0] != '$') {
+                    if (firstError === null && !form[field].$valid) {
+                        firstError = form[field].$name;
+                    }
+                    if (form[field].$pristine) {
+                        form[field].$dirty = true;
+                    }
+                }
+            }
+            angular.element('.ng-invalid[name=' + firstError + ']').focus();
+            //    swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
+        }
+        else{
+            var changeDate;
+            if(angular.isObject(updateDetails.date)){
+                var saveDate=new Date(updateDetails.date).toDateString();
+                 changeDate=$filter('date')(new Date(saveDate), 'yyyy-MM-dd');
+            }
+            else{
+                 changeDate=updateDetails.date;
+
+            }
+            $scope.univUpdateData = {
+                "universityCode":updateDetails.universityCode,
+                "universityName":updateDetails.universityName,
+                "billNo":updateDetails.billNo,
+                "billAmount":updateDetails.billAmount,
+                "date":changeDate,
+                "receiptNo":updateDetails.receiptNo,
+                "comments":updateDetails.comments,
+                "ID":updateDetails.ID,
+                "paymentID":updateDetails.paymentID,
+            }
+
+            var updatePayment = {
+                method: 'POST',
+                url: apiPoint.url + 'updateUniversityPaymentDetails/',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                data: {
+                    localDetails: localDetail,
+                    details: $scope.univUpdateData,
+                }
+            };
+            $http(updatePayment).then(function (response) {
+                if (response.data.status==true) {
+                    swal(" ", response.data.message, "success");
+                    $rootScope.updatePaymentModal.close();
+                    $rootScope.updatePaymentModel = {
+                        'ID':"",
+                        'billNo':"",
+                        'date':"",
+                        'billAmount':"",
+                        'receiptNo':"",
+                        'comments':"",
+                        'universityCode':"",
+                        'universityName':"",
+                        'paymentID':""
+
+                    };
+                    $rootScope.getPaymentVerificationDetails($scope.paymentVerficationModel);
+
+
+                } else {
+                    $rootScope.updateError=response.data.message;
+                    $timeout(function () {
+                        $rootScope.updateError="";
+                    }, 4000);
+
+
+                }
+            });
+        }
+
+    }
+
+
 
 
     /*
@@ -233,4 +379,24 @@ app.controller('univFormPaymentCtrl', ["$scope","$rootScope","$filter", "ngTable
         });
     };
 
+    /*
+    * cancel update modal
+    * */
+    $rootScope.cancelUpdatePaymentModal=function () {
+        $rootScope.updatePaymentModal.close();
+       /* $rootScope.updatePaymentModel = {
+            'ID':"",
+            'billNo':"",
+            'date':"",
+            'billAmount':"",
+            'receiptNo':"",
+            'comments':"",
+            'universityCode':"",
+            'universityName':"",
+            'paymentID':""
+
+        };*/
+        $rootScope.updateError="";
+    };
+
 }]);

Apollo/assets/views/edit_course.html

@@ -1,6 +1,8 @@
 
 <form name="Form" id="form" novalidate>
     <div class="row">
+
+
         <div class="col-md-12">
             <div class="col-md-12">
                 <fieldset>
@@ -26,7 +28,15 @@
                     
                    
 <!-- {{feeInfo}} -->
-                 <div class="col-md-12">
+<!-- <div ng-if="feecheck==true">
+<div align="center" style="font-weight: bold; font-size:20 ">
+{{loadfee}}
+</div>
+</div> -->
+<div ng-if="courselist == false" class="text-center">
+               <h3>No Records Found</h3>
+        </div>
+                 <div class="col-md-12" ng-if="courselist == true">
                  <!-- {{feeInfo}} -->
                     <div class="table-responsive">
                     <table  id="datatable"   class="table table-hover">

Apollo/assets/views/entry_correction.html

@@ -167,6 +167,8 @@
              <tr ng-show="editId === p.ID" ng-if="editId === p.ID">
                             <td colspan="12" ng-include src="'assets/views/edit_course.html'"></td>
                         </tr>
+
+        
          </tbody>
       </table>
    </div>

Apollo/assets/views/hallticket/batchshedule.html

@@ -167,7 +167,8 @@
                                 <fieldset>
                                     <js-xls onread="readUploadBatchDetails" onerror="error"></js-xls>
                                     <br>
-                                    <a href="https://www.w3schools.com/html/" target="_top">Sample Format</a>
+                                  <!-- <a href="C:\xampp\htdocs\apollodec\Apollo\images\Batchschedule.xlsx">Sample Format</a>-->
+                                   <a href="images/Batchschedule.xlsx">Sample Format</a>
                                     <button type="button" class="btn btn-success btn-o" style="float: right" ng-click="UploadFileData(extractFileDetails,myModel,selectedCourseNameC)"> Submit</button>
                                 
                                 </fieldset>

Apollo/assets/views/partials/nav.html

@@ -180,7 +180,7 @@
 				</a>
 			</li>-->
 				<li>
-				<a href="javascript:;">
+				<a href="javascript:void(0);">
 					<span translate="sidebar.nav.student.status.MAIN">Status Update</span> <i class="icon-arrow"></i>
 				</a>
 				<ul class="sub-menu">
@@ -216,23 +216,9 @@
 					</li>
 				</ul>
 			</li>
-			<li ui-sref-active="active">
-				<a ui-sref="app.student.UnivFormEnroment" ng-click="checkSuperAdmin()">
-					<span class="title" translate="sidebar.nav.student.STUDENTFEEDETAILCOMPARE"> University Form Enrolment </span>
-				</a>
-			</li>
-			<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 ui-sref-active="active">
-				<a ui-sref="app.student.universityformpayment" ng-click="checkSuperAdmin()">
-					<span class="title" translate="sidebar.nav.student.UNIVERSITYFORMPAYMENT"> University Form Payment </span>
-				</a>
-			</li>
 		</ul>
 	</li>
+
 	<!--<li ng-class="{'active open':$state.includes('app.call')}">
 		<a ui-sref="app.call.tracking">
 			<div class="item-content">
@@ -427,6 +413,7 @@
 		</ul>
 	</li>
 
+	
 	<li ng-class="{'active open':$state.includes('app.reports')}">
 		<a href="javascript:void(0)">
 			<div class="item-content">
@@ -522,6 +509,36 @@
 
 		</ul>
 	</li>
+	<li ng-class="{'active open':$state.includes('app.formupload')}">
+		<a href="javascript:void(0)">
+			<div class="item-content">
+				<div class="item-media">
+					<i class="ti-check"></i>
+				</div>
+				<div class="item-inner">
+					<span class="title" translate="sidebar.nav.formupload.MAIN"> University Form Upload </span><i class="icon-arrow"></i>
+				</div>
+			</div>
+		</a>
+		<ul class="sub-menu">
+			<li ui-sref-active="active">
+				<a ui-sref="app.formupload.UnivFormEnroment" ng-click="checkSuperAdmin()">
+					<span class="title" translate="sidebar.nav.formupload.STUDENTFEEDETAILCOMPARE"> Form Enrolment </span>
+				</a>
+			</li>
+			<li ui-sref-active="active">
+				<a ui-sref="app.formupload.studentUnivFormIdFeeDetails" ng-click="checkSuperAdmin()">
+					<span class="title" translate="sidebar.nav.formupload.STUDENTFROMIDFEEDETAILS"> Form Fees </span>
+				</a>
+			</li>
+			<li ui-sref-active="active">
+				<a ui-sref="app.formupload.universityformpayment" ng-click="checkSuperAdmin()">
+					<span class="title" translate="sidebar.nav.formupload.UNIVERSITYFORMPAYMENT"> Payment </span>
+				</a>
+			</li>
+		</ul>
+	</li>
+
 	<!--<li ng-class="{'active open':$state.includes('app.myprofile')}">
 		<a ui-sref="app.myprofile" ng-click="checkSuperAdmin()">
 			<div class="item-content">

Apollo/assets/views/student/UnivFormPaymentDetails.html

@@ -2,6 +2,10 @@
     .universityPaid {
         background: #f4f4f7 !important;
     }
+    .spanCursor{
+        cursor: pointer;
+
+    }
 </style>
 <section id="page-title">
     <div class="row">
@@ -12,7 +16,7 @@
             <span class="mainDescription">Form List. </span>
 
         </div>
-        <div ncy-breadcrumb></div>
+        <!--<div ncy-breadcrumb></div>-->
     </div>
 </section>
 <div class="container-fluid container-fullw bg-white" ng-controller="univFormPaymentCtrl" data-ng-init="init()">
@@ -63,8 +67,9 @@
                     <thead>
                     <tr>
                         <th> Form ID</th>
-                        <th> Enrolment No</th>
+                        <th> Enrollment ID</th>
                         <th> Bill No</th>
+                        <th> Date</th>
                         <th> Payable</th>
                         <th> Paid </th>
                         <th> Balance</th>
@@ -75,7 +80,9 @@
                     <tr ng-class="{universityPaid:p.TypeID==0}">
                         <td>{{p.FormID}}</td>
                         <td>{{p.EnrolmentNo}}</td>
-                        <td>{{p.BillNo}}</td>
+                        <td><span class="spanCursor" tooltip="Click to edit/view bill" ng-click="viewPayment(p)">{{p.BillNo}}</span></td>
+                        <td>{{p.FormatDate}}</td>
+
                         <td ng-if="p.CreditAmount==0"></td>
                         <td ng-if="p.CreditAmount>0"><span style="float:right;">{{p.CreditAmount}}</span></td>
                         <td ng-if="p.DebitAmount==0"></td>

Apollo/assets/views/student/editStudentCourseDetails.html

@@ -6,12 +6,15 @@
             })
             </script>
         <div ng-if="courseEditLoading == true" class="text-center">
-            <!--<img src="assets/images/ajax_loader_blue.gif" style="width: 5%; height: 30%">-->
+            <!-- <img src="assets/images/ajax_loader_blue.gif" style="width: 5%; height: 30%"> -->
             <h3>Fetching ...</h3>
         </div>
+        <div ng-if="courselist == false" class="text-center">
+               <h3>No Records Found</h3>
+        </div>
         <div class="col-md-12">
 
-            <fieldset ng-if="courseEditLoading == false">
+            <fieldset ng-if="courseEditLoading == false && courselist == true">
                 <legend>
                     Course Details
                 </legend>

Apollo/assets/views/student/studentUnivFeeCompareDetails.html

@@ -2,8 +2,8 @@
 <section id="page-title">
     <div class="row">
         <div class="col-sm-8">
-            <h1 class="mainTitle" translate="Enrolment Details">{{ mainTitle }}</h1>
+            <h1 class="mainTitle" translate="Enrollment Details">{{ mainTitle }}</h1>
-            <span class="mainDescription">Student Form Enrolment Details. </span>
+            <span class="mainDescription">Student Form Enrollment Details. </span>
         </div>
         <!--  <div ncy-breadcrumb></div>-->
     </div>
@@ -43,7 +43,7 @@
 
         <div class="row" ng-init="init()">
             <tabset id="here" class="tabbable">
-                <tab tabindex="1" active="tabactive1" ng-click="tabActive('tabactive1')" heading="View Enrolment Details" id="viewDetails">
+                <tab tabindex="1" active="tabactive1" ng-click="tabActive('tabactive1')" heading="Matched Details" id="viewDetails">
                     <script>
                         $("#selectBranch").change(function () {
                             $("#searchIn").focus();
@@ -52,7 +52,7 @@
                         });
                     </script>
                     <div class="col-md-12">
-                        <button class="btn btn-sm btn-info" tabindex="2" style="float: right" ng-click="addManualEnrolemntDetails('1')">Add Enrolment Details</button>
+                        <button class="btn btn-sm btn-info" tabindex="2" style="float: right" ng-click="addManualEnrolemntDetails('1')">Add Enrollment Details</button>
                     </div>
                     <div class="container" ng-show="enableEnrolment==true">
                         <form name="manualEnForm" id="manualEnForm" novalidate>
@@ -60,7 +60,7 @@
                                 <div class="col-md-12">
                                     <fieldset>
                                         <legend>
-                                            Add Enrolment Details
+                                            Add Enrollment Details
                                         </legend>
 
                                         <div class="row">
@@ -68,7 +68,7 @@
                                             <div class="col-md-12 form-group"
                                                  ng-class="{'has-error':manualEnForm.manualEnrolmentNo.$dirty && manualEnForm.manualEnrolmentNo.$invalid, 'has-success':manualEnForm.manualEnrolmentNo.$valid}">
                                                 <label>
-                                                    Enrolment ID<span class="symbol required"></span>
+                                                    Enrollment ID<span class="symbol required"></span>
                                                 </label>
 
                                                 <input type="text"  placeholder="Enter Enrolment No"
@@ -76,9 +76,9 @@
                                                        ng-model="manualEnModel.enrolmentNo" required />
                                                 <span class="error text-small block"
                                                       ng-if="manualEnForm.manualEnrolmentNo.$dirty && manualEnForm.manualEnrolmentNo.$invalid"
-                                                      ng-hide="manualEnForm.manualEnrolmentNo.$error.maxlength || manualEnForm.manualEnrolmentNo.$error.minlength || manualEnForm.manualEnrolmentNo.$error.pattern">Enrolment no is required</span>
+                                                      ng-hide="manualEnForm.manualEnrolmentNo.$error.maxlength || manualEnForm.manualEnrolmentNo.$error.minlength || manualEnForm.manualEnrolmentNo.$error.pattern">Enrollment no is required</span>
                                                 <span class="error text-small block"
-                                                      ng-if="manualEnForm.manualEnrolmentNo.$error.maxlength || manualEnForm.manualEnrolmentNo.$error.minlength || manualEnForm.manualEnrolmentNo.$error.pattern">Enter a valid enrolment no</span>
+                                                      ng-if="manualEnForm.manualEnrolmentNo.$error.maxlength || manualEnForm.manualEnrolmentNo.$error.minlength || manualEnForm.manualEnrolmentNo.$error.pattern">Enter a valid enrollment no</span>
 
                                             </div>
                                             <div class="col-md-6 form-group">
@@ -172,7 +172,7 @@
 
                                 <div class="col-md-3">
                                     <label for="form-field-select-2">
-                                               Course
+                                               Course <span class="symbol required"></span>
                         </label>
 
                                     <select ui-select2 class="form-control" tabindex="10" class="cs-select cs-skin-elastic" name="serachCourse" id="serachCourse" ng-model="searchData.Course">
@@ -191,14 +191,10 @@
 
                                 </div>
 
-                                <div class="col-md-2" style="padding-top: 2.3%;">
+                                <div class="col-md-2" style="margin-top: 23px;">
-                                    <div class="pull-right">
+                                    <button ng-disabled="searchData.University == '' || searchData.Course == ''" type="submit" class="btn btn-success" tabindex="12">
-
+                                        Get Record
-                                        <button ng-disabled="searchData.University == ''" type="submit" class="btn btn-success btn-o" tabindex="12">
-                                        Submit
                                     </button>
-
-                                    </div>
                                 </div>
                             </div>
 
@@ -207,23 +203,24 @@
 
                     <div>
                         <!--{{data | json}}-->
-                <div class="row" style="text-align: right;">
-                       
-                        <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
-                    
-                </div>        
                 <div ng-if="Searchloader">
-                    <div align="center" >
+                        <div style="color: blue; align: center;" align="center"> Loading...</div>
-                        <h3 style="color: blue;">Loading...</h3></div>
-                   <h2> {{statusMessage}} </h2>
                 </div>
-                            <div class="table-responsive" ng-if="studentData">
+                        <div align="center" ng-if="studentData==false">
+                            <div style="color: red; align: center;" align="center"> {{statusMessage}}</div>
+                        </div>
+                        <div class="row" style="text-align: right;">
+
+                            <button class="btn btn-success btn-o" ng-click="exportData()" ng-if="studentData">Export to Excel</button>
+
+                        </div>
+                        <div class="table-responsive" ng-if="studentData">
                                 <table class="table table-hover" >
                                     <thead>
                                         <tr>
                                             <th> FormID
                                             </th>
-                                            <th> Enrolment No
+                                            <th> Enrollment ID
                                             </th>
                                             <th> Form Type
                                             </th>
@@ -240,7 +237,7 @@
 
                                         </tr>
                                     </thead>
-                                    <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
+                                    <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results" pagination-id="matched">
                                         <tr>
                                             <td>
                                                     {{p.FormID}}
@@ -292,13 +289,13 @@
                                         </tr>-->
                                     </tbody>
                                 </table>
-                                <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
+                                <dir-pagination-controls pagination-id="matched" max-size="10" direction-links="true" boundary-links="true">
                                 </dir-pagination-controls>
 
                             </div>
                     </div>
                 </tab>
-                <tab tabindex="13" active="tabactive2" ng-click="tabActive('tabactive2')" heading="Unmatched Records" id="unmatchedRecord">
+                <tab tabindex="13" active="tabactive2" ng-click="tabActive('tabactive2')" heading="Un-Matched Details" id="unmatchedRecord">
 
                     <div class="col-md-3 form-group">
                         <label for="form-field-select-2">
@@ -314,7 +311,8 @@
 
                     <div class="col-md-3 form-group">
                         <label for="form-field-select-2">
-                            Course
+                            Course <span class="symbol required"></span>
+                        </label>
                         </label>
                         <select class="form-control" tabindex="15" class="cs-select cs-skin-elastic" name="mismatchCourseSearch" id="mismatchCourseSearch" ng-model="misMatchsSearchData.Course">
                             <option value=""  selected>Select Course</option>
@@ -334,7 +332,7 @@
                     </div>
 
                     <div class="col-md-2" style="margin-top: 20px;">
-                        <button class="btn btn-success" ng-disabled="!misMatchUnivSearch" ng-click="getUnmatchedRecord(misMatchsSearchData)">Get Record</button>
+                        <button class="btn btn-success" ng-disabled="!misMatchUnivSearch || misMatchsSearchData.Course=='' " ng-click="getUnmatchedRecord(misMatchsSearchData)">Get Record</button>
                     </div>
 
                    
@@ -344,11 +342,11 @@
                             <div style="color: blue; align: center;" align="center"> Loading...</div>
                         </div>
                         <div ng-if="unMatchedNoRecordFound">
-                            <div style="color: red; align: center;" align="center"> No Record Found ...</div>
+                            <div style="color: red; align: center;" align="center"> No record found ...</div>
                         </div>
                     </div>
 
-                    <div class="row" style="text-align: right;">
+                    <div class="row" style="text-align: right;" ng-if="!unMatchedNoRecordFound && unMatchedRecordDetails">
                        
                         <button class="btn btn-success btn-o" ng-click="exportDataTab2()">Export to Excel</button>
                     
@@ -359,7 +357,7 @@
                             <table class="table table-border table-hover" >
                                 <thead>
                                 <th>FormID</th>
-                                <th>EnrolmentNo</th>
+                                <th>Enrollment ID</th>
                                 <th>SemesterYear</th>
                                 <th>MobileNumber</th>
                                 <th>StudentName</th>
@@ -377,7 +375,7 @@
 
 
                                 </thead>
-                                <tbody dir-paginate="p in unMatchedRecordDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
+                                <tbody dir-paginate="p in unMatchedRecordDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results" pagination-id="unmatched">
                                 <tr>
                                     <td>{{p.FormID}}</td>
                                     <td ng-if="p.EnromentStatus==true">{{p.EnrolmentNo}}</td>
@@ -402,7 +400,7 @@
                                 </tr>
                                 </tbody>
                             </table>
-                            <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
+                            <dir-pagination-controls pagination-id="unmatched" max-size="10" direction-links="true" boundary-links="true">
                             </dir-pagination-controls>
                         </div>
 

Apollo/assets/views/student/studentUnivFormIdFeeDetails.html

@@ -101,6 +101,9 @@
                             </div>
                             <h2> {{statusMessage}} </h2>
                         </div>
+                        <div ng-if="formIdListNoRecordFound" align="center">
+                           <div style="color: red; align: center;" align="center"> No Record Found ...</div>
+                        </div>
                         <div class="row" style="text-align: right;">
                        
                             <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
@@ -164,7 +167,7 @@
                                         </th>
                                     </tr>
                                 </thead> 
-                                <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
+                                <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results" pagination-id="startSearchList">
                                     <tr>
                                         <td>
                                             <i class="glyphicon glyphicon-list-alt" tooltip="Status Details" ng-click="statusUpdate(p.ID);"></i>
@@ -186,16 +189,16 @@
                                             {{p.Year}}
                                         </td>
                                         <td>
-                                            {{p.Semester}}
+                                            <div ng-style="p.SemesterStatus == 'YES' ? myObj: myObjErr"> {{p.Semester}} </div>
                                         </td>
-                                        <td ng-style="p.StudentNameStatus == 'YES' ? myObj: myObjErr">
+                                        <td>
-                                            {{p.Student_Name}}
+                                            <div ng-style="p.StudentNameStatus == 'YES' ? myObj: myObjErr">{{p.Student_Name}}<div>
                                         </td>
-                                        <td ng-style="p.FathernameStatus == 'YES' ? myObj: myObjErr">
+                                        <td>
-                                            {{p.Father_Name}}
+                                            <div ng-style="p.FathernameStatus == 'YES' ? myObj: myObjErr"> {{p.Father_Name}}</div>
                                         </td>
-                                        <td ng-style="p.CourseCodeStatus == 'YES' ? myObj: myObjErr">
+                                        <td>
-                                            {{p.CourseCode}}
+                                           <div ng-style="p.CourseCodeStatus == 'YES' ? myObj: myObjErr"> {{p.CourseCode}} </div>
                                         </td>
                                         <td>{{p.ActualCourseFee}}</td>
                                         <td>{{p.CourseFee}}</td>
@@ -304,7 +307,7 @@
                                     </tr>
                                 </tbody>
                             </table>
-                            <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
+                            <dir-pagination-controls pagination-id="startSearchList" max-size="10" direction-links="true" boundary-links="true">
                             </dir-pagination-controls>
 
                             </div>
@@ -317,7 +320,7 @@
                             <label>
                                 University <span class="symbol required"></span>
                             </label>
-                            <select class="form-control" tabindex="1" name="formUniversity" ng-model="formUploadUnivSelectID.univCode" required>
+                            <select class="form-control" tabindex="1" name="formUniversity" ng-model="formUploadUnivSelectID.univCode" ng-change="subTabActive('subTabactive1');" required>
                                     <option value="" selected>Select University</option>
                                     <option ng-repeat="univ in universityData"  value="{{univ.UniversityID}}">{{univ.UniversityName}}</option>
                             </select>
@@ -326,7 +329,7 @@
                     </div>
 
                     <tabset ng-if="formUploadUnivSelectID.univCode" id="uploadDetails" class="tabbable">
-                        <tab tabindex="1" active="subTabactive1" ng-click="subTabActive('subTabactive1')" heading="Upload File" id="uploadFiles">
+                        <tab tabindex="1" active="subTabactive == 'subTabactive1'" ng-click="subTabActive('subTabactive1')" heading="Upload File" id="uploadFiles">
                             <div class="container-fluid">
                                 <div class="row">
 
@@ -341,7 +344,7 @@
                                 </div>
                             </div>
                         </tab>
-                        <tab tabindex="2" active="subTabactive2" ng-click="subTabActive('subTabactive2')" heading="Upload Data Manualy" id="uploadDataManualy">
+                        <tab tabindex="2" active="subTabactive == 'subTabactive2'" ng-click="subTabActive('subTabactive2')" heading="Upload Data Manualy" id="uploadDataManualy">
                             <div class="container-fluid">
                                 <div class="container">
                                     <div class="table-responsive">
@@ -422,6 +425,9 @@
                                         Loading...
                                     </div>
                                 </div>
+                                <div class="container">
+                                     <div ng-if="draftListDetailsNoRecordFound" style="color: red; align: center;" align="center"> No Record Found ...</div>
+                                </div>
                                 <div class="container">
                                     <div ng-if="draftListDetails && !draftListDetailsLoading" class="table-responsive">
                                         <table class="table table-border table-hover">
@@ -454,7 +460,7 @@
                                                 <th>Amount</th>
 
                                             </thead>
-                                            <tbody dir-paginate="p in draftListDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
+                                            <tbody dir-paginate="p in draftListDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results" pagination-id="draftListDetails">
                                                 <tr>
                                                     <td>
                                                         <i class="ti-receipt" tooltip="Add To List" ng-click="addToList(p.ID);"></i>
@@ -667,7 +673,7 @@
                                                 </tr>
                                             </tbody>
                                         </table>
-                                        <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
+                                        <dir-pagination-controls pagination-id="draftListDetails" max-size="10" direction-links="true" boundary-links="true">
                                         </dir-pagination-controls>
                                     </div>
                                 </div>
@@ -773,7 +779,7 @@
                                     <th>CourseFee</th>
                                     <th>Amount</th>
                                 </thead>
-                                <tbody dir-paginate="p in unMatchedRecordDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
+                                <tbody dir-paginate="p in unMatchedRecordDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results"  pagination-id="missMatchListDetails" >
                                     <tr>
                                         <td>{{p.FormID}}</td>
                                         <td>{{p.FormType}}</td>
@@ -785,7 +791,7 @@
                                     </tr>
                                 </tbody>
                             </table>
-                            <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
+                            <dir-pagination-controls  pagination-id="missMatchListDetails"  max-size="10" direction-links="true" boundary-links="true">
                             </dir-pagination-controls>
                         </div>
                     </div>

Apollo/assets/views/student/updateUniversityPaymentModal.html

@@ -0,0 +1,103 @@
+<div class="container-fluid container-fullw bg-white">
+    <fieldset>
+
+        <legend>Payment for : {{updatePaymentModel.universityName}}</legend>
+        <form name="UpdateFormPayment" id="form" novalidate>
+            <div class="row">
+                <div class="col-md-4 form-group"
+                     ng-class="{'has-error':UpdateFormPayment.billno.$dirty && UpdateFormPayment.billno.$invalid, 'has-success':UpdateFormPayment.billno.$valid}">
+                    <label>
+                        Bill No <span
+                            class="symbol required"></span>
+                    </label>
+
+                    <input type="text"  placeholder="Enter Bill No"
+                           tabindex="1" class="form-control" name="billno"
+                           ng-model="updatePaymentModel.billNo" capitalize disallow-spaces required/>
+                    <span class="error text-small block"
+                          ng-if="UpdateFormPayment.billno.$dirty && UpdateFormPayment.billno.$error.required">Bill no is required</span>
+                </div>
+                <div class="col-md-4 form-group"
+                     ng-class="{'has-error':UpdateFormPayment.billAmount.$dirty && UpdateFormPayment.billAmount.$invalid,'has-success':UpdateFormPayment.billAmount.$valid}">
+                    <label>
+                        Bill Amount <span class="symbol required"></span>
+                    </label>
+
+                    <input type="text"  placeholder="Enter Bill Amount"
+                           autofocus tabindex="2" class="form-control" name="billAmount" id="billAmount" ng-maxlength="9"
+                           ng-model="updatePaymentModel.billAmount" ng-pattern="/^[0-9]*$/" required/>
+                    <span class="error text-small block"
+                          ng-if="UpdateFormPayment.billAmount.$dirty && UpdateFormPayment.billAmount.$invalid"
+                          ng-hide="UpdateFormPayment.billAmount.$error.maxlength || UpdateFormPayment.billAmount.$error.pattern">Bill amount is required</span>
+                    <span class="error text-small block"
+                          ng-if="UpdateFormPayment.billAmount.$error.maxlength || UpdateFormPayment.billAmount.$error.pattern">Enter a valid amount</span>
+
+                </div>
+                <div data-ng-controller="DatepickerDemoCtrl">
+                    <div class="col-md-4 form-group"
+                         ng-class="{'has-error':UpdateFormPayment.date.$dirty && UpdateFormPayment.date.$invalid, 'has-success':UpdateFormPayment.date.$valid}">
+                        <label>
+                            Bill Date <span
+                                class="symbol required"></span>
+                        </label>
+                        <input type="text"
+                               class="form-control "
+                               ng-click="startOpen = !startOpen"
+                               datepicker-popup="dd-MM-yyyy"
+                               ng-model="updatePaymentModel.date"
+                               is-open="startOpen"
+                               ng-init="startOpen = false"
+                               name="date"
+                               datepicker-options="dateOptions"
+                               placeholder="Select Date"
+                               min-date="currentDate"
+                               max-date="futureDate"
+                               close-text="Close" required="required" ng-readonly="true"/>
+                        <span class="error text-small block"
+                              ng-if="UpdateFormPayment.date.$dirty && UpdateFormPayment.date.$error.required">Date is required.</span>
+                    </div>
+
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-md-4 form-group"
+                     ng-class="{'has-error':UpdateFormPayment.receiptNo.$dirty && UpdateFormPayment.receiptNo.$invalid}">
+                    <label>
+                        Receipt No
+                    </label>
+
+                    <input type="text"  placeholder="Enter Receipt No"
+                           tabindex="3" class="form-control" name="receiptNo"
+                           ng-model="updatePaymentModel.receiptNo" disallow-spaces/>
+                </div>
+                <div class="col-md-8 form-group"
+                     ng-class="{'has-error':UpdateFormPayment.comments.$dirty && UpdateFormPayment.comments.$invalid}">
+                    <label>
+                        Comments
+                    </label>
+                    <textarea placeholder="Enter Comments" tabindex="4"
+                              class="form-control textdsc" name="comments"
+                              ng-model="updatePaymentModel.comments"></textarea>
+                </div>
+
+            </div>
+            <div class="row">
+                <div class="col-md-12">
+                    <div class="pull-right">
+                        <span style="color:red;">{{updateError}}</span>
+                        <button type="submit" tabindex="5" class="btn btn-wide btn-success" ng-click="updateUnivPayment(UpdateFormPayment,updatePaymentModel)">
+                            Update
+                        </button>
+
+                        <input type="button" class="btn btn-warning btn-wide" tabindex="6" value="Cancel"
+                               ng-click="cancelUpdatePaymentModal();">
+
+                        </input>
+                    </div>
+                </div>
+            </div>
+
+        </form>
+    </fieldset>
+
+</div>