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

Time Tracking Task #3

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

Time Tracking Task #3

wants to merge 12 commits into from

Conversation

awartani
Copy link
Member

@awartani awartani commented Aug 9, 2020

Signed-off-by: Mo'ath Zaghdad [email protected]

Signed-off-by: Mo'ath Zaghdad <[email protected]>
Dockerfile Show resolved Hide resolved
Dockerfile Outdated Show resolved Hide resolved
version: '3.7'

services:
app:
Copy link
Member Author

Choose a reason for hiding this comment

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

app is very generic, it's better to specific about which app is this

Choose a reason for hiding this comment

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

What naming conditions would you suggest?
I'm naming it app after its role, so if I used a Postgres image its name would be db.

Choose a reason for hiding this comment

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

I renamed it to time_tracking

I usually name the container as I explained earlier because as you know, docker-compose abbreviate the names of the containers with the folder name, so on my computer, the container name is time-tracking_app.

docker-compose.yml Outdated Show resolved Hide resolved
requirements.txt Outdated Show resolved Hide resolved
app/time_tracking/work_time/models.py Outdated Show resolved Hide resolved
app/time_tracking/event/models.py Outdated Show resolved Hide resolved
app/time_tracking/event/models.py Outdated Show resolved Hide resolved
app/time_tracking/vacation/models.py Outdated Show resolved Hide resolved
app/time_tracking/vacation/models.py Outdated Show resolved Hide resolved
app/time_tracking/urls.py Outdated Show resolved Hide resolved
app/time_tracking/vacation/views.py Outdated Show resolved Hide resolved
app/time_tracking/vacation/views.py Outdated Show resolved Hide resolved
app/time_tracking/work_time/views.py Outdated Show resolved Hide resolved
app/time_tracking/work_statistic/views.py Outdated Show resolved Hide resolved
app/time_tracking/work_statistic/views.py Outdated Show resolved Hide resolved
app/time_tracking/work_statistic/views.py Outdated Show resolved Hide resolved
app/time_tracking/work_statistic/views.py Outdated Show resolved Hide resolved
app/time_tracking/work_statistic/views.py Outdated Show resolved Hide resolved
app/time_tracking/work_statistic/views.py Outdated Show resolved Hide resolved
@MotasemAghbar
Copy link
Member

@Moath-Zaghdad Cloud you please update the code per PR comments and push the changes on this development branch?

@Moath-Zaghdad
Copy link

@MotasemAghbar sure, I'll do that, I'm refactoring the wortk_time app, as sone as I'm done with it I'll push all my changes to this branch.

* Added flake8 and applied its code style updates

Signed-off-by: Mo'ath Zaghdad <[email protected]>

* fixed permissions issues and added validations to the dates (#2)

* Fixed the IsStaffMemberOrReadOnly class issues.
* Added validation to the start_date and end_date fields so that the end date can not occur before the start date.
* Added created_by to the Event model.

Signed-off-by: Mo'ath Zaghdad <[email protected]>

* Added Event related constrains and more validation on the vacation date (#4)

Signed-off-by: Mo'ath Zaghdad <[email protected]>

* refactored the work_time model and fix the issues with the statistecs (#5)

Signed-off-by: Mo'ath Zaghdad <[email protected]>

* fix typos

Signed-off-by: Mo'ath Zaghdad <[email protected]>

* Switched to Class-based views

Signed-off-by: Mo'ath Zaghdad <[email protected]>
* Docker related fixes
* Use the same port as internal and external for the container
* Container renamed to `time_tracking`
* Used -p flag with `mkdir` to prevent errors if file exists
* Replaced requirements.txt with Pipfile
* Added create_at and updated_at fields

Signed-off-by: Mo'ath Zaghdad <[email protected]>
Signed-off-by: Mo'ath Zaghdad <[email protected]>
Signed-off-by: Mo'ath Zaghdad <[email protected]>
@Moath-Zaghdad Moath-Zaghdad requested review from Moath-Zaghdad and removed request for Moath-Zaghdad September 12, 2020 11:16
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.

4 participants