Preparing for HHNK

Geodan · Mar 12, 2014 · a739e81 · a739e81
1 parent dec878d
commit a739e81
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 14 deletions.
diff --git a/index.html b/index.html
@@ -9,6 +9,11 @@
     <link rel="stylesheet" href="lib/diff/font-awesome-4.0.3/css/font-awesome.min.css">
     <link rel="stylesheet" href="css/app.css">
   <script src="./lib/cow/lib/dbjs/db.js"></script>
+  <!-- signalR ready-->
+  <script type="text/javascript" src="./lib/cow/lib/jquery-1.9.1/jquery.min.js"></script>
+  <script type="text/javascript" src="./lib/cow/lib/jquery.signalR/jquery.signalR-2.0.2.js"></script>
+  <script type="text/javascript" src="https://srvcis/cow/signalr/hubs"></script> <!-- CHANGE THIS TO CORRECT SIGNALR SERVER URL -->
+
   <script type="text/javascript" src="./lib/cow/lib/underscore/underscore-min.js" ></script>
   <script type="text/javascript" src="./lib/cow/src/cow2.utils.js" ></script>
   <script type="text/javascript" src="./lib/cow/src/cow2.record.js" ></script>
@@ -18,7 +23,8 @@
   <script type="text/javascript" src="./lib/cow/src/cow2.group.js" ></script>
   <script type="text/javascript" src="./lib/cow/src/cow2.item.js" ></script>
   <script type="text/javascript" src="./lib/cow/src/cow2.project.js" ></script>
-  <script type="text/javascript" src="./lib/cow/src/cow2.websocket.js" ></script>
+  <!--<script type="text/javascript" src="./lib/cow/src/cow2.websocket.js" ></script>-->
+  <script type="text/javascript" src="./lib/cow/src/cow2.signalR.js" ></script>
   <script type="text/javascript" src="./lib/cow/src/cow2.core.js" ></script>
   <script type="text/javascript" src="./lib/cow/lib/polyfill-promise/promise-0.1.1.min.js"></script>
 

diff --git a/lib/cow b/lib/cow
diff --git a/src/controllers/leafletCtrl.js b/src/controllers/leafletCtrl.js
@@ -20,6 +20,11 @@ icm.controller('LeafletController', [ '$scope','$http','$timeout','Core', 'Utils
         $scope.time = new Date($scope.mytime).getTime();
         populateFeatures();
     };
+    $scope.setNow = function() {
+        var d = new Date();
+        $scope.mytime = d;
+        $scope.timechanged();
+    };
     $scope.toggleChronos = function(){
         populateFeatures();
     };

diff --git a/src/factories.js b/src/factories.js
@@ -65,7 +65,8 @@ icm.factory('Beelden', ['$rootScope', function( $rootScope ) {
 icm.factory('Core', ['$rootScope', function($rootScope) {
 
    var cow = new Cow.core({
-          wsUrl: 'wss://websocket.geodan.nl:443/icms'
+          //wsUrl: 'wss://websocket.geodan.nl:443/icms'
+          wsUrl: 'https://srvcis/cow/signalr'
         });   
     cow.userStore().loaded.then(function(){
         if (!cow.users('1')){

diff --git a/src/services.js b/src/services.js
@@ -5,10 +5,10 @@ icm.factory('LeafletService',['$rootScope','Core',function($rootScope, Core) {
     instance.layers = {};
     instance.center = function(center){
         if (!center){
-            console.log('Getting center: ', instance._center);
+            //console.log('Getting center: ', instance._center);
         }
         else{
-            console.log('setting center: ', center);
+            //console.log('setting center: ', center);
         }
         return instance._center = center || instance._center;
     };

diff --git a/src/state.js b/src/state.js
@@ -1,29 +1,24 @@
 var icm = angular.module('icm', ["ui.router",'ui.bootstrap',"leaflet-directive",'ngSanitize', 'textAngular'])
     .run(
-      [        '$rootScope', '$state', '$stateParams',
-      function ($rootScope,   $state,   $stateParams) {
+      [        '$rootScope', '$state', '$stateParams','Utils',
+      function ($rootScope,   $state,   $stateParams, Utils) {
 
         // It's very handy to add references to $state and $stateParams to the $rootScope
         // so that you can access them from any scope within your applications.For example,
         // <li ui-sref-active="active }"> will set the <li> // to active whenever
         // 'contacts.list' or one of its decendents is active.
         $rootScope.$state = $state;
         $rootScope.$stateParams = $stateParams;
-
       }])
     .config(
-        [          '$stateProvider', '$urlRouterProvider',
-            function ($stateProvider, $urlRouterProvider) {
+        ['$stateProvider', '$urlRouterProvider',function ($stateProvider, $urlRouterProvider) {
 
 
       $urlRouterProvider
-
-
-      //bij foute url stuur naar het begin
+        //bij foute url stuur naar het begin
         .otherwise("/");
 
       $stateProvider
-
         // Hier moet IAAA stuff komen, maar voorlopig moet je een username invullen voor
         // COW
         .state("login", {

diff --git a/templates/kaart.html b/templates/kaart.html
@@ -77,6 +77,7 @@ <h3>Lagen</h3>
       <span ng-model="mytime" ng-change="timechanged()" ng-show="chronos" style="display:inline-block;">
         <timepicker hour-step="hstep" minute-step="mstep" show-meridian="ismeridian"></timepicker>
       </span>
+      <button class="btn btn-default" ng-click="setNow()" ng-show="chronos">Huidig</button>
       <leaflet center="initcenter" defaults="defaults" height="800px" width="100%" markers="markers" paths='paths' layers="layers" events="events"></leaflet>
       </div>
       </div>