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

Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Browse Source
This commit is contained in:
dineshkumarkannan 2018-08-30 16:09:14 +05:30
commit c78f6df959
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Apollo/api/application/config/constants.php
View File

@ -160,6 +160,7 @@ defined('STUDENTDOCUMENTDETAILS') OR define('STUDENTDOCUMENTDETAILS','T_StudentD
defined('STUDENTDOCUMENTTRACKDETAILS') OR define('STUDENTDOCUMENTTRACKDETAILS','T_Student_DocumentTrack_Details');
defined('REGISTRATIONDETAILS') OR define('REGISTRATIONDETAILS','T_Registration_Details');
defined('ENROLMENTRECEIVEDFROMUNIV') OR define('ENROLMENTRECEIVEDFROMUNIV','T_Enrolment_Received_From_University');
defined('FORMFEESRECEIVEDFROMUNIV') OR define('FORMFEESRECEIVEDFROMUNIV','T_FormId_FeeDetails_Received_From_University');
// define APPLICATION certificate type constant

3
Apollo/api/application/config/routes.php
View File

@ -346,4 +346,5 @@ $route['getApplicationFormStatusList'] = 'StatusUpdation_Controller/getApplicati
// update university enrolment and fees details received
$route['receiveEnrolmentFromUniv'] = 'Receive_Enrolment_Fees_Univ_Controller/receiveEnrolmentFromUniv';
$route['insertFormIdUnivFeeDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/insertFormIdUnivFeeDetails';
$route['getStudentUnivFeeCompareDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getStudentUnivFeeCompareDetails';
$route['getStudentUnivFeeCompareDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getStudentUnivFeeCompareDetails';
$route['formIDFeeCompareDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/formIDFeeCompareDetails';

4
Apollo/api/application/models/Hallticket_model.php
View File

@ -11,7 +11,7 @@
class Hallticket_model extends CI_Model
{
/*
/*
* get university details
* created by velz
* */
@ -843,7 +843,7 @@ class Hallticket_model extends CI_Model
JOIN T_SemSubMap_Master on T_SemSubMap_Child.MapID = T_SemSubMap_Master.MapID and T_SemSubMap_Master.UniversityID = ? and T_SemSubMap_Master.CourseID = ? and T_SemSubMap_Master.SemesterID = ? and T_SemSubMap_Master.BranchCode = ? and T_SemSubMap_Child.IsActive = 1
JOIN T_Batch_Schedule_Master on T_Batch_Schedule_Master.UniversityID = ? and T_Batch_Schedule_Master.CourseID = ? and T_Batch_Schedule_Master.BranchCode = ?
JOIN T_Batch_Schedule_Child on T_Batch_Schedule_Master.SchId = T_Batch_Schedule_Child.SchId and T_SemSubMap_Child.SubjectID = T_Batch_Schedule_Child.SubjectID and T_Batch_Schedule_Child.IsActive = 1
order by T_SemSubMap_Master.SemesterID";
order by T_Batch_Schedule_Child.ScheduleDate";
$res = $this->db->query($sql,array($UID['universityID'],$courseID,$ind['SemID'],$branchId,$UID['universityID'],$courseID,$branchId));
//$id['FeeDetails'][$key2] = $res->result();
$in = $res->result();

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

@ -160,6 +160,8 @@
</tbody>
</table>
</div>
<dir-pagination-controls direction-links="true" boundary-links="true">
</dir-pagination-controls>
</div>
</form>