Issue #SB-919 chore : Merge pull request #102 from souravdey091/sb-91…

…9-routing Issue #SB-919 feat:Create router for announcement
Sunbird-Ed · Nov 22, 2017 · 2d7ca6e · 2d7ca6e
2 parents 04587a2 + eda1076
commit 2d7ca6e
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 54 deletions.
diff --git a/src/app/private/index.ejs b/src/app/private/index.ejs
@@ -90,6 +90,7 @@
  <script src="scripts/managers/eventManager.js"></script>
  <script src="scripts/app.js"></script>
  <script src="scripts/routes/appRoute.js"></script>
+ <script src="scripts/routes/announcementRoute.js"></script>
  <script src="scripts/factories/sessionFactory.js"></script>
  <script src="scripts/services/httpService.js"></script>
  <script src="scripts/services/httpServiceJava.js"></script>

diff --git a/src/app/private/scripts/routes/announcementRoute.js b/src/app/private/scripts/routes/announcementRoute.js
@@ -0,0 +1,63 @@
+'use strict'
+
+angular.module('playerApp')
+ .config(function ($stateProvider, $urlRouterProvider, $qProvider) {
+ $qProvider.errorOnUnhandledRejections(false) // To handle error rejection
+ $urlRouterProvider.deferIntercept()
+ $urlRouterProvider.otherwise('/home')
+ $stateProvider
+ .state('announcementOutbox', {
+ url: '/announcement/outbox',
+ views: {
+ mainView: {
+ templateUrl: '/views/announcement/announcementOutboxList.html',
+ controller: 'announcementOutboxListController as announcementOutboxData'
+ }
+ },
+ onEnter: function ($stateParams, $rootScope, routeHelperService) {
+ $rootScope.profileActive = 'active'
+ $rootScope.courseActive = ' '
+ $rootScope.isPlayerPage = true
+ routeHelperService.loadRouteConfig('announcementOutbox', null)
+ },
+ onExit: function ($rootScope) {
+ $rootScope.profileActive = ''
+ }
+ })
+ .state('announcementDetails', {
+ url: '/announcement/:announcementId',
+ views: {
+ mainView: {
+ templateUrl: '/views/announcement/announcementDetails.html',
+ controller: 'announcementDetailsController as announcementDetailsData'
+ }
+ },
+ onEnter: function ($stateParams, $rootScope, routeHelperService) {
+ $rootScope.profileActive = 'active'
+ $rootScope.courseActive = ' '
+ $rootScope.isPlayerPage = true
+ routeHelperService.loadRouteConfig('announcementDetails', null)
+ },
+ onExit: function ($rootScope) {
+ $rootScope.profileActive = ''
+ }
+ })
+ .state('announcementInbox', {
+ url: '/announcement/inbox',
+ views: {
+ mainView: {
+ templateUrl: '/views/announcement/announcementInboxList.html',
+ controller: 'announcementInboxListController as announcementInboxData'
+ }
+ },
+ onEnter: function ($stateParams, $rootScope, routeHelperService) {
+ $rootScope.homeActive = 'active'
+ $rootScope.isPlayerPage = true
+ $rootScope.courseActive = ' '
+ routeHelperService.loadRouteConfig('announcementInbox', null)
+ },
+ onExit: function ($rootScope) {
+ $rootScope.homeActive = ''
+ }
+ })
+ })
diff --git a/src/app/private/scripts/routes/appRoute.js b/src/app/private/scripts/routes/appRoute.js
@@ -758,60 +758,6 @@ angular.module('playerApp')
  $rootScope.profileActive = ''
  }
  })
- .state('announcementOutbox', {
- url: '/announcement/outbox',
- views: {
- mainView: {
- templateUrl: '/views/announcement/announcementOutboxList.html',
- controller: 'announcementOutboxListController as announcementOutboxData'
- }
- },
- onEnter: function ($stateParams, $rootScope, routeHelperService) {
- $rootScope.profileActive = 'active'
- $rootScope.courseActive = ' '
- $rootScope.isPlayerPage = true
- routeHelperService.loadRouteConfig('announcementOutbox', null)
- },
- onExit: function ($rootScope) {
- $rootScope.profileActive = ''
- }
- })
- .state('announcementDetails', {
- url: '/announcement/:announcementId',
- views: {
- mainView: {
- templateUrl: '/views/announcement/announcementDetails.html',
- controller: 'announcementDetailsController as announcementDetailsData'
- }
- },
- onEnter: function ($stateParams, $rootScope, routeHelperService) {
- $rootScope.profileActive = 'active'
- $rootScope.courseActive = ' '
- $rootScope.isPlayerPage = true
- routeHelperService.loadRouteConfig('announcementDetails', null)
- },
- onExit: function ($rootScope) {
- $rootScope.profileActive = ''
- }
- })
- .state('announcementInbox', {
- url: '/announcement/inbox',
- views: {
- mainView: {
- templateUrl: '/views/announcement/announcementInboxList.html',
- controller: 'announcementInboxListController as announcementInboxData'
- }
- },
- onEnter: function ($stateParams, $rootScope, routeHelperService) {
- $rootScope.homeActive = 'active'
- $rootScope.isPlayerPage = true
- $rootScope.courseActive = ' '
- routeHelperService.loadRouteConfig('announcementInbox', null)
- },
- onExit: function ($rootScope) {
- $rootScope.homeActive = ''
- }
- })
  .state('WorkSpace.ContentBatch', {
  url: '/content/batches',
  views: {

diff --git a/src/gulp/paths.js b/src/gulp/paths.js
@@ -297,6 +297,7 @@ var paths = {
  'dist/private/scripts/managers/eventManager.js',
  'dist/private/scripts/app.js',
  'dist/private/scripts/routes/appRoute.js',
+ 'dist/private/scripts/routes/announcementRoute.js',
  'dist/private/script.min.js',
  'dist/common/fonts/**',
  'dist/common/images/**',