aleksis/AlekSIS-App-Alsijil
8
0
Fork 0
Code Issues 51 Pull requests 10 Projects Releases 3 Packages Activity Actions

Resolve "Filter selects on week overview and register absence" #462

Merged
yuha merged 5 commits from 79-filter-selects-on-week-overview-and-register-absence into 73-add-rules-and-permissions 2020-08-19 22:31:46 +02:00
Conversation 9 Commits 5 Files changed 2 +31 -12
yuha commented 2020-07-18 01:23:34 +02:00 (Migrated from edugit.org)
Copy link

Closes #79

Closes #79
yuha commented 2020-07-18 01:23:34 +02:00 (Migrated from edugit.org)
Copy link

changed milestone to %2

changed milestone to %2
yuha commented 2020-07-18 01:30:56 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • 0d6400b4 - Filter possible selection in absence form

Compare with previous version

added 1 commit <ul><li>0d6400b4 - Filter possible selection in absence form</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/72/diffs?diff_id=2854&start_sha=4a5b813ed95a86d2dbc00c7ed639ee52af5da56e)
yuha commented 2020-07-18 01:31:13 +02:00 (Migrated from edugit.org)
Copy link

unmarked as a Work In Progress

unmarked as a **Work In Progress**
hansegucker commented 2020-07-18 17:02:58 +02:00 (Migrated from edugit.org)
Copy link

Blocked by #73

Blocked by #73
yuha commented 2020-08-16 19:02:52 +02:00 (Migrated from edugit.org)
Copy link

added 143 commits

  • 0d6400b4...19ac25fc - 82 commits from branch master
  • 6e338635 - Add rules and permissions for some views
  • e65b4cb2 - Add some more rules&permissions
  • 45de9a0c - Merge branch 'master' into 73-add-rules-and-permissions
  • a85bcae6 - Merge branch 'master' into 73-add-rules-and-permissions
  • c0e47390 - Merge branch 'master' into 73-add-rules-and-permissions
  • 451cdb33 - Merge branch '73-add-rules-and-permissions' of...
  • 2a84050c - Fix order of has_perm and perm check in lesson template
  • 420f07a0 - Add rules&permissions in class register template
  • a95d775a - Replace ugettext with gettext
  • 2011793a - Add tooltips in alsijil_helpers.py
  • 53bfe409 - Fix typo
  • 287cac5e - Merge branch '73-add-rules-and-permissions' of...
  • 442e28eb - Merge branch 'master' into 73-add-rules-and-permissions
  • c8791096 - Fix order of queries in week view
  • 95f16ef8 - Merge branch 'master' into 73-add-rules-and-permissions
  • 6b0eedfd - Fix lint issues and reformat files
  • 93203b44 - Move annotate before union because annotating works only before union
  • fbbb6020 - Fix permission names and core/alsijil relation
  • f3cc545c - Convert pks of lesson periods to list to simplify query
  • b1978f7a - Fixed permission for absence register
  • 4cf0c8e6 - Merge branch 'master' into 73-add-rules-and-permissions
  • b3df531e - Merge branch '73-add-rules-and-permissions' of...
  • 52c06bb4 - Merge branch '73-add-rules-and-permissions' of...
  • 262cf49e - Merge branch '73-add-rules-and-permissions' of...
  • b7fa224e - Annotate week in get_lesson_by_period_pk
  • 26b63e39 - Fix usage of RelatedQuerySet in predicate
  • 07ca4f09 - Merge branch 'master' into 73-add-rules-and-permissions
  • 6e9a0f60 - Add menu validators using rules
  • d524ad07 - Rename personalnotefilter rules
  • 5eb56aae - Refactor predicates
  • 7365b60b - Fix is_person_group_owner predicate
  • 0292d973 - Reformat predicates
  • 9cff3804 - Merge branch 'master' into 73-add-rules-and-permissions
  • 62c3ea5d - Add rules&permissions for excuse types
  • 63c96016 - Also check whether a person is a teacher in a LessonSubstitution in is_lesson_teacher
  • 5143e011 - Merge branch 'master' into 73-add-rules-and-permissions
  • 7652c383 - Remove rests of personal note filters
  • 780fd921 - Reformat
  • f1a5702d - Fix permissions in lesson.html after merge
  • 4daa50e1 - Merge branch 'master' into 73-add-rules-and-permissions
  • 6da0a1a0 - Fix rules
  • 87e90a54 - Fix wrong used pk
  • 910e001c - Fix is_lesson_teacher: Wrong qs
  • e8144bc6 - Merge branch 'master' into 73-add-rules-and-permissions
  • 4ce2f988 - Revert "Fix rules"
  • 8f136405 - Add permissions for management of extra marks
  • 867088d7 - Fixed mixin sequency in class-based views
  • 9a6d823e - Fixed typo in extramark rule
  • 4964c534 - Allow filtering of personal notes displayed in overview of last lesson and...
  • 3daf91e8 - Change rule name
  • fe5d0416 - add menu validator for extra marks
  • bd4c962a - Change edit personal note rule
  • f2151ca2 - Remove usage of has_any_object and change to custom queries
  • fc2f0f6c - Merge branch 'master' into 73-add-rules-and-permissions
  • b422dae3 - Fix query
  • 25dc771a - Use correct permission in views
  • 39496545 - Do not all queries in has_any_object_absence, only necessary ones
  • 46259cb0 - Fix is_lesson_teacher predicate
  • 16b2fb03 - Merge branch '73-add-rules-and-permissions' into...
  • 5b18cc4e - Filter person dropdown list of absence registration form with custom queryset...
  • 017602dd - Add filtered dropdowns for week overview

