aleksis/AlekSIS-App-Chronos
Watch
10
0
Fork
You've already forked AlekSIS-App-Chronos
 0
Code Issues 49 Pull requests 4 Projects Releases 4 Packages 1 Activity Actions

Dashboard widget for SMART PLAN #340

Merged
hansegucker merged 8 commits from feature/smart-plan-dashboard-widget into master 2020-02-17 15:34:11 +01:00
Conversation 23 Commits 8 Files changed 10 +179 -51
hansegucker commented 2020-02-10 20:31:13 +01:00
Owner
Copy link

Can be merged when https://edugit.org/AlekSIS/official/AlekSIS/merge_requests/155 is merged.

Can be merged when https://edugit.org/AlekSIS/official/AlekSIS/merge_requests/155 is merged.
hansegucker commented 2020-02-10 20:31:14 +01:00
Author
Owner
Copy link

changed milestone to %"2.0a2"

changed milestone to %"2.0a2"
hansegucker commented 2020-02-11 17:01:47 +01:00
Author
Owner
Copy link

@nik, now you can review.

@nik, now you can review.
nik commented 2020-02-11 18:11:24 +01:00
Owner
Copy link

Please evaluate https://pypi.org/project/humanize/ instead

Please evaluate https://pypi.org/project/humanize/ instead
nik commented 2020-02-11 18:14:10 +01:00
Owner
Copy link

This should be in models.py for auto-discovery to work properly (without abusing side-effects of admin site registration, which might not happen in cases like applying single-app migrations, etc.).

This should be in `models.py` for auto-discovery to work properly (without abusing side-effects of admin site registration, which might not happen in cases like applying single-app migrations, etc.).
nik commented 2020-02-11 18:15:39 +01:00
Owner
Copy link

Doesn't this have a lot of common code with the regular view funtion? If yes, duplicate logic should probably be factored out (or argued against ;)).

Doesn't this have a lot of common code with the regular view funtion? If yes, duplicate logic should probably be factored out (or argued against ;)).
nik commented 2020-02-11 18:16:47 +01:00
Owner
Copy link

Oh, even https://docs.djangoproject.com/en/3.0/ref/contrib/humanize/ ;)

Oh, even https://docs.djangoproject.com/en/3.0/ref/contrib/humanize/ ;)
hansegucker commented 2020-02-11 18:50:28 +01:00
Author
Owner
Copy link

The issue with putting it into models.py is a circular import.

The issue with putting it into models.py is a circular import.
hansegucker commented 2020-02-11 18:52:54 +01:00
Author
Owner
Copy link

There is a lot of common code, that's true. But some part of this code can't be factored out. I will do some work on this.

There is a lot of common code, that's true. But some part of this code can't be factored out. I will do some work on this.
hansegucker commented 2020-02-11 18:55:18 +01:00
Author
Owner
Copy link

Ok, that's great.

Ok, that's great.
nik commented 2020-02-11 20:06:15 +01:00
Owner
Copy link

Which one?

Which one?
hansegucker commented 2020-02-11 20:07:57 +01:00
Author
Owner
Copy link

from aleksis.apps.chronos.util.prev_next import get_next_relevant_day

↓

from aleksis.apps.chronos.models import TimePeriod

`from aleksis.apps.chronos.util.prev_next import get_next_relevant_day` ↓ `from aleksis.apps.chronos.models import TimePeriod`
nik commented 2020-02-11 20:10:41 +01:00
Owner
Copy link

That's why I always wanted the code in prev_next as class methods on TimePeriod, or something similar ;).

That's why I always wanted the code in prev_next as class methods on TimePeriod, or something similar ;).
hansegucker commented 2020-02-11 20:44:04 +01:00
Author
Owner
Copy link

Yes, you are right. #65

Yes, you are right. #65
hansegucker commented 2020-02-12 20:56:32 +01:00
Author
Owner
Copy link

added 6 commits

  • 7e89c1d4...fbc203aa - 4 commits from branch master
  • 0e0eacb4 - Merge branch 'master' into feature/smart-plan-dashboard-widget
  • a7eb4dc1 - Fix path of get_next_relevant_day

Compare with previous version

added 6 commits <ul><li>7e89c1d4...fbc203aa - 4 commits from branch <code>master</code></li><li>0e0eacb4 - Merge branch &#39;master&#39; into feature/smart-plan-dashboard-widget</li><li>a7eb4dc1 - Fix path of get_next_relevant_day</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/merge_requests/36/diffs?diff_id=1340&start_sha=7e89c1d4a221df1ae999d899b0e4473df38e2ecb)
hansegucker commented 2020-02-12 21:08:02 +01:00
Author
Owner
Copy link

changed this line in version 3 of the diff

