diff --git a/ippisite/ippidb/forms.py b/ippisite/ippidb/forms.py
index 031c6d68a9f7e897991020d351de1bfc27136966..fa85bfa572d801ee039e08c32f090375a42dddc5 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 c7ec807e645a24b223245600236cada2330626f8..9cdf60fab3a4a0dc2c785b7648c38d89586ef35a 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 7bf09fd57994e4c9e919ff7247c7d8a622f8d55a..f8827b243bad216e7c46f04f97963ee7785d8d74 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 508db7e66806463ead9e542b98209d427864ec43..b221e936e1b9d980c7388750c1709fd885854c57 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 29361b6bd8490a5c0140169d83b581a6f2368934..a771a3df1538fa8f99c22875e0ce747ac45c3709 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 5b8e04a1c55ba653b4d8fda714dca1bfe6bab88e..672bb18942087cf4eef2733cd920bf6cc464c4a3 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 12d439acb441f0017331f070a0b986c21827fc99..042ccf6adf1e2aad01f4d8805078d53dd005c393 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 48c98c67598a7ecf62f251914c9d153337c6a97a..1ca7318031c20662d900acc54cd784b90753ff5a 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 20264b5e9b37a333058bb8549d0b5017cd759710..8299ca283da521205dd06fae475a441101da1110 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 76fc071f914d7c9dcf51cb0395dc327b539701bb..919d2cfe41a8b2489806068060606b1db2cfbc17 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 fdbfd64eff2ca780652d3cd0bd346938dc3f906c..1a8eb21ca8010583a00c282ae818df7263643538 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 5c1215153fb21041bf994d6e7f3ef5a38294ae18..cca12b30a93bb841fd3d9a58aad68e98dc119dfb 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 e62f82c272d3c3ff10084083df887b08f93d95c7..97347068b5da694a470642edf31d9ceb5b3b4ad7 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):