From 2a83d48859e8c3dc453f082a4668c0086fb604ea Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Thu, 15 Nov 2018 17:56:39 +0530
Subject: [PATCH] active deactive for student

---
 .../api/application/models/Student_model.php  | 64 +++++++++----------
 .../assets/views/student/student_details.html |  9 +++
 .../student/student_details_SuperAdmin.html   |  9 +++
 3 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/Apollo/api/application/models/Student_model.php b/Apollo/api/application/models/Student_model.php
index 1f9fc938..3ba3cc0b 100755
--- a/Apollo/api/application/models/Student_model.php
+++ b/Apollo/api/application/models/Student_model.php
@@ -84,7 +84,7 @@ class Student_model extends CI_Model {
             // list for super admin based on branch
   
             if ($getSearchData["University"] === '' && $getSearchData["Course"] === '' && $getSearchData["Status"] === '') {
-                $this->db->select('S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID');
+                $this->db->select('S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive');
                 $this->db->from('' . STUDENTCOURSE . ' as SC');
                 $this->db->join('' . STUDENTS . ' as S', 'S.StudentID = SC.StudentID', 'LEFT');
                 $this->db->join('' . UNIVERSITY . ' as U', 'SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode', 'LEFT');
@@ -109,7 +109,7 @@ class Student_model extends CI_Model {
                 $StuStatus = $getSearchData['Status'];
                 if ($StuStatus == '') {
                     if ($University != '' && $Course == '' && $batchcode=='') {
-                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID 
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -125,7 +125,7 @@ class Student_model extends CI_Model {
                                         ORDER BY S.CreatedOn";
                                         //  GROUP BY SC.StudentID 
                     } else if ($University != '' && $Course != '' && $batchcode=='') {
-                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseCode,C.CourseName,C.CourseID
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseCode,C.CourseName,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -149,7 +149,7 @@ class Student_model extends CI_Model {
 
                     else if($University !='' && $Course == '' && $batchcode!='') 
                     {
-                           $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, U.UniversityID,C.CourseCode,C.CourseName,C.CourseID
+                           $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, U.UniversityID,C.CourseCode,C.CourseName,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC 
                                         LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID 
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -171,7 +171,7 @@ class Student_model extends CI_Model {
 
                     else if($University !=''&&$Course != '' && $batchcode !='')
                     {
-                              $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode, U.UniversityID,C.CourseName,C.CourseID
+                              $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode, U.UniversityID,C.CourseName,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC 
                                         LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -197,7 +197,7 @@ class Student_model extends CI_Model {
                 else 
                 {
                     if ($University != '' && $Course == '' && $batchcode=='' ) {
-                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode,U.UniversityID, C.CourseName,C.CourseID
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode,U.UniversityID, C.CourseName,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID LEFT JOIN " . COURSE . " as C ON 
                                         SC.CourseID = C.CourseID
@@ -212,7 +212,7 @@ class Student_model extends CI_Model {
                                         group by Student_Course_id,StudentID    
                                         ORDER BY S.CreatedOn";
                     } else if ($University != '' && $Course != ''  && $batchcode=='') {
-                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, C.CourseCode,C.CourseName,C.CourseID,U.UniversityID
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, C.CourseCode,C.CourseName,C.CourseID,U.UniversityID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -232,7 +232,7 @@ class Student_model extends CI_Model {
 
 
                           if ($University != '' && $Course == ''&& $batchcode=='' ) {
-                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseCode,C.CourseName,C.CourseID
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseCode,C.CourseName,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID LEFT JOIN " . COURSE . " as C ON 
                                         SC.CourseID = C.CourseID
@@ -248,7 +248,7 @@ class Student_model extends CI_Model {
                                         group by Student_Course_id,StudentID    
                                         ORDER BY S.CreatedOn";
                     } else if ($University != '' && $Course != '' && $batchcode=='') {
-                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseCode,C.CourseName,C.CourseID
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseCode,C.CourseName,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC 
                                         LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -269,7 +269,7 @@ class Student_model extends CI_Model {
 
                     else if($University != '' && $Course == ''  && $batchcode !='' )
                     {
-                            $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, U.UniversityID,C.CourseCode,C.CourseName,C.CourseID
+                            $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, U.UniversityID,C.CourseCode,C.CourseName,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID LEFT JOIN " . COURSE . " as C ON 
                                         SC.CourseID = C.CourseID
@@ -296,7 +296,7 @@ class Student_model extends CI_Model {
                     {   
 
 
-                          $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode, U.UniversityID,C.CourseName,C.CourseID
+                          $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode, U.UniversityID,C.CourseName,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC 
                                         LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -323,7 +323,7 @@ class Student_model extends CI_Model {
 
 
                         else{
-                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode, C.CourseName,C.CourseID,U.UniversityID
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode, C.CourseName,C.CourseID,U.UniversityID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -361,7 +361,7 @@ class Student_model extends CI_Model {
         } else if ($loginUserType == ADMIN) {
             // list for admin
             if ($getSearchData["University"] === '' && $getSearchData["Course"] === '' && $getSearchData["Status"] === '') {
-                 $this->db->select('S.*, SC.id as Student_Course_id , U.UniversityName, U.UniversityID, C.CourseCode,C.CourseName,C.CourseID');
+                 $this->db->select('S.*, SC.id as Student_Course_id , U.UniversityName, U.UniversityID, C.CourseCode,C.CourseName,C.CourseID,SC.IsActive as CourseActive');
                 $this->db->from('' . STUDENTCOURSE . ' as SC');
                 $this->db->join('' . STUDENTS . ' as S', 'S.StudentID = SC.StudentID', 'LEFT');
                 $this->db->join('' . UNIVERSITY . ' as U', 'SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode', 'LEFT');
@@ -384,7 +384,7 @@ class Student_model extends CI_Model {
                 $StuStatus = $getSearchData['Status'];
                 if ($StuStatus == '') {
                     if ($University != '' && $Course == ''  && $batchcode=='') {
-                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID,C.CourseCode, C.CourseName,C.CourseID
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID,C.CourseCode, C.CourseName,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode 
@@ -397,7 +397,7 @@ class Student_model extends CI_Model {
                                         
                                         ORDER BY S.CreatedOn";
                     } else if ($University != '' && $Course != ''  && $batchcode=='') {
-                        $subQuery = "SELECT S.* , SC.id as Student_Course_id , U.UniversityName,U.UniversityID,C.CourseCode, C.CourseName,C.CourseID
+                        $subQuery = "SELECT S.* , SC.id as Student_Course_id , U.UniversityName,U.UniversityID,C.CourseCode, C.CourseName,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -413,7 +413,7 @@ class Student_model extends CI_Model {
 
                     else if($University !='' && $Course == '' && $batchcode!='') 
                     {
-                           $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseCode,C.CourseName,C.CourseID
+                           $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseCode,C.CourseName,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC 
                                         LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode 
@@ -436,7 +436,7 @@ class Student_model extends CI_Model {
                     else if($University !=''&&$Course != '' && $batchcode !='')
                     {
 
-                          $subQuery = "SELECT S.* , SC.id as Student_Course_id , U.UniversityName,C.CourseCode,U.UniversityID, C.CourseName,C.CourseID
+                          $subQuery = "SELECT S.* , SC.id as Student_Course_id , U.UniversityName,C.CourseCode,U.UniversityID, C.CourseName,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC
                                         LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -459,7 +459,7 @@ class Student_model extends CI_Model {
                  else 
                  {
                     if ($University != '' && $Course == '' && $batchcode =='') {
-                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode, U.UniversityID,C.CourseName,C.CourseID
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode, U.UniversityID,C.CourseName,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -474,7 +474,7 @@ class Student_model extends CI_Model {
                     } 
                     else if ($University != '' && $Course != '' && $batchcode =='') 
                     {
-                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode,U.UniversityID, C.CourseName,C.CourseID
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode,U.UniversityID, C.CourseName,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -493,7 +493,7 @@ class Student_model extends CI_Model {
                     else if($University != '' && $Course == '' && $batchcode !='')
                     {
                           
-                           $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseCode,C.CourseName,C.CourseID
+                           $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseCode,C.CourseName,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC 
                                         LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -519,7 +519,7 @@ class Student_model extends CI_Model {
                     {
                            
 
-                           $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode,U.UniversityID, C.CourseName,C.CourseID
+                           $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode,U.UniversityID, C.CourseName,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC 
                                         LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -544,7 +544,7 @@ class Student_model extends CI_Model {
 
                     else 
                     {
-                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode,U.UniversityID, C.CourseName,C.CourseID
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode,U.UniversityID, C.CourseName,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -573,7 +573,7 @@ class Student_model extends CI_Model {
         } else if ($loginUserType == EMPLOYEE || $loginUserType == TRAINEE) {
             // list for staff
             if ($getSearchData["University"] === '' && $getSearchData["Course"] === '' && $getSearchData["Status"] === '') {
-                $this->db->select("S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist ,  SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID");
+                $this->db->select("S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist ,  SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive");
                  $this->db->from('' . STUDENTCOURSE . ' as SC');
                 $this->db->join('' . STUDENTS . ' as S', 'S.StudentID = SC.StudentID', 'LEFT');
                 $this->db->join('' . UNIVERSITY . ' as U', 'SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode', 'LEFT');
@@ -597,7 +597,7 @@ class Student_model extends CI_Model {
                 $StuStatus = $getSearchData['Status'];
                 if ($StuStatus == '') {
                     if ($University != '' && $Course == '' && $batchcode=='') {
-                        $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID
+                        $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -611,7 +611,7 @@ class Student_model extends CI_Model {
                                         GROUP BY SC.id 
                                         ORDER BY S.CreatedOn";
                     } else if ($University != '' && $Course != '' && $batchcode=='') {
-                        $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID
+                        $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode 
@@ -630,7 +630,7 @@ class Student_model extends CI_Model {
 
                    else if ($University != '' && $Course == '' && $batchcode !='') 
                    {
-                        $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID
+                        $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC 
                                         LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -654,7 +654,7 @@ class Student_model extends CI_Model {
 
 
                     else if ($University != '' && $Course != '' && $batchcode !='') {
-                        $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID
+                        $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC 
                                         LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode 
@@ -693,7 +693,7 @@ class Student_model extends CI_Model {
                     //         OR (SC.CourseID = '$Course' AND SC.UniversityID = '$University'))
                 } else {
                     if ($University != '' && $Course == '' && $batchcode=='') {
-                        $subQuery = "SELECT  S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID
+                        $subQuery = "SELECT  S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode 
@@ -709,7 +709,7 @@ class Student_model extends CI_Model {
                                         GROUP BY SC.id 
                                         ORDER BY S.CreatedOn";
                     } else if ($University != '' && $Course != '' && $batchcode=='') {
-                        $subQuery = "SELECT  S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID
+                        $subQuery = "SELECT  S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode  
@@ -729,7 +729,7 @@ class Student_model extends CI_Model {
 
 
                else if ($University != '' && $Course == '' && $batchcode !='') {
-                        $subQuery = "SELECT  S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID
+                        $subQuery = "SELECT  S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC 
                                         LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode 
@@ -755,7 +755,7 @@ class Student_model extends CI_Model {
 
 
                     else if ($University != '' && $Course != '' && $batchcode!='') {
-                        $subQuery = "SELECT  S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID
+                        $subQuery = "SELECT  S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC 
                                         LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode  
@@ -794,7 +794,7 @@ class Student_model extends CI_Model {
 
 
                     else {
-                        $subQuery = "SELECT  S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID
+                        $subQuery = "SELECT  S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode  
diff --git a/Apollo/assets/views/student/student_details.html b/Apollo/assets/views/student/student_details.html
index 7ff0cb23..9b910632 100755
--- a/Apollo/assets/views/student/student_details.html
+++ b/Apollo/assets/views/student/student_details.html
@@ -210,6 +210,8 @@
                                             <th ng-click="sort('Fathername')">Status
                                                 <span class="glyphicon sort-icon" ng-show="sortKey=='Fathername'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                             </th>
+
+                                            <th>Course Status</th>
                                             <th>Comments
                                                 <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Fathername'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
                                             </th>
@@ -237,6 +239,13 @@
                                             <td><span ng-if="p.IsActive == true" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">ACTIVE</span>
                                                 <span tooltip="{{p.DeactiveComments}}" ng-if="p.IsActive == false" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">DEACTIVE
                                                     </span></td>
+
+                                              <td><span ng-if="p.CourseActive == true" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">ACTIVE</span>
+                                                <span tooltip="{{p.DeactiveComments}}" ng-if="p.CourseActive == false" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">DEACTIVE</span></td>
+
+
+
+
                                             <td>
                                                {{p.Comments}}
                                             </td>
diff --git a/Apollo/assets/views/student/student_details_SuperAdmin.html b/Apollo/assets/views/student/student_details_SuperAdmin.html
index 76e08e87..ca3aeb22 100755
--- a/Apollo/assets/views/student/student_details_SuperAdmin.html
+++ b/Apollo/assets/views/student/student_details_SuperAdmin.html
@@ -245,6 +245,8 @@
                                             <th ng-click="sort('Fathername')">Status
                                                 <span class="glyphicon sort-icon" ng-show="sortKey=='Fathername'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                             </th>
+
+                                            <th>Course Status</th>
                                             <th>Comments
                                                 <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Fathername'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
                                             </th>
@@ -271,6 +273,13 @@
                                             <td>{{p.CourseName}}</td>
                                             <td><span ng-if="p.IsActive == true" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">ACTIVE</span>
                                                 <span tooltip="{{p.DeactiveComments}}" ng-if="p.IsActive == false" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">DEACTIVE</span></td>
+
+
+                                                <td><span ng-if="p.CourseActive == true" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">ACTIVE</span>
+                                                <span tooltip="{{p.DeactiveComments}}" ng-if="p.CourseActive == false" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">DEACTIVE</span></td>
+
+
+
                                             <td><div id="containersPara">{{p.Comments}}</div></td>
                                             <td style="padding-left: 1px;">
                                                 <!--<input type=button class="btn btn-info btn-xs" ladda="ldloading1.zoom_in" id="editRowBtn{{p.StudentID}}" value="Personal Details"