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.

Sign up for GitHub

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

Jump to bottom

Add default Officer Overtime value #1083

Merged
merged 2 commits into from
Jan 3, 2024
Merged

Add default Officer Overtime value #1083

merged 2 commits into from
Jan 3, 2024

Conversation

Spraynard
Copy link
Contributor

@Spraynard Spraynard commented Jan 1, 2024 •
edited by michplunkett
Loading

Fixes issue

#856

Description of Changes

Adds default of $0 in officer "Overtime Pay" field. Users don't have to fill this in if they don't have any overtime pay information and use the form faster!

Testing and Linting

  • This branch is up-to-date with the develop branch.
  • pytest passes on my local development environment.
  • pre-commit passes on my local development environment.

@Spraynard
Modifying forms.py
29783c9 
Adding default of "0" to overtime_pay field
@Spraynard Spraynard changed the title Modifying forms.py Adding default Officer Overtime value Jan 1, 2024
@michplunkett
Copy link
Collaborator

It fails the pre-commit step. That needs to be updated before we can merge.

@michplunkett michplunkett changed the title Adding default Officer Overtime value Add default Officer Overtime value Jan 2, 2024
@Spraynard
Modifying forms.py
57d2a4b 
Performing black formatting process
@michplunkett
Copy link
Collaborator

michplunkett commented Jan 3, 2024 •
edited
Loading

Notes for the next PR:

  • Check off the boxes in the Testing and Linting section.
  • Show a screenshot of change if applicable.
  • Keep the text, descriptions, etc. underneath the headers.
  • Please write the PR title in the present imperative tense. Examples of that tense are: "Fix issue in the dispatcher where…", "Improve our handling of…", etc.

michplunkett
michplunkett approved these changes Jan 3, 2024
View reviewed changes
Copy link
Collaborator

@michplunkett michplunkett left a comment

Choose a reason for hiding this comment

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

Good eye! 👀

@michplunkett michplunkett merged commit 81e228a into lucyparsons:develop Jan 3, 2024
3 checks passed
@Spraynard
Copy link
Contributor Author

@michplunkett Thank you! I will take note for next PR.