changed this line in [version 3 of the diff](/AlekSIS/official/AlekSIS-App-Chronos/merge_requests/36/diffs?diff_id=1341&start_sha=a7eb4dc193e6bc1bbce5d2516d7dbd05a0b4c3d8#1a4cb5cefae331bb26c07cfa4f7d111984be7066_36_34)
hansegucker commented 2020-02-12 21:08:04 +01:00
Author
Owner
Copy link

changed this line in version 3 of the diff

changed this line in [version 3 of the diff](/AlekSIS/official/AlekSIS-App-Chronos/merge_requests/36/diffs?diff_id=1341&start_sha=a7eb4dc193e6bc1bbce5d2516d7dbd05a0b4c3d8#fad72c9513e514267b1bd6995b4fd81994ed1fa7_15_0)
hansegucker commented 2020-02-12 21:08:04 +01:00
Author
Owner
Copy link

changed this line in version 3 of the diff

changed this line in [version 3 of the diff](/AlekSIS/official/AlekSIS-App-Chronos/merge_requests/36/diffs?diff_id=1341&start_sha=a7eb4dc193e6bc1bbce5d2516d7dbd05a0b4c3d8#fad72c9513e514267b1bd6995b4fd81994ed1fa7_18_0)
hansegucker commented 2020-02-12 21:08:05 +01:00
Author
Owner
Copy link

added 2 commits

  • 4a199dc9 - Move TimetableWidget to models.py
  • 9ecc6742 - Use django.contrib.humanize instead of own functions for dashboard widget

Compare with previous version

added 2 commits <ul><li>4a199dc9 - Move TimetableWidget to models.py</li><li>9ecc6742 - Use django.contrib.humanize instead of own functions for dashboard widget</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/merge_requests/36/diffs?diff_id=1341&start_sha=a7eb4dc193e6bc1bbce5d2516d7dbd05a0b4c3d8)
hansegucker commented 2020-02-13 17:32:45 +01:00
Author
Owner
Copy link

added 2 commits

  • 00fd4ba2 - Refactor out a lot of stuff used by TimetableWidget and my_timetable both to...
  • c5b23ddd - Add card action link "Go to smart plan" for dashboard widget

Compare with previous version

added 2 commits <ul><li>00fd4ba2 - Refactor out a lot of stuff used by TimetableWidget and my_timetable both to...</li><li>c5b23ddd - Add card action link &quot;Go to smart plan&quot; for dashboard widget</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/merge_requests/36/diffs?diff_id=1342&start_sha=9ecc67428a461c57d4cb5202d5d80677ab8740d4)
hansegucker commented 2020-02-13 17:34:59 +01:00
Author
Owner
Copy link

resolved all threads

resolved all threads
hansegucker commented 2020-02-16 11:55:13 +01:00
Author
Owner
Copy link

Any progress?

Any progress?
nik commented 2020-02-17 15:34:11 +01:00
Owner
Copy link

merged

merged
nik commented 2020-02-17 15:34:12 +01:00
Owner
Copy link

mentioned in commit fd78dcd1e4

mentioned in commit fd78dcd1e4ef8ca270ee77667136ce434e6cc778
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Security

   
TeX
Needs LaTeX template

  
auto-update
  
board
done

  
board
ready

  
board
todo

  
check
delete-eslint-rc-js

  
check
update-builddeps-package-json

  
check
update-eslint-rc-js

  
check
update-gitignore

  
check
update-merge-request-template

  
check
update-prettier-ignore

  
check
update-pyproject-toml

  
check
update-renovate-json

  
check
update-tox-ini

  
part
backend
 Backend (view code, models, logic, etc.)

  
part
ci

  
part
docs
 Issue or addition to the documentation

  
part
frontend
 Frontend (templates, etc.)

  
part
i18n
 Translation or internationalisation issue

  
part
non-technical
 Non-technical (policy, maintenance, etc.) issue or discussion

  
part
packaging
 Issue concerning the packaging of AlekSIS and components

  
prio
1
 Priority High

  
prio
2
 Priority Medium

  
prio
3
 Priority Low

  
release-mr-5.x
  
size
large

  
size
medium

  
size
small

  
source
customer
 Requested by a customer or affiliated user

  
source
customer::fsmw

  
source
customer::fss

  
source
customer::teckids

  
source
downstream
 Issue or merge request from other projects using AlekSIS or parts of it

  
type
breaking

  
type
bug
 Bug

  
type
feature
 New feature

  
type
refactoring

  
workflow
blocked
 Issue is blocked by another issue

  
workflow
confirmed
 The bug is reproducible and will be fixed

  
workflow
current-todo

  
workflow
discussing
 Needs to be discussed before implementation

  
workflow
new-app
 Requires new AlekSIS app, which has to be created

  
workflow
wontfix
 The bug is not reproducible or the feature was decided against

  
source::aleksolotl
No labels
Security
TeX
auto-update
board
done
board
ready
board
todo
check
delete-eslint-rc-js
check
update-builddeps-package-json
check
update-eslint-rc-js
check
update-gitignore
check
update-merge-request-template
check
update-prettier-ignore
check
update-pyproject-toml
check
update-renovate-json
check
update-tox-ini
part
backend
part
ci
part
docs
part
frontend
part
i18n
part
non-technical
part
packaging
prio
1
prio
2
prio
3
release-mr-5.x
size
large
size
medium
size
small
source
customer
source
customer::fsmw
source
customer::fss
source
customer::teckids
source
downstream
type
breaking
type
bug
type
feature
type
refactoring
workflow
blocked
workflow
confirmed
workflow
current-todo
workflow
discussing
workflow
new-app
workflow
wontfix
source::aleksolotl
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
aleksis/AlekSIS-App-Chronos!340
No description provided.