From 0daf690549ba36a6fe30a41f4dae7b765c097932 Mon Sep 17 00:00:00 2001
From: Kalev Takkis <ktakkis@informaticsmatters.com>
Date: Wed, 4 Sep 2024 15:24:48 +0100
Subject: [PATCH] stashing

---
 viewer/target_loader.py | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/viewer/target_loader.py b/viewer/target_loader.py
index e94127d5..27d7c6f6 100644
--- a/viewer/target_loader.py
+++ b/viewer/target_loader.py
@@ -1807,10 +1807,19 @@ def process_bundle(self):
         for val in canon_site_objects.values():  # pylint: disable=no-member
             prefix = val.instance.canon_site_num
             # tag = canon_name_tag_map.get(val.versioned_key, "UNDEFINED")
-            tag = val.versioned_key
             so_list = SiteObservation.objects.filter(
                 canon_site_conf__canon_site=val.instance
             )
+            try:
+                tag = val.versioned_key.split('-')[1]
+                main_obvs = val.instance.ref_conf_site.ref_site_observation
+                code_prefix = experiment_objects[main_obvs.experiment.code].index_data[
+                    "code_prefix"
+                ]
+                tag = f"{code_prefix}{tag}"
+            except IndexError:
+                tag = val.versioned_key
+
             self._tag_observations(
                 tag, prefix, category=cat_canon, site_observations=so_list
             )
@@ -1826,11 +1835,21 @@ def process_bundle(self):
                 f"{val.instance.canon_site.canon_site_num}"
                 + f"{next(numerators[val.instance.canon_site.canon_site_num])}"
             )
-            # tag = val.instance.name.split('+')[0]
-            tag = val.instance.name
             so_list = [
                 site_observation_objects[k].instance for k in val.index_data["members"]
             ]
+            # tag = val.instance.name.split('+')[0]
+            # tag = val.instance.name
+            try:
+                tag = val.instance.name.split('-')[1]
+                main_obvs = val.instance.ref_site_observation
+                code_prefix = experiment_objects[main_obvs.experiment.code].index_data[
+                    "code_prefix"
+                ]
+                tag = f"{code_prefix}{tag}"
+            except IndexError:
+                tag = val.instance.name
+
             self._tag_observations(
                 tag, prefix, category=cat_conf, site_observations=so_list, hidden=True
             )
@@ -1855,10 +1874,11 @@ def process_bundle(self):
         cat_xtal = TagCategory.objects.get(category="Crystalforms")
         for val in xtalform_objects.values():  # pylint: disable=no-member
             prefix = f"F{val.instance.xtalform_num}"
-            tag = val.instance.name
             so_list = SiteObservation.objects.filter(
                 xtalform_site__xtalform=val.instance
             )
+            tag = val.instance.name
+
             self._tag_observations(
                 tag, prefix, category=cat_xtal, site_observations=so_list
             )