Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compatibility with core#2399 #90

Merged
merged 4 commits into from
Oct 9, 2023
Merged

Compatibility with core#2399 #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b9a00da
Compatibility with core#2399
xispa Oct 6, 2023
b4a2350
Port widget for DX
xispa Oct 6, 2023
de55ca6
Changelog
xispa Oct 6, 2023
ed55f29
cleanup
xispa Oct 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Changelog
1.4.0 (unreleased)
------------------

- #90 Compatibility with core#2399
- #89 Fix addition of snapshots in PatientFolder on Patient creation
- #88 Display all samples by default in Patient context
- #86 Fix non-unique MRNs are permitted when "Require MRN" setting is enabled
Expand Down
2 changes: 1 addition & 1 deletion src/senaite/patient/content/analysisrequest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
render_own_label=True,
default_age=True,
show_time=False,
datepicker_nofuture=True,
max="current",
visible={
"add": "edit",
}
Expand Down
2 changes: 1 addition & 1 deletion src/senaite/patient/content/patient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ class IPatientSchema(model.Schema):

directives.widget("birthdate",
DatetimeWidget,
datepicker_nofuture=True,
max="current",
show_time=False)
birthdate = DatetimeField(
title=_(u"label_patient_birthdate", default=u"Birthdate"),
Expand Down
8 changes: 5 additions & 3 deletions src/senaite/patient/skins/templates/senaite_patient_widgets/agedobwidget.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,15 @@
<div class="input-group input-group-sm flex-nowrap d-inline-flex w-auto">
<input type="date"
style="min-width:130px;max-width:130px"
tal:define="invalid_class python: 'is-invalid' if dob_estimated else ''"
tal:attributes="python:widget.attrs();
tal:define="invalid_class python: 'is-invalid' if dob_estimated else '';
widget_attrs python: widget.attrs(here, field);"
tal:attributes="
id string:${subfield_dob};
name string:${subfield_dob};
required python:required and 'required' or None;
value python: value;
class python: 'form-control form-control-sm {}'.format(invalid_class);"/>
class python: 'form-control form-control-sm {}'.format(invalid_class);
python:widget_attrs"/>

<div tal:condition="dob_estimated"
class="form-control form-control-sm text-danger border-danger">
Expand Down