diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php
index fcab2433..56a918e2 100644
--- a/Apollo/api/application/models/DayBook_model.php
+++ b/Apollo/api/application/models/DayBook_model.php
@@ -1147,11 +1147,32 @@ class DayBook_model extends CI_Model
                     FROM
                     T_DayBookMaster AS p 
                     join T_PickListDetails on T_PickListDetails.ListCode = p.name
-                    where '.$where.' p.IsActive=? and (p.Name=? and p.Status !=? or p.Name=?) and (p.ModeOfPayment != ? and  p.ModeOfPayment != ? ) and Status !=? and p.BranchCode=? 
-                    GROUP BY p.`Name`';
-		
-	    $query = $this->db->query($subQuery,array($incomecode,$expensecode,'Pending',$incomecode,$expensecode,'1','I001','Pending','I002','WAIVER','REFERRAL','Cancel',$br));
+                    LEFT JOIN T_Income_Outcome_Master ON T_Income_Outcome_Master.ID = p.Type
+                    where '.$where.' p.IsActive=? and 
+                    (CASE
+                    WHEN
+                        p.Name=?
+                    THEN
+                        p.ModeOfPayment != ?
+                            AND p.ModeOfPayment != ?
+                            AND p.Status != ?
+                            AND T_Income_Outcome_Master.TypeName NOT LIKE ?
+                    WHEN
+                        p.Name=?
+                    THEN
+                        p.Status != ?
+                            AND T_Income_Outcome_Master.TypeName != ?
+                            AND T_Income_Outcome_Master.TypeName NOT LIKE ?
+                    END)
+                    and Status !=? and p.BranchCode=? 
+                    GROUP BY p.`Name`';		
+	    $query = $this->db->query($subQuery,array($incomecode,$expensecode,'Pending',$incomecode,$expensecode,'1','I002','WAIVER','REFERRAL','Pending','%BY CASH%','I001','Pending','FEES','%CASH TO%','Cancel',$br));
         $expense = $query->result();  
+        // print_r($this->db->last_query());
+        // echo "    income total query";
+        // print_r($query);
+
+        // die();
         // and p.Isdaybook=?
             // if(count($expense) > 0)
             // {
@@ -1177,7 +1198,7 @@ class DayBook_model extends CI_Model
 
         $querynon = $this->db->query($subQueryNON,array($incomecode,$expensecode,$incomecode,$expensecode,'1','I001','I002','Cancel',$br,'1'));
         $expensenon = $querynon->result();  
-
+        // print_r($this->db->last_query());
         // if(count($expensenon)>0)
         // {
                 $results['expense_data_nonop'] = $expensenon;
@@ -1214,8 +1235,8 @@ class DayBook_model extends CI_Model
             when ListName = 'Expense' then T_DayBookMaster.Status !='Pending' and T_Income_Outcome_Master.TypeName != 'FEES' and T_Income_Outcome_Master.TypeName NOT LIKE '%CASH TO%' end) group by Type,Name";
         $query = $this->db->query($subQuery,array('Cancel',$branch)); 
          $expense = $query->result(); 
