Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improved handling of competency domains #1945

Merged
merged 6 commits into from
Aug 15, 2016

Conversation

jrjohnson
Copy link
Member

This set of changes allows a program year to be associated with top level competencies (domains). They can also be associated with program year objectives.

Fixes #1696

@jrjohnson
Copy link
Member Author

@saschaben please test.

@saschaben
Copy link
Member

saschaben commented Aug 11, 2016

  • make sure that only selected competencies/domains load for mapping selection

@jrjohnson jrjohnson changed the title IMproved handling of competency domains Improved handling of competency domains Aug 11, 2016
@saschaben
Copy link
Member

blocked by #1947. Waiting for merge to test and validate.

@saschaben
Copy link
Member

Looking good functionally. only issue I see is with the handlling of the objective parent selector: if you click on any domain, the highlighting and checkbox are activated as expected -- but if you click directly on the checkbox, it activates the highlighting, but not the checkbox itself.

This is a visual UX issue only -- functionally the select works regardless.

@jrjohnson
Copy link
Member Author

Issues with checkboxes fixed, assigning to @stopfstedt for code review

@jrjohnson jrjohnson assigned stopfstedt and unassigned saschaben Aug 12, 2016
@saschaben
Copy link
Member

We eventually will have to deal with the "challenged" refreshing of available competencies for selection when both managers are open and there is no intervening page refresh, but that is for another day.
👍

@jrjohnson
Copy link
Member Author

@saschaben I wasn't able to get that to happen again, thought maybe it was my imagination. Are you seeing it here?

@saschaben
Copy link
Member

@jrjohnson it only occurs with objectives that are already hooked up to a parent; if you modify the competency set while the objective manager is also open and then try to change a parent to a newly added competency, this pops up. It's not a common use pattern and should not block this pr.

@homu
Copy link
Contributor

homu commented Aug 15, 2016

☔ The latest upstream changes (presumably #1947) made this pull request unmergeable. Please resolve the merge conflicts.

Remove the tree concept and get rid of the management component in favor
of doing the management in programyear-competencies component directly.
Previously only competencies within a domain not a top level competency
could be added to a program year objective.  This was insufficient as
some program years use only top level competencies.
Mistakenly looking at the school set instead of the program year set.
Using a single checked attribute for this didn't work because clicking
on it changed the state.  Instead we have to create a new box for each
case so it stays checked when clicked.
@jrjohnson jrjohnson force-pushed the 1696-singlecompetency branch from 8a62381 to 16617ad Compare August 15, 2016 17:53
@stopfstedt
Copy link
Member

LGTM

@stopfstedt stopfstedt merged commit 878a23a into ilios:master Aug 15, 2016
@jrjohnson jrjohnson deleted the 1696-singlecompetency branch August 15, 2016 23:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants