feat: ✨ Updated samples table headers

fairdataihub · Nov 23, 2023 · 4d7c086 · 4d7c086
1 parent 62ed4a0
commit 4d7c086
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/scripts/guided-mode/guided-curate-dataset.js b/scripts/guided-mode/guided-curate-dataset.js
@@ -10241,14 +10241,14 @@ const renderSubjectSampleAdditionTable = (subject) => {
       <thead>
         <tr>
           <th class="text-center" colspan="2" style="position: relative">   
-            Enter a unique sample ID for each sample taken from subject ${subject.subjectName}
+            Samples taken from ${subject.subjectName}
             <button
               type="button"
               class="btn btn-primary btn-sm button-subject-add-samples"
               style="position: absolute; top: 10px; right: 20px;"
               data-samples-subject-name="${subject.subjectName}"
             >
-              Add sample
+              Add samples
             </button>
           </th>
         </tr>
@@ -11638,9 +11638,13 @@ const guidedOpenEntityAdditionSwal = async (entityName) => {
       });
     }
   };
-
+  `${entityNameSingular} addition`;
   const additionConfirmed = await Swal.fire({
-    title: `${entityNameSingular} addition`,
+    title: `${
+      entityName.startsWith("sub-")
+        ? `Add samples taken from ${entityName}`
+        : `${entityNameSingular} addition`
+    }`,
     html: `
       <p class="help-text">
         Enter a unique ${entityNameSingular} ID and press enter or the

diff --git a/sections/guided_mode/guided_curate_dataset.html b/sections/guided_mode/guided_curate_dataset.html
@@ -1362,17 +1362,17 @@ <h2 class="guided--text-user-directions">
                     src="assets/img/subjects-samples-spreadseet-example.png"
                   />
                   <p class="help-text text-left w-100">
-                    <b>Subject ID column: </b>For each subject in your dataset, enter the subject's
-                    name prefaced with 'sub-'.
+                    <b>Subject ID column: </b> Type each subject's name here, starting with 'sub-'.
+                    Avoid using special characters or spaces.
                   </p>
                   <p class="help-text text-left">
-                    <b>Sample ID column: </b>For each sample taken from a subject in your dataset,
-                    enter the sample's name prefaced with 'sam-'. All sample names must be unique.
+                    <b>Sample ID column: </b> Type each sample's name here, starting with 'sam-'.
+                    Make sure each sample has a unique name. All sample names must be different.
+                    Avoid using special characters or spaces.
                   </p>
                   <p class="help-text text-left">
-                    <b>Note: </b> If the subjects in your dataset contain multiple samples, the
-                    subject ID can be duplicated in the 'Subject ID' column with each sample taken
-                    from the subject listed in the 'Sample ID' column.
+                    <b>Note: </b> If a subject has more than one sample, repeat the subject's name
+                    in the 'Subject ID' column for each sample.
                   </p>
                 </div>
                 <div class="sub-section mb-3" id="import-instructions-subjects-pools-samples">