Skip to content
Snippets Groups Projects
Commit 0932056a authored by Hervé  MENAGER's avatar Hervé MENAGER
Browse files

Merge branch 'master' of https://gitlab.pasteur.fr/hub/iPPIDB

Former-commit-id: cc6923aa38c039ce2b467ec527c317b5691633a4
parents f1427fa7 e16e172f
No related branches found
No related tags found
No related merge requests found
......@@ -215,6 +215,19 @@ UNIT_CONCENTRATION = (
('nano', 'nM'),
('pico','pM'),
)
ADMINISTRATION_MODE = [
("Enteral",
[('', "Oral"), ('', "Sublingual"), ('', "Rectal")]),
("Parenteral",
[('', "Inhalational"), ('', "Intravenous"), ('', "Intramuscular"), ('', "Subcutaneous"), ('', "Intra-arterial"), ('', "Intra-articular"), ('', "Intrathecal"), ('', "Intradermal"), ('', "Transdermal")]),
("Local",
[('', "Skin topical"), ('', "Intranasal"), ('', "Ocular drops"), ('', "Mucosal-throat"), ('', "Vagina"), ('', "Mouth"), ('', "Ear"), ('', "Transdermal")]),
]
class BaseTestsFormSet(BaseFormSet):
def add_fields(self, form, index):
super(BaseTestsFormSet, self).add_fields(form, index)
......@@ -226,16 +239,17 @@ class BaseTestsFormSet(BaseFormSet):
form.fields["activityDesc_protein_bound_construct"] = forms.ModelChoiceField(queryset=TestActivityDescription.objects.values_list('protein_bound_construct', flat=True).distinct(),empty_label=None, widget=forms.Select(attrs={'class': 'form-control'}))
form.fields["activityRes_compound"] = forms.ChoiceField(widget=forms.Select(attrs={'class': 'form-control'}))
form.fields["activityRes_activity_type"] = forms.ModelChoiceField(required=False,widget=forms.Select(attrs={'class': 'form-control'}),queryset=CompoundActivityResult.objects.values_list('activity_type',flat=True).distinct(),empty_label=None)
form.fields["unit_concentration"] = forms.CharField(required=True, widget=forms.Select(choices=UNIT_CONCENTRATION, attrs={'class':'form-control'}))
form.fields["activityRes_unit_concentration"] = forms.CharField(required=True, widget=forms.Select(choices=UNIT_CONCENTRATION, attrs={'class':'form-control'}))
form.fields["activityRes_activity"] = forms.IntegerField(forms.NumberInput(attrs={'class': 'form-control'}))
form.fields["cytotoxDesc_name"] = forms.ModelChoiceField(queryset=TestCytotoxDescription.objects.values_list('test_name', flat=True).distinct(), empty_label=None, required=False, widget=forms.Select(attrs={'required':'required', 'class':'form-control'}))
form.fields["cytotoxDesc_cell_line"] = forms.ModelChoiceField(queryset=CellLine.objects.all(), empty_label=None, widget=forms.Select(attrs={'class': 'form-control'}),required=False)
form.fields["cytotoxDesc_compound_concentration"] = forms.DecimalField(required=False)
form.fields["cytotoxRes_unit_concentration"] = forms.CharField(required=True, widget=forms.Select(choices=UNIT_CONCENTRATION, attrs={'class':'form-control'}))
form.fields["cytotoxRes_compound"] = forms.ChoiceField(widget=forms.Select(attrs={'class': 'form-control'}),required=False)
form.fields["cytotoxRes_toxicity"] = forms.ModelChoiceField(queryset=CompoundCytotoxicityResult.objects.values_list('toxicity', flat=True).distinct(), empty_label=None,required=False,widget=forms.Select(attrs={'class': 'form-control'}))
form.fields["pkDesc_name"] = forms.ModelChoiceField(queryset=TestPKDescription.objects.values_list('test_name', flat=True).distinct(), empty_label=None,required=False, widget=forms.Select(attrs={'required':'required', 'class':'form-control'}))
form.fields["pkDesc_organism"] = forms.ModelChoiceField(queryset=Taxonomy.objects.all(),empty_label=None, widget=forms.Select(attrs={'class': 'form-control'}),required=False)
form.fields["pkDesc_administration_mode"] = forms.ModelChoiceField(required=False,widget=forms.Select(attrs={'class': 'form-control'}),queryset=TestPKDescription.objects.values_list('administration_mode',flat=True).distinct(),empty_label=None)
form.fields["pkDesc_administration_mode"] = forms.CharField(required=True, widget=forms.Select(choices=ADMINISTRATION_MODE, attrs={'class':'form-control'}))
form.fields["pkDesc_dose"] = forms.IntegerField(required=False)
form.fields["pkDesc_dose_interval"] = forms.IntegerField(required=False)
form.fields["pkDesc_concentration"] = forms.DecimalField(required=False)
......
......@@ -160,3 +160,4 @@ $(document).ready(function() {
}
});
});
......@@ -76,6 +76,9 @@
</table>
<input class="submit_button" type="submit" value="{% trans "Next step" %}"/>
</form>
<div style="display:none;">
Empty form: {{ wizard.form.empty_form }}
</div>
</div>
</div>
......
......@@ -47,7 +47,7 @@
{{ form.test_type }}
<label class="form-control-placeholder">Test type</label>
</div>
<div class="input_field form-group">
<div id="test-type" class="input_field form-group">
{{ form.activityDesc_type }}
<label class="form-control-placeholder">Activity type</label>
</div>
......@@ -81,7 +81,7 @@
<label class="form-control-placeholder">Activity type</label>
</div>
<div class="input_field form-group">
{{ form.unit_concentration }}
{{ form.activityRes_unit_concentration }}
<label class="form-control-placeholder">Concentration unit</label>
</div>
<div class="input_field form-group">
......@@ -111,6 +111,10 @@
{{ form.cytotoxDesc_compound_concentration }}
<label class="form-control-placeholder">Compound concentration</label>
</div>
<div class="input_field form-group">
{{ form.cytotoxRes_unit_concentration }}
<label class="form-control-placeholder">Concentration unit</label>
</div>
</div>
</div>
<div class="div_test_cytotoxicity_res">
......@@ -210,11 +214,19 @@
<div>
<input type="button" id="ck-button-long" class="add-test" value="Add Test" onclick="cloneMoreEmpty('.div_test:last', 'TestsForm');"/>
</div>
{% endfor %}
{% endif %}
</table>
<input class="submit_button" type="submit" name="{{ wizard.steps.next }}" value="{% trans "Submit" %}"/>
</form>
<div style="display:none;">
Empty form:
{% for field in wizard.form.empty_form %}
test: {{ field }}
{% endfor %}
</div>
</div>
</div>
{% endblock %}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment