diff --git a/Apollo/api/application/models/Data_correction.php b/Apollo/api/application/models/Data_correction.php index da2a8e35..953212af 100644 --- a/Apollo/api/application/models/Data_correction.php +++ b/Apollo/api/application/models/Data_correction.php @@ -266,6 +266,7 @@ group by Student_id,cid"; $this->db->join('T_CourseMaster cm','cm.CourseID=scd.CourseID'); $this->db->join('T_UniversityMaster um','um.UniversityID=scd.UniversityID'); $this->db->where('scd.StudentID',$search['studentId']); + $this->db->group_by('CourseID'); //$this->db->where('scd.IsActive','1'); // if($search['University']!='') @@ -290,7 +291,7 @@ group by Student_id,cid"; $result_array['details'] = 'No Records Found'; } - //print_r($this->db->last_query());die(); + // print_r($this->db->last_query());die(); 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 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 -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); $feepaid = $fee->result(); @@ -331,7 +333,7 @@ where sfp.StudentID='".$search['studentId']."' and sfs.CourseID='".$search['Cour $result_array['feepaiddetails'] = 'No Records Found'; } - // print_r($this->db->last_query());die(); + // print_r($this->db->last_query());die(); return $result_array; @@ -341,8 +343,9 @@ where sfp.StudentID='".$search['studentId']."' and sfs.CourseID='".$search['Cour public function UpdateFeePaidDetails($search,$selectFeeIDs) { - // print_r($search); + // print_r($search); // print_r($selectFeeIDs); + // die(); foreach ($selectFeeIDs as $keyy => $vvalue) diff --git a/Apollo/assets/js/controllers/feetransferCtrl.js b/Apollo/assets/js/controllers/feetransferCtrl.js index 63e4f5d1..67e0f008 100644 --- a/Apollo/assets/js/controllers/feetransferCtrl.js +++ b/Apollo/assets/js/controllers/feetransferCtrl.js @@ -230,7 +230,7 @@ $scope.TransferAmt=0; if (response.data.status==200 && response.data.feeStatus) { $scope.FeePaidDetails = response.data.feepaiddetails; - //sconsole.log($scope.FeePaidDetails); + // console.log($scope.FeePaidDetails); $scope.feedetstatus=true; @@ -266,9 +266,9 @@ $scope.TransferAmt=0; // console.log(myModel); // console.log(p); // console.log(updateModel); - // console.log($scope.selectedfeeID); + //console.log($scope.selectedfeeID); //console.log(myModel.totalpaidfee); - // return false; + //return false; // console.log(myModel.Activecourse); if($scope.selectedfeeID.length == 0) diff --git a/Apollo/assets/views/edit_transferfee.html b/Apollo/assets/views/edit_transferfee.html index f89102c1..1e9888e4 100644 --- a/Apollo/assets/views/edit_transferfee.html +++ b/Apollo/assets/views/edit_transferfee.html @@ -32,6 +32,7 @@ BillNO BillDate + Sem/Year ModeOfPayment BillAmount @@ -47,6 +48,7 @@ {{p.BillNO}} {{p.BillDate}} + {{p.Sem_Year}} {{p.ModeOfPayment}} {{p.BillAmount}}