Commits · b36cb333149e67b4490c98bd6e5286273302385a · Felix Blanke / AKPlanning

Feb 06, 2025
- Merge branch 'feature/avoid-duration-setting-at-import' into 'main' · b36cb333
  Lorenzo Conti authored 1 month ago
  
  Avoid setting the slot duration at import See merge request !8
  b36cb333
- Avoid setting the slot duration at import · e030e675
  Felix Blanke authored 1 month ago and Lorenzo Conti committed 1 month ago
  
  e030e675
- Merge branch 'feature/multiple-ak-occurrence' into 'main' · 63d6c5ee
  Lorenzo Conti authored 1 month ago
  
  AKs with multiple slots in JSON export See merge request !10
  63d6c5ee
- Merge branch 'fix/fixed-ak-slots' into 'main' · e7862fee
  Lorenzo Conti authored 1 month ago
  
  Fix: export of fixed ak slots See merge request !12
  e7862fee
Jan 26, 2025
- Add generated constraints to list · 26f432ad
  Felix Blanke authored 1 month ago
  
  26f432ad
- Iterate over AKs instead of AKSlots · 205436f8
  Felix Blanke authored 1 month ago
  
  205436f8
- Only add constr if event is not covered · e3bdd347
  Felix Blanke authored 1 month ago
  
  e3bdd347
- Rename constraint for fixed rooms · cf2637d2
  Felix Blanke authored 1 month ago
  
  cf2637d2
- Refactor · 57c40a50
  Felix Blanke authored 1 month ago
  
  57c40a50
Jan 23, 2025
- Add django AK id to info dict of slot · b0f0b9ae
  Felix Blanke authored 2 months ago
  
  b0f0b9ae
- Add other slots of same AK to conflict list · 417e8151
  Felix Blanke authored 2 months ago
  
  417e8151
Jan 22, 2025
- Merge branch 'feature/ak-conflict-dependency' into 'main' · 7a1c5004
  Lorenzo Conti authored 2 months ago
  
  Implement export of AK conflicts and dependencies See merge request !9
  7a1c5004
- fix · c420f00e
  Lorenzo Conti authored 2 months ago
  
  c420f00e
- Merge branch 'main' into 'feature/ak-conflict-dependency' · eec6035e
  Lorenzo Conti authored 2 months ago
  
  # Conflicts: # AKModel/models.py
  eec6035e
- Merge branch 'feature/duration-rounding-strategy' into 'main' · bb1179c7
  Lorenzo Conti authored 2 months ago
  
  Rounding strategy for slot duration at JSON export Closes #16 See merge request !6
  bb1179c7
- Merge branch 'feature/encapsulate_discretization_choice' into 'main' · e0801c1f
  Lorenzo Conti authored 2 months ago
  
  Encapsulate discretization in Event::discretize_timeslots See merge request !7
  e0801c1f
- Encapsulate discretization in Event::discretize_timeslots · f1d4a9ee
  Felix Blanke authored 2 months ago and Lorenzo Conti committed 2 months ago
  
  f1d4a9ee
- Export conflicts and dependencies as AK properties · ba533efa
  Felix Blanke authored 2 months ago
  
  ba533efa
Jan 21, 2025
- Convert decimal to float first · 9301ef7a
  Felix Blanke authored 2 months ago
  
  9301ef7a
- Add new field to AK info block with exact duration in hours · 57ac0fe7
  Felix Blanke authored 2 months ago
  
  57ac0fe7
- Fix import · 693fec82
  Felix Blanke authored 2 months ago
  
  693fec82
- change offset from float to decimal · 3f8f7ad7
  Felix Blanke authored 2 months ago
  
  3f8f7ad7
- Change rounding strategy to ceil · dafa0810
  Felix Blanke authored 2 months ago
  
  dafa0810
Dec 29, 2024
- Merge branch 'refactor-main' into 'main' · aee5627c
  Lorenzo Conti authored 2 months ago
  
  Refactor main See merge request !5
  aee5627c
Dec 28, 2024
- Fix typo · 1ae6e916
  Felix Blanke authored 2 months ago
  
  1ae6e916
- Fix event filter · 4505f33b
  Felix Blanke authored 2 months ago
  
  4505f33b
- Add json import/export view to test for only internal access · 05dbef0b
  Felix Blanke authored 2 months ago
  
  05dbef0b
- Fix import · ec5c79e7
  Felix Blanke authored 2 months ago
  
  ec5c79e7
- Fix docstr placement · 53dfe886
  Felix Blanke authored 2 months ago
  
  53dfe886
Dec 27, 2024
- Add more comments · 1661b359
  Felix Blanke authored 2 months ago
  
  1661b359
- Use uniform discretization if no default slots exist · c73020b0
  Felix Blanke authored 2 months ago
  
  c73020b0
- Make tests more descriptive · 8d049baa
  Felix Blanke authored 2 months ago
  
  8d049baa
Dec 26, 2024
- Detach merge_blocks from Event object · 61922712
  Felix Blanke authored 2 months ago
  
  61922712
- Use round instead of int to calc duration · fd6adb0e
  Felix Blanke authored 2 months ago
  
  fd6adb0e
- Improve docstring and type hints for optimizer slots · cf082b61
  Felix Blanke authored 2 months ago
  
  cf082b61
- Check all blocks of union if event is covered · 1b1b56fd
  Felix Blanke authored 2 months ago
  
  1b1b56fd
- Rename json import to make clear that a schedule is imported · 25a3b3f9
  Felix Blanke authored 2 months ago
  
  25a3b3f9
May 31, 2024
- Merge branch 'feature-json-export' into 'main' · c7b910c2
  Felix Blanke authored 9 months ago
  
  See merge request !3
  c7b910c2
- Update language files · 326da97b
  Felix Blanke authored 9 months ago
  
  326da97b
- Merge branch 'feature/merge-ak-category-slots' into 'feature-json-export' · a6ff6623
  Felix Blanke authored 9 months ago
  
  Merge AK category slots See merge request !2
  a6ff6623