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

Resolve "Implement Absence model based on FreeBusy" #70

Merged
hansegucker merged 22 commits from 1-implement-absence-model-based-on-freebusy into master 2024-04-03 20:46:37 +02:00
Conversation 22 Commits 22 Files changed 21 +757 -99
magicfelix commented 2023-08-17 21:50:22 +02:00
Member
Copy link

Closes #1, #5

Closes #1, #5
magicfelix commented 2023-08-17 22:07:30 +02:00
Author
Member
Copy link

added 2 commits

  • 52aacc90 - Update Core dependency and bump version
  • e549a80f - Make Absence subclass of FreeBusy

Compare with previous version

added 2 commits <ul><li>52aacc90 - Update Core dependency and bump version</li><li>e549a80f - Make Absence subclass of FreeBusy</li></ul> [Compare with previous version](/AlekSIS/onboarding/aleksis-app-kolego/-/merge_requests/7/diffs?diff_id=33855&start_sha=e7f43a07b843ec971a0cdfeb0649dc093dc4c8af)
magicfelix commented 2023-08-18 00:47:24 +02:00
Author
Member
Copy link

added 2 commits

  • 0b85d916 - Add graphql schema for absence and reason
  • 9eda5940 - Add list frontends for absence and reason

Compare with previous version

added 2 commits <ul><li>0b85d916 - Add graphql schema for absence and reason</li><li>9eda5940 - Add list frontends for absence and reason</li></ul> [Compare with previous version](/AlekSIS/onboarding/aleksis-app-kolego/-/merge_requests/7/diffs?diff_id=33858&start_sha=e549a80f01d46f5dc00b9d8a31d3fe69e62509df)
magicfelix commented 2023-08-18 09:32:10 +02:00
Author
Member
Copy link

added 1 commit

  • 19a3d69f - Use correct manager

Compare with previous version

added 1 commit <ul><li>19a3d69f - Use correct manager</li></ul> [Compare with previous version](/AlekSIS/onboarding/aleksis-app-kolego/-/merge_requests/7/diffs?diff_id=33865&start_sha=9eda5940447374bcb1f83cdebd75cf6c03138134)
magicfelix commented 2023-09-12 20:23:09 +02:00
Author
Member
Copy link

added 7 commits

  • 64a2ddee - Restructure graphql files
  • 544630ca - Fix foreignkey selects
  • aa976088 - Use datetime instead of only date for start and end
  • 6efeca64 - Fix absence reason reference
  • 181a40c2 - Query IDs for CRUD list editing mode
  • 3ff662d2 - Handle timezones
  • c071de7a - Add permission checking

Compare with previous version

added 7 commits <ul><li>64a2ddee - Restructure graphql files</li><li>544630ca - Fix foreignkey selects</li><li>aa976088 - Use datetime instead of only date for start and end</li><li>6efeca64 - Fix absence reason reference</li><li>181a40c2 - Query IDs for CRUD list editing mode</li><li>3ff662d2 - Handle timezones</li><li>c071de7a - Add permission checking</li></ul> [Compare with previous version](/AlekSIS/onboarding/aleksis-app-kolego/-/merge_requests/7/diffs?diff_id=34260&start_sha=19a3d69f766802fec14c14dfb2ba46bb4e5a8239)
magicfelix commented 2023-09-29 21:36:49 +02:00
Author
Member
Copy link

added 1 commit

  • 190956cc - Restructure gql files and fix CRUD lists

Compare with previous version

added 1 commit <ul><li>190956cc - Restructure gql files and fix CRUD lists</li></ul> [Compare with previous version](/AlekSIS/onboarding/aleksis-app-kolego/-/merge_requests/7/diffs?diff_id=34644&start_sha=c071de7a355bd01db7d4da429cd8531af1b06f07)
magicfelix commented 2023-09-30 15:45:51 +02:00
Author
Member
Copy link

added 2 commits

  • e6876d65 - Remove unnecessary stuff from gql query
  • dbaabece - Fix absence batch editing

Compare with previous version

added 2 commits <ul><li>e6876d65 - Remove unnecessary stuff from gql query</li><li>dbaabece - Fix absence batch editing</li></ul> [Compare with previous version](/AlekSIS/onboarding/aleksis-app-kolego/-/merge_requests/7/diffs?diff_id=34656&start_sha=190956cc6390b5fb03d5fb6903762176c51c287c)
hansegucker commented 2023-12-29 18:07:56 +01:00
Owner
Copy link

Make mandatory

Make mandatory
hansegucker commented 2023-12-29 18:09:14 +01:00
Owner
Copy link

Add default field to mark an AbsenceReason as default

Add default field to mark an AbsenceReason as default
hansegucker commented 2023-12-30 01:12:43 +01:00
Owner
Copy link

added 20 commits

  • dbaabece...375f1205 - 17 commits from branch master
  • 3bcbd794 - Merge branch 'master' into 1-implement-absence-model-based-on-freebusy
  • c887e5bf - Fix reformat and lint
  • b311663b - Drop sites framework

Compare with previous version

added 20 commits <ul><li>dbaabece...375f1205 - 17 commits from branch <code>master</code></li><li>3bcbd794 - Merge branch &#39;master&#39; into 1-implement-absence-model-based-on-freebusy</li><li>c887e5bf - Fix reformat and lint</li><li>b311663b - Drop sites framework</li></ul> [Compare with previous version](/AlekSIS/onboarding/aleksis-app-kolego/-/merge_requests/7/diffs?diff_id=37441&start_sha=dbaabece63257f21ba665bda78a5ab01bbe742b1)
yuha commented 2024-01-02 16:05:18 +01:00
Member
Copy link

