2 files changed, 126 insertions, 6 deletions
diff --git a/qc_app/templates/rqtl2/create-probe-study-success.html b/qc_app/templates/rqtl2/create-probe-study-success.html
new file mode 100644
index 0000000..1b85d0c
--- /dev/null
+++ b/qc_app/templates/rqtl2/create-probe-study-success.html
@@ -0,0 +1,53 @@
+{%extends "base.html"%}
+{%from "flash_messages.html" import flash_messages%}
+
+{%block title%}Upload R/qtl2 Bundle{%endblock%}
+
+{%block contents%}
+<h2 class="heading">Create ProbeSet Study</h2>
+
+<div class="explainer">
+  <p>You successfully created the ProbeSet study with the following
+    information.
+    <dl>
+      <dt>ID</dt>
+      <dd>{{study.id}}</dd>
+
+      <dt>Name</dt>
+      <dd>{{study.name}}</dd>
+
+      <dt>Full Name</dt>
+      <dd>{{study.fname}}</dd>
+
+      <dt>Short Name</dt>
+      <dd>{{study.sname}}</dd>
+
+      <dt>Created On</dt>
+      <dd>{{study.today}}</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 study</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.studyid}}" />
+
+  <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-study-id.html b/qc_app/templates/rqtl2/select-probeset-study-id.html
index bb31fde..34aa54e 100644
--- a/qc_app/templates/rqtl2/select-probeset-study-id.html
+++ b/qc_app/templates/rqtl2/select-probeset-study-id.html
@@ -1,5 +1,5 @@
 {%extends "base.html"%}
-{%from "flash_messages.html" import flash_messages%}
+{%from "flash_messages.html" import flash_messages, flash_all_messages%}
 
 {%block title%}Upload R/qtl2 Bundle{%endblock%}
 
@@ -12,9 +12,13 @@
   <p>This page gives you the ability to do that.</p>
 </div>
 
+{{flash_all_messages()}}
+
 <form method="POST"
-      action="#">
-  <legend class="heading">Select from existing ProbeSet datasets</legend>
+      action="{{url_for('upload.rqtl2.select_probeset_study',
+	      species_id=species.SpeciesId, population_id=population.Id)}}"
+      id="frm:select-probeset-study">
+  <legend class="heading">Select from existing ProbeSet studies</legend>
 
   <input type="hidden" name="species_id" value="{{species.SpeciesId}}" />
   <input type="hidden" name="population_id"
@@ -51,9 +55,72 @@
 <p style="color:#FE3535; padding-left:20em; font-weight:bolder;">OR</p>
 
 <form method="POST"
-      action="#">
-  <legend class="heading">Create new ProbeSet dataset</legend>
-  <strong style="color: red;font-weight:bold;">Under construction</strong>
+      action="{{url_for('upload.rqtl2.create_probeset_study',
+	      species_id=species.SpeciesId, population_id=population.Id)}}"
+      id="frm:create-probeset-study">
+  <legend class="heading">Create new ProbeSet study</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}}" />
+
+  <fieldset>
+    <label for="select:platform">Platform</label>
+    <select id="select:platform"
+	    name="platformid"
+	    required="required"
+	    {%if platforms | length == 0%}disabled="disabled"{%endif%}>
+      <option value="">Select a platform</option>
+      {%for platform in platforms%}
+      <option value="{{platform.GeneChipId}}">
+	{{platform.GeneChipName}} ({{platform.Name}})
+      </option>
+      {%endfor%}
+    </select>
+  </fieldset>
+
+  <fieldset>
+    <label for="select:tissue">Tissue</label>
+    <select id="select:tissue"
+	    name="tissueid"
+	    required="required"
+	    {%if tissues | length == 0%}disabled="disabled"{%endif%}>
+      <option value="">Select tissue</option>
+      {%for tissue in tissues%}
+      <option value="{{tissue.Id}}">
+	{{tissue.TissueName}} ({{tissue.Short_Name}})
+      </option>
+      {%endfor%}
+    </select>
+  </fieldset>
+
+  <fieldset>
+    <label for="txt:studyname">Study name</label>
+    <input type="text" id="txt:studyname" name="studyname"
+	   placeholder="Name of the study. (Required)"
+	   required="required" />
+  </fieldset>
+
+  <fieldset>
+    <label for="txt:studyfullname">Study name</label>
+    <input type="text" id="txt:studyfullname" name="studyfullname"
+	   placeholder="Longer name of the study. (Optional)" />
+  </fieldset>
+
+  <fieldset>
+    <label for="txt:studyshortname">Study name</label>
+    <input type="text" id="txt:studyshortname" name="studyshortname"
+	   placeholder="Shorter name of the study. (Optional)" />
+  </fieldset>
+
+    <fieldset>
+    <input type="submit"
+	   value="create study"
+	   class="btn btn-main form-col-2" />
+  </fieldset>
 </form>
 
 {%endblock%}