Resolve "Support import from MySQL" #90

Merged
hansegucker merged 62 commits from 4-support-import-from-mysql into master 2020-04-20 21:52:00 +02:00
Owner

Closes #4

Closes #4
Author
Owner

changed milestone to %"2.0a1"

changed milestone to %"2.0a1"
Owner

marked as a Work In Progress

marked as a **Work In Progress**
Owner

assigned to @hansegucker and unassigned @nik

assigned to @hansegucker and unassigned @nik
Owner

changed milestone to %"2.0a2"

changed milestone to %"2.0a2"
Owner

added 2 commits

  • 21d53109 - Move util files to own namespace
  • 76558b2a - Add support for getting current term and importing subjects and teachers

Compare with previous version

added 2 commits <ul><li>21d53109 - Move util files to own namespace</li><li>76558b2a - Add support for getting current term and importing subjects and teachers</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1531&start_sha=4ac21f6678c4e1683c4831a724ea3cb5f7deec9b)
Owner

added 1 commit

  • 443d9bc0 - Add typing to helper functions for UNTIS dates

Compare with previous version

added 1 commit <ul><li>443d9bc0 - Add typing to helper functions for UNTIS dates</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1534&start_sha=76558b2ab1d8502f3d57952cf63f4a3722e6879f)
Owner

added 1 commit

  • 9b61ba9f - Add support for import of classes, rooms, supervision areas, time periods and breaks

Compare with previous version

added 1 commit <ul><li>9b61ba9f - Add support for import of classes, rooms, supervision areas, time periods and breaks</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1548&start_sha=443d9bc028c1969823482325222ad71374200073)
Owner

added 2 commits

  • e42bb27e - Add code for import of lessons
  • 07501abc - Add mysql client as a dependency

Compare with previous version

added 2 commits <ul><li>e42bb27e - Add code for import of lessons</li><li>07501abc - Add mysql client as a dependency</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1572&start_sha=9b61ba9f5e0a18e4837285db79c606872d29dd79)
Owner

added 1 commit

  • cc773252 - Remove unnecessary old stuff from SchoolApps

Compare with previous version

added 1 commit <ul><li>cc773252 - Remove unnecessary old stuff from SchoolApps</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1573&start_sha=07501abc2ddde34ee9a631bbb56bc159002d3d9e)
Owner

added 2 commits

Compare with previous version

added 2 commits <ul><li>7e865773 - Move api_helper.py to util.py</li><li>34b3223b - Reformat main.py and util.py</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1574&start_sha=cc7732524c035b385d6fbc1780f9541538fb4921)
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>6411fb83 - Refactor</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1575&start_sha=34b3223b34820caf4449f54fa4e777b658ee3626)
Owner

added 1 commit

  • a0785efc - Move lessons importer to own file

Compare with previous version

added 1 commit <ul><li>a0785efc - Move lessons importer to own file</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1576&start_sha=6411fb830ed4f65fde743fcc2f4572668d8a913b)
Owner

added 1 commit

  • 97ca02d4 - Update template for XML import

Compare with previous version

added 1 commit <ul><li>97ca02d4 - Update template for XML import</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1579&start_sha=a0785efcc096671118dcea83485c99d6c366a354)
Owner

added 1 commit

  • 459c83cb - Make MySQL import only available as management command

Compare with previous version

added 1 commit <ul><li>459c83cb - Make MySQL import only available as management command</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1580&start_sha=97ca02d4f6a78c762f48bdabc11b08006bc39994)
Owner

added 1 commit

  • 30d39e72 - Mark all UNTIS models as PureDjangoModel

Compare with previous version

added 1 commit <ul><li>30d39e72 - Mark all UNTIS models as PureDjangoModel</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1581&start_sha=459c83cb83113b7fc78f31651f1ac1b74ddbfef5)
Owner

added 1 commit

  • d2eb0a87 - Don't use soft-deleted UNTIS data

Compare with previous version

added 1 commit <ul><li>d2eb0a87 - Don&#39;t use soft-deleted UNTIS data</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1586&start_sha=30d39e7257bbd7ba9145e3335c937495c5414fcc)
Owner

added 2 commits

  • 4ffaae54 - Add import_ref fields to common data models
  • 3352c20b - Improve import job for subjects (MySQL)

Compare with previous version

added 2 commits <ul><li>4ffaae54 - Add import_ref fields to common data models</li><li>3352c20b - Improve import job for subjects (MySQL)</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1588&start_sha=d2eb0a875dd675ae8a00d385e42dd77ff23c0b2e)
Owner

added 2 commits

  • 30622bea - Improve import functions for subjects and teachers
  • 3207b91d - Improve import process for groups

Compare with previous version

