diff --git a/core/__pycache__/admin.cpython-311.pyc b/core/__pycache__/admin.cpython-311.pyc index a5ed392..3b8901b 100644 Binary files a/core/__pycache__/admin.cpython-311.pyc and b/core/__pycache__/admin.cpython-311.pyc differ diff --git a/core/__pycache__/models.cpython-311.pyc b/core/__pycache__/models.cpython-311.pyc index e061640..15aaf46 100644 Binary files a/core/__pycache__/models.cpython-311.pyc and b/core/__pycache__/models.cpython-311.pyc differ diff --git a/core/__pycache__/views.cpython-311.pyc b/core/__pycache__/views.cpython-311.pyc index 2a36fd6..59da7bc 100644 Binary files a/core/__pycache__/views.cpython-311.pyc and b/core/__pycache__/views.cpython-311.pyc differ diff --git a/core/admin.py b/core/admin.py index 8c38f3f..d2f5c12 100644 --- a/core/admin.py +++ b/core/admin.py @@ -1,3 +1,17 @@ from django.contrib import admin +from .models import MemberOfParliament, TradeDisclosure, Watchlist -# Register your models here. +@admin.register(MemberOfParliament) +class MemberOfParliamentAdmin(admin.ModelAdmin): + list_display = ('name', 'party', 'constituency', 'province') + search_fields = ('name', 'party', 'constituency') + +@admin.register(TradeDisclosure) +class TradeDisclosureAdmin(admin.ModelAdmin): + list_display = ('mp', 'ticker', 'trade_type', 'amount_range', 'disclosure_date') + list_filter = ('trade_type', 'disclosure_date', 'mp__party') + search_fields = ('ticker', 'company_name', 'mp__name') + +@admin.register(Watchlist) +class WatchlistAdmin(admin.ModelAdmin): + list_display = ('user', 'mp', 'ticker', 'created_at') \ No newline at end of file diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py new file mode 100644 index 0000000..93f4cbb --- /dev/null +++ b/core/migrations/0001_initial.py @@ -0,0 +1,54 @@ +# Generated by Django 5.2.7 on 2026-02-04 15:06 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='MemberOfParliament', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255)), + ('party', models.CharField(max_length=100)), + ('constituency', models.CharField(max_length=255)), + ('province', models.CharField(max_length=100)), + ('image_url', models.URLField(blank=True, null=True)), + ], + ), + migrations.CreateModel( + name='TradeDisclosure', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('ticker', models.CharField(max_length=20)), + ('company_name', models.CharField(max_length=255)), + ('trade_type', models.CharField(choices=[('BUY', 'Buy'), ('SELL', 'Sell'), ('HOLD', 'Hold')], max_length=10)), + ('amount_range', models.CharField(max_length=100)), + ('disclosure_date', models.DateField()), + ('transaction_date', models.DateField(blank=True, null=True)), + ('mp', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='trades', to='core.memberofparliament')), + ], + ), + migrations.CreateModel( + name='Watchlist', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('ticker', models.CharField(blank=True, max_length=20, null=True)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('mp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='core.memberofparliament')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='watchlist', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'unique_together': {('user', 'mp', 'ticker')}, + }, + ), + ] diff --git a/core/migrations/__pycache__/0001_initial.cpython-311.pyc b/core/migrations/__pycache__/0001_initial.cpython-311.pyc new file mode 100644 index 0000000..fd53806 Binary files /dev/null and b/core/migrations/__pycache__/0001_initial.cpython-311.pyc differ diff --git a/core/models.py b/core/models.py index 71a8362..eaad072 100644 --- a/core/models.py +++ b/core/models.py @@ -1,3 +1,39 @@ from django.db import models +from django.contrib.auth.models import User -# Create your models here. +class MemberOfParliament(models.Model): + name = models.CharField(max_length=255) + party = models.CharField(max_length=100) + constituency = models.CharField(max_length=255) + province = models.CharField(max_length=100) + image_url = models.URLField(blank=True, null=True) + + def __str__(self): + return self.name + +class TradeDisclosure(models.Model): + TRADE_TYPES = ( + ('BUY', 'Buy'), + ('SELL', 'Sell'), + ('HOLD', 'Hold'), + ) + + mp = models.ForeignKey(MemberOfParliament, on_delete=models.CASCADE, related_name='trades') + ticker = models.CharField(max_length=20) + company_name = models.CharField(max_length=255) + trade_type = models.CharField(max_length=10, choices=TRADE_TYPES) + amount_range = models.CharField(max_length=100) # e.g. "$15,001 - $50,000" + disclosure_date = models.DateField() + transaction_date = models.DateField(null=True, blank=True) + + def __str__(self): + return f"{self.mp.name} - {self.ticker} ({self.trade_type})" + +class Watchlist(models.Model): + user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='watchlist') + mp = models.ForeignKey(MemberOfParliament, on_delete=models.CASCADE, blank=True, null=True) + ticker = models.CharField(max_length=20, blank=True, null=True) + created_at = models.DateTimeField(auto_now_add=True) + + class Meta: + unique_together = ('user', 'mp', 'ticker') \ No newline at end of file diff --git a/core/templates/base.html b/core/templates/base.html index 1e7e5fb..023dcd6 100644 --- a/core/templates/base.html +++ b/core/templates/base.html @@ -1,25 +1,124 @@ -
- -