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

issue no:1669

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-02-19 18:24:52 +05:30
parent c0ccf33aa0
commit 795b07dcbd
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Apollo/api/application/models/Data_correction.php
View File

@ -266,6 +266,7 @@ group by Student_id,cid";
$this->db->join('T_CourseMaster cm','cm.CourseID=scd.CourseID'); $this->db->join('T_CourseMaster cm','cm.CourseID=scd.CourseID');
$this->db->join('T_UniversityMaster um','um.UniversityID=scd.UniversityID'); $this->db->join('T_UniversityMaster um','um.UniversityID=scd.UniversityID');
$this->db->where('scd.StudentID',$search['studentId']); $this->db->where('scd.StudentID',$search['studentId']);
$this->db->group_by('CourseID');
//$this->db->where('scd.IsActive','1'); //$this->db->where('scd.IsActive','1');
// if($search['University']!='') // if($search['University']!='')
@ -290,7 +291,7 @@ group by Student_id,cid";
$result_array['details'] = 'No Records Found'; $result_array['details'] = 'No Records Found';
} }
//print_r($this->db->last_query());die(); // print_r($this->db->last_query());die();
return $result_array; return $result_array;
@ -308,9 +309,10 @@ group by Student_id,cid";
// $qry="select * from T_Students_Fees_PaidDetails where StudentID='".$search['studentId']."' and FeesId=(select FeesID from T_Students_Fees_Status where StudentID='".$search['studentId']."' and CourseID='".$search['CourseId']."')"; // $qry="select * from T_Students_Fees_PaidDetails where StudentID='".$search['studentId']."' and FeesId=(select FeesID from T_Students_Fees_Status where StudentID='".$search['studentId']."' and CourseID='".$search['CourseId']."')";
$qry="select * from T_Students_Fees_PaidDetails sfp $qry="select sfp.ID as ID,BillNO,BillDate,Sem_Year,ModeOfPayment,BillAmount,sfs.FeesID as FeesID from T_Students_Fees_PaidDetails sfp
Join T_Students_Fees_Status sfs on sfs.FeesID= sfp.FeesId Join T_Students_Fees_Status sfs on sfs.FeesID= sfp.FeesId
where sfp.StudentID='".$search['studentId']."' and sfs.CourseID='".$search['CourseId']."';"; join T_Course_Fees_Details cfd on cfd.CourseID=sfs.CourseID and cfd.ID=sfs.FeesType
where sfp.StudentID='".$search['studentId']."' and sfs.CourseID='".$search['CourseId']."'";
$fee=$this->db->query($qry); $fee=$this->db->query($qry);
$feepaid = $fee->result(); $feepaid = $fee->result();
@ -331,7 +333,7 @@ where sfp.StudentID='".$search['studentId']."' and sfs.CourseID='".$search['Cour
$result_array['feepaiddetails'] = 'No Records Found'; $result_array['feepaiddetails'] = 'No Records Found';
} }
// print_r($this->db->last_query());die(); // print_r($this->db->last_query());die();
return $result_array; return $result_array;
@ -341,8 +343,9 @@ where sfp.StudentID='".$search['studentId']."' and sfs.CourseID='".$search['Cour
public function UpdateFeePaidDetails($search,$selectFeeIDs) public function UpdateFeePaidDetails($search,$selectFeeIDs)
{ {
// print_r($search); // print_r($search);
// print_r($selectFeeIDs); // print_r($selectFeeIDs);
// die();
foreach ($selectFeeIDs as $keyy => $vvalue) foreach ($selectFeeIDs as $keyy => $vvalue)

6
Apollo/assets/js/controllers/feetransferCtrl.js
View File

@ -230,7 +230,7 @@ $scope.TransferAmt=0;
if (response.data.status==200 && response.data.feeStatus) { if (response.data.status==200 && response.data.feeStatus) {
$scope.FeePaidDetails = response.data.feepaiddetails; $scope.FeePaidDetails = response.data.feepaiddetails;
//sconsole.log($scope.FeePaidDetails); // console.log($scope.FeePaidDetails);
$scope.feedetstatus=true; $scope.feedetstatus=true;
@ -266,9 +266,9 @@ $scope.TransferAmt=0;
// console.log(myModel); // console.log(myModel);
// console.log(p); // console.log(p);
// console.log(updateModel); // console.log(updateModel);
// console.log($scope.selectedfeeID); //console.log($scope.selectedfeeID);
//console.log(myModel.totalpaidfee); //console.log(myModel.totalpaidfee);
// return false; //return false;
// console.log(myModel.Activecourse); // console.log(myModel.Activecourse);
if($scope.selectedfeeID.length == 0) if($scope.selectedfeeID.length == 0)

2
Apollo/assets/views/edit_transferfee.html
View File

@ -32,6 +32,7 @@
<th></th> <th></th>
<th style="font-size: 12px;">BillNO</th> <th style="font-size: 12px;">BillNO</th>
<th style="font-size: 12px;">BillDate</th> <th style="font-size: 12px;">BillDate</th>
<th style="font-size: 12px;">Sem/Year</th>
<th style="font-size: 12px">ModeOfPayment</th> <th style="font-size: 12px">ModeOfPayment</th>
<th style="font-size: 12px;">BillAmount</th> <th style="font-size: 12px;">BillAmount</th>
<!-- <th style="font-size: 12px;">Action</th> --> <!-- <th style="font-size: 12px;">Action</th> -->
@ -47,6 +48,7 @@
<td>{{p.BillNO}}</td> <td>{{p.BillNO}}</td>
<td>{{p.BillDate}}</td> <td>{{p.BillDate}}</td>
<td>{{p.Sem_Year}}</td>
<td>{{p.ModeOfPayment}}</td> <td>{{p.ModeOfPayment}}</td>
<td>{{p.BillAmount}}</td> <td>{{p.BillAmount}}</td>