diff --git a/Apollo/api/application/models/Data_correction.php b/Apollo/api/application/models/Data_correction.php index d6a270e9..da2a8e35 100644 --- a/Apollo/api/application/models/Data_correction.php +++ b/Apollo/api/application/models/Data_correction.php @@ -261,9 +261,10 @@ group by Student_id,cid"; public function GetCourseFeeDetails($search) { - $this->db->select('StudentID,scd.UniversityID,scd.CourseID,CourseName,scd.IsActive,CourseCode'); + $this->db->select('StudentID,scd.UniversityID,scd.CourseID,CourseName,scd.IsActive,CourseCode,um.UniversityName'); $this->db->from('T_Student_CourseDetails scd'); $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->where('scd.IsActive','1'); @@ -289,6 +290,8 @@ group by Student_id,cid"; $result_array['details'] = 'No Records Found'; } + //print_r($this->db->last_query());die(); + return $result_array; diff --git a/Apollo/assets/js/controllers/feetransferCtrl.js b/Apollo/assets/js/controllers/feetransferCtrl.js index 14f89cd3..63e4f5d1 100644 --- a/Apollo/assets/js/controllers/feetransferCtrl.js +++ b/Apollo/assets/js/controllers/feetransferCtrl.js @@ -165,7 +165,7 @@ app.controller('feetransferCtrl', ["$scope","$rootScope","toaster", "$filter", " //console.log(response) if (response.data.status==200 && response.data.courseStatus) { $scope.feeInfo=response.data.details; - // console.log($scope.feeInfo); + // console.log($scope.feeInfo); $scope.editId = P.ID; $scope.courselist =true; $scope.feecheck=false; diff --git a/Apollo/assets/views/edit_transferfee.html b/Apollo/assets/views/edit_transferfee.html index 62f5da52..f89102c1 100644 --- a/Apollo/assets/views/edit_transferfee.html +++ b/Apollo/assets/views/edit_transferfee.html @@ -14,7 +14,7 @@ ng-click="getpaidFeeDetails(myModel,p)"> - + @@ -58,6 +58,7 @@ +
@@ -66,7 +67,7 @@ ng-click="getTotalFeePaid(myModel,p)"> - +