Adjacent lock #133

hc00364289 · 2021-02-01T14:24:50Z

Adjacent lock

zlavergne

I've got a number of things that need to be addressed in the inline comments. Additionally, there's a couple other things:

Let's also implement this for validation. If someone locks something for validation, we want to prevent the surrounding tasks from being locked. This shouldn't be much of a change, just using the adjacent_task_lock/unlock functions when we lock for validation too
Make sure to remove any unnecessary comments or console logs.

zlavergne · 2021-02-09T19:07:47Z

backend/models/dtos/project_dto.py

@@ -207,7 +207,7 @@ class ProjectDTO(Model):
    enforce_random_task_selection = BooleanType(
        required=False, default=False, serialized_name="enforceRandomTaskSelection"
    )
-
+    adjacent_task_lock = BooleanType(required=True, default=False, serialized_name='adjacentTaskLock')


Suggested change

adjacent_task_lock = BooleanType(required=True, default=False, serialized_name='adjacentTaskLock')

prevent_adjacent_task_lock = BooleanType(required=True, default=False, serialized_name='preventAdjacentTaskLock')

Similarly to how the name "Adjacent Task Lock" is confusing, let's call it "Prevent Adjacent Task Lock" throughout the project.

zlavergne · 2021-02-09T19:08:14Z

backend/models/postgis/project.py

@@ -136,6 +136,7 @@ class Project(db.Model):
    enforce_random_task_selection = db.Column(
        db.Boolean, default=False
    )  # Force users to edit at random to avoid mapping "easy" tasks
+    adjacent_task_lock = db.Column(db.Boolean, default=False) # Turn on adjacent lock


Suggested change

adjacent_task_lock = db.Column(db.Boolean, default=False) # Turn on adjacent lock

prevent_adjacent_task_lock = db.Column(db.Boolean, default=False) # Turn on adjacent lock

Same

zlavergne · 2021-02-09T19:08:34Z

backend/models/postgis/project.py

@@ -359,6 +360,7 @@ def update(self, project_dto: ProjectDTO):
        self.priority = ProjectPriority[project_dto.project_priority].value
        self.default_locale = project_dto.default_locale
        self.enforce_random_task_selection = project_dto.enforce_random_task_selection
+        self.adjacent_task_lock = project_dto.adjacent_task_lock


Suggested change

self.adjacent_task_lock = project_dto.adjacent_task_lock

self.prevent_adjacent_task_lock = project_dto.prevent_adjacent_task_lock

Same

zlavergne · 2021-02-09T19:08:55Z

backend/models/postgis/project.py

@@ -969,6 +971,7 @@ def _get_project_and_base_dto(self):
            self.validation_permission
        ).name
        base_dto.enforce_random_task_selection = self.enforce_random_task_selection
+        base_dto.adjacent_task_lock = self.adjacent_task_lock


Suggested change

base_dto.adjacent_task_lock = self.adjacent_task_lock

base_dto.prevent_adjacent_task_lock = self.prevent_adjacent_task_lock

zlavergne · 2021-02-09T19:09:42Z

backend/models/postgis/project.py

@@ -1163,6 +1166,11 @@ def get_project_campaigns(project_id: int):

        return campaign_list

+    def get_project_adj_toggle(project_id: int):
+        """ get the value of adjacent task lock true/false for project"""
+        query = db.session.query(Project.adjacent_task_lock).filter(Project.id==project_id).all()


Suggested change

query = db.session.query(Project.adjacent_task_lock).filter(Project.id==project_id).all()

query = db.session.query(Project.prevent_adjacent_task_lock).filter(Project.id==project_id).all()

Same

zlavergne · 2021-02-11T16:12:41Z

frontend/src/components/projectStats/taskStatus.js

+    {
+      label: getLabel('ADJACENT_LOCK'),
+      field: 'adjacentLock',
+      backgroundColor: TASK_COLOURS.ADJACENT_LOCK,
+      borderColor: '#929db3',
+    },
+    {
+      label: getLabel('ADJACENTLOCK'),
+      field: 'adjacentLock',
+      backgroundColor: TASK_COLOURS.ADJACENTLOCK,
+      borderColor: '#929db3',
+    },


Why are there two here? It looks like we only use both in different parts of the code. Let's try to remove one of them and unify the rest of the code usage.

