Merge pull request #10 from BRaimbault/v0.8-dev

v0.8-pre-release
msf-ocba · Aug 31, 2016 · 151b44e · 151b44e
2 parents 44b880b + 6875eec
commit 151b44e
Show file tree

Hide file tree

Showing 17 changed files with 560 additions and 10 deletions.
diff --git a/app/app.config.js b/app/app.config.js
@@ -3,12 +3,13 @@
     Please refer to the LICENSE.md and LICENSES-DEP.md for complete licenses.
 ------------------------------------------------------------------------------------*/
 
+var graphModule = angular.module('graphModule', ['angucomplete-alt']);
 var dossiersEditorModule = angular.module('dossiersEditorModule', ['ui.tinymce']);
 var dossiersReaderModule = angular.module('dossiersReaderModule', []);
 var searchModule = angular.module('searchModule', ['angularUtils.directives.dirPagination','angular.filter']);
 var dossiersModule = angular.module('dossiersModule', ['dossiersEditorModule','dossiersReaderModule']);
 
-var appModule = angular.module('appModule', ['ui.router', 'd2Menu', 'ngSanitize', 'pascalprecht.translate', 'ngResource', 'dossiersModule', 'searchModule']);
+var appModule = angular.module('appModule', ['ui.router', 'd2Menu', 'ngSanitize', 'pascalprecht.translate', 'ngResource', 'dossiersModule', 'searchModule', 'graphModule']);
 
 /*
  * 	@alias appModule.config
@@ -37,6 +38,10 @@ appModule.config(['$stateProvider', '$urlRouterProvider', '$translateProvider',
         .state('search', {
             url:'/search',
             templateUrl: 'app/search/search.view.html',
+        })
+        .state('graph', {
+            url:'/graph',
+            templateUrl: 'app/graph/graph.view.html',
         });
 
 

diff --git a/app/dossiers/dossiers.view.html b/app/dossiers/dossiers.view.html
@@ -11,6 +11,7 @@ <h1>{{'Services' | translate}}</h1>
 		<p>{{'Number of IndicatorGroups in Service' | translate}}: {{indicatorGroups.indicatorGroups.length}}</p>
 		<div class="col-md-12">
 			<select class="col-md-2" ng-options="service.displayName for service in services.organisationUnitGroups | orderBy: 'displayName'" name="selectService" id="drpBoxServices" ng-model="selectedService">
+				<option value="" disabled selected>Select a service</option>
 			</select>
 		</div>
 	</div>