Enable creation of new dataset

Enable the user to create a new dataset should the need arise.

A few extra fixes were done, such as:

- Provide list of average methods to choose from
- Provide input elements for some expected fields
- Add a new confirmation step before doing the actual data update

3 files changed, 127 insertions, 14 deletions

diff --git a/qc_app/templates/continue_from_create_dataset.html b/qc_app/templates/continue_from_create_dataset.html
new file mode 100644
index 0000000..1e493c5
--- /dev/null
+++ b/qc_app/templates/continue_from_create_dataset.html
@@ -0,0 +1,56 @@
+{%extends "base.html"%}
+{%from "dbupdate_hidden_fields.html" import hidden_fields%}
+
+{%block title%}Create Study{%endblock%}
+
+{%block css%}
+<link rel="stylesheet" href="/static/css/two-column-with-separator.css" />
+{%endblock%}
+
+{%block contents%}
+<h2 class="heading">{{filename}}: create study</h2>
+
+{%with messages = get_flashed_messages(with_categories=true)%}
+{%if messages:%}
+<ul>
+  {%for category, message in messages:%}
+  <li class="{{category}}">{{message}}</li>
+  {%endfor%}
+</ul>
+{%endif%}
+{%endwith%}
+
+<div class="two-column-with-separator">
+  <form method="POST" action="{{url_for('dbinsert.final_confirmation')}}"
+	id="select-platform-form" data-genechips="{{genechips_data}}"
+	class="two-col-sep-col1">
+    <legend>continue with new dataset</legend>
+    {{hidden_fields(
+    filename, filetype, species=species, genechipid=genechipid,
+    studyid=studyid, datasetid=datasetid)}}
+
+    <fieldset>
+      <input type="submit"
+	     value="continue"
+	     class="btn btn-main form-col-2" />
+    </fieldset>
+  </form>
+
+  <p class="two-col-sep-separator">OR</p>
+
+  <form method="POST" action="{{url_for('dbinsert.select_dataset')}}"
+	id="select-platform-form" data-genechips="{{genechips_data}}"
+	class="two-col-sep-col2">
+    <legend>Select from existing dataset</legend>
+    {{hidden_fields(
+    filename, filetype, species=species, genechipid=genechipid,
+    studyid=studyid, datasetid=datasetid)}}
+
+    <fieldset>
+      <input type="submit"
+	     value="go back"
+	     class="btn btn-main form-col-2" />
+    </fieldset>
+  </form>
+</div>
+{%endblock%}
diff --git a/qc_app/templates/dbupdate_hidden_fields.html b/qc_app/templates/dbupdate_hidden_fields.html
index c66ebba..5a95cbb 100644
--- a/qc_app/templates/dbupdate_hidden_fields.html
+++ b/qc_app/templates/dbupdate_hidden_fields.html
@@ -19,5 +19,8 @@
 {%if kwargs.get("studyid"):%}
 <input type="hidden" name="studyid" value="{{kwargs['studyid']}}" />
 {%endif%}
+{%if kwargs.get("datasetid"):%}
+<input type="hidden" name="datasetid" value="{{kwargs['datasetid']}}" />
+{%endif%}
 
 {%endmacro%}
diff --git a/qc_app/templates/select_dataset.html b/qc_app/templates/select_dataset.html
index 59ead59..a16fc75 100644
--- a/qc_app/templates/select_dataset.html
+++ b/qc_app/templates/select_dataset.html
@@ -8,10 +8,10 @@
 {%endblock%}
 
 {%block contents%}
-<h1 class="heading">{{filename}}: select dataset</h2>
+<h2 class="heading">{{filename}}: select dataset</h2>
 
 <div class="two-column-with-separator">
-  <form method="POST" action="{{url_for('dbinsert.insert_data')}}"
+  <form method="POST" action="{{url_for('dbinsert.final_confirmation')}}"
 	id="select-dataset-form" class="two-col-sep-col1">
     <legend>choose existing dataset</legend>
     {{hidden_fields(
@@ -19,8 +19,8 @@
     studyid=studyid)}}
 
     <fieldset>
