Move code handling expression data upload into new module.

15 files changed, 22 insertions, 22 deletions

diff --git a/uploader/templates/rqtl2/create-geno-dataset-success.html b/uploader/templates/rqtl2/create-geno-dataset-success.html
index 1b50221..bb6d63d 100644
--- a/uploader/templates/rqtl2/create-geno-dataset-success.html
+++ b/uploader/templates/rqtl2/create-geno-dataset-success.html
@@ -33,7 +33,7 @@
 
 <div class="row">
   <form id="frm-upload-rqtl2-bundle"
-        action="{{url_for('upload.rqtl2.select_dataset_info',
+        action="{{url_for('expression-data.rqtl2.select_dataset_info',
 	        species_id=species.SpeciesId,
 	        population_id=population.InbredSetId)}}"
         method="POST"
diff --git a/uploader/templates/rqtl2/create-probe-dataset-success.html b/uploader/templates/rqtl2/create-probe-dataset-success.html
index 790d174..03b75c7 100644
--- a/uploader/templates/rqtl2/create-probe-dataset-success.html
+++ b/uploader/templates/rqtl2/create-probe-dataset-success.html
@@ -36,7 +36,7 @@
 
 <div class="row">
   <form id="frm-upload-rqtl2-bundle"
-        action="{{url_for('upload.rqtl2.select_dataset_info',
+        action="{{url_for('expression-data.rqtl2.select_dataset_info',
 	        species_id=species.SpeciesId,
 	        population_id=population.InbredSetId)}}"
         method="POST"
diff --git a/uploader/templates/rqtl2/create-probe-study-success.html b/uploader/templates/rqtl2/create-probe-study-success.html
index d0ee508..e293f6f 100644
--- a/uploader/templates/rqtl2/create-probe-study-success.html
+++ b/uploader/templates/rqtl2/create-probe-study-success.html
@@ -28,7 +28,7 @@
   </p>
 
   <form id="frm-upload-rqtl2-bundle"
-        action="{{url_for('upload.rqtl2.select_dataset_info',
+        action="{{url_for('expression-data.rqtl2.select_dataset_info',
 	        species_id=species.SpeciesId,
 	        population_id=population.InbredSetId)}}"
         method="POST"
diff --git a/uploader/templates/rqtl2/create-tissue-success.html b/uploader/templates/rqtl2/create-tissue-success.html
index 5f2c5a0..d6fe154 100644
--- a/uploader/templates/rqtl2/create-tissue-success.html
+++ b/uploader/templates/rqtl2/create-tissue-success.html
@@ -56,7 +56,7 @@
 
     <form id="frm-create-tissue-success-continue"
           method="POST"
-          action="{{url_for('upload.rqtl2.select_dataset_info',
+          action="{{url_for('expression-data.rqtl2.select_dataset_info',
 	          species_id=species.SpeciesId,
 	          population_id=population.InbredSetId)}}"
           style="display: inline; width: 100%; grid-column: 1 / 2;
@@ -85,7 +85,7 @@
 <div class="row">
   <form id="frm-create-tissue-success-select-existing"
         method="POST"
-        action="{{url_for('upload.rqtl2.select_tissue',
+        action="{{url_for('expression-data.rqtl2.select_tissue',
 	        species_id=species.SpeciesId,
 	        population_id=population.InbredSetId)}}"
         style="display: inline; width: 100%; grid-column: 3 / 4;
diff --git a/uploader/templates/rqtl2/index.html b/uploader/templates/rqtl2/index.html
index f3329c2..8ce13bf 100644
--- a/uploader/templates/rqtl2/index.html
+++ b/uploader/templates/rqtl2/index.html
@@ -8,7 +8,7 @@
 
 <h2>R/qtl2 Upload</h2>
 
-<form method="POST" action="{{url_for('upload.rqtl2.select_species')}}"
+<form method="POST" action="{{url_for('expression-data.rqtl2.select_species')}}"
       id="frm-rqtl2-upload">
   <legend class="heading">upload R/qtl2 bundle</legend>
   {{flash_messages("error-rqtl2")}}
diff --git a/uploader/templates/rqtl2/rqtl2-qc-job-results.html b/uploader/templates/rqtl2/rqtl2-qc-job-results.html
index 59bc8cd..b3c3a8f 100644
--- a/uploader/templates/rqtl2/rqtl2-qc-job-results.html
+++ b/uploader/templates/rqtl2/rqtl2-qc-job-results.html
@@ -15,7 +15,7 @@
 
 <div class="row">
   <form id="form-qc-job-results"
