Integrate the course assignment table according to researchers' preferences #10
Conversation
SamuelVch98
force-pushed
the
Feature-Assignement
branch
from
049fd10
to
5ad66ef
Compare
SamuelVch98
force-pushed
the
Feature-Assignement
branch
from
3b0d5b9
to
aa31167
Compare
|
Can you rebase ? |
There was a problem hiding this comment.
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 ? |
SamuelVch98
force-pushed
the
Feature-Assignement
branch
from
aa31167
to
709f4d3
Compare
# Conflicts: # app.py
…re is no undesirable behaviour
…ake them easier to read
SamuelVch98
force-pushed
the
Feature-Assignement
branch
from
25becb8
to
5c36f64
Compare
|
|
||
| rank = 0 |
There was a problem hiding this comment.
It seems this piece of code comes from #42. We'll wait for it to be merged before proceeding further with this one.
| toastNotification.show(); | ||
| }) | ||
| $('#button-create-assignments').click(function () { | ||
| storeDataLocally(data); |
There was a problem hiding this comment.
Do we actually want this ? Storing this in the local storage only allows the local browser to load saved data. This means:
- an admin currently working on assignments should keep using the same browser until assignments are published
- if an admin save their own assignments, another admin cannot get the current state of assignments and go on until the data are ready for publishment.
Data should be saved in remote database. And can only be viewed by teachers and researchers once they are published.
| def load_data(): | ||
| current_year = get_current_year() | ||
| courses = (db.session.query(Course).filter_by(year=current_year).order_by(Course.quadri).all()) | ||
| users = db.session.query(User).filter_by(active=True).all() |
There was a problem hiding this comment.
Beware: if you save assignments and then de-activate a user, their data won't be found when reloading the assignment table. You should check for this.
| } | ||
|
|
||
| // Verify if the table is modified locally | ||
| retrieveDataLocally(); |
There was a problem hiding this comment.
Please either:
- remove the function definition as it is used once and alter the value of a variable out of its scope (
data) - make the function return the loaded value.
| // Old non-empty value and new non-empty value: loadValue++ and nbrAssistants++. | ||
| // Old null value and new non-empty value: loadValue++ and nbrAssistants++. | ||
| // Old non-null value and new null value: loadValue-- and nbrAssistants--. | ||
| if (oldValue !== newValue) { |
There was a problem hiding this comment.
We still need a small doc for this in the UI. It won't be clear for user that whatever the cell content is corresponds to assigned and that an empty cell corresponds to not assigned.
Another nice and valid solution would be to catch double click for instance and check or uncheck the cell.
| export const taLoad = 4; // Load of a teaching assistant | ||
| export const phdLoad = 2; // Load of a phd student | ||
| export const postDocLoad = 1; // Load of a post doc |
There was a problem hiding this comment.
This is already defined in enums.py. You should rather inject them dynamically from the template instead of duplicating definitions.
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