From e2bc2c8a83547304f60ab6ed2c732d62b1cd181d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20=20MENAGER?= <herve.menager@pasteur.fr> Date: Wed, 7 Mar 2018 15:15:30 +0100 Subject: [PATCH] change model for TestActivityDescription fol. conv. with @osperand WIP for #27 Former-commit-id: 0a396477406508e1634db8beee067d8885510b1e --- .../migrations/0027_auto_20180307_1327.py | 39 +++++++++++++++++++ .../migrations/0028_auto_20180307_1405.py | 20 ++++++++++ ippisite/ippidb/models.py | 7 ++++ 3 files changed, 66 insertions(+) create mode 100644 ippisite/ippidb/migrations/0027_auto_20180307_1327.py create mode 100644 ippisite/ippidb/migrations/0028_auto_20180307_1405.py diff --git a/ippisite/ippidb/migrations/0027_auto_20180307_1327.py b/ippisite/ippidb/migrations/0027_auto_20180307_1327.py new file mode 100644 index 00000000..dcc95b76 --- /dev/null +++ b/ippisite/ippidb/migrations/0027_auto_20180307_1327.py @@ -0,0 +1,39 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11 on 2018-03-07 13:27 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('ippidb', '0026_auto_20171110_1426'), + ] + + operations = [ + migrations.AddField( + model_name='testactivitydescription', + name='is_primary', + field=models.BooleanField(default=False, verbose_name='Is primary'), + preserve_default=False, + ), + migrations.AddField( + model_name='testactivitydescription', + name='protein_bound_construct', + field=models.CharField(choices=[('F', 'Full length'), ('U', 'Unspecified')], default='U', max_length=5, verbose_name='Protein bound construct'), + preserve_default=False, + ), + migrations.AddField( + model_name='testactivitydescription', + name='protein_domain_bound_complex', + field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='ippidb.ProteinDomainBoundComplex'), + preserve_default=False, + ), + migrations.AlterField( + model_name='protein', + name='organism', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ippidb.Taxonomy'), + ), + ] diff --git a/ippisite/ippidb/migrations/0028_auto_20180307_1405.py b/ippisite/ippidb/migrations/0028_auto_20180307_1405.py new file mode 100644 index 00000000..4ac71bf7 --- /dev/null +++ b/ippisite/ippidb/migrations/0028_auto_20180307_1405.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11 on 2018-03-07 14:05 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ippidb', '0027_auto_20180307_1327'), + ] + + operations = [ + migrations.AlterField( + model_name='testactivitydescription', + name='protein_bound_construct', + field=models.CharField(blank=True, choices=[('F', 'Full length'), ('U', 'Unspecified')], max_length=5, null=True, verbose_name='Protein bound construct'), + ), + ] diff --git a/ippisite/ippidb/models.py b/ippisite/ippidb/models.py index 81350553..55e9612f 100644 --- a/ippisite/ippidb/models.py +++ b/ippisite/ippidb/models.py @@ -431,9 +431,16 @@ class TestActivityDescription(models.Model): ('I', 'Inhibition'), ('S', 'Stabilization') ) + PROTEIN_BOUND_CONSTRUCTS = ( + ('F', 'Full length'), + ('U', 'Unspecified') + ) biblio = models.ForeignKey(Bibliography, models.CASCADE) + protein_domain_bound_complex = models.ForeignKey(ProteinDomainBoundComplex, models.CASCADE) ppi = models.ForeignKey(Ppi, models.CASCADE, blank=True, null=True) test_name = models.CharField('Test name', max_length=100) + is_primary = models.BooleanField('Is primary') + protein_bound_construct = models.CharField('Protein bound construct', max_length=5, choices=PROTEIN_BOUND_CONSTRUCTS, blank=True, null=True) test_type = models.CharField('Test type', max_length=5, choices=TEST_TYPES) test_modulation_type = models.CharField( 'Test modulation type', max_length=1, choices=TEST_MODULATION_TYPES) -- GitLab