Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec
This commit is contained in:
dineshkumarkannan
commit
eb9f7dc9bf
@ -153,13 +153,8 @@ defined('SESSIONSCHEDULEDETAILS') OR define('SESSIONSCHEDULEDETAILS','T_SessionS
|
||||
defined('STUDENTDOCUMENTDETAILS') OR define('STUDENTDOCUMENTDETAILS','T_StudentDocumentsDetails');
|
||||
defined('STUDENTDOCUMENTTRACKDETAILS') OR define('STUDENTDOCUMENTTRACKDETAILS','T_Student_DocumentTrack_Details');
|
||||
|
||||
// branch relation db tables
|
||||
|
||||
defined('UNIVERSITYBRANCHREL') OR define('UNIVERSITYBRANCHREL','T_Univ_Branch_Rel');
|
||||
defined('COURSEBRANCHREL') OR define('COURSEBRANCHREL','T_Course_Branch_Rel');
|
||||
defined('STATUSBRANCHREL') OR define('STATUSBRANCHREL','T_Status_Branch_Rel');
|
||||
defined('INOUTCOMEBRANCHREL') OR define('INOUTCOMEBRANCHREL','T_Income_Outcome_Branch_Rel');
|
||||
defined('CENTERBRANCHREL') OR define('CENTERBRANCHREL','T_Center_Branch_Rel');
|
||||
// define APPLICATION certificate type constant
|
||||
defined('APPLICATION_CONST') OR define('APPLICATION_CONST','APPLICATION');
|
||||
|
||||
|
||||
|
||||
|
||||
@ -144,7 +144,7 @@ class Fees_Status_Controller extends REST_Controller {
|
||||
$detailsChild['CreatedBy'] = $this->post('createdBy');
|
||||
$detailsChild['CreatedOn'] = $now->format('Y-m-d H:i:s');
|
||||
$detailsChild['UpdatedBy'] = $this->post('requestedBranch');
|
||||
$updateDetails = $this->Fees_model->updateFees($detailsChild,$this->post('courseID'));// Check if the users data store contains users (in case the database result returns NULL)
|
||||
$updateDetails = $this->Fees_model->updateFees($detailsChild,$this->post('courseID'),$this->post('feesName'));// Check if the users data store contains users (in case the database result returns NULL)
|
||||
if ($updateDetails)
|
||||
{
|
||||
$updateDetails['status'] = REST_Controller::HTTP_OK;
|
||||
|
||||
@ -424,7 +424,7 @@ class Fees_status_model extends CI_Model
|
||||
* created by kms
|
||||
* */
|
||||
|
||||
public function updateFees($feesPaidDetails=null,$courseID=null)
|
||||
public function updateFees($feesPaidDetails=null,$courseID=null,$feesName=null)
|
||||
{
|
||||
if($feesPaidDetails['UpdatedBy']=='All'){
|
||||
$this->db->select('BranchID');
|
||||
@ -478,7 +478,7 @@ class Fees_status_model extends CI_Model
|
||||
|
||||
if($feesPaidDetails['BillAmount']!='0'){
|
||||
|
||||
$dayBookEntry = $this->insertDayBookMaster($feesPaidDetails,$feesPayedID);
|
||||
$dayBookEntry = $this->insertDayBookMaster($feesPaidDetails,$feesPayedID,$courseID,$feesName);
|
||||
}
|
||||
|
||||
// Entry for all status screen except fees
|
||||
@ -1142,7 +1142,7 @@ class Fees_status_model extends CI_Model
|
||||
* insert day book master while fees update
|
||||
* created by kms
|
||||
* */
|
||||
public function insertDayBookMaster($data=null,$paymentID){
|
||||
public function insertDayBookMaster($data=null,$paymentID,$courseID,$feesName){
|
||||
$this->db->select('Firstname');
|
||||
$this->db->where('StudentID', $data['StudentID']);
|
||||
$getStudentName=$this->db->get(STUDENTS)->result();
|
||||
@ -1161,6 +1161,9 @@ class Fees_status_model extends CI_Model
|
||||
$insertArray['PaidTo'] = $getStudentName[0]->Firstname;
|
||||
$insertArray['BranchCode'] = $data['UpdatedBy'];
|
||||
$insertArray['ModeOfPayment'] = $data['ModeOfPayment'];
|
||||
$insertArray['StudentID'] = $data['StudentID'];
|
||||
$insertArray['CourseID'] = $courseID;
|
||||
$insertArray['FeePaymentDetails'] = $feesName;
|
||||
|
||||
$this->db->select('ID,TypeID');
|
||||
$this->db->where('TypeID', 'I002');
|
||||
@ -1189,6 +1192,9 @@ class Fees_status_model extends CI_Model
|
||||
$expenseArray['PaidTo'] = $getStudentName[0]->Firstname;
|
||||
$expenseArray['BranchCode'] = $data['UpdatedBy'];
|
||||
$expenseArray['ModeOfPayment'] = $data['ModeOfPayment'];
|
||||
$expenseArray['StudentID'] = $data['StudentID'];
|
||||
$expenseArray['CourseID'] = $courseID;
|
||||
$expenseArray['FeePaymentDetails'] = $feesName;
|
||||
$this->db->select('ID,TypeID');
|
||||
$this->db->where('TypeID', 'I001');
|
||||
$this->db->where('TypeName', 'FEES');
|
||||
|
||||
@ -28,7 +28,7 @@ class Studentview_model extends CI_Model
|
||||
$result['studentStatus'] = true;
|
||||
$result['studentDetails'] = $studentDetails;
|
||||
// get student course details
|
||||
$result['courseDetails'] = $this->getStudentCourse($studentDetails->StudentID);
|
||||
$result['courseDetails'] = $this->getStudentCourse($studentDetails->StudentID,$requestFrom);
|
||||
}
|
||||
else{
|
||||
$result['studentStatus'] = false;
|
||||
@ -45,7 +45,7 @@ class Studentview_model extends CI_Model
|
||||
$result['studentStatus'] = true;
|
||||
$result['studentDetails'] = $studentDetails;
|
||||
// get student course details
|
||||
$result['courseDetails'] = $this->getStudentCourse($studentDetails->StudentID);
|
||||
$result['courseDetails'] = $this->getStudentCourse($studentDetails->StudentID,$requestFrom);
|
||||
}
|
||||
else{
|
||||
$result['studentStatus'] = false;
|
||||
@ -62,7 +62,7 @@ class Studentview_model extends CI_Model
|
||||
$result['studentStatus'] = true;
|
||||
$result['studentDetails'] = $studentDetails;
|
||||
// get student course details
|
||||
$result['courseDetails'] = $this->getStudentCourse($studentDetails->StudentID);
|
||||
$result['courseDetails'] = $this->getStudentCourse($studentDetails->StudentID,$requestFrom);
|
||||
}
|
||||
else{
|
||||
$result['studentStatus'] = false;
|
||||
@ -77,7 +77,7 @@ class Studentview_model extends CI_Model
|
||||
* get student course details
|
||||
* created by kms
|
||||
* */
|
||||
public function getStudentCourse($studentId=null){
|
||||
public function getStudentCourse($studentId=null,$requestFrom=null){
|
||||
|
||||
$this->db->select('SCU.EnrollmentID,CU.CourseID,CU.CourseName,US.UniversityID,US.UniversityName,US.UniversityShortName');
|
||||
$this->db->from( STUDENTCOURSE . ' as SCU');
|
||||
@ -101,7 +101,14 @@ class Studentview_model extends CI_Model
|
||||
// get student boollet details
|
||||
$fetchData['studyMaterialDetails']=$this->getStudentMaterialDetails($studentId,$row->CourseID);
|
||||
// get application details
|
||||
$fetchData['applicationDetails']=$this->getStudentCertificateDetails($studentId,$row->CourseID);
|
||||
if($requestFrom!='2'){
|
||||
$fetchData['applicationDetails']=$this->getStudentApplicationDetails($studentId,$row->CourseID);
|
||||
$fetchData['answerbookletDetails']=$this->getStudentAnswerbookletDetails($studentId,$row->CourseID);
|
||||
|
||||
|
||||
}
|
||||
$fetchData['certificateDetails']=$this->getStudentCertificateDetails($studentId,$row->CourseID);
|
||||
|
||||
// get student Mark crad details
|
||||
$fetchData['markCardDetails']=$this->getMarkcardDetails($studentId,$row->CourseID);
|
||||
|
||||
@ -332,6 +339,33 @@ class Studentview_model extends CI_Model
|
||||
$this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = AS.ListCode');
|
||||
$this->db->where('CU.CourseID', $courseID);
|
||||
$this->db->where('AS.StudentID', $studentID);
|
||||
$this->db->where('CM.CertificateName !=', APPLICATION_CONST);
|
||||
$this->db->order_by('AS.ID', 'DESC');
|
||||
$getCertDetails = $this->db->get();
|
||||
|
||||
if($getCertDetails->result()){
|
||||
return $getCertDetails->result();
|
||||
}
|
||||
|
||||
else {
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
/*
|
||||
* get student applications details
|
||||
* created by kms
|
||||
* */
|
||||
public function getStudentApplicationDetails($studentID=null,$courseID=null){
|
||||
$this->db->select('AS.CertificationNo,AS.AppDate,AS.Comments,CM.CertificateName,PLD.ListName');
|
||||
$this->db->from(APPLICATION_STATUS.' as AS');
|
||||
$this->db->join(CERTIFICATION_MASTER.' as CM','CM.CertificationID = AS.CertificationType');
|
||||
//$this->db->join(COURSE_FEES.' as CF','CF.ID = AS.CourseID');
|
||||
$this->db->join(COURSE.' as CU', 'CU.CourseID = AS.CourseID');
|
||||
$this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = AS.ListCode');
|
||||
$this->db->where('CU.CourseID', $courseID);
|
||||
$this->db->where('AS.StudentID', $studentID);
|
||||
$this->db->where('CM.CertificateName', APPLICATION_CONST);
|
||||
$this->db->order_by('AS.ID', 'DESC');
|
||||
$getCertDetails = $this->db->get();
|
||||
|
||||
@ -368,23 +402,25 @@ class Studentview_model extends CI_Model
|
||||
}
|
||||
}
|
||||
/*
|
||||
* get student application details
|
||||
* created by kms*/
|
||||
public function getStudentApplicationDetails($studentID=null,$courseID=null){
|
||||
$this->db->select('AS.CourseID,AS.AppDate,AS.Comments,CF.Sem_Year,PLD.ListName');
|
||||
$this->db->from(APPLICATION_STATUS.' as AS');
|
||||
$this->db->join(COURSE_FEES.' as CF','CF.ID = AS.CourseID');
|
||||
* get student answer booklet details
|
||||
* created by kms
|
||||
* */
|
||||
public function getStudentAnswerbookletDetails($studentID=null,$courseID=null){
|
||||
$this->db->select('ABT.CourseID,ABT.AnsDate,ABT.Comments,CF.Sem_Year,CF.FeesType,ABT.Sem,PLD.ListName');
|
||||
$this->db->from(ANSWER_BOOKLET.' as ABT');
|
||||
$this->db->join(COURSE_FEES.' as CF','CF.ID = ABT.CourseID');
|
||||
$this->db->join(COURSE.' as CU', 'CU.CourseID = CF.CourseID');
|
||||
$this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = AS.ListCode');
|
||||
$this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = ABT.ListCode');
|
||||
$this->db->where('CU.CourseID', $courseID);
|
||||
$this->db->where('AS.StudentID', $studentID);
|
||||
$this->db->order_by('AS.ID', 'DESC');
|
||||
$getAppDetails = $this->db->get();
|
||||
if ($getAppDetails->result()){
|
||||
return $getAppDetails->result();
|
||||
$this->db->where('ABT.StudentID', $studentID);
|
||||
$this->db->order_by('ABT.ID', 'DESC');
|
||||
$getBookletDetails = $this->db->get();
|
||||
if ($getBookletDetails->result()){
|
||||
return $getBookletDetails->result();
|
||||
}
|
||||
else{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -457,6 +457,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
|
||||
courseID:myModel.CourseID,
|
||||
courseAmount:updateModel.feesType.ActualFees,
|
||||
feesID: updateModel.feesType.FeesID,
|
||||
feesName: updateModel.feesType.Sem_Year,
|
||||
billNO: updateModel.billNo,
|
||||
billDate: $scope.billDate,
|
||||
billAmount:updateModel.billAmount,
|
||||
|
||||
@ -298,8 +298,7 @@
|
||||
</div>
|
||||
|
||||
</tab>
|
||||
|
||||
<tab heading="Document Details" id="document">
|
||||
<tab heading="Application Details" id="application">
|
||||
<div class="panel-scroll height-200 ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
|
||||
<div ng-if="course.applicationDetails==false">
|
||||
<!--<center>
|
||||
@ -318,7 +317,99 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="cert in course.applicationDetails | unique:'CertificateName'">
|
||||
<tr ng-repeat="apps in course.applicationDetails | unique:'CertificateName'">
|
||||
<td>
|
||||
<span>{{apps.CertificateName}}</span>
|
||||
</td>
|
||||
<td>
|
||||
<span>{{apps.ListName}} </span>
|
||||
</td>
|
||||
<td>
|
||||
<span>{{apps.AppDate}}</span>
|
||||
</td>
|
||||
<td>
|
||||
<span>{{apps.Comments}}</span>
|
||||
</td>
|
||||
|
||||
|
||||
</tr>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<!--
|
||||
view tab end
|
||||
-->
|
||||
|
||||
</div>
|
||||
</tab>
|
||||
<tab heading="Answer Booklet Details" id="booklet">
|
||||
<div class="panel-scroll height-200 ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
|
||||
<div ng-if="course.answerbookletDetails==false">
|
||||
<!--<center>
|
||||
<h5 class="text-dark">No Document Details!</h5>
|
||||
</center>-->
|
||||
</div>
|
||||
<table class="table no-margin ng-scope" ng-if="course.answerbookletDetails!=false">
|
||||
<thead>
|
||||
<tr>
|
||||
<!-- <th>Type</th>-->
|
||||
<th>Sem/Year</th>
|
||||
<th>Status</th>
|
||||
<th>Date</th>
|
||||
<th>Comments</th>
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="booklet in course.answerbookletDetails | unique:'Sem'">
|
||||
<td>
|
||||
<span>{{booklet.Sem}}</span>
|
||||
</td>
|
||||
<td>
|
||||
<span>{{booklet.ListName}} </span>
|
||||
</td>
|
||||
<td>
|
||||
<span>{{booklet.AnsDate}}</span>
|
||||
</td>
|
||||
<td>
|
||||
<span>{{booklet.Comments}}</span>
|
||||
</td>
|
||||
|
||||
|
||||
</tr>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<!--
|
||||
view tab end
|
||||
-->
|
||||
|
||||
</div>
|
||||
</tab>
|
||||
|
||||
|
||||
<tab heading="Document Details" id="document">
|
||||
<div class="panel-scroll height-200 ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
|
||||
<div ng-if="course.certificateDetails==false">
|
||||
<!--<center>
|
||||
<h5 class="text-dark">No Document Details!</h5>
|
||||
</center>-->
|
||||
</div>
|
||||
<table class="table no-margin ng-scope" ng-if="course.certificateDetails!=false">
|
||||
<thead>
|
||||
<tr>
|
||||
<!-- <th>Type</th>-->
|
||||
<th>Document Name</th>
|
||||
<th>Status</th>
|
||||
<th>Date</th>
|
||||
<th>Comments</th>
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="cert in course.certificateDetails | unique:'CertificateName'">
|
||||
<!-- <td>
|
||||
<span>{{cert.Sem_Year}}</span>
|
||||
</td>-->
|
||||
|
||||
@ -457,12 +457,12 @@
|
||||
|
||||
<tab heading="Document Details" id="document">
|
||||
<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.certificateDetails==false">
|
||||
<!--<center>
|
||||
<h5 class="text-dark">No Document Details!</h5>
|
||||
</center>-->
|
||||
</div>
|
||||
<table class="table height-200 no-margin ng-scope" ng-if="course.applicationDetails!=false" fixed-header>
|
||||
<table class="table height-200 no-margin ng-scope" ng-if="course.certificateDetails!=false" fixed-header>
|
||||
<thead>
|
||||
<tr>
|
||||
<!-- <th>Type</th>-->
|
||||
@ -474,7 +474,7 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="cert in course.applicationDetails | unique:'CertificateName'">
|
||||
<tr ng-repeat="cert in course.certificateDetails | unique:'CertificateName'">
|
||||
<!-- <td>
|
||||
<span>{{cert.Sem_Year}}</span>
|
||||
</td>-->
|
||||
|
||||
Loading…
Reference in New Issue
Block a user