Issue #91: affichage du tableau et chargement des données initiales

makinacorpus · Jul 21, 2015 · 79a0070 · 79a0070
1 parent 5a003df
commit 79a0070
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 3 deletions.
diff --git a/app/index.html b/app/index.html
@@ -13,6 +13,7 @@
     <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" />
     <link rel="stylesheet" href="bower_components/seiyria-bootstrap-slider/dist/css/bootstrap-slider.css" />
     <link rel="stylesheet" href="bower_components/fontawesome/css/font-awesome.css" />
+    <link rel="stylesheet" href="bower_components/angular-ui-grid/ui-grid.css" />
     <!-- endbower -->
     <!-- endbuild -->
     <!-- build:css(.tmp) styles/main.css -->
@@ -94,6 +95,7 @@ <h3 class="text-muted">Editeur de DER</h3>
     <script src="bower_components/file-saver.js/FileSaver.js"></script>
     <script src="bower_components/turf/turf.min.js"></script>
     <script src="bower_components/angular-ui-utils/ui-utils.js"></script>
+    <script src="bower_components/angular-ui-grid/ui-grid.js"></script>
     <!-- endbower -->
     <!-- endbuild -->
 

diff --git a/app/scripts/app.js b/app/scripts/app.js
@@ -19,7 +19,8 @@ angular
     'angularSpinner',
     'ui.select',
     'ui.bootstrap-slider',
-    'ui.keypress'
+    'ui.keypress',
+    'ui.grid'
   ])
   .config(function($routeProvider) {
     $routeProvider

diff --git a/app/scripts/controllers/commonmap.js b/app/scripts/controllers/commonmap.js
@@ -74,6 +74,22 @@ angular.module('accessimapEditeurDerApp')
         $scope.rightMenuVisible = true;
       };
 
+      $scope.interactiveFiltersInit = [{
+        'id': 'name',
+        'f0': 'Aucune interaction'
+      }, {
+        'id': 'expandable',
+        'f0': false
+      }, {
+        'id': 'title',
+        'f0': 'Titre par défaut'
+      }];
+
+      $scope.interactiveFilters = {
+        data: $scope.interactiveFiltersInit
+      };
+
+
       d3.select('svg').append('defs')
           .append('marker')
           .attr('id', 'midmarker')

diff --git a/app/styles/map.scss b/app/styles/map.scss
@@ -43,3 +43,8 @@
 .menu-right {
   background-color: #EEEEEE;
 }
+
+.myGrid {
+  width: 500px;
+  height: 250px;
+}
diff --git a/app/views/commonmap.html b/app/views/commonmap.html
@@ -101,6 +101,7 @@
   <span class="pull-right" id="slide-submenu" ng-click="hideMenu()">
     <i class="fa fa-times"></i>
   </span>
-    Ici, affichage des filtres d'interaction
+    Ajouter des interactions
+    <div ui-grid="interactiveFilters" class="myGrid"></div>
 </div>
 
diff --git a/bower.json b/bower.json
@@ -21,7 +21,8 @@
     "file-saver.js": "~1.20150304.1",
     "turf": "~2.0.2",
     "fontawesome": "~4.3.0",
-    "angular-ui-utils": "~0.2.3"
+    "angular-ui-utils": "~0.2.3",
+    "angular-ui-grid": "~3.0.1"
   },
   "devDependencies": {
     "angular-mocks": "~1.3.0",