added 1 commit

  • 1ed53c6f - Fix creating/editing of Absences

Compare with previous version

added 1 commit <ul><li>1ed53c6f - Fix creating/editing of Absences</li></ul> [Compare with previous version](/AlekSIS/onboarding/aleksis-app-kolego/-/merge_requests/7/diffs?diff_id=37470&start_sha=b311663bd1e5760f4d81cb0c9a5caa3f39b19499)
hansegucker commented 2024-01-11 21:47:05 +01:00
Owner
Copy link

changed this line in version 9 of the diff

changed this line in [version 9 of the diff](/AlekSIS/onboarding/aleksis-app-kolego/-/merge_requests/7/diffs?diff_id=38002&start_sha=1ed53c6fe86aab7d2f177536c86ab4534735da0e#ec86d25712acd0ef68a451cea16eb434d7ff5d3f_34_71)
hansegucker commented 2024-01-11 21:47:05 +01:00
Owner
Copy link

added 2 commits

  • 26f802b7 - Add more attributes to models
  • b161a7d4 - Merge branch '1-implement-absence-model-based-on-freebusy' of...

Compare with previous version

added 2 commits <ul><li>26f802b7 - Add more attributes to models</li><li>b161a7d4 - Merge branch &#39;1-implement-absence-model-based-on-freebusy&#39; of...</li></ul> [Compare with previous version](/AlekSIS/onboarding/aleksis-app-kolego/-/merge_requests/7/diffs?diff_id=38002&start_sha=1ed53c6fe86aab7d2f177536c86ab4534735da0e)
magicfelix commented 2024-02-01 20:43:41 +01:00
Author
Member
Copy link

added 22 commits

  • b161a7d4...0b4e1f83 - 2 commits from branch master
  • 0b4e1f83...52430089 - 10 earlier commits
  • b0855414 - Handle timezones
  • 61446c9c - Add permission checking
  • e9beeda1 - Restructure gql files and fix CRUD lists
  • 7148c461 - Remove unnecessary stuff from gql query
  • 2c74ad67 - Fix absence batch editing
  • 8214e3d8 - Fix reformat and lint
  • d12b6b13 - Drop sites framework
  • 46bcbee0 - Add more attributes to models
  • ed301eeb - Fix creating/editing of Absences
  • 0d1c7214 - Adapt to refactored CRUD lists

Compare with previous version

added 22 commits <ul><li>b161a7d4...0b4e1f83 - 2 commits from branch <code>master</code></li><li>0b4e1f83...52430089 - 10 earlier commits</li><li>b0855414 - Handle timezones</li><li>61446c9c - Add permission checking</li><li>e9beeda1 - Restructure gql files and fix CRUD lists</li><li>7148c461 - Remove unnecessary stuff from gql query</li><li>2c74ad67 - Fix absence batch editing</li><li>8214e3d8 - Fix reformat and lint</li><li>d12b6b13 - Drop sites framework</li><li>46bcbee0 - Add more attributes to models</li><li>ed301eeb - Fix creating/editing of Absences</li><li>0d1c7214 - Adapt to refactored CRUD lists</li></ul> [Compare with previous version](/AlekSIS/onboarding/aleksis-app-kolego/-/merge_requests/7/diffs?diff_id=38729&start_sha=b161a7d4c9c2503044dc4d91b4f5fabd9af65ce7)
magicfelix commented 2024-02-01 21:07:02 +01:00
Author
Member
Copy link

changed the description

changed the description
hansegucker commented 2024-02-15 16:58:48 +01:00
Owner
Copy link

@magicfelix You're sure that this works?

@magicfelix You're sure that this works?
hansegucker commented 2024-02-15 17:49:57 +01:00
Owner
Copy link

added 1 commit

  • a92d23de - Fix menu (icons and permissions)

Compare with previous version

added 1 commit <ul><li>a92d23de - Fix menu (icons and permissions)</li></ul> [Compare with previous version](/AlekSIS/onboarding/AlekSIS-App-Kolego/-/merge_requests/7/diffs?diff_id=39201&start_sha=0d1c72140f68bb0371d8adb8b4a4550bdaa2ff6b)
magicfelix commented 2024-02-15 18:30:46 +01:00
Author
Member
Copy link

Interesting, but yes, I just tested it again to be sure, and it works.

Interesting, but yes, I just tested it again to be sure, and it works.
hansegucker commented 2024-02-24 12:25:34 +01:00
Owner
Copy link

resolved all threads

resolved all threads
hansegucker commented 2024-02-24 12:25:37 +01:00
Owner
Copy link

assigned to @hansegucker

assigned to @hansegucker
hansegucker commented 2024-03-10 17:57:16 +01:00
Owner
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>961ea376 - Add some rules</li></ul> [Compare with previous version](/AlekSIS/onboarding/AlekSIS-App-Kolego/-/merge_requests/7/diffs?diff_id=40451&start_sha=a92d23def9748b8100f793424f09311afa4f4ca0)
hansegucker commented 2024-04-03 20:46:30 +02:00
Owner
Copy link

marked this merge request as ready

marked this merge request as **ready**
hansegucker commented 2024-04-03 20:46:37 +02:00
Owner
Copy link

mentioned in commit c881def8b6

mentioned in commit c881def8b6cc748bb30e1334b9328d6176b0542d
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-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-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
hansegucker
3 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-Kolego!70
No description provided.