2 files changed, 95 insertions, 8 deletions
diff --git a/uploader/templates/phenotypes/bulk-edit-upload.html b/uploader/templates/phenotypes/bulk-edit-upload.html
new file mode 100644
index 0000000..926bcf5
--- /dev/null
+++ b/uploader/templates/phenotypes/bulk-edit-upload.html
@@ -0,0 +1,61 @@
+{%extends "phenotypes/base.html"%}
+{%from "flash_messages.html" import flash_all_messages%}
+{%from "macro-table-pagination.html" import table_pagination%}
+{%from "populations/macro-display-population-card.html" import display_population_card%}
+
+{%block title%}Phenotypes{%endblock%}
+
+{%block pagetitle%}Phenotypes{%endblock%}
+
+{%block lvl4_breadcrumbs%}
+<li {%if activelink=="view-dataset"%}
+    class="breadcrumb-item active"
+    {%else%}
+    class="breadcrumb-item"
+    {%endif%}>
+  <a href="{{url_for('species.populations.phenotypes.view_dataset',
+           species_id=species.SpeciesId,
+           population_id=population.Id,
+           dataset_id=dataset.Id)}}">View</a>
+</li>
+{%endblock%}
+
+{%block contents%}
+<div class="row">
+  <p>Upload the edited file you downloaded and edited.</p>
+</div>
+
+<div class="row">
+  <form id="frm-bulk-edit-upload"
+        class="form-horizontal"
+        method="POST"
+        action="{{url_for(
+                'species.populations.phenotypes.edit_upload_phenotype_data',
+                species_id=species.SpeciesId,
+                population_id=population.Id,
+                dataset_id=dataset.Id)}}"
+        enctype="multipart/form-data">
+
+    <div class="form-group row">
+      <label for="file-upload-bulk-edit-upload"
+             class="form-label col-form-label col-sm-2">
+        Edited File</label>
+      <div class="col-sm-10">
+        <input id="file-upload-bulk-edit-upload"
+               name="file_upload_bulk_edit_upload"
+               class="form-control"
+               type="file"
+               required="required" />
+      </div>
+    </div>
+
+    <input type="submit" class="btn btn-primary"
+           value="upload to edit" />
+
+  </form>
+</div>
+{%endblock%}
+
+
+{%block javascript%}
+{%endblock%}
diff --git a/uploader/templates/phenotypes/view-dataset.html b/uploader/templates/phenotypes/view-dataset.html
index fa1044b..21563d6 100644
--- a/uploader/templates/phenotypes/view-dataset.html
+++ b/uploader/templates/phenotypes/view-dataset.html
@@ -147,6 +147,8 @@
                           },
                           {
                               text: "Bulk Edit (Download Data)",
+                              className: "btn btn-info btn-bulk-edit",
+                              titleAttr: "Click to download data for editing.",
                               action: (event, dt, node, config) => {
                                   var phenoids = [];
                                   var selected = dt.rows({selected: true, page: "all"}).data();
@@ -160,10 +162,23 @@
                                       alert("No record selected. Nothing to do!");
                                       return false;
                                   }
+
+                                  $(".btn-bulk-edit").prop("disabled", true);
+                                  $(".btn-bulk-edit").addClass("d-none");
+                                  var spinner = $(
+                                      "<div id='bulk-edit-spinner' class='spinner-grow text-info'>");
+                                  spinner_content = $(
+                                      "<span class='visually-hidden'>");
+                                  spinner_content.html(
+                                      "Downloading data &hellip;");
+                                  spinner.append(spinner_content)
+                                  $(".btn-bulk-edit").parent().append(
+                                      spinner);
+
                                   $.ajax(
                                       (`/species/${species_id}/populations/` +
                                        `${population_id}/phenotypes/datasets/` +
-                                       `${dataset_id}/download`),
+                                       `${dataset_id}/edit-download`),
                                       {
                                           method: "POST",
                                           data: JSON.stringify(phenoids),
@@ -185,19 +200,30 @@
                                               console.log("Experienced an error: ", textStatus);
                                               console.log("The ERROR: ", errorThrown);
                                           },
+                                          complete: (jqXHR, textStatus) => {
+                                              $("#bulk-edit-spinner").remove();
+                                              $(".btn-bulk-edit").removeClass(
+                                                  "d-none");
+                                              $(".btn-bulk-edit").prop(
+                                                  "disabled", false);
+                                          },
                                           contentType: "application/json"
                                       });
-                              },
-                              className: "btn btn-info",
-                              titleAttr: "Click to download data for editing."
+                              }
                           },
                           {
                               text: "Bulk Edit (Upload Data)",
+                              className: "btn btn-info btn-bulk-edit",
+                              titleAttr: "Click to upload edited data you got by clicking the `Bulk Edit (Download Data)` button.",
                               action: (event, dt, node, config) => {
-                                  alert("Not implemented yet!")
-                              },
-                              className: "btn btn-info",
-                              titleAttr: "Click to upload edited data you got by clicking the `Bulk Edit (Download Data)` button."
+                                  window.location.assign(
+                                      `${window.location.protocol}//` +
+                                          `${window.location.host}` +
+                                          `/species/${species_id}` +
+                                          `/populations/${population_id}` +
+                                          `/phenotypes/datasets/${dataset_id}` +
+                                          `/edit-upload`)
+                              }
                           }
                       ]
                   },