From d0d44147f7678c8427119397ec96e9a1cdc8d49f Mon Sep 17 00:00:00 2001 From: Ethan Nelson Date: Sat, 11 Aug 2018 19:51:27 -0500 Subject: [PATCH 01/11] Add menu item styling --- client/assets/styles/sass/_structure.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/assets/styles/sass/_structure.scss b/client/assets/styles/sass/_structure.scss index 5976abb333..fa474b8e2d 100644 --- a/client/assets/styles/sass/_structure.scss +++ b/client/assets/styles/sass/_structure.scss @@ -199,6 +199,10 @@ } } +.drop__menu-item { + display: block; +} + /* ========================================================================== Body ========================================================================== */ From 36f706b75ecfc4d67fe7c5978db9943f7f65d63a Mon Sep 17 00:00:00 2001 From: Neil Rotstan Date: Thu, 30 Aug 2018 11:14:54 -0700 Subject: [PATCH 02/11] Show missing xmark (close, delete) controls. Add style for xmark controls, such as the control to dismiss the new-message notification and the control to remove users from a private project, to ensure they are displayed (as hot-design-system styles are no longer pulled in). --- client/assets/styles/sass/_helpers.scss | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/client/assets/styles/sass/_helpers.scss b/client/assets/styles/sass/_helpers.scss index 5cf8c98b79..9a4345352e 100644 --- a/client/assets/styles/sass/_helpers.scss +++ b/client/assets/styles/sass/_helpers.scss @@ -169,3 +169,13 @@ hr { .button[disabled]{ cursor: not-allowed; } + +.hot-ds-icon-sm-xmark:before { + width: 12px; + height: 12px; + background-size: 12px 12px; + content: " "; + background-image: url('../../icons/xmark.svg'); + display: inline-block; + margin-right: .3em; +} From b2bacacb195406647fe1040cc7a2f8afaf9e4f95 Mon Sep 17 00:00:00 2001 From: Neil Rotstan Date: Thu, 30 Aug 2018 11:58:52 -0700 Subject: [PATCH 03/11] Configurable comment and chat limits. Closes #970 * Make comment and chat length limits configurable through `maxCommentLength` and `maxChatLength` settings, respectively, in the taskingmanager.config.json file. * Set default limit to 5000 characters for both comments and chats. * Include migration to remove the 250 character limit from the project_chat.message column. --- .../project-chat/project-chat.directive.js | 6 ++-- client/app/project/project.controller.js | 2 +- client/taskingmanager.config.json | 8 ++++-- migrations/versions/251a7638da78_.py | 28 +++++++++++++++++++ server/models/postgis/project_chat.py | 2 +- 5 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 migrations/versions/251a7638da78_.py diff --git a/client/app/components/project-chat/project-chat.directive.js b/client/app/components/project-chat/project-chat.directive.js index 6fd080a8b2..dc80f065b4 100644 --- a/client/app/components/project-chat/project-chat.directive.js +++ b/client/app/components/project-chat/project-chat.directive.js @@ -8,7 +8,7 @@ angular .module('taskingManager') - .controller('projectChatController', ['$scope', '$anchorScroll', '$location', '$timeout', '$interval', 'messageService', 'userService', projectChatController]) + .controller('projectChatController', ['$scope', '$anchorScroll', '$location', '$timeout', '$interval', 'messageService', 'userService', 'configService', projectChatController]) .directive('projectChat', projectChatDirective); /** @@ -34,14 +34,14 @@ return directive; } - function projectChatController($scope, $anchorScroll, $location, $timeout, $interval, messageService, userService) { + function projectChatController($scope, $anchorScroll, $location, $timeout, $interval, messageService, userService, configService) { var vm = this; vm.projectId = 0; vm.author = ''; vm.message = ''; vm.messages = []; - vm.maxlengthComment = 250; + vm.maxlengthComment = configService.maxChatLength; vm.hasScrolled = false; diff --git a/client/app/project/project.controller.js b/client/app/project/project.controller.js index 17697bc328..7208b6ca6e 100644 --- a/client/app/project/project.controller.js +++ b/client/app/project/project.controller.js @@ -19,7 +19,7 @@ vm.lockedByCurrentUserVectorLayer = null; vm.map = null; vm.user = null; - vm.maxlengthComment = 500; + vm.maxlengthComment = configService.maxCommentLength; vm.taskUrl = ''; // tab and view control diff --git a/client/taskingmanager.config.json b/client/taskingmanager.config.json index 11f0c893ed..b913435cc7 100644 --- a/client/taskingmanager.config.json +++ b/client/taskingmanager.config.json @@ -25,7 +25,9 @@ "key": "AioPAglzP9Qw32KN17dOkKYRdSlzj7W5kIQY6zct_UCmGc0WRxAh-QeiRBpRUgrv", "imagerySet": "Aerial" } - ] + ], + "maxCommentLength": 5000, + "maxChatLength": 5000 } }, "release": { @@ -55,7 +57,9 @@ "attribution": "Courtesy of Microsoft Bing", "imagerySet": "Aerial" } - ] + ], + "maxCommentLength": 5000, + "maxChatLength": 5000 } } } diff --git a/migrations/versions/251a7638da78_.py b/migrations/versions/251a7638da78_.py new file mode 100644 index 0000000000..005f99eaa1 --- /dev/null +++ b/migrations/versions/251a7638da78_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: 251a7638da78 +Revises: deec8123583d +Create Date: 2018-08-30 07:46:49.074078 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '251a7638da78' +down_revision = 'deec8123583d' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.alter_column('project_chat', 'message', existing_type=sa.String(length=250), type_=sa.String()) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.alter_column('project_chat', 'message', existing_type=sa.String(), type_=sa.String(length=250)) + # ### end Alembic commands ### diff --git a/server/models/postgis/project_chat.py b/server/models/postgis/project_chat.py index 55be770ef5..f18d67f540 100644 --- a/server/models/postgis/project_chat.py +++ b/server/models/postgis/project_chat.py @@ -13,7 +13,7 @@ class ProjectChat(db.Model): project_id = db.Column(db.Integer, db.ForeignKey('projects.id'), index=True, nullable=False) user_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False) time_stamp = db.Column(db.DateTime, nullable=False, default=timestamp) - message = db.Column(db.String(250), nullable=False) + message = db.Column(db.String, nullable=False) # Relationships posted_by = db.relationship(User, foreign_keys=[user_id]) From 1c9f8c8846a6f84b0ce38009d2fdffe2515de30f Mon Sep 17 00:00:00 2001 From: Neil Rotstan Date: Thu, 30 Aug 2018 13:40:07 -0700 Subject: [PATCH 04/11] Notify mapper if their task was invalidated Send a notification message to mapper if a task they mapped was marked invalid. --- server/services/messaging/message_service.py | 12 ++++++++---- .../templates/invalidation_message_en.txt | 8 ++++++++ server/services/validator_service.py | 19 +++++++++++-------- 3 files changed, 27 insertions(+), 12 deletions(-) create mode 100644 server/services/messaging/templates/invalidation_message_en.txt diff --git a/server/services/messaging/message_service.py b/server/services/messaging/message_service.py index 0223dd92f2..acdc3fca2a 100644 --- a/server/services/messaging/message_service.py +++ b/server/services/messaging/message_service.py @@ -8,6 +8,7 @@ from server import create_app from server.models.dtos.message_dto import MessageDTO from server.models.postgis.message import Message, NotFound +from server.models.postgis.task import TaskStatus from server.services.messaging.smtp_service import SMTPService from server.services.messaging.template_service import get_template, get_profile_url from server.services.project_service import ProjectService @@ -43,16 +44,19 @@ def send_welcome_message(user: User): return welcome_message.id @staticmethod - def send_message_after_validation(validated_by: int, mapped_by: int, task_id: int, project_id: int): - """ Sends mapper a thank you, after their task has been marked as valid """ + def send_message_after_validation(status: int, validated_by: int, mapped_by: int, task_id: int, project_id: int): + """ Sends mapper a notification after their task has been marked valid or invalid """ if validated_by == mapped_by: - return # No need to send a thankyou to yourself + return # No need to send a message to yourself user = UserService.get_user_by_id(mapped_by) if user.validation_message == False: return # No need to send validation message text_template = get_template('validation_message_en.txt') + text_template = get_template('invalidation_message_en.txt' if status == TaskStatus.INVALIDATED \ + else 'validation_message_en.txt') + status_text = 'marked invalid' if status == TaskStatus.INVALIDATED else 'validated' task_link = MessageService.get_task_link(project_id, task_id) text_template = text_template.replace('[USERNAME]', user.username) @@ -61,7 +65,7 @@ def send_message_after_validation(validated_by: int, mapped_by: int, task_id: in validation_message = Message() validation_message.from_user_id = validated_by validation_message.to_user_id = mapped_by - validation_message.subject = f'Your mapping in Project {project_id} on {task_link} has just been validated' + validation_message.subject = f'Your mapping in Project {project_id} on {task_link} has just been {status_text}' validation_message.message = text_template validation_message.add_message() diff --git a/server/services/messaging/templates/invalidation_message_en.txt b/server/services/messaging/templates/invalidation_message_en.txt new file mode 100644 index 0000000000..6e2d2599a4 --- /dev/null +++ b/server/services/messaging/templates/invalidation_message_en.txt @@ -0,0 +1,8 @@ +Hi [USERNAME],
+
+Unfortunately, the task you marked as "Completely Mapped" was just marked as invalid. [TASK_LINK].
+
+This is an automated message, the person who validated it hopefully shared some feedback with you.
+
+Thank you very much for mapping! +
diff --git a/server/services/validator_service.py b/server/services/validator_service.py index 4e7ec06026..665894d02a 100644 --- a/server/services/validator_service.py +++ b/server/services/validator_service.py @@ -97,14 +97,17 @@ def unlock_tasks_after_validation(validated_dto: UnlockAfterValidationDTO) -> Ta # Parses comment to see if any users have been @'d MessageService.send_message_after_comment(validated_dto.user_id, task_to_unlock['comment'], task.id, validated_dto.project_id) - - if task_to_unlock['new_state'] == TaskStatus.VALIDATED and task.mapped_by not in message_sent_to: - # All mappers get a thankyou if their task has been validated :) Only once if multiple tasks mapped - MessageService.send_message_after_validation(validated_dto.user_id, task.mapped_by, task.id, - validated_dto.project_id) - # Set last_validation_date for the mapper to current date - task.mapper.last_validation_date = timestamp() - message_sent_to.append(task.mapped_by) + if task_to_unlock['new_state'] == TaskStatus.VALIDATED or task_to_unlock['new_state'] == TaskStatus.INVALIDATED: + # All mappers get a notification if their task has been validated or invalidated. + # Only once if multiple tasks mapped + if task.mapped_by not in message_sent_to: + MessageService.send_message_after_validation(task_to_unlock['new_state'], validated_dto.user_id, + task.mapped_by, task.id, validated_dto.project_id) + message_sent_to.append(task.mapped_by) + + if task_to_unlock['new_state'] == TaskStatus.VALIDATED: + # Set last_validation_date for the mapper to current date + task.mapper.last_validation_date = timestamp() # Update stats if user setting task to a different state from previous state prev_status = TaskHistory.get_last_status(project_id, task.id) From babd6906c97ce0740a9c27342405b2d2a00666b8 Mon Sep 17 00:00:00 2001 From: Neil Rotstan Date: Fri, 31 Aug 2018 10:57:18 -0700 Subject: [PATCH 05/11] Add opt-out note to invalidation notification --- .../services/messaging/templates/invalidation_message_en.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/services/messaging/templates/invalidation_message_en.txt b/server/services/messaging/templates/invalidation_message_en.txt index 6e2d2599a4..480c19d676 100644 --- a/server/services/messaging/templates/invalidation_message_en.txt +++ b/server/services/messaging/templates/invalidation_message_en.txt @@ -4,5 +4,7 @@ Unfortunately, the task you marked as "Completely Mapped" was just marked as inv
This is an automated message, the person who validated it hopefully shared some feedback with you.

-Thank you very much for mapping! +Thank you very much for mapping!
+
+Please note: You can opt-out of these automated validation messages by visiting your User Profile and clicking "Edit-Add Contact Details."

From 4860568b308aa4590e1468fea080b94d278ddd7f Mon Sep 17 00:00:00 2001 From: Neil Rotstan Date: Thu, 30 Aug 2018 13:59:32 -0700 Subject: [PATCH 06/11] Option to reset project tasks, preserving history. * Add option for project managers to reset all tasks back to ready status while preserving task history. * Add comment to each task indicating it was reset. --- .../edit-project/edit-project.controller.js | 57 ++++++++++++++++++ .../app/admin/edit-project/edit-project.html | 58 +++++++++++++++++++ client/app/services/project.service.js | 23 ++++++++ server/__init__.py | 3 +- server/api/project_admin_api.py | 41 +++++++++++++ server/models/postgis/task.py | 11 ++++ server/services/project_admin_service.py | 17 +++++- tests/server/unit/models/postgis/test_task.py | 28 +++++++++ .../services/test_project_admin_service.py | 35 +++++++++++ 9 files changed, 271 insertions(+), 2 deletions(-) diff --git a/client/app/admin/edit-project/edit-project.controller.js b/client/app/admin/edit-project/edit-project.controller.js index 0eb4f71681..35f843538f 100644 --- a/client/app/admin/edit-project/edit-project.controller.js +++ b/client/app/admin/edit-project/edit-project.controller.js @@ -59,12 +59,17 @@ // Delete vm.showDeleteConfirmationModal = false; + // Reset + vm.showResetConfirmationModal = false; + // Private project/add users vm.addUserEnabled = false; // Error messages vm.deleteProjectFail = false; vm.deleteProjectSuccess = false; + vm.resetProjectFail = false; + vm.resetProjectSuccess = false; vm.invalidateTasksFail = false; vm.invalidateTasksSuccess = false; vm.validateTasksFail = false; @@ -370,6 +375,37 @@ }; + /* + * Set the reset confirmation modal to visible/invisible + * @param showModal + */ + vm.showResetConfirmation = function(showModal){ + vm.showResetConfirmationModal = showModal; + if (!showModal && vm.resetProjectSuccess){ + $location.path('/'); + } + }; + + /** + * Reset a project + */ + vm.resetProject = function(){ + vm.resetProjectFail = false; + vm.resetProjectSuccess = false; + var resultsPromise = projectService.resetProject(vm.project.projectId); + resultsPromise.then(function () { + // Project reset successfully + vm.resetProjectFail = false; + vm.resetProjectSuccess = true; + // Reset the page elements + getProjectMetadata(vm.project.projectId); + }, function(){ + // Project not reset successfully + vm.resetProjectFail = true; + vm.resetProjectSuccess = false; + }); + }; + /** * Set the invalidate confirmation modal to visible/invisible * @param showModal @@ -428,6 +464,27 @@ }) }; + /** + * Reset all tasks on a project + */ + vm.resetAllTasks = function(){ + vm.resetInProgress = true; + vm.resetTasksFail = false; + vm.resetTasksSuccess = false; + var resultsPromise = projectService.resetAllTasks(vm.project.projectId); + resultsPromise.then(function(){ + // Tasks reset successfully + vm.resetTasksFail = false; + vm.resetTasksSuccess = true; + vm.resetInProgress = false; + }, function(){ + // Tasks not reset successfully + vm.resetTasksFail = true; + vm.resetTasksSuccess = false; + vm.resetInProgress = false; + }) + }; + /** * Set the show message contributors modal to visible/invisible */ diff --git a/client/app/admin/edit-project/edit-project.html b/client/app/admin/edit-project/edit-project.html index d4bf836bd1..f508142428 100644 --- a/client/app/admin/edit-project/edit-project.html +++ b/client/app/admin/edit-project/edit-project.html @@ -492,6 +492,17 @@

{{ 'In this area' | translate }}

{{ 'Delete project' | translate }} +
+ +

{{ 'Reset all tasks in the project to ready to map, preserving history.' | translate }}

+ + +

{{ 'This will clone all descriptions, instructions, metadata etc. The Area of Interest, the tasks and the priority areas will not be cloned. You will have to redraw/import these. Your newly cloned project will be in draft status.' | translate }}

@@ -729,6 +740,53 @@

{{ 'Task validation' | translate }}

+ +
+
+
+
+

{{ 'Task reset' | translate }}

+
+
+
+
+

+ {{ 'Are you sure you want to reset all tasks? You cannot undo this.' | translate }} +

+

+ {{ 'This will reset all tasks to ready to map (preserving existing history). Please use this only if you are sure of what you are doing.' | translate }} +

+
+

+ {{ 'The tasks were reset successfully.' | translate }} +

+

+ {{ 'Failed to reset all tasks for an unknown reason.' | translate }} +

+
+
+
+ + + {{ 'Resetting...' | translate }} +
+
+ +
+
+
+ +
+ +
diff --git a/client/app/services/project.service.js b/client/app/services/project.service.js index 56ec6152b9..f98e06a812 100644 --- a/client/app/services/project.service.js +++ b/client/app/services/project.service.js @@ -47,6 +47,7 @@ mapAllTasks: mapAllTasks, invalidateAllTasks: invalidateAllTasks, validateAllTasks: validateAllTasks, + resetAllTasks: resetAllTasks, getCommentsForProject: getCommentsForProject, userCanMapProject: userCanMapProject, userCanValidateProject: userCanValidateProject, @@ -545,6 +546,28 @@ }); } + /** + * Resets all tasks on the project + * @param projectId + * @returns {!jQuery.deferred|*|!jQuery.jqXHR|!jQuery.Promise} + */ + function resetAllTasks(projectId) { + // Returns a promise + return $http({ + method: 'POST', + url: configService.tmAPI + '/admin/project/' + projectId + '/reset-all', + headers: authService.getAuthenticatedHeader() + }).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"); + }); + } + /** Get comments for a project * @param id * @returns {*|!jQuery.jqXHR|!jQuery.deferred|!jQuery.Promise} diff --git a/server/__init__.py b/server/__init__.py index 044c459503..ba82b02443 100644 --- a/server/__init__.py +++ b/server/__init__.py @@ -104,7 +104,7 @@ def init_flask_restful_routes(app): ResendEmailValidationAPI from server.api.messaging.project_chat_apis import ProjectChatAPI from server.api.project_admin_api import ProjectAdminAPI, ProjectCommentsAPI, ProjectInvalidateAll,\ - ProjectValidateAll, ProjectMapAll, ProjectsForAdminAPI + ProjectValidateAll, ProjectMapAll, ProjectResetAll, ProjectsForAdminAPI from server.api.project_apis import ProjectAPI, ProjectAOIAPI, ProjectSearchAPI, HasUserTaskOnProject,\ HasUserTaskOnProjectDetails, ProjectSearchBBoxAPI, ProjectSummaryAPI from server.api.swagger_docs_api import SwaggerDocsAPI @@ -126,6 +126,7 @@ def init_flask_restful_routes(app): api.add_resource(ProjectInvalidateAll, '/api/v1/admin/project//invalidate-all') api.add_resource(ProjectValidateAll, '/api/v1/admin/project//validate-all') api.add_resource(ProjectMapAll, '/api/v1/admin/project//map-all') + api.add_resource(ProjectResetAll, '/api/v1/admin/project//reset-all') api.add_resource(ProjectsMessageAll, '/api/v1/admin/project//message-all') api.add_resource(ProjectsForAdminAPI, '/api/v1/admin/my-projects') api.add_resource(LoginAPI, '/api/v1/auth/login') diff --git a/server/api/project_admin_api.py b/server/api/project_admin_api.py index 725cce21d7..19be043b9b 100644 --- a/server/api/project_admin_api.py +++ b/server/api/project_admin_api.py @@ -434,6 +434,47 @@ def post(self, project_id): current_app.logger.critical(error_msg) return {"error": error_msg}, 500 +class ProjectResetAll(Resource): + + @tm.pm_only() + @token_auth.login_required + def post(self, project_id): + """ + Reset all tasks on project back to ready, preserving history. + --- + tags: + - project-admin + produces: + - application/json + parameters: + - in: header + name: Authorization + description: Base64 encoded session token + required: true + type: string + default: Token sessionTokenHere== + - name: project_id + in: path + description: The unique project ID + required: true + type: integer + default: 1 + responses: + 200: + description: All tasks reset + 401: + description: Unauthorized - Invalid credentials + 500: + description: Internal Server Error + """ + try: + ProjectAdminService.reset_all_tasks(project_id, tm.authenticated_user_id) + return {"Success": "All tasks reset"}, 200 + except Exception as e: + error_msg = f'Project GET - unhandled error: {str(e)}' + current_app.logger.critical(error_msg) + return {"error": error_msg}, 500 + class ProjectMapAll(Resource): diff --git a/server/models/postgis/task.py b/server/models/postgis/task.py index f38bae84d9..7d60351a16 100644 --- a/server/models/postgis/task.py +++ b/server/models/postgis/task.py @@ -302,6 +302,17 @@ def lock_task_for_validating(self, user_id: int): self.locked_by = user_id self.update() + def reset_task(self, user_id: int): + if TaskStatus(self.task_status) in [TaskStatus.LOCKED_FOR_MAPPING, TaskStatus.LOCKED_FOR_VALIDATION]: + self.clear_task_lock() + + self.set_task_history(TaskAction.STATE_CHANGE, user_id, None, TaskStatus.READY) + self.mapped_by = None + self.validated_by = None + self.locked_by = None + self.task_status = TaskStatus.READY.value + self.update() + def clear_task_lock(self, lock_duration): """ Unlocks task in scope in the database. Clears the lock as though it never happened. diff --git a/server/services/project_admin_service.py b/server/services/project_admin_service.py index f499a9f74d..0538d1faa4 100644 --- a/server/services/project_admin_service.py +++ b/server/services/project_admin_service.py @@ -6,7 +6,7 @@ from server.models.dtos.project_dto import DraftProjectDTO, ProjectDTO, ProjectCommentsDTO from server.models.postgis.project import Project, Task, ProjectStatus from server.models.postgis.statuses import TaskCreationMode -from server.models.postgis.task import TaskHistory +from server.models.postgis.task import TaskHistory, TaskStatus, TaskAction from server.models.postgis.utils import NotFound, InvalidData, InvalidGeoJson from server.services.grid.grid_service import GridService from server.services.license_service import LicenseService @@ -135,6 +135,21 @@ def delete_project(project_id: int): else: raise ProjectAdminServiceError('Project has mapped tasks, cannot be deleted') + @staticmethod + def reset_all_tasks(project_id: int, user_id: int): + """ Resets all tasks on project, preserving history""" + tasks_to_reset = Task.query.filter(Task.project_id == project_id).all() + + for task in tasks_to_reset: + task.set_task_history(TaskAction.COMMENT, user_id, "Task reset", TaskStatus.READY) + task.reset_task(user_id) + + # Reset project counters + project = ProjectAdminService._get_project_by_id(project_id) + project.tasks_mapped = 0 + project.tasks_validated = 0 + project.save() + @staticmethod def get_all_comments(project_id: int) -> ProjectCommentsDTO: """ Gets all comments mappers, validators have added to tasks associated with project """ diff --git a/tests/server/unit/models/postgis/test_task.py b/tests/server/unit/models/postgis/test_task.py index 72ce7ff7ff..9e96d777f2 100644 --- a/tests/server/unit/models/postgis/test_task.py +++ b/tests/server/unit/models/postgis/test_task.py @@ -2,6 +2,8 @@ import unittest from server import create_app from server.models.postgis.task import InvalidGeoJson, InvalidData, Task, TaskAction +from server.models.postgis.statuses import TaskStatus +from unittest.mock import patch, MagicMock class TestTask(unittest.TestCase): @@ -13,6 +15,32 @@ def setUp(self): def tearDown(self): self.ctx.pop() + @patch.object(Task, 'update') + @patch.object(Task, 'set_task_history') + def test_reset_task_sets_to_ready_status(self, mock_set_task_history, mock_update): + user_id = 123 + + test_task = Task() + test_task.task_status = TaskStatus.MAPPED + test_task.reset_task(user_id) + + mock_set_task_history.assert_called_with(TaskAction.STATE_CHANGE, user_id, None, TaskStatus.READY) + mock_update.assert_called() + self.assertEqual(test_task.task_status, TaskStatus.READY.value) + + @patch.object(Task, 'update') + @patch.object(Task, 'clear_task_lock') + @patch.object(Task, 'set_task_history') + def test_reset_task_clears_any_existing_locks(self, mock_set_task_history, mock_clear_task_lock, mock_update): + user_id = 123 + + test_task = Task() + test_task.task_status = TaskStatus.LOCKED_FOR_MAPPING + test_task.reset_task(user_id) + + mock_clear_task_lock.assert_called() + self.assertEqual(test_task.task_status, TaskStatus.READY.value) + def test_cant_add_task_if_feature_geometry_is_invalid(self): # Arrange invalid_feature = geojson.loads('{"geometry": {"coordinates": [[[[-4.0237, 56.0904], [-3.9111, 56.1715],' \ diff --git a/tests/server/unit/services/test_project_admin_service.py b/tests/server/unit/services/test_project_admin_service.py index 4b7e052327..de4a567acc 100644 --- a/tests/server/unit/services/test_project_admin_service.py +++ b/tests/server/unit/services/test_project_admin_service.py @@ -4,9 +4,19 @@ from server.services.project_admin_service import ProjectAdminService, InvalidGeoJson, Project, \ ProjectAdminServiceError, ProjectDTO, ProjectStatus, NotFound, LicenseService from server.models.dtos.project_dto import ProjectInfoDTO +from server.models.postgis.task import Task +from server import create_app class TestProjectAdminService(unittest.TestCase): + def setUp(self): + self.app = create_app() + self.ctx = self.app.app_context() + self.ctx.push() + + def tearDown(self): + self.ctx.pop() + def test_cant_add_tasks_if_geojson_not_feature_collection(self): # Arrange invalid_feature = '{"coordinates": [[[[-4.0237, 56.0904], [-3.9111, 56.1715], [-3.8122, 56.098],' \ @@ -112,3 +122,28 @@ def test_attempting_to_attach_non_existant_license_raise_error(self, license_moc with self.assertRaises(ProjectAdminServiceError): ProjectAdminService._validate_imagery_licence(1) + + @patch.object(ProjectAdminService, '_get_project_by_id') + @patch.object(Task, 'query') + @patch.object(Task, 'set_task_history') + def test_reset_all_tasks(self, mock_set_task_history, mock_query, mock_get_project): + user_id = 123 + test_project = MagicMock(spec=Project) + test_project.id = 456 + test_project.tasks_mapped = 2 + test_project.tasks_validated = 2 + test_tasks = [MagicMock(spec=Task), MagicMock(spec=Task), MagicMock(spec=Task)] + + mock_query.filter().all.return_value = test_tasks + mock_get_project.return_value = test_project + + ProjectAdminService.reset_all_tasks(test_project.id, user_id) + + for test_task in test_tasks: + test_task.set_task_history.assert_called() + test_task.reset_task.assert_called_with(user_id) + + mock_get_project.assert_called_with(test_project.id) + self.assertEqual(test_project.tasks_mapped, 0) + self.assertEqual(test_project.tasks_validated, 0) + test_project.save.assert_called() From 192253241117e5053e64eb65f766cdd4ff28fa3a Mon Sep 17 00:00:00 2001 From: Neil Rotstan Date: Fri, 31 Aug 2018 15:41:20 -0700 Subject: [PATCH 07/11] Adjust unit test for circleci environment --- tests/server/unit/services/test_project_admin_service.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/server/unit/services/test_project_admin_service.py b/tests/server/unit/services/test_project_admin_service.py index de4a567acc..b779f57663 100644 --- a/tests/server/unit/services/test_project_admin_service.py +++ b/tests/server/unit/services/test_project_admin_service.py @@ -124,7 +124,7 @@ def test_attempting_to_attach_non_existant_license_raise_error(self, license_moc ProjectAdminService._validate_imagery_licence(1) @patch.object(ProjectAdminService, '_get_project_by_id') - @patch.object(Task, 'query') + @patch('flask_sqlalchemy._QueryProperty.__get__') @patch.object(Task, 'set_task_history') def test_reset_all_tasks(self, mock_set_task_history, mock_query, mock_get_project): user_id = 123 @@ -134,7 +134,7 @@ def test_reset_all_tasks(self, mock_set_task_history, mock_query, mock_get_proje test_project.tasks_validated = 2 test_tasks = [MagicMock(spec=Task), MagicMock(spec=Task), MagicMock(spec=Task)] - mock_query.filter().all.return_value = test_tasks + mock_query.return_value.filter.return_value.all.return_value = test_tasks mock_get_project.return_value = test_project ProjectAdminService.reset_all_tasks(test_project.id, user_id) From 4d4f15c2f08ec2fcd71584dc2854d00342eb39ea Mon Sep 17 00:00:00 2001 From: Neil Rotstan Date: Tue, 4 Sep 2018 08:42:40 -0700 Subject: [PATCH 08/11] Prioritize participants in user-mention type-ahead * Present the usernames of matching users who have previously mapped or validated in the current project first when offering type-ahead suggestions for a user-mention in a comment, followed by other users. * Support an optional `projectId` query parameter to `user/search/filter` API. The response includes a new `users` array (in addition to the previous `usernames` for backward compatibility) that is populated with additional information about each user if a projectId is provided, including whether that user has "participated" (mapped or validated) in the project. The `users` array is left empty if no projectId is given. --- .../edit-project/edit-project.controller.js | 2 +- .../project-chat/project-chat.directive.js | 20 +++++++++------- .../components/project-chat/project-chat.html | 3 ++- client/app/project/project.controller.js | 21 ++++++++-------- client/app/project/project.html | 9 ++++--- client/app/project/user-suggestions-menu.html | 12 ++++++++++ client/app/services/user.service.js | 9 +++++-- client/assets/styles/sass/_project.scss | 10 ++++++++ server/api/users/user_apis.py | 7 +++++- server/models/dtos/user_dto.py | 9 +++++++ server/models/postgis/user.py | 24 ++++++++++++++----- server/services/users/user_service.py | 4 ++-- 12 files changed, 95 insertions(+), 35 deletions(-) create mode 100644 client/app/project/user-suggestions-menu.html diff --git a/client/app/admin/edit-project/edit-project.controller.js b/client/app/admin/edit-project/edit-project.controller.js index 0eb4f71681..39cc2d6cde 100644 --- a/client/app/admin/edit-project/edit-project.controller.js +++ b/client/app/admin/edit-project/edit-project.controller.js @@ -482,7 +482,7 @@ * @param searchValue */ vm.getUser = function(searchValue){ - var resultsPromise = userService.searchUser(searchValue); + var resultsPromise = userService.searchUser(searchValue, vm.project.id); return resultsPromise.then(function (data) { // On success return data.usernames; diff --git a/client/app/components/project-chat/project-chat.directive.js b/client/app/components/project-chat/project-chat.directive.js index 6fd080a8b2..efe6c052ee 100644 --- a/client/app/components/project-chat/project-chat.directive.js +++ b/client/app/components/project-chat/project-chat.directive.js @@ -42,6 +42,7 @@ vm.message = ''; vm.messages = []; vm.maxlengthComment = 250; + vm.suggestedUsers = []; vm.hasScrolled = false; @@ -112,17 +113,18 @@ * @param search */ vm.searchUser = function (search) { + // If the search is empty, do nothing. + if (!search || search.length === 0) { + vm.suggestedUsers = []; + return $q.resolve(vm.suggestedUsers); + } + // Search for a user by calling the API - var resultsPromise = userService.searchUser(search); + var resultsPromise = userService.searchUser(search, parseInt(vm.projectId, 10)); return resultsPromise.then(function (data) { // On success - vm.usernames = []; - if (data.usernames) { - for (var i = 0; i < data.usernames.length; i++) { - vm.usernames.push({'label': data.usernames[i]}); - } - } - return data.usernames; + vm.suggestedUsers = data.users; + return vm.suggestedUsers; }, function () { // On error }); @@ -135,7 +137,7 @@ vm.formatUserTag = function (item) { // Format the user tag by wrapping into brackets so it is easier to detect that it is a username // especially when there are spaces in the username - return '@[' + item.label + ']'; + return '@[' + item.username + ']'; }; /** diff --git a/client/app/components/project-chat/project-chat.html b/client/app/components/project-chat/project-chat.html index fd99f5a4ba..7af9b5e6f7 100644 --- a/client/app/components/project-chat/project-chat.html +++ b/client/app/components/project-chat/project-chat.html @@ -24,7 +24,8 @@ mentio-typed-text="typedTerm" mentio-search="projectChatCtrl.searchUser(term)" mentio-select="projectChatCtrl.formatUserTag(item)" - mentio-items="projectChatCtrl.usernames | filter:label:typedTerm" + mentio-items="projectChatCtrl.suggestedUsers" + mentio-template-url="/app/project/user-suggestions-menu.html" ng-model="projectChatCtrl.message">

{{ projectChatCtrl.maxlengthComment - projectChatCtrl.message.length }} {{ 'characters remaining' | translate }} diff --git a/client/app/project/project.controller.js b/client/app/project/project.controller.js index 17697bc328..0fb35158c7 100644 --- a/client/app/project/project.controller.js +++ b/client/app/project/project.controller.js @@ -67,7 +67,7 @@ //bound from the html vm.comment = ''; - vm.usernames = []; + vm.suggestedUsers = []; //table sorting control vm.propertyName = 'username'; @@ -1540,17 +1540,18 @@ * @param search */ vm.searchUser = function (search) { + // If the search is empty, do nothing. + if (!search || search.length === 0) { + vm.suggestedUsers = []; + return $q.resolve(vm.suggestedUsers); + } + // Search for a user by calling the API - var resultsPromise = userService.searchUser(search); + var resultsPromise = userService.searchUser(search, vm.projectData ? parseInt(vm.projectData.projectId, 10) : null); return resultsPromise.then(function (data) { // On success - vm.usernames = []; - if (data.usernames) { - for (var i = 0; i < data.usernames.length; i++) { - vm.usernames.push({'label': data.usernames[i]}); - } - } - return data.usernames; + vm.suggestedUsers = data.users; + return vm.suggestedUsers; }, function () { // On error }); @@ -1563,7 +1564,7 @@ vm.formatUserTag = function (item) { // Format the user tag by wrapping into brackets so it is easier to detect that it is a username // especially when there are spaces in the username - return '@[' + item.label + ']'; + return '@[' + item.username + ']'; }; } }) diff --git a/client/app/project/project.html b/client/app/project/project.html index 1034014258..e2f1271843 100644 --- a/client/app/project/project.html +++ b/client/app/project/project.html @@ -458,7 +458,8 @@

Done editing? Leave a comment and select one of the options below that match mentio-typed-text="typedTerm" mentio-search="projectCtrl.searchUser(term)" mentio-select="projectCtrl.formatUserTag(item)" - mentio-items="projectCtrl.usernames | filter:label:typedTerm" + mentio-items="projectCtrl.suggestedUsers" + mentio-template-url="/app/project/user-suggestions-menu.html" ng-model="projectCtrl.comment">

{{ projectCtrl.maxlengthComment - projectCtrl.comment.length }} {{ 'characters remaining' | translate }}

@@ -799,7 +800,8 @@
Done editing? Leave a comment and select one of the options below that match mentio-typed-text="typedTerm" mentio-search="projectCtrl.searchUser(term)" mentio-select="projectCtrl.formatUserTag(item)" - mentio-items="projectCtrl.usernames | filter:label:typedTerm" + mentio-items="projectCtrl.suggestedUsers" + mentio-template-url="/app/project/user-suggestions-menu.html" ng-model="projectCtrl.comment">

{{ projectCtrl.maxlengthComment - projectCtrl.comment.length }} {{ 'characters remaining' | translate }}

@@ -890,7 +892,8 @@
Done editing? Leave a comment and select one of the options below that match mentio-typed-text="typedTerm" mentio-search="projectCtrl.searchUser(term)" mentio-select="projectCtrl.formatUserTag(item)" - mentio-items="projectCtrl.usernames | filter:label:typedTerm" + mentio-items="projectCtrl.suggestedUsers" + mentio-template-url="/app/project/user-suggestions-menu.html" ng-model="projectCtrl.comment">

{{ projectCtrl.maxlengthComment - projectCtrl.comment.length }} {{ 'characters remaining' | translate }}

diff --git a/client/app/project/user-suggestions-menu.html b/client/app/project/user-suggestions-menu.html new file mode 100644 index 0000000000..e40808a12e --- /dev/null +++ b/client/app/project/user-suggestions-menu.html @@ -0,0 +1,12 @@ +
    +
  • +
    +
    {{ 'Participants' | translate }}
    +
    +
    +
    +
    {{ 'Other Users' | translate }}
    +
    + +
    • +
diff --git a/client/app/services/user.service.js b/client/app/services/user.service.js index ef67882fe3..ff35ca10bf 100644 --- a/client/app/services/user.service.js +++ b/client/app/services/user.service.js @@ -146,11 +146,16 @@ * Search a user * @returns {!jQuery.jqXHR|*|!jQuery.deferred|!jQuery.Promise} */ - function searchUser(username){ + function searchUser(username, projectId){ + var params = ''; + if (typeof projectId === "number" && !isNaN(projectId)) { + params = '?projectId=' + projectId; + } + // Returns a promise return $http({ method: 'GET', - url: configService.tmAPI + '/user/search/filter/' + username, + url: configService.tmAPI + '/user/search/filter/' + username + params, headers: { 'Content-Type': 'application/json; charset=UTF-8' } diff --git a/client/assets/styles/sass/_project.scss b/client/assets/styles/sass/_project.scss index 58fd231ae3..0f9f49b0e4 100644 --- a/client/assets/styles/sass/_project.scss +++ b/client/assets/styles/sass/_project.scss @@ -193,3 +193,13 @@ .indent--right { padding-left: 1.5em; } + +.user-suggestions-menu { + h6 { + margin: 0.25em 0.5em; + } + + hr { + margin: 1rem auto; + } +} diff --git a/server/api/users/user_apis.py b/server/api/users/user_apis.py index 313c7de896..82d7db9e7c 100644 --- a/server/api/users/user_apis.py +++ b/server/api/users/user_apis.py @@ -187,6 +187,10 @@ def get(self, username): name: page description: Page of results user requested type: integer + - in: query + name: projectId + description: Optional, promote project participants to head of results + type: integer responses: 200: description: Users found @@ -197,7 +201,8 @@ def get(self, username): """ try: page = int(request.args.get('page')) if request.args.get('page') else 1 - users_dto = UserService.filter_users(username, page) + project_id = request.args.get('projectId', None, int) + users_dto = UserService.filter_users(username, project_id, page) return users_dto.to_primitive(), 200 except NotFound: return {"Error": "User not found"}, 404 diff --git a/server/models/dtos/user_dto.py b/server/models/dtos/user_dto.py index 165b2a626f..19b78c7a71 100644 --- a/server/models/dtos/user_dto.py +++ b/server/models/dtos/user_dto.py @@ -96,6 +96,13 @@ class ListedUser(Model): mapping_level = StringType(serialized_name='mappingLevel') +class ProjectParticipantUser(Model): + """ Describes a user who has participated in a project """ + username = StringType() + project_id = LongType(serialized_name='projectId') + is_participant = BooleanType(serialized_name='isParticipant') + + class UserSearchDTO(Model): """ Paginated list of TM users """ def __init__(self): @@ -111,6 +118,8 @@ class UserFilterDTO(Model): def __init__(self): super().__init__() self.usernames = [] + self.users = [] pagination = ModelType(Pagination) usernames = ListType(StringType) + users = ListType(ModelType(ProjectParticipantUser)) diff --git a/server/models/postgis/user.py b/server/models/postgis/user.py index 525df7d059..dd72053f6c 100644 --- a/server/models/postgis/user.py +++ b/server/models/postgis/user.py @@ -1,7 +1,8 @@ import geojson from server import db +from sqlalchemy import desc from server.models.dtos.user_dto import UserDTO, UserMappedProjectsDTO, MappedProject, UserFilterDTO, Pagination, \ - UserSearchQuery, UserSearchDTO, ListedUser + UserSearchQuery, UserSearchDTO, ProjectParticipantUser, ListedUser from server.models.postgis.licenses import License, users_licenses_table from server.models.postgis.project_info import ProjectInfo from server.models.postgis.statuses import MappingLevel, ProjectStatus, UserRole @@ -105,17 +106,28 @@ def get_all_users_not_pagainated(): @staticmethod - def filter_users(user_filter: str, page: int) -> UserFilterDTO: - """ Finds users that matches first characters, for auto-complete """ - results = db.session.query(User.username).filter(User.username.ilike(user_filter.lower() + '%')) \ - .order_by(User.username).paginate(page, 20, True) - + def filter_users(user_filter: str, project_id: int, page: int) -> UserFilterDTO: + """ Finds users that matches first characters, for auto-complete. + + Users who have participated (mapped or validated) in the project, if given, will be + returned ahead of those who have not. + """ + # Note that the projects_mapped column includes both mapped and validated projects. + results = db.session.query(User.username, User.projects_mapped.any(project_id).label("participant")) \ + .filter(User.username.ilike(user_filter.lower() + '%')) \ + .order_by(desc("participant").nullslast(), User.username).paginate(page, 20, True) if results.total == 0: raise NotFound() dto = UserFilterDTO() for result in results.items: dto.usernames.append(result.username) + if project_id is not None: + participant = ProjectParticipantUser() + participant.username = result.username + participant.project_id = project_id + participant.is_participant = bool(result.participant) + dto.users.append(participant) dto.pagination = Pagination(results) return dto diff --git a/server/services/users/user_service.py b/server/services/users/user_service.py index ec58373e6b..940124353a 100644 --- a/server/services/users/user_service.py +++ b/server/services/users/user_service.py @@ -133,9 +133,9 @@ def get_all_users(query: UserSearchQuery) -> UserSearchDTO: @staticmethod @cached(user_filter_cache) - def filter_users(username: str, page: int) -> UserFilterDTO: + def filter_users(username: str, project_id: int, page: int) -> UserFilterDTO: """ Gets paginated list of users, filtered by username, for autocomplete """ - return User.filter_users(username, page) + return User.filter_users(username, project_id, page) @staticmethod def is_user_a_project_manager(user_id: int) -> bool: From 0fda6d0ab09c3927838e4bfe58b8356d11810301 Mon Sep 17 00:00:00 2001 From: Ethan Nelson Date: Wed, 12 Sep 2018 22:12:00 -0700 Subject: [PATCH 09/11] Remove deprecated line of code --- server/services/messaging/message_service.py | 1 - 1 file changed, 1 deletion(-) diff --git a/server/services/messaging/message_service.py b/server/services/messaging/message_service.py index acdc3fca2a..19567d00e3 100644 --- a/server/services/messaging/message_service.py +++ b/server/services/messaging/message_service.py @@ -53,7 +53,6 @@ def send_message_after_validation(status: int, validated_by: int, mapped_by: int if user.validation_message == False: return # No need to send validation message - text_template = get_template('validation_message_en.txt') text_template = get_template('invalidation_message_en.txt' if status == TaskStatus.INVALIDATED \ else 'validation_message_en.txt') status_text = 'marked invalid' if status == TaskStatus.INVALIDATED else 'validated' From 99d9bc0eddce9df81b8e7a190c70a9357a8c5730 Mon Sep 17 00:00:00 2001 From: Sunidhi Raheja Date: Sun, 23 Sep 2018 03:59:52 +0530 Subject: [PATCH 10/11] Add reset all bad imagery option --- .../edit-project/edit-project.controller.js | 28 ++++++++++ .../app/admin/edit-project/edit-project.html | 53 +++++++++++++++++++ client/app/services/project.service.js | 23 ++++++++ server/__init__.py | 3 +- server/api/project_admin_api.py | 42 +++++++++++++++ server/services/mapping_service.py | 14 +++++ 6 files changed, 162 insertions(+), 1 deletion(-) diff --git a/client/app/admin/edit-project/edit-project.controller.js b/client/app/admin/edit-project/edit-project.controller.js index 0eb4f71681..7f5e472234 100644 --- a/client/app/admin/edit-project/edit-project.controller.js +++ b/client/app/admin/edit-project/edit-project.controller.js @@ -369,6 +369,34 @@ }) }; + /** + * Set the reset bad imagery confirmation modal to visible/invisible + * @param showModal + */ + vm.showResetBadImageryConfirmation = function(showModal){ + vm.showResetBadImageryConfirmationModal = showModal; + }; + + /** + * Reset all bad imagery tasks on a project + */ + vm.resetBadImageryTasks = function(){ + vm.resetBadImageryInProgress = true; + vm.resetBadImageryFail = false; + vm.resetBadImagerySuccess = false; + var resultsPromise = projectService.resetBadImageryTasks(vm.project.projectId); + resultsPromise.then(function(){ + // Tasks mapped successfully + vm.resetBadImageryFail = false; + vm.resetBadImagerySuccess = true; + vm.resetBadImageryInProgress = false; + }, function(){ + // Tasks not mapped successfully + vm.resetBadImageryFail = true; + vm.resetBadImagerySuccess = false; + vm.resetBadImageryInProgress = false; + }) + }; /** * Set the invalidate confirmation modal to visible/invisible diff --git a/client/app/admin/edit-project/edit-project.html b/client/app/admin/edit-project/edit-project.html index d4bf836bd1..81a4435de9 100644 --- a/client/app/admin/edit-project/edit-project.html +++ b/client/app/admin/edit-project/edit-project.html @@ -480,6 +480,12 @@

{{ 'In this area' | translate }}

ng-click="editProjectCtrl.showValidateConfirmation(true)"> {{ 'Validate all tasks' | translate }} +
+ +
@@ -635,6 +641,53 @@

{{ 'Task mapping' | translate }}

+ +
+
+
+
+

{{ 'Reset Bad Imagery Tasks' | translate }}

+
+
+
+
+

+ {{ 'Are you sure you want to mark all bad imagery tasks in this project as ready? You cannot undo this.' | translate }} +

+

+ {{ 'This will mark all bad imagery tasks as ready. Please use this only if you are sure of what you are doing.' | translate }} +

+
+

+ {{ 'The tasks were reset successfully.' | translate }} +

+

+ {{ 'Resetting all the bad imagery tasks failed for an unknown reason.' | translate }} +

+
+
+
+ + + {{ 'Loading...' | translate }} +
+
+ +
+
+
+ +
+ +
diff --git a/client/app/services/project.service.js b/client/app/services/project.service.js index 56ec6152b9..98e99907cb 100644 --- a/client/app/services/project.service.js +++ b/client/app/services/project.service.js @@ -45,6 +45,7 @@ updateProject: updateProject, deleteProject: deleteProject, mapAllTasks: mapAllTasks, + resetBadImageryTasks: resetBadImageryTasks, invalidateAllTasks: invalidateAllTasks, validateAllTasks: validateAllTasks, getCommentsForProject: getCommentsForProject, @@ -501,6 +502,28 @@ }); } + /** + * Mark all bad imagery tasks ready for mapping + * @param projectId + * @returns {!jQuery.deferred|*|!jQuery.jqXHR|!jQuery.Promise} + */ + function resetBadImageryTasks(projectId) { + // Returns a promise + return $http({ + method: 'POST', + url: configService.tmAPI + '/admin/project/' + projectId + '/reset-all-badimagery', + headers: authService.getAuthenticatedHeader() + }).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"); + }); + } + /** * Invalidate all tasks on the project * @param projectId diff --git a/server/__init__.py b/server/__init__.py index 044c459503..c2d0b46ed4 100644 --- a/server/__init__.py +++ b/server/__init__.py @@ -104,7 +104,7 @@ def init_flask_restful_routes(app): ResendEmailValidationAPI from server.api.messaging.project_chat_apis import ProjectChatAPI from server.api.project_admin_api import ProjectAdminAPI, ProjectCommentsAPI, ProjectInvalidateAll,\ - ProjectValidateAll, ProjectMapAll, ProjectsForAdminAPI + ProjectValidateAll, ProjectMapAll, ProjectResetBadImagery, ProjectsForAdminAPI from server.api.project_apis import ProjectAPI, ProjectAOIAPI, ProjectSearchAPI, HasUserTaskOnProject,\ HasUserTaskOnProjectDetails, ProjectSearchBBoxAPI, ProjectSummaryAPI from server.api.swagger_docs_api import SwaggerDocsAPI @@ -126,6 +126,7 @@ def init_flask_restful_routes(app): api.add_resource(ProjectInvalidateAll, '/api/v1/admin/project//invalidate-all') api.add_resource(ProjectValidateAll, '/api/v1/admin/project//validate-all') api.add_resource(ProjectMapAll, '/api/v1/admin/project//map-all') + api.add_resource(ProjectResetBadImagery, '/api/v1/admin/project//reset-all-badimagery') api.add_resource(ProjectsMessageAll, '/api/v1/admin/project//message-all') api.add_resource(ProjectsForAdminAPI, '/api/v1/admin/my-projects') api.add_resource(LoginAPI, '/api/v1/auth/login') diff --git a/server/api/project_admin_api.py b/server/api/project_admin_api.py index 725cce21d7..914e1c993a 100644 --- a/server/api/project_admin_api.py +++ b/server/api/project_admin_api.py @@ -477,6 +477,48 @@ def post(self, project_id): return {"error": error_msg}, 500 +class ProjectResetBadImagery(Resource): + + @tm.pm_only() + @token_auth.login_required + def post(self, project_id): + """ + Mark all bad imagery tasks ready for mapping + --- + tags: + - project-admin + produces: + - application/json + parameters: + - in: header + name: Authorization + description: Base64 encoded session token + required: true + type: string + default: Token sessionTokenHere== + - name: project_id + in: path + description: The unique project ID + required: true + type: integer + default: 1 + responses: + 200: + description: All bad imagery tasks marked ready for mapping + 401: + description: Unauthorized - Invalid credentials + 500: + description: Internal Server Error + """ + try: + MappingService.reset_all_badimagery(project_id, tm.authenticated_user_id) + return {"Success": "All bad imagery tasks marked ready for mapping"}, 200 + except Exception as e: + error_msg = f'Project GET - unhandled error: {str(e)}' + current_app.logger.critical(error_msg) + return {"error": error_msg}, 500 + + class ProjectsForAdminAPI(Resource): @tm.pm_only() diff --git a/server/services/mapping_service.py b/server/services/mapping_service.py index 258ad2ce9b..8c6d8b7676 100644 --- a/server/services/mapping_service.py +++ b/server/services/mapping_service.py @@ -252,3 +252,17 @@ def map_all_tasks(project_id: int, user_id: int): project = ProjectService.get_project_by_id(project_id) project.tasks_mapped = (project.total_tasks - project.tasks_bad_imagery) project.save() + + @staticmethod + def reset_all_badimagery(project_id: int, user_id: int): + """ Marks all bad imagery tasks ready for mapping """ + badimagery_tasks = Task.query.filter(Task.task_status == TaskStatus.BADIMAGERY.value).all() + + for task in badimagery_tasks: + task.lock_task_for_mapping(user_id) + task.unlock_task(user_id, new_state=TaskStatus.READY) + + # Reset bad imagery counter + project = ProjectService.get_project_by_id(project_id) + project.tasks_bad_imagery = 0 + project.save() From a286c05b493ccb1b89a1ae873f23bb342d13af40 Mon Sep 17 00:00:00 2001 From: Wille Marcel Date: Mon, 1 Oct 2018 10:27:41 -0300 Subject: [PATCH 11/11] update pyyaml --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index b7bf5d7df8..08f1bee3bf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -31,7 +31,7 @@ pyflakes==1.5.0 python-dateutil==2.6.0 python-editor==1.0.3 pytz==2017.2 -PyYAML==3.12 +PyYAML==3.13 requests==2.13.0 requests-oauthlib==0.8.0 schematics==2.0.0a1 @@ -42,4 +42,4 @@ transifex-client==0.12.4 urllib3==1.21.1 webencodings==0.5.1 Werkzeug==0.12.2 -newrelic==3.2.0.91 \ No newline at end of file +newrelic==3.2.0.91