diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ada77297106d287fca238770c9dd06db3ac05292..90c7b5782567055e8719db22c4f6d9540d26d13b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -60,6 +60,6 @@ Minor changes * Use bootstrap buttons everywhere -_`1.0a1`: https://edugit.org/Teckids/BiscuIT/BiscuIT-App-Alsijil/-/tags/1.0a1 -_`1.0a2`: https://edugit.org/Teckids/BiscuIT/BiscuIT-App-Alsijil/-/tags/1.0a2 -_`1.0a3`: https://edugit.org/Teckids/BiscuIT/BiscuIT-App-Alsijil/-/tags/1.0a3 +_`1.0a1`: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Alsijil/-/tags/1.0a1 +_`1.0a2`: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Alsijil/-/tags/1.0a2 +_`1.0a3`: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Alsijil/-/tags/1.0a3 diff --git a/MANIFEST.in b/MANIFEST.in index 9b0e08dedc70ecec7e6ef7f2a443282422a2f605..7596319c7593694223dc4b759343a59f59936774 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ include LICENCE -recursive-include biscuit/apps/alsijil/static * -recursive-include biscuit/apps/alsijil/templates * -recursive-include biscuit/apps/alsijil/migrations * +recursive-include aleksis/apps/alsijil/static * +recursive-include aleksis/apps/alsijil/templates * +recursive-include aleksis/apps/alsijil/migrations * diff --git a/README.rst b/README.rst index 5008cf7477e76e5461b7deefec618e6f2bbdeb93..e75b7cddc1f109c41ef9c67393c074f28f41a3eb 100644 --- a/README.rst +++ b/README.rst @@ -1,4 +1,4 @@ -AlekSIS School Information System (SIS) - App Alsijil (class register) +AlekSIS (School Information System) - App Alsijil (class register) ====================================================================== AlekSIS diff --git a/aleksis/apps/alsijil/__init__.py b/aleksis/apps/alsijil/__init__.py index 13d0907873673eb2aec31f7847e7f5018954b090..3f6bb77a1ebd7eb3520f1f0774450a6185f24d3c 100644 --- a/aleksis/apps/alsijil/__init__.py +++ b/aleksis/apps/alsijil/__init__.py @@ -1,8 +1,8 @@ import pkg_resources try: - __version__ = pkg_resources.get_distribution("BiscuIT-App-Alsijil").version + __version__ = pkg_resources.get_distribution("AlekSIS-App-Alsijil").version except Exception: __version__ = "unknown" -default_app_config = "biscuit.apps.alsijil.apps.AlsijilConfig" +default_app_config = "aleksis.apps.alsijil.apps.AlsijilConfig" diff --git a/aleksis/apps/alsijil/apps.py b/aleksis/apps/alsijil/apps.py index 8fb3b07a4895eb9cbe7046c437a559c35ee3d182..d14dc41c6a9ede2e6afa78070633f7c5f2fd95aa 100644 --- a/aleksis/apps/alsijil/apps.py +++ b/aleksis/apps/alsijil/apps.py @@ -1,6 +1,6 @@ -from biscuit.core.util.apps import AppConfig +from aleksis.core.util.apps import AppConfig class AlsijilConfig(AppConfig): - name = "biscuit.apps.alsijil" - verbose_name = "BiscuIT - Alsijil (Class register)" + name = "aleksis.apps.alsijil" + verbose_name = "AlekSIS - Alsijil (Class register)" diff --git a/aleksis/apps/alsijil/forms.py b/aleksis/apps/alsijil/forms.py index 91fa15ac1d820bc2e84c81066d5e40e1c656e90e..1a86b761eeef10c7694ea71af351bdbddb129077 100644 --- a/aleksis/apps/alsijil/forms.py +++ b/aleksis/apps/alsijil/forms.py @@ -6,8 +6,8 @@ from django.utils.translation import ugettext_lazy as _ from django_select2.forms import Select2Widget -from biscuit.apps.chronos.models import Room -from biscuit.core.models import Group, Person +from aleksis.apps.chronos.models import Room +from aleksis.core.models import Group, Person from .models import LessonDocumentation, PersonalNote, PersonalNoteFilter diff --git a/aleksis/apps/alsijil/locale/ar/LC_MESSAGES/django.po b/aleksis/apps/alsijil/locale/ar/LC_MESSAGES/django.po index 543e5f96445cbddb631b2778e27861ef889e9ec1..84ed5cc49e3ecf7291bfb0d1b5b4251c120fdb0d 100644 --- a/aleksis/apps/alsijil/locale/ar/LC_MESSAGES/django.po +++ b/aleksis/apps/alsijil/locale/ar/LC_MESSAGES/django.po @@ -159,7 +159,7 @@ msgid "" "\n" " This printout is intended for archival purposes. The main copy " "of\n" -" the class register is stored in the BiscuIT School Information\n" +" the class register is stored in the AlekSIS School Information\n" " System.\n" " " msgstr "" diff --git a/aleksis/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po b/aleksis/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po index 19ca6df50966e59506ae4abe6d2de0371e0480c3..d7136c3a8f7ef9f3aee5752cc4cdf3b023a02b47 100644 --- a/aleksis/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po +++ b/aleksis/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po @@ -10,8 +10,8 @@ msgstr "" "POT-Creation-Date: 2019-11-24 22:45+0100\n" "PO-Revision-Date: 2019-11-24 21:56+0000\n" "Last-Translator: Tom Teichler <tom.teichler@teckids.org>\n" -"Language-Team: German <https://translate.edugit.org/projects/biscuit-sis/" -"biscuit-app-alsijil/de/>\n" +"Language-Team: German <https://translate.edugit.org/projects/aleksis-sis/" +"aleksis-app-alsijil/de/>\n" "Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -159,14 +159,14 @@ msgid "" "\n" " This printout is intended for archival purposes. The main copy " "of\n" -" the class register is stored in the BiscuIT School Information\n" +" the class register is stored in the AlekSIS School Information\n" " System.\n" " " msgstr "" "\n" " Dieser Ausdruck ist für Archivierungszwecke gedacht. Die " "Hauptkopie\n" -" des Klassenbusches ist im BiscuIT-Schul-Informations-System " +" des Klassenbusches ist im AlekSIS-Schul-Informations-System " "gespeichert.\n" " " @@ -416,8 +416,8 @@ msgstr "Der Filter wurde gespeichert." #~ msgid "Week" #~ msgstr "Woche" -#~ msgid "BiscuIT - Alsijil (Class register)" -#~ msgstr "BiscuIT - Alsijil (Klassenbuch)" +#~ msgid "AlekSIS - Alsijil (Class register)" +#~ msgstr "AlekSIS - Alsijil (Klassenbuch)" #~ msgid "No lesson found" #~ msgstr "Keine Stunde gefunden" diff --git a/aleksis/apps/alsijil/locale/fr/LC_MESSAGES/django.po b/aleksis/apps/alsijil/locale/fr/LC_MESSAGES/django.po index c9c2d685f60c0f88556a5fa4f91bb632d65bf90c..0b6a67c46cb4757212c26c072cca1e575a260271 100644 --- a/aleksis/apps/alsijil/locale/fr/LC_MESSAGES/django.po +++ b/aleksis/apps/alsijil/locale/fr/LC_MESSAGES/django.po @@ -158,7 +158,7 @@ msgid "" "\n" " This printout is intended for archival purposes. The main copy " "of\n" -" the class register is stored in the BiscuIT School Information\n" +" the class register is stored in the AlekSIS School Information\n" " System.\n" " " msgstr "" diff --git a/aleksis/apps/alsijil/locale/nb_NO/LC_MESSAGES/django.po b/aleksis/apps/alsijil/locale/nb_NO/LC_MESSAGES/django.po index 7dae5527cd7298f22417186ff1d7a44dc40e254b..42aca62c153c87786a40f89e52fa8a6bcacb26e7 100644 --- a/aleksis/apps/alsijil/locale/nb_NO/LC_MESSAGES/django.po +++ b/aleksis/apps/alsijil/locale/nb_NO/LC_MESSAGES/django.po @@ -157,7 +157,7 @@ msgid "" "\n" " This printout is intended for archival purposes. The main copy " "of\n" -" the class register is stored in the BiscuIT School Information\n" +" the class register is stored in the AlekSIS School Information\n" " System.\n" " " msgstr "" diff --git a/aleksis/apps/alsijil/locale/tr_TR/LC_MESSAGES/django.po b/aleksis/apps/alsijil/locale/tr_TR/LC_MESSAGES/django.po index 7dae5527cd7298f22417186ff1d7a44dc40e254b..42aca62c153c87786a40f89e52fa8a6bcacb26e7 100644 --- a/aleksis/apps/alsijil/locale/tr_TR/LC_MESSAGES/django.po +++ b/aleksis/apps/alsijil/locale/tr_TR/LC_MESSAGES/django.po @@ -157,7 +157,7 @@ msgid "" "\n" " This printout is intended for archival purposes. The main copy " "of\n" -" the class register is stored in the BiscuIT School Information\n" +" the class register is stored in the AlekSIS School Information\n" " System.\n" " " msgstr "" diff --git a/aleksis/apps/alsijil/menus.py b/aleksis/apps/alsijil/menus.py index 4e6abca1c2658a3e63a3549e82651be05dfe0cd7..5eb69b96d078a8c5cf4830023e7c45510f232f24 100644 --- a/aleksis/apps/alsijil/menus.py +++ b/aleksis/apps/alsijil/menus.py @@ -8,7 +8,7 @@ MENUS = { "root": True, "validators": [ "menu_generator.validators.is_authenticated", - "biscuit.core.util.core_helpers.has_person", + "aleksis.core.util.core_helpers.has_person", ], "submenu": [ { diff --git a/aleksis/apps/alsijil/migrations/0001_initial.py b/aleksis/apps/alsijil/migrations/0001_initial.py index 5de48ef84f0aa2b955059baeadcb1fb7671b87ee..f7fb4a0c056dd4af708dae04555368a3d7546fe6 100644 --- a/aleksis/apps/alsijil/migrations/0001_initial.py +++ b/aleksis/apps/alsijil/migrations/0001_initial.py @@ -3,7 +3,7 @@ import django.db.models.deletion from django.db import migrations, models -import biscuit.core.util.core_helpers +import aleksis.core.util.core_helpers class Migration(migrations.Migration): diff --git a/aleksis/apps/alsijil/migrations/0002_add_personal_note_filter.py b/aleksis/apps/alsijil/migrations/0002_add_personal_note_filter.py index dff35d692073bd6810a42d6649ee219a6762f2eb..c188380c0a61d41117d57b901028d24111bcafc8 100644 --- a/aleksis/apps/alsijil/migrations/0002_add_personal_note_filter.py +++ b/aleksis/apps/alsijil/migrations/0002_add_personal_note_filter.py @@ -3,8 +3,8 @@ import django.db.models.deletion from django.db import migrations, models -import biscuit.apps.alsijil.models -import biscuit.core.util.core_helpers +import aleksis.apps.alsijil.models +import aleksis.core.util.core_helpers class Migration(migrations.Migration): @@ -31,7 +31,7 @@ class Migration(migrations.Migration): "identifier", models.CharField( max_length=30, - validators=[biscuit.apps.alsijil.models.isidentifier], + validators=[aleksis.apps.alsijil.models.isidentifier], verbose_name="Identifier", ), ), diff --git a/aleksis/apps/alsijil/model_extensions.py b/aleksis/apps/alsijil/model_extensions.py index 521e5795e7250c0a44cef5a19f51d9f063582a86..41c7c0b8836bdb3bc2b636afe9ae451593931957 100644 --- a/aleksis/apps/alsijil/model_extensions.py +++ b/aleksis/apps/alsijil/model_extensions.py @@ -2,9 +2,9 @@ from datetime import date from django.db.models import Exists, F, OuterRef -from biscuit.apps.chronos.models import LessonPeriod -from biscuit.apps.chronos.util import CalendarWeek -from biscuit.core.models import Group, Person +from aleksis.apps.chronos.models import LessonPeriod +from aleksis.apps.chronos.util import CalendarWeek +from aleksis.core.models import Group, Person from .models import PersonalNote @@ -24,7 +24,7 @@ def mark_absent( This function creates `PersonalNote` objects for every `LessonPeriod` the person participates in on the selected day and marks them as absent/excused. - ..note:: Only available when BiscuIT-App-Alsijil is installed. + ..note:: Only available when AlekSIS-App-Alsijil is installed. :Date: 2019-11-10 :Authors: @@ -62,7 +62,7 @@ def get_personal_notes(self, wanted_week: CalendarWeek): Returns all linked `PersonalNote` objects, filtered by the given weeek, creating those objects that haven't been created yet. - ..note:: Only available when BiscuIT-App-Alsijil is installed. + ..note:: Only available when AlekSIS-App-Alsijil is installed. :Date: 2019-11-09 :Authors: diff --git a/aleksis/apps/alsijil/models.py b/aleksis/apps/alsijil/models.py index 6f5d91f26cf09da0cdec20b28ab321619202db15..67833dc6651e5db703333f03b7c3e093f2de12d4 100644 --- a/aleksis/apps/alsijil/models.py +++ b/aleksis/apps/alsijil/models.py @@ -1,7 +1,7 @@ from django.db import models from django.utils.translation import ugettext_lazy as _ -from biscuit.core.mixins import CRUDMixin +from aleksis.core.mixins import CRUDMixin def isidentifier(value: str) -> bool: diff --git a/aleksis/apps/alsijil/templates/alsijil/print/full_register.html b/aleksis/apps/alsijil/templates/alsijil/print/full_register.html index 5f132763e7d9c306503b032beff5c0f284bd2f98..b5f24badd0c9067fd0563ea01d23aacec8371586 100644 --- a/aleksis/apps/alsijil/templates/alsijil/print/full_register.html +++ b/aleksis/apps/alsijil/templates/alsijil/print/full_register.html @@ -35,7 +35,7 @@ <p> {% blocktrans %} This printout is intended for archival purposes. The main copy of - the class register is stored in the BiscuIT School Information + the class register is stored in the AlekSIS School Information System. {% endblocktrans %} </p> diff --git a/aleksis/apps/alsijil/views.py b/aleksis/apps/alsijil/views.py index 391116903df209f222a3b55e5f16cf0191983d22..ea54bc23622738a1f388f54b720d51ac161702c6 100644 --- a/aleksis/apps/alsijil/views.py +++ b/aleksis/apps/alsijil/views.py @@ -11,11 +11,11 @@ from django.utils.translation import ugettext as _ from django_tables2 import RequestConfig -from biscuit.apps.chronos.models import LessonPeriod -from biscuit.apps.chronos.util import CalendarWeek -from biscuit.core.decorators import admin_required -from biscuit.core.models import Group, Person, School -from biscuit.core.util import messages +from aleksis.apps.chronos.models import LessonPeriod +from aleksis.apps.chronos.util import CalendarWeek +from aleksis.core.decorators import admin_required +from aleksis.core.models import Group, Person, School +from aleksis.core.util import messages from .forms import ( LessonDocumentationForm, diff --git a/pyproject.toml b/pyproject.toml index a515f183018d3b8c69b7f147a708024061e145cb..ca49c0db499b04f52dc05bea346bfbd271050e91 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,16 +1,16 @@ [tool.poetry] -name = "BiscuIT-App-Alsijil" +name = "AlekSIS-App-Alsijil" version = "1.0a4dev0" packages = [ { include = "aleksis" } ] readme = "README.rst" -description = "AlekSIS School Information System (SIS) - App Alsijil (Class register)" +description = "AlekSIS (School Information System) - App Alsijil (Class register)" authors = ["Dominik George <dominik.george@teckids.org>", "mirabilos <thorsten.glaser@teckids.org>", "Tom Teichler <tom.teichler@teckids.org>"] license = "EUPL-1.2" homepage = "https://aleksis.edugit.io/" -repository = "https://edugit.org/BiscuIT/BiscuIT-App-Alsijil" +repository = "https://edugit.org/AlekSIS/AlekSIS-App-Alsijil" documentation = "https://aleksis.edugit.io/AlekSIS/docs/html/" classifiers = [ "Environment :: Web Environment", @@ -21,7 +21,7 @@ classifiers = [ [tool.poetry.dependencies] python = "^3.7" AlekSIS = { path = "../../.." } -BiscuIT-App-Chronos = { path = "../BiscuIT-App-Chronos" } +AlekSIS-App-Chronos = { path = "../AlekSIS-App-Chronos" } [build-system] requires = ["poetry>=0.12"]