Skip to content

[FIX][T15384] NEWS Analysis creates trace error when viewing date field #75

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

Merged
james-opusvl merged 1 commit into from
Aug 19, 2019
Merged

[FIX][T15384] NEWS Analysis creates trace error when viewing date field #75

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions nh_eobs_analysis/news.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ class nh_eobs_news_report(osv.Model):
_columns = {
'user_id': fields.many2one('res.users', 'Taken By', readonly=True),
'date_scheduled': fields.datetime('Date Scheduled', readonly=True),
'date_terminated': fields.datetime('Date Taken', readonly=True),
'effective_date_terminated': fields.datetime('Date Taken', readonly=True),
'date_terminated': fields.datetime('Submitted Date', readonly=True),
'effective_date_terminated': fields.datetime('Effective Date Taken', readonly=True),
'ward_id': fields.many2one('nh.clinical.location', 'Ward',
readonly=True),
'location_str': fields.char('Location', readonly=True),
Expand Down Expand Up @@ -51,6 +51,7 @@ def _select(self):
end as obs_type,
a.date_scheduled as date_scheduled,
a.effective_date_terminated as effective_date_terminated,
a.date_terminated as date_terminated,
a.location_id as location_id,
case
when char_length(loc.name) = 5 then
Expand Down Expand Up @@ -155,6 +156,7 @@ def _group_by(self):
a.terminate_uid,
obs_type,
a.date_scheduled,
a.date_terminated,
a.effective_date_terminated,
a.location_id,
location_str,
Expand Down