aleksis/AlekSIS-App-Alsijil
Watch
10
0
Fork
You've already forked AlekSIS-App-Alsijil
 0
Code Issues 48 Pull requests 7 Projects Releases 3 Packages 1 Activity Actions

Resolve "Add option to configure extra marks for personal notes" #458

Merged
hansegucker merged 12 commits from 85-add-option-to-configure-extra-marks-for-personal-notes into master 2020-07-31 13:22:35 +02:00
Conversation 27 Commits 12 Files changed 18 +354 -189
hansegucker commented 2020-07-12 14:37:48 +02:00
Owner
Copy link

Closes #85

Closes #85
hansegucker commented 2020-07-12 14:37:50 +02:00
Author
Owner
Copy link

changed milestone to %2

changed milestone to %2
hansegucker commented 2020-07-12 14:55:51 +02:00
Author
Owner
Copy link

added 2 commits

Compare with previous version

added 2 commits <ul><li>f1b6dd99 - Add extra mark model</li><li>99cae0aa - Add views for managing extra marks</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/68/diffs?diff_id=2817&start_sha=de461c45e5752f47b409dc9570da633bb280e22a)
hansegucker commented 2020-07-12 15:31:07 +02:00
Author
Owner
Copy link

If !454 is merged, fix migration and abbreviations etc.

If !454 is merged, fix migration and abbreviations etc.
hansegucker commented 2020-07-14 21:06:23 +02:00
Author
Owner
Copy link

Set extra marks

image

In lesson overview

image

In week view

image

In printout

Person list page

image

Person page

image

Week page

image

Managing

image

### Set extra marks ![image](/uploads/5805981b7879cd21854bb2869e218eff/image.png) ### In lesson overview ![image](/uploads/7631c88fff1d169e82e8c17633dfa908/image.png) ### In week view ![image](/uploads/2ec45e51ba8f42b3069a5ecbb7b3491b/image.png) ### In printout #### Person list page ![image](/uploads/f502ec48fe9c7c98fbc7fd96ab64c09a/image.png) #### Person page ![image](/uploads/3963791bddcfa96a8cd8b7ba7bce07d8/image.png) #### Week page ![image](/uploads/d00c20f059ad6926a0b19e44f5ae81cd/image.png) ### Managing ![image](/uploads/bac3283e8b1018ce2ea11af04d22d5df/image.png)
hansegucker commented 2020-07-14 21:17:51 +02:00
Author
Owner
Copy link

added 5 commits

  • 0e17112c - Show only name in __str__ method of extra mark model
  • c8b20d10 - [Lesson view] Add form field for extra marks in personal note table
  • 5a66f5fb - [Week view] Show statistics on extra marks
  • 2197e680 - [Full register printout] Show statistics on extra marks and personal notes with extra marks
  • 49718f69 - [Lesson overview] Show extra marks of previous lesson

Compare with previous version

added 5 commits <ul><li>0e17112c - Show only name in __str__ method of extra mark model</li><li>c8b20d10 - [Lesson view] Add form field for extra marks in personal note table</li><li>5a66f5fb - [Week view] Show statistics on extra marks</li><li>2197e680 - [Full register printout] Show statistics on extra marks and personal notes with extra marks</li><li>49718f69 - [Lesson overview] Show extra marks of previous lesson</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/68/diffs?diff_id=2825&start_sha=99cae0aa62e3eb58deb170bc04ec6c7b0189bfb6)
hansegucker commented 2020-07-14 21:35:14 +02:00
Author
Owner
Copy link

added 20 commits

  • 49718f69...4a5b813e - 17 commits from branch master
  • 4079c21f - Merge branch 'master' into 85-add-option-to-configure-extra-marks-for-personal-notes
  • 15bee250 - Fix migration history
  • e24effa5 - [Full register print out] Show abbreviations of available extra marks

Compare with previous version

added 20 commits <ul><li>49718f69...4a5b813e - 17 commits from branch <code>master</code></li><li>4079c21f - Merge branch &#39;master&#39; into 85-add-option-to-configure-extra-marks-for-personal-notes</li><li>15bee250 - Fix migration history</li><li>e24effa5 - [Full register print out] Show abbreviations of available extra marks</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/68/diffs?diff_id=2826&start_sha=49718f69811f5a4570fcc6b0d2c9bb663484076f)
hansegucker commented 2020-07-14 21:36:32 +02:00
Author
Owner
Copy link

Uff, that was a lot of stuff to merge (merge conflicts in ca. 10 files). ✅

