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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
gandhimathi 2018-03-29 17:15:41 +05:30
commit 811dc8bb0d
9 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,7 +118,9 @@
"INCOMELISTING": "INCOME LISTING", "INCOMELISTING": "INCOME LISTING",
"EXPENSELISTING": "EXPENSE LISTING", "EXPENSELISTING": "EXPENSE LISTING",
"DAYBOOK": "DAY BOOK ", "DAYBOOK": "DAY BOOK ",
"APPROVAL": "APPROVE EXPENSE" "APPROVAL": "APPROVE EXPENSE",
"DAYBOOKDETAILS": "DAYBOOK DETAILS",
"DAYBOOKAPPROVAL": "DAYBOOK APPROVAL"
}, },
"mydetails": { "mydetails": {
"MAIN": "MY DETAILS" "MAIN": "MY DETAILS"

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

@ -394,73 +394,73 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
}).state('app.daybook', { }).state('app.daybook', {
url: '/daybook', url: '/daybook',
template: '<div ui-view class="fade-in-up"> <div style="margin: auto; width: 50%;padding: 10px;"> STUDENT STATUS UPDATE </div> </div>', template: '<div ui-view class="fade-in-up"> <div style="margin: auto; width: 50%;padding: 10px;"> STUDENT STATUS UPDATE </div> </div>',
title: 'Income/Expense', title: 'Daybook',
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'Income/Expense' label: 'Daybook'
} }
}).state('app.daybook.details', { }).state('app.daybook.details', {
url: '/daybookdetails', url: '/daybookdetails',
templateUrl: "assets/views/daybook/daybook.html", templateUrl: "assets/views/daybook/daybook.html",
title: 'Income/Expense', title: 'Daybook Details',
resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybookCtrl','ngTable'), resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybookCtrl','ngTable'),
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'Income/Expense' label: 'Daybook Details'
} }
}).state('app.daybook.approval', { }).state('app.daybook.approval', {
url: '/daybookApproval', url: '/daybookApproval',
templateUrl: "assets/views/daybook/dayBookApproval.html", templateUrl: "assets/views/daybook/dayBookApproval.html",
title: 'Approve expense', title: 'Daybook Approval',
resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybookapprovalCtrl','ngTable'), resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybookapprovalCtrl','ngTable'),
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'Approve expense' label: 'Daybook Approval'
} }
}).state('app.daybookadmin', { }).state('app.daybookadmin', {
url: '/daybookadmin', url: '/daybookadmin',
template: '<div ui-view class="fade-in-up"> <div style="margin: auto; width: 50%;padding: 10px;"> STUDENT STATUS UPDATE </div> </div>', template: '<div ui-view class="fade-in-up"> <div style="margin: auto; width: 50%;padding: 10px;"> STUDENT STATUS UPDATE </div> </div>',
title: 'Income/Expense', title: 'Daybook',
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'Income/Expense' label: 'Daybook'
} }
}).state('app.daybookadmin.details', { }).state('app.daybookadmin.details', {
url: '/daybookadmindetails', url: '/daybookadmindetails',
templateUrl: "assets/views/daybook/daybookadmin.html", templateUrl: "assets/views/daybook/daybookadmin.html",
title: 'Income/Expense', title: 'Daybook Details',
resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybookadminCtrl','ngTable'), resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybookadminCtrl','ngTable'),
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'Income/Expense' label: 'Daybook Details'
} }
}) })
.state('app.daybookadmin.approval', { .state('app.daybookadmin.approval', {
url: '/daybookadminApproval', url: '/daybookadminApproval',
templateUrl: "assets/views/daybook/dayBookadminApproval.html", templateUrl: "assets/views/daybook/dayBookadminApproval.html",
title: 'Approve expense', title: 'Daybook Approval',
resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybookadminapprovalCtrl','ngTable'), resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybookadminapprovalCtrl','ngTable'),
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'Approve expense' label: 'Daybook Approval'
} }
}).state('app.daybooksuperadmin', { }).state('app.daybooksuperadmin', {
url: '/daybooksuperadmin', url: '/daybooksuperadmin',
template: '<div ui-view class="fade-in-up"> <div style="margin: auto; width: 50%;padding: 10px;"> STUDENT STATUS UPDATE </div> </div>', template: '<div ui-view class="fade-in-up"> <div style="margin: auto; width: 50%;padding: 10px;"> STUDENT STATUS UPDATE </div> </div>',
title: 'Income/Expense', title: 'Daybook',
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'Income/Expense' label: 'Daybook'
} }
}).state('app.daybooksuperadmin.details', { }).state('app.daybooksuperadmin.details', {
url: '/daybooksuperadmindetails', url: '/daybooksuperadmindetails',
templateUrl: "assets/views/daybook/daybooksuperadmin.html", templateUrl: "assets/views/daybook/daybooksuperadmin.html",
title: 'Income/Expense', title: 'Daybook Details',
resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybooksuperadminCtrl','ngTable'), resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybooksuperadminCtrl','ngTable'),
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'Income/Expense' label: 'Daybook Details'
} }
}) })
.state('app.daybooksuperadmin.approval', { .state('app.daybooksuperadmin.approval', {
url: '/daybooksuperadminApproval', url: '/daybooksuperadminApproval',
templateUrl: "assets/views/daybook/daybooksuperAdminApproval.html", templateUrl: "assets/views/daybook/daybooksuperAdminApproval.html",
title: 'Approve expense', title: 'Daybook Approval',
resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybooksuperadminapprovalCtrl','ngTable'), resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybooksuperadminapprovalCtrl','ngTable'),
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'Approve expense' label: 'Daybook Approval'
} }
}) })
// .state('app.daybooksuperadmin', { // .state('app.daybooksuperadmin', {

