Skip to content

Overload Information in Labor History Enhancement#563

Open
JohnCox2211 wants to merge 13 commits intodevelopmentfrom
labor-history-overload-info
Open

Overload Information in Labor History Enhancement#563
JohnCox2211 wants to merge 13 commits intodevelopmentfrom
labor-history-overload-info

Conversation

@JohnCox2211
Copy link
Contributor

Fixes issue #536

Changes:

Adds visibility into the overload form process for individual forms on the student Labor History page. This includes sections for notes on an overload rejection, the labor office contact for a form, the labor office's review date for the form, and the student's reason for the overload.

Testing:

Student Search:
- Find a student with overload forms (I found Nicholas Hamilton to be a good example)
- Open a form on the student's page with the overload status
- If the form was approved or pending, there should be a section with a labor office contact, labor review date, and the student's reason for overload.
- If the form was denied, the above section should be included, as well as one with a rejection reason from the reviewer.

Example (Denied form with no contact listed):

image

Example (approved form with a contact listed):

image

@JohnCox2211 JohnCox2211 self-assigned this Jan 29, 2026
@JohnCox2211 JohnCox2211 marked this pull request as ready for review January 29, 2026 20:33
@JohnCox2211 JohnCox2211 requested a review from Kafui123 January 29, 2026 21:02
@JohnCox2211 JohnCox2211 changed the title Labor history overload info Admins should see Overload Information in Labor History Jan 29, 2026
@JohnCox2211 JohnCox2211 changed the title Admins should see Overload Information in Labor History Overload Information in Labor History Enhancement Jan 29, 2026
@JohnCox2211 JohnCox2211 linked an issue Jan 29, 2026 that may be closed by this pull request
@RueHaile RueHaile self-requested a review February 3, 2026 20:54
@JohnCox2211
Copy link
Contributor Author

JohnCox2211 commented Feb 5, 2026

Known issues as of 2/5/26:

  • WHEN MAKING AN OVERLOAD BY ADJUSTING A FORM
    adjustment pending form for an overload shows "{ "Success": false }"

  • adjustment pending form shows "{ "Success": false }" after only changing the notes
    ***turns out this is also an issue on development

  • pending adjustment forms tab in pending forms gives this error:
    "An unexpected error has occurred
    The administrator has been notified. Sorry for the inconvenience!"
    ***turns out this is also an issue on development

  • WHEN MAKING AN OVERLOAD FORM FROM New LSF PAGE
    Overload Pending form shows "{ "Success": false }"

added back accidental feature deletions

still need to fix adjustment pending page on
pending forms page
for readability

modified overload info display html
form modal giving error w/ no review date
pending adjustment forms page to not load properly.

Seems like some departments are just showing up as
None for some reason, should probably fix that
got rid of prints
changed html logic for labor history modal
@Kafui123
Copy link

I think it would be a good idea to bold these texts: the labor office contact, the labor review date, and the reason for overload.

image

@JohnCox2211
Copy link
Contributor Author

I think it would be a good idea to bold these texts: the labor office contact, the labor review date, and the reason for overload.

image

The reason why I ended up not bolding the text was to match the appearance of the additional information already in place for release forms. I do agree that both would look better if they stood out more, so I have implemented this change for both as well the extra info popup for adjusted forms.

@JohnCox2211
Copy link
Contributor Author

Possible conflicting semi-related issues you may run into:

  • When adjusting a form, the department ends up changing to some default that is not the department connected to the form, so it will appear as None. I have added error handling to catch this problem so that the labor history modal still appears to allow testing of this issue.
  • When adjusting an existing labor status form for it to become an overload form, the student is unable to accept the form in the pre-student-approval phase. To avoid running into this in testing, simply create a labor status form as an overload form.

Note: both of the above issues are in the development branch as well and should be fixed in another issue.

added bold text labels in labor form extra info rows
modified peewee query
made some jinja a bit more readable
@RueHaile
Copy link
Contributor

RueHaile commented Mar 9, 2026

image The box text area is missleading it seems interactive when in fact it is not. We can have a better UI where it is merely a display, and the presentation is not misleading. Is there a reason that is the case?

@JohnCox2211
Copy link
Contributor Author

image The box text area is missleading it seems interactive when in fact it is not. We can have a better UI where it is merely a display, and the presentation is not misleading. Is there a reason that is the case?

The reason this textbox is kept this way is that it is the same as the release form (which you screenshotted). I kept that format for the overload forms for consistency. Though I agree that it would look better if it were disabled, so I implemented that change for the release and overload text areas

overload forms in the student history modal to
prevent user confusion
Comment on lines +176 to +177
form.adjustedForm.newValue = newDepartment.DEPT_NAME if newDepartment else "Unknown " + newValue
form.adjustedForm.oldValue = oldDepartment.DEPT_NAME if oldDepartment else "Unknown " + oldValue

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we possibly get rid of the "unknown" and just put the new value to make it cleaner?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line is more of an error catching for another problem, and is meant just to allow the modal to open up when you encounter one of the known errors mentioned in a previous comment I made. This is what that ends up looking like:

image

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.

Admins should see Overload Information in Labor History

3 participants