1) added retmin, retmax

2) fixed pdb input js

diff --git a/qcg/forms.py b/qcg/forms.py
index d53569d..0b8475a 100644 (file)
--- a/qcg/forms.py
+++ b/qcg/forms.py
@@ -125,6 +125,8 @@ class JobDescriptionForm(forms.Form):
     nrep = forms.IntegerField(label=u"NREP", help_text=u"Liczba replik", min_value=2, initial=16, required=False)
     nstex = forms.IntegerField(label=u"NSTEX", help_text=u"Liczba kroków po których następuje wymiana replik", min_value=2, initial=1000, required=False)
     pdb_file = forms.CharField(label=u"Plik PDB", max_length=500, required=False)
+    retmin = forms.IntegerField(label=u"RETMIN", help_text=u"Dolny zakres temparatur dla wymiany replik", min_value=2, initial=250, required=False)
+    retmax = forms.IntegerField(label=u"RETMAX", help_text=u"Górny zakres temperatur dla wymiany replik", min_value=2, initial=450, required=False)
     
     application = forms.ChoiceField(choices=APPLICATION_CHOICES, label=u"Aplikacja", required=False)  # TODO choices
     master_file = forms.CharField(label=u"Plik główny", max_length=500, required=False)

diff --git a/qcg/templates/qcg/job_submit.html b/qcg/templates/qcg/job_submit.html
index 61c56e9..eae0192 100644 (file)
--- a/qcg/templates/qcg/job_submit.html
+++ b/qcg/templates/qcg/job_submit.html
@@ -95,7 +95,7 @@
                     }
                 }
             });
-            $('#id_modules,#id_hosts,#id_master_file,#id_executable,#id_input,#id_stage_in,#id_preprocess_script,#id_postprocess_script').selectize({
+            $('#id_modules,#id_hosts,#id_pdb_file,#id_master_file,#id_executable,#id_input,#id_stage_in,#id_preprocess_script,#id_postprocess_script').selectize({
                 plugins: ['remove_button']
             });
 

diff --git a/qcg/templates/qcg/job_submit_form.html b/qcg/templates/qcg/job_submit_form.html
index f8c4200..1de0bb0 100644 (file)
--- a/qcg/templates/qcg/job_submit_form.html
+++ b/qcg/templates/qcg/job_submit_form.html
@@ -22,6 +22,9 @@
         {% bootstrap_field form.nrep layout="horizontal" %}
         {% bootstrap_field form.nstex layout="horizontal" form_group_class="form-group collapse" %}
         {% bootstrap_field form.pdb_file layout="horizontal" %}
+        {% bootstrap_field form.retmin layout="horizontal" form_group_class="form-group collapse" %}
+        {% bootstrap_field form.retmax layout="horizontal" form_group_class="form-group collapse" %}
+        
         <!-- {% bootstrap_field form.application layout="horizontal" %}
         {% bootstrap_field form.master_file layout="horizontal" %}
         {% bootstrap_field form.executable layout="horizontal" form_group_class="form-group collapse" %}