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

Python3 #12

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Python3 #12

wants to merge 12 commits into from

Conversation

patrickpritchett
Copy link

This PR updates Docker linux version to Alma 9, postgres to 11 and fixes some errors. Updates for logo and disable Job functionality also included.

NOTE Revert .gitmodules -> branch after Chucho python3 branch is merged to master.

Files Changed

.gitmodules

  • updated url
  • TEMP branch specification

docker/app/Dockerfile
docker/app/pip-requirements.txt
docker/postgres/run.sh
requirements.txt

  • docker and postgres updgrades

time_system/clocker/hashMethods.py

  • fixed error by adding encode and str() cmds

time_system/clocker/models.py

  • fixed error for ManyToManyField error by using .set() vs =
  • added default hourly_rate of 0.00 when not set

time_system/clocker/views/job.py

  • added default hourly_rate and miles of 0.00 when not set

time_system/clocker/views/timesheet.py

  • removed duplicate employee entry from return dict

time_system/clocker/templates/base.html
time_system/clocker/templates/mainPage.html
time_system/clocker/templates/manageShifts.html
time_system/clocker/views/mainPage.py
time_system/urls.py

  • added conditions for ENABLE_JOBS

time_system/clocker/views/shiftExport.py

  • added conditions for ENABLE_JOBS
  • added message when no results

time_system/clocker/views/clockEmployee.py

  • added condition to auto save summary to default(id=1) job

time_system/clocker/static/js/timeline.js

  • replaced hard coded visgence.com with relative url

time_system/clocker/static/images/logo.png
time_system/clocker/static/images/Visgence_incwhite.png

  • renamed image

time_system/clocker/management/commands/setup.py

  • updated to load default job when jobs disabled and running ./manage.py setup

time_system/settings.py

  • added DEFAULT_AUTO_FIELD to squash warnings
  • added ENABLE_JOBS flag

README.md

  • Added notes for new job functionality and branding

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.

2 participants