Uff, that was a lot of stuff to merge (merge conflicts in ca. 10 files). :white_check_mark:
hansegucker commented 2020-07-14 21:37:00 +02:00
Author
Owner
Copy link

unmarked as a Work In Progress

unmarked as a **Work In Progress**
hansegucker commented 2020-07-14 21:37:00 +02:00
Author
Owner
Copy link

assigned to @nik

assigned to @nik
hansegucker commented 2020-07-14 21:37:35 +02:00
Author
Owner
Copy link

And now you're allowed to review, @nik ;-)

And now you're allowed to review, @nik ;-)
nik commented 2020-07-14 21:45:51 +02:00
Owner
Copy link

This overlaps with personal note filters, so this cannot be merged. Personal note filters provide the same funtionality. We need to properly discuss this feature to not duplicate it.

This overlaps with personal note filters, so this cannot be merged. Personal note filters provide the same funtionality. We need to properly discuss this feature to not duplicate it.
hansegucker commented 2020-07-14 21:47:46 +02:00
Author
Owner
Copy link

Yes, especially as personal note filters are not usable for common teachers without generating mistakes in counting (through spelling mistakes).

Yes, especially as personal note filters are not usable for common teachers without generating mistakes in counting (through spelling mistakes).
nik commented 2020-07-14 21:57:34 +02:00
Owner
Copy link

So, do you intend to replace the feature?

So, do you intend to replace the feature?
nik commented 2020-07-17 12:41:53 +02:00
Owner
Copy link

Ping?

Ping?
hansegucker commented 2020-07-17 12:42:48 +02:00
Author
Owner
Copy link

From my side of view the extra marks fit more to usual use cases than the personal notes filters.

From my side of view the extra marks fit more to usual use cases than the personal notes filters.
nik commented 2020-07-17 13:04:33 +02:00
Owner
Copy link

Can they fully replace the personal note filters feature? If yes, please remove personal note filters.

Can they fully replace the personal note filters feature? If yes, please remove personal note filters.
hansegucker commented 2020-07-18 17:21:41 +02:00
Author
Owner
Copy link

mentioned in merge request !439

mentioned in merge request !439
hansegucker commented 2020-07-18 17:24:59 +02:00
Author
Owner
Copy link

added 1 commit

  • a66dc7a9 - Remove legacy personal notes filters in favor of extra marks

Compare with previous version

added 1 commit <ul><li>a66dc7a9 - Remove legacy personal notes filters in favor of extra marks</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/68/diffs?diff_id=2858&start_sha=e24effa5f160396bb7254b95ac0b9f5b32dadb26)
hansegucker commented 2020-07-18 17:25:38 +02:00
Author
Owner
Copy link

Yes, I think so. Done.

Yes, I think so. Done.
hansegucker commented 2020-07-18 17:25:38 +02:00
Author
Owner
Copy link

resolved all threads

resolved all threads
hansegucker commented 2020-07-22 19:50:05 +02:00
Author
Owner
Copy link

Anything left preventing this from merging?

Anything left preventing this from merging?
nik commented 2020-07-30 23:48:57 +02:00
Owner
Copy link

Please resolve merge conflicts.

Please resolve merge conflicts.
hansegucker commented 2020-07-31 12:56:12 +02:00
Author
Owner
Copy link

added 19 commits

  • a66dc7a9...bf05b372 - 18 commits from branch master
  • 0bc8ec73 - Merge branch 'master' into 85-add-option-to-configure-extra-marks-for-personal-notes

Compare with previous version

added 19 commits <ul><li>a66dc7a9...bf05b372 - 18 commits from branch <code>master</code></li><li>0bc8ec73 - Merge branch &#39;master&#39; into 85-add-option-to-configure-extra-marks-for-personal-notes</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/68/diffs?diff_id=2923&start_sha=a66dc7a9a445abfc5c5aab8132e9802dcb92da0d)
hansegucker commented 2020-07-31 12:56:29 +02:00
Author
Owner
Copy link

Done.

Done.
hansegucker commented 2020-07-31 12:56:31 +02:00
Author
Owner
Copy link

resolved all threads

resolved all threads
nik commented 2020-07-31 13:22:35 +02:00
Owner
Copy link

mentioned in commit 8fa024daa2

mentioned in commit 8fa024daa219c6187719fc7cb0eb7272cdd0eba7
nik commented 2020-07-31 13:22:35 +02:00
Owner
Copy link

merged

merged
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
nik
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-Alsijil!458
No description provided.