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

Fix/diff and other minor issues. #711

Merged
merged 21 commits into from
Oct 22, 2024
Merged

Fix/diff and other minor issues. #711

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
8093d5e
fix: update the diff template
EdoStorm96 Sep 26, 2024
cd09962
fix: make sure StudyDesign also deletes study types
EdoStorm96 Sep 26, 2024
06a6da9
fix: small bug on task_create
EdoStorm96 Sep 26, 2024
f9b095b
Merge branch 'major/4' into fix/diff
EdoStorm96 Sep 30, 2024
82863a6
feat: dumb css implementation on compare_documents.html
EdoStorm96 Sep 30, 2024
690ae5a
fix: simplify diff css and put in own diff.css file
EdoStorm96 Oct 1, 2024
da35b00
fix: use Session.repeats too for Session.net_duration()
EdoStorm96 Oct 1, 2024
7d45799
fix: reinsert diff-ignore
EdoStorm96 Oct 1, 2024
0eed19e
style: back to black
EdoStorm96 Oct 1, 2024
13f4a88
fix: change default view for compare_documents to split
EdoStorm96 Oct 7, 2024
5bc4b70
fix: make compare_documents extend fetc_base
EdoStorm96 Oct 7, 2024
ab1ce42
fix: improve styling on compare_documents.html
EdoStorm96 Oct 8, 2024
87c1c26
style: djlint
EdoStorm96 Oct 8, 2024
aef04eb
fix: undo self.repeats in Session.net_duration()
EdoStorm96 Oct 10, 2024
54118f9
Merge branch 'major/4' into fix/diff
EdoStorm96 Oct 10, 2024
0d9376d
fix: typo
EdoStorm96 Oct 10, 2024
565bff2
fix: replace th with td on row.verbose_name in diff
EdoStorm96 Oct 10, 2024
aa21af3
fix: implement get property methods for study_types, to not have to d…
EdoStorm96 Oct 10, 2024
1a1224a
style: style
EdoStorm96 Oct 10, 2024
8167d23
fix: correct title variable proposal_confirmation.html
EdoStorm96 Oct 10, 2024
c320001
Merge branch 'major/4' into fix/diff
EdoStorm96 Oct 22, 2024
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
2 changes: 1 addition & 1 deletion tasks/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def net_duration(self):
if duration := self.task_set.annotate(
total_duration=models.F("duration") * models.F("repeats")
).aggregate(models.Sum("total_duration"))["total_duration__sum"]:
return duration
return duration * self.repeats
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok, now that I'm reading the help text again, I am actually thinking, the old version, which did not take session repeats into account is more accurate to the goal of this question. What do you think?

Copy link
Contributor

Choose a reason for hiding this comment

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

I agree, net duration should not take these repeats into account.


return 0

Expand Down