Merge branch 'master' of https://github.com/tomvantilburg/icm-ui

Conflicts:
	src/controllers/leafletCtrl.js

src/controllers/beeldSideCtrl.js

@@ -9,7 +9,15 @@ icm.controller('BeeldSideCtrl', ['$scope', '$stateParams', 'Beelden', 'Core', 'U
         if(!Core.project($stateParams.incidentID)) return false;
 
     } 
+    $scope.nieuwBericht = false;
+    $scope.$watch('data.users',function(users){
+        var updated = false;
+        _(users).each(function(d){
+            if(d.updated) updated = true;
+        })
+        $scope.nieuwBericht =updated;
 
+    }, true);
     //functie om het huidige beeld op te halen
     $scope.currentBeeld = _(Beelden.beelden).filter(function(d){
         return d.beeld == $scope.beeldType;
@@ -49,6 +57,8 @@ icm.controller('BeeldSideCtrl', ['$scope', '$stateParams', 'Beelden', 'Core', 'U
     $scope.getBerichten = function(user) {
         $scope.discussie = user.name;
         $scope.gesprek = true;
+        user.timestamp = new Date().getTime();
+        user.updated = false;
     }
     $scope.sendMessage = function() {
         if($scope.chat == '') return false;

src/controllers/incidentCtrl.js

@@ -0,0 +1,83 @@
+// Please note that $modalInstance represents a modal window (instance) dependency.
+// It is not the same as the $modal service used above.
+icm.controller('IncidentCtrl' ,['$scope', 'Core', '$stateParams', '$location', function($scope, Core, $stateParams, $location) {
+
+    var project = null;
+    $scope.incident = {};
+    $scope.isNew = true;
+    $scope.projectTypes =
+        [
+            { id: 0, name: "LIVE" },
+            { id: 1, name: "Oefening" }
+        ];
+    $scope.projectStatuses =
+        [
+            { id: 0, name: "Actief" },
+            { id: 1, name: "Gepland" },
+            { id: 2, name: "Gesloten" }
+        ];
+
+    /* Datepicker configuration */
+    $scope.dateOptions = {
+        'starting-day': 1
+    };
+    $scope.open = function($event) {
+        $event.preventDefault();
+        $event.stopPropagation();
+        $scope.opened = true;
+    };
+
+    if ($stateParams.incidentID != undefined)
+    {
+        if(!Core.project()) return false;
+        //TODO: hier moet je of terug gestuurd worden naar incidenten of netjes met een promise oid alsnog alle gegevens zetten
+
+        project = Core.projects($stateParams.incidentID + '');
+    }
+
+    if (project === null)
+    {
+        $scope.id = null;
+        $scope.incident.date = new Date();
+        $scope.incident.name = '';
+        $scope.incident.status = $scope.projectStatuses[0];
+        $scope.isPlanned = false;
+        $scope.incident.type = $scope.projectTypes[1];
+        $scope.isNew = true;
+    } else {
+        $scope.id = project.id();
+        $scope.incident.name = project.data('name');
+        $scope.incident.date = project.data('date');
+        $scope.incident.status = project.data('status') === undefined ? $scope.projectStatuses[0] : $scope.projectStatuses[project.data('status').id];
+        $scope.incident.type = project.data('type') === undefined ? $scope.projectTypes[1] : $scope.projectTypes[project.data('type').id];
+        $scope.isPlanned = $scope.incident.status.id === 1;
+        $scope.isNew = false;
+    }
+
+    $scope.changeStatus = function() {
+        $scope.isPlanned = $scope.incident.status.id === 1;
+        console.log('change: ' + $scope.isPlanned);
+    };
+
+    $scope.ok = function () {
+        var coreProject;
+        if ($scope.id === null) {
+            coreProject = Core.projects({_id: Date.now()});
+            coreProject.itemStore.loaded.then(function () {
+                //TODO load all map layers
+            });
+        } else {
+            coreProject = Core.projects(  $scope.id + '');
+        }
+
+        if ($scope.isPlanned) {
+            coreProject.data('date', $scope.incident.date.toISOString());
+        }
+
+        coreProject.data('name',$scope.incident.name)
+            .data('status',$scope.incident.status)
+            .data('type',$scope.incident.type)
+            .sync();
+        $location.path('/incidenten');
+    };
+}]);

src/controllers/incidentenCtrl.js

@@ -28,6 +28,22 @@ icm.controller('IncidentenCtrl' ,['$scope', 'Core', 'Utils', 'Beelden', 'Leaflet
              b.updated = updated;
 
         });
+
+
+        _($scope.data.users).each(function(u){
+            var updated =false;
+            var berichten = _($scope.data.itemlist).filter(function(d){ 
+                return (d.data('naar') == $scope.data.user && d.data('van') == u.name )
+            }); 
+            _(berichten).each(function(msg){
+                if(msg._updated > u.timestamp) {
+                    updated = true;
+                }
+                u.updated = updated;
+            })
+        })
+
+
     }
 
     //Set the current project

src/controllers/leafletCtrl.js

@@ -530,6 +530,7 @@ icm.controller('LeafletController', [ '$scope','$http','$timeout','Core', 'Utils
         /** Bind layer reload on storechanged **/
         var itemstore = core.project().itemStore();
         var peerstore = core.peerStore();
+
         itemstore.off('datachange',populateFeatures);
         itemstore.on('datachange',populateFeatures);
         peerstore.off('datachange',populatePeers);

src/factories.js

@@ -129,6 +129,7 @@ icm.factory('Utils', ['$rootScope', function ($rootScope) {
           var user = {};
           user.online = _.contains(onlinePeers,d);
           user.name = d;
+          user.timestamp = 0;
           onlineUsers.push(user)
         });
         return onlineUsers;

templates/incident.html

@@ -29,10 +29,17 @@ <h5 class="list-group-item-heading text-primary">Status</h5>
                     <h5 class="list-group-item-heading text-primary">Incidentdatum</h5>
                     <p class="input-group">
                     <input type="text" class="form-control" datepicker-popup="dd-MM-yyyy" ng-model="incident.date" is-open="opened" datepicker-options="dateOptions" show-button-bar="false"  show-weeks="false" date-disabled="disabled(date, mode)" close-text="Sluiten" ng-disabled="!isPlanned" />
-                  <span class="input-group-btn">
-                    <button class="btn btn-default" ng-click="open($event)" ng-disabled="!isPlanned"><i class="glyphicon glyphicon-calendar"></i></button>
-                  </span>
+                      <span class="input-group-btn">
+                        <button class="btn btn-default" ng-click="open($event)" ng-disabled="!isPlanned"><i class="glyphicon glyphicon-calendar"></i></button>
+                      </span>
                     </p>
+                    <p>
+                        <timepicker ng-model="incident.date" ng-disabled="!isPlanned" hour-step="1" minute-step="1" show-meridian="false"></timepicker>
+                    </p>
+                    <p>
+                        {{incident.date}}
+                    </p>
+
                     <p>Kies hier de datum van het incident</p>
                 </div>
             </div>

templates/sidebar/beeld.html

@@ -4,13 +4,13 @@
 
 
 </div>
-<div class="panel panel-info">
-    <div class="panel-heading">Berichten <span  ng-click="isCollapsed = !isCollapsed" ng-class="{ 'glyphicon-chevron-up':!isCollapsed,  'glyphicon-chevron-down':isCollapsed}" class="pull-right glyphicon"></span><span class="clearfix"></span></div>
+<div class="panel panel-info" ng-class="{'panel-danger':nieuwBericht,'active':nieuwBericht}">
+    <div class="panel-heading"  ng-click="isCollapsed = !isCollapsed">Berichten <span  ng-class="{ 'glyphicon-chevron-up':!isCollapsed,  'glyphicon-chevron-down':isCollapsed}" class="pull-right glyphicon"></span><span class="clearfix"></span></div>
     <div class="list-group"  collapse="isCollapsed">
-       <div ng-class="{'hidden':gesprek}" class="list-group-item" ng-click="getBerichten(user)" ng-repeat="user in data.users | orderBy:'online':true">
+       <div ng-class="{'hidden':gesprek,'list-group-item-danger': user.updated}" class="list-group-item" ng-click="getBerichten(user)"  ng-repeat="user in data.users | orderBy:'online':true">
             {{user.name}} 
             <span class="pull-right" >
-                <span class="glyphicon" ng-class="{'glyphicon-ok-sign': user.online, 'glyphicon-minus-sign': !user.online,'text-danger':!user.online, 'text-success':user.online}"></span>
+                <span class="glyphicon" ng-class="{'glyphicon-ok-sign': user.online, 'glyphicon-minus-sign': !user.online,'text-danger':!user.online, 'text-success':user.online}"></span><span class="glyphicon" ng-class="{'glyphicon-bell': user.updated}"></span>
             </span>
         </div>