From 6515d15ea6dc7190b457307a7bd7a0b419926679 Mon Sep 17 00:00:00 2001
From: Rachel TORCHET <racheltorchet@users.noreply.github.com>
Date: Wed, 13 Dec 2017 15:54:50 +0100
Subject: [PATCH] Add Clear all button to start again/empty the form + change
the Composition form into a formset which broke PPI form (dict instead of
simple data)
Former-commit-id: 75bfcdcf4564749ab2cdfcfa80ef1d142cc6d72f
---
ippisite/ippidb/forms.py | 25 +++----
ippisite/ippidb/static/css/ippidb.css | 19 +++++
ippisite/ippidb/static/js/ippidb.js | 9 ++-
.../ippidb/templates/BibliographyForm.html | 3 +-
ippisite/ippidb/templates/CompoundForm.html | 75 ++++++++++---------
ippisite/ippidb/templates/IdForm.html | 3 +-
ippisite/ippidb/templates/PDBForm.html | 4 +-
ippisite/ippidb/templates/PpiForm.html | 3 +-
.../templates/ProteinDomainComplexForm.html | 34 ++++-----
.../ProteinDomainComplexTypeForm.html | 7 +-
.../{ActivityForm.html => TestsForm.html} | 7 +-
ippisite/ippidb/urls.py | 2 +-
ippisite/ippidb/views.py | 12 +--
13 files changed, 115 insertions(+), 88 deletions(-)
rename ippisite/ippidb/templates/{ActivityForm.html => TestsForm.html} (63%)
diff --git a/ippisite/ippidb/forms.py b/ippisite/ippidb/forms.py
index 031c6d68..fa85bfa5 100644
--- a/ippisite/ippidb/forms.py
+++ b/ippisite/ippidb/forms.py
@@ -1,4 +1,4 @@
-from django.forms import ModelForm, modelformset_factory, formset_factory, BaseFormSet
+from django.forms import ModelForm, modelformset_factory, modelform_factory, formset_factory, BaseFormSet, BaseModelFormSet
from django import forms
from django.db import models
from django.core.exceptions import ValidationError
@@ -37,7 +37,7 @@ def validate_pdb_exists(value):
class PDBForm(forms.Form):
- pdb_id = forms.CharField(label="PDB ID", max_length=4, widget=forms.TextInput(attrs={'placeholder': 'e.g 4HHB', 'required': 'required'}), required=True, validators=[
+ pdb_id = forms.CharField(label="PDB ID", max_length=4, widget=forms.TextInput(attrs={'placeholder': 'e.g 3u85', 'required': 'required'}), required=True, validators=[
RegexValidator(
'^[0-9][a-zA-Z0-9]{3}$', message='PDB ID must be 1 numeric + 3 alphanumeric characters'),
validate_pdb_exists
@@ -83,18 +83,15 @@ class ProteinDomainComplexTypeForm(forms.Form):
complexChoice=forms.CharField(label="PPI Complex Type", widget=forms.Select(choices=TYPE_COMPLEX))
complexType=forms.CharField(widget=forms.RadioSelect(choices=TYPE_CHOICES))
-
class ProteinDomainComplexForm(ModelForm):
class Meta:
- model = ProteinDomainComplex
- fields = ['protein','domain','ppc_copy_nb']
-
- """def __init__(self, id, *args, **kwargs):
- super(ProteinDomainComplexForm, self).__init__(*args, **kwargs)
- self.fields['protein'].queryset = ProteinDomainComplex.objects.filter(id=id)
- self.fields['domain'].queryset = ProteinDomainComplex.objects.filter(id=id)
-"""
+ model=ProteinDomainComplex
+ fields=['protein', 'domain', 'ppc_copy_nb']
+
+
+ProteinDomainComplexFormSet = modelformset_factory(ProteinDomainComplex, fields=('protein', 'domain', 'ppc_copy_nb'), max_num=2)
+
class PpiForm(ModelForm):
@@ -137,14 +134,14 @@ class BaseCompoundFormSet(BaseFormSet):
form.fields["molecule"] = forms.CharField(widget=forms.RadioSelect(choices=TYPE_MOLECULE, attrs={'onclick':"showMol(this.id)"}))
form.fields["molecule_comp"] = forms.CharField()
-CompoundFormSet = formset_factory(CompoundForm, formset=BaseCompoundFormSet, extra=2)
+CompoundFormSet = formset_factory(CompoundForm, formset=BaseCompoundFormSet)
formset = CompoundFormSet()
-class ActivityForm(ModelForm):
+class TestsForm(ModelForm):
class Meta:
model=TestActivityDescription
- fields=['test_type','test_name','test_modulation_type']
+ fields=['test_name','test_type','test_modulation_type', 'cell_line']
#CompoundFormSet = modelformset_factory(
diff --git a/ippisite/ippidb/static/css/ippidb.css b/ippisite/ippidb/static/css/ippidb.css
index c7ec807e..9cdf60fa 100644
--- a/ippisite/ippidb/static/css/ippidb.css
+++ b/ippisite/ippidb/static/css/ippidb.css
@@ -100,6 +100,10 @@ html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pr
display: none;
}
+.clear_all{
+ font-size: 14px;
+}
+
#main-header{
margin-bottom: 2px;
}
@@ -1793,6 +1797,21 @@ button, input, select, textarea {
width:30%;
}
+.add_form div{
+ background-color: #8D8889;
+ color: #FFFFFF;
+}
+
+.add_form div:hover{
+ cursor: pointer;
+ background-color: #484848;
+ color: #FFFFFF;
+}
+
+.add_form div:active {
+ background-color: #484848;
+}
+
.add_field_button{
width:10%;
}
diff --git a/ippisite/ippidb/static/js/ippidb.js b/ippisite/ippidb/static/js/ippidb.js
index 7bf09fd5..f8827b24 100644
--- a/ippisite/ippidb/static/js/ippidb.js
+++ b/ippisite/ippidb/static/js/ippidb.js
@@ -25,7 +25,6 @@ function AnEventHasOccurred(id) {
document.getElementById("Name_"+id).innerHTML = "Compound "+ document.getElementById(id).value;
}
-
// CompoundForm - Function to hide/show input field according to the chosen type of molecule
function showMol(id){
var newID=id.slice(0, -1);
@@ -61,6 +60,14 @@ function showMol(id){
}
}
+// Function to add/remove form in CoumpoundFormSet
+function addComp(id){
+ var div = document.getElementById("compound_"+id);
+ clone = div.cloneNode(true);
+ console.log(id);
+ document.getElementById("compound_"+id).appendChild(clone);
+}
+
// Function to enlarge some part of the main page
$(document).ready(function(){
$('.box').on('click','.box__inner',function() {
diff --git a/ippisite/ippidb/templates/BibliographyForm.html b/ippisite/ippidb/templates/BibliographyForm.html
index 508db7e6..b221e936 100644
--- a/ippisite/ippidb/templates/BibliographyForm.html
+++ b/ippisite/ippidb/templates/BibliographyForm.html
@@ -11,7 +11,7 @@
<li><a href='/admin-session/add/ProteinDomainComplexForm/'>{% trans "Composition" %}</a></li>
<li><a href='/admin-session/add/PPIForm/'>{% trans "PPI" %}</a></li>
<li><a href='/admin-session/add/CompoundForm/'>{% trans "Compounds" %}</a></li>
- <li><a href='/admin-session/add/ActivityForm/'>{% trans "Activity" %}</a></li>
+ <li><a href='/admin-session/add/TestsForm/'>{% trans "Tests" %}</a></li>
</ul>
</div>
<div id="Form">
@@ -78,6 +78,7 @@
{% endif %}
</table>
<input type="submit" value="{% trans "Next step" %}"/>
+ <a href="{% url 'ippidb' %}?reset" class="clear_all">Clear all</a>
</form>
</div>
</div>
diff --git a/ippisite/ippidb/templates/CompoundForm.html b/ippisite/ippidb/templates/CompoundForm.html
index 29361b6b..a771a3df 100644
--- a/ippisite/ippidb/templates/CompoundForm.html
+++ b/ippisite/ippidb/templates/CompoundForm.html
@@ -11,7 +11,7 @@
<li><a class="validate" href='/admin-session/add/ProteinDomainComplexForm/'>{% trans "Composition" %}</a></li>
<li><a class="validate" href='/admin-session/add/PPIForm/'>{% trans "PPI" %}</a></li>
<li><a class="active" href='/admin-session/add/CompoundForm/'>{% trans "Compounds" %}</a></li>
- <li><a href='/admin-session/add/ActivityForm/'>{% trans "Activity" %}</a></li>
+ <li><a href='/admin-session/add/TestsForm/'>{% trans "Tests" %}</a></li>
</ul>
</div>
<div id="Form">
@@ -24,49 +24,52 @@
<form action="" method="post">
{% csrf_token %}
<table>
- {{ formset.management_form }}
- {{ wizard.management_form }}
{{ wizard.form.errors}}
- {{ wizard.form.non_field_errors}}
- {% block custom_form %}{% endblock %}
-
+ {{ wizard.form.non_field_errors}}
{% if wizard.form.forms %}
- {{ wizard.form.management_form }}
- {{ formset.management_form }}
{% for form in wizard.form.forms %}
- <div class="compound">
- <h1 id="Name_{{ form.compound_name.id_for_label }}">Compound</h1>
- <h2>Name your compound</h2>
- <div class="compound_input">{{ form.common_name }}</div>
- <div class="compound_input">{{ form.compound_name }}</div>
- <h2>Choose a format to import your molecule</h2>
- <div id="compound_mol">
- {% for radio in form.molecule %}
- <div class="compound_radio_{{ radio.choice_label }}">
- {{ radio.tag }}
- <label for="{{ radio.id_for_label }}">
- <span>{{ radio.choice_label }}</span>
- </label>
+ <div class="compound">
+ <div id="compound_{{ form.compound_name.id_for_label }}">
+ <h1 id="Name_{{ form.compound_name.id_for_label }}">Compound</h1>
+ <h2>Name your compound</h2>
+ <div class="compound_input">{{ form.common_name }}</div>
+ <div class="compound_input">{{ form.compound_name }}</div>
+ <h2>Choose a format to import your molecule</h2>
+ <div id="compound_mol">
+ {% for radio in form.molecule %}
+ <div class="compound_radio_{{ radio.choice_label }}">
+ {{ radio.tag }}
+ <label for="{{ radio.id_for_label }}">
+ <span>{{ radio.choice_label }}</span>
+ </label>
+ </div>
+ {% endfor %}
+ </div>
+ <div id="divSmiles_{{ form.molecule.id_for_label }}">
+ <input type="text" name="smiles" id="in-smiles_{{ form.compound_name.id_for_label }}" placeholder="Paste the SMILES of your molecule here" required>
+ </div>
+ <div id="divIupac_{{ form.molecule.id_for_label }}" class="hide">
+ <input type="text" name="iupac" id="in-iupac_{{ form.compound_name.id_for_label }}" placeholder="Paste the IUPAC of your molecule here">
+ </div>
+ <div id="divSketch_{{ form.molecule.id_for_label }}" class="hide">
+ <input type="text" name="sketch" id="in-sketch_{{ form.compound_name.id_for_label }}" placeholder="Sketch your molecule here">
+ </div>
+ <div id="ck-button-long" class="compound_input">
+ <label>{{ form.is_macrocycle}}<span>{{ form.is_macrocycle.label }}</span></label>
+ </div>
+ </div>
+ <div class="add_form">
+ <div id="{{ form.compound_name.id_for_label }}" onclick="addComp(this.id)">Add compound<div>
</div>
- {% endfor %}
- </div>
- <div id="divSmiles_{{ form.molecule.id_for_label }}">
- <input type="text" name="smiles" id="in-smiles_{{ form.compound_name.id_for_label }}" placeholder="Paste the SMILES of your molecule here" required>
- </div>
- <div id="divIupac_{{ form.molecule.id_for_label }}" class="hide">
- <input type="text" name="iupac" id="in-iupac_{{ form.compound_name.id_for_label }}" placeholder="Paste the IUPAC of your molecule here">
- </div>
- <div id="divSketch_{{ form.molecule.id_for_label }}" class="hide">
- <input type="text" name="sketch" id="in-sketch_{{ form.compound_name.id_for_label }}" placeholder="Sketch your molecule here">
- </div>
- <div id="ck-button-long" class="compound_input">
- <label>{{ form.is_macrocycle}}<span>{{ form.is_macrocycle.label }}</span></label>
</div>
- </div>
{% endfor %}
+
{% endif %}
</table>
- <input type="submit" value="{% trans "Next step" %}"/>
+ <div>
+ <input type="submit" value="{% trans "Next step" %}"/>
+ <a href="{% url 'ippidb' %}?reset" class="clear_all">Clear all</a>
+ </div>
</form>
</div>
</div>
diff --git a/ippisite/ippidb/templates/IdForm.html b/ippisite/ippidb/templates/IdForm.html
index 5b8e04a1..672bb189 100644
--- a/ippisite/ippidb/templates/IdForm.html
+++ b/ippisite/ippidb/templates/IdForm.html
@@ -11,7 +11,7 @@
<li><a href='/admin-session/add/ProteinDomainComplexForm/'>{% trans "Composition" %}</a></li>
<li><a href='/admin-session/add/PPIForm/'>{% trans "PPI" %}</a></li>
<li><a href='/admin-session/add/CompoundForm/'>{% trans "Compounds" %}</a></li>
- <li><a href='/admin-session/add/ActivityForm/'>{% trans "Activity" %}</a></li>
+ <li><a href='/admin-session/add/TestsForm/'>{% trans "Tests" %}</a></li>
</ul>
</div>
<div id="Form">
@@ -49,6 +49,7 @@
{% endif %}
</table>
<input type="submit" value="{% trans "Get Infos" %}"/>
+ <a href="{% url 'ippidb' %}?reset" class="clear_all">Clear all</a>
</form>
</div>
</div>
diff --git a/ippisite/ippidb/templates/PDBForm.html b/ippisite/ippidb/templates/PDBForm.html
index 12d439ac..042ccf6a 100644
--- a/ippisite/ippidb/templates/PDBForm.html
+++ b/ippisite/ippidb/templates/PDBForm.html
@@ -11,7 +11,7 @@
<li><a href='/admin-session/add/ProteinDomainComplexForm/'>{% trans "Composition" %}</a></li>
<li><a href='/admin-session/add/PPIForm/'>{% trans "PPI" %}</a></li>
<li><a href='/admin-session/add/CompoundForm/'>{% trans "Compounds" %}</a></li>
- <li><a href='/admin-session/add/ActivityForm/'>{% trans "Activity" %}</a></li>
+ <li><a href='/admin-session/add/TestsForm/'>{% trans "Tests" %}</a></li>
</ul>
</div>
<div id="Form">
@@ -26,7 +26,6 @@
<table>
{{ wizard.management_form }}
{{ wizard.form.non_field_errors}}
- {% block custom_form %}{% endblock %}
{% if wizard.form.forms %}
{{ wizard.form.management_form }}
@@ -39,6 +38,7 @@
{% endif %}
</table>
<input type="submit" value="{% trans "Next step" %}"/>
+ <a href="{% url 'ippidb' %}?reset" class="clear_all">Clear all</a>
</form>
</div>
</div>
diff --git a/ippisite/ippidb/templates/PpiForm.html b/ippisite/ippidb/templates/PpiForm.html
index 48c98c67..1ca73180 100644
--- a/ippisite/ippidb/templates/PpiForm.html
+++ b/ippisite/ippidb/templates/PpiForm.html
@@ -11,7 +11,7 @@
<li><a class="validate" href='/admin-session/add/ProteinDomainComplexForm/'>{% trans "Composition" %}</a></li>
<li><a class="active" href='/admin-session/add/PPIForm/'>{% trans "PPI" %}</a></li>
<li><a href='/admin-session/add/CompoundForm/'>{% trans "Compounds" %}</a></li>
- <li><a href='/admin-session/add/ActivityForm/'>{% trans "Activity" %}</a></li>
+ <li><a href='/admin-session/add/TestsForm/'>{% trans "Tests" %}</a></li>
</ul>
</div>
<div id="Form">
@@ -47,6 +47,7 @@
{% endif %}
</table>
<input type="submit" value="{% trans "Next step" %}"/>
+ <a href="{% url 'ippidb' %}?reset" class="clear_all">Clear all</a>
</form>
<div>
</div>
diff --git a/ippisite/ippidb/templates/ProteinDomainComplexForm.html b/ippisite/ippidb/templates/ProteinDomainComplexForm.html
index 20264b5e..8299ca28 100644
--- a/ippisite/ippidb/templates/ProteinDomainComplexForm.html
+++ b/ippisite/ippidb/templates/ProteinDomainComplexForm.html
@@ -11,32 +11,27 @@
<li><a class="active" href='/admin-session/add/ProteinDomainComplexForm/'>{% trans "Composition" %}</a></li>
<li><a href='/admin-session/add/PPIForm/'>{% trans "PPI" %}</a></li>
<li><a href='/admin-session/add/CompoundForm/'>{% trans "Compounds" %}</a></li>
- <li><a href='/admin-session/add/ActivityForm/'>{% trans "Activity" %}</a></li>
+ <li><a href='/admin-session/add/TestsForm/'>{% trans "Tests" %}</a></li>
</ul>
</div>
<div id="Form">
+ <div class="step_step_desc">
+ <h1 class="step_title">Bound and Partner</h1>
+ <p class="step_step">Step {{ wizard.steps.step1 }} on {{ wizard.steps.count }}</p>
+ <p>You have selected a <span style="color:#2d96fa;">{{ complex_type }}</span> that is <span style="color:#2d96fa;">{{ complex_choice }}</span> by the binding of PPI modulator.<br/>
+ According to this architecture you need to specify:<br/>
+ </p>
+ </div>
<div class="form_div">
<form action="" method="post">
{% csrf_token %}
- {{ wizard.management_form }}
{{ wizard.form.errors}}
- {{ wizard.form.non_field_errors}}
- {% block custom_form %}{% endblock %}
-
+ {{ wizard.form.non_field_errors}}
+ {{ wizard.management_form }}
+ {{ ProteinDomainComplexFormSet.management_form }}
{% if wizard.form.forms %}
- {{ wizard.form.management_form }}
- {% for form in wizard.form.forms %}
- {{ form }}
- {% endfor %}
- {% else %}
- <div class="step_step_desc">
- <h1 class="step_title">Bound and Partner</h1>
- <p class="step_step">Step {{ wizard.steps.step1 }} on {{ wizard.steps.count }}</p>
- <p>You have selected a <span style="color:#2d96fa;">{{ complex_type }}</span> that is <span style="color:#2d96fa;">{{ complex_choice }}</span> by the binding of PPI modulator.<br/>
- According to this architecture you need to specify:<br/>
- </p>
- </div>
+ <table>
<div class="inline_box_complex">
<div class="inline_label"> Bound complex : </div>
<div class="inline_field"> {{ form.protein }}</div>
@@ -48,10 +43,11 @@
<div class="inline_field"> {{ form.protein }}</div>
<div class="inline_field"> {{ form.domain }}</div>
<div class="inline_field"><div>{{ form.ppc_copy_nb }}</div></div>
- </div>
+ </div>
+ </table>
{% endif %}
-
<input type="submit" value="{% trans "Next step" %}"/>
+ <a href="{% url 'ippidb' %}?reset" class="clear_all">Clear all</a>
</form>
</div>
</div>
diff --git a/ippisite/ippidb/templates/ProteinDomainComplexTypeForm.html b/ippisite/ippidb/templates/ProteinDomainComplexTypeForm.html
index 76fc071f..919d2cfe 100644
--- a/ippisite/ippidb/templates/ProteinDomainComplexTypeForm.html
+++ b/ippisite/ippidb/templates/ProteinDomainComplexTypeForm.html
@@ -11,7 +11,7 @@
<li><a href='/admin-session/add/ProteinDomainComplexForm/'>{% trans "Composition" %}</a></li>
<li><a href='/admin-session/add/PPIForm/'>{% trans "PPI" %}</a></li>
<li><a href='/admin-session/add/CompoundForm/'>{% trans "Compounds" %}</a></li>
- <li><a href='/admin-session/add/ActivityForm/'>{% trans "Activity" %}</a></li>
+ <li><a href='/admin-session/add/TestsForm/'>{% trans "Tests" %}</a></li>
</ul>
</div>
<div id="Form">
@@ -26,9 +26,7 @@ If your PPI complex is not among them, please select « Custom »</p>
{% csrf_token %}
<table>
{{ wizard.management_form }}
- {{ wizard.form.non_field_errors}}
- {% block custom_form %}{% endblock %}
-
+ {{ wizard.form.non_field_errors}}
{% if wizard.form.forms %}
{{ wizard.form.management_form }}
{% for form in wizard.form.forms %}
@@ -91,6 +89,7 @@ If your PPI complex is not among them, please select « Custom »</p>
{% endif %}
</table>
<input type="submit" value="{% trans "Next step" %}"/>
+ <a href="{% url 'ippidb' %}?reset" class="clear_all">Clear all</a>
</form>
</div>
</div>
diff --git a/ippisite/ippidb/templates/ActivityForm.html b/ippisite/ippidb/templates/TestsForm.html
similarity index 63%
rename from ippisite/ippidb/templates/ActivityForm.html
rename to ippisite/ippidb/templates/TestsForm.html
index fdbfd64e..1a8eb21c 100644
--- a/ippisite/ippidb/templates/ActivityForm.html
+++ b/ippisite/ippidb/templates/TestsForm.html
@@ -11,12 +11,14 @@
<li><a class="validate" href='/admin-session/add/ProteinDomainComplexForm/'>{% trans "Composition" %}</a></li>
<li><a class="validate" href='/admin-session/add/PPIForm/'>{% trans "PPI" %}</a></li>
<li><a class="validate" href='/admin-session/add/CompoundForm/'>{% trans "Compounds" %}</a></li>
- <li><a class="active" href='/admin-session/add/ActivityForm/'>{% trans "Activity" %}</a></li>
+ <li><a class="active" href='/admin-session/add/TestsForm/'>{% trans "Tests" %}</a></li>
</ul>
</div>
<div id="Form">
<div class="step_desc">
- <p> Activity test </p>
+ <h1 class="step_title">Tests performed</h1>
+ <p class="step_step">Step {{ wizard.steps.step1 }} on {{ wizard.steps.count }}</p>
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam vulputate felis ac augue pretium, ac blandit lectus mattis. Vestibulum iaculis consequat facilisis. Duis porttitor erat mauris, non porttitor eros feugiat eu. Pellentesque id nisl vel nisl imperdiet convallis vel sed lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec dolor urna, posuere vitae leo quis, hendrerit imperdiet enim. Nunc nec euismod nisi. Phasellus ut ante ante.</p>
</div>
<div class="form_div">
<form action="" method="post">
@@ -37,6 +39,7 @@
{% endif %}
</table>
<input type="submit" value="{% trans "submit" %}"/>
+ <a href="{% url 'ippidb' %}?reset" class="clear_all">Clear all</a>
</form>
</div>
</div>
diff --git a/ippisite/ippidb/urls.py b/ippisite/ippidb/urls.py
index 5c121515..cca12b30 100644
--- a/ippisite/ippidb/urls.py
+++ b/ippisite/ippidb/urls.py
@@ -1,6 +1,6 @@
from django.conf.urls import include, url
from . import views
-from ippidb.forms import IdForm,BibliographyForm, PDBForm, ProteinDomainComplexTypeForm, ProteinDomainComplexForm, PpiForm
+from ippidb.forms import IdForm,BibliographyForm, PDBForm, ProteinDomainComplexTypeForm, ProteinDomainComplexForm, ProteinDomainComplexFormSet,PpiForm, PpiComplexForm, ProteinFormSet,TestsForm, CompoundForm, CompoundFormSet
from ippidb.views import IppiWizard, FORMS
ippidb_wizard = IppiWizard.as_view(FORMS,
diff --git a/ippisite/ippidb/views.py b/ippisite/ippidb/views.py
index e62f82c2..97347068 100644
--- a/ippisite/ippidb/views.py
+++ b/ippisite/ippidb/views.py
@@ -4,7 +4,7 @@ from django.shortcuts import render
from django.http import HttpResponseRedirect, Http404
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
from formtools.wizard.views import SessionWizardView, NamedUrlSessionWizardView
-from .forms import IdForm, BibliographyForm, PDBForm, ProteinForm, ProteinDomainComplexTypeForm, ProteinDomainComplexForm, PpiForm, PpiComplexForm, ProteinFormSet,ActivityForm, CompoundForm, CompoundFormSet
+from .forms import IdForm, BibliographyForm, PDBForm, ProteinForm, ProteinDomainComplexTypeForm, ProteinDomainComplexForm, ProteinDomainComplexFormSet, PpiForm, PpiComplexForm, ProteinFormSet,TestsForm, CompoundForm, CompoundFormSet
from .models import Protein, Bibliography, ProteinDomainComplex, RefCompoundBiblio, TestActivityDescription, Compound, Ppi
from .ws import get_pdb_uniprot_mapping
@@ -56,10 +56,10 @@ FORMS = [("IdForm", ippidb.forms.IdForm),
("PDBForm", ippidb.forms.PDBForm),
("ProteinDomainComplexTypeForm",
ippidb.forms.ProteinDomainComplexTypeForm),
- ("ProteinDomainComplexForm", ippidb.forms.ProteinDomainComplexForm),
+ ("ProteinDomainComplexForm", ippidb.forms.ProteinDomainComplexFormSet),
("PpiForm", ippidb.forms.PpiForm),
("CompoundForm", ippidb.forms.CompoundFormSet),
- ("ActivityForm", ippidb.forms.ActivityForm),]
+ ("TestsForm", ippidb.forms.TestsForm),]
TEMPLATES = {"IdForm": "IdForm.html",
"BibliographyForm": "BibliographyForm.html",
@@ -68,7 +68,7 @@ TEMPLATES = {"IdForm": "IdForm.html",
"ProteinDomainComplexForm": "ProteinDomainComplexForm.html",
"PpiForm": "PpiForm.html",
"CompoundForm":"CompoundForm.html",
- "ActivityForm":"ActivityForm.html",
+ "TestsForm":"TestsForm.html",
}
@@ -156,9 +156,9 @@ class IppiWizard(NamedUrlSessionWizardView):
pk = self.storage.get_step_data('IdForm').get('pk')
return Bibliography.objects.get(pk=pk)
if self.steps.current == 'ProteinDomainComplexTypeForm':
- print(self.storage.get_step_data('PDBForm').get('pks'))
+ print("blablabla", self.storage.get_step_data('PDBForm').get('pks'))
pks = self.storage.get_step_data('PDBForm').get('pks')
- print(self.storage.get_step_data('PDBForm').get('pks'))
+ print("blablabla", self.storage.get_step_data('PDBForm').get('pks'))
return Protein.objects.filter(id__in=pks)
def get_template_names(self):
--
GitLab