application status
This commit is contained in:
parent
c7b923fc3b
commit
6533bcb6a3
@ -185,7 +185,9 @@ class Studentview_model extends CI_Model
|
|||||||
$fetchData['studyMaterialDetails']=$this->getStudentMaterialDetails($studentId,$row->CourseID);
|
$fetchData['studyMaterialDetails']=$this->getStudentMaterialDetails($studentId,$row->CourseID);
|
||||||
// get application details
|
// get application details
|
||||||
if($requestFrom!='2'){
|
if($requestFrom!='2'){
|
||||||
$fetchData['applicationDetails']=$this->getStudentApplicationDetails($studentId,$row->CourseID);
|
//$fetchData['applicationDetails']=$this->getStudentApplicationDetails($studentId,$row->CourseID);
|
||||||
|
|
||||||
|
$fetchData['applicationDetails']=$this->getStudentLatestAppStatus($studentId,$row->CourseID);
|
||||||
$fetchData['answerbookletDetails']=$this->getStudentAnswerbookletDetails($studentId,$row->CourseID);
|
$fetchData['answerbookletDetails']=$this->getStudentAnswerbookletDetails($studentId,$row->CourseID);
|
||||||
|
|
||||||
|
|
||||||
@ -583,4 +585,31 @@ class Studentview_model extends CI_Model
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
public function getStudentLatestAppStatus($studentid,$courseid)
|
||||||
|
{
|
||||||
|
|
||||||
|
// echo 'in';
|
||||||
|
$this->db->select('T_ApplicationStatus.StudentID,AppDate,CertificateName,ListName,Firstname,Lastname,T_ApplicationStatus.Comments,CourseName,T_ApplicationStatus.CertificationNo');
|
||||||
|
$this->db->from('T_ApplicationStatus');
|
||||||
|
$this->db->join('T_PickListDetails','T_PickListDetails.ListCode = T_ApplicationStatus.ListCode','left');
|
||||||
|
$this->db->join('T_CertificationMaster','T_CertificationMaster.CertificationID = T_ApplicationStatus.CertificationType','left');
|
||||||
|
$this->db->join('T_StudentDetails','T_StudentDetails.StudentID = T_ApplicationStatus.StudentID','left');
|
||||||
|
$this->db->join('T_CourseMaster','T_CourseMaster.CourseID = T_ApplicationStatus.CourseID','left');
|
||||||
|
$this->db->where('T_ApplicationStatus.CourseID',$courseid);
|
||||||
|
$this->db->where('T_ApplicationStatus.StudentID',$studentid);
|
||||||
|
$this->db->group_by('CertificationType');
|
||||||
|
$this->db->order_by('T_ApplicationStatus.CreatedOn','desc');
|
||||||
|
|
||||||
|
$appDetails = $this->db->get();
|
||||||
|
|
||||||
|
if ($appDetails->result()){
|
||||||
|
return $appDetails->result();
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -303,6 +303,8 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
</tab>
|
</tab>
|
||||||
|
|
||||||
|
<!-- {{course.applicationDetails}} -->
|
||||||
<tab heading="Application Details" id="application">
|
<tab heading="Application Details" id="application">
|
||||||
<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 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.applicationDetails==false">
|
<div ng-if="course.applicationDetails==false">
|
||||||
@ -314,16 +316,23 @@
|
|||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<!-- <th>Type</th>-->
|
<!-- <th>Type</th>-->
|
||||||
<th>Document Name</th>
|
<!-- <th>Document Name</th>
|
||||||
<th>Status</th>
|
<th>Status</th>
|
||||||
<th>Date</th>
|
<th>Date</th>
|
||||||
|
<th>Comments</th> -->
|
||||||
|
|
||||||
|
<th>Certificate Number</th>
|
||||||
|
<th>Certificate Type</th>
|
||||||
|
<th>Course</th>
|
||||||
<th>Comments</th>
|
<th>Comments</th>
|
||||||
|
<th>Date</th>
|
||||||
|
<th>Status</th>
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr ng-repeat="apps in course.applicationDetails | unique:'CertificateName'">
|
<tr ng-repeat="apps in course.applicationDetails | unique:'CertificateName'">
|
||||||
<td>
|
<!-- <td>
|
||||||
<span>{{apps.CertificateName}}</span>
|
<span>{{apps.CertificateName}}</span>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
@ -334,9 +343,16 @@
|
|||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<span style="white-space:pre-wrap;">{{apps.Comments}}</span>
|
<span style="white-space:pre-wrap;">{{apps.Comments}}</span>
|
||||||
</td>
|
</td> -->
|
||||||
|
|
||||||
|
|
||||||
|
<td><span>{{apps.CertificationNo}} </span></td>
|
||||||
|
<td><span>{{apps.CertificateName}}</span></td>
|
||||||
|
<td><span>{{apps.CourseName}}</span></span></td>
|
||||||
|
<td><span>{{apps.Comments}}</span></span></td>
|
||||||
|
<td><span>{{apps.AppDate}}</span></td>
|
||||||
|
<td><span>{{apps.ListName}}</span></td>
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user