Merge remote-tracking branch 'upstream/main' into docker-hf

indie_label_svelte/src/HypothesisPanel.svelte

@@ -95,7 +95,7 @@
         selected = all_reports[0];
         setActive(selected);
         cur_open_evidence = selected["evidence"];
-        unfinished_count = all_reports.filter(item => !item.complete_status).length
+        unfinished_count = all_reports.filter(item => (item.evidence.length == 0) || (item.text_entry == "") || !(item.sep_selection)).length
         has_complete_report = hasCompleteReport();
         return all_reports;
     }
@@ -165,15 +165,13 @@
             evidence: [],
             text_entry: "",
             sep_selection: "",
-            complete_status: false,
         };
         all_reports = all_reports.concat(new_report);
         promise = Promise.resolve(all_reports);
         // Open this new report
         selected = all_reports[all_reports.length - 1];
         cur_open_evidence = selected["evidence"];
-        selected["complete_status"] = false;
-        unfinished_count = all_reports.filter(item => !item.complete_status).length
+        unfinished_count = all_reports.filter(item => (item.evidence.length == 0) || (item.text_entry == "") || !(item.sep_selection)).length
     }
 
     function handleDeleteReport() {
@@ -182,17 +180,11 @@
         promise = Promise.resolve(all_reports);
         selected  = all_reports[0];
         cur_open_evidence = selected["evidence"];
-        unfinished_count = all_reports.filter(item => !item.complete_status).length
-    }
-
-    function handleMarkComplete() {
-        selected["complete_status"] = !selected["complete_status"];
-        unfinished_count = all_reports.filter(item => !item.complete_status).length
-        handleSaveReport(); // Auto-save report
+        unfinished_count = all_reports.filter(item => (item.evidence.length == 0) || (item.text_entry == "") || !(item.sep_selection)).length
     }
 
     function hasCompleteReport() {
-        return all_reports.some(item => item.complete_status && (item.evidence.length > 0) && (item.text_entry != "") && (item.sep_selection));
+        return all_reports.some(item => (item.evidence.length > 0) && (item.text_entry != "") && (item.sep_selection));
     }
 
     // Error type
@@ -309,7 +301,7 @@
                                         on:click={() => setActive(report)}
                                         activated={selected === report}
                                     >   
-                                        {#if report["complete_status"]}
+                                        {#if (report["evidence"].length > 0) && (report["text_entry"] != "") && (report["sep_selection"])}
                                         <Graphic class="material-icons" aria-hidden="true">task_alt</Graphic>
                                         {:else}
                                         <Graphic class="material-icons" aria-hidden="true">radio_button_unchecked</Graphic>
@@ -455,7 +447,7 @@
                                     
                                 </div>
 
-                                <div class="spacing_vert_40">
+                                <div class="spacing_vert_40 spacing_vert_100_bottom">
                                     <div class="head_6">
                                         <b>Audit Category</b>
                                     </div>
@@ -467,18 +459,6 @@
                                         </Select>
                                     </div>
                                 </div>
-
-                                <div class="spacing_vert_100_bottom">
-                                    <div>
-                                        <span class="head_6"><b>Mark report as complete?</b></span>
-                                        <FormField>
-                                            <Checkbox checked={selected["complete_status"]} on:change={handleMarkComplete} />
-                                        </FormField>
-                                        <br>
-                                        <p>Reports must be marked as complete and include all fields before they can be sent to AVID below.</p>
-                                    </div>
-                                    
-                                </div>
                             </div>
                             {/if}
                         </main>
@@ -540,9 +520,8 @@
                     on:click={handleSubmitReport} 
                     variant="outlined"
                     color="secondary"
-                    disabled={!has_complete_report}
                 >
-                    <Label>Send to AVID</Label>
+                    <Label>Send Reports to AVID</Label>
                 </Button>
                 {/key}
 

indie_label_svelte/src/SubmitReportDialog.svelte

@@ -3,12 +3,19 @@
     import Button, { Label } from "@smui/button";
     import Textfield from "@smui/textfield";
     import CircularProgress from '@smui/circular-progress';
+    import Checkbox from '@smui/checkbox';
 
     export let open;
     export let cur_user;
     export let all_reports;
     let name = "";
     let email = "";
+    // which_reports_to_submit is an array of booleans that tracks whether the report
+    // in the corresponding index of all_reports should be submitted to AVID.
+    let which_reports_to_submit = [];
+    for (let i = 0; i < all_reports.length; i++) {
+        which_reports_to_submit.push(false);
+    }
 
     let promise_submit = Promise.resolve(null);
     function handleSubmitReport() {
@@ -16,9 +23,17 @@
     }
 
     async function submitReport() {
+        //Get the relevant reports
+        let submitted_reports = [];
+        for (let i = 0; i < which_reports_to_submit.length; i++) {
+            if (which_reports_to_submit[i]) {
+                submitted_reports.push(all_reports[i])
+            }
+        }
+
         let req_params = {
             cur_user: cur_user,
-            reports: JSON.stringify(all_reports),
+            reports: JSON.stringify(submitted_reports),
             name: name,
             email: email,
         };
@@ -49,11 +64,15 @@
 
             <!-- Summary of complete reports -->
             <div>
-                <p><b>Summary of Reports to Send</b> (Reports that include all fields and are marked as complete)</p>
+                <p><b>Summary of Reports Eligible to Send</b> (Reports that include all fields)</p>
+                <p>    Select the reports you want to submit. </p>
                 <ul>
-                    {#each all_reports as report}
-                        {#if report["complete_status"] && (report["evidence"].length > 0) && (report["text_entry"] != "") && (report["sep_selection"])}
-                            <li>{report["title"]}</li>
+                    {#each all_reports as report, index}
+                        {#if (report["evidence"].length > 0) && (report["text_entry"] != "") && (report["sep_selection"])}
+
+                            <input type="checkbox" bind:checked={which_reports_to_submit[index]} />
+
+                            <span>{report["title"]}</span>
                             <ul>
                                 <li>Error Type: {report["error_type"]}</li>
                                 <li>Evidence: Includes {report["evidence"].length} example{(report["evidence"].length > 1) ? 's' : ''}</li>
@@ -75,7 +94,7 @@
 
             <!-- Submission and status message -->
             <div class="dialog_footer">
-                <Button on:click={handleSubmitReport} variant="outlined">
+                <Button on:click={handleSubmitReport} variant="outlined" disabled={which_reports_to_submit.filter(item => item).length == 0}>
                     <Label>Submit Report to AVID</Label>
                 </Button>