diff --git a/client/app/project/project.controller.js b/client/app/project/project.controller.js index e78d6d0ebd..6206c00a7b 100644 --- a/client/app/project/project.controller.js +++ b/client/app/project/project.controller.js @@ -7,37 +7,92 @@ */ angular .module('taskingManager') - .controller('projectController', ['$location', 'mapService', 'projectService', 'styleService', projectController]); + .controller('projectController', ['$scope', '$location', 'mapService', 'projectService', 'styleService', 'taskService', projectController]); - function projectController($location, mapService, projectService, styleService) { + function projectController($scope, $location, mapService, projectService, styleService, taskService) { var vm = this; - vm.project = null; + vm.projectData = null; + vm.taskVectorLayer = null; vm.map = null; + + // tab and view control vm.currentTab = ''; + vm.mappingStep = ''; + + //selected task + vm.selectedTask = null; + vm.isSelectTaskMappable = false; + + //interaction + var select = new ol.interaction.Select({ + style: styleService.getSelectedStyleFunction + }); activate(); function activate() { - //TODO: Set up sidebar tabs vm.currentTab = 'description'; + vm.mappingStep = 'select'; mapService.createOSMMap('map'); vm.map = mapService.getOSMMap(); + + vm.map.addInteraction(select); + select.on('select', function (event) { + $scope.$apply(function () { + var feature = event.selected[0]; + onTaskSelection(feature); + }); + }); + var id = $location.search().project; initialiseProject(id); - //TODO: put the project metadata (description instructions on disebar tabs + //TODO: put the project metadata (description and instructions on siedbar tabs) } /** - * Get a project with using it's id + * Sets up a randomly selected task as the currently selected task + */ + vm.selectRandomTask = function () { + var feature = taskService.getRandomMappableTaskFeature(vm.taskVectorLayer.getSource().getFeatures()); + if (feature) { + select.getFeatures().clear(); + select.getFeatures().push(feature); + onTaskSelection(feature); + // padding to makes sure there is plenty of clear space around feature on map to keep visual + // context of feature location + var vPadding = vm.map.getSize()[1] * 0.3; + vm.map.getView().fit(feature.getGeometry().getExtent(), {padding: [vPadding, vPadding, vPadding, vPadding]}); + } + else { + vm.selectedTask = null; + vm.isSelectTaskMappable = false; + vm.mappingStep = 'none-available'; + } + }; + + /** + * clears the currently selected task. Clears down/resets the vm properties and clears the feature param in the select interaction object. + */ + vm.clearCurrentSelection = function () { + vm.selectedTask = null; + vm.isSelectTaskMappable = false; + vm.currentTab = 'mapping'; + vm.mappingStep = 'select'; + select.getFeatures().clear(); + }; + + /** + * Initilaise a project using it's id + * @param id - id of the project to initialise */ - function initialiseProject(id){ + function initialiseProject(id) { var resultsPromise = projectService.getProject(id); resultsPromise.then(function (data) { //project returned successfully - vm.project = data; - addAoiToMap(vm.project.areaOfInterest); - addProjectTasksToMap(vm.project.tasks); - }, function(){ + vm.projectData = data; + addAoiToMap(vm.projectData.areaOfInterest); + addProjectTasksToMap(vm.projectData.tasks); + }, function () { // project not returned successfully // TODO - may want to handle error }); @@ -47,14 +102,15 @@ * Adds project tasks to map as features from geojson * @param tasks */ - function addProjectTasksToMap(tasks){ + function addProjectTasksToMap(tasks) { //TODO: may want to refactor this into a service at some point so that it can be reused var source = new ol.source.Vector(); - var vector = new ol.layer.Vector({ + vm.taskVectorLayer = new ol.layer.Vector({ source: source, + name: 'tasks', style: styleService.getTaskStyleFunction }); - vm.map.addLayer(vector); + vm.map.addLayer(vm.taskVectorLayer); // read tasks JSON into features var format = new ol.format.GeoJSON(); @@ -70,11 +126,12 @@ * Adds the aoi feature to the map * @param aoi */ - function addAoiToMap(aoi){ + function addAoiToMap(aoi) { //TODO: may want to refactor this into a service at some point so that it can be resused var source = new ol.source.Vector(); var vector = new ol.layer.Vector({ - source: source + source: source, + name: 'aoi' }); vm.map.addLayer(vector); @@ -86,5 +143,30 @@ }); source.addFeature(aoiFeatures); } + + /** + * Gets a task from the server and sets up the task returned as the currently selected task + * @param feature + */ + function onTaskSelection(feature) { + //get id from feature + var taskId = feature.get('taskId'); + var projectId = vm.projectData.projectId; + // get full task from task service call + var taskPromise = taskService.getTask(projectId, taskId); + taskPromise.then(function (data) { + //task returned successfully + vm.selectedTask = data; + vm.isSelectTaskMappable = !data.taskLocked && (data.taskStatus === 'READY' || data.taskStatus === 'INVALIDATED'); + vm.currentTab = 'mapping'; + vm.mappingStep = 'view'; + }, function () { + // task not returned successfully + vm.selectedTask = null; + vm.isSelectTaskMappable = false; + vm.currentTab = 'mapping'; + vm.mappingStep = 'task-get-error'; + }); + } } })(); diff --git a/client/app/project/project.html b/client/app/project/project.html index eef417f411..d1ee6f7f05 100644 --- a/client/app/project/project.html +++ b/client/app/project/project.html @@ -9,23 +9,176 @@

-
- - - -
-
-

Description

-

some text

- -
-
-

Instructions

- -
-
-

*Mapping*

- +
+
+ + + +
+
+

Description

+

Lorem ipsum dolor sit amet, ius idque facete concludaturque eu, esse populo tacimates te cum. + Agam mollis sit no, vis lorem laoreet adversarium ut. Tollit dolorem mandamus te mel. Cum + mazim + mucius neglegentur ut, vel nominati pericula constituam in. Eu cum elit rationibus, tibique + suavitate inciderint pri at. Vim eu laoreet perpetua maluisset.

+ +

Tollit ocurreret his no, utamur expetendis has id, nisl mnesarchum appellantur pri id. Laudem + recusabo ex usu. Te eripuit similique rationibus mel. Et est nisl duis, ridens facilis mei + cu. + Aliquam recteque sit id, quem errem nostro in qui, id sea ridens melius forensibus.

+ +

Blandit sensibus id nec, quo ex recusabo reprehendunt, no errem veritus quo. Erat sonet + quando + sea ex, unum aliquid sit ex. Qui an etiam utinam deleniti, usu ea clita molestie intellegam, + et + duo posse inani vocent. Brute percipit mel ad. Ea eum tollit vivendo. Veniam apeirian ei + mei, + pro et fierent neglegentur.

+ +
+
+

Instructions

+

Lorem ipsum dolor sit amet, oporteat liberavisse at nam, hinc nemore pericula eos in. Ei hinc + minim has. Vix brute falli ei, his ut exerci temporibus disputationi, an vel sumo corrumpit. + Eu + sea exerci euismod invenire, meis mundi graeco vix cu. In vis delenit oportere dignissim, + viderer aperiri ei mei, fastidii moderatius duo ex.

+ +

An sea iracundia dissentiet, id inermis cotidieque nec, porro propriae dissentias ex per. At + labores nominati moderatius pro, eam dolor placerat liberavisse ne, civibus apeirian + convenire + vis te. Id posse labore democritum vim, eos natum iudico in, ne everti omnesque rationibus + cum. + Cu sale brute graeci sea, ad sea verear diceret.

+ +

Malis fierent eleifend usu te. Augue eruditi dissentias eum ne. Eos odio solet an. Nobis + persequeris vim ad, sit exerci aliquid similique id, dico suavitate contentiones cum cu. Has + no + mucius civibus accusata, nam diam eirmod euripidis et, qui euismod laoreet delicata in.

+ +
+
+
+

Choose a task

+

There are 2 options for choosing a task:

+

Option 1: Select a task by clicking on the map

+

Option 2: Select a random task + +

+
+
+

Task #{{ projectCtrl.selectedTask.taskId }} is + LOCKED {{ projectCtrl.selectedTask.taskStatus }} +

+ + + +
+ + + +
+
+
+

+ Advanced + + +

+

Advanced task information and editing options

+
+
+
+
Details
+
+
ID
+
#{{ projectCtrl.selectedTask.taskId }}
+
Status
+
{{ projectCtrl.selectedTask.taskStatus }}
+
Locked
+
{{ projectCtrl.selectedTask.taskLocked }}
+
Difficulty
+
TODO
+
Addisgned
+
TODO
+
+
+
+
History +
+
+
Action: {{ item.action }}
+
Date: {{ item.actionDate }}
+
Text: {{ item.actionText }}
+
+
+
+
Options
+ + + + + +
+
+
+
+ +
+
+ +
+
+
diff --git a/client/app/services/style.service.js b/client/app/services/style.service.js index a7813a0fda..1c339fb10a 100644 --- a/client/app/services/style.service.js +++ b/client/app/services/style.service.js @@ -13,28 +13,49 @@ function styleService() { + // a default style is good practice! + var DEAFAULT_STYLE = new ol.style.Style({ + fill: new ol.style.Fill({ + color: [250, 250, 250, 1] + }), + stroke: new ol.style.Stroke({ + color: [220, 220, 220, 1], + width: 1 + }) + }); + + var FILL_COLOUR_READY = 'rgba(223,223,223,0.1)';//very light grey, 0.1 opacity + var FILL_COLOUR_INVALIDATED = 'rgba(255,0,0,0.4)';//red, 0.4 opacity + var FILL_COLOUR_DONE = 'rgba(255,165,0,0.4)';//orange, 0.4 opacity + var FILL_COLOUR_VALIDATED = 'rgba(0,128,0,0.4)';//green, 0.4 opacity + var FILL_COLOUR_LOCKED = 'rgba(30,144,255,0.4)';//blue, 0.4 opacity + var FILL_COLOUR_BADIMAGERY = 'rgba(0,0,0,0.4)';//black, 0.4 opacity + + var STROKE_COLOUR = 'rgba(84,84,84,0.7)';//grey, 0.7 opacity + var STROKE_WIDTH = 1; + + var STROKE_COLOUR_SELECTED = 'rgba(255,255,0,1)'//red, 1.0 opacity + var STROKE_WIDTH_SELECTED = 2; + + // TODO - It could be important for performance to cache styles. + // This could work with a javascript object literal to cache previously created styles. + // The get style functions could check the cache for the style and if found return it, otherwise + // create a new one and add to cache + // var styleCache = {}; + var service = { getTaskStyleFunction: getTaskStyleFunction, + getSelectedStyleFunction: getSelectedStyleFunction }; return service; /** - * Creates a StyleFunction for tasks based on the feature's taskStatus and taskLocked properties. - * @param feature + * OpenLayers style function. Creates a Style for tasks based on the feature's taskStatus and taskLocked properties. + * @param feature - feature to be stuled * @returns {Array} */ - function getTaskStyleFunction(feature){ - - var FILL_COLOUR_READY = 'rgba(223,223,223,0.1)';//very light grey, 0.1 opacity - var FILL_COLOUR_INVALIDATED = 'rgba(255,0,0,0.4)';//red, 0.4 opacity - var FILL_COLOUR_DONE = 'rgba(255,165,0,0.4)';//orange, 0.4 opacity - var FILL_COLOUR_VALIDATED = 'rgba(0,128,0,0.4)';//green, 0.4 opacity - var FILL_COLOUR_LOCKED = 'rgba(30,144,255,0.4)';//blue, 0.4 opacity - var FILL_COLOUR_BADIMAGERY = 'rgba(0,0,0,0.4)';//black, 0.4 opacity - - var STROKE_COLOUR = 'rgba(84,84,84,0.7)';//grey, 0.7 opacity - var STROKE_WIDTH = 1; + function getTaskStyleFunction(feature) { // Get the feature's properties that control styling var status = feature.get('taskStatus'); @@ -43,37 +64,50 @@ // calculate the fill colour and opacity settings based on status, use rgba because this is the way to // set opacity in OL3, but also better for cross browser than named colors var fillColor = null; - if( typeof(isLocked) === 'boolean' && isLocked ){ - fillColor = FILL_COLOUR_LOCKED; + if (typeof(isLocked) === 'boolean' && isLocked) { + fillColor = FILL_COLOUR_LOCKED; } else if (status === 'READY') { - fillColor = FILL_COLOUR_READY; + fillColor = FILL_COLOUR_READY; } else if (status === 'INVALIDATED') { fillColor = FILL_COLOUR_INVALIDATED } - else if (status === 'DONE') { + else if (status === 'DONE') { fillColor = FILL_COLOUR_DONE } - else if (status === 'VALIDATED') { + else if (status === 'VALIDATED') { fillColor = FILL_COLOUR_VALIDATED } - else if (status === 'BADIMAGERY') { + else if (status === 'BADIMAGERY') { fillColor = FILL_COLOUR_BADIMAGERY } + else { + return DEAFAULT_STYLE; + } - // build an ol.style.Style to be returned using calculated settings - var style = new ol.style.Style({ + return new ol.style.Style({ fill: new ol.style.Fill({ color: fillColor }), stroke: new ol.style.Stroke({ - color: STROKE_COLOUR, - width: STROKE_WIDTH + color: STROKE_COLOUR, + width: STROKE_WIDTH }) - }) + }); + } - return style; + /** + * OpenLayers style function. Creates a style for currently selected tasks. + * @param feature - feature to be stuled + * @returns {Array} + */ + function getSelectedStyleFunction(feature) { + // get the base style for the feature and override it's stroke only. + var baseStyle = getTaskStyleFunction(feature); + baseStyle.getStroke().setColor(STROKE_COLOUR_SELECTED); + baseStyle.getStroke().setWidth(STROKE_WIDTH_SELECTED); + return baseStyle; } } })(); diff --git a/client/app/services/task.service.js b/client/app/services/task.service.js new file mode 100644 index 0000000000..ba66d43208 --- /dev/null +++ b/client/app/services/task.service.js @@ -0,0 +1,106 @@ +(function () { + 'use strict'; + /** + * @fileoverview This file provides a service for task operations. + */ + + angular + .module('taskingManager') + .service('taskService', ['$http', '$q', 'configService', taskService]); + + function taskService($http, $q, configService) { + + var service = { + getTask: getTask, + getRandomMappableTaskFeature: getRandomMappableTaskFeature, + getTasksByStatus: getTasksByStatus + }; + + return service; + + /** + * Gets a task + * @param projectId - id of project to to get task from + * @param taskId - id of task to get + * @returns {!jQuery.jqXHR|!jQuery.deferred|!jQuery.Promise|*} + */ + function getTask(projectId, taskId) { + // Returns a promise + return $http({ + method: 'GET', + url: configService.tmAPI + '/v1/project/' + projectId + '/task/' + taskId, + headers: { + 'Content-Type': 'application/json; charset=UTF-8' + } + }).then(function successCallback(response) { + // this callback will be called asynchronously + // when the response is available + return (response.data); + }, function errorCallback() { + // called asynchronously if an error occurs + // or server returns response with an error status. + return $q.reject("error"); + }); + } + + /** + * returns a randomly selected mappable task feature from the passed in vector features. + * Will return a non locked READY task if available, + * otherwise will return a non locked INVALIDATED task if available, + * otherwise will return null. + * @param feature - array of ol.Feature objects from which to find a random task + * @returns ol.Feature - randomly selected mappable ol.Feature object + */ + function getRandomMappableTaskFeature(features) { + //first check that we have a non empty array to work with + if (features && (features instanceof Array) && features.length > 0) { + + var candidates = []; + + // get all non locked ready tasks + var candidates = getTasksByStatus(features, false, 'READY'); + + // if no ready tasks, get non locked invalidated tasks + if (candidates.length == 0) { + candidates = getTasksByStatus(features, false, 'INVALIDATED'); + } + + // if candidates features were found, pick one randomly and return it + if (candidates.length > 0) { + return candidates[Math.floor((Math.random() * (candidates.length - 1)))]; + } + } + + // if all else fails, return null + return null; + } + + /** + * Returns an array of task features that meet passed in locked and status criteria + * @param features - array of ol.Feature objects + * @param taskLocked - boolean, required locked status + * @param taskStatus - required task status + */ + function getTasksByStatus(features, locked, status) { + //TODO - may need to refactor to allow passing in null for locked or status to infer any value. + //This would allow get all locked tasks, regardless of status, or all tasks with certain status, + //regardless of locked + candidates = []; + //first check we are working with a non empty array + if (features && (features instanceof Array) && features.length > 0) { + // get all tasks with taskLocked and taskStatus property values meeting the passed in values for locked and status + var candidates = features.filter(function (item) { + //check we are working with an ol.Feature + if (item instanceof ol.Feature) { + // safe to use the function + var taskLocked = item.get('taskLocked'); + var taskStatus = item.get('taskStatus'); + if (taskLocked == locked && taskStatus === status) + return item; + } + }); + } + return candidates; + } + } +})(); diff --git a/client/assets/styles/sass/_helpers.scss b/client/assets/styles/sass/_helpers.scss index afd4036765..2f13791c6b 100644 --- a/client/assets/styles/sass/_helpers.scss +++ b/client/assets/styles/sass/_helpers.scss @@ -13,4 +13,22 @@ /** Override the OSM design system form__group **/ .form__group { margin-top: $global-spacing; +} + +.panel-grey-rounder-corners { + border-radius: 0.5em; + background: #ebebeb; + padding: 1em; + margin-top: 0.5em; +} + +.panel-white-round-corners { + background: #ffffff; + border-radius: 0.2em; + padding: 0.2em; + font-size: smaller; +} + +.historyItem { + margin-bottom: 0.5em; } \ No newline at end of file diff --git a/client/index.html b/client/index.html index ad44ccbf8e..436395220e 100644 --- a/client/index.html +++ b/client/index.html @@ -143,6 +143,7 @@

+ diff --git a/tests/client/unit/app/project/test.project.controller.js b/tests/client/unit/app/project/test.project.controller.js index 638caadf9a..067c2aaf5c 100644 --- a/tests/client/unit/app/project/test.project.controller.js +++ b/tests/client/unit/app/project/test.project.controller.js @@ -1,13 +1,14 @@ 'use strict'; describe('project.controller', function () { - var projectController = null; + var projectController = null, scope = null; beforeEach(function () { module('taskingManager'); - inject(function ($controller) { - projectController = $controller('projectController'); + inject(function ($controller, $rootScope) { + scope = $rootScope.$new(); + projectController = $controller('projectController', {$scope: scope}); }); }); diff --git a/tests/client/unit/app/services/test.style.service.js b/tests/client/unit/app/services/test.style.service.js index b851255ba8..a973bb9759 100644 --- a/tests/client/unit/app/services/test.style.service.js +++ b/tests/client/unit/app/services/test.style.service.js @@ -3,6 +3,16 @@ describe('style.service', function () { var styleService = null; + var DEFAULT_STYLE = new ol.style.Style({ + fill: new ol.style.Fill({ + color: [250,250,250,1] + }), + stroke: new ol.style.Stroke({ + color: [220,220,220,1], + width: 1 + }) + }); + var FILL_COLOUR_READY = 'rgba(223,223,223,0.1)';//very light grey, 0.1 opacity var FILL_COLOUR_INVALIDATED = 'rgba(255,0,0,0.4)';//red, 0.4 opacity var FILL_COLOUR_DONE = 'rgba(255,165,0,0.4)';//orange, 0.4 opacity @@ -165,142 +175,82 @@ describe('style.service', function () { expect(style).toEqual(expectedStyle); }); - it('should return a style with null fill and grey outline when taskLocked is not boolean ', function () { + it('should return default style when taskLocked is not boolean ', function () { // arrange var taskFeature = new ol.Feature({ taskLocked: 'dfkjwlfjekj' }); - var expectedStyle = new ol.style.Style({ - fill: new ol.style.Fill({ - color: null - }), - stroke: new ol.style.Stroke({ - color: STROKE_COLOUR, - width: STROKE_WIDTH - }) - }); - // act var style = styleService.getTaskStyleFunction(taskFeature) // assert - expect(style).toEqual(expectedStyle); + expect(style).toEqual(DEFAULT_STYLE); }); - it('should return a style with null fill and grey outline when taskLocked is null ', function () { + it('should return default style when taskLocked is null ', function () { // arrange var taskFeature = new ol.Feature({ taskLocked: null }); - var expectedStyle = new ol.style.Style({ - fill: new ol.style.Fill({ - color: null - }), - stroke: new ol.style.Stroke({ - color: STROKE_COLOUR, - width: STROKE_WIDTH - }) - }); - // act var style = styleService.getTaskStyleFunction(taskFeature) // assert - expect(style).toEqual(expectedStyle); + expect(style).toEqual(DEFAULT_STYLE); }); - it('should return a style with null fill and grey outline when taskLocked is undefined ', function () { + it('should return default style when taskLocked is undefined ', function () { // arrange var taskFeature = new ol.Feature({ }); - var expectedStyle = new ol.style.Style({ - fill: new ol.style.Fill({ - color: null - }), - stroke: new ol.style.Stroke({ - color: STROKE_COLOUR, - width: STROKE_WIDTH - }) - }); - // act var style = styleService.getTaskStyleFunction(taskFeature) // assert - expect(style).toEqual(expectedStyle); + expect(style).toEqual(DEFAULT_STYLE); }); - it('should return a style with null fill and grey outline when taskLocked and taskStatus are undefined', function () { + it('should return default style taskLocked and taskStatus are undefined', function () { // arrange var taskFeature = new ol.Feature({ }); - var expectedStyle = new ol.style.Style({ - fill: new ol.style.Fill({ - color: null - }), - stroke: new ol.style.Stroke({ - color: STROKE_COLOUR, - width: STROKE_WIDTH - }) - }); - // act var style = styleService.getTaskStyleFunction(taskFeature) // assert - expect(style).toEqual(expectedStyle); + expect(style).toEqual(DEFAULT_STYLE); }); - it('should return a style with null fill and grey outline when taskStatus is null', function () { + it('should return default style taskStatus is null', function () { // arrange var taskFeature = new ol.Feature({ taskStatus: null }); - var expectedStyle = new ol.style.Style({ - fill: new ol.style.Fill({ - color: null - }), - stroke: new ol.style.Stroke({ - color: STROKE_COLOUR, - width: STROKE_WIDTH - }) - }); - // act var style = styleService.getTaskStyleFunction(taskFeature) // assert - expect(style).toEqual(expectedStyle); + expect(style).toEqual(DEFAULT_STYLE); }); - it('should return a style with null fill and grey outline when taskStatus is unknown', function () { + it('should return default style when taskStatus is unknown', function () { // arrange var taskFeature = new ol.Feature({ taskStatus: 'ejrgfkerj' }); - var expectedStyle = new ol.style.Style({ - fill: new ol.style.Fill({ - color: null - }), - stroke: new ol.style.Stroke({ - color: STROKE_COLOUR, - width: STROKE_WIDTH - }) - }); - // act var style = styleService.getTaskStyleFunction(taskFeature) // assert - expect(style).toEqual(expectedStyle); + expect(style).toEqual(DEFAULT_STYLE); }); }); diff --git a/tests/client/unit/app/services/test.task.service.js b/tests/client/unit/app/services/test.task.service.js new file mode 100644 index 0000000000..300554c0f5 --- /dev/null +++ b/tests/client/unit/app/services/test.task.service.js @@ -0,0 +1,254 @@ +'use strict'; + +describe('task.service', function () { + var taskService = null; + + beforeEach(function () { + module('taskingManager'); + + inject(function (_taskService_) { + taskService = _taskService_; + }); + }); + + it('should be created successfully', function () { + expect(taskService).toBeDefined(); + }); + + it('should return null when empty array is passed in', function () { + + //arrange + var features = []; + + //act + var feature = taskService.getRandomMappableTaskFeature(features); + + //assert + expect(feature).toEqual(null); + + }); + + it('should return null when null is passed in', function () { + + //arrange + var features = null; + + //act + var feature = taskService.getRandomMappableTaskFeature(features); + + //assert + expect(feature).toEqual(null); + + }); + + it('should return null when passed in array members do not have a get function', function () { + + //arrange + var features = [{make: 'ford', model: 'T'}]; + + //act + var feature = taskService.getRandomMappableTaskFeature(features); + + //assert + expect(feature).toEqual(null); + }); + + it('should return null when passed object is not an array', function () { + + //arrange + var features = 'dgsdg'; + + //act + var feature = taskService.getRandomMappableTaskFeature(features); + + //assert + expect(feature).toEqual(null); + }); + + it('should return one unlocked READY feature', function () { + + //arrange + var locked = false; + var status = 'READY'; + + var features = [ + new ol.Feature({ + taskLocked: locked, + taskStatus: status + }), + new ol.Feature({ + taskLocked: locked, + taskStatus: status + }), + new ol.Feature({ + taskLocked: true, + taskStatus: 'INVALIDATED' + }), + new ol.Feature({ + taskLocked: false, + taskStatus: 'READY' + }), + new ol.Feature({ + taskLocked: true, + taskStatus: 'READY' + }), + new ol.Feature({ + taskLocked: false, + taskStatus: 'OTHER' + }), + new ol.Feature({ + taskLocked: true, + taskStatus: 'OTHER' + }) + ]; + + //act + var returnedFeature = taskService.getRandomMappableTaskFeature(features); + + //assert + expect(returnedFeature.get('taskLocked') == locked && + returnedFeature.get('taskStatus') === status).toEqual(true); + }); + + it('should return one unlocked INVALIDATED feature', function () { + + //arrange + var locked = false; + var status = 'INVALIDATED'; + + var features = [ + new ol.Feature({ + taskLocked: false, + taskStatus: 'INVALIDATED' + }), + new ol.Feature({ + taskLocked: false, + taskStatus: 'INVALIDATED' + }), + new ol.Feature({ + taskLocked: true, + taskStatus: 'INVALIDATED' + }), + new ol.Feature({ + taskLocked: true, + taskStatus: 'READY' + }), + new ol.Feature({ + taskLocked: true, + taskStatus: 'READY' + }), + new ol.Feature({ + taskLocked: false, + taskStatus: 'OTHER' + }), + new ol.Feature({ + taskLocked: true, + taskStatus: 'OTHER' + }) + ]; + + //act + var returnedFeature = taskService.getRandomMappableTaskFeature(features); + + //assert + expect(returnedFeature.get('taskLocked') == locked && + returnedFeature.get('taskStatus') === status).toEqual(true); + }); + + it('should return null when no mappable tasks available', function () { + + //arrange + + var features = [ + new ol.Feature({ + taskLocked: true, + taskStatus: 'READY' + }), + new ol.Feature({ + taskLocked: false, + taskStatus: 'DONE' + }), + new ol.Feature({ + taskLocked: false, + taskStatus: 'VALIDATED' + }), + new ol.Feature({ + taskLocked: true, + taskStatus: 'INVALIDATED' + }) + ]; + + //act + var feature = taskService.getRandomMappableTaskFeature(features); + + //assert + expect(feature).toEqual(null); + }); + + it('should return an array of locked ready features', function () { + + //arrange + var locked = false; + var status = 'READY'; + + var features = [ + new ol.Feature({ + taskLocked: locked, + taskStatus: status + }), + new ol.Feature({ + taskLocked: locked, + taskStatus: status + }), + new ol.Feature({ + taskLocked: true, + taskStatus: 'INVALIDATED' + }), + new ol.Feature({ + taskLocked: false, + taskStatus: 'READY' + }), + new ol.Feature({ + taskLocked: true, + taskStatus: 'READY' + }), + new ol.Feature({ + taskLocked: false, + taskStatus: 'OTHER' + }), + new ol.Feature({ + taskLocked: true, + taskStatus: 'OTHER' + }) + ]; + + //act + var returnedFeatures = taskService.getTasksByStatus(features, locked, status); + + //assert returnedFeatures meet the criteria + var candidates = returnedFeatures.filter(function (item) { + if (item.get('taskLocked') == locked && item.get('taskStatus') === status) return item; + + }); + expect(returnedFeatures.length).toEqual(candidates.length); + }); + + + it('should return an empty array array of unexpected objects is passed in', function () { + + //arrange + var locked = false; + var status = 'READY'; + + var features = ['sdfsdf']; + + //act + var returnedFeatures = taskService.getTasksByStatus(features, locked, status); + + //assert + expect(returnedFeatures).toEqual([]); + }); + + +}); +