added 2 commits <ul><li>30622bea - Improve import functions for subjects and teachers</li><li>3207b91d - Improve import process for groups</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1605&start_sha=3352c20b040b5c1ddf8468ea50f2e1b1488996a7)
Owner

added 1 commit

  • d07e75d9 - Improve import process for rooms

Compare with previous version

added 1 commit <ul><li>d07e75d9 - Improve import process for rooms</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1606&start_sha=3207b91dfca99c2ff5b71c9262fd62105b022e8e)
Owner

added 1 commit

  • 4db39687 - Improve import process for supervision areas

Compare with previous version

added 1 commit <ul><li>4db39687 - Improve import process for supervision areas</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1607&start_sha=d07e75d951d4798083e19f8fea26d568e439ee2a)
Owner

added 1 commit

  • 814ffe64 - Improve import of time periods and breaks

Compare with previous version

added 1 commit <ul><li>814ffe64 - Improve import of time periods and breaks</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1612&start_sha=4db39687c0d8aa19b6aebe173d9638245858bd27)
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>7ef59d25 - Improve import of lessons</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1614&start_sha=814ffe640c5c1a5bf4166c98afa4ee76e545565a)
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>9b4b90d2 - Reformat</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1621&start_sha=7ef59d2545d14f7a8db14294cb99b51e00eee819)
Owner

added 1 commit

  • d72b586c - Add option to match course groups via parent groups and preset subject

Compare with previous version

added 1 commit <ul><li>d72b586c - Add option to match course groups via parent groups and preset subject</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1627&start_sha=9b4b90d241a48a57fee7d332dc32692d8ca24229)
Owner

added 1 commit

  • 77732e1e - Make import references optional and add verbose names

Compare with previous version

added 1 commit <ul><li>77732e1e - Make import references optional and add verbose names</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1628&start_sha=d72b586c7688d7a06d5310b0e8b1185566ac727e)
Owner

added 2 commits

  • 1a504589 - Build own import references for time periods and breaks as dicts
  • 409b0e09 - Sync course group owners

Compare with previous version

added 2 commits <ul><li>1a504589 - Build own import references for time periods and breaks as dicts</li><li>409b0e09 - Sync course group owners</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1630&start_sha=77732e1e0d752175b6575433118495b0c2bab484)
Owner

added 5 commits

  • fc485fc6 - Add import process for supervisions
  • 7efd0d09 - Use sync_m2m for group owners
  • 7f0bdb4d - Use sync_m2m for group owners
  • bcc7f302 - Add basic import for substitutions
  • 110a89b8 - Add import process for supervision substitutions

Compare with previous version

added 5 commits <ul><li>fc485fc6 - Add import process for supervisions</li><li>7efd0d09 - Use sync_m2m for group owners</li><li>7f0bdb4d - Use sync_m2m for group owners</li><li>bcc7f302 - Add basic import for substitutions</li><li>110a89b8 - Add import process for supervision substitutions</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1635&start_sha=409b0e09bcf63ace8c8651bde6452da0f2cedf42)
Owner

added 5 commits

  • 78ba426b - Add util function to connect data which are split by UNTIS in different fields
  • 848a5acf - Fix import of time periods, a more reliable data source is used now
  • b2614ea4 - Fix import of lessons: Check if there are lessons from other terms ending in this term
  • e64a5517 - Fix import of substitutions
  • 875503b4 - Add util function connect_untis_fields

Compare with previous version

added 5 commits <ul><li>78ba426b - Add util function to connect data which are split by UNTIS in different fields</li><li>848a5acf - Fix import of time periods, a more reliable data source is used now</li><li>b2614ea4 - Fix import of lessons: Check if there are lessons from other terms ending in this term</li><li>e64a5517 - Fix import of substitutions</li><li>875503b4 - Add util function connect_untis_fields</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1639&start_sha=110a89b89cd336e3947838d29de6e0bca7f035a8)
Owner

added 1 commit

  • 219eff23 - Add importer for absence reasons

Compare with previous version

added 1 commit <ul><li>219eff23 - Add importer for absence reasons</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1670&start_sha=875503b4a372529a7f58dfd77e6ae0c3aa63574d)
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>3fe94035 - Add importer for absences</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1684&start_sha=219eff23826062310290f4b5db3bed51bed564e1)
Owner

assigned to @nik and unassigned @hansegucker

assigned to @nik and unassigned @hansegucker
Owner

added 2 commits

  • e665f1f2 - Move util code for getting first/last weekdays/periods to util.py
  • bd9a1004 - Add import code for events

Compare with previous version

added 2 commits <ul><li>e665f1f2 - Move util code for getting first/last weekdays/periods to util.py</li><li>bd9a1004 - Add import code for events</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1736&start_sha=3fe9403525f1b674cce24cad3e589c33cd30e273)
Owner