-        action="{{url_for('upload.rqtl2.select_dataset_info',
+        action="{{url_for('expression-data.rqtl2.select_dataset_info',
 	        species_id=species.SpeciesId,
 	        population_id=population.Id)}}"
         method="POST">
diff --git a/uploader/templates/rqtl2/rqtl2-qc-job-success.html b/uploader/templates/rqtl2/rqtl2-qc-job-success.html
index 2861a04..f126835 100644
--- a/uploader/templates/rqtl2/rqtl2-qc-job-success.html
+++ b/uploader/templates/rqtl2/rqtl2-qc-job-success.html
@@ -18,7 +18,7 @@
   -->
 <div class="row">
   <form id="frm-upload-rqtl2-bundle"
-        action="{{url_for('upload.rqtl2.select_dataset_info',
+        action="{{url_for('expression-data.rqtl2.select_dataset_info',
 	        species_id=species.SpeciesId,
 	        population_id=population.InbredSetId)}}"
         method="POST"
diff --git a/uploader/templates/rqtl2/select-geno-dataset.html b/uploader/templates/rqtl2/select-geno-dataset.html
index 873f9c3..1db51e0 100644
--- a/uploader/templates/rqtl2/select-geno-dataset.html
+++ b/uploader/templates/rqtl2/select-geno-dataset.html
@@ -15,7 +15,7 @@
 
 <div class="row">
   <form id="frm-upload-rqtl2-bundle"
-        action="{{url_for('upload.rqtl2.select_geno_dataset',
+        action="{{url_for('expression-data.rqtl2.select_geno_dataset',
 	        species_id=species.SpeciesId,
 	        population_id=population.InbredSetId)}}"
         method="POST"
@@ -62,7 +62,7 @@
 
 <div class="row">
   <form id="frm-upload-rqtl2-bundle"
-        action="{{url_for('upload.rqtl2.create_geno_dataset',
+        action="{{url_for('expression-data.rqtl2.create_geno_dataset',
 	        species_id=species.SpeciesId,
 	        population_id=population.InbredSetId)}}"
         method="POST"
diff --git a/uploader/templates/rqtl2/select-population.html b/uploader/templates/rqtl2/select-population.html
index 37731f0..7d27303 100644
--- a/uploader/templates/rqtl2/select-population.html
+++ b/uploader/templates/rqtl2/select-population.html
@@ -17,7 +17,7 @@
 </div>
 
 <form method="POST"
-      action="{{url_for('upload.rqtl2.select_population', species_id=species.SpeciesId)}}">
+      action="{{url_for('expression-data.rqtl2.select_population', species_id=species.SpeciesId)}}">
   <legend class="heading">select grouping/population</legend>
   {{flash_messages("error-select-population")}}
 
@@ -47,7 +47,7 @@
 <p style="color:#FE3535; padding-left:20em; font-weight:bolder;">OR</p>
 
 <form method="POST"
-      action="{{url_for('upload.rqtl2.create_population', species_id=species.SpeciesId)}}">
+      action="{{url_for('expression-data.rqtl2.create_population', species_id=species.SpeciesId)}}">
   <legend class="heading">create new grouping/population</legend>
   {{flash_messages("error-create-population")}}
 
diff --git a/uploader/templates/rqtl2/select-probeset-dataset.html b/uploader/templates/rqtl2/select-probeset-dataset.html
index 26f52ed..74f8f69 100644
--- a/uploader/templates/rqtl2/select-probeset-dataset.html
+++ b/uploader/templates/rqtl2/select-probeset-dataset.html
@@ -15,7 +15,7 @@
 {%if datasets | length > 0%}
 <div class="row">
   <form method="POST"
-        action="{{url_for('upload.rqtl2.select_probeset_dataset',
+        action="{{url_for('expression-data.rqtl2.select_probeset_dataset',
 	        species_id=species.SpeciesId, population_id=population.Id)}}"
         id="frm:select-probeset-dataset">
     <legend class="heading">Select from existing ProbeSet datasets</legend>
@@ -68,7 +68,7 @@
 
 <div class="row">
   <form method="POST"
-        action="{{url_for('upload.rqtl2.create_probeset_dataset',
+        action="{{url_for('expression-data.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>
diff --git a/uploader/templates/rqtl2/select-probeset-study-id.html b/uploader/templates/rqtl2/select-probeset-study-id.html
index b9bf52e..e3fd9cc 100644
--- a/uploader/templates/rqtl2/select-probeset-study-id.html
+++ b/uploader/templates/rqtl2/select-probeset-study-id.html
@@ -12,7 +12,7 @@
   <p>In this page, you can either select from a existing dataset:</p>
 
   <form method="POST"
