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 11:04:54 +05:30
parent 0a3c8fbd9e
commit 3918f37b33
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -261,9 +261,10 @@ group by Student_id,cid";
public function GetCourseFeeDetails($search) 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->from('T_Student_CourseDetails scd');
$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->where('scd.StudentID',$search['studentId']); $this->db->where('scd.StudentID',$search['studentId']);
//$this->db->where('scd.IsActive','1'); //$this->db->where('scd.IsActive','1');
@ -289,6 +290,8 @@ group by Student_id,cid";
$result_array['details'] = 'No Records Found'; $result_array['details'] = 'No Records Found';
} }
//print_r($this->db->last_query());die();
return $result_array; return $result_array;

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

@ -14,7 +14,7 @@
ng-click="getpaidFeeDetails(myModel,p)"> ng-click="getpaidFeeDetails(myModel,p)">
<option value="" selected>Select</option> <option value="" selected>Select</option>
<option ng-repeat="item in feeInfo" value="{{item.CourseID}}">{{item.CourseName}}-{{item.CourseCode}}</option> <option ng-repeat="item in feeInfo" value="{{item.CourseID}}">{{item.CourseName}}-{{item.CourseCode}}({{item.UniversityName}})</option>
</select> </select>
</div> </div>
@ -58,6 +58,7 @@
</table> </table>
<!-- </div> --> <!-- </div> -->
<!-- {{feeInfo}} -->
<div class="row"> <div class="row">
<div class="col-md-3 form-group"> <div class="col-md-3 form-group">
@ -66,7 +67,7 @@
ng-click="getTotalFeePaid(myModel,p)"> ng-click="getTotalFeePaid(myModel,p)">
<option value="" selected>Select</option> <option value="" selected>Select</option>
<option ng-repeat="item in feeInfo" ng-if="item.IsActive==1" value="{{item.CourseID}}">{{item.CourseName}}-{{item.CourseCode}}</option> <option ng-repeat="item in feeInfo" ng-if="item.IsActive==1" value="{{item.CourseID}}">{{item.CourseName}}-{{item.CourseCode}}({{item.UniversityName}})</option>
</select> </select>
</div> </div>