Skip to content

Fix/return all time entries range time#122 #143

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

Merged
merged 8 commits into from
May 19, 2020
Merged

Fix/return all time entries range time#122 #143

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d94fde7
fix: role-based control #122
fabidick22 May 14, 2020
ea2cfe9
Merge branch 'master' into fix/return-all-time-metries-range-time#122
fabidick22 May 14, 2020
ceb6ced
fix: Update time-entries model #122
fabidick22 May 18, 2020
1e72830
feat(comments): Remove print #122
fabidick22 May 18, 2020
5394265
fix: Resolve conflicts #122
fabidick22 May 18, 2020
7521b14
fix: Remove unused variable (close #122)
fabidick22 May 18, 2020
a41aac4
feat(comments): Remove print #122
fabidick22 May 18, 2020
e877315
fix: Refactor code #122
fabidick22 May 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: Resolve conflicts #122
  • Loading branch information
@fabidick22
fabidick22 committed May 18, 2020
commit 53942651157b369d3f6f8940fea7aedba7c156ce
5 changes: 0 additions & 5 deletions time_tracker_api/time_entries/time_entries_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,11 +314,6 @@ def get_all(self, conditions: dict = None, **kwargs) -> list:
date_range = self.handle_date_filter_args(args=conditions)
return self.repository.find_all(event_ctx, conditions=conditions, date_range=date_range)

project_dao = projects_model.create_dao()
projects = project_dao.get_all()
add_project_name_to_time_entries(time_entries, projects)
return time_entries

def get(self, id):
event_ctx = self.create_event_context("read")
time_entry = self.repository.find(
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.