Merge pull request #134 from labsyspharm/gatingupload_form

commit
labsyspharm · Mar 6, 2024 · 5adcb81 · 5adcb81
2 parents 53ce893 + 2a43de4
commit 5adcb81
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/minerva_analysis/client/dist/vendor_bundle.js b/minerva_analysis/client/dist/vendor_bundle.js
diff --git a/minerva_analysis/client/package-lock.json b/minerva_analysis/client/package-lock.json
diff --git a/minerva_analysis/client/templates/upload.html b/minerva_analysis/client/templates/upload.html
@@ -31,7 +31,7 @@
                     <div id="custom_import" style="display: inline;">
                         <div class="row">
                             <div class="col-3">
-                                <label for="channel_file">Channel File Path:</label>
+                                <label for="channel_file">Image File Path:</label>
                             </div>
                             <div class="col-9">
                                 <input type="text" id="channel_file" class="form-control" name="channel_file" onkeyup="checkFileExistence(this)" required>
@@ -57,7 +57,7 @@
                         </div>
                         <div class="row">
                             <div class="col-3">
-                                <label for="csv_file">CSV File Path:</label>
+                                <label for="csv_file">Quantification File CSV:</label>
                             </div>
                             <div class="col-9">
 {#                                <input type="file" id="csv_file" name="csv_file" required>#}

diff --git a/minerva_analysis/server/routes/import_routes.py b/minerva_analysis/server/routes/import_routes.py
@@ -559,7 +559,7 @@ def check_mc_channel_file_existence():
                 mcmicroDirName = pathsSplit[len(pathsSplit) - 1]
 
                 # check if channel file exists
-                channelFile = Path(directory, 'registration', mcmicroDirName + '.ome.tif')
+                channelFile = Path(directory, 'registration', mcmicroDirName + '.ome.tif') or Path(directory, 'registration', mcmicroDirName + '.ome.tiff')
 
                 if channelFile.is_file():
                     return serialize_and_submit_json(True)