Compare with previous version

added 143 commits <ul><li>0d6400b4...19ac25fc - 82 commits from branch <code>master</code></li><li>6e338635 - Add rules and permissions for some views</li><li>e65b4cb2 - Add some more rules&amp;permissions</li><li>45de9a0c - Merge branch &#39;master&#39; into 73-add-rules-and-permissions</li><li>a85bcae6 - Merge branch &#39;master&#39; into 73-add-rules-and-permissions</li><li>c0e47390 - Merge branch &#39;master&#39; into 73-add-rules-and-permissions</li><li>451cdb33 - Merge branch &#39;73-add-rules-and-permissions&#39; of...</li><li>2a84050c - Fix order of has_perm and perm check in lesson template</li><li>420f07a0 - Add rules&amp;permissions in class register template</li><li>a95d775a - Replace ugettext with gettext</li><li>2011793a - Add tooltips in alsijil_helpers.py</li><li>53bfe409 - Fix typo</li><li>287cac5e - Merge branch &#39;73-add-rules-and-permissions&#39; of...</li><li>442e28eb - Merge branch &#39;master&#39; into 73-add-rules-and-permissions</li><li>c8791096 - Fix order of queries in week view</li><li>95f16ef8 - Merge branch &#39;master&#39; into 73-add-rules-and-permissions</li><li>6b0eedfd - Fix lint issues and reformat files</li><li>93203b44 - Move annotate before union because annotating works only before union</li><li>fbbb6020 - Fix permission names and core/alsijil relation</li><li>f3cc545c - Convert pks of lesson periods to list to simplify query</li><li>b1978f7a - Fixed permission for absence register</li><li>4cf0c8e6 - Merge branch &#39;master&#39; into 73-add-rules-and-permissions</li><li>b3df531e - Merge branch &#39;73-add-rules-and-permissions&#39; of...</li><li>52c06bb4 - Merge branch &#39;73-add-rules-and-permissions&#39; of...</li><li>262cf49e - Merge branch &#39;73-add-rules-and-permissions&#39; of...</li><li>b7fa224e - Annotate week in get_lesson_by_period_pk</li><li>26b63e39 - Fix usage of RelatedQuerySet in predicate</li><li>07ca4f09 - Merge branch &#39;master&#39; into 73-add-rules-and-permissions</li><li>6e9a0f60 - Add menu validators using rules</li><li>d524ad07 - Rename personalnotefilter rules</li><li>5eb56aae - Refactor predicates</li><li>7365b60b - Fix is_person_group_owner predicate</li><li>0292d973 - Reformat predicates</li><li>9cff3804 - Merge branch &#39;master&#39; into 73-add-rules-and-permissions</li><li>62c3ea5d - Add rules&amp;permissions for excuse types</li><li>63c96016 - Also check whether a person is a teacher in a LessonSubstitution in is_lesson_teacher</li><li>5143e011 - Merge branch &#39;master&#39; into 73-add-rules-and-permissions</li><li>7652c383 - Remove rests of personal note filters</li><li>780fd921 - Reformat</li><li>f1a5702d - Fix permissions in lesson.html after merge</li><li>4daa50e1 - Merge branch &#39;master&#39; into 73-add-rules-and-permissions</li><li>6da0a1a0 - Fix rules</li><li>87e90a54 - Fix wrong used pk</li><li>910e001c - Fix is_lesson_teacher: Wrong qs</li><li>e8144bc6 - Merge branch &#39;master&#39; into 73-add-rules-and-permissions</li><li>4ce2f988 - Revert &quot;Fix rules&quot;</li><li>8f136405 - Add permissions for management of extra marks</li><li>867088d7 - Fixed mixin sequency in class-based views</li><li>9a6d823e - Fixed typo in extramark rule</li><li>4964c534 - Allow filtering of personal notes displayed in overview of last lesson and...</li><li>3daf91e8 - Change rule name</li><li>fe5d0416 - add menu validator for extra marks</li><li>bd4c962a - Change edit personal note rule</li><li>f2151ca2 - Remove usage of has_any_object and change to custom queries</li><li>fc2f0f6c - Merge branch &#39;master&#39; into 73-add-rules-and-permissions</li><li>b422dae3 - Fix query</li><li>25dc771a - Use correct permission in views</li><li>39496545 - Do not all queries in has_any_object_absence, only necessary ones</li><li>46259cb0 - Fix is_lesson_teacher predicate</li><li>16b2fb03 - Merge branch &#39;73-add-rules-and-permissions&#39; into...</li><li>5b18cc4e - Filter person dropdown list of absence registration form with custom queryset...</li><li>017602dd - Add filtered dropdowns for week overview</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/72/diffs?diff_id=3137&start_sha=0d6400b43ffd15f9a73b066e9071586f729c2e4f)
hansegucker (Migrated from edugit.org) changed target branch from master to 73-add-rules-and-permissions 2020-08-16 19:29:25 +02:00
yuha commented 2020-08-16 23:54:01 +02:00 (Migrated from edugit.org)
Copy link

