diff --git a/Apollo/api/application/models/Student_model.php b/Apollo/api/application/models/Student_model.php index de5b6bfd..b3dfd5e8 100755 --- a/Apollo/api/application/models/Student_model.php +++ b/Apollo/api/application/models/Student_model.php @@ -413,7 +413,12 @@ class Student_model extends CI_Model { $this->db->where('IsActive', 1); $this->db->where('BranchCode', $branch); $courseDetails = $this->db->get(); + // print_r($courseDetails->result()); + // die(); + if ($courseDetails->result()) { + + $this->db->select('B.SessionID, B.SessionName'); $this->db->from(SESSIONMASTER . ' as B'); $this->db->join(SESSIONDETAILS . ' SD', 'SD.SessionID = B.SessionID'); @@ -421,6 +426,10 @@ class Student_model extends CI_Model { $this->db->where('B.IsActive', 1); $this->db->where('SD.IsActive', 1); $batchDetails = $this->db->get(); + +//print_r($batchDetails->result()); +//die(); + if ($batchDetails->result()) { $result['courseStatus'] = true; $result['course_details'] = $courseDetails->result(); diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index 1d1a7aab..81f26042 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -158,7 +158,8 @@ "entry": { "MAIN": "My Details", "coursecorrection": "Course Details", - "stud_merge": "Student Merge" + "stud_merge": "Student Merge", + "DATACORRECTION" : "Bills Correction" }, "announcement": { "MAIN": "ANNOUNCEMENT", diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index 29ba3e3c..ac339ca7 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -178,7 +178,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com ncyBreadcrumb: { label: 'income_expense' }, - }).state('app.daybooksuperadmin.datacorrection', { + }).state('app.entry.datacorrection', { url: '/datacorrection', templateUrl: "assets/views/data_correction.html", resolve: loadSequence('datacorrectionCtrl','ngTable', 'ladda', 'angular-ladda'), diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index 83c52768..7b01f3b5 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -1,4 +1,4 @@ - +start: MAIN NAVIGATION MENU --> @@ -328,11 +328,11 @@ -