diff --git a/Apollo/api/application/models/Studentview_model.php b/Apollo/api/application/models/Studentview_model.php index 770c783c..e0e85550 100755 --- a/Apollo/api/application/models/Studentview_model.php +++ b/Apollo/api/application/models/Studentview_model.php @@ -17,11 +17,9 @@ class Studentview_model extends CI_Model // get student list based on login user public function getStudentInfo($requestedBy=null,$requestFrom=null,$requestedBranch=null, $accessFrom=null) - { - - + { if($requestFrom =='2'){ - //echo '2'; + // echo '2';die(); //$this->db->select('ST.*'); $this->db->select('LO.ID,ST.*,concat(SF.Firstname," ",SF.Lastname) as fname,STC.DOJ'); $this->db->from( LOGIN . ' as LO'); @@ -43,7 +41,7 @@ class Studentview_model extends CI_Model } } else if($requestFrom =='1'){ - //echo '1';die(); + // echo '1';die(); $this->db->select('ST.*,concat(SF.Firstname," ",SF.Lastname) as fname,STC.DOJ'); $this->db->from( LOGIN . ' as LO'); $this->db->join( STUDENTS .' as ST', 'LO.StaffID = ST.StudentID'); @@ -64,7 +62,7 @@ class Studentview_model extends CI_Model } } else if ($requestFrom =='3'){ - // echo '3'; + // echo '3';die(); $this->db->select('ST.*,min(BillDate)'); $this->db->from( LOGIN . ' as LO'); $this->db->join( STUDENTS . ' as ST', 'LO.StaffID = ST.StudentID'); @@ -89,7 +87,7 @@ class Studentview_model extends CI_Model } // requestedFrom 4 for based on form get student details else if ($requestFrom =='4'){ - //echo '4'; + // echo '4';die(); $this->db->select('ST.*'); $this->db->from( LOGIN . ' as LO'); $this->db->join( STUDENTS . ' as ST', 'LO.StaffID = ST.StudentID'); @@ -151,10 +149,10 @@ class Studentview_model extends CI_Model } $fetchData['certificateDetails']=$this->getStudentCertificateDetails($studentId,$row->CourseID); - $fetchData['markCardDetails']=$this->getMarkcardDetails($studentId,$row->CourseID); - - $CourseArray[]=$fetchData; + $fetchData['markCardDetails']=$this->getMarkcardDetails($studentId,$row->CourseID); + $fetchData['batchHistory']=$this->getbatchHistory($studentId,$row->CourseID,$requestedBranch); + $CourseArray[]=$fetchData; } $studentCourseStatus['courseStatus'] = $CourseArray; @@ -223,6 +221,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); $CourseArray[]=$fetchData; @@ -721,4 +720,24 @@ class Studentview_model extends CI_Model return $result; } + public function getbatchHistory($studentID=null,$courseID=null,$requestedBranch=null){ + $this->db->select('CS.StudentID,CS.CourseID,B1.BatchName as ExistValue,B2.BatchName as NewValue,ST.Firstname as UpdatedBy,DATE_FORMAT(CS.UpdatedOn, "%d-%m-%Y %h:%i %p") as UpdatedOn'); + $this->db->from('T_Student_BatchHistory as CS'); + $this->db->join(BATCH.' as B1', 'B1.BatchCode = CS.ExistValue and B1.BranchCode = "'.$requestedBranch.'"','left'); + $this->db->join(BATCH.' as B2', 'B2.BatchCode = CS.NewValue and B2.BranchCode = "'.$requestedBranch.'"','left'); + $this->db->join(LOGIN.' as LO', 'LO.ID = CS.UpdatedBy','left'); + $this->db->join(STAFF.' as ST', 'ST.StaffID = LO.StaffID','left'); + $this->db->where('CS.CourseID', $courseID); + $this->db->where('CS.StudentID', $studentID); + $this->db->where('CS.FieldName',"Batch"); + $getbatchHistory = $this->db->get(); + // print_r($this->db->last_query());die(); + if ($getbatchHistory->result()){ + return $getbatchHistory->result(); + } + else{ + return false; + } + } + } \ No newline at end of file diff --git a/Apollo/assets/views/student/studentDetailsModal.html b/Apollo/assets/views/student/studentDetailsModal.html index 7df009b9..f483b04c 100755 --- a/Apollo/assets/views/student/studentDetailsModal.html +++ b/Apollo/assets/views/student/studentDetailsModal.html @@ -647,6 +647,20 @@ + +
+
+ +
+ +
+