2
Apollo/assets/views/daybook/dayBookApproval.html
View File

@ -2,7 +2,7 @@
<section id="page-title"> <section id="page-title">
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="Approve expense">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKAPPROVAL">{{ mainTitle }}</h1>
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>

2
Apollo/assets/views/daybook/dayBookadminApproval.html
View File

@ -2,7 +2,7 @@
<section id="page-title"> <section id="page-title">
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="Approve expense">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKAPPROVAL">{{ mainTitle }}</h1>
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>

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

@ -2,7 +2,7 @@
<section id="page-title"> <section id="page-title">
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="sidebar.nav.daybook.MAIN">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKDETAILS">{{ mainTitle }}</h1>
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>

2
Apollo/assets/views/daybook/daybookadmin.html
View File

@ -2,7 +2,7 @@
<section id="page-title"> <section id="page-title">
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="sidebar.nav.daybook.MAIN">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKDETAILS">{{ mainTitle }}</h1>
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>

2
Apollo/assets/views/daybook/daybooksuperAdminApproval.html
View File

@ -2,7 +2,7 @@
<section id="page-title"> <section id="page-title">
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="sidebar.nav.daybook.MAIN">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKAPPROVAL">{{ mainTitle }}</h1>
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>

2
Apollo/assets/views/daybook/daybooksuperadmin.html
View File

@ -2,7 +2,7 @@
<section id="page-title"> <section id="page-title">
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="sidebar.nav.daybook.MAIN">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKDETAILS">{{ mainTitle }}</h1>
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>

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

@ -264,19 +264,19 @@
<i class="ti-money"></i> <i class="ti-money"></i>
</div> </div>
<div class="item-inner"> <div class="item-inner">
<span class="title" translate="sidebar.nav.daybook.MAIN"> DAY BOOK</span><i class="icon-arrow"></i> <span class="title" translate="sidebar.nav.daybook.DAYBOOK"> DAY BOOK</span><i class="icon-arrow"></i>
</div> </div>
</div> </div>
</a> </a>
<ul class="sub-menu"> <ul class="sub-menu">
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.daybooksuperadmin.details" ng-click="checkSuperAdmin()"> <a ui-sref="app.daybooksuperadmin.details" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.daybook.MAIN"> DAY BOOK</span> <span class="title" translate="sidebar.nav.daybook.DAYBOOKDETAILS"> DAY BOOK</span>
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.daybooksuperadmin.approval" ng-click="checkSuperAdmin()"> <a ui-sref="app.daybooksuperadmin.approval" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.daybook.APPROVAL"> DAY BOOK</span> <span class="title" translate="sidebar.nav.daybook.DAYBOOKAPPROVAL"> DAY BOOK</span>
</a> </a>
</li> </li>
</ul> </ul>
@ -584,19 +584,19 @@
<i class="ti-money"></i> <i class="ti-money"></i>
</div> </div>
<div class="item-inner"> <div class="item-inner">
<span class="title" translate="sidebar.nav.daybook.MAIN"> DAY BOOK</span><i class="icon-arrow"></i> <span class="title" translate="sidebar.nav.daybook.DAYBOOK"> DAY BOOK</span><i class="icon-arrow"></i>
</div> </div>
</div> </div>
</a> </a>
<ul class="sub-menu"> <ul class="sub-menu">
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.daybookadmin.details" ng-click="checkAdmin()"> <a ui-sref="app.daybookadmin.details" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.daybook.MAIN"> DAY BOOK</span> <span class="title" translate="sidebar.nav.daybook.DAYBOOKDETAILS"> DAY BOOK</span>
</a> </a>
</li> </li>
<li ui-sref-active="active" ng-if="is_active_DayBookAprlAccess == '1'"> <li ui-sref-active="active" ng-if="is_active_DayBookAprlAccess == '1'">
<a ui-sref="app.daybookadmin.approval" ng-click="checkAdmin()"> <a ui-sref="app.daybookadmin.approval" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.daybook.APPROVAL"> DAY BOOK</span> <span class="title" translate="sidebar.nav.daybook.DAYBOOKAPPROVAL"> DAY BOOK</span>
</a> </a>
</li> </li>
</ul> </ul>
@ -718,19 +718,19 @@
<i class="ti-money"></i> <i class="ti-money"></i>
</div> </div>
<div class="item-inner"> <div class="item-inner">
<span class="title" translate="sidebar.nav.daybook.MAIN"> DAY BOOK</span><i class="icon-arrow"></i> <span class="title" translate="sidebar.nav.daybook.DAYBOOK"> DAY BOOK</span><i class="icon-arrow"></i>
</div> </div>
</div> </div>
</a> </a>
<ul class="sub-menu"> <ul class="sub-menu">
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.daybook.details" ng-click="checkStaff()"> <a ui-sref="app.daybook.details" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.daybook.MAIN"> DAY BOOK</span> <span class="title" translate="sidebar.nav.daybook.DAYBOOKDETAILS"> DAY BOOK</span>
</a> </a>
</li> </li>
<li ui-sref-active="active" ng-if="is_active_DayBookAprlAccess == '1'"> <li ui-sref-active="active" ng-if="is_active_DayBookAprlAccess == '1'">
<a ui-sref="app.daybook.approval" ng-click="checkStaff()"> <a ui-sref="app.daybook.approval" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.daybook.APPROVAL"> DAY BOOK</span> <span class="title" translate="sidebar.nav.daybook.DAYBOOKAPPROVAL"> DAY BOOK</span>
</a> </a>
</li> </li>
</ul> </ul>