Merge 7de8223 into 1e820d9

g0v · Sep 10, 2014 · 44b3828 · 44b3828
2 parents 1e820d9 + 7de8223
commit 44b3828
Show file tree

Hide file tree

Showing 36 changed files with 60,360 additions and 3 deletions.
diff --git a/app/app.ls b/app/app.ls
@@ -29,6 +29,12 @@ angular.module \ly.g0v.tw <[ngGrid app.controllers ly.g0v.tw.controllers app.dir
       resolve: _init: <[LYService]> ++ (.init!)
       controller: \LYBills
 
+    .state 'bills-search' do
+      url: '/bills-search?ad&session&year&month&day&committee&extra&sitting&motion_type'
+      templateUrl: 'app/partials/bills-search.html'
+      resolve: _init: <[LYService]> ++ (.init!)
+      controller: \LYBillsSearch
+
     .state 'bills-detail.compare' do
       url: '/compare/{otherBills}'
 

diff --git a/app/app/controllers.ls b/app/app/controllers.ls
@@ -18,7 +18,7 @@ renderCommittee = (committee) ->
     res.join ''
 
 
-angular.module 'app.controllers' <[app.controllers.calendar app.controllers.sittings app.controllers.sittings-new app.controllers.bills app.controllers.search ng]>
+angular.module 'app.controllers' <[app.controllers.calendar app.controllers.sittings app.controllers.sittings-new app.controllers.bills app.controllers.bills-search app.controllers.search ng]>
 .run <[$rootScope]> ++ ($rootScope) ->
   $rootScope.committees = committees
 .controller AppCtrl: <[$scope $location $rootScope $sce]> ++ (s, $location, $rootScope, $sce) ->