added 2 commits

  • 52f3d140 - Refactor run_default_filter
  • 02c0d089 - Add import code for holidays

Compare with previous version

added 2 commits <ul><li>52f3d140 - Refactor run_default_filter</li><li>02c0d089 - Add import code for holidays</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1751&start_sha=bd9a100496ef6fcaa683c48a9ee0e8cff62b2c9f)
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>409fbc99 - Add import code for holidays</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1752&start_sha=02c0d089c24206abe97b6d09fb03e4dfa561c3c0)
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>0fb8bd9e - Use tqdm for progress bar</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1756&start_sha=409fbc99b67f4048d3a4c78356e8dbc3be77600c)
Owner

added 1 commit

  • b25f4631 - Add celery task for MySQL import script

Compare with previous version

added 1 commit <ul><li>b25f4631 - Add celery task for MySQL import script</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1757&start_sha=0fb8bd9edb022b6a311b5ea93f92d4e43c399559)
Owner

added 1 commit

  • 3f77a814 - Get configuration of UNTIS database from dynaconf

Compare with previous version

added 1 commit <ul><li>3f77a814 - Get configuration of UNTIS database from dynaconf</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1760&start_sha=b25f4631697789d2cc138f4168e793badae45364)
Owner

added 3 commits

  • a09facf3 - Disable linting for auto-generated model file
  • e48aa9a5 - Remove legacy constance config for database
  • 30f1c6ec - Use celery_optional task from management command as well

Compare with previous version

added 3 commits <ul><li>a09facf3 - Disable linting for auto-generated model file</li><li>e48aa9a5 - Remove legacy constance config for database</li><li>30f1c6ec - Use celery_optional task from management command as well</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1776&start_sha=3f77a81430f5524679e98ae73658bb92c1150bca)
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>805d6f7c - Remove legacy files</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1777&start_sha=30f1c6ec7d2890d8cea543a77a25c2cc48386469)
Owner

added 1 commit

  • 21e327de - Use standard logging instead of messages in lessons importer

Compare with previous version

added 1 commit <ul><li>21e327de - Use standard logging instead of messages in lessons importer</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1778&start_sha=805d6f7c376c3387603e450bbe19e97e32e40f48)
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>eb5e495c - Clean up utility code a bit</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1782&start_sha=21e327ded3ae00e88ed39e107c6e4952ea2d3979)
Owner

added 2 commits

  • 2f32277c - Use atomic transaction for whole import; use Enums instead of magic values
  • 4f8a0d4f - [Reformat] Update all style with black

Compare with previous version

added 2 commits <ul><li>2f32277c - Use atomic transaction for whole import; use Enums instead of magic values</li><li>4f8a0d4f - [Reformat] Update all style with black</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1790&start_sha=eb5e495cf1eeffc108aa1dbf8c025731eb157b35)
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>f6e871d8 - Fix and reorder imports</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1791&start_sha=4f8a0d4f01ca8abec5f83757b479cf0266a32521)
Owner

added 3 commits

Compare with previous version

added 3 commits <ul><li>7d427289 - Fix MySQL importer</li><li>057873f5 - Add import code for extra lessons</li><li>27d479a8 - Fix import of extra lessons</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1811&start_sha=f6e871d8095670841121f248614f1dca0cedd663)
Owner

added 6 commits

  • 27d479a8...a567021e - 5 commits from branch master
  • 1eefb1c7 - Merge branch 'master' into 4-support-import-from-mysql

Compare with previous version

added 6 commits <ul><li>27d479a8...a567021e - 5 commits from branch <code>master</code></li><li>1eefb1c7 - Merge branch &#39;master&#39; into 4-support-import-from-mysql</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Untis/-/merge_requests/13/diffs?diff_id=1813&start_sha=27d479a8fc15f8ba10acc34e5c05effbe8fe96ef)
Owner

unmarked as a Work In Progress

unmarked as a **Work In Progress**
Owner

@nik Extra lessons are included now. It can be merged finally.

@nik Extra lessons are included now. It can be merged finally.
Owner

This change is unrelated and wrong, even if jsonstore does not suppoer exclude. You can still use filter and negate that using a Q object, for example.

This change is unrelated and wrong, even if jsonstore does not suppoer `exclude`. You can still use `filter` and negate that using a `Q` object, for example.
Owner

That didn't work, too. If you found a better solution, it would be great.

That didn't work, too. If you found a better solution, it would be great.
Owner

mentioned in commit 2fca14451d

mentioned in commit 2fca14451d5c02493d75baa2307457216204eadd
Owner

merged

merged
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
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-Untis!90
No description provided.