Skip to content

Commit 37ae970

Browse files
authored
Merge pull request #1550 from AllenNeuralDynamics/production_testing
[update main] 2025-05-27
2 parents 21a48eb + ea5bb50 commit 37ae970

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/foraging_gui/Foraging.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2029,15 +2029,16 @@ def _AddWaterLogResult(self, session: Session):
20292029
logging.info(
20302030
"Creating SlimsWaterlogResult based on session information."
20312031
)
2032+
print(water)
20322033
model = models.SlimsWaterlogResult(
20332034
mouse_pk=mouse.pk,
2034-
date=session.session_start_time,
2035+
date=datetime.now(),
20352036
weight_g=session.animal_weight_post,
20362037
operator=self.behavior_session_model.experimenter[0],
2037-
water_earned_ml=water["water_in_session_foraging"],
2038+
water_earned_ml=water["water_in_session_total"],
20382039
water_supplement_delivered_ml=water["water_after_session"],
20392040
water_supplement_recommended_ml=None,
2040-
total_water_ml=water["water_in_session_total"],
2041+
total_water_ml=water["water_in_session_total"]+water["water_after_session"],
20412042
comments=session.notes,
20422043
workstation=session.rig_id,
20432044
sw_source=software.url,

src/foraging_gui/ForagingGUI.ui

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -761,14 +761,14 @@
761761
</property>
762762
<property name="minimumSize">
763763
<size>
764-
<width>0</width>
764+
<width>255</width>
765765
<height>300</height>
766766
</size>
767767
</property>
768768
<property name="maximumSize">
769769
<size>
770-
<width>16777215</width>
771-
<height>16777215</height>
770+
<width>270</width>
771+
<height>300</height>
772772
</size>
773773
</property>
774774
<property name="font">

0 commit comments

Comments
 (0)