Water restrictions in UW (#962)

* default implant weight is 0 and not None

* temporarily set django below version 6 #963

* make sure current subject is always available in restriction form

* fix tests when we can't get current object from request

* update alyx version number - changelog

Author: oliche

.gitignore

@@ -48,3 +48,5 @@ alyx/alyx_full.sql.gz
 alyx/.idea/
 
 alyx.log
+
+alyx/data/management/commands/create_public_links.py

CHANGELOG.md

@@ -5,11 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.3.3] 2025-12-04
+
+### Fixed
+- default implant weight is 0 and not none to allow plotting of water curves.
+- water restriction admin form makes sure the current subject is selectable even if it is not alive anymore.
 
 ## [3.3.2] 2025-11-26
 
 ### Fixed
-
 - water history plots: the weight thresholds is `(w - iw) / (ew - iw)`, where `w` is the measured weight, `iw` the implant weight and `ew` the expected weight.  Expected weight is `(ew = (rw * a + zw *b) + iw`  (weighted sum of reference weight and zscore weight + implant weight).  The display was computing thresholds according to `w/ew` , not taking into account the implant weight and is now fixed.
 
 
@@ -18,7 +22,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - The documentation endpoint `/docs` is only for the browser and uses openapiv3. The database schemes are accessed through `/api/schema`. For compatibility, if the headers require `coreapi`, the endpoint returns a frozen set of endpoint to the client. [#929](https://github.com/cortex-lab/alyx/pull/929)
-
 - narrative template is now available on the base action instead of only for surgeries [#938](https://github.com/cortex-lab/alyx/pull/938)
 
 

alyx/actions/admin.py

@@ -348,11 +348,20 @@ class Meta:
 class WaterRestrictionAdmin(BaseActionAdmin):
     def formfield_for_foreignkey(self, db_field, request, **kwargs):
         if db_field.name == 'subject':
+            obj = None
             kwargs['queryset'] = Subject.objects.filter(cull__isnull=True).order_by('nickname')
-            subject_id = self._get_last_subject(request)
-            if subject_id:
-                subject = Subject.objects.get(id=subject_id)
-                kwargs['initial'] = subject
+            # here if the form is of an existing water restriction, get the subject
+            if request.resolver_match is not None:
+                object_id = request.resolver_match.kwargs.get('object_id')
+                obj = self.get_object(request, object_id) if object_id else None
+            if obj is not None:
+                kwargs['queryset'] = (kwargs['queryset'] | Subject.objects.filter(pk=obj.subject.pk)).order_by('nickname')
+                kwargs['initial'] = obj.subject
+            else:
+                subject_id = self._get_last_subject(request)
+                if subject_id:
+                    subject = Subject.objects.get(id=subject_id)
+                    kwargs['initial'] = subject
         return super(BaseActionAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs)
 
     def get_form(self, request, obj=None, **kwargs):

alyx/actions/water_control.py

@@ -294,7 +294,7 @@ def last_implant_weight_before(self, date=None, return_date=False):
         weights_before = (
             (d, w) for (d, w) in reversed(self.implant_weights) if d.date() <= date.date()
         )
-        w = next(weights_before, None)
+        w = next(weights_before, 0)
         return w[1] if (w and not return_date) else w
 
     def last_weighing_before(self, date=None):

alyx/alyx/__init__.py

@@ -1 +1 @@
-VERSION = __version__ = '3.3.2'
+VERSION = __version__ = '3.3.3'

deploy/docker-compose-postgres-gunicorn.yaml

@@ -4,7 +4,7 @@ services:
     container_name: alyx_apache
     ports:
       - "8000:8000"
-    env_file: ../alyx/alyx/.env_local
+    env_file: ../alyx/alyx/.env
     command: >
       bash -c "python /var/www/alyx/alyx/manage.py collectstatic --noinput &&
                gunicorn --workers 2 -b 0.0.0.0:8000 alyx.gunicorn_wsgi:application"
@@ -19,7 +19,7 @@ services:
   postgres:
     image: postgres:17
     container_name: alyx_postgres
-    env_file: ../alyx/alyx/.env_local
+    env_file: ../alyx/alyx/.env
     volumes:
       - alyx_postgres:/var/lib/postgresql/data
     expose:

deploy/docker-compose-postgres.yaml

@@ -2,7 +2,7 @@ services:
   postgres:
     image: postgres:17
     container_name: alyx_postgres
-    env_file: ../alyx/alyx/.env
+    env_file: ../alyx/alyx/.env_prod
     volumes:
       - alyx_postgres:/var/lib/postgresql/data
     ports:

requirements.txt

@@ -1,6 +1,6 @@
 boto3
 colorlog
-django>=5.2.2
+django>=5.2.9,<6  # see issue #963
 django-admin-list-filter-dropdown
 django-admin-rangefilter
 django-autocomplete-light