-
-        
+        //  print_r($this->db->last_query());
+        // die();
         if(count($expense)>0)
         {
             $results['fullexpense_detail'] = $expense;
diff --git a/Apollo/api/application/models/Studentview_model.php b/Apollo/api/application/models/Studentview_model.php
index 1a78c5e9..2782501a 100755
--- a/Apollo/api/application/models/Studentview_model.php
+++ b/Apollo/api/application/models/Studentview_model.php
@@ -151,6 +151,7 @@ class Studentview_model extends CI_Model
                     $fetchData['certificateDetails']=$this->getStudentCertificateDetails($studentId,$row->CourseID);
                     $fetchData['markCardDetails']=$this->getMarkcardDetails($studentId,$row->CourseID);
                     $fetchData['batchHistory']=$this->getbatchHistory($studentId,$row->CourseID,$requestedBranch);
+                    $fetchData['applicationHistory']=$this->getStudentApplicationDetails($studentId,$row->CourseID);
 
                     $CourseArray[]=$fetchData;
 
@@ -221,6 +222,7 @@ class Studentview_model extends CI_Model
                 // get student Mark crad details
                 $fetchData['markCardDetails']=$this->getMarkcardDetails($studentId,$row->CourseID);
                 $fetchData['batchHistory']=$this->getbatchHistory($studentId,$row->CourseID,$requestedBranch);
+                $fetchData['applicationHistory']=$this->getStudentApplicationDetails($studentId,$row->CourseID);
 
                 $CourseArray[]=$fetchData;
 
@@ -508,6 +510,7 @@ class Studentview_model extends CI_Model
         // $this->db->group_by('SMS.ID');
         $this->db->order_by('SMS.ID', 'DESC');
         $getMaterialDetails = $this->db->get();
+        // print_r($this->db->last_query());die();
        if ($getMaterialDetails->result()){
            return $getMaterialDetails->result();
        }
@@ -563,7 +566,7 @@ class Studentview_model extends CI_Model
         $this->db->where('CM.CertificateName', APPLICATION_CONST);
         $this->db->order_by('AS.ID', 'DESC');
         $getCertDetails = $this->db->get();
-        print_r($this->db->last_query());die();
+        // print_r($this->db->last_query());die();
         if($getCertDetails->result()){
             return $getCertDetails->result();
         }
@@ -677,9 +680,13 @@ class Studentview_model extends CI_Model
         // }
 
 
-
-        $subquery_old='SELECT t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year,t2.RegistrationMode,t2.RegistrationType,t1.AppFormDate as StatusUpdateDate, t3.ListName,t1.Comments FROM T_ApplicationFormStatus as t1 JOIN T_Registration_Details as t2 ON t2.ID = t1.Registration_Details_ID JOIN T_Course_Fees_Details as CFD ON CFD.ID = t2.FeeType LEFT JOIN T_PickListDetails as t3 ON t3.ListCode = t1.ListCode WHERE t2.StudentID =? AND t2.CourseID = ? and t1.ID in (select max(ID) from T_ApplicationFormStatus group by Registration_Details_ID)';
-        $subquery='SELECT t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year,t2.RegistrationMode,t2.RegistrationType,t1.AppFormDate as StatusUpdateDate, t3.ListName,t1.Comments FROM T_ApplicationFormStatus as t1 JOIN T_Registration_Details as t2 ON t2.ID = t1.Registration_Details_ID JOIN T_Course_Fees_Details as CFD ON CFD.ID = t2.FeeType LEFT JOIN T_PickListDetails as t3 ON t3.ListCode = t1.ListCode WHERE t2.StudentID =? AND t2.CourseID = ?';
+        
+        $subquery='SELECT t1.ID, t2.BatchCode,t4.BatchName,t2.FeeType as SemID, CFD.Sem_Year as Sem_Year,t2.RegistrationMode,t2.RegistrationType,t1.AppFormDate as StatusUpdateDate, t3.ListName,t1.Comments FROM T_ApplicationFormStatus as t1 JOIN T_Registration_Details as t2 ON t2.ID = t1.Registration_Details_ID 
+        JOIN T_Course_Fees_Details as CFD ON CFD.ID = t2.FeeType 
+        LEFT JOIN T_PickListDetails as t3 ON t3.ListCode = t1.ListCode 
+        LEFT JOIN T_BatchMaster as t4 on t4.BatchCode = t2.BatchCode
+        WHERE t2.StudentID =? AND t2.CourseID = ? and t1.ID in (select max(ID) from T_ApplicationFormStatus group by Registration_Details_ID)';
+        $subquery_old='SELECT t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year,t2.RegistrationMode,t2.RegistrationType,t1.AppFormDate as StatusUpdateDate, t3.ListName,t1.Comments FROM T_ApplicationFormStatus as t1 JOIN T_Registration_Details as t2 ON t2.ID = t1.Registration_Details_ID JOIN T_Course_Fees_Details as CFD ON CFD.ID = t2.FeeType LEFT JOIN T_PickListDetails as t3 ON t3.ListCode = t1.ListCode WHERE t2.StudentID =? AND t2.CourseID = ?';
 
         $query = $this->db->query($subquery,array($studentid,$courseid)); 
 
@@ -698,6 +705,25 @@ class Studentview_model extends CI_Model
 
     }
 
