If there is an error but videos were uploaded, show them. Added search Functionality (Fixed)

public/tags/subjectTags.json

@@ -1,6 +1,9 @@
 { "subject_tags": [
     { "value": "unimpaired", "label": "Unimpaired" },
     { "value": "alzheimers", "label": "Alzheimers" },
+    { "value": "anterior_cruciate_ligament", "label": "Anterior Cruciate Ligament (ACL)"},
+    { "value": "anterior_cruciate_ligament_replacement_left", "label": "Anterior Cruciate Ligament Replacement (ACLR) - Left"},
+    { "value": "anterior_cruciate_ligament_replacement_right", "label": "Anterior Cruciate Ligament Replacement (ACLR) - Right"},
     { "value": "athlete", "label": "Athlete" },
     { "value": "blind", "label": "Blind" },
     { "value": "cerebral_palsy", "label": "Cerebral Palsy" },
@@ -31,6 +34,8 @@
     { "value": "post_partum", "label": "Postpartum" },
     { "value": "ptsd", "label": "Post-Traumatic Stress Disorder (PTSD)" },
     { "value": "pregnant", "label": "Pregnant" },
+    { "value": "slipped_capital_femoral_epiphysis", "label": "Slipped Capital Femoral Epiphysis" },
+    { "value": "spinal_cord_injury", "label": "Spinal Cord Injury (SCI)" },
     { "value": "spina_bifida", "label": "Spina Bifida" },
     { "value": "stroke", "label": "Stroke" },
     { "value": "stroke_left_hemiparesis", "label": "Stroke Left Hemiparesis" },

src/components/pages/SelectSession.vue

@@ -39,6 +39,19 @@
       </v-btn>
 
       <v-checkbox v-model="show_trashed" class="ml-2 mt-0" label="Show removed sessions"></v-checkbox>
+
+      <v-text-field
+        v-model="searchText"
+        class="ml-2"
+        label="Enter text"
+        dense
+      ></v-text-field>
+
+      <v-btn
+        class="ml-2"
+        @click="handleSearch">
+        Submit
+      </v-btn>
     </div>
 
     <v-data-table        
@@ -279,6 +292,7 @@ export default {
       sessionName: '',
       sessionNewName: '',
       show_trashed: false,
+      searchText: '',
       headers: [
         {
           text: 'Session ID',
@@ -325,6 +339,27 @@ export default {
         'restoreTrashedSession',
         'loadAnalysisDashboardList',
     ]),
+    handleSearch() {
+      this.loading = true;
+      const params = new URLSearchParams({ text: this.searchText }).toString();Add commentMore actions
+      axios.get(`/sessions/search_sessions/?${params}`).then(response => {
+        const filteredSessions = response.data.filter(session => {
+          // Count trials that are NOT calibration
+          const nonCalibrationTrials = session.trials.filter(
+            trial => trial.name.toLowerCase() !== 'calibration'
+          );
+          // Keep the session only if there's at least one non-calibration trial
+          return nonCalibrationTrials.length > 0;
+        });
+
+        this.valid_sessions = filteredSessions;
+        this.session_total = filteredSessions.length;
+        this.loading = false;
+      }).catch(error => {
+        apiError(error)
+        this.loading = false
+      })
+    },
     loadValidSessions () {
       this.loading = true
       let data = {

src/components/pages/Session.vue

@@ -1246,7 +1246,7 @@
           this.trial = null
           this.synced = false
           this.trialLoading = true
-  
+
           try {
             const {data} = await axios.get(`/trials/${trial.id}/`)
 
@@ -1255,7 +1255,6 @@
 
             // load JSON
             const json = data.results.filter(element => element.tag == "visualizerTransforms-json")
-
             if (json && json.length > 0) {
               let data
               const url = json[0].media
@@ -1286,18 +1285,26 @@
 
             this.videos = data.results.filter(element => element.tag == "video-sync")
 
+            let render_skeleton = true
+
             if (this.videos.length === 0) {
               this.frame = 0
               this.time = 0
+              this.videos = data.videos
+              this.videos.forEach(videoObj => {
+                videoObj.media = videoObj.video;
+                delete videoObj.video;
+              });
+              render_skeleton = false
             }
 
-            if (this.frames.length > 0) {
+            if (this.frames.length > 0 || this.videos.length > 0) {
               this.$nextTick(() => {
                 try {
                   while (this.$refs.mocap.lastChild) {
                     this.$refs.mocap.removeChild(this.$refs.mocap.lastChild)
                   }
-  
+
                   // setup3d
                   const container = this.$refs.mocap
 
@@ -1373,26 +1380,28 @@
                     // const cameraHelper = new THREE.CameraHelper(light.shadow.camera);
                     // this.scene.add(cameraHelper);
                   }
-
-                  // add bones
-                  for (let body in this.animation_json.bodies) {
-                    let bd = this.animation_json.bodies[body]
-                    bd.attachedGeometries.forEach((geom) => {
-                      let path = 'https://mc-opencap-public.s3.us-west-2.amazonaws.com/geometries/' + geom.substr(0, geom.length - 4) + ".obj";
-                      objLoader.load(path, (root) => {
-                        root.castShadow = true;
-                        root.receiveShadow = true;
-                        root.traverse(function (child) {
-                          if (child instanceof THREE.Mesh) {
-                            //                               child.receiveShadow = true;
-                            child.castShadow = true;
-                          }
-                        });
-                        this.meshes[body + geom] = root;
-                        this.meshes[body + geom].scale.set(bd.scaleFactors[0], bd.scaleFactors[1], bd.scaleFactors[2])
-                        this.scene.add(root);
+
+                  if (render_skeleton) {
+                    // add bones
+                    for (let body in this.animation_json.bodies) {
+                      let bd = this.animation_json.bodies[body]
+                      bd.attachedGeometries.forEach((geom) => {
+                        let path = 'https://mc-opencap-public.s3.us-west-2.amazonaws.com/geometries/' + geom.substr(0, geom.length - 4) + ".obj";
+                        objLoader.load(path, (root) => {
+                          root.castShadow = true;
+                          root.receiveShadow = true;
+                          root.traverse(function (child) {
+                            if (child instanceof THREE.Mesh) {
+                              //                               child.receiveShadow = true;
+                              child.castShadow = true;
+                            }
+                          });
+                          this.meshes[body + geom] = root;
+                          this.meshes[body + geom].scale.set(bd.scaleFactors[0], bd.scaleFactors[1], bd.scaleFactors[2])
+                          this.scene.add(root);
+                        })
                       })
-                    })
+                    }
                   }
                 } finally {
                   this.trialLoading = false

src/components/ui/Status.vue

@@ -39,7 +39,8 @@ export default {
 
         case 'error': {
           const res = await axios.get(`/trials/${this.value.id}/`)
-          apiErrorRes(res, 'Error in processing, you may want to re-record this trial.')         
+          apiErrorRes(res, 'Error in processing, you may want to re-record this trial.')
+          this.$emit('click')
           break          
         }