Skip to content

Toggle task compensation and loop markers#1297

Merged
velkymx merged 45 commits intodevelopfrom
1271-add-loop-characteristic-toggles
Dec 10, 2020
Merged

Toggle task compensation and loop markers#1297
velkymx merged 45 commits intodevelopfrom
1271-add-loop-characteristic-toggles

Conversation

@vehikl-jacare
Copy link
Copy Markdown
Contributor

@vehikl-jacare vehikl-jacare commented Dec 9, 2020

Duplicate of #1280 but it removes code that causes hanging issue in combination with the changes in this PR.

vehikl-jacare and others added 30 commits November 27, 2020 11:36
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
WIP add marker flags control to tasks
34628e7 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
WIP: add task marker options in advanced inspector
62d373c 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
add custom data transform for task
4efa251 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
set some default values for markerFlags
6f7044f 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
remove compensation icon if isForCompensation is false
cdaadd2 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
cleanup compensation icon logic
f26c5d8 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
refactor watcher for compensation
125e4df 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
get standard loop characteristic to show up
802294c 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
unset loop icon
b44cda4 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
properly remove marker
d2c5440 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
sort the bottom center markers alphabetically
b433ab0 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
assert that bottom centre markers get sorted
41f76d0 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
did do the todo
86edac8 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
set the MarkerFlags radio values from the bpmn
c48a2d9 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
WIP: add e2e tests for adding task marker flags
9a7cfa8 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
add tests for task markers
1192d00 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
Fix spacing
c2f4cc0 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
reword tests
99aafdf 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
fix failing test
b5ee459 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
add failing test
2de44f8 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
space
e105d32 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
remove .only
f4ff120 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
fix watcher bug
cc0061c 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
fix setting props so they are reactive
83a26d1 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare
Merge branch 'develop' into 1271-add-loop-characteristic-toggles
690ebcc
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
update data input and output association ids
7e3aae9 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
lint spacinig
536a750 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
fix null definitiion reference error
c9258af 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
Update ci test spec
1e48d3f 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
add test for no validation errors
1eb4345 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
vehikl-jacare and others added 15 commits December 3, 2020 14:24
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
update assertion as timer and name accordions are now linked
320767c 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare
Revert "update assertion as timer and name accordions are now linked"
a76485f 
This reverts commit 320767c.
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
rename inspector accordion names to be unique
c778035 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
fix unsetting definition value
2ee7f70 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
add test for unsetting loop characteristics
c2f7f7e 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
rename
99281af 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare
refactor method so early return works without skipping other updates
5af7081
@vehikl-jacare
early return to remove one level of if block
d7fffb3
@vehikl-jacare
Merge branch 'develop' into 1271-add-loop-characteristic-toggles
7a46016
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
Comment out code that causes infinite loop
90f896c 
PR #1284 introduces this code

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
revert #1290 as it interacts badly with crown
06bbef4 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
add failing test that checks task assignment doesn't get reset
1a8ab00 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
add watchers for specific user assignment properties
9e8a066 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
clean up watchers
86ce7cc 
Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@vehikl-jacare @JStruk
@chipit24 @johnblackspear
removed incorrect test
2c5d287 
This does not safeguard the behaviour that we need safeguarded and will need different tests once we bring in the user assignment components into modeler.

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com>
Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com>
Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>
@velkymx velkymx merged commit a00793e into develop Dec 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@vehikl-jacare @velkymx