Skip to content

Commit

Permalink
Merge pull request #94 from ryaustin/ra/3-nov/country-detail-page
Browse files Browse the repository at this point in the history 
Ra/3 nov/country detail page
  • Loading branch information
@gm3dmo
gm3dmo authored Nov 4, 2023
2 parents f7d47fa + b73b51d commit e37c3bc
Show file tree
Hide file tree
Showing 20 changed files with 295 additions and 829 deletions.
180 changes: 179 additions & 1 deletion cmp/migrations/0001_initial.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Generated by Django 4.2.5 on 2023-09-20 13:51
# Generated by Django 4.2.5 on 2023-11-03 14:33

from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone


Expand All @@ -12,6 +13,183 @@ class Migration(migrations.Migration):
]

operations = [
migrations.CreateModel(
name="Company",
fields=[
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.CharField(default="", max_length=255, unique=True)),
("notes", models.CharField(default="", max_length=255)),
],
),
migrations.CreateModel(
name="Country",
fields=[
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.CharField(default="", max_length=255, unique=True)),
("Alpha2", models.CharField(default="", max_length=2, unique=True)),
("Alpha3", models.CharField(default="", max_length=3, unique=True)),
(
"CountryNumber",
models.CharField(default="", max_length=3, unique=True),
),
("Flag", models.CharField(default="", max_length=255)),
],
),
migrations.CreateModel(
name="PowCamp",
fields=[
("id", models.IntegerField(primary_key=True, serialize=False)),
("name", models.CharField(default="", max_length=255, unique=True)),
("nearestCity", models.CharField(default="", max_length=255)),
("notes", models.CharField(default="", max_length=255)),
("presentCountry", models.CharField(default="", max_length=255)),
("latitude", models.FloatField()),
("longitude", models.FloatField()),
(
"wartimeCountry",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE, to="cmp.country"
),
),
],
),
migrations.CreateModel(
name="Rank",
fields=[
("id", models.IntegerField(primary_key=True, serialize=False)),
("name", models.CharField(max_length=50, unique=True)),
("abbreviation", models.CharField(blank=True, max_length=50)),
(
"rankClass",
models.CharField(
blank=True,
choices=[
("OR", "Other Rank"),
("NC", "Non Commisioned Officer"),
("OF", "Officer"),
],
default="Other Rank",
max_length=2,
),
),
],
),
migrations.CreateModel(
name="Soldier",
fields=[
("id", models.IntegerField(primary_key=True, serialize=False)),
("surname", models.CharField(default="", max_length=255)),
("initials", models.CharField(default="", max_length=255)),
("army_number", models.CharField(default="", max_length=255)),
("notes", models.CharField(default="", max_length=255)),
(
"rank_id",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE, to="cmp.rank"
),
),
],
),
migrations.CreateModel(
name="Theatre",
fields=[
("id", models.IntegerField(primary_key=True, serialize=False)),
("name", models.CharField(default="", max_length=255, unique=True)),
],
),
migrations.CreateModel(
name="SoldierImprisonment",
fields=[
("id", models.IntegerField(primary_key=True, serialize=False)),
("powNumber", models.CharField(default="", max_length=255)),
("dateFrom", models.DateField()),
("dateTo", models.DateField()),
("notes", models.CharField(default="", max_length=255)),
(
"company_id",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE, to="cmp.company"
),
),
(
"powCamp_id",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE, to="cmp.powcamp"
),
),
(
"soldier_id",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE, to="cmp.soldier"
),
),
],
),
migrations.CreateModel(
name="SoldierDecoration",
fields=[
("id", models.IntegerField(primary_key=True, serialize=False)),
("name", models.CharField(default="", max_length=255, unique=True)),
("notes", models.CharField(default="", max_length=255)),
("details_link", models.CharField(default="", max_length=255)),
("abbreviation", models.CharField(default="", max_length=255)),
(
"country_id",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE, to="cmp.country"
),
),
],
),
migrations.CreateModel(
name="Decoration",
fields=[
("id", models.IntegerField(primary_key=True, serialize=False)),
("name", models.CharField(default="", max_length=255, unique=True)),
("notes", models.CharField(default="", max_length=255)),
("details_link", models.CharField(default="", max_length=255)),
("abbreviation", models.CharField(default="", max_length=255)),
(
"country_id",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE, to="cmp.country"
),
),
],
),
migrations.CreateModel(
name="Cemetery",
fields=[
("id", models.IntegerField(primary_key=True, serialize=False)),
("name", models.CharField(default="", max_length=255, unique=True)),
("latitude", models.CharField(default="", max_length=255)),
("longitude", models.CharField(default="", max_length=255)),
(
"country",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
to="cmp.country",
to_field="CountryNumber",
),
),
],
),
migrations.CreateModel(
name="CustomUser",
fields=[
Expand Down
23 changes: 23 additions & 0 deletions cmp/migrations/0002_alter_cemetery_country.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 4.2.5 on 2023-11-03 15:04

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):
dependencies = [
("cmp", "0001_initial"),
]

operations = [
migrations.AlterField(
model_name="cemetery",
name="country",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="cemeteries",
to="cmp.country",
to_field="CountryNumber",
),
),
]
30 changes: 0 additions & 30 deletions cmp/migrations/0002_country.py
View file

This file was deleted.

Loading

0 comments on commit e37c3bc

Please sign in to comment.