+    public function s(){
+        $subquery_old='SELECT t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year,t2.RegistrationMode,t2.RegistrationType,t1.AppFormDate as StatusUpdateDate, t3.ListName,t1.Comments FROM T_ApplicationFormStatus as t1 JOIN T_Registration_Details as t2 ON t2.ID = t1.Registration_Details_ID JOIN T_Course_Fees_Details as CFD ON CFD.ID = t2.FeeType LEFT JOIN T_PickListDetails as t3 ON t3.ListCode = t1.ListCode WHERE t2.StudentID =? AND t2.CourseID = ?';
+
+        $query = $this->db->query($subquery,array($studentid,$courseid)); 
+
+        $fromTypes = $query->result();  
+
+        if(count($fromTypes)>0)
+       {
+          return $fromTypes; 
+       }  
+
+       else
+       {
+            return false;
+       } 
+
+    }
+
     public function updateStudentComment($id,$value){
     
         $Arr = array('Comments'=>$value);
diff --git a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js
index 4963ba58..6ccfa8a1 100755
--- a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js
+++ b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js
@@ -545,7 +545,7 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
 app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope, $rootScope, $modal, $log,apiPoint,$http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
diff --git a/Apollo/assets/js/controllers/applicationStatusCtrl.js b/Apollo/assets/js/controllers/applicationStatusCtrl.js
index 1a3b9fb7..c68b5d3a 100644
--- a/Apollo/assets/js/controllers/applicationStatusCtrl.js
+++ b/Apollo/assets/js/controllers/applicationStatusCtrl.js
@@ -495,6 +495,7 @@ $scope.editStatusID = id;
 app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope, $rootScope, $modal, $log,apiPoint,$http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
 
diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js
index 8ec746f9..4997955e 100755
--- a/Apollo/assets/js/controllers/callTrackingCtrl.js
+++ b/Apollo/assets/js/controllers/callTrackingCtrl.js
@@ -2457,6 +2457,7 @@ app.filter('unique', function() {
 app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope, $rootScope, $modal, $log,apiPoint,$http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
 
diff --git a/Apollo/assets/js/controllers/certificateStatusCtrl.js b/Apollo/assets/js/controllers/certificateStatusCtrl.js
index 089505e5..3784f78b 100644
--- a/Apollo/assets/js/controllers/certificateStatusCtrl.js
+++ b/Apollo/assets/js/controllers/certificateStatusCtrl.js
@@ -496,6 +496,7 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
 app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope, $rootScope, $modal, $log,apiPoint,$http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
 
diff --git a/Apollo/assets/js/controllers/certificationStatusCtrl.js b/Apollo/assets/js/controllers/certificationStatusCtrl.js
index e67f0b91..1d955caa 100644
--- a/Apollo/assets/js/controllers/certificationStatusCtrl.js
+++ b/Apollo/assets/js/controllers/certificationStatusCtrl.js
@@ -498,6 +498,7 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
 app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope, $rootScope, $modal, $log,apiPoint,$http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
 
diff --git a/Apollo/assets/js/controllers/dashboardCtrl.js b/Apollo/assets/js/controllers/dashboardCtrl.js
index 84afc615..bb9d1613 100644
--- a/Apollo/assets/js/controllers/dashboardCtrl.js
+++ b/Apollo/assets/js/controllers/dashboardCtrl.js
@@ -2011,7 +2011,7 @@ app.filter('unique', function () {
 app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope, $rootScope, $modal, $log, apiPoint, $http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
diff --git a/Apollo/assets/js/controllers/daybookCtrl.js b/Apollo/assets/js/controllers/daybookCtrl.js
index 0f0af5f4..0915907b 100644
--- a/Apollo/assets/js/controllers/daybookCtrl.js
+++ b/Apollo/assets/js/controllers/daybookCtrl.js
@@ -1023,7 +1023,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
     //Tooltip for print button
 
      $scope.studentDetails='';$scope.studentDetails
-
+     $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 $scope.searchResultDetails ='';
         $scope.open = function (studentDetails) {
 
diff --git a/Apollo/assets/js/controllers/daybookadminCtrl.js b/Apollo/assets/js/controllers/daybookadminCtrl.js
index 7ed546ce..cec67f42 100644
--- a/Apollo/assets/js/controllers/daybookadminCtrl.js
+++ b/Apollo/assets/js/controllers/daybookadminCtrl.js
@@ -883,7 +883,7 @@ else
 
      $scope.studentDetails='';$scope.studentDetails
      $scope.searchResultDetails ='';
-
+     $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
              $scope.open = function (studentDetails) {
 
diff --git a/Apollo/assets/js/controllers/daybookonlineCtrl.js b/Apollo/assets/js/controllers/daybookonlineCtrl.js
index 0ae581b2..f25f25b5 100644
--- a/Apollo/assets/js/controllers/daybookonlineCtrl.js
+++ b/Apollo/assets/js/controllers/daybookonlineCtrl.js
@@ -1059,7 +1059,7 @@ else
     }
 
     $scope.studentDetails='';$scope.studentDetails
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 $scope.searchResultDetails ='';
         $scope.open = function (studentDetails) {
 
@@ -1180,7 +1180,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
     //Tooltip for print button
 
      $scope.studentDetails='';$scope.studentDetails
-
+     $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 $scope.searchResultDetails ='';
         $scope.open = function (studentDetails) {
 
diff --git a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js
index 9cfabfc2..3bfbfdf1 100644
--- a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js
+++ b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js
@@ -1053,7 +1053,7 @@ else
     }
 
     $scope.studentDetails='';$scope.studentDetails
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 $scope.searchResultDetails ='';
         $scope.open = function (studentDetails) {
 
@@ -1174,7 +1174,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
     //Tooltip for print button
 
      $scope.studentDetails='';$scope.studentDetails
-
+     $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 $scope.searchResultDetails ='';
         $scope.open = function (studentDetails) {
 
diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js
index 7e526f66..332d899a 100755
--- a/Apollo/assets/js/controllers/feesStatusCtrl.js
+++ b/Apollo/assets/js/controllers/feesStatusCtrl.js
@@ -2645,7 +2645,7 @@ app.directive('visible', function() {
 app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope, $rootScope, $modal, $log,apiPoint,$http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
diff --git a/Apollo/assets/js/controllers/generateHallTicketCtrl.js b/Apollo/assets/js/controllers/generateHallTicketCtrl.js
index 3bf4ca1d..23155b4a 100644
--- a/Apollo/assets/js/controllers/generateHallTicketCtrl.js
+++ b/Apollo/assets/js/controllers/generateHallTicketCtrl.js
@@ -518,7 +518,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS"
 
     $scope.open = function (studentDetails) {
 
-      
+		$scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
  $scope.Currentdate = new Date();
 
diff --git a/Apollo/assets/js/controllers/markcardStatusCtrl.js b/Apollo/assets/js/controllers/markcardStatusCtrl.js
index 456b6a07..7ae8eb6d 100644
--- a/Apollo/assets/js/controllers/markcardStatusCtrl.js
+++ b/Apollo/assets/js/controllers/markcardStatusCtrl.js
@@ -501,7 +501,7 @@ app.controller('markcardStatusCtrl', ["$scope", "toaster", "$filter", "ngTablePa
 app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope, $rootScope, $modal, $log,apiPoint,$http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
diff --git a/Apollo/assets/js/controllers/newreg_reportCtrl.js b/Apollo/assets/js/controllers/newreg_reportCtrl.js
index b83b1551..59742dd6 100644
--- a/Apollo/assets/js/controllers/newreg_reportCtrl.js
+++ b/Apollo/assets/js/controllers/newreg_reportCtrl.js
@@ -259,7 +259,7 @@ $scope.tod = to_dt;
 $scope.fdate ='';
 $scope.tdate ='';
 //$scope.Subtypes = '';
-
+$scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
 
@@ -349,7 +349,7 @@ app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items", "Words
 app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
diff --git a/Apollo/assets/js/controllers/nonoperationalCtrl.js b/Apollo/assets/js/controllers/nonoperationalCtrl.js
index beaa80e9..2170457b 100644
--- a/Apollo/assets/js/controllers/nonoperationalCtrl.js
+++ b/Apollo/assets/js/controllers/nonoperationalCtrl.js
@@ -1012,7 +1012,7 @@ $scope.loadStaring = true;
     }
 
     $scope.studentDetails='';$scope.studentDetails
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 $scope.searchResultDetails ='';
         $scope.open = function (studentDetails) {
 
@@ -1133,7 +1133,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
     //Tooltip for print button
 
      $scope.studentDetails='';$scope.studentDetails
-
+     $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 $scope.searchResultDetails ='';
         $scope.open = function (studentDetails) {
 
diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js
index eee38a42..0a628208 100755
--- a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js
+++ b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js
@@ -425,7 +425,7 @@ $scope.generateButtonStatus = false;
 app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js
index f12290c9..dfbefaec 100755
--- a/Apollo/assets/js/controllers/report_app_pendingCtrl.js
+++ b/Apollo/assets/js/controllers/report_app_pendingCtrl.js
@@ -470,7 +470,7 @@ $scope.generateButtonStatus = false;
 app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
diff --git a/Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js b/Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js
index 869a0f73..c678546d 100644
--- a/Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js
+++ b/Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js
@@ -425,7 +425,7 @@ $scope.generateButtonStatus = false;
 app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js
index 57e274f9..70001f07 100755
--- a/Apollo/assets/js/controllers/report_balfeeCtrl.js
+++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js
@@ -499,7 +499,7 @@ $scope.generateButtonStatus = false;
 app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
diff --git a/Apollo/assets/js/controllers/report_certificateCtrl.js b/Apollo/assets/js/controllers/report_certificateCtrl.js
index 25383e9c..1cfb4586 100755
--- a/Apollo/assets/js/controllers/report_certificateCtrl.js
+++ b/Apollo/assets/js/controllers/report_certificateCtrl.js
@@ -476,7 +476,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
 
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
     //  $scope.items = ['item1', 'item2', 'item3'];
 
diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js
index 0f9f9f9f..67808c9d 100755
--- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js
+++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js
@@ -420,7 +420,7 @@ $scope.generateButtonStatus = false;
 app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
diff --git a/Apollo/assets/js/controllers/report_examfeeCtrl.js b/Apollo/assets/js/controllers/report_examfeeCtrl.js
index 3f3a1d35..8f3cd71a 100755
--- a/Apollo/assets/js/controllers/report_examfeeCtrl.js
+++ b/Apollo/assets/js/controllers/report_examfeeCtrl.js
@@ -424,7 +424,7 @@ $scope.generateButtonStatus = false;
 app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
diff --git a/Apollo/assets/js/controllers/report_leadCtrl.js b/Apollo/assets/js/controllers/report_leadCtrl.js
index 7953962e..b095d839 100644
--- a/Apollo/assets/js/controllers/report_leadCtrl.js
+++ b/Apollo/assets/js/controllers/report_leadCtrl.js
@@ -218,7 +218,7 @@ $scope.generateButtonStatus = false;
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
 
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
     //  $scope.items = ['item1', 'item2', 'item3'];
 
diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
index a12bf0a3..977b5140 100755
--- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
+++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
@@ -445,7 +445,7 @@ $scope.generateButtonStatus = false;
 app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
diff --git a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js
index 7a7c89af..cebe9c2c 100755
--- a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js
+++ b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js
@@ -445,7 +445,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
 app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
diff --git a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js
index 8307613b..e262fe5c 100755
--- a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js
+++ b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js
@@ -418,7 +418,7 @@ $scope.$watch(function () {
 app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
diff --git a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js
index 5c85e5d2..4f49b15b 100755
--- a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js
+++ b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js
@@ -164,7 +164,7 @@ $scope.generateButtonStatus = false;
   app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
diff --git a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js
index 51e2f120..bcb64453 100755
--- a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js
+++ b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js
@@ -980,7 +980,7 @@ app.filter('unique', function() {
 app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope, $rootScope, $modal, $log,apiPoint,$http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js
index 1218493a..a212cd5e 100755
--- a/Apollo/assets/js/controllers/studentCtrl.js
+++ b/Apollo/assets/js/controllers/studentCtrl.js
@@ -3805,7 +3805,7 @@ app.filter('unique', function () {
 app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
diff --git a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js
index e6766306..86767cdb 100644
--- a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js
+++ b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js
@@ -728,7 +728,7 @@ $scope.exportDataTab3 = function () {
 app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope, $rootScope, $modal, $log,apiPoint,$http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
diff --git a/Apollo/assets/js/controllers/student_university_fee_compare.js b/Apollo/assets/js/controllers/student_university_fee_compare.js
index 1761dd8b..f43951e0 100644
--- a/Apollo/assets/js/controllers/student_university_fee_compare.js
+++ b/Apollo/assets/js/controllers/student_university_fee_compare.js
@@ -498,7 +498,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
 
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
     //  $scope.items = ['item1', 'item2', 'item3'];
 
diff --git a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js
index 5aa443c2..a0b632ba 100755
--- a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js
+++ b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js
@@ -489,7 +489,7 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
 app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS", "$http", function ($scope, $modal, $log,apiPoint,$http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
diff --git a/Apollo/assets/js/controllers/univFormPaymentCtrl.js b/Apollo/assets/js/controllers/univFormPaymentCtrl.js
index 2f5b89d3..86c2c65d 100644
--- a/Apollo/assets/js/controllers/univFormPaymentCtrl.js
+++ b/Apollo/assets/js/controllers/univFormPaymentCtrl.js
@@ -498,7 +498,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
 
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
     //  $scope.items = ['item1', 'item2', 'item3'];
 
diff --git a/Apollo/assets/views/student/studentDetailsModal.html b/Apollo/assets/views/student/studentDetailsModal.html
index d6a7eb06..05305006 100755
--- a/Apollo/assets/views/student/studentDetailsModal.html
+++ b/Apollo/assets/views/student/studentDetailsModal.html
@@ -289,7 +289,7 @@
                             </tr>
                         </thead>
                         <tbody>
-                            <tr ng-repeat="fees in course.feesDetails">
+                            <tr ng-repeat="fees in course.feesDetails | orderBy : FeesName ">
                                 <td><span>{{fees.FeesName}}</span></td>
                                 <td ng-if="fees.BatchName=='Not Applicable'"><span>{{fees.BatchName}}</span></td>
                                 <td ng-if="fees.BatchName!='Not Applicable'"><span><a tooltip="View Batch History"  class="text-dark" ng-click="open1(course.batchHistory,'3');">{{fees.BatchName}}</a></span></td>
@@ -352,7 +352,7 @@
 												  <th style="text-align:center;">SEM/YEAR</th>
 												   <th style="text-align:center;">Form Type</th>
                                                  <th  style="text-align:center;">Status</th> 
-                                                <th style="text-align:center;">Comments</th>
+                                                <th style="text-align:center;">Comments</th><th ng-if="userType != 'R001'"></th>
                                                
                                                 
                                                 
@@ -360,7 +360,7 @@
                                             </tr>
                                             </thead>
                                             <tbody>
-                                            <tr ng-repeat="apps in course.applicationDetails">
+                                            <tr ng-repeat="apps in course.applicationDetails | orderBy:'Sem_Year' | unique:'Sem_Year'">
                                                 <!-- <td>
                                                     <span>{{apps.CertificateName}}</span>
                                                 </td>
@@ -374,13 +374,20 @@
                                                     <span style="white-space:pre-wrap;">{{apps.Comments}}</span>
                                                 </td> -->
 
-                                            <td><span>{{apps.StatusUpdateDate}}</span></span></td>
-											<td><span>{{apps.BatchCode}}</span></span></td>
+                                            <td><span>{{apps.StatusUpdateDate}}</span></td>
+                                            <td ng-if="apps.BatchName=='Not Applicable'"><span>{{apps.BatchName}}</span></td>
+                                            <td ng-if="apps.BatchName!='Not Applicable'"><span><a tooltip="View Batch History"  class="text-dark" ng-click="open1(course.batchHistory,'3');">{{apps.BatchName}}</a></span></td>
+											<!-- <td><span>{{apps.BatchName}}</span></span></td> -->
 											<td><span>{{apps.Sem_Year}}</span></td>
 											<td><span>{{apps.RegistrationType}}</span></td>
                                             <td><span>{{apps.ListName}} </span></td>
                                             <td><span>{{apps.Comments}}</span></td>
-                                           
+                                            <td ng-if="userType != 'R001'"><span>
+                                                <a  tooltip="View Application History" ng-click="open1(course.applicationDetails,'4');">
+                                                    <i class="fa fa-history text-green text-large"></i>
+                                                </a> </span>
+                                            </td>
+                                            
                                             
                                            
                                             
@@ -408,30 +415,33 @@
                                             <thead>
                                             <tr>
                                                 <!-- <th>Type</th>-->
-												 <th style="text-align:center;">Date</th>
+												<th style="text-align:center;">Date</th>
                                                 <th style="text-align:center;">Sem/Year</th>
                                                 <th style="text-align:center;">Status</th>
                                                
                                                 <th style="text-align:center;">Comments</th>
-
+                                                <th ng-if="userType != 'R001'"></th>
                                             </tr>
                                             </thead>
                                             <tbody>
-                                            <!-- <tr ng-repeat="booklet in course.answerbookletDetails | unique:'Sem'"> -->
-                                                <tr ng-repeat="booklet in course.answerbookletDetails">
+                                            <tr ng-repeat="booklet in course.answerbookletDetails | orderBy:'Sem' | unique:'Sem'">
+                                                <!-- <tr ng-repeat="booklet in course.answerbookletDetails"> -->
                                                 <td>
                                                     <span>{{booklet.AnsDate}}</span>
                                                 </td>                                                
 												<td>
                                                      <span>{{booklet.Sem}}</span>
                                                  </td>
-                                                <td>
-                                                    <span>{{booklet.ListName}} </span>
-                                                </td>
-                                                
+                                                <!-- Role Check -->
+                                                <td><span>{{booklet.ListName}} </span></td>
                                                 <td>
                                                     <span style="white-space:pre-wrap;">{{booklet.Comments}}</span>
                                                 </td>
+                                                <td ng-if="userType != 'R001'"><span>
+                                                    <a  tooltip="View Answer Booklet History" ng-click="open1(course.answerbookletDetails,'5');">
+                                                        <i class="fa fa-history text-green text-large"></i>
+                                                    </a> </span>
+                                                </td>
 
 
                                             </tr>
@@ -462,32 +472,22 @@
 												<th style="text-align:center;">Date</th>
                                                 <th style="text-align:center;">Certificate Name</th>
                                                 <th style="text-align:center;">Status</th>
-                                                
                                                 <th style="text-align:center;">Comments</th>
+                                                <th ng-if="userType != 'R001'"></th>
 
                                             </tr>
                                             </thead>
                                             <tbody>
-                                            <tr ng-repeat="cert in course.certificateDetails">
-                                            <!-- <tr ng-repeat="cert in course.certificateDetails'"> -->
-                                                <!-- <td>
-                                                     <span>{{cert.Sem_Year}}</span>
-                                                 </td>-->
-												 <td>
-                                                   <span>{{cert.AppDate}}</span>
-                                                </td>
-                                                <td>
-                                                    <span>{{cert.CertificateName}}</span>
-                                                </td>
-                                                <td>
-                                                    <span>{{cert.ListName}} </span>
-                                                </td>
-                                                
-                                                <td>
-                                                    <span style="white-space:pre-wrap;">{{cert.Comments}}</span>
-                                                </td>
-
-
+                                                 <tr ng-repeat="cert in course.certificateDetails | unique:'CertificateName'">
+												 <td><span>{{cert.AppDate}}</span></td>
+                                                 <td><span>{{cert.CertificateName}}</span></td> 
+                                                 <td><span>{{cert.ListName}} </span></td>
+                                                 <td><span style="white-space:pre-wrap;">{{cert.Comments}}</span></td>
+                                                 <td ng-if="userType != 'R001'"><span>
+                                                    <a tooltip="View Certificate History" ng-click="open1(course.certificateDetails,'6');">
+                                                        <i class="fa fa-history text-green text-large"></i>
+                                                    </a></span>
+                                                 </td>
                                             </tr>
 
                                             </tbody>
@@ -500,7 +500,6 @@
                                     </div>
                                 </tab>
 
-
                                 <tab heading="Mark Card Details" id="mark">
                                     <div class="panel-scroll  ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar=""  data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
                                         <div ng-if="course.markCardDetails==false">
@@ -519,17 +518,24 @@
                                                     <!-- <th style="text-align:center;">Name</th> -->
                                                     <th style="text-align:center;">Status</th>
                                                     <th style="text-align:center;">Comments</th>
+                                                    <th ng-if="userType != 'R001'"></th>
                                                 </tr>
                                             </thead>
                                             <!-- <tbody ng-if="course.markCardDetails.length!=0 && course.markCardDetails[0].FeesType=='F001'">
                                                     <tr ng-repeat="mark in course.markCardDetails | unique:'Sem'"> -->
                                             <tbody ng-if="course.markCardDetails.length!=0">
-                                                <tr ng-repeat="mark in course.markCardDetails">
+                                                <tr ng-repeat="mark in course.markCardDetails | unique:'Sem'">
                                                     <td><span>{{mark.CDate}}</span></td>                                               
                                                     <td><span>{{mark.Sem_Year}} ({{mark.Sem}})</span></td>
                                                     <!-- <td><span>{{mark.CertificateName}}</span></td> -->
-                                                    <td><span>{{mark.ListName}} </span></td>
+                                                    <!-- Role check  -->
+                                                    <td><span>{{mark.ListName}} </span></td> 
                                                     <td><span style="white-space:pre-wrap;">{{mark.Comments}}</span></td>
+                                                    <td ng-if="userType != 'R004'"><span>
+                                                        <a  tooltip="View Markcard History" ng-click="open1(course.markCardDetails,'7');">
+                                                            <i class="fa fa-history text-green text-large"></i>
+                                                        </a> </span>
+                                                    </td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -546,20 +552,18 @@
                                         <table class="table table-striped table-bordered table-hover table-condensed" ng-if="course.studyMaterialDetails!=false" fixed-header>
                                             <thead>
                                             <tr>
-											<th style="text-align:center;">Date</th>
+											    <th style="text-align:center;">Date</th>
                                                 <th style="text-align:center;">Sem/Year</th>
                                                 <!-- <th>Date</th>-->
                                                 <th style="text-align:center;">Status</th>
-                                                
                                                 <th style="text-align:center;">Comments</th>
+                                                <th ng-if="userType != 'R001'"></th>
 
 
                                             </tr>
                                             </thead>
-                                            <!-- <tbody ng-if="course.studyMaterialDetails.length!=0 && course.studyMaterialDetails[0].FeesType=='F001'">
-                                            <tr ng-repeat="study in course.studyMaterialDetails | unique:'Sem'"> -->
                                                 <tbody ng-if="course.studyMaterialDetails.length!=0">
-                                                    <tr ng-repeat="study in course.studyMaterialDetails">
+                                                    <tr ng-repeat="study in course.studyMaterialDetails | unique:'Sem' ">
                                                 <td>
                                                    <span>{{study.SDate}}</span>
                                                 </td>
@@ -573,6 +577,11 @@
                                                
                                                 <td>
                                                     <span style="white-space:pre-wrap;">{{study.Comments}}</span></td>
+                                                    <td ng-if="userType != 'R001'"><span>
+                                                        <a tooltip="View studyMaterial History" ng-click="open1(course.studyMaterialDetails,'8');">
+                                                            <i class="fa fa-history text-green text-large"></i>
+                                                        </a> </span>
+                                                    </td>
 
                                             </tr>
 
diff --git a/Apollo/assets/views/student/studentPaymentModal.html b/Apollo/assets/views/student/studentPaymentModal.html
index 447de2d4..e75e49fb 100755
--- a/Apollo/assets/views/student/studentPaymentModal.html
+++ b/Apollo/assets/views/student/studentPaymentModal.html
@@ -54,6 +54,104 @@
                             </li>
                         </ul>
                         <center ng-if="selectedtype=='3' && items1==false" > Batch History Not Found </center>
+
+                        <table class="table" ng-if="selectedtype=='4'">
+                            <thead>
+                            <tr>
+                                <th>Date</th>
+								<th>Batch</th>
+								<th>SEM/YEAR</th>
+								<th>Form Type</th>
+                                <th >Status</th> 
+                                <th>Comments</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                                <tr ng-repeat="apps in items1">
+                                    <td><span>{{apps.StatusUpdateDate}}</span></td>
+                                    <td><span>{{apps.BatchName}}</span></td>
+                                    <td><span>{{apps.Sem_Year}}</span></td>
+                                    <td><span>{{apps.RegistrationType}}</span></td>
+                                    <td><span>{{apps.ListName}} </span></td>
+                                    <td><span>{{apps.Comments}}</span></td>
+                                </tr>
+                            </tbody>
+                        </table>
+
+                        
+                        <table class="table" ng-if="selectedtype=='5'">
+                            <thead>
+                            <tr>
+                                <th>Date</th>
+                                <th>Sem/Year</th>
+                                <th>Status</th>
+                                <th>Comments</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                                <tr ng-repeat="booklet in items1">
+                                    <td><span>{{booklet.AnsDate}}</span></td>                                                
+                                    <td><span>{{booklet.Sem}}</span></td>
+                                    <td><span>{{booklet.ListName}}</span></td>
+                                    <td><span>{{booklet.Comments}}</span></td>
+                                </tr>
+                            </tbody>
+                        </table>
+
+                        <table class="table" ng-if="selectedtype=='6'">
+                            <thead>
+                            <tr><th>Date</th>
+                                <th>Certificate Name</th>
+                                <th>Status</th>
+                                <th>Comments</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                                <tr ng-repeat="cert in items1">
+                                 <td><span>{{cert.AppDate}}</span></td>
+                                 <td><span>{{cert.CertificateName}}</span></td> 
+                                 <td><span>{{cert.ListName}} </span></td>
+                                 <td><span>{{cert.Comments}}</span></td>
+                                </tr>
+                            </tbody>
+                        </table>
+
+                        <table class="table" ng-if="selectedtype=='7'">
+                            <thead>
+                                <tr>
+                                    <th>Date</th>
+                                    <th>Sem/Year</th>
+                                    <th>Status</th>
+                                    <th>Comments</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr ng-repeat="v in items1">
+                                    <td>{{v.CDate}}</td>                                               
+                                    <td>{{v.Sem_Year}} ({{v.Sem}})</td>
+                                    <td>{{v.ListName}}</td>
+                                    <td>{{v.Comments}}</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                        <table class="table" ng-if="selectedtype=='8'">
+                            <thead>
+                            <tr>
+                            <th>Date</th>
+                            <th>Sem/Year</th>
+                            <th>Status</th>
+                            <th>Comments</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                                <tr ng-repeat="study in items1">
+                                    <td><span>{{study.SDate}}</span></td>
+                                    <td><span>{{study.Sem_Year}} ({{study.Sem}})</span></td>
+                                    <td><span>{{study.ListName}} </span></td>
+                                    <td><span>{{study.Comments}}</span></td>
+                                </tr>
+                            </tbody>
+                        </table>
                 </div>
 
             </div>