diff --git a/Apollo/api/application/controllers/Report.php b/Apollo/api/application/controllers/Report.php
index 8a5eb136..d089469b 100755
--- a/Apollo/api/application/controllers/Report.php
+++ b/Apollo/api/application/controllers/Report.php
@@ -91,7 +91,9 @@ class Report extends REST_Controller {
         $bat = $this->post('batch');
         $br = $this->post('branch');
         $u = $this->post('university');
-        $getStatus = $this->report_model->certificate_status($bat,$br,$u);
+		 $from = $this->post('from');
+        $to = $this->post('to');
+        $getStatus = $this->report_model->certificate_status($bat,$br,$u,$from,$to);
         //print_r($getStatus);
         if ($getStatus)
         {
@@ -339,7 +341,30 @@ class Report extends REST_Controller {
     public function filters_post()
     {
         $br = $this->post('branch');
-        $getStatus = $this->report_model->filters($br);
+        $getStatus = $this->report_model->getUniversity($br);
+        //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 BatchName_post()
+    {
+		$br = $this->post('branch');
+        $batch = $this->post('batch');
+        $getStatus = $this->report_model->BatchName($br,$batch);
         //print_r($getStatus);
         if ($getStatus)
         {
diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php
index 79de6b99..f116fba3 100755
--- a/Apollo/api/application/models/Reports_model.php
+++ b/Apollo/api/application/models/Reports_model.php
@@ -34,7 +34,7 @@ order by CourseID) as cm
         on cm.cid=cfd.ccid
         left join 
         (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,AlternateNumber,PresentAddress as address FROM T_StudentDetails where IsActive = 1) as std on std.sid=sms.sid
-left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid
+left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid 
        where sms.branch = '".$br."'
         ";
        
@@ -64,17 +64,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
     
     }
     public function filters($br){
-       $sql = "SELECT distinct BatchCode as batchcode,BatchName as batch,BatchDate FROM T_BatchMaster 
-where BranchCode = '".$br."'";
-        $b=$this->db->query($sql);
-        $batch = $b->result();
-        if (count($batch) > 0) {
-            $results['batchlist'] = true;
-            $results['batch'] = $batch;
-        } else {
-            $results['batchlist'] = false;
-            $results['message']      = 'No record found';
-        }
+       
         
         $sql = "SELECT distinct UniversityID as uid,UniversityName as university FROM T_UniversityMaster
         where BranchCode = '".$br."'";
@@ -89,13 +79,30 @@ where BranchCode = '".$br."'";
         }
         return $results;
     
+    }
+	 public function BatchName($br,$batch){
+       $sql = "SELECT distinct BatchCode as batchcode,BatchName as batch,BatchDate FROM T_BatchMaster 
+where BranchCode = '".$br."' and BatchName = '".$batch."'";
+        $b=$this->db->query($sql);
+        $batch = $b->result();
+        if (count($batch) > 0) {
+            $results['batchlists'] = true;
+            $results['batchName'] = $batch;
+        } else {
+            $results['batchlists'] = false;
+            $results['message']      = 'No record found';
+        }
+        
+       
+    
     }
     public function markcard($bat=null,$br=null,$u=null){
        
         $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(sfs.rollno,'-') as Roll_NO,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sms.cdate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status,ifnull(sfp.bdate,'-') as Initial_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_Fee,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,appdate,ansdate 
         from 
-        (SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode,CertificationType as ctype,CDate as cdate,Sem as sem FROM T_CertificationStatus  
-WHERE ID IN (SELECT max(ID) FROM T_CertificationStatus group by StudentID,CourseID,BranchCode,Sem)
+        (SELECT c.ID,StudentID as sid,c.CourseID as cid,c.BranchCode as branch,c.ListCode as lcode,p.ListName,c.CertificationType as ctype,c.CDate as cdate,c.Sem as sem FROM T_CertificationStatus c
+ left join T_PickListDetails p on p.ListCode=c.ListCode
+WHERE c.ID IN (SELECT max(ID) FROM T_CertificationStatus group by StudentID,CourseID,BranchCode,Sem)
 group by sid,sem,cid,lcode,branch) as sms
         left join 
         (SELECT FeesID as fid,BatchCode as batch,StudentID as sid,RollNO as rollno,CourseID as cid,FeesType as ftype,sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others FROM T_Students_Fees_Status
@@ -161,7 +168,7 @@ group by sid,sem) as apdate on apdate.sid=sms.sid and apdate.sem=cfd.syear
         return $results;
     
     }
-    public function certificate_status($bat=null,$br=null,$u=null){
+    public function certificate_status($bat=null,$br=null,$u=null,$from=null,$to=null){
        
         $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(list.status,'-') as Markcard_status,ifnull(sms.mdate,'-') as Markcard_date,ifnull(sms.mcmts,'-') as Markcard_comments,ifnull(ams.certname,'-') as Certificate_name,ifnull(alist.astatus,'-') as Certificate_status,ifnull(ams.adate,'-') as Certificate_date,ifnull(ams.acmts,'-') as Certificate_comments,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber 
         from 
@@ -218,6 +225,14 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
             $sql.=" and cm.uid = '".$u."'";
           
           }
+		  if ($from != '' and $to != ''){
+            $fromd= date("Y-m-d",strtotime($from));
+            $tod=date("Y-m-d",strtotime($to));
+            
+            $sql.="and STR_TO_DATE(ams.adate,'%d-%m-%Y') >= '".$fromd."'
+                and STR_TO_DATE(ams.adate,'%d-%m-%Y') <= '".$tod."'";
+        
+        }
           $sql.=" group by Student_id,Course_id,Batch_code,Branch_code";
           
         $leadDet=$this->db->query($sql);
@@ -319,7 +334,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
        
         $sql = "SELECT ifnull(dbm.Date,'-') as date,ifnull(exp.TypeName,'-') as Expense_name,ifnull(sum(dbm.Amount),0) as Amount FROM (SELECT @s:= 0) AS s,T_Income_Outcome_Master exp
         join T_DayBookMaster dbm on dbm.Type=exp.ID
-        where dbm.Name = 'I001' and dbm.Status = 'Approved' and exp.BranchCode = '".$br."'
+        where dbm.Name = 'I001' and exp.TypeName not like 'FEES' and dbm.Status = 'Approved' and exp.BranchCode = '".$br."'
         ";
        
           if ($from and $to != ''){
@@ -348,7 +363,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
     }
     public function answer_booklet($bat=null,$br=null,$u=null){
        
-        $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(sms.adate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,listdate.issuedate,listdate.rcvedate
+        $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(sms.adate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,listdate.issuedate as issuedate,listdate.rcvedate as rcvedate,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as balance
 
         from 
 			 (SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode,AnsDate as  
@@ -422,7 +437,7 @@ group by sid
     public function app_pending($bat=null,$br=null,$u=null){
        
         $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(cfd.syear,'-') as Sem_year,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,ifnull(sfp.bdate,'-') as Admission_date,
-        ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
+        ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,sms.adate as appdate
         from 
 			 (SELECT ID,StudentID as sid,CourseID as cid,app.BranchCode as branch,list.ListName as status,app.ListCode as lcode,AppDate as adate,Comments as acmts,CertificationType as ctype,CertificateName as certname FROM T_ApplicationStatus as app
 left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType
@@ -784,5 +799,49 @@ from T_Lead_Tracking_Followup as ltf
         return $results;
     
     }
+	public function getUniversity($br=null)
+    {
+        $this->db->select('UniversityID,UniversityName');
+        $this->db->where('IsActive','1');
+        $this->db->where('BranchCode',$br);
+        $this->db->order_by('CreatedOn','DESC');
+        $university = $this->db->get(UNIVERSITY);
+
+        if($university->result()){
+            $result = array();
+            $result['univlist'] = true;
+            foreach ($university->result() as $row)
+            {
+
+                $university_array['universityID'] = $row->UniversityID;
+                $university_array['universityName'] = $row->UniversityName;
+                $university_array['batchDetails']= $this->getBatch($row->UniversityID,$br);
+                $result_array[]=$university_array;
+            }
+            $result['university']= $result_array;
+        }
+        else {
+            $result['univlist'] = false;
+            $result['message'] = "No records found!";
+            $result['universityID'] = "";
+            $result['universityName'] = "";
+            $result['batchDetails']= "";
+        }
+
+
+        return $result;
+
+    }
+    
+    public function getBatch($universityID=null,$br=null)
+    {
+        $this->db->select('BatchCode,BatchName');
+        $this->db->where('UniversityID',$universityID);
+        $this->db->where('IsActive','1');
+        $this->db->where('BranchCode',$br);
+        $this->db->order_by('BatchCode','ASC');
+        $batchDetails = $this->db->get(BATCH);
+        return $batchDetails->result();
+    }
     
 }
\ No newline at end of file
diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json
index d4c1260e..2c8f0340 100755
--- a/Apollo/assets/i18n/en.json
+++ b/Apollo/assets/i18n/en.json
@@ -81,14 +81,13 @@
 	   "report": {
         "TITLE": "REPORTS",
         "studmatstatus": "STUDY MATERIAL STATUS ",
-		"unidataupload":"UNIVERSITY DATA UPLOAD",
         "mstatus": "MARK CARD STATUS ",
         "certificate_status": "CERTIFICATE STATUS ",
         "certificate_mark_status": "MARKCARD/CERTIFICATE ISSUED STATUS ",
         "expense": "EXPENSE REPORT ",
         "answer_booklets": "ANSWER BOOKLETS STATUS REPORT ",
         "app_pending": "APPLICATION PENDING STUDENT LIST REPORT",
-        "doc_pending": "DOCUMENT PENDING STUDENT LIST REPORT",
+        "doc_pending": "STUDENT DOCUMENTS PENDING REPORT",
         "wav_ref": "WAIVER AND REFERAL REPORT",
         "examfee": "EXAM WRITING FEE REPORT",
         "balfee": "FEE BALANCE REPORT",
diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js
index c35c524d..90bc2c36 100755
--- a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js
+++ b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js
@@ -39,7 +39,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod
         // DataTables configurable options
 
 
-        $scope.filters = {
+        $scope.univModel = {
             "branch": "",
             "university": "",
             "batch": "",
@@ -95,8 +95,8 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod
                 },
                 data: {
                     branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.filters.university,
-                    batch: $scope.filters.batch
+                    university: $scope.univModel.university.universityID,
+                    batch: $scope.univModel.batch
                    
                 }
 
@@ -133,7 +133,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod
         
         
         $scope.exportData = function () {
-            alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,Status as AnswerBookletStatus,Date as Date INTO XLS("Answer_booklet_status.xls",?) FROM ?',[mystyle,$scope.ans_book_data]);
+            alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,CAST(balance AS NUMBER) as BalanceFee,issuedate as IssuedToStudentDate,rcvedate as ReceivedFromStudentDate,Status as AnswerBookletStatus,Date as Date INTO XLS("Answer_booklet_status.xls",?) FROM ?',[mystyle,$scope.ans_book_data]);
         };
 
 /*modal controller
diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js
index 6f5f5fa6..8cca0fef 100755
--- a/Apollo/assets/js/controllers/report_app_pendingCtrl.js
+++ b/Apollo/assets/js/controllers/report_app_pendingCtrl.js
@@ -39,7 +39,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
         // DataTables configurable options
 
 
-        $scope.filters = {
+        $scope.univModel = {
             "branch": "",
             "university": "",
             "batch": "",
@@ -95,8 +95,8 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
                 },
                 data: {
                     branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.filters.university,
-                    batch: $scope.filters.batch
+                    university: $scope.univModel.university.universityID,
+                    batch: $scope.univModel.batch
                    
                 }
 
diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js
index cb0d843e..aab98246 100755
--- a/Apollo/assets/js/controllers/report_balfeeCtrl.js
+++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js
@@ -47,7 +47,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
         //     $scope.serial = newPageNumber * $scope.itemPerPage - ($scope.itemPerPage-1);
         // }
         //to filter labels
-        $scope.filters = {
+        $scope.univModel = {
             "branch": "",
             "university": "",
             "batch": "",
@@ -103,8 +103,8 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
                 },
                 data: {
                     branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.filters.university,
-                    batch: $scope.filters.batch
+                    university: $scope.univModel.university.universityID,
+                    batch: $scope.univModel.batch
                    
                 }
 
diff --git a/Apollo/assets/js/controllers/report_certificateCtrl.js b/Apollo/assets/js/controllers/report_certificateCtrl.js
index 15daec08..81ffff7b 100755
--- a/Apollo/assets/js/controllers/report_certificateCtrl.js
+++ b/Apollo/assets/js/controllers/report_certificateCtrl.js
@@ -39,10 +39,12 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
         // DataTables configurable options
 
 
-        $scope.filters = {
+        $scope.univModel = {
             "branch": "",
             "university": "",
             "batch": "",
+            "from_date": "",
+            "to_date": "",
 
         };
 
@@ -94,8 +96,10 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
                 },
                 data: {
                     branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.filters.university,
-                    batch: $scope.filters.batch
+                    university: $scope.univModel.university.universityID,
+                    batch: $scope.univModel.batch,
+					from : $scope.univModel.from_date,
+                    to : $scope.univModel.to_date
                 }
 
             };
diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js
index f032cefd..b646cb4f 100755
--- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js
+++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js
@@ -39,7 +39,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
         // DataTables configurable options
 
 
-        $scope.filters = {
+        $scope.univModel = {
             "branch": "",
             "university": "",
             "batch": "",
@@ -95,8 +95,8 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
                 },
                 data: {
                     branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.filters.university,
-                    batch: $scope.filters.batch
+                    university: $scope.univModel.university.universityID,
+                    batch: $scope.univModel.batch
                    
                 }
 
diff --git a/Apollo/assets/js/controllers/report_examfeeCtrl.js b/Apollo/assets/js/controllers/report_examfeeCtrl.js
index 18bce29f..35937f3b 100755
--- a/Apollo/assets/js/controllers/report_examfeeCtrl.js
+++ b/Apollo/assets/js/controllers/report_examfeeCtrl.js
@@ -39,7 +39,7 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
         // DataTables configurable options
 
 
-        $scope.filters = {
+        $scope.univModel = {
             "branch": "",
             "university": "",
             "batch": "",
@@ -95,8 +95,8 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
                 },
                 data: {
                     branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.filters.university,
-                    batch: $scope.filters.batch
+                    university: $scope.univModel.university.universityID,
+                    batch: $scope.univModel.batch
                    
                 }
 
diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
index f0db496b..d4e31322 100755
--- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
+++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
@@ -39,7 +39,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
         // DataTables configurable options
 
 
-        $scope.filters = {
+        $scope.univModel = {
             "branch": "",
             "university": "",
             "batch": "",
@@ -96,10 +96,10 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
                 },
                 data: {
                     branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.filters.university,
-                    batch: $scope.filters.batch,
-                    from : $scope.filters.from_date,
-                    to : $scope.filters.to_date
+                    university: $scope.univModel.university.universityID,
+                    batch: $scope.univModel.batch,
+                    from : $scope.univModel.from_date,
+                    to : $scope.univModel.to_date
                 }
 
             };
diff --git a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js
index f6fe4989..d76fc58e 100755
--- a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js
+++ b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js
@@ -39,7 +39,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
         // DataTables configurable options
 
 
-        $scope.filters = {
+        $scope.univModel = {
             "branch": "",
             "university": "",
             "batch": "",
@@ -95,8 +95,8 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
                 },
                 data: {
                     branch:  JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.filters.university,
-                    batch: $scope.filters.batch
+                    university: $scope.univModel.university.universityID,
+                    batch: $scope.univModel.batch
                 }
 
             };
@@ -124,7 +124,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
             },
             // style:'background:#00FF00',
             column: {
-              style:'font-size:10px'
+              style:'font-size:16px'
             },
            
         };
diff --git a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js
index 3b71259a..f17415b7 100755
--- a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js
+++ b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js
@@ -1,7 +1,7 @@
 'use strict';
 /*** controller***/
-app.controller('report_study_material_statusCtrl', ["$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) {
+app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootScope", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', '$window',"dateListDescService","$modal","$timeout",
+    function ($scope, $filter,$rootScope,apiPoint, $http, SweetAlert, $state, md5, ipCookie, $window, dateListDescService,$modal,$timeout,$log) {
 
         /**
          * auto call tracking
@@ -39,7 +39,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
         // DataTables configurable options 
    
  
-       $scope.filters = {  
+       $scope.univModel = {  
             "branch": "",
             "university": "",
             "batch": "",
@@ -61,27 +61,44 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
             };
             $http(filterlist).then(function (response) { 
                 if (response.data) {
-                    $scope.batch=[];
-                    $scope.batchlist = response.data.batch;
                     $scope.university = response.data.university;
                     //Desc order Batchlist
-                    angular.forEach($scope.batchlist,function (values,key) {
-                        var parts = values.BatchDate.split("-");
-                        $scope.batch.push({
-                            "batchcode":values.batchcode,
-                            "batch":values.batch + '('+ values.batchcode + ')',
-                            "BatchDate":values.BatchDate,
-                            "givenDateObject":new Date(parts[2], parts[1] - 1, parts[0])
-                        })
-                    });
+                   
                     // call service for make a list in desc order based on date
-                    $scope.batch=dateListDescService.getOrderByList($scope.batch);
+                    
                 // console.log(response.data.batch);
                 // console.log($scope.batch);
                 } else {
                 }
             });
         } 
+		//dropdown values for batch
+		$scope.getBatch = function(Form,filters){
+			$scope.batchValue= filters.university;
+			
+			 var filterBatch = {
+                method: 'POST',
+                url: apiPoint.url + 'report_BatchName/',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                data: {
+                    branch : JSON.parse(localStorage.getItem('localObj')).localBranchID,
+                    batch : $scope.batchValue
+                }
+                
+            };
+			//console.log($scope.batchValue);
+			$scope.batchName = "";
+			 $http(filterBatch).then(function (response) { 
+                if (response.data) {
+                   
+                    $scope.batchName = response.data.batchName;
+                    console.log($scope.batchName);
+                } else {
+                }
+            });
+		}
           
  $scope.onSubmit = function() {
      //alert($scope.batch.name);
@@ -95,8 +112,8 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
             },
             data: {
                 branch : JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                university : $scope.filters.university,
-                batch : $scope.filters.batch
+                university : $scope.univModel.university.universityID,
+                batch : $scope.univModel.batch
             }
             
         };
diff --git a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js
index 2c918064..a7daf5f4 100755
--- a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js
+++ b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js
@@ -6,7 +6,7 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S
         // DataTables configurable options
 
 
-        $scope.filters = {
+        $scope.univModel = {
             "branch": "",
             "university": "",
             "batch": "",
@@ -63,8 +63,8 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S
                 },
                 data: {
                     branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.filters.university,
-                    batch: $scope.filters.batch
+                    university: $scope.univModel.university.universityID,
+                    batch: $scope.univModel.batch
                    
                 }
 
diff --git a/Apollo/assets/views/hallticket/semcoursemap.html b/Apollo/assets/views/hallticket/semcoursemap.html
index 569963b2..aad606fb 100755
--- a/Apollo/assets/views/hallticket/semcoursemap.html
+++ b/Apollo/assets/views/hallticket/semcoursemap.html
@@ -114,11 +114,11 @@
 												<ui-select multiple ng-model="selectedSubjetcsSem1ViewPage.list" tabindex="4" id="sem1" ng-change="modifySelectedSubjetcs(selectedSubjetcsSem1ViewPage.list);" on-remove="itemRemove($item);">
 												
 																<ui-select-match placeholder="Select Subjetcs" >
-																	{{$item.SubjectName}} 
+																{{$item.SubjectCode}}-{{$item.SubjectName}} 
 																</ui-select-match>
 																<ui-select-choices
 																		repeat="x in overAllSubjects | filter:$select.search">
-																	{{x.SubjectName}}
+																	{{x.SubjectCode}}-{{x.SubjectName}}
 																</ui-select-choices>
 															</ui-select>
 													 
@@ -132,11 +132,11 @@
 												<ui-select multiple ng-model="selectedSubjetcsSem2ViewPage.list"  tabindex="5" ng-change="modifySelectedSubjetcs(selectedSubjetcsSem2ViewPage.list);" on-remove="itemRemove($item);">
 												
 																<ui-select-match placeholder="Select Subjetcs" >
-																	{{$item.SubjectName}} 
+																	{{$item.SubjectCode}}-{{$item.SubjectName}} 
 																</ui-select-match>
 																<ui-select-choices
 																		repeat="x in overAllSubjects | filter:$select.search">
-																	{{x.SubjectName}}
+																	{{x.SubjectCode}}-{{x.SubjectName}}
 																</ui-select-choices>
 															</ui-select>
 													 <!-- <pre>{{selectedSubjetcsSem2C.list | json}}</pre>  -->
@@ -156,11 +156,11 @@
 												<ui-select multiple ng-model="selectedSubjetcsSem3ViewPage.list" tabindex="6" ng-change="modifySelectedSubjetcs(selectedSubjetcsSem3ViewPage.list);" on-remove="itemRemove($item);">
 												
 																<ui-select-match placeholder="Select Subjetcs" >
-																	{{$item.SubjectName}} 
+																	{{$item.SubjectCode}}-{{$item.SubjectName}} 
 																</ui-select-match>
 																<ui-select-choices
 																		repeat="x in overAllSubjects | filter:$select.search">
-																	{{x.SubjectName}}
+																	{{x.SubjectCode}}-{{x.SubjectName}}
 																</ui-select-choices>
 															</ui-select>
 													 <!-- <pre>{{selectedSubjetcsSem3C.list | json}}</pre>  -->
@@ -179,11 +179,11 @@
 												<ui-select multiple ng-model="selectedSubjetcsSem4ViewPage.list" tabindex="7" ng-change="modifySelectedSubjetcs(selectedSubjetcsSem4ViewPage.list);" on-remove="itemRemove($item);">
 												
 																<ui-select-match placeholder="Select Subjetcs" >
-																	{{$item.SubjectName}} 
+																	{{$item.SubjectCode}}-{{$item.SubjectName}} 
 																</ui-select-match>
 																<ui-select-choices
 																		repeat="x in overAllSubjects | filter:$select.search">
-																	{{x.SubjectName}}
+																	{{x.SubjectCode}}-{{x.SubjectName}}
 																</ui-select-choices>
 															</ui-select>
 													 <!-- <pre>{{selectedSubjetcsSem4C.list | json}}</pre>  -->
@@ -203,11 +203,11 @@
 												<ui-select multiple ng-model="selectedSubjetcsSem5ViewPage.list" tabindex="8" ng-change="modifySelectedSubjetcs(selectedSubjetcsSem5ViewPage.list);" on-remove="itemRemove($item);">
 												
 																<ui-select-match placeholder="Select Subjetcs" >
-																	{{$item.SubjectName}} 
+																	{{$item.SubjectCode}}-{{$item.SubjectName}} 
 																</ui-select-match>
 																<ui-select-choices
 																		repeat="x in overAllSubjects | filter:$select.search">
-																	{{x.SubjectName}}
+																	{{x.SubjectCode}}-{{x.SubjectName}}
 																</ui-select-choices>
 															</ui-select>
 													 <!-- <pre>{{selectedSubjetcsSem5C.list | json}}</pre>  -->
@@ -221,11 +221,11 @@
 												<ui-select multiple ng-model="selectedSubjetcsSem6ViewPage.list" tabindex="9" ng-change="modifySelectedSubjetcs(selectedSubjetcsSem6ViewPage.list);" on-remove="itemRemove($item);">
 												
 																<ui-select-match placeholder="Select Subjetcs" >
-																	{{$item.SubjectName}} 
+																	{{$item.SubjectCode}}-{{$item.SubjectName}} 
 																</ui-select-match>
 																<ui-select-choices
 																		repeat="x in overAllSubjects | filter:$select.search">
-																	{{x.SubjectName}}
+																	{{x.SubjectCode}}-{{x.SubjectName}}
 																</ui-select-choices>
 															</ui-select>
 													 <!-- <pre>{{selectedSubjetcsSem6C.list | json}}</pre>  -->
@@ -245,11 +245,11 @@
 												<ui-select multiple ng-model="selectedSubjetcsSem7ViewPage.list" tabindex="10" ng-change="modifySelectedSubjetcs(selectedSubjetcsSem7ViewPage.list);" on-remove="itemRemove($item);">
 												
 																<ui-select-match placeholder="Select Subjetcs" >
-																	{{$item.SubjectName}} 
+																	{{$item.SubjectCode}}-{{$item.SubjectName}} 
 																</ui-select-match>
 																<ui-select-choices
 																		repeat="x in overAllSubjects | filter:$select.search">
-																	{{x.SubjectName}}
+																	{{x.SubjectCode}}-{{x.SubjectName}}
 																</ui-select-choices>
 															</ui-select>
 													  <!-- <pre>{{viewPage.SubjectDetails[7] | json}}</pre>  -->
@@ -263,11 +263,11 @@
 												<ui-select multiple ng-model="selectedSubjetcsSem8ViewPage.list" tabindex="11" ng-change="modifySelectedSubjetcs(selectedSubjetcsSem8ViewPage.list);" on-remove="itemRemove($item);">
 												
 																<ui-select-match placeholder="Select Subjetcs" >
-																	{{$item.SubjectName}} 
+																	{{$item.SubjectCode}}-{{$item.SubjectName}} 
 																</ui-select-match>
 																<ui-select-choices
 																		repeat="x in overAllSubjects | filter:$select.search">
-																	{{x.SubjectName}}
+																	{{x.SubjectCode}}-{{x.SubjectName}}
 																</ui-select-choices>
 															</ui-select>
 													 <!-- <pre>{{selectedSubjetcsSem8C.list | json}}</pre>  -->
@@ -367,11 +367,11 @@
 						<ui-select multiple ng-model="selectedSubjetcsSem1C.list" tabindex="4" id="sem1" ng-change="removeSelectedSubjetcs(selectedSubjetcsSem1C.list);">
 						
                                         <ui-select-match placeholder="Select Subjetcs" >
-                                            {{$item.SubjectName}} 
+                                          {{$item.SubjectCode}}-{{$item.SubjectName}}  
                                         </ui-select-match>
                                         <ui-select-choices
                                                 repeat="x in subjects | filter:$select.search">
-                                            {{x.SubjectName}}
+                                             {{x.SubjectCode}}-{{x.SubjectName}}
                                         </ui-select-choices>
                                     </ui-select>
 							 <!-- <pre>{{selectedSubjetcsSem1C.list | json}}</pre>  -->
@@ -385,11 +385,11 @@
 						<ui-select multiple ng-model="selectedSubjetcsSem2C.list"  tabindex="5" ng-change="removeSelectedSubjetcs(selectedSubjetcsSem2C.list);">
 						
                                         <ui-select-match placeholder="Select Subjetcs" >
-                                            {{$item.SubjectName}} 
+                                            {{$item.SubjectCode}}-{{$item.SubjectName}}  
                                         </ui-select-match>
                                         <ui-select-choices
                                                 repeat="x in subjects | filter:$select.search">
-                                            {{x.SubjectName}}
+                                            {{x.SubjectCode}}-{{x.SubjectName}}
                                         </ui-select-choices>
                                     </ui-select>
 							 <!-- <pre>{{selectedSubjetcsSem2C.list | json}}</pre>  -->
@@ -410,11 +410,11 @@
 						<ui-select multiple ng-model="selectedSubjetcsSem3C.list" tabindex="6" ng-change="removeSelectedSubjetcs(selectedSubjetcsSem3C.list);">
 						
                                         <ui-select-match placeholder="Select Subjetcs" >
-                                            {{$item.SubjectName}} 
+                                             {{$item.SubjectCode}}-{{$item.SubjectName}}  
                                         </ui-select-match>
                                         <ui-select-choices
                                                 repeat="x in subjects | filter:$select.search">
-                                            {{x.SubjectName}}
+                                            {{x.SubjectCode}}-{{x.SubjectName}}
                                         </ui-select-choices>
                                     </ui-select>
 							 <!-- <pre>{{selectedSubjetcsSem3C.list | json}}</pre>  -->
@@ -433,11 +433,11 @@
 						<ui-select multiple ng-model="selectedSubjetcsSem4C.list" tabindex="7" ng-change="removeSelectedSubjetcs(selectedSubjetcsSem4C.list);">
 						
                                         <ui-select-match placeholder="Select Subjetcs" >
-                                            {{$item.SubjectName}} 
+                                          {{$item.SubjectCode}}-{{$item.SubjectName}}  
                                         </ui-select-match>
                                         <ui-select-choices
                                                 repeat="x in subjects | filter:$select.search">
-                                            {{x.SubjectName}}
+                                            {{x.SubjectCode}}-{{x.SubjectName}}
                                         </ui-select-choices>
                                     </ui-select>
 							 <!-- <pre>{{selectedSubjetcsSem4C.list | json}}</pre>  -->
@@ -458,11 +458,11 @@
 						<ui-select multiple ng-model="selectedSubjetcsSem5C.list" tabindex="8" ng-change="removeSelectedSubjetcs(selectedSubjetcsSem5C.list);">
 						
                                         <ui-select-match placeholder="Select Subjetcs" >
-                                            {{$item.SubjectName}} 
+                                            {{$item.SubjectCode}}-{{$item.SubjectName}}  
                                         </ui-select-match>
                                         <ui-select-choices
                                                 repeat="x in subjects | filter:$select.search">
-                                            {{x.SubjectName}}
+                                            {{x.SubjectCode}}-{{x.SubjectName}}
                                         </ui-select-choices>
                                     </ui-select>
 							 <!-- <pre>{{selectedSubjetcsSem5C.list | json}}</pre>  -->
@@ -476,11 +476,11 @@
 						<ui-select multiple ng-model="selectedSubjetcsSem6C.list" tabindex="9" ng-change="removeSelectedSubjetcs(selectedSubjetcsSem6C.list);">
 						
                                         <ui-select-match placeholder="Select Subjetcs" >
-                                            {{$item.SubjectName}} 
+                                            {{$item.SubjectCode}}-{{$item.SubjectName}}  
                                         </ui-select-match>
                                         <ui-select-choices
                                                 repeat="x in subjects | filter:$select.search">
-                                            {{x.SubjectName}}
+                                             {{x.SubjectCode}}-{{x.SubjectName}}
                                         </ui-select-choices>
                                     </ui-select>
 							 <!-- <pre>{{selectedSubjetcsSem6C.list | json}}</pre>  -->
@@ -501,11 +501,11 @@
 						<ui-select multiple ng-model="selectedSubjetcsSem7C.list" tabindex="10" ng-change="removeSelectedSubjetcs(selectedSubjetcsSem7C.list);">
 						
                                         <ui-select-match placeholder="Select Subjetcs" >
-                                            {{$item.SubjectName}} 
+                                            {{$item.SubjectCode}}-{{$item.SubjectName}}  
                                         </ui-select-match>
                                         <ui-select-choices
                                                 repeat="x in subjects | filter:$select.search">
-                                            {{x.SubjectName}}
+                                             {{x.SubjectCode}}-{{x.SubjectName}}
                                         </ui-select-choices>
                                     </ui-select>
 							 <!-- <pre>{{selectedSubjetcsSem7C.list | json}}</pre>  -->
@@ -519,11 +519,11 @@
 						<ui-select multiple ng-model="selectedSubjetcsSem8C.list" tabindex="11" ng-change="removeSelectedSubjetcs(selectedSubjetcsSem8C.list);">
 						
                                         <ui-select-match placeholder="Select Subjetcs" >
-                                            {{$item.SubjectName}} 
+                                            {{$item.SubjectCode}}-{{$item.SubjectName}}  
                                         </ui-select-match>
                                         <ui-select-choices
                                                 repeat="x in subjects | filter:$select.search">
-                                            {{x.SubjectName}}
+                                             {{x.SubjectCode}}-{{x.SubjectName}}
                                         </ui-select-choices>
                                     </ui-select>
 							 <!-- <pre>{{selectedSubjetcsSem8C.list | json}}</pre>  -->
diff --git a/Apollo/assets/views/report_answer_booklets.html b/Apollo/assets/views/report_answer_booklets.html
index e450ccf7..a9e0e5a6 100755
--- a/Apollo/assets/views/report_answer_booklets.html
+++ b/Apollo/assets/views/report_answer_booklets.html
@@ -35,25 +35,23 @@ td,th {
 
                         <div class="row">
                            
-                            <div class="col-md-3">
+                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.university">
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university">
                                     <option value="" selected>Select University</option>
-                                    <option ng-repeat="u in university" value="{{u.uid}}"> {{u.university}}</option>
-                                </select>
+                                  </select>
                             </div>
                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.batch">
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails">
                                     <option value="" selected>Select Batch</option>
-                                    <option ng-repeat="b in batch" value="{{b.batchcode}}"> {{b.batch}}</option>
-                                </select>
+                                 </select>
                             </div>
                             <div class="col-md-2" style="padding-top: 2.3%;">
                                 <div >
@@ -98,6 +96,7 @@ td,th {
                         <th>Sem/Year</th>
                         <th>Phone No</th>
                         <th>University</th>
+						<th>Balance Fee</th>
 						<th>Issued To Student Date</th>
 						<th>Received From Student Date</th>
                         <th>Answer Booklet Status</th>
@@ -117,6 +116,7 @@ td,th {
                         <td>{{p.Sem_year}}({{p.Sem}})</td>
                         <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
                         <td>{{p.University}}</td>
+						 <td>{{p.balance}}</td>
 						<td>{{p.issuedate}}</td>
 						<td>{{p.rcvedate}}</td>
                         <td>{{p.Status}}</td>
diff --git a/Apollo/assets/views/report_application_pending.html b/Apollo/assets/views/report_application_pending.html
index ec146e3b..5f07d8da 100755
--- a/Apollo/assets/views/report_application_pending.html
+++ b/Apollo/assets/views/report_application_pending.html
@@ -37,25 +37,23 @@
 
                         <div class="row">
                             
-                            <div class="col-md-3">
+                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.university">
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university">
                                     <option value="" selected>Select University</option>
-                                    <option ng-repeat="u in university" value="{{u.uid}}"> {{u.university}}</option>
-                                </select>
+                                  </select>
                             </div>
                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.batch">
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails">
                                     <option value="" selected>Select Batch</option>
-                                    <option ng-repeat="b in batch" value="{{b.batchcode}}"> {{b.batch}}</option>
-                                </select>
+                                 </select>
                             </div>
                             <div class="col-md-2" style="padding-top: 2.3%;">
                                 <div >
@@ -102,6 +100,7 @@
                         <th>Phone No</th>
                         <th>University</th>
                         <th>Application Status</th>
+						<th>Date</th>
                         
                         
                  
@@ -120,6 +119,7 @@
                         <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
                         <td>{{p.University}}</td>
                         <td>{{p.Status}}</td>
+						 <td>{{p.appdate}}</td>
                         
                         
                     </tr>
diff --git a/Apollo/assets/views/report_balance_fee.html b/Apollo/assets/views/report_balance_fee.html
index 8cf35652..b7bf6f22 100755
--- a/Apollo/assets/views/report_balance_fee.html
+++ b/Apollo/assets/views/report_balance_fee.html
@@ -29,26 +29,24 @@
     
                             <div class="row">
                                 
-                                <div class="col-md-3">
-                                    <label for="form-field-select-2">
-                                        University
-                                    </label>
-    
-                                    <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.university">
-                                        <option value="" selected>Select University</option>
-                                        <option ng-repeat="u in university" value="{{u.uid}}"> {{u.university}}</option>
-                                    </select>
-                                </div>
-                                <div class="col-md-3">
-                                    <label for="form-field-select-2">
-                                        Batch
-                                    </label>
-    
-                                    <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.batch">
-                                        <option value="" selected>Select Batch</option>
-                                        <option ng-repeat="b in batch" value="{{b.batchcode}}"> {{b.batch}}</option>
-                                    </select>
-                                </div>
+                                 <div class="col-md-3">
+                                <label for="form-field-select-2">
+                                    University
+                                </label>
+
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university">
+                                    <option value="" selected>Select University</option>
+                                  </select>
+                            </div>
+                            <div class="col-md-3">
+                                <label for="form-field-select-2">
+                                    Batch
+                                </label>
+
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails">
+                                    <option value="" selected>Select Batch</option>
+                                 </select>
+                            </div>
                                 <div class="col-md-2" style="padding-top: 2.3%;">
                                     <div >
     
@@ -75,8 +73,10 @@
 					<div class="col-md-2">
                     <span>Paid:Rs.</span><span>{{getpaid()}}</span>
                     </div>
+			
 					<div class="col-md-2">
-                    <span>Balance:</span><span>{{getbalance()/gettotal()*100 | number : 2 || "0"}}%</span>
+					<span>Balance:Rs.</span><span>{{getbalance()}}</span>
+                    <span>({{getbalance()/gettotal()*100 | number : 2 || "0"}}%)</span>
                     </div>
                     <div class="col-md-2">
                             <button class="btn btn-success btn-o" ng-click="calltracking()">Call Tracking</button>
diff --git a/Apollo/assets/views/report_certificate_status.html b/Apollo/assets/views/report_certificate_status.html
index 46c15679..1129dc61 100755
--- a/Apollo/assets/views/report_certificate_status.html
+++ b/Apollo/assets/views/report_certificate_status.html
@@ -35,30 +35,65 @@ td,th {
 
                         <div class="row">
                             
-                            <div class="col-md-3">
+                            <div class="col-md-4">
                                 <label for="form-field-select-2">
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.university">
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university">
                                     <option value="" selected>Select University</option>
-                                    <option ng-repeat="u in university" value="{{u.uid}}"> {{u.university}}</option>
-                                </select>
+                                  </select>
                             </div>
-                            <div class="col-md-3">
+                            <div class="col-md-4">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.batch">
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails">
                                     <option value="" selected>Select Batch</option>
-                                    <option ng-repeat="b in batch" value="{{b.batchcode}}">{{b.batch}}</option>
-                                </select>
+                                 </select>
                             </div>
-                           
+                        </div>
+                        <div class="row">
+                            <div class="col-md-4">
+                                <!--<pre>{{searchData.date}}</pre>-->
+                                <div data-ng-controller="DatepickerDemoCtrl">
+                                    <label>
+                                           From Date 
+                                        </label>
+                                    <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="filters.from_date"
+                                        is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
+                                        placeholder="Select Date" close-text="Close" required="required" ng-change="changeDate()" 
+                                        show-button-bar="true" />
 
-                            <div class="col-md-2" style="padding-top: 2.3%;">
-                                <div class="pull-right">
+                                </div>
+                            </div>
+                            <div class="col-md-4">
+                                <!--<pre>{{searchData.date}}</pre>-->
+                                <div data-ng-controller="DatepickerDemoCtrl">
+                                    <label>
+                                            To Date   
+                                        </label>
+                                    <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="filters.to_date"
+                                        is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
+                                        placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()"
+                                        show-button-bar="true" />
+
+                                </div>
+                            </div>
+                            <!-- <div class="col-md-3">
+                                        <label for="form-field-select-2">
+                                                           Batch
+                                    </label>
+                                       
+                                        <select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="batch" ng-model="searchData.Batch" ng-change="getValueChange()">
+                                    <option value="" selected>Select Batch</option>
+                                    <option ng-repeat="itemBatch in batchData"  value="{{itemBatch.BatchCode}}">{{itemBatch.BatchName}}</option>
+                                    </select>
+                                    </div> -->
+
+                            <div class="col-md-3" style="padding-top: 2.3%;">
+                                <div >
 
                                     <button type="submit" class="btn btn-success btn-o" tabindex="8">
                                         Submit
@@ -66,8 +101,8 @@ td,th {
 
                                 </div>
                             </div>
-
                         </div>
+                        
 
 
                     </div>
diff --git a/Apollo/assets/views/report_document_pending.html b/Apollo/assets/views/report_document_pending.html
index 2a7bbd37..98bfaebd 100755
--- a/Apollo/assets/views/report_document_pending.html
+++ b/Apollo/assets/views/report_document_pending.html
@@ -35,25 +35,25 @@ td,th {
 
                         <div class="row">
                             
-                            <div class="col-md-3">
+                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.university">
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" >
                                     <option value="" selected>Select University</option>
-                                    <option ng-repeat="u in university" value="{{u.uid}}"> {{u.university}}</option>
-                                </select>
+                                  </select>
+								  <!--<p ng-show="Form.university.$error.required">Providing a username is mandatory.</p>-->
                             </div>
                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.batch">
-                                    <option value="" selected>Select Batch</option>
-                                    <option ng-repeat="b in batch" value="{{b.batchcode}}"> {{b.batch}}</option>
-                                </select>
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails">
+                                    <option value="" selected >Select Batch</option>
+                                 </select>
+								<!-- <p ng-show="Form.batch.$error.required">Providing a username is mandatory.</p>-->
                             </div>
                             <div class="col-md-2" style="padding-top: 2.3%;">
                                 <div >
@@ -100,8 +100,8 @@ td,th {
                         <th>Phone No</th>
                         <th>University</th>
 						<th>Document Applied Date</th>
-						<!-- <th>Document Name</th>
-                        <th>Document Status</th> -->
+						<th>Pending Document</th>
+                        <!-- <th>Document Status</th> -->
                         
                         
                  
@@ -120,8 +120,8 @@ td,th {
                         <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
                         <td>{{p.University}}</td>
 						 <td>{{p.adate}}</td>
-						  <!-- <td>{{p.certname}}</td>
-                        <td>{{p.Status}}</td> -->
+						 <td>{{p.certname}}</td>
+                         <!-- <td>{{p.Status}}</td> -->
                         
                         
                     </tr>
diff --git a/Apollo/assets/views/report_exam_writing_fee.html b/Apollo/assets/views/report_exam_writing_fee.html
index d3d12c41..f06966a0 100755
--- a/Apollo/assets/views/report_exam_writing_fee.html
+++ b/Apollo/assets/views/report_exam_writing_fee.html
@@ -35,26 +35,24 @@
     
                             <div class="row">
                                 
-                                <div class="col-md-3">
-                                    <label for="form-field-select-2">
-                                        University
-                                    </label>
-    
-                                    <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.university">
-                                        <option value="" selected>Select University</option>
-                                        <option ng-repeat="u in university" value="{{u.uid}}"> {{u.university}}</option>
-                                    </select>
-                                </div>
-                                <div class="col-md-3">
-                                    <label for="form-field-select-2">
-                                        Batch
-                                    </label>
-    
-                                    <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.batch">
-                                        <option value="" selected>Select Batch</option>
-                                        <option ng-repeat="b in batch" value="{{b.batchcode}}"> {{b.batch}}</option>
-                                    </select>
-                                </div>
+                                 <div class="col-md-3">
+                                <label for="form-field-select-2">
+                                    University
+                                </label>
+
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university">
+                                    <option value="" selected>Select University</option>
+                                  </select>
+                            </div>
+                            <div class="col-md-3">
+                                <label for="form-field-select-2">
+                                    Batch
+                                </label>
+
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails">
+                                    <option value="" selected>Select Batch</option>
+                                 </select>
+                            </div>
                                 <div class="col-md-2" style="padding-top: 2.3%;">
                                     <div >
     
diff --git a/Apollo/assets/views/report_mark_certificate_status.html b/Apollo/assets/views/report_mark_certificate_status.html
index 90e76c4b..945b94a2 100755
--- a/Apollo/assets/views/report_mark_certificate_status.html
+++ b/Apollo/assets/views/report_mark_certificate_status.html
@@ -40,20 +40,18 @@ td,th {
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.university">
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university">
                                     <option value="" selected>Select University</option>
-                                    <option ng-repeat="u in university" value="{{u.uid}}"> {{u.university}}</option>
-                                </select>
+                                  </select>
                             </div>
                             <div class="col-md-4">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.batch">
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails">
                                     <option value="" selected>Select Batch</option>
-                                    <option ng-repeat="b in batch" value="{{b.batchcode}}"> {{b.batch}}</option>
-                                </select>
+                                 </select>
                             </div>
                         </div>
                         <div class="row">
@@ -142,12 +140,11 @@ td,th {
                         <th>Phone No</th>
                         <th>University</th>
                         <th>Balance Fee</th>
-                        <th>Markcard Status</th>
-                        <th>Date</th>
-                        <th>Markcard Issued Comments</th>
                         <th>Certificates Name</th>
-                        <th>Certificates Status</th>
-                        <th>Date</th>
+                        <th>Received Status</th>
+                        <th>Received Date</th>
+						<th>Issued Status</th>
+                        <th>Issued Date</th>
                         <th>Certificate Issued Comments</th>
                  
                     </tr>
@@ -165,13 +162,13 @@ td,th {
                         <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
                         <td>{{p.University}}</td>
                         <td>{{p.Balance_fee}}</td>
-                        <td>{{p.Markcard_status}}</td>
-                        <td>{{p.Markcard_date}}</td>
-                        <td>{{p.Markcard_comments}}</td>
-                        <td>{{p.Certificate_name}}</td>
-                        <td>{{p.Certificate_status}}</td>
-                        <td>{{p.Certificate_date}}</td>
-                        <td>{{p.Certificate_comments}}</td>
+						<td>{{p.Certificate_name}}</td>
+						<td>{{p.received_status}}</td>
+                        <td>{{p.received_date}}</td>
+                        <td>{{p.issued_status}}</td>
+                        <td>{{p.issued_date}}</td>
+                        <td>{{p.issued_comments}}</td>
+                        
                     </tr>
                 
                 </tbody>
diff --git a/Apollo/assets/views/report_markcardstatus.html b/Apollo/assets/views/report_markcardstatus.html
index 5768c9a3..dbcb0ab4 100755
--- a/Apollo/assets/views/report_markcardstatus.html
+++ b/Apollo/assets/views/report_markcardstatus.html
@@ -31,20 +31,18 @@
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.university">
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university">
                                     <option value="" selected>Select University</option>
-                                    <option ng-repeat="u in university" value="{{u.uid}}"> {{u.university}}</option>
-                                </select>
+                                  </select>
                             </div>
                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.batch">
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails">
                                     <option value="" selected>Select Batch</option>
-                                    <option ng-repeat="b in batch" value="{{b.batchcode}}"> {{b.batch}}</option>
-                                </select>
+                                 </select>
                             </div>
                             <!-- <div class="col-md-3">
                                         <label for="form-field-select-2">
diff --git a/Apollo/assets/views/report_studymaterialstatus.html b/Apollo/assets/views/report_studymaterialstatus.html
index f8cdc72a..4a050029 100755
--- a/Apollo/assets/views/report_studymaterialstatus.html
+++ b/Apollo/assets/views/report_studymaterialstatus.html
@@ -28,20 +28,18 @@
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.university">
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university">
                                     <option value="" selected>Select University</option>
-                                    <option ng-repeat="u in university" value="{{u.uid}}"> {{u.university}}</option>
-                                </select>
+                                  </select>
                             </div>
                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.batch">
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails">
                                     <option value="" selected>Select Batch</option>
-                                    <option ng-repeat="b in batch" value="{{b.batchcode}}">{{b.batch}} </option> 
-                                </select>
+                                 </select>
                             </div>
                             <!-- <div class="col-md-3">
                                         <label for="form-field-select-2">
@@ -110,7 +108,7 @@
                             <td><input type="checkbox" ng-checked="myModel.all" id="{{p.Student_id}}" name="{{p.Student_id}}" class="form-control" ng-click="isClick($event);" /></td>
                         <td>{{p.SL_NO}}</td>
                         <td>{{p.Initial_paid_date}}</td>
-                        <td>{{p.Enrollment_id}}</td>
+                        <td>{{p.Enrollment_id || '-'}}</td>
                         <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Student_name}}</a></td>
                         <td>{{p.Father_name}}</td>
                         <td>{{p.Course_name}}</td>
diff --git a/Apollo/assets/views/report_waiver_referal.html b/Apollo/assets/views/report_waiver_referal.html
index ca6aef60..bee971b8 100755
--- a/Apollo/assets/views/report_waiver_referal.html
+++ b/Apollo/assets/views/report_waiver_referal.html
@@ -33,25 +33,23 @@
 
                         <div class="row">
                             
-                            <div class="col-md-3">
+                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.university">
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university">
                                     <option value="" selected>Select University</option>
-                                    <option ng-repeat="u in university" value="{{u.uid}}"> {{u.university}}</option>
-                                </select>
+                                  </select>
                             </div>
                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="filters" ng-model="filters.batch">
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails">
                                     <option value="" selected>Select Batch</option>
-                                    <option ng-repeat="b in batch" value="{{b.batchcode}}"> {{b.batch}}</option>
-                                </select>
+                                 </select>
                             </div>
                             <div class="col-md-2" style="padding-top: 2.3%;">
                                 <div >