-      <label for="dataset" class="form-col-1">dataset:</label>
-      <select id="dataset" name="dataset" class="form-col-2"
+      <label for="datasetid" class="form-col-1">dataset:</label>
+      <select id="datasetid" name="datasetid" class="form-col-2"
 	      {%if datasets | length == 0:%}
 	      disabled="disabled"
 	      {%endif%}>
@@ -44,37 +44,91 @@
   <p class="two-col-sep-separator">OR</p>
 
   <form method="POST" id="create-dataset-form"
+	action="{{url_for('dbinsert.create_dataset')}}"
 	class="two-col-sep-col2">
     <legend>create new dataset</legend>
     {{hidden_fields(
     filename, filetype, species=species, genechipid=genechipid,
     studyid=studyid)}}
 
+    {%with messages = get_flashed_messages(with_categories=true)%}
+    {%if messages:%}
+    <ul>
+      {%for category, message in messages:%}
+      <li class="{{category}}">{{message}}</li>
+      {%endfor%}
+    </ul>
+    {%endif%}
+    {%endwith%}
+
     <fieldset>
-      <label for="avgid">average:</label>
-      <select id="avgid" name="avgid" required="required">
+      <label for="avgid" class="form-col-1">average:</label>
+      <select id="avgid" name="avgid" required="required" class="form-col-2">
 	<option value="">Select averaging method</option>
+	{%for method in avgmethods:%}
+	<option value="{{method['AvgMethodId']}}">
+	  {{method["Name"]}}
+	</option>
+	{%endfor%}
       </select>
     </fieldset>
 
     <fieldset>
-      <label for="datasetname">name:</label>
-      <input id="datasetname" name="datasetname" type="text" />
+      <label for="datasetname" class="form-col-1">name:</label>
+      <input id="datasetname" name="datasetname" type="text"
+	     class="form-col-2" />
+    </fieldset>
+
+    <fieldset>
+      <label for="datasetname2" class="form-col-1">name 2:</label>
+      <input id="datasetname2" name="datasetname2" type="text"
+	     required="required" class="form-col-2" />
+    </fieldset>
+
+    <fieldset>
+      <label for="datasetfullname" class="form-col-1">full name:</label>
+      <input id="datasetfullname" name="datasetfullname" type="text"
+	     required="required" class="form-col-2" />
     </fieldset>
 
     <fieldset>
-      <label for="datasetname2">name 2:</label>
-      <input id="datasetname2" name="datasetname2" type="text" />
+      <label for="datasetshortname" class="form-col-1">short name:</label>
+      <input id="datasetshortname" name="datasetshortname" type="text"
+	     required="required" class="form-col-2" />
     </fieldset>
 
     <fieldset>
-      <label for="datasetfullname">full name:</label>
-      <input id="datasetfullname" name="datasetfullname" type="text" />
+      <label for="datasetpublic" class="form-col-1">public:</label>
+      <input id="datasetpublic" name="datasetpublic" type="number"
+	     required="required" min="0" max="2" value="0"
+	     class="form-col-2" />
+    </fieldset>
+
+    <fieldset>
+      <label for="datasetconfidentiality">confidentiality:</label>
+      <input id="datasetconfidentiality" name="datasetconfidentiality"
+	     type="number" required="required" min="0" max="2" value="0"
+	     class="form-col-2" />
+    </fieldset>
+
+    <fieldset>
+      <label for="datasetdatascale" class="form-col-1">data scale:</label>
+      <select id="datasetdatascale" name="datasetdatascale" class="form-col-2">
+	<option value="">None</option>
+	{%for dscale in datascales:%}
+	<option value="{{dscale}}"
+		{%if dscale == "log2":%}
+		selected="selected"
+		{%endif%}>
+	  {{dscale}}
+	</option>
+	{%endfor%}
+      </select>
     </fieldset>
 
     <fieldset>
-      <label for="datasetshortname">full name:</label>
-      <input id="datasetshortname" name="datasetshortname" type="text" />
+      <input type="submit" value="create new dataset"
+	     class="btn btn-main form-col-2" />
     </fieldset>
   </form>