From d8337b564fa31a739cd20f5426f85e632ebcc5f9 Mon Sep 17 00:00:00 2001
From: gayathri1990 <maran7mca@gmail.com>
Date: Thu, 23 Aug 2018 14:40:05 +0530
Subject: [PATCH] merge navbar

---
 Apollo/assets/i18n/en.json        | 6 ++++--
 Apollo/assets/js/config.router.js | 9 +++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json
index d0b61293..e53b3f15 100755
--- a/Apollo/assets/i18n/en.json
+++ b/Apollo/assets/i18n/en.json
@@ -92,8 +92,10 @@
         "wav_ref": "WAIVER AND REFERAL REPORT",
         "examfee": "EXAM WRITING FEE REPORT",
         "balfee": "FEE BALANCE REPORT",
-		"lead": "LEAD TRACKING REPORT",
-		"newreg":"NEW REG REPORT"
+	     	"lead": "LEAD TRACKING REPORT",   
+	    	"newreg":"NEW REG REPORT",
+         "feeCollect":"FEE COLLECTED"
+
        
       },
       "student": {
diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js
index 01728e08..5db70383 100755
--- a/Apollo/assets/js/config.router.js
+++ b/Apollo/assets/js/config.router.js
@@ -194,6 +194,15 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
                 ncyBreadcrumb: {
                     label: 'newreg'
                 },
+            
+            }).state('app.reports.feeCollect', {
+                url: '/feeCollect',
+                templateUrl: "assets/views/feecollected.html",
+                resolve: loadSequence('FeeCollected_reportCtrl','ngTable', 'ladda', 'angular-ladda'),
+                title: 'feeCollect',
+                ncyBreadcrumb: {
+                    label: 'feeCollect'
+                }
             }).state('app.master.studentStatusUpdate', {
             url: '/default activity',
             templateUrl: "assets/views/studentStatusUpdate.html",