Merged in feature/project (pull request #10)

Feature/project

Makefile

@@ -87,8 +87,8 @@ ruff-fix:
 
 load-fixtures:
 	clear
-	@docker-compose run --rm web python manage.py loaddata fixtures/contributing-centre.json
 	@docker-compose run --rm web python manage.py loaddata fixtures/institution.json
+	@docker-compose run --rm web python manage.py loaddata fixtures/projects.json
 	@docker-compose run --rm web python manage.py loaddata fixtures/language.json
 	@docker-compose run --rm web python manage.py loaddata fixtures/subjects.json
 

app/app/settings.py

@@ -9,6 +9,7 @@
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/5.0/ref/settings/
 """
+
 import os
 from pathlib import Path
 

app/app/urls.py

@@ -14,6 +14,7 @@
     1. Import the include() function: from django.urls import include, path
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
+
 from django.contrib import admin
 from django.urls import path
 

app/fixtures/institution.json

@@ -7,8 +7,7 @@
       "abbreviation": "UNISA",
       "url": "https://www.unisa.ac.za/",
       "email": "[email protected]",
-      "logo": "logo",
-      "contributing_centre_id": "1"
+      "logo": "logo"
     }
   },
   {
@@ -19,8 +18,7 @@
       "abbreviation": "NWU",
       "url": "https://www.nwu.ac.za/",
       "email": "[email protected]",
-      "logo": "logo",
-      "contributing_centre_id": "1"
+      "logo": "logo"
     }
   },
   {
@@ -31,8 +29,7 @@
       "abbreviation": "UP",
       "url": "https://www.up.ac.za/",
       "email": "[email protected]",
-      "logo": "logo",
-      "contributing_centre_id": "1"
+      "logo": "logo"
     }
   },
   {
@@ -43,8 +40,7 @@
       "abbreviation": "UJ",
       "url": "https://www.uj.ac.za/",
       "email": "[email protected]",
-      "logo": "logo",
-      "contributing_centre_id": "1"
+      "logo": "logo"
     }
   },
   {
@@ -55,8 +51,7 @@
       "abbreviation": "UKZN",
       "url": "https://www.ukzn.ac.za/",
       "email": "[email protected]",
-      "logo": "logo",
-      "contributing_centre_id": "1"
+      "logo": "logo"
     }
   },
   {
@@ -67,8 +62,7 @@
       "abbreviation": "UFS",
       "url": "https://www.ufs.ac.za/",
       "email": "[email protected]",
-      "logo": "logo",
-      "contributing_centre_id": "1"
+      "logo": "logo"
     }
   },
   {
@@ -79,8 +73,7 @@
       "abbreviation": "CPUT",
       "url": "https://www.cput.ac.za/",
       "email": "[email protected]",
-      "logo": "logo",
-      "contributing_centre_id": "1"
+      "logo": "logo"
     }
   },
   {
@@ -91,8 +84,7 @@
       "abbreviation": "WITS",
       "url": "https://www.wits.ac.za/",
       "email": "[email protected]",
-      "logo": "logo",
-      "contributing_centre_id": "1"
+      "logo": "logo"
     }
   },
   {
@@ -103,8 +95,7 @@
       "abbreviation": "US",
       "url": "http://www.sun.ac.za/",
       "email": "[email protected]",
-      "logo": "logo",
-      "contributing_centre_id": "1"
+      "logo": "logo"
     }
   },
   {
@@ -115,8 +106,7 @@
       "abbreviation": "UCT",
       "url": "https://uct.ac.za/",
       "email": "[email protected]",
-      "logo": "logo",
-      "contributing_centre_id": "1"
+      "logo": "logo"
     }
   },
   {
@@ -127,8 +117,7 @@
       "abbreviation": "NMU",
       "url": "https://www.mandela.ac.za/",
       "email": "[email protected]",
-      "logo": "logo",
-      "contributing_centre_id": "1"
+      "logo": "logo"
     }
   },
   {
@@ -139,8 +128,7 @@
       "abbreviation": "WSU",
       "url": "https://www.wsu.ac.za/",
       "email": "[email protected]",
-      "logo": "logo",
-      "contributing_centre_id": "1"
+      "logo": "logo"
     }
   },
   {
@@ -151,8 +139,7 @@
       "abbreviation": "DUT",
       "url": "https://www.dut.ac.za/",
       "email": "[email protected]",
-      "logo": "logo",
-      "contributing_centre_id": "1"
+      "logo": "logo"
     }
   },
   {
@@ -163,8 +150,7 @@
       "abbreviation": "UL",
       "url": "https://www.ul.ac.za/",
       "email": "[email protected]",
-      "logo": "logo",
-      "contributing_centre_id": "1"
+      "logo": "logo"
     }
   },
    {
@@ -175,8 +161,7 @@
       "abbreviation": "VUT",
       "url": "https://www.vut.ac.za/",
       "email": "[email protected]",
-      "logo": "logo",
-      "contributing_centre_id": "1"
+      "logo": "logo"
     }
   },
     {
@@ -187,8 +172,7 @@
       "abbreviation": "UniZulu",
       "url": "https://www.unizulu.ac.za/",
       "email": "[email protected]",
-      "logo": "logo",
-      "contributing_centre_id": "1"
+      "logo": "logo"
     }
   },
    {
@@ -199,8 +183,7 @@
       "abbreviation": "UWC",
       "url": "https://www.uwc.ac.za/",
       "email": "[email protected]",
-      "logo": "logo",
-      "contributing_centre_id": "1"
+      "logo": "logo"
     }
   },
   {
@@ -211,8 +194,7 @@
       "abbreviation": "CUT",
       "url": "https://www.cut.ac.za/",
       "email": "[email protected]",
-      "logo": "logo",
-      "contributing_centre_id": "1"
+      "logo": "logo"
     }
   },
    {
@@ -223,8 +205,7 @@
       "abbreviation": "UFH",
       "url": "https://www.ufh.ac.za/",
       "email": "[email protected]",
-      "logo": "logo",
-      "contributing_centre_id": "1"
+      "logo": "logo"
     }
   },
   {
@@ -235,8 +216,7 @@
       "abbreviation": "RU",
       "url": "https://www.ru.ac.za/",
       "email": "[email protected]",
-      "logo": "logo",
-      "contributing_centre_id": "1"
+      "logo": "logo"
     }
   },
   {
@@ -247,8 +227,7 @@
       "abbreviation": "Venda",
       "url": "https://www.univen.ac.za/",
       "email": "[email protected]",
-      "logo": "logo",
-      "contributing_centre_id": "1"
+      "logo": "logo"
     }
   },
     {
@@ -259,8 +238,7 @@
       "abbreviation": "MUT",
       "url": "https://www.mut.ac.za/",
       "email": "[email protected]",
-      "logo": "logo",
-      "contributing_centre_id": "1"
+      "logo": "logo"
     }
   },
   {
@@ -271,8 +249,7 @@
       "abbreviation": "FMHSU",
       "url": "https://www.smu.ac.za/",
       "email": "[email protected]",
-      "logo": "logo",
-      "contributing_centre_id": "1"
+      "logo": "logo"
     }
   },
     {
@@ -283,8 +260,7 @@
       "abbreviation": "UMP",
       "url": "https://www.ump.ac.za/",
       "email": "[email protected]",
-      "logo": "logo",
-      "contributing_centre_id": "1"
+      "logo": "logo"
     }
   },
     {
@@ -295,8 +271,7 @@
       "abbreviation": "SPU",
       "url": "https://www.spu.ac.za/",
       "email": "[email protected]",
-      "logo": "logo",
-      "contributing_centre_id": "1"
+      "logo": "logo"
     }
   }
 ]

app/fixtures/projects.json

@@ -0,0 +1,26 @@
+[
+  {
+    "model": "general.Project",
+    "pk": 1,
+    "fields": {
+      "name": "Study Centre",
+      "url": "https://example.dev",
+      "logo": "logo.png",
+      "start_date": "2020-01-01",
+      "end_date": "2020-01-01",
+      "Institution": 1
+    }
+  },
+  {
+    "model": "general.Project",
+    "pk": 2,
+    "fields": {
+      "name": "Research Centre",
+      "url": "https://example.dev",
+      "logo": "logo.png",
+      "start_date": "2020-01-01",
+      "end_date": "2020-01-01",
+      "Institution": 2
+    }
+  }
+]

app/general/admin.py

@@ -1,17 +1,18 @@
 from django.contrib import admin
 
-from .models import ContributingCentre, Institution, Language, Subject
+from .models import Institution, Language, Project, Subject
 
 
-class SubjectInline(admin.TabularInline):
-    model = Subject.contributing_centre.through
+class ProjectAdminInline(admin.TabularInline):
+    model = Project
+    extra = 0
 
 
-class ContributingCentreAdmin(admin.ModelAdmin):
-    inlines = [SubjectInline]
+class ProjectAdmin(admin.ModelAdmin):
+    inlines = [ProjectAdminInline]
 
 
-admin.site.register(ContributingCentre, ContributingCentreAdmin)
-admin.site.register(Institution)
+admin.site.register(Project)
+admin.site.register(Institution, ProjectAdmin)
 admin.site.register(Language)
 admin.site.register(Subject)