diff --git a/ippisite/ippidb/forms.py b/ippisite/ippidb/forms.py
index f69c0084babdf7570157ce594dfd0d61f2c2fd31..fe0f196ddd522d9ceaee8e161137219f3cea4b26 100644
--- a/ippisite/ippidb/forms.py
+++ b/ippisite/ippidb/forms.py
@@ -102,17 +102,13 @@ class ComplexCompositionForm(forms.Form):
def __init__(self,*args,**kwargs):
super(ComplexCompositionForm, self).__init__(*args, **kwargs)
+ """ TODO : Filter based on submited PDBid"""
self.fields['complex_protein'].queryset=Protein.objects.filter(pk__in=[569,570])
-class BaseProteinDomainComplexFormSet(BaseModelFormSet):
- def __init__(self, *args, **kwargs):
- super(BaseProteinDomainComplexFormSet,self).__init__(*args, **kwargs)
- self.queryset = ProteinDomainComplex.objects.none()
-
-ProteinDomainComplexFormSet = modelformset_factory(ProteinDomainComplex, form=ProteinDomainComplexForm, formset=BaseProteinDomainComplexFormSet, extra=2)
-formset= ProteinDomainComplexFormSet()
-#print(formset)
+ComplexCompositionFormSet = formset_factory(ComplexCompositionForm, extra=2)
+formset= ComplexCompositionFormSet()
+print(formset.is_valid())
class PpiForm(ModelForm):
@@ -154,7 +150,7 @@ class BaseCompoundFormSet(BaseFormSet):
form.fields["molecule"] = forms.CharField(widget=forms.Select(choices=TYPE_MOLECULE))
form.fields["molecule_comp"] = forms.CharField(widget=forms.TextInput(attrs={'placeholder':'Molecule composition', 'required':'required'}))
-CompoundFormSet = formset_factory(CompoundForm, formset=BaseCompoundFormSet, extra=2, max_num=500, can_delete=True)
+CompoundFormSet = formset_factory(CompoundForm, formset=BaseCompoundFormSet, max_num=500, can_delete=True)
formset = CompoundFormSet()
diff --git a/ippisite/ippidb/static/css/main.css b/ippisite/ippidb/static/css/main.css
index 65e3e8031daa4781f36be8cbea839ccdcd93b9ef..e4d17a2fd3acc82fcba74ee7d465f969d0b049b9 100644
--- a/ippisite/ippidb/static/css/main.css
+++ b/ippisite/ippidb/static/css/main.css
@@ -13,6 +13,9 @@ Description: IPPI-DB Theme
.clear_all{
font-size: 14px;
+ color: #007bff;
+ text-decoration: none;
+ font-family: "BrandonGrotesqueReg"
}
#main-header{
@@ -616,7 +619,6 @@ font-size: 42px;
padding: 10px;
min-height: 150px;
text-align: center;
- min-height: 350px;
border-top: 1px solid #2D96FA;
}
diff --git a/ippisite/ippidb/templates/BibliographyForm.html b/ippisite/ippidb/templates/BibliographyForm.html
index 7b48a540fc92d1a52524d42ef76a8ac5926c1f96..1cb7263bdde8a066512551c4456988a7bf98e312 100644
--- a/ippisite/ippidb/templates/BibliographyForm.html
+++ b/ippisite/ippidb/templates/BibliographyForm.html
@@ -80,7 +80,6 @@
{% endif %}
</table>
<input class="submit_button" type="submit" value="{% trans "Next step" %}"/>
- <div class="clear_button"><a href="{% url 'ippidb' %}?reset" class="clear_all">Clear all</a></div>
</form>
</div>
</div>
diff --git a/ippisite/ippidb/templates/CompoundForm.html b/ippisite/ippidb/templates/CompoundForm.html
index db55d706c174baedb8257ee61c1b2b24639c6fb4..fd72c2eee2dd93dced600e9452950acd9295c65b 100644
--- a/ippisite/ippidb/templates/CompoundForm.html
+++ b/ippisite/ippidb/templates/CompoundForm.html
@@ -60,7 +60,7 @@
</div>
</div>
{% endfor %}
- </div>
+ </div>
<!--<div class="add_form">
<div id="{{ form.compound_name.id_for_label }}" onclick="">Add compound<div>
</div>-->
@@ -68,7 +68,6 @@
<input type="hidden" name="ippi_wizard-current_step" value="CompoundForm" id="id_ippi_wizard-current_step"/>
</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/IdForm.html b/ippisite/ippidb/templates/IdForm.html
index 91446507da7c12e6ddc6517477572652c17fe095..ef8eeef8065dd15fba5d406b940e62917a19955c 100644
--- a/ippisite/ippidb/templates/IdForm.html
+++ b/ippisite/ippidb/templates/IdForm.html
@@ -51,7 +51,6 @@
{% endif %}
</table>
<input class="submit_button" type="submit" value="{% trans "Get Infos" %}"/>
- <div class="clear_button"><a href="{% url 'ippidb' %}?reset" class="clear_all">Clear all</a></div>
</form>
</div>
</div>
diff --git a/ippisite/ippidb/templates/PDBForm.html b/ippisite/ippidb/templates/PDBForm.html
index f9259f85d672e84f5cd04a774ff91f4f7156f731..50626d6d7e959970287c432aaab4383aac692e3a 100644
--- a/ippisite/ippidb/templates/PDBForm.html
+++ b/ippisite/ippidb/templates/PDBForm.html
@@ -40,7 +40,6 @@
{% endif %}
</table>
<input class="submit_button" type="submit" value="{% trans "Next step" %}"/>
- <div class="clear_button"><a href="{% url 'ippidb' %}?reset" class="clear_all">Clear all</a></div>
</form>
</div>
</div>
diff --git a/ippisite/ippidb/templates/PpiForm.html b/ippisite/ippidb/templates/PpiForm.html
index a49c8de059a1d7a288e99afb4c5283f1f38079fe..a632afd5021f807635311214332c77eedabac082 100644
--- a/ippisite/ippidb/templates/PpiForm.html
+++ b/ippisite/ippidb/templates/PpiForm.html
@@ -45,11 +45,9 @@
</div>
{% endif %}
</table>
-
- <input type="hidden" name="ippi_wizard-current_step" value="PpiAndPpiComplexForm" id="id_ippi_wizard-current_step"/>
+ <input type="hidden" name="ippi_wizard-current_step" value="PpiForm" id="id_ippi_wizard-current_step"/>
<input class="submit_button" type="submit" name="{{ wizard.steps.next }}" value="{% trans "Next step" %}"/>
- <div class="clear_button"><a href="{% url 'ippidb' %}?reset" class="clear_all">Clear all</a></div>
</form>
- <div>
+ </div>
</div>
{% endblock %}
\ No newline at end of file
diff --git a/ippisite/ippidb/templates/ProteinDomainComplexForm.html b/ippisite/ippidb/templates/ProteinDomainComplexForm.html
index dab073f0ecc6ad6995a9c431389ac0a4819f4b05..f6bfa0ee19a27cb845ecb16e6474c77809732f03 100644
--- a/ippisite/ippidb/templates/ProteinDomainComplexForm.html
+++ b/ippisite/ippidb/templates/ProteinDomainComplexForm.html
@@ -28,23 +28,22 @@
<form action="" method="post">
{% csrf_token %}
<table>
- {{ wizard.management_form }}
- {{ wizard.form.non_field_errors}}
+ {{ wizard.form.errors}}
+ {{ wizard.form.non_field_errors}}
{% if wizard.form.forms %}
{{ wizard.form.management_form }}
{% for form in wizard.form.forms %}
-
- {% endfor %}
- {% else %}
<div class="inline_box_complex_long">
<div class="input_field"> {{ form.complex_type }}</div>
<div class="input_field"> {{ form.complex_protein }}</div>
<div class="input_field"> {{ form.complex_domain }}</div>
<div class="input_field"> {{ form.ppc_copy_nb }}</div>
</div>
+ {% endfor %}
{% endif %}
- <input type="hidden" name="ippi_wizard-current_step" value="ProteinDomainComplexForm" id="id_ippi_wizard-current_step"/>
</table>
+ <input type="hidden" name="ippi_wizard-current_step" value="ProteinDomainComplexForm" id="id_ippi_wizard-current_step"/>
+ <input class="submit_button" type="submit" value="{% trans "Next step" %}"/>
</form>
</div>
</div>
diff --git a/ippisite/ippidb/templates/ProteinDomainComplexTypeForm.html b/ippisite/ippidb/templates/ProteinDomainComplexTypeForm.html
index 49a026f750cebf03597a26bdabb9f651e7934b05..f2c72bcc5a8e7143c2a884ca9958bd82808aa569 100644
--- a/ippisite/ippidb/templates/ProteinDomainComplexTypeForm.html
+++ b/ippisite/ippidb/templates/ProteinDomainComplexTypeForm.html
@@ -90,8 +90,8 @@ If your PPI complex is not among them, please select « Custom »</p>
</div>
{% endif %}
</table>
- <input class="submit_button" type="submit" value="{% trans "Next step" %}"/>
- <div class="clear_button"><a href="{% url 'ippidb' %}?reset" class="clear_all">Clear all</a></div>
+ <input type="hidden" name="ippi_wizard-current_step" value="ProteinDomainComplexTypeForm" id="id_ippi_wizard-current_step"/>
+ <input class="submit_button" type="submit" value="{% trans "Next step" %}"/>
</form>
</div>
</div>
diff --git a/ippisite/ippidb/templates/TestsForm.html b/ippisite/ippidb/templates/TestsForm.html
index 769a7ecc607667b770108b0b7a28c0cd84c187f0..4713e834bb1c8cd394a9e2a96149654af635bf64 100644
--- a/ippisite/ippidb/templates/TestsForm.html
+++ b/ippisite/ippidb/templates/TestsForm.html
@@ -41,7 +41,6 @@
{% 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/templates/add.html b/ippisite/ippidb/templates/add.html
index 389d23e55f11b97367c67006c8599a6ea5796cfc..d6ee91be8c140257b799b9e1e508d49ff1b8bc8d 100644
--- a/ippisite/ippidb/templates/add.html
+++ b/ippisite/ippidb/templates/add.html
@@ -57,6 +57,7 @@
{% block form %}{% endblock %}
</div>
+ <div class="clear_button"><a href="{% url 'ippidb' %}?reset" class="clear_all">Clear all</a></div>
</div>
</div>
</div>
diff --git a/ippisite/ippidb/templates/admin-session.html b/ippisite/ippidb/templates/admin-session.html
index 68811903efd41a04da755a28df06cbb452cd8a31..21d659b6f8a30b79caf04fed17ccdefe7c339b78 100644
--- a/ippisite/ippidb/templates/admin-session.html
+++ b/ippisite/ippidb/templates/admin-session.html
@@ -46,8 +46,6 @@
<div class="view-content">
</div>
- <input class="submit_button" type="submit" name="{{ wizard.steps.next }}" value="{% trans "Next step" %}"/>
- <div class="clear_button"><a href="{% url 'ippidb' %}?reset" class="clear_all">Clear all</a></div>
</div>
</div>
</div>
diff --git a/ippisite/ippidb/views.py b/ippisite/ippidb/views.py
index e8436ce5382a8422e95299b87cf1a6297472cb07..923955e731909e60704b425dbd6767cdcd1c078a 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, ComplexCompositionForm, ProteinDomainComplexTypeForm, ProteinDomainComplexForm, ProteinDomainComplexFormSet, PpiForm, PpiComplexForm, ProteinFormSet,TestsForm, CompoundForm, CompoundFormSet
+from .forms import IdForm, BibliographyForm, PDBForm, ProteinForm, ComplexCompositionForm, ComplexCompositionFormSet, ProteinDomainComplexTypeForm, ProteinDomainComplexForm, PpiForm, PpiComplexForm, ProteinFormSet,TestsForm, CompoundForm, CompoundFormSet
from .models import Protein, Bibliography, ProteinDomainComplex, ProteinDomainBoundComplex, RefCompoundBiblio, TestActivityDescription, Compound, Ppi, Disease, Taxonomy
from .ws import get_pdb_uniprot_mapping
@@ -59,7 +59,7 @@ FORMS = [("IdForm", ippidb.forms.IdForm),
("PDBForm", ippidb.forms.PDBForm),
("ProteinDomainComplexTypeForm",
ippidb.forms.ProteinDomainComplexTypeForm),
- ("ProteinDomainComplexForm", ippidb.forms.ComplexCompositionForm),
+ ("ProteinDomainComplexForm", ippidb.forms.ComplexCompositionFormSet),
("PpiForm", ippidb.forms.PpiForm),
("CompoundForm", ippidb.forms.CompoundFormSet),
("TestsForm", ippidb.forms.TestsForm),]