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

setFeesForStudent : ps

Browse Source
This commit is contained in:
Sanjeev 2020-12-12 17:56:19 +05:30
parent ad714f5db3
commit 1be9249ef4
5 changed files with 123 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Apollo/api/application/controllers/Fees_Status_Controller.php
View File

@ -255,7 +255,6 @@ class Fees_Status_Controller extends REST_Controller {
$details['BranchCode'] = $this->post('branchCode'); $details['BranchCode'] = $this->post('branchCode');
$details['Comments'] = $this->post('comments'); $details['Comments'] = $this->post('comments');
$jsonInstallmenData = $this->post('installmentItems'); $jsonInstallmenData = $this->post('installmentItems');
//print_r($details);
$updateDetails = $this->Fees_model->setFees($details,$jsonInstallmenData);// Check if the users data store contains users (in case the database result returns NULL) $updateDetails = $this->Fees_model->setFees($details,$jsonInstallmenData);// Check if the users data store contains users (in case the database result returns NULL)

70
Apollo/api/application/models/Fees_status_model.php
View File

@ -1196,14 +1196,14 @@ class Fees_status_model extends CI_Model
* */ * */
public function setFees($details=null,$jsonData=null){ public function setFees($details=null,$jsonData=null){
// echo 'i am Here'; // echo 'Set Fee Function ** ';
// print_r($details); // print_r($details);
// print_r($jsonData); // print_r($jsonData);
// die();
$RollNo= $details['RollNo']; $RollNo= $details['RollNo'];
//Existing Or Not using RollNo
if($RollNo !='') if($RollNo !='')
{ {
@ -1215,9 +1215,6 @@ $this->db->where('StudentID !=',$details['StudentID']);
$qry=$this->db->get(); $qry=$this->db->get();
$qry=$qry->result(); $qry=$qry->result();
//print_r($this->db->last_query());die();
//echo count($qry);die();
if(count($qry)>0) if(count($qry)>0)
{ {
$result['setStatus'] = false; $result['setStatus'] = false;
@ -1225,7 +1222,6 @@ if(count($qry)>0)
return $result; return $result;
} }
} }
@ -1236,6 +1232,13 @@ if(count($qry)>0)
$this->db->where('StudentID', $details['StudentID']); $this->db->where('StudentID', $details['StudentID']);
$this->db->where('FeesType', $details['FeesType']); $this->db->where('FeesType', $details['FeesType']);
$checkExist=$this->db->get(STUDENTS_FEES_STATUS); $checkExist=$this->db->get(STUDENTS_FEES_STATUS);
$checkwithstatus = count($checkExist->result())<=0;
// select cf.Sem_Year
// from T_Students_Fees_Status sfs
// left join T_Course_Fees_Details cf on sfs.CourseID = cf.CourseID
// where sfs.StudentID = 4101 and cf.CourseID = 22 and cf.ID =748;
// If $checkExist->result() has value means Updating the Details. No Value means Inserting (in else part)
if($checkExist->result()){ if($checkExist->result()){
$feesId = $checkExist->result(); $feesId = $checkExist->result();
$updateDetails['CourseFees'] = $details['CourseFees']; $updateDetails['CourseFees'] = $details['CourseFees'];
@ -1285,6 +1288,7 @@ if(count($qry)>0)
} }
else{ else{
$this->db->insert(STUDENTS_FEES_STATUS, $details); $this->db->insert(STUDENTS_FEES_STATUS, $details);
$this->db->select('FeesID,BatchCode,StudentID,CourseID,FeesType'); $this->db->select('FeesID,BatchCode,StudentID,CourseID,FeesType');
@ -1333,9 +1337,7 @@ if(count($qry)>0)
$fromd= date("d-m-Y",strtotime($details['CreatedOn'])); $fromd= date("d-m-Y",strtotime($details['CreatedOn']));
if(($details['FeesType']=='PPC') || ($details['FeesType']=='TC')|| ($details['FeesType']=='MC')|| ($details['FeesType'] == 'DC'))
if(($details['FeesType']=='PPC') || ($details['FeesType']=='TC')|| ($details['FeesType']=='MC')
|| ($details['FeesType'] == 'DC'))
{ {
$this->db->select('ListCode'); $this->db->select('ListCode');
@ -1348,11 +1350,10 @@ if(($details['FeesType']=='PPC') || ($details['FeesType']=='TC')|| ($details['Fe
$listcode=''; $listcode='';
// Expected Remove because mentioned ON Apollo XL sheet(30.11.2020) foreach($getId as $ge)
// foreach($getId as $ge) {
// { $listcode=$ge->ListCode;
// $listcode=$ge->ListCode; }
// }
$appstatus['StudentID'] = $details['StudentID']; $appstatus['StudentID'] = $details['StudentID'];
$appstatus['CourseID'] = $details['CourseID']; $appstatus['CourseID'] = $details['CourseID'];
@ -1369,7 +1370,7 @@ if(($details['FeesType']=='PPC') || ($details['FeesType']=='TC')|| ($details['Fe
} }
// update registration details // update registration details
if($jsonData){ if($jsonData){
$this->updateRegistrationDetails($details,$installmentFeesID); $this->updateRegistrationDetails($details,$installmentFeesID,$checkwithstatus);
} }
return $result; return $result;
@ -1379,7 +1380,7 @@ if(($details['FeesType']=='PPC') || ($details['FeesType']=='TC')|| ($details['Fe
* insert registration details while set fees * insert registration details while set fees
* created by kms * created by kms
* */ * */
public function updateRegistrationDetails($details=null,$feesStatusID=null){ public function updateRegistrationDetails($details=null,$feesStatusID=null,$checkwithstatus=null){
$regId=''; $regId='';
@ -1387,6 +1388,13 @@ if(($details['FeesType']=='PPC') || ($details['FeesType']=='TC')|| ($details['Fe
$this->db->where('CourseID', $details['CourseID']); $this->db->where('CourseID', $details['CourseID']);
$this->db->where('StudentID', $details['StudentID']); $this->db->where('StudentID', $details['StudentID']);
$checkCourseFees=$this->db->get(REGISTRATIONDETAILS); $checkCourseFees=$this->db->get(REGISTRATIONDETAILS);
// $sql = "select cf.Sem_Year
// from T_Students_Fees_Status sfs
// left join T_Course_Fees_Details cf on sfs.CourseID = cf.CourseID
// where sfs.StudentID = ? and cf.CourseID = ? and cf.ID = ?" ;
// $late = $this->db->query($sql);
if($checkCourseFees->num_rows()<=0){ if($checkCourseFees->num_rows()<=0){
// insert registration details table // insert registration details table
@ -1419,18 +1427,16 @@ if(($details['FeesType']=='PPC') || ($details['FeesType']=='TC')|| ($details['Fe
// $regId= $feesStatusID; // $regId= $feesStatusID;
} }
else{ else{
$reRegistartion['Student_Fee_Status_Id']=$feesStatusID; $reRegistartion['Student_Fee_Status_Id']=$feesStatusID;
$reRegistartion['BatchCode']=$details['BatchCode']; $reRegistartion['BatchCode']=$details['BatchCode'];
$reRegistartion['StudentID']=$details['StudentID']; $reRegistartion['StudentID']=$details['StudentID'];
$reRegistartion['CourseID']=$details['CourseID']; $reRegistartion['CourseID']=$details['CourseID'];
$reRegistartion['FeeType']=$details['FeesType']; $reRegistartion['FeeType']=$details['FeesType'];
$reRegistartion['RegistrationMode']=0; $reRegistartion['RegistrationMode']= ($checkwithstatus!=0) ? 1 : 0;
$reRegistartion['RegistrationType']=RE_REGISTRATION_CONST; $reRegistartion['RegistrationType']= ($checkwithstatus!=0) ? NEWREGISTRATION_CONST : RE_REGISTRATION_CONST ;
$reRegistartion['BranchCode']=$details['BranchCode']; $reRegistartion['BranchCode']=$details['BranchCode'];
$reRegistartion['CreatedBy']=$details['CreatedBy']; $reRegistartion['CreatedBy']=$details['CreatedBy'];
$reRegistartion['CreatedOn']=$details['CreatedOn']; $reRegistartion['CreatedOn']=$details['CreatedOn'];
@ -1459,11 +1465,6 @@ $REGID='';
} }
// print_r($getlastid);
// echo 'in';
// die();
$this->db->select('ListCode'); $this->db->select('ListCode');
$this->db->from('T_PickListDetails'); $this->db->from('T_PickListDetails');
$this->db->where('ListName','EXPECTED'); $this->db->where('ListName','EXPECTED');
@ -1472,14 +1473,13 @@ $REGID='';
$searchDetails = $this->db->get(); $searchDetails = $this->db->get();
$getId=$searchDetails->result(); $getId=$searchDetails->result();
$listcode=''; // $listcode='';
// Expected Remove because mentioned ON Apollo XL sheet(30.11.2020)
foreach($getId as $ge) // foreach($getId as $ge)
{ // {
$listcode=$ge->ListCode; // $listcode=$ge->ListCode;
} // }
$listcode=null;
$fromd= date("d-m-Y",strtotime($details['CreatedOn'])); $fromd= date("d-m-Y",strtotime($details['CreatedOn']));

9
Apollo/api/application/models/Student_model.php
View File

@ -37,7 +37,8 @@ class Student_model extends CI_Model {
} }
public function get_student_tracking_details($universityid,$courseid,$MobileNumber,$loginBranch,$userType,$createdBy) public function get_student_tracking_details($universityid,$courseid,$MobileNumber,$loginBranch,$userType,$createdBy)
{ {
// echo $universityid.'-'.$courseid.'-'.$MobileNumber.'-'.$loginBranch.'-'.$userType.'-'.$createdBy;
// die();
$sql="SELECT LTF.FollowupOn,LD.LeadID,LTF.InteractionId, LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry, LT.TrackingID, LT.ActivityStatus,LT.AssignedTo, LT.StatusCode, LT.University, LT.Course, LT.AlternateMobile, LT.Address,LT.Flag, ST.StaffID, ST.Firstname, PLD1.ListCode as statusListCode, PLD1.ListName as statusListName, AV.ActivityID ,AV.ActivityName, LTF.FollowupComments $sql="SELECT LTF.FollowupOn,LD.LeadID,LTF.InteractionId, LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry, LT.TrackingID, LT.ActivityStatus,LT.AssignedTo, LT.StatusCode, LT.University, LT.Course, LT.AlternateMobile, LT.Address,LT.Flag, ST.StaffID, ST.Firstname, PLD1.ListCode as statusListCode, PLD1.ListName as statusListName, AV.ActivityID ,AV.ActivityName, LTF.FollowupComments
FROM T_Lead_Tracking_Followup as LTF FROM T_Lead_Tracking_Followup as LTF
JOIN T_Lead_Tracking as LT ON LT.TrackingID=LTF.TrackingID JOIN T_Lead_Tracking as LT ON LT.TrackingID=LTF.TrackingID
@ -73,11 +74,13 @@ class Student_model extends CI_Model {
// } // }
$sql.=" group by LTF.TrackingID"; $sql.=" group by LTF.TrackingID";
print_r($sql); // print_r($sql);
die(); // die();
$b=$this->db->query($sql); $b=$this->db->query($sql);
$trackingDetails = $b->result(); $trackingDetails = $b->result();
$result =$trackingDetails; $result =$trackingDetails;
// print_r($result);
// die();
return $result; return $result;
} }
// get student list based on login user // get student list based on login user

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

@ -507,6 +507,7 @@ class Studentview_model extends CI_Model
$this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = SMS.ListCode'); $this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = SMS.ListCode');
$this->db->where('CU.CourseID', $courseID); $this->db->where('CU.CourseID', $courseID);
$this->db->where('SMS.StudentID', $studentID); $this->db->where('SMS.StudentID', $studentID);
// $this->db->group_by('SMS.ID');
$this->db->order_by('SMS.ID', 'DESC'); $this->db->order_by('SMS.ID', 'DESC');
$getMaterialDetails = $this->db->get(); $getMaterialDetails = $this->db->get();
if ($getMaterialDetails->result()){ if ($getMaterialDetails->result()){
@ -533,6 +534,7 @@ class Studentview_model extends CI_Model
$this->db->where('CU.CourseID', $courseID); $this->db->where('CU.CourseID', $courseID);
$this->db->where('AS.StudentID', $studentID); $this->db->where('AS.StudentID', $studentID);
$this->db->where('CM.CertificateName !=', APPLICATION_CONST); $this->db->where('CM.CertificateName !=', APPLICATION_CONST);
$this->db->group_by('AS.ID');
$this->db->order_by('AS.ID', 'DESC'); $this->db->order_by('AS.ID', 'DESC');
$getCertDetails = $this->db->get(); $getCertDetails = $this->db->get();
@ -589,8 +591,10 @@ class Studentview_model extends CI_Model
$this->db->where('CU.CourseID', $courseID); $this->db->where('CU.CourseID', $courseID);
$this->db->where('CS.StudentID', $studentID); $this->db->where('CS.StudentID', $studentID);
$this->db->where_in('CS.CertificationType', 'MARK CARD'); $this->db->where_in('CS.CertificationType', 'MARK CARD');
$this->db->group_by('CS.ID');
$this->db->order_by('CS.ID', 'DESC'); $this->db->order_by('CS.ID', 'DESC');
$getMarkDetails = $this->db->get(); $getMarkDetails = $this->db->get();
// print_r($this->db->last_query());die();
if ($getMarkDetails->result()){ if ($getMarkDetails->result()){
return $getMarkDetails->result(); return $getMarkDetails->result();
} }
@ -610,6 +614,7 @@ class Studentview_model extends CI_Model
$this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = ABT.ListCode'); $this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = ABT.ListCode');
$this->db->where('CU.CourseID', $courseID); $this->db->where('CU.CourseID', $courseID);
$this->db->where('ABT.StudentID', $studentID); $this->db->where('ABT.StudentID', $studentID);
// $this->db->group_by('ABT.ID');
$this->db->order_by('ABT.ID', 'DESC'); $this->db->order_by('ABT.ID', 'DESC');
$getBookletDetails = $this->db->get(); $getBookletDetails = $this->db->get();
if ($getBookletDetails->result()){ if ($getBookletDetails->result()){

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

@ -416,6 +416,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<!-- <tr ng-repeat="booklet in course.answerbookletDetails | unique:'Sem'"> -->
<tr ng-repeat="booklet in course.answerbookletDetails | unique:'Sem'"> <tr ng-repeat="booklet in course.answerbookletDetails | unique:'Sem'">
<td> <td>
<span>{{booklet.AnsDate}}</span> <span>{{booklet.AnsDate}}</span>
@ -467,6 +468,7 @@
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="cert in course.certificateDetails | unique:'CertificateName'"> <tr ng-repeat="cert in course.certificateDetails | unique:'CertificateName'">
<!-- <tr ng-repeat="cert in course.certificateDetails'"> -->
<!-- <td> <!-- <td>
<span>{{cert.Sem_Year}}</span> <span>{{cert.Sem_Year}}</span>
</td>--> </td>-->
@ -518,8 +520,10 @@
</tr> </tr>
</thead> </thead>
<tbody ng-if="course.markCardDetails.length!=0 && course.markCardDetails[0].FeesType=='F001'"> <!-- <tbody ng-if="course.markCardDetails.length!=0 && course.markCardDetails[0].FeesType=='F001'">-->
<tr ng-repeat="mark in course.markCardDetails | unique:'Sem'"> <!-- <tr ng-repeat="mark in course.markCardDetails | unique:'Sem'"> -->
<tbody ng-if="course.markCardDetails.length!=0">
<tr ng-repeat="mark in course.markCardDetails'">
<td> <td>
<span>{{mark.CDate}}</span> <span>{{mark.CDate}}</span>
</td> </td>
@ -541,7 +545,7 @@
</tr> </tr>
</tbody> </tbody>
<tbody ng-if="course.markCardDetails.length!=0 && course.markCardDetails[0].FeesType!='F001'"> <!-- <tbody ng-if="course.markCardDetails.length!=0 && course.markCardDetails[0].FeesType!='F001'">
<tr ng-repeat="mark in course.markCardDetails | unique:'CourseID'"> <tr ng-repeat="mark in course.markCardDetails | unique:'CourseID'">
<td> <td>
<span>{{mark.CDate}}</span> <span>{{mark.CDate}}</span>
@ -550,9 +554,9 @@
<td> <td>
<span>{{mark.Sem_Year}}</span> <span>{{mark.Sem_Year}}</span>
</td> </td>
<!--<td> <!-<td>
<span>{{mark.CertificateName}}</span> <span>{{mark.CertificateName}}</span>
</td>--> </td>->
<td> <td>
<span>{{mark.ListName}} </span> <span>{{mark.ListName}} </span>
</td> </td>
@ -564,7 +568,7 @@
</tr> </tr>
</tbody> </tbody>-->
</table> </table>
<!-- <!--
@ -594,9 +598,10 @@
</tr> </tr>
</thead> </thead>
<tbody ng-if="course.studyMaterialDetails.length!=0 && course.studyMaterialDetails[0].FeesType=='F001'"> <!-- <tbody ng-if="course.studyMaterialDetails.length!=0 && course.studyMaterialDetails[0].FeesType=='F001'">
<tr ng-repeat="study in course.studyMaterialDetails | unique:'Sem'"> <tr ng-repeat="study in course.studyMaterialDetails | unique:'Sem'"> -->
<tbody ng-if="course.studyMaterialDetails.length!=0">
<tr ng-repeat="study in course.studyMaterialDetails">
<td> <td>
<span>{{study.SDate}}</span> <span>{{study.SDate}}</span>
</td> </td>
@ -614,7 +619,7 @@
</tr> </tr>
</tbody> </tbody>
<tbody ng-if="course.studyMaterialDetails.length!=0 && course.studyMaterialDetails[0].FeesType!='F001'"> <!-- <tbody ng-if="course.studyMaterialDetails.length!=0 && course.studyMaterialDetails[0].FeesType!='F001'">
<tr ng-repeat="study in course.studyMaterialDetails | unique:'CourseID'"> <tr ng-repeat="study in course.studyMaterialDetails | unique:'CourseID'">
<td> <td>
<span>{{study.SDate}}</span> <span>{{study.SDate}}</span>
@ -622,8 +627,8 @@
<td> <td>
<span>{{study.Sem_Year}}</span></td> <span>{{study.Sem_Year}}</span></td>
<!--<td> <!-<td>
<span>{{study.SDate}}</span></td>--> <span>{{study.SDate}}</span></td>->
<td> <td>
<span>{{study.ListName}} </span> <span>{{study.ListName}} </span>
</td> </td>
@ -633,7 +638,7 @@
</tr> </tr>
</tbody> </tbody> -->
</table> </table>
<!-- <!--