-
Notifications
You must be signed in to change notification settings - Fork 1
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
Integrate the course assignment table according to researchers' preferences #10
base: main
Are you sure you want to change the base?
Conversation
049fd10
to
5ad66ef
Compare
3b0d5b9
to
aa31167
Compare
Can you rebase ? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems that we can change the preferences line and put whatever we want in the cells, and then save the table and loose the actual prferences...
Also, I think that you should add some short notice on how to use the table: which cells need to be modified, how....
Can you fix conflicts and rebase ? |
aa31167
to
709f4d3
Compare
# Conflicts: # app.py
Save comments in assignments to avoid a rigid data structure Modify the way loads and the number of assistants are calculated to avoid consistency problems Small fix on issues
static/scripts/assignment_table.js
Outdated
if (col > lenFixedHeaders - 1) { | ||
let colData = this.getDataAtCol(col); | ||
if (colData[RowIndices.TOTAL_ASSISTANT_NOW] >= colData[RowIndices.ASSISTANTS]) { | ||
th.style.backgroundColor = 'green'; | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Your check on the number of assignations per course is not complete because you only check if that number is lower or equal to the desired value. You don't check if it goes over (red).
Also, you don't do that check if there is no desired number of assigned researcher. The title remains green all the time. I don't know what is best : giving a number at course creation or just leaving the title white if no number is given. What do you think @anthonygego @luciledierckx
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If there is no desired number of researchers assigned, the value is set to 0 by default. Would you like me to set the header to ‘’white‘’ if the value is the default?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I feel that in the normal use of the application, we should define a number of researchers per course. Obviously a person creating a course might not now exactly how many are needed at first. And that is why we handle the case where none are given.
I was thinking we might use a way to clearly indicate that desired number is not defined for a course. For example, ith a title in light purple or something similar. It would be a way of saying "Be advised, you didn't define a desired number of researcher !".
That additional color would prevent the case where we confuse the courses that are not fully assigned and those with no desired number of researchers.
I will discuss this possibility with the others.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As discussed, you should indicate clearly in the table when a course has no number of researcher defined
Add accordions to reduce the legend and controls.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We want a course that is not fully assigned to be white. Right now it becomes red.
Also, a course with too many researchers assigned stays green instead of turning red.
static/scripts/assignment_table.js
Outdated
let colData = this.getDataAtCol(col); | ||
if (col > lenFixedHeaders - 1) { | ||
if (colData[RowIndices.ASSISTANTS] === 0) { | ||
th.style.backgroundColor = '#E1BEE7'; | ||
} | ||
else if (colData[RowIndices.TOTAL_ASSISTANT_NOW] >= colData[RowIndices.ASSISTANTS]) { | ||
th.style.backgroundColor = 'green'; | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where is the red gone ?
Now it is white when not enough researchers are assigned and turns green when enough are assigned. But if too many are assigned the titles does not change to red... Also the red color is missing from the legend.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, it's my fault, I misunderstood your last comment.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me other than that last change in the legend. @anthonygego, does it look good ?
<li><span class="d-inline-block bg-danger" | ||
style="width: 16px; height: 16px; margin-right: 8px;"></span> | ||
Additional | ||
researchers needed | ||
</li> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"Additional researchers needed" needs to be "too many researchers assigned"
Integration of the handsontable table into the application.
Ability to save the state of a table, delete data, export it as a CSV file and publish it.
Update README