Merge pull request #3097 from antgonza/fix-3089

fix #3089
qiita-spots · Apr 28, 2021 · cac9820 · cac9820
2 parents 7af3f73 + b3efaee
commit cac9820
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/qiita_pet/templates/study_ajax/artifact_file_selector.html b/qiita_pet/templates/study_ajax/artifact_file_selector.html
@@ -20,6 +20,8 @@
    * that are "checkable"
    */
   function check_files_lists() {
+      $('#file-check-messages').hide();
+
       // Reset the error counter
       $('#files-selector').attr("data-error-count", 0);
       // initialize the error count to the number of file types
@@ -37,9 +39,14 @@
    * as wrong and updates the global error counter accordingly
    *
    */
-  function mark_as_wrong(container) {
+  function mark_as_wrong(container, message=null) {
     $(container).removeClass("highlightCorrect");
     $(container).addClass("highlightWrong");
+    if (message !== null){
+      $('#file-check-messages').show();
+      $('#file-check-messages').html(message);
+    }
+
     if ( $(container).attr("data-correct") === "true" ) {
       // It changed value - update the counters and the value
       $('#files-selector').attr("data-error-count", +$('#files-selector').attr("data-error-count") + 1);
@@ -60,6 +67,7 @@
   function mark_as_correct(container) {
     $(container).removeClass("highlightWrong");
     $(container).addClass("highlightCorrect");
+
     if ( $(container).attr("data-correct") === "false" ) {
       // It changed value - update the counters and the value
       var count = $('#files-selector').attr("data-error-count");
@@ -86,6 +94,7 @@
     var num_children = this.children.length;
     var is_required = $(this).attr("data-file-required") === "True";
     var req_count = +$(this).attr("data-file-count");
+    var num_samples = $("#processing-tab-btn").attr("number-samples");
 
     // If required count is > 0, then we have to check that the number of files
     // in each list that is required or optional but populated, have the same
@@ -96,8 +105,14 @@
       // If the count is correct, then it is always correct. If the count is not
       // correct, it is correct if and only if it is not required and has no
       // children
-      if (count_ok || (!is_required && num_children === 0)) {
-        mark_as_correct(this);
+
+      if ((count_ok || (!is_required && num_children === 0))) {
+        if (($("#artifact-type").val() === 'per_sample_FASTQ') && (num_samples !== num_children)) {
+          message = "per_sample_FASTQ expects one run_prefix per sample. Check for duplicate or missing run_prefix entries.";
+          mark_as_wrong(this, message);
+        } else {
+          mark_as_correct(this);
+        }
       }
       else {
         mark_as_wrong(this);
@@ -229,7 +244,7 @@
           {% raw message.replace('\n', '<br/>') %}
         {% end %}
       </div>
-
+      <div class="alert alert-warning" role="alert" id="file-check-messages"></div>
   </div>
   <div class="col-md-3" id="files-div">
     <p style="text-align: center;"><i>Available Files</i></p>

diff --git a/qiita_pet/templates/study_ajax/prep_summary.html b/qiita_pet/templates/study_ajax/prep_summary.html
@@ -458,7 +458,7 @@ <h5>
     <ul class="nav nav-pills">
       <li style="border: 1px solid #428bca; border-radius: 5px"><a data-toggle="tab" href="#sample-listing-tab-div">Sample Listing</a></li>
       <li style="border: 1px solid #428bca; border-radius: 5px"><a data-toggle="tab" href="#summary-tab-div">Summary</a></li>
-      <li style="border: 1px solid #428bca; border-radius: 5px" class="active"><a data-toggle="tab" href="#processing-graph-vue" id="processing-tab-btn">Processing</a></li>
+      <li style="border: 1px solid #428bca; border-radius: 5px" class="active"><a data-toggle="tab" href="#processing-graph-vue" id="processing-tab-btn" number-samples={{num_samples}}>Processing</a></li>
     </ul>
 
     <div class="tab-content">
@@ -494,8 +494,8 @@ <h5>
         </div>
       </div>
       <div id="summary-tab-div" class="tab-pane fade">
-        <b>Number of samples: </b>{{num_samples}}</br>
-        <b>Number of columns: </b>{{num_columns}}</br>
+        <b>Number of samples: </b>{{num_samples}}<br/>
+        <b>Number of columns: </b>{{num_columns}}<br/>
         {% if editable %}
           <!-- Update prep template -->
           <div class="row">