Resetting queue and sample list when session changes

mxcube · Jan 31, 2025 · 205f76a · 205f76a
1 parent 6685af1
commit 205f76a
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/mxcubeweb/core/components/lims.py b/mxcubeweb/core/components/lims.py
@@ -204,11 +204,17 @@ def select_session(self, session_id: str) -> bool:
                     "[LIMS] Commissioning proposal flag set."
                 )
 
-        HWR.beamline.session.proposal_code = session.code
-        HWR.beamline.session.proposal_number = session.number
-        HWR.beamline.session.session_id = HWR.beamline.lims.get_session_id()
-        HWR.beamline.session.proposal_id = session.proposal_id
-        HWR.beamline.session.set_session_start_date(session.start_date)
+        if HWR.beamline.session.session_id != HWR.beamline.lims.get_session_id():
+            # NBNB Temp fix to be investigated
+            app.queue.clear_queue()
+            HWR.beamline.sample_view.clear_all()
+            app.lims.init_sample_list()
+
+            HWR.beamline.session.proposal_code = session.code
+            HWR.beamline.session.proposal_number = session.number
+            HWR.beamline.session.session_id = HWR.beamline.lims.get_session_id()
+            HWR.beamline.session.proposal_id = session.proposal_id
+            HWR.beamline.session.set_session_start_date(session.start_date)
 
         logging.getLogger("MX3.HWR").info(
             "[LIMS] Selected session. proposal=%s session_id=%s.",
@@ -236,7 +242,6 @@ def select_session(self, session_id: str) -> bool:
                 )
 
         # save selected proposal in users db
-
         current_user.selected_proposal = session.session_id
         self.app.usermanager.update_user(current_user)