2 files changed, 141 insertions, 1 deletions
diff --git a/qc_app/templates/rqtl2/create-probe-dataset-success.html b/qc_app/templates/rqtl2/create-probe-dataset-success.html
new file mode 100644
index 0000000..33612c4
--- /dev/null
+++ b/qc_app/templates/rqtl2/create-probe-dataset-success.html
@@ -0,0 +1,60 @@
+{%extends "base.html"%}
+{%from "flash_messages.html" import flash_messages%}
+
+{%block title%}Upload R/qtl2 Bundle{%endblock%}
+
+{%block contents%}
+<h2 class="heading">Create ProbeSet Dataset</h2>
+
+<div class="explainer">
+  <p>You successfully created the ProbeSet dataset with the following
+    information.
+    <dl>
+      <dt>Averaging Method</dt>
+      <dd>{{avgmethod.Name}}</dd>
+
+      <dt>ID</dt>
+      <dd>{{dataset.datasetid}}</dd>
+
+      <dt>Name</dt>
+      <dd>{{dataset.name2}}</dd>
+
+      <dt>Full Name</dt>
+      <dd>{{dataset.fname}}</dd>
+
+      <dt>Short Name</dt>
+      <dd>{{dataset.sname}}</dd>
+
+      <dt>Created On</dt>
+      <dd>{{dataset.today}}</dd>
+
+      <dt>DataScale</dt>
+      <dd>{{dataset.datascale}}</dd>
+    </dl>
+  </p>
+</div>
+
+<form id="frm-upload-rqtl2-bundle"
+      action="{{url_for('upload.rqtl2.select_dataset_info',
+	      species_id=species.SpeciesId,
+	      population_id=population.InbredSetId)}}"
+      method="POST"
+      enctype="multipart/form-data">
+  <legend class="heading">Create ProbeSet dataset</legend>
+
+  <input type="hidden" name="species_id" value="{{species.SpeciesId}}" />
+  <input type="hidden" name="population_id"
+	 value="{{population.InbredSetId}}" />
+  <input type="hidden" name="rqtl2_bundle_file" value="{{rqtl2_bundle_file}}" />
+  <input type="hidden" name="geno-dataset-id" value="{{geno_dataset.Id}}" />
+  <input type="hidden" name="probe-study-id" value="{{study.Id}}" />
+  <input type="hidden" name="probe-dataset-id" value="{{dataset.datasetid}}" />
+
+  <fieldset>
+    <input type="submit"
+	   value="continue"
+	   class="btn btn-main form-col-2" />
+  </fieldset>
+</form>
+
+{%endblock%}
diff --git a/qc_app/templates/rqtl2/select-probeset-dataset.html b/qc_app/templates/rqtl2/select-probeset-dataset.html
index 8b9e5ed..3e160fd 100644
--- a/qc_app/templates/rqtl2/select-probeset-dataset.html
+++ b/qc_app/templates/rqtl2/select-probeset-dataset.html
@@ -14,6 +14,7 @@
 
 {{flash_all_messages()}}
 
+{%if datasets | length > 0%}
 <form method="POST"
       action="{{url_for('upload.rqtl2.select_probeset_dataset',
 	      species_id=species.SpeciesId, population_id=population.Id)}}"
@@ -53,6 +54,85 @@
   </fieldset>
 </form>
 
-<p style="color: red; font-weight: bold;">Under Construction</p>
+<p style="color:#FE3535; padding-left:20em; font-weight:bolder;">OR</p>
+{%endif%}
+
+<form method="POST"
+      action="{{url_for('upload.rqtl2.create_probeset_dataset',
+	      species_id=species.SpeciesId, population_id=population.Id)}}"
+      id="frm:create-probeset-dataset">
+  <legend class="heading">Create a new ProbeSet dataset</legend>
+
+  <input type="hidden" name="species_id" value="{{species.SpeciesId}}" />
+  <input type="hidden" name="population_id"
+	 value="{{population.InbredSetId}}" />
+  <input type="hidden" name="rqtl2_bundle_file"
+	 value="{{rqtl2_bundle_file}}" />
+  <input type="hidden" name="geno-dataset-id" value="{{geno_dataset.Id}}" />
+  <input type="hidden" name="probe-study-id" value="{{probe_study.Id}}" />
+
+  <fieldset>
+    <label for="select:average">averaging method</label>
+    <select id="select:average"
+	    name="averageid"
+	    required="required">
+      <option value="">Select averaging method</option>
+      {%for avgmethod in avgmethods%}
+      <option value="{{avgmethod.Id}}">
+	{{avgmethod.Name}}
+	{%if avgmethod.Normalization%}
+	({{avgmethod.Normalization}})
+	{%endif%}
+      </option>
+      {%endfor%}
+    </select>
+  </fieldset>
+
+  <fieldset>
+    <label for="txt:datasetname">Name</label>
+    <input type="text" id="txt:datasetname" name="datasetname"
+	   required="required"
+	   title="Name of the dataset, e.g 'BXDMicroArray_ProbeSet_June03'. (Required)" />
+  </fieldset>
+
+  <fieldset>
+    <label for="txt:datasetfullname">Full Name</label>
+    <input type="text" id="txt:datasetfullname" name="datasetfullname"
+	   required="required"
+	   title="A longer name for the dataset, e.g. 'UTHSC Brain mRNA U74Av2 (Jun03) MAS5'. (Required)" />
+  </fieldset>
+
+  <fieldset>
+    <label for="txt:datasetshortname">Short Name</label>
+    <input type="text" id="txt:datasetshortname" name="datasetshortname"
+	   title="An abbreviated name for the dataset, e.g 'Br_U_0603_M'. (Optional)" />
+  </fieldset>
+
+  <fieldset>
+    <input type="checkbox" id="chk:public" name="datasetpublic"
+	   checked="checked"
+	   title="Whether or not the dataset is accessible by the general public." />
+    <label for="chk:datasetpublic">Public?</label>
+  </fieldset>
+
+  <fieldset>
+    <label for="select:datasetdatascale">Data Scale</label>
+    <select id="select:datasetdatascale"
+	    name="datasetdatascale"
+	    required="required">
+      <option value="log2" selected="selected">log2</option>
+      <option value="z_score">z_score</option>
+      <option value="log2_ratio">log2_ratio</option>
+      <option value="linear">linear</option>
+      <option value="linear_positive">linear_positive</option>
+    </select>
+  </fieldset>
+
+  <fieldset>
+    <input type="submit"
+	   value="create dataset"
+	   class="btn btn-main form-col-2" />
+  </fieldset>
+</form>
 
 {%endblock%}