diff --git a/README.md b/README.md index 423329a5ecd84561ca497eac1743f206b0590f00..00169440d191fc2dab9d6eb74ba5c18c8089ed88 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,13 @@ -MySU is a member administration tool for all associations of the University of Twente. +# MySU is a member administration tool used to provide a common platform for any association willing to be a part of it. -You can find more information in the wiki. +### Backend of MySU is divided into several components: +- **Calendar** is responsible for handling events provided by different associations. It contains information about: enrollment, enrollment options, event types, and events themselves. +- **Email** is responsible for distributing emails to members of the various associations. +- **Financial** is responsible for handling the finances of the associations and their particular members. Contains information about: bank accounts, debt entries, debt collections and invoices. +- **API [apps/MySU]** is responsible for handling the requests and responses between the frontend and backend. +- **Backend [MySU]** is a main part of the code that the other components are built upon. It handles all the major work and provides the functionality for the web application. +- **Buddy**, **Exams** and **Inventory** are **deprecated** and have no use for the main App, as of now. Can be found in "Unused Apps" directory. + +## In order to properly setup the MySU application in local environment, follow +## [More information about Backend can be found here.](https://gitlab.utwente.nl/my-su/backend/api) +## [More information about Frontend can be found here.](https://gitlab.utwente.nl/my-su/frontend/website) \ No newline at end of file diff --git a/apps/exams/__init__.py b/Unused Apps/__init__.py similarity index 100% rename from apps/exams/__init__.py rename to Unused Apps/__init__.py diff --git a/apps/exams/admin/__init__.py b/Unused Apps/exams/__init__.py similarity index 100% rename from apps/exams/admin/__init__.py rename to Unused Apps/exams/__init__.py diff --git a/apps/exams/fixtures/__init__.py b/Unused Apps/exams/admin/__init__.py similarity index 100% rename from apps/exams/fixtures/__init__.py rename to Unused Apps/exams/admin/__init__.py diff --git a/apps/exams/apps.py b/Unused Apps/exams/apps.py similarity index 68% rename from apps/exams/apps.py rename to Unused Apps/exams/apps.py index 70ac6208567301285f9b0203b1457e7adbaf63ce..ebe1437a30acb530dab9b0ed18ee202c39cb1812 100644 --- a/apps/exams/apps.py +++ b/Unused Apps/exams/apps.py @@ -2,4 +2,4 @@ from django.apps import AppConfig class ExamsConfig(AppConfig): - name = 'apps.exams' + name = 'Unused Apps.exams' diff --git a/apps/exams/migrations/__init__.py b/Unused Apps/exams/fixtures/__init__.py similarity index 100% rename from apps/exams/migrations/__init__.py rename to Unused Apps/exams/fixtures/__init__.py diff --git a/apps/exams/models/__init__.py b/Unused Apps/exams/migrations/__init__.py similarity index 100% rename from apps/exams/models/__init__.py rename to Unused Apps/exams/migrations/__init__.py diff --git a/apps/exams/serializers/__init__.py b/Unused Apps/exams/models/__init__.py similarity index 100% rename from apps/exams/serializers/__init__.py rename to Unused Apps/exams/models/__init__.py diff --git a/apps/exams/viewsets/__init__.py b/Unused Apps/exams/serializers/__init__.py similarity index 100% rename from apps/exams/viewsets/__init__.py rename to Unused Apps/exams/serializers/__init__.py diff --git a/apps/exams/urls.py b/Unused Apps/exams/urls.py similarity index 100% rename from apps/exams/urls.py rename to Unused Apps/exams/urls.py diff --git a/apps/inventory/__init__.py b/Unused Apps/exams/viewsets/__init__.py similarity index 100% rename from apps/inventory/__init__.py rename to Unused Apps/exams/viewsets/__init__.py diff --git a/apps/inventory/admin/__init__.py b/Unused Apps/inventory/__init__.py similarity index 100% rename from apps/inventory/admin/__init__.py rename to Unused Apps/inventory/__init__.py diff --git a/apps/inventory/fixtures/__init__.py b/Unused Apps/inventory/admin/__init__.py similarity index 100% rename from apps/inventory/fixtures/__init__.py rename to Unused Apps/inventory/admin/__init__.py diff --git a/apps/inventory/admin/category.py b/Unused Apps/inventory/admin/category.py similarity index 100% rename from apps/inventory/admin/category.py rename to Unused Apps/inventory/admin/category.py diff --git a/apps/inventory/admin/product.py b/Unused Apps/inventory/admin/product.py similarity index 100% rename from apps/inventory/admin/product.py rename to Unused Apps/inventory/admin/product.py diff --git a/apps/inventory/admin/purchase.py b/Unused Apps/inventory/admin/purchase.py similarity index 100% rename from apps/inventory/admin/purchase.py rename to Unused Apps/inventory/admin/purchase.py diff --git a/apps/inventory/apps.py b/Unused Apps/inventory/apps.py similarity index 78% rename from apps/inventory/apps.py rename to Unused Apps/inventory/apps.py index 17e54d763f0373c7e10c74393e32de7da6b44c08..9f08ecce65da2dba8a09ea065338a806b94d2bc9 100644 --- a/apps/inventory/apps.py +++ b/Unused Apps/inventory/apps.py @@ -3,5 +3,5 @@ from django.apps import AppConfig class InventoryConfig(AppConfig): label = 'inventory' - name = 'apps.inventory' + name = 'Unused Apps.inventory' verbose_name = "Inventory" diff --git a/apps/inventory/fixtures/preset/__init__.py b/Unused Apps/inventory/fixtures/__init__.py similarity index 100% rename from apps/inventory/fixtures/preset/__init__.py rename to Unused Apps/inventory/fixtures/__init__.py diff --git a/apps/inventory/migrations/__init__.py b/Unused Apps/inventory/fixtures/preset/__init__.py similarity index 100% rename from apps/inventory/migrations/__init__.py rename to Unused Apps/inventory/fixtures/preset/__init__.py diff --git a/apps/inventory/fixtures/preset/category.json b/Unused Apps/inventory/fixtures/preset/category.json similarity index 100% rename from apps/inventory/fixtures/preset/category.json rename to Unused Apps/inventory/fixtures/preset/category.json diff --git a/apps/inventory/fixtures/preset/product.json b/Unused Apps/inventory/fixtures/preset/product.json similarity index 100% rename from apps/inventory/fixtures/preset/product.json rename to Unused Apps/inventory/fixtures/preset/product.json diff --git a/apps/inventory/fixtures/preset/purchase.json b/Unused Apps/inventory/fixtures/preset/purchase.json similarity index 100% rename from apps/inventory/fixtures/preset/purchase.json rename to Unused Apps/inventory/fixtures/preset/purchase.json diff --git a/apps/inventory/models/__init__.py b/Unused Apps/inventory/migrations/__init__.py similarity index 100% rename from apps/inventory/models/__init__.py rename to Unused Apps/inventory/migrations/__init__.py diff --git a/apps/inventory/serializers/__init__.py b/Unused Apps/inventory/models/__init__.py similarity index 100% rename from apps/inventory/serializers/__init__.py rename to Unused Apps/inventory/models/__init__.py diff --git a/apps/inventory/models/category.py b/Unused Apps/inventory/models/category.py similarity index 100% rename from apps/inventory/models/category.py rename to Unused Apps/inventory/models/category.py diff --git a/apps/inventory/models/product.py b/Unused Apps/inventory/models/product.py similarity index 100% rename from apps/inventory/models/product.py rename to Unused Apps/inventory/models/product.py diff --git a/apps/inventory/models/purchase.py b/Unused Apps/inventory/models/purchase.py similarity index 100% rename from apps/inventory/models/purchase.py rename to Unused Apps/inventory/models/purchase.py diff --git a/apps/inventory/viewsets/__init__.py b/Unused Apps/inventory/serializers/__init__.py similarity index 100% rename from apps/inventory/viewsets/__init__.py rename to Unused Apps/inventory/serializers/__init__.py diff --git a/apps/inventory/serializers/category.py b/Unused Apps/inventory/serializers/category.py similarity index 100% rename from apps/inventory/serializers/category.py rename to Unused Apps/inventory/serializers/category.py diff --git a/apps/inventory/serializers/product.py b/Unused Apps/inventory/serializers/product.py similarity index 100% rename from apps/inventory/serializers/product.py rename to Unused Apps/inventory/serializers/product.py diff --git a/apps/inventory/serializers/purchase.py b/Unused Apps/inventory/serializers/purchase.py similarity index 100% rename from apps/inventory/serializers/purchase.py rename to Unused Apps/inventory/serializers/purchase.py diff --git a/apps/inventory/urls.py b/Unused Apps/inventory/urls.py similarity index 100% rename from apps/inventory/urls.py rename to Unused Apps/inventory/urls.py diff --git a/apps/inventory/viewsets/category.py b/Unused Apps/inventory/viewsets/__init__.py similarity index 100% rename from apps/inventory/viewsets/category.py rename to Unused Apps/inventory/viewsets/__init__.py diff --git a/apps/inventory/viewsets/product.py b/Unused Apps/inventory/viewsets/category.py similarity index 100% rename from apps/inventory/viewsets/product.py rename to Unused Apps/inventory/viewsets/category.py diff --git a/apps/inventory/viewsets/purchase.py b/Unused Apps/inventory/viewsets/product.py similarity index 100% rename from apps/inventory/viewsets/purchase.py rename to Unused Apps/inventory/viewsets/product.py diff --git a/Unused Apps/inventory/viewsets/purchase.py b/Unused Apps/inventory/viewsets/purchase.py new file mode 100755 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/apps/MySU/admin/association_membership.py b/apps/MySU/admin/association_membership.py index 0117ba6059e69590a6710908fdfcc53c20f723ff..e4fd26f4f60e1e0c773f86f07f70bb8cc0d72575 100644 --- a/apps/MySU/admin/association_membership.py +++ b/apps/MySU/admin/association_membership.py @@ -9,7 +9,7 @@ from apps.MySU.models import AssociationMembership class AssociationMembershipForm(forms.ModelForm): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) - self.fields['user'].required = True + # self.fields['user'].required = False class Meta: model = AssociationMembership diff --git a/apps/buddy/fixtures/__init__.py b/apps/buddy/fixtures/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/apps/calendar/views/enrollments_emails.py b/apps/calendar/views/enrollments_emails.py index bdbcba3658054bf65d9175b83c04b62a93f2533e..cf2eb515d391d440267e0c76c2cd93bf7e87cd5e 100644 --- a/apps/calendar/views/enrollments_emails.py +++ b/apps/calendar/views/enrollments_emails.py @@ -1,4 +1,3 @@ -from django.core.mail import send_mail from rest_framework import permissions from rest_framework import status from rest_framework.response import Response