taxon names

VoSeq · Jan 27, 2015 · 5dd2ffa · 5dd2ffa
1 parent 2d33bf6
commit 5dd2ffa
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 3 deletions.
diff --git a/voseq/create_dataset/forms.py b/voseq/create_dataset/forms.py
@@ -48,6 +48,11 @@ class CreateDatasetForm(BaseDatasetForm):
         widget=forms.CheckboxInput(),
     )
 
+    aminoacids = forms.ChoiceField(
+        label='Amino acids',
+        widget=forms.CheckboxInput(),
+    )
+
     degen_translations = forms.ChoiceField(
         label='Degenerated translations)',
         widget=forms.RadioSelect(),
@@ -58,3 +63,27 @@ class CreateDatasetForm(BaseDatasetForm):
             ('SZ', 'SZ'),
         ]
     )
+
+    special = forms.ChoiceField(
+        label='Special',
+        widget=forms.CheckboxInput(),
+    )
+
+    taxon_names = forms.ChoiceField(
+        label='What info do you want in the taxon names?',
+        choices=[
+            ('CODE', 'Code'),
+            ('ORDER', 'Order'),
+            ('FAMILY', 'Family'),
+            ('SUBFAMILY', 'Subfamily'),
+            ('TRIBE', 'Tribe'),
+            ('SUBTRIBE', 'Subtribe'),
+            ('GENUS', 'Genus'),
+            ('SPECIES', 'Species'),
+            ('SUBSPECIES', 'Subspecies'),
+            ('AUCTOR', 'Auctor'),
+            ('HOSTORG', 'Host org.'),
+            ('GENECODE', 'Gene code'),
+        ],
+        widget=forms.CheckboxSelectMultiple(),
+    )
diff --git a/voseq/create_dataset/templates/create_dataset/index.html b/voseq/create_dataset/templates/create_dataset/index.html
@@ -53,13 +53,13 @@ <h3 class="panel-title"><b>Enter the required info to make yourself a ready-to-r
                 Amino Acids->Special->Degen->All->1st—2nd,3rd):
               </td>
               <td>
-                {{ form.positions.label }}
+                <b>{{ form.positions.label }}</b>
                 {{ form.positions }}
 
-                {{ form.partition_by_positions.label }}
+                <b>{{ form.partition_by_positions.label }}</b>
                 {{ form.partition_by_positions }}
 
-                Translations <br />
+                <b>Translations</b> <br />
                 {{ form.translations }}
                 {{ form.translations.label }}
                 <i id="translations-tooltip" class="fa fa-question-circle"></i>
@@ -68,9 +68,26 @@ <h3 class="panel-title"><b>Enter the required info to make yourself a ready-to-r
                     &nbsp;{{ i }}
                     <i title="{% cycle 'Normal' 'Degen S: alternative degen encoding of Serin 1 to Serin 2' 'Degen Z: alternative degen encoding of Serin 2 to Serin 1' 'Degen SZ: alternative degen encoding of Serin 1 and Serin 2 to NNN' %}" class="fa fa-question-circle"></i>
                   {% endfor %}
+
+                <br />
+
+                {{ form.aminoacids }}
+                {{ form.aminoacids.label }}
+
+                <br />
+
+                <b>{{ form.special.label }}</b><br />
+                {{ form.special }}
+                {{ form.special.label }}
+                <i class="fa fa-question-circle" title="Will enable you to specify different translations, positions and partitions for each gene/alignment"></i>
               </td>
             </tr>
 
+            <tr>
+              <td>{{ form.taxon_names.label }}</td>
+              <td>{{ form.taxon_names }}</td>
+            </tr>
+
           </table>
 
 

diff --git a/voseq/public_interface/static/css/pi.css b/voseq/public_interface/static/css/pi.css
@@ -41,3 +41,8 @@ body {
     display: inline-block;
     padding-right: 15px;
 }
+
+#id_taxon_names li {
+    display: inline-block;
+    padding-right: 15px;
+}