zlavergne · 2021-02-11T16:13:02Z

frontend/src/components/taskSelection/map.js

@@ -104,6 +108,7 @@ export const TasksMap = ({
      if (map.getSource('tasks') === undefined) {
        map.addImage('lock', lockIcon, { width: 17, height: 20, data: lockIcon });
        map.addImage('redlock', redlockIcon, { width: 30, height: 30, data: redlockIcon });
+        //  map.addImage('adjacentLock', adjLockIcon, { width: 130, height: 130, data: adjLockIcon });


please remove if not necessary

zlavergne · 2021-02-11T16:13:19Z

frontend/src/components/taskSelection/map.js

+        console.log('adjacent lock is', adjacentlocked);
+        console.log(' lock is', locked);


please remove if not necessary

zlavergne · 2021-02-11T16:13:26Z

frontend/src/components/taskSelection/map.js

        let taskStatusCondition = ['case'];
+        console.log('task status ', taskStatusCondition);


zlavergne · 2021-02-11T16:15:56Z

frontend/src/config/index.js

+export const OSM_SERVER_URL =
+  process.env.REACT_APP_OSM_SERVER_URL || 'https://www.openstreetmap.org';
+export const ID_EDITOR_URL =
+  process.env.REACT_APP_ID_EDITOR_URL || 'https://www.openstreetmap.org/edit?editor=id&';
+export const POTLATCH2_EDITOR_URL =
+  process.env.REACT_APP_POTLATCH2_EDITOR_URL ||
+  'https://www.openstreetmap.org/edit?editor=potlatch2';


If these are just formatting changes, let's remove them so we avoid conflicts

hc00364289 added 5 commits January 13, 2021 10:41

Adjacent lock intial commit

a7d4f48

API intial commit for Adjcent lock

b99ee38

migration file

247f1aa

Added Enum for Adjacent lock

7a7739b

api code changes

6c99028

facebook-github-bot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Feb 1, 2021

github-actions bot added Component: Backend Component: Frontend labels Feb 1, 2021

zlavergne linked an issue Feb 3, 2021 that may be closed by this pull request

Adjacent Task Lock #30

Open

zlavergne suggested changes Feb 11, 2021

View reviewed changes

hc00364289 added 2 commits March 1, 2021 10:41

api commit for PR comments

16394d1

PR comment fixes for UI

7c613a7

zlavergne added the PRIORITY Work on these first label Nov 9, 2021

zlavergne added this to the Hi-Pri Features milestone Nov 9, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adjacent lock #133

Adjacent lock #133

hc00364289 commented Feb 1, 2021

zlavergne left a comment

zlavergne Feb 9, 2021

zlavergne Feb 9, 2021

zlavergne Feb 9, 2021

zlavergne Feb 9, 2021

zlavergne Feb 9, 2021

zlavergne Feb 11, 2021

zlavergne Feb 11, 2021

zlavergne Feb 11, 2021

zlavergne Feb 11, 2021

zlavergne Feb 11, 2021

	adjacent_task_lock = BooleanType(required=True, default=False, serialized_name='adjacentTaskLock')
	prevent_adjacent_task_lock = BooleanType(required=True, default=False, serialized_name='preventAdjacentTaskLock')

	adjacent_task_lock = db.Column(db.Boolean, default=False) # Turn on adjacent lock
	prevent_adjacent_task_lock = db.Column(db.Boolean, default=False) # Turn on adjacent lock

	self.adjacent_task_lock = project_dto.adjacent_task_lock
	self.prevent_adjacent_task_lock = project_dto.prevent_adjacent_task_lock

	base_dto.adjacent_task_lock = self.adjacent_task_lock
	base_dto.prevent_adjacent_task_lock = self.prevent_adjacent_task_lock

	query = db.session.query(Project.adjacent_task_lock).filter(Project.id==project_id).all()
	query = db.session.query(Project.prevent_adjacent_task_lock).filter(Project.id==project_id).all()

		console.log('adjacent lock is', adjacentlocked);
		console.log(' lock is', locked);

		let taskStatusCondition = ['case'];
		console.log('task status ', taskStatusCondition);

Adjacent lock #133

Are you sure you want to change the base?

Adjacent lock #133

Conversation

hc00364289 commented Feb 1, 2021

zlavergne left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment