Skip to content
This repository was archived by the owner on Jan 16, 2024. It is now read-only.

Fix Traceback "bika_widgets/remarks does not exist for ..." #109

Merged
merged 1 commit into from
Sep 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Changelog

**Fixed**

- #109 Traceback `bika_widgets/remarks does not exist for`
- #107 DateTime validator fires even if DateOfBirth is non-mandatory
- #106 Fields from Patient's additional tabs are not displayed
- #105 Date of Birth and Age are required fields for anonymous patients
Expand Down
14 changes: 6 additions & 8 deletions bika/health/content/insurancecompany.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,18 @@
from Products.Archetypes.public import *
from bika.health import bikaMessageFactory as _
from bika.health.config import PROJECTNAME
from bika.lims.content.organisation import Organisation
from bika.health.interfaces import IInsuranceCompany
from bika.lims.browser.fields.remarksfield import RemarksField
from bika.lims.browser.widgets.remarkswidget import RemarksWidget
from bika.lims.content.organisation import Organisation
from zope.interface import implements

schema = Organisation.schema.copy() + ManagedSchema((
TextField('Remarks',
RemarksField(
'Remarks',
searchable = True,
default_content_type = 'text/x-web-intelligent',
allowable_content_types = ('text/x-web-intelligent',),
default_output_type = "text/html",
widget = TextAreaWidget(
macro = "bika_widgets/remarks",
widget = RemarksWidget(
label = _('Remarks'),
append_only = True,
),
),
))
Expand Down
11 changes: 4 additions & 7 deletions bika/health/content/patient.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@
from bika.health import bikaMessageFactory as _
from bika.lims.browser.fields import AddressField
from bika.lims.browser.fields import DateTimeField as DateTimeField_bl
from bika.lims.browser.fields.remarksfield import RemarksField
from bika.lims.browser.widgets import AddressWidget
from bika.lims.browser.widgets import DateTimeWidget as DateTimeWidget_bl
from bika.lims.browser.widgets import RecordsWidget
from bika.health.widgets import SplittedDateWidget
from bika.health.config import *
from bika.lims.browser.widgets.remarkswidget import RemarksWidget
from bika.lims.content.person import Person
from bika.health.interfaces import IPatient
from bika.health.permissions import *
Expand Down Expand Up @@ -187,16 +189,11 @@
visible=False
),
),
TextField(
RemarksField(
'Remarks',
searchable=True,
default_content_type='text/plain',
allowable_content_types=('text/plain', ),
default_output_type="text/plain",
widget=TextAreaWidget(
macro="bika_widgets/remarks",
widget=RemarksWidget(
label=_('Remarks'),
append_only=True,
),
),
RecordsField(
Expand Down
12 changes: 5 additions & 7 deletions bika/health/content/vaccinationcenter.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,18 @@
from bika.lims import bikaMessageFactory as _b
from bika.health import bikaMessageFactory as _
from bika.health.config import PROJECTNAME
from bika.lims.browser.fields.remarksfield import RemarksField
from bika.lims.browser.widgets.remarkswidget import RemarksWidget
from bika.lims.content.organisation import Organisation
from bika.health.interfaces import IVaccinationCenter
from zope.interface import implements

schema = Organisation.schema.copy() + ManagedSchema((
TextField('Remarks',
RemarksField(
'Remarks',
searchable = True,
default_content_type = 'text/x-web-intelligent',
allowable_content_types = ('text/x-web-intelligent',),
default_output_type = "text/html",
widget = TextAreaWidget(
macro = "bika_widgets/remarks",
widget = RemarksWidget(
label = _('Remarks'),
append_only = True,
),
),
))
Expand Down