diff --git a/clubs/migrations/0001_initial.py b/clubs/migrations/0001_initial.py index d7249e15c33da81bbc1296a2f442bbe823f55381..440aa2f555cd40fcf7d1d1317bb799e2dd7ebac3 100644 --- a/clubs/migrations/0001_initial.py +++ b/clubs/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.1.5 on 2023-03-22 18:50 +# Generated by Django 4.1.5 on 2023-05-03 14:04 from django.conf import settings from django.db import migrations, models @@ -9,11 +9,36 @@ class Migration(migrations.Migration): initial = True dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ("accounts", "0001_initial"), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ + migrations.CreateModel( + name="Club", + fields=[ + ("id", models.AutoField(primary_key=True, serialize=False)), + ("name", models.CharField(max_length=50)), + ("street_number", models.IntegerField()), + ("street", models.CharField(max_length=255)), + ("city", models.CharField(max_length=255)), + ("postcode", models.CharField(max_length=255)), + ("telephone_number", models.CharField(max_length=255)), + ("mobile_number", models.CharField(max_length=255)), + ("email_address", models.EmailField(max_length=255)), + ("active", models.BooleanField(default=False)), + ( + "account", + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name="club_account", + to="accounts.account", + ), + ), + ], + ), migrations.CreateModel( name="ClubRepresentative", fields=[ @@ -30,6 +55,7 @@ class Migration(migrations.Migration): ("email", models.EmailField(max_length=255, null=True)), ("first_name", models.CharField(max_length=255, null=True)), ("last_name", models.CharField(max_length=255, null=True)), + ("password", models.CharField(max_length=255, null=True)), ( "linked_user", models.ForeignKey( @@ -41,37 +67,40 @@ class Migration(migrations.Migration): ], ), migrations.CreateModel( - name="Club", + name="ClubDiscountRequest", fields=[ - ("id", models.AutoField(primary_key=True, serialize=False)), - ("name", models.CharField(max_length=50)), - ("street_number", models.IntegerField()), - ("street", models.CharField(max_length=255)), - ("city", models.CharField(max_length=255)), - ("postcode", models.CharField(max_length=255)), - ("telephone_number", models.CharField(max_length=255)), - ("mobile_number", models.CharField(max_length=255)), - ("email_address", models.EmailField(max_length=255)), ( - "account", - models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.CASCADE, - related_name="club_account", - to="accounts.account", + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", ), ), + ("old_discount_rate", models.FloatField(default=0)), + ("new_discount_rate", models.FloatField(default=0)), + ("reason", models.CharField(max_length=255)), + ("approved", models.BooleanField(default=False)), ( - "representative", + "club", models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.CASCADE, - related_name="clubs", - to=settings.AUTH_USER_MODEL, + on_delete=django.db.models.deletion.PROTECT, + related_name="discount_requests", + to="clubs.club", ), ), ], ), + migrations.AddField( + model_name="club", + name="representative", + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name="clubs", + to="clubs.clubrepresentative", + ), + ), ] diff --git a/clubs/templates/clubs/manage_clubs.html b/clubs/templates/clubs/manage_clubs.html index b4814f6030c09872a3f9004c2224eede34c0b3b8..887f08beb544f032af80fd1a5a06653bca4cdb9a 100644 --- a/clubs/templates/clubs/manage_clubs.html +++ b/clubs/templates/clubs/manage_clubs.html @@ -81,12 +81,7 @@ {% endif %} </tbody> </table> - <button - class="btn btn-primary" - onclick="window.location.href='{% url 'create_club' %}'" - > - Create Club - </button> + <a class="btn btn-primary" href="{% url 'create_club' %}">Create Club</a> <h2>Clubs for Approval</h2> <table class="table table-striped mt-3"> <thead> diff --git a/db.sqlite3 b/db.sqlite3 index ecffef526df3debb6b6be385ecfe473dde24ee7a..e23ea2696a6591fbf21954bf86898e63e17dbf70 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