@michplunkett michplunkett linked an issue Jan 3, 2024 that may be closed by this pull request
Leaving overtime field blank when adding a new officer causes an error #856
Closed
@michplunkett michplunkett mentioned this pull request Jan 3, 2024
Closed
sea-kelp pushed a commit to OrcaCollective/OpenOversight that referenced this pull request Feb 4, 2024
@Spraynard @sea-kelp
Add default Officer Overtime value (lucyparsons#1083)
bc06bfd 
## Fixes issue
lucyparsons#856 

## Description of Changes
Adds default of $0 in officer "Overtime Pay" field. Users don't have to
fill this in if they don't have any overtime pay information and use the
form faster!

## Testing and Linting
 - [x] This branch is up-to-date with the `develop` branch.
 - [x] `pytest` passes on my local development environment.
 - [x] `pre-commit` passes on my local development environment.
sea-kelp pushed a commit to OrcaCollective/OpenOversight that referenced this pull request Feb 4, 2024
@Spraynard @sea-kelp
Add default Officer Overtime value (lucyparsons#1083)
068a057 
## Fixes issue
lucyparsons#856 

## Description of Changes
Adds default of $0 in officer "Overtime Pay" field. Users don't have to
fill this in if they don't have any overtime pay information and use the
form faster!

## Testing and Linting
 - [x] This branch is up-to-date with the `develop` branch.
 - [x] `pytest` passes on my local development environment.
 - [x] `pre-commit` passes on my local development environment.
AetherUnbound pushed a commit to OrcaCollective/OpenOversight that referenced this pull request Feb 6, 2024
@Spraynard @AetherUnbound
Add default Officer Overtime value (lucyparsons#1083)
6cc6fb1 
## Fixes issue
lucyparsons#856 

## Description of Changes
Adds default of $0 in officer "Overtime Pay" field. Users don't have to
fill this in if they don't have any overtime pay information and use the
form faster!

## Testing and Linting
 - [x] This branch is up-to-date with the `develop` branch.
 - [x] `pytest` passes on my local development environment.
 - [x] `pre-commit` passes on my local development environment.
AetherUnbound pushed a commit to OrcaCollective/OpenOversight that referenced this pull request Feb 6, 2024
@sea-kelp @abandoned-prototype
@brrusselburg @michplunkett @Spraynard
Upstream batch 5 (#408)
6cd9857 
* Make url_for work with all endpoints  (lucyparsons#1070)

Some of the `ModelView` based endpoints were missing a distinct name
that could be used for `url_for`, and instead string concatenation was
used (mostly in templates). I also moved some logic out of templates
(e.g. calculation of total pay), added helper methods and made some
other changed to reduce the code needed in the templates and improve
readability a little bit.

I also added an anonymous user class that is useful to call things like
`.is_admin_or_coordinator(department)` on any `current_user` object,
without first making sure the user is not anonymous.

 - [x] This branch is up-to-date with the `develop` branch.
 - [x] `pytest` passes on my local development environment.
 - [x] `pre-commit` passes on my local development environment.

* Replace inline styles with external css (lucyparsons#1073)

<!-- New Contributor? Welcome!

We recommend you check your privacy settings, so the name and email
associated with
the commits are what you want them to be. See the contribution guide at

https://github.com/lucyparsons/OpenOversight/blob/develop/CONTRIB.md#recommended-privacy-settings
for more infos.

Also make sure you have read and abide by the code of conduct:

https://github.com/lucyparsons/OpenOversight/blob/develop/CODE_OF_CONDUCT.md

If this pull request is not ready for review yet, please submit it as a
draft.
-->
lucyparsons#969

Removes the H021 tag and does the relevant clean-up. In this case,
inline styles are refactored into external CSS via pre-existing
stylesheets.

Unsure of the CSS class names, very open to changes. One in particular I
really disliked, but left a note-to-self. Historically more of a
back-end dev, so apologies if I missed something obvious with these
changes!

 - [x] This branch is up-to-date with the `develop` branch.
 - [x] `pytest` passes on my local development environment.
 - [x] `pre-commit` passes on my local development environment.

(`pre-commit` technically fails on some .py files and migrations, but
none of the new changes it seems)

* Add missing <img> alt tags (lucyparsons#1074)

## Fixes issue
lucyparsons#970

## Description of Changes
Removes H013 from pre-commit ignore list and adds alt tag + text to
<img>s where needed. Adds some tips and resources in the CONTRIB.md for
folks who encounter this in the future.

## Tests and linting
 - [x] This branch is up-to-date with the `develop` branch.
 - [ ] `pytest` passes on my local development environment.
 - [x] `pre-commit` passes on my local development environment.

* Update font-awesome icons (lucyparsons#1076)

* Fix `Departments` pagination automatic filter application (lucyparsons#1078)

## Fixes issue
Fixes lucyparsons#1077 

## Description of Changes
Changes check if there are "filters" being applied to the list given in
the `departments` view. If there are no filters applied then we generate
a "next" link that does not automatically apply filters.

## Tests and linting
 - [x] This branch is up-to-date with the `develop` branch.
 - [x] `pytest` passes on my local development environment.
 - [x] `pre-commit` passes on my local development environment.

---------

Co-authored-by: sea-kelp <66500457+sea-kelp@users.noreply.github.com>

* Add default Officer Overtime value (lucyparsons#1083)

## Fixes issue
lucyparsons#856 

## Description of Changes
Adds default of $0 in officer "Overtime Pay" field. Users don't have to
fill this in if they don't have any overtime pay information and use the
form faster!

## Testing and Linting
 - [x] This branch is up-to-date with the `develop` branch.
 - [x] `pytest` passes on my local development environment.
 - [x] `pre-commit` passes on my local development environment.

---------

Co-authored-by: abandoned-prototype <41744410+abandoned-prototype@users.noreply.github.com>
Co-authored-by: benj <25828824+brrusselburg@users.noreply.github.com>
Co-authored-by: Michael Plunkett <5885605+michplunkett@users.noreply.github.com>
Co-authored-by: Spraynard <priv4te3y3@protonmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michplunkett michplunkett michplunkett approved these changes

@sea-kelp sea-kelp Awaiting requested review from sea-kelp

Assignees

@Spraynard Spraynard

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Leaving overtime field blank when adding a new officer causes an error
2 participants
@Spraynard @michplunkett