added 143 commits

  • 0d6400b4...46259cb0 - 140 commits from branch 73-add-rules-and-permissions
  • 16b2fb03 - Merge branch '73-add-rules-and-permissions' into...
  • 5b18cc4e - Filter person dropdown list of absence registration form with custom queryset...
  • 017602dd - Add filtered dropdowns for week overview

Compare with previous version

added 143 commits <ul><li>0d6400b4...46259cb0 - 140 commits from branch <code>73-add-rules-and-permissions</code></li><li>16b2fb03 - Merge branch &#39;73-add-rules-and-permissions&#39; into...</li><li>5b18cc4e - Filter person dropdown list of absence registration form with custom queryset...</li><li>017602dd - Add filtered dropdowns for week overview</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/72/diffs?diff_id=3141&start_sha=0d6400b43ffd15f9a73b066e9071586f729c2e4f)
yuha commented 2020-08-19 22:28:44 +02:00 (Migrated from edugit.org)
Copy link

added 6 commits

  • 017602dd...cbd4e140 - 5 commits from branch 73-add-rules-and-permissions
  • f3864ef9 - Merge branch '73-add-rules-and-permissions' into...

Compare with previous version

added 6 commits <ul><li>017602dd...cbd4e140 - 5 commits from branch <code>73-add-rules-and-permissions</code></li><li>f3864ef9 - Merge branch &#39;73-add-rules-and-permissions&#39; into...</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/72/diffs?diff_id=3160&start_sha=017602dda429b70af3cefdd9c0911412bd73a597)
yuha commented 2020-08-19 22:31:46 +02:00 (Migrated from edugit.org)
Copy link

merged

merged
yuha commented 2020-08-19 22:31:46 +02:00 (Migrated from edugit.org)
Copy link

mentioned in commit 0c1b499e90

mentioned in commit 0c1b499e90a2529412bfabcc48d450171a2657d2
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

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
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
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-Alsijil!462
No description provided.