-        action="{{url_for('upload.rqtl2.select_probeset_study',
+        action="{{url_for('expression-data.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>
@@ -62,7 +62,7 @@
   <p>Create a new ProbeSet dataset below:</p>
 
   <form method="POST"
-        action="{{url_for('upload.rqtl2.create_probeset_study',
+        action="{{url_for('expression-data.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>
diff --git a/uploader/templates/rqtl2/select-tissue.html b/uploader/templates/rqtl2/select-tissue.html
index 34e1758..fe3080a 100644
--- a/uploader/templates/rqtl2/select-tissue.html
+++ b/uploader/templates/rqtl2/select-tissue.html
@@ -15,7 +15,7 @@
 {%if tissues | length > 0%}
 <div class="row">
   <form method="POST"
-        action="{{url_for('upload.rqtl2.select_tissue',
+        action="{{url_for('expression-data.rqtl2.select_tissue',
 	        species_id=species.SpeciesId, population_id=population.Id)}}"
         id="frm:select-probeset-dataset">
     <legend class="heading">Select from existing ProbeSet datasets</legend>
@@ -65,7 +65,7 @@
     to the system below.</p>
 
   <form method="POST"
-        action="{{url_for('upload.rqtl2.create_tissue',
+        action="{{url_for('expression-data.rqtl2.create_tissue',
 	        species_id=species.SpeciesId, population_id=population.Id)}}"
         id="frm:create-probeset-dataset">
     <legend class="heading">Add new tissue, organ or biological material</legend>
diff --git a/uploader/templates/rqtl2/summary-info.html b/uploader/templates/rqtl2/summary-info.html
index 1be87fa..0adba2e 100644
--- a/uploader/templates/rqtl2/summary-info.html
+++ b/uploader/templates/rqtl2/summary-info.html
@@ -44,7 +44,7 @@
 
 <div class="row">
   <form id="frm:confirm-rqtl2bundle-details"
-        action="{{url_for('upload.rqtl2.confirm_bundle_details',
+        action="{{url_for('expression-data.rqtl2.confirm_bundle_details',
 	        species_id=species.SpeciesId,
 	        population_id=population.InbredSetId)}}"
         method="POST"
diff --git a/uploader/templates/rqtl2/upload-rqtl2-bundle-step-01.html b/uploader/templates/rqtl2/upload-rqtl2-bundle-step-01.html
index 07c240f..9d45c5f 100644
--- a/uploader/templates/rqtl2/upload-rqtl2-bundle-step-01.html
+++ b/uploader/templates/rqtl2/upload-rqtl2-bundle-step-01.html
@@ -71,13 +71,13 @@
 </div>
 
 <form id="frm-upload-rqtl2-bundle"
-      action="{{url_for('upload.rqtl2.upload_rqtl2_bundle',
+      action="{{url_for('expression-data.rqtl2.upload_rqtl2_bundle',
 	      species_id=species.SpeciesId,
 	      population_id=population.InbredSetId)}}"
       method="POST"
       enctype="multipart/form-data"
       data-resumable-target="{{url_for(
-                             'upload.rqtl2.upload_rqtl2_bundle_chunked_post',
+                             'expression-data.rqtl2.upload_rqtl2_bundle_chunked_post',
                              species_id=species.SpeciesId,
                              population_id=population.InbredSetId)}}">
   <input type="hidden" name="species_id" value="{{species.SpeciesId}}" />
diff --git a/uploader/templates/rqtl2/upload-rqtl2-bundle-step-02.html b/uploader/templates/rqtl2/upload-rqtl2-bundle-step-02.html
index 93b1dc9..8210ed0 100644
--- a/uploader/templates/rqtl2/upload-rqtl2-bundle-step-02.html
+++ b/uploader/templates/rqtl2/upload-rqtl2-bundle-step-02.html
@@ -14,7 +14,7 @@
   <p>Click "Continue" below to proceed.</p>
 
   <form id="frm-upload-rqtl2-bundle"
-        action="{{url_for('upload.rqtl2.select_dataset_info',
+        action="{{url_for('expression-data.rqtl2.select_dataset_info',
 	        species_id=species.SpeciesId,
 	        population_id=population.InbredSetId)}}"
         method="POST"