diff --git a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php
index 8cff220d..d5b7adfc 100644
--- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php
+++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php
@@ -278,7 +278,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
diff --git a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php
index 4a5584d9..e16502b3 100644
--- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php
+++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php
@@ -893,8 +893,10 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
 
     // get formid draft mode list details
     // kdk
-    public function getForFormIdDraftDetails(){
-        $selectQuery = "SELECT * FROM T_FormId_FeeDetails_Received_From_University WHERE DraftStatus = 1";
+    public function getForFormIdDraftDetails($getUnivDetails){
+        $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');
diff --git a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js
index 24c39d90..7b561b1e 100644
--- a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js
+++ b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js
@@ -10,7 +10,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
      */
 
     // get local client details
-    var localDetail = JSON.parse(localStorage.getItem('localObj'));
+    var localDetail = JSON.parse(localStorage.getItem('localObj')); 
     var localDetails = ipCookie('cookiechk');
 
     // load when html page load
@@ -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,27 +152,49 @@ 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 {
 
         }
     }
+   //Export excel
+   var mystyle1 = {
+    sheetid: 'Student University FormId Fees Details',
+    headers: true,
+    caption: {
+      title:'Student University FormId Fees Details',
+      width: '300px',
+      style:'font-size:50px;' 
+    },
+    // style:'background:#00FF00',
+    column: {
+      style:'font-size:16px'
+    },
+   
+};
 
+
+
+$scope.exportData = function () {
+    alasql('SELECT CAST(FormID as NUMBER) as FormID,FormType as FormType,CentreCode as CentreCode,Session as Session,CAST(Year as NUMBER) as Year,Semester as Semester,Student_Name as Student_Name,Father_Name as Father_Name,CourseCode as CourseCode,CAST(ActualCourseFee as NUMBER) as ActualCourseFee,CAST(CourseFee as NUMBER) as CourseFee,CAST(ExamFee as NUMBER) as ExamFee,CAST(EnrollmentFee as NUMBER) as EnrollmentFee,CAST(ProspectusFee as NUMBER) as ProspectusFee,CAST(ReRegFee as NUMBER) as ReRegFee,CAST(CreditTransferFee as NUMBER) as CreditTransferFee,CAST(LateralEntryFee as NUMBER) as LateralEntryFee,CAST(DualSpclFee as NUMBER) as DualSpclFee,CAST(OtherFee as NUMBER) as OtherFee,CAST(NRIFEE as NUMBER) as NRIFEE,CAST(ProvisionalFee as NUMBER) as ProvisionalFee,CAST(MigrationFee as NUMBER) as MigrationFee,CAST(UrgentResultDMCFee as NUMBER) as UrgentResultDMCFee,CAST(AdditionalFee as NUMBER) as AdditionalFee,CAST(Amount as NUMBER) as Amount INTO XLS("FormIdFeesDetails.xls",?) FROM ?',[mystyle1,$scope.data]);
+};
+   //End of export excel
     $scope.myObj = {
         // "color" : "green",
         "font-size": "inherit"
     }
 
     $scope.myObjErr = {
-        "text-decoration": "underline",
-        "text-decoration-color": "red",
-        "font-size": "inherit"
+        "color": "red",
+        "font-size": "inherit",
     }
 
     $scope.editId = -1;
@@ -330,10 +353,32 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
             }
         });
     }
+   //Export Excel
+   var mystyle = {
+    sheetid: 'Student University FormId Unmatched Records',
+    headers: true,
+    caption: {
+      title:'Student University FormId Unmatched Records',
+      width: '300px',
+      style:'font-size:50px;' 
+    },
+    // style:'background:#00FF00',
+    column: {
+      style:'font-size:16px'
+    },
+   
+};
 
+
+
+$scope.exportDataTab3 = function () {
+    alasql('SELECT CAST(FormID as NUMBER) as FormID,FormType as FormType,CentreCode as CentreCode,CourseCode as CourseCode,CAST(ActualCourseFee as NUMBER) as ActualCourseFee,CAST(CourseFee as NUMBER) as CourseFee,CAST(Amount as NUMBER) as Amount INTO XLS("FormIdUnmatchedRecords.xls",?) FROM ?',[mystyle,$scope.unMatchedRecordDetails]);
+};
+   //End of export excel
     // get subtab details for the formid fee details get form the university
 
     $scope.subTabActive = function (tab) {
+        $scope.subTabactive = tab;
         if (tab == 'subTabactive2') {
             getDraftFormIdDetails();
         }
@@ -369,6 +414,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
     }
 
 
+
     $scope.draftListDetails = '';
     $scope.draftListDetailsNoRecordFound = false;
     $scope.draftListDetailsLoading = false;
@@ -384,7 +430,8 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
                 'Content-Type': 'application/json'
             },
             data: {
-                localDetails: localDetail
+                localDetails: localDetail,
+                getDetailsFor: $scope.formUploadUnivSelectID
             }
         };
         $http(getFormIdDraftDetailsList).then(function (response) {
diff --git a/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html b/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html
index 7072f594..09eecdf4 100644
--- a/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html
+++ b/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html
@@ -101,6 +101,14 @@
                             </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>
+                        
+                        </div>  
                         <div class="table-responsive" ng-if="studentData">
                             <table class="table table-hover">
                                 <thead>
@@ -158,7 +166,7 @@
                                         <th> Amount
                                         </th>
                                     </tr>
-                                </thead>
+                                </thead> 
                                 <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
                                     <tr>
                                         <td>
@@ -181,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">
-                                            {{p.Student_Name}}
+                                        <td>
+                                            <div ng-style="p.StudentNameStatus == 'YES' ? myObj: myObjErr">{{p.Student_Name}}<div>
                                         </td>
-                                        <td ng-style="p.FathernameStatus == 'YES' ? myObj: myObjErr">
-                                            {{p.Father_Name}}
+                                        <td>
+                                            <div ng-style="p.FathernameStatus == 'YES' ? myObj: myObjErr"> {{p.Father_Name}}</div>
                                         </td>
-                                        <td ng-style="p.CourseCodeStatus == 'YES' ? myObj: myObjErr">
-                                            {{p.CourseCode}}
+                                        <td>
+                                           <div ng-style="p.CourseCodeStatus == 'YES' ? myObj: myObjErr"> {{p.CourseCode}} </div>
                                         </td>
                                         <td>{{p.ActualCourseFee}}</td>
                                         <td>{{p.CourseFee}}</td>
@@ -312,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>
@@ -321,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">
 
@@ -336,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">
@@ -417,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">
@@ -752,6 +763,11 @@
                             <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
                             </dir-pagination-controls>
                         </div>
+                        <div class="row" style="text-align: right;">
+                       
+                            <button class="btn btn-success btn-o" ng-click="exportDataTab3()">Export to Excel</button>
+                        
+                        </div>  
                         <div ng-if="unMatchedRecordDetailsType == 'FormIDFile'">
                             <table class="table table-border table-hover">
                                 <thead>