Skip to content

Commit

Permalink
update database
Browse files Browse the repository at this point in the history
  • Loading branch information
@wseis
wseis committed Apr 11, 2022
1 parent d3e2ce8 commit 56ded9a
Show file tree
Hide file tree
Showing 9 changed files with 46 additions and 154 deletions.
1 change: 1 addition & 0 deletions qmra
Submodule qmra added at d3e2ce
Binary file removed tools/db.sqlite3
View file
Binary file not shown.
Binary file modified tools/qmra.db
View file
Binary file not shown.
44 changes: 22 additions & 22 deletions tools/qmratool/migrations/0001_initial.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 3.1.7 on 2021-03-09 21:00
# Generated by Django 4.0.3 on 2022-04-11 05:06

from django.conf import settings
import django.contrib.auth.models
Expand All @@ -20,7 +20,7 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='User',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('password', models.CharField(max_length=128, verbose_name='password')),
('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
Expand All @@ -31,8 +31,8 @@ class Migration(migrations.Migration):
('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')),
('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')),
('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')),
('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')),
],
options={
'verbose_name': 'user',
Expand All @@ -46,57 +46,57 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Exposure',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=250)),
('description', models.CharField(max_length=250)),
('events_per_year', models.IntegerField(default=10)),
('volume_per_event', models.DecimalField(decimal_places=4, max_digits=10)),
('volume_per_event', models.DecimalField(decimal_places=6, max_digits=10)),
],
),
migrations.CreateModel(
name='PathogenGroup',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('pathogen_group', models.CharField(max_length=64)),
('description', models.TextField(max_length=2000)),
],
),
migrations.CreateModel(
name='QA',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('question', models.CharField(max_length=120)),
('answer', models.TextField(max_length=20000)),
],
),
migrations.CreateModel(
name='Reference',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=50)),
('link', models.URLField(blank=True)),
],
),
migrations.CreateModel(
name='SourceWater',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('water_source_name', models.CharField(max_length=64)),
('water_source_description', models.CharField(max_length=2000)),
],
),
migrations.CreateModel(
name='Text',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=120)),
('content', models.TextField(max_length=20000)),
],
),
migrations.CreateModel(
name='Treatment',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=64)),
('group', models.CharField(default='wastewater', max_length=64)),
('category', models.CharField(choices=[('wastewater', 'wastewater'), ('drinking_water', 'drinking water'), ('surface_water', 'surface water')], default='wastewater', max_length=64)),
Expand All @@ -107,19 +107,19 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='RiskAssessment',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(default='', max_length=64)),
('description', models.TextField(blank=True, max_length=500)),
('exposure', models.ForeignKey(blank=True, default=1, null=True, on_delete=django.db.models.deletion.CASCADE, to='qmratool.exposure')),
('source', models.ForeignKey(blank=True, default=1, on_delete=django.db.models.deletion.PROTECT, to='qmratool.sourcewater')),
('treatment', models.ManyToManyField(blank=True, default=1, related_name='treatments', to='qmratool.Treatment')),
('treatment', models.ManyToManyField(blank=True, default=1, related_name='treatments', to='qmratool.treatment')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='assessments', to=settings.AUTH_USER_MODEL)),
],
),
migrations.CreateModel(
name='Pathogen',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('pathogen', models.CharField(default='Rota', max_length=64)),
('description', models.TextField(max_length=2000)),
('pathogen_group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='pathogens', to='qmratool.pathogengroup')),
Expand All @@ -128,7 +128,7 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='LogRemoval',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('min', models.DecimalField(decimal_places=1, max_digits=4)),
('max', models.DecimalField(decimal_places=1, max_digits=4)),
('mean', models.DecimalField(decimal_places=3, max_digits=6, null=True)),
Expand All @@ -143,7 +143,7 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Inflow',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('min', models.DecimalField(decimal_places=8, default=-100, max_digits=20)),
('max', models.DecimalField(decimal_places=8, default=-100, max_digits=20)),
('mean', models.DecimalField(decimal_places=8, default=-100, max_digits=20, null=True)),
Expand All @@ -160,7 +160,7 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Health',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('infection_to_illness', models.DecimalField(decimal_places=2, max_digits=3)),
('dalys_per_case', models.DecimalField(decimal_places=6, max_digits=6)),
('pathogen', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='qmratool.pathogen')),
Expand All @@ -170,7 +170,7 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Guideline',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=250)),
('description', models.CharField(max_length=250)),
('reference', models.ForeignKey(default=40, on_delete=django.db.models.deletion.CASCADE, to='qmratool.reference')),
Expand All @@ -189,7 +189,7 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='DoseResponse',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('bestfitmodel', models.CharField(default='unknown', max_length=250)),
('k', models.DecimalField(decimal_places=10, default=0, max_digits=20)),
('alpha', models.DecimalField(decimal_places=10, default=0, max_digits=20)),
Expand All @@ -205,8 +205,8 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Comparison',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('risk_assessment', models.ManyToManyField(blank=True, to='qmratool.RiskAssessment')),
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('risk_assessment', models.ManyToManyField(blank=True, to='qmratool.riskassessment')),
],
),
]
20 changes: 20 additions & 0 deletions tools/qmratool/migrations/0002_alter_exposure_user.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Generated by Django 4.0.3 on 2022-04-11 05:23

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


class Migration(migrations.Migration):

dependencies = [
('qmratool', '0001_initial'),
]

operations = [
migrations.AlterField(
model_name='exposure',
name='user',
field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='scenarios', to=settings.AUTH_USER_MODEL),
),
]
18 changes: 0 additions & 18 deletions tools/qmratool/migrations/0002_auto_20210407_1443.py
View file

This file was deleted.

18 changes: 0 additions & 18 deletions tools/qmratool/migrations/0003_auto_20210410_1010.py
View file

This file was deleted.

93 changes: 0 additions & 93 deletions tools/qmratool/migrations/0004_alter_comparison_id_alter_doseresponse_id_and_more.py
View file

This file was deleted.

6 changes: 3 additions & 3 deletions tools/qmratool/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def serialize(self):


class Treatment(models.Model):
user = models.ForeignKey(User, related_name="treatments", on_delete=models.CASCADE)
user = models.ForeignKey(User, related_name="treatments", default = 1, on_delete=models.CASCADE)
name = models.CharField(max_length=64)
group=models.CharField(max_length=64, default = "wastewater")
category=models.CharField(max_length=64, choices=[("wastewater", "wastewater"),
Expand Down Expand Up @@ -88,7 +88,7 @@ class Health(models.Model):
infection_to_illness=models.DecimalField( decimal_places=2, max_digits=3)
dalys_per_case=models.DecimalField(decimal_places=6, max_digits=6)
def __str__(self):
return self.pathogen.name
return self.pathogen.pathogen

class DoseResponse(models.Model):
pathogen= models.ForeignKey(Pathogen, on_delete=models.CASCADE)
Expand All @@ -111,7 +111,7 @@ class Guideline(models.Model):


class Exposure(models.Model):
user = models.ForeignKey(User, related_name="scenarios", on_delete=models.CASCADE)
user = models.ForeignKey(User, related_name="scenarios", default = 1, on_delete=models.CASCADE)
name = models.CharField(max_length=250)
description = models.CharField(max_length=250)
events_per_year = models.IntegerField(default = 10)
Expand Down

0 comments on commit 56ded9a

Please sign in to comment.