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

data correction menu change

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-09-08 14:31:33 +05:30
parent 2078b8e849
commit 6da672c989
4 changed files with 64 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Apollo/api/application/models/Student_model.php
View File

@ -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();

3
Apollo/assets/i18n/en.json
View File

@ -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",

2
Apollo/assets/js/config.router.js
View File

@ -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'),

59
Apollo/assets/views/partials/nav.html
View File

@ -1,4 +1,4 @@
<!-- start: MAIN NAVIGATION MENU -->
start: MAIN NAVIGATION MENU -->
<!-- start: Super Admin -->
@ -328,11 +328,11 @@
</li>
<li ui-sref-active="active">
<!-- <li ui-sref-active="active">
<a ui-sref="app.daybooksuperadmin.datacorrection" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.daybook.DATACORRECTION"> DATA CORRECTION</span>
</a>
</li>
</li> -->
@ -560,6 +560,12 @@
<span class="title" translate="sidebar.nav.entry.stud_merge">Student Merge</span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.entry.datacorrection" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.entry.DATACORRECTION"> DATA CORRECTION</span>
</a>
</li>
</ul>
</li>
@ -849,11 +855,11 @@
</li>
<li ui-sref-active="active">
<!-- <li ui-sref-active="active">
<a ui-sref="app.daybooksuperadmin.datacorrection" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.daybook.DATACORRECTION"> DATA CORRECTION</span>
</a>
</li>
</li> -->
@ -1038,7 +1044,7 @@
<li ui-sref-active="active">
<a ui-sref="app.reports.feeCollect" ng-click="checkSuperAdmin()">
<a ui-sref="app.reports.feeCollect" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.report.feeCollect">Report For Fees Collection</span>
</a>
</li>
@ -1059,6 +1065,45 @@
</a>
</li>-->
<li ng-class="{'active open':$state.includes('app.entry')}">
<a href="javascript:void(0)">
<div class="item-content">
<div class="item-media">
<i class="ti-pencil"></i>
</div>
<div class="item-inner">
<span class="title" translate="sidebar.nav.master.ENTRY"> ENTRY </span><i class="icon-arrow"></i>
</div>
</div>
</a>
<ul class="sub-menu">
<li ui-sref-active="active">
<a ui-sref="app.entry.coursecorrection" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.entry.coursecorrection">COURSECORRECTION</span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.entry.stud_merge" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.entry.stud_merge">Student Merge</span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.entry.datacorrection" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.entry.DATACORRECTION"> DATA CORRECTION</span>
</a>
</li>
</ul>
</li>
</ul>
<!-- end: Admin -->
@ -1613,4 +1658,4 @@
<span translate="sidebar.heading.DOCUMENTATION">Documentation</span>
</a>
</div>-->
<!-- end: DOCUMENTATION BUTTON -->
<!-- end: DOCUMENTATION BUTTON