Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1596 AdmittedBy and Date

Browse Source
This commit is contained in:
sriramv 2019-01-30 15:29:55 +05:30
parent e5ff78986a
commit 367b8d6b31
4 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Apollo/api/application/config/constants.php
View File

@ -165,6 +165,8 @@ defined('FORMFEESRECEIVEDFROMUNIV') OR define('FORMFEESRECEIVEDFROMUNIV','T_Form
defined('UNIVERSITYCREDITDEBIY') OR define('UNIVERSITYCREDITDEBIY','T_University_Credit_Debit');
defined('UNIVERSITYPAYMENT') OR define('UNIVERSITYPAYMENT','T_University_Payment');
defined('ADMISSIONS') OR define('ADMISSIONS','admissions');
// define APPLICATION certificate type constant
defined('APPLICATION_CONST') OR define('APPLICATION_CONST','APPLICATION');
@ -190,3 +192,4 @@ defined('NONOPERATIONAL') OR define('NONOPERATIONAL','T_NonOperationalMaster');

23
Apollo/api/application/models/Studentview_model.php
View File

@ -65,10 +65,13 @@ class Studentview_model extends CI_Model
}
else if ($requestFrom =='3'){
// echo '3';
$this->db->select('ST.*');
$this->db->select('ST.*,min(BillDate)');
$this->db->from( LOGIN . ' as LO');
$this->db->join( STUDENTS . ' as ST', 'LO.StaffID = ST.StudentID');
$this->db->join( STUDENTCOURSE . ' as STC', 'STC.StudentID = ST.StudentID');
$this->db->join(STUDENTS_FEES_PAID . ' as SFP','SFP.StudentID = ST.StudentID ');
$this->db->join(STUDENTS_FEES_STATUS . ' as SFS','SFS.FeesID = SFP.FeesId and SFS.StudentID = SFP.StudentID');
$this->db->where('ST.MobileNumber', $requestedBy);
$this->db->where('STC.BranchID', $requestedBranch);
$studentDetails = $this->db->get()->first_row();
@ -110,11 +113,12 @@ class Studentview_model extends CI_Model
public function getStudentCourseStudentLogin($studentId=null,$requestFrom=null,$requestedBranch=null,$accessFrom=null){
// this sub query for avoid university duplicate id
$this->db->select('SCU.EnrollmentID,CU.CourseID,CU.CourseName,US.UniversityID,US.UniversityName,US.UniversityShortName');
$this->db->select('SCU.EnrollmentID,CU.CourseID,CU.CourseName,US.UniversityID,US.UniversityName,US.UniversityShortName,AD.CreatedOn,AD.AdmittedBy');
$this->db->from( STUDENTCOURSE . ' as SCU');
$this->db->join( BRANCH . ' as BR', 'BR.BranchCode = SCU.BranchID');
$this->db->join( COURSE . ' as CU', 'CU.CourseID = SCU.CourseID');
$this->db->join( UNIVERSITY . ' as US', 'US.UniversityID = SCU.UniversityID AND SCU.BranchID=US.BranchCode');
$this->db->join( ADMISSIONS .' as AD','AD.StudentID = SCU.StudentID and AD.UniversityID = SCU.UniversityID','LEFT');
$this->db->where('SCU.StudentID',$studentId);
if($accessFrom == 'Web'){
$this->db->where('BR.Is_StudentWebAccessActive', 1);
@ -130,6 +134,8 @@ class Studentview_model extends CI_Model
$fetchData['UniversityID']=$row->UniversityID;
$fetchData['UniversityName']=$row->UniversityName;
$fetchData['UniveShortName'] = $row->UniversityShortName;
$fetchData['CreatedOn']=$row->CreatedOn;
$fetchData['AdmittedBy']=$row->AdmittedBy;
// $fetchData['SessionName']=$row->SessionName;
$fetchData['EnrollmentID']=$row->EnrollmentID;
// get student fees details
@ -169,12 +175,19 @@ class Studentview_model extends CI_Model
$this->db->where('StudentID',$studentId);
$subQuery = $this->db->get_compiled_select();*/
// subquery end
$this->db->select('SCU.EnrollmentID,CU.CourseID,CU.CourseName,US.UniversityID,US.UniversityName,US.UniversityShortName');
$this->db->select('SCU.EnrollmentID,CU.CourseID,CU.CourseName,US.UniversityID,US.UniversityName,US.UniversityShortName,AD.CreatedOn,AD.AdmittedBy');
$this->db->from( STUDENTCOURSE . ' as SCU');
$this->db->join( COURSE . ' as CU', 'CU.CourseID = SCU.CourseID');
$this->db->join( UNIVERSITY . ' as US', 'US.UniversityID = SCU.UniversityID AND SCU.BranchID=US.BranchCode');
$this->db->join( ADMISSIONS .' as AD','AD.StudentID = SCU.StudentID and AD.UniversityID = SCU.UniversityID','LEFT');
// $this->db->join(STUDENTS_FEES_PAID . ' as SFP','SFP.StudentID = SCU.StudentID ');
// $this->db->join(STUDENTS_FEES_STATUS . ' as SFS','SFS.FeesID = SFP.FeesId and SFS.StudentID = SFP.StudentID');
// $this->db->join( SESSIONMASTER . ' as SM', 'SM.SessionID = SCU.SessionID');
$this->db->where('SCU.StudentID',$studentId);
//print_r($this->db->last_query());die();
if($requestFrom!='2'){
$this->db->where('CU.BranchCode',$requestedBranch);
}
@ -188,7 +201,8 @@ class Studentview_model extends CI_Model
$fetchData['UniversityID']=$row->UniversityID;
$fetchData['UniversityName']=$row->UniversityName;
$fetchData['UniveShortName'] = $row->UniversityShortName;
// $fetchData['SessionName']=$row->SessionName;
$fetchData['CreatedOn']=$row->CreatedOn;
$fetchData['AdmittedBy']=$row->AdmittedBy;
$fetchData['EnrollmentID']=$row->EnrollmentID;
// get student fees details
$fetchData['feesDetails']=$this->getStudentFeesDetails($studentId,$row->CourseID);
@ -217,6 +231,7 @@ class Studentview_model extends CI_Model
else{
$studentCourseStatus['status'] = false;
}
//print_r($this->db->last_query());die();
return $studentCourseStatus;
}

31
Apollo/assets/views/student/studentDetailsModal.html
View File

@ -102,14 +102,14 @@
<span style="white-space:pre-wrap;">{{items.studentDetails.PermanentAddress}}</span>
</td>
</tr>
<tr>
<td>Admitted BY</td>
<td>{{items.studentDetails.fname}}</td>
</tr>
<tr>
<td>Admission Date</td>
<td>{{items.studentDetails.DOJ}}</td>
</tr>
<!-- <tr> -->
<!-- <td>Admitted BY</td> -->
<!-- <td>{{items.studentDetails.fname}}</td> -->
<!-- </tr> -->
<!-- <tr> -->
<!-- <td>Admission Date</td> -->
<!-- <td>{{items.studentDetails.DOJ}}</td> -->
<!-- </tr> -->
</tbody>
</table>
</div>
@ -212,22 +212,27 @@
</a>
</div>
</div>
<div class="col-xs-6 text-center no-padding">
<div class="col-xs-3 text-center no-padding">
<a class="text-blue">
Course &nbsp;:&nbsp;{{course.CourseName}}
</a>
</div>
<div class="col-xs-6 text-center no-padding">
<div class="col-xs-3 text-center no-padding">
<a class="text-blue">
Enrollment ID &nbsp;:&nbsp;{{course.EnrollmentID}}
</a>
</div>
<!-- <div class="col-xs-4 text-center no-padding">
<div class="col-xs-3 text-center no-padding">
<a class="text-blue">
Session &nbsp;:&nbsp;{{course.SessionName}}
Date Of Joining &nbsp;:&nbsp;{{course.CreatedOn}}
</a>
</div>
-->
<div class="col-xs-3 text-center no-padding">
<a class="text-blue">
Admitted By &nbsp;:&nbsp;{{course.AdmittedBy}}
</a>
</div>
</div>
<ct-paneltool class="panel-tools" tool-collapse="tool-collapse">

6
Apollo/assets/views/student/studentView.html
View File

@ -172,8 +172,8 @@
<td>{{studentDetails.Designation}}</td>
</tr>
<tr>
<td>Admission Date</td>
<td>{{studentDetails.DOJ}}</td>
<!-- <td>Admission Date</td> -->
<!-- <td>{{studentDetails.DOJ}}</td> -->
</tr>
</tbody>
@ -238,7 +238,7 @@
</div>
<div class="col-xs-12 no-padding">
<a class="text-blue" tooltip="University">
{{course.UniversityName}} &nbsp;:&nbsp; Enrollment ID &nbsp;:&nbsp;{{course.EnrollmentID}}
{{course.UniversityName}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Enrollment ID &nbsp;:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{course.EnrollmentID}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Date Of Joining &nbsp;:&nbsp; {{course.CreatedOn}}
</a>
</div>