Skip to content

Commits on Source 7

Show whitespace changes
Inline Side-by-side
client/CHANGELOG
View file @ b21a7db0
......@@ -6,6 +6,12 @@
# rel-1-7-patches
------------------------------------------------
1.7.8.
FIX: billing: invoice ID template configuration [thanks Marc]
FIX: config: top pane lab panel setting [thanks Jelle Mous]
FIX: searching across active EMR [thanks Eberhard]
1.7.7
FIX: EMR/tree: exception on showing visual progress note
......@@ -2009,6 +2015,10 @@ FIX: missing cast to ::text in dem.date_trunc_utc() calls
# gnumed_v22
------------------------------------------------
22.8
FIX: i18n.set_curr/force_curr_lang()
22.7
IMPROVED: lab results plotting scripts for gnuplot
......
client/business/gmBilling.py
View file @ b21a7db0
......@@ -25,6 +25,8 @@ from Gnumed.business import gmDocuments
_log = logging.getLogger('gm.bill')
INVOICE_DOCUMENT_TYPE = u'invoice'
# default: old style
DEFAULT_INVOICE_ID_TEMPLATE = u'GM%(pk_pat)s / %(date)s / %(time)s'
#============================================================
# billables
......@@ -563,8 +565,7 @@ def generate_invoice_id(template=None, pk_patient=None, person=None, date_format
assert (None in [pk_patient, person]), u'either of <pk_patient> or <person> can be defined, but not both'
if (template is None) or (template.strip() == u''):
# force old style
template = u'GM%(pk_pat)s / %(date)s / %(time)s'
template = DEFAULT_INVOICE_ID_TEMPLATE
date_format = '%Y-%m-%d'
time_format = '%H%M%S'
template = template.strip()
......
client/business/gmClinNarrative.py
View file @ b21a7db0
......@@ -498,7 +498,7 @@ def get_as_journal(since=None, until=None, encounters=None, episodes=None, issue
#============================================================
# convenience functions
#============================================================
__VIEW_DEF = """
_VIEW_clin_v_narrative4search = u"""
create temporary view v_narrative4search as
select * from (
......@@ -913,7 +913,7 @@ def search_text_across_emrs(search_term=None):
#rows, idx = gmPG2.run_ro_queries(queries = [{'cmd': cmd, 'args': {'term': search_term}}], get_col_idx = False)
cmd = u'select * from v_narrative4search where narrative ~* %(term)s order by pk_patient limit 1000'
queries = [
{'cmd': __VIEW_DEF},
{'cmd': _VIEW_clin_v_narrative4search},
{'cmd': cmd, 'args': {'term': search_term}}
]
rows, idx = gmPG2.run_rw_queries(queries = queries, get_col_idx = True, return_data = True)
......
client/business/gmClinicalRecord.py
View file @ b21a7db0
......@@ -970,17 +970,23 @@ class cClinicalRecord(object):
as encounter_ended,
(SELECT _(description) FROM clin.encounter_type WHERE pk = (SELECT fk_type FROM clin.encounter WHERE pk = vn4s.pk_encounter))
as encounter_type
from clin.v_narrative4search vn4s
-- CHANGE BACK IN V23:
--FROM clin.v_narrative4search vn4s
FROM v_narrative4search vn4s
WHERE
pk_patient = %(pat)s and
vn4s.narrative ~ %(term)s
order by
encounter_started
""" # case sensitive
rows, idx = gmPG2.run_ro_queries(queries = [
#rows, idx = gmPG2.run_ro_queries(queries = [{'cmd': cmd, 'args': {'pat': self.pk_patient, 'term': search_term}}])
queries = [
{'cmd': gmClinNarrative._VIEW_clin_v_narrative4search},
{'cmd': cmd, 'args': {'pat': self.pk_patient, 'term': search_term}}
])
]
rows, idx = gmPG2.run_rw_queries(queries = queries, get_col_idx = True, return_data = True)
return rows
#--------------------------------------------------------
def get_text_dump(self, since=None, until=None, encounters=None, episodes=None, issues=None):
fields = [
......
client/doc/api/Gnumed-module.html
View file @ b21a7db0
......@@ -420,6 +420,7 @@ options when the application is started.</em> </li>
<li> <strong class="uidlink"><a href="Gnumed.timelinelib.plugin.plugins.exporters-module.html">Gnumed.timelinelib.plugin.plugins.exporters</a></strong>
<ul>
<li> <strong class="uidlink"><a href="Gnumed.timelinelib.plugin.plugins.exporters.exporttobitmap-module.html">Gnumed.timelinelib.plugin.plugins.exporters.exporttobitmap</a></strong> </li>
<li> <strong class="uidlink"><a href="Gnumed.timelinelib.plugin.plugins.exporters.exporttobitmaps-module.html">Gnumed.timelinelib.plugin.plugins.exporters.exporttobitmaps</a></strong> </li>
<li> <strong class="uidlink"><a href="Gnumed.timelinelib.plugin.plugins.exporters.exporttolist-module.html">Gnumed.timelinelib.plugin.plugins.exporters.exporttolist</a></strong> </li>
<li> <strong class="uidlink"><a href="Gnumed.timelinelib.plugin.plugins.exporters.exporttosvg-module.html">Gnumed.timelinelib.plugin.plugins.exporters.exporttosvg</a></strong> </li>
<li> <strong class="uidlink"><a href="Gnumed.timelinelib.plugin.plugins.exporters.timelineexporter-module.html">Gnumed.timelinelib.plugin.plugins.exporters.timelineexporter</a></strong> </li>
......@@ -1094,7 +1095,7 @@ the user presses Ctrl+F.</em> </li>
<tr>
<td align="left" class="footer">
Generated by Epydoc 3.0.1
on Fri Sep 13 01:55:28 2019
on Sun Nov 10 02:55:34 2019
</td>
<td align="right" class="footer">
<a target="mainFrame" href="http://epydoc.sourceforge.net"
......
client/doc/api/Gnumed-pysrc.html
View file @ b21a7db0
......@@ -98,7 +98,7 @@ expandto(location.href);
<tr>
<td align="left" class="footer">
Generated by Epydoc 3.0.1
on Fri Sep 13 01:55:28 2019
on Sun Nov 10 02:55:34 2019
</td>
<td align="right" class="footer">
<a target="mainFrame" href="http://epydoc.sourceforge.net"
......
client/doc/api/Gnumed.artwork-module.html
View file @ b21a7db0
......@@ -123,7 +123,7 @@
<tr>
<td align="left" class="footer">
Generated by Epydoc 3.0.1
on Fri Sep 13 01:55:28 2019
on Sun Nov 10 02:55:34 2019
</td>
<td align="right" class="footer">
<a target="mainFrame" href="http://epydoc.sourceforge.net"
......
client/doc/api/Gnumed.artwork-pysrc.html
View file @ b21a7db0
......@@ -99,7 +99,7 @@ expandto(location.href);
<tr>
<td align="left" class="footer">
Generated by Epydoc 3.0.1
on Fri Sep 13 01:55:28 2019
on Sun Nov 10 02:55:34 2019
</td>
<td align="right" class="footer">
<a target="mainFrame" href="http://epydoc.sourceforge.net"
......
client/doc/api/Gnumed.artwork.checkboxOff-module.html
View file @ b21a7db0
......@@ -154,7 +154,7 @@
<tr>
<td align="left" class="footer">
Generated by Epydoc 3.0.1
on Fri Sep 13 01:55:28 2019
on Sun Nov 10 02:55:34 2019
</td>
<td align="right" class="footer">
<a target="mainFrame" href="http://epydoc.sourceforge.net"
......
client/doc/api/Gnumed.artwork.checkboxOff-pysrc.html
View file @ b21a7db0
......@@ -125,7 +125,7 @@ expandto(location.href);
<tr>
<td align="left" class="footer">
Generated by Epydoc 3.0.1
on Fri Sep 13 01:55:28 2019
on Sun Nov 10 02:55:34 2019
</td>
<td align="right" class="footer">
<a target="mainFrame" href="http://epydoc.sourceforge.net"
......
client/doc/api/Gnumed.artwork.checkboxOn-module.html
View file @ b21a7db0
......@@ -154,7 +154,7 @@
<tr>
<td align="left" class="footer">
Generated by Epydoc 3.0.1
on Fri Sep 13 01:55:28 2019
on Sun Nov 10 02:55:34 2019
</td>
<td align="right" class="footer">
<a target="mainFrame" href="http://epydoc.sourceforge.net"
......
client/doc/api/Gnumed.artwork.checkboxOn-pysrc.html
View file @ b21a7db0
......@@ -131,7 +131,7 @@ expandto(location.href);
<tr>
<td align="left" class="footer">
Generated by Epydoc 3.0.1
on Fri Sep 13 01:55:28 2019
on Sun Nov 10 02:55:34 2019
</td>
<td align="right" class="footer">
<a target="mainFrame" href="http://epydoc.sourceforge.net"
......
client/doc/api/Gnumed.business-module.html
View file @ b21a7db0
......@@ -167,7 +167,7 @@
<tr>
<td align="left" class="footer">
Generated by Epydoc 3.0.1
on Fri Sep 13 01:55:28 2019
on Sun Nov 10 02:55:34 2019
</td>
<td align="right" class="footer">
<a target="mainFrame" href="http://epydoc.sourceforge.net"
......
client/doc/api/Gnumed.business-pysrc.html
View file @ b21a7db0
......@@ -99,7 +99,7 @@ expandto(location.href);
<tr>
<td align="left" class="footer">
Generated by Epydoc 3.0.1
on Fri Sep 13 01:55:28 2019
on Sun Nov 10 02:55:34 2019
</td>
<td align="right" class="footer">
<a target="mainFrame" href="http://epydoc.sourceforge.net"
......
client/doc/api/Gnumed.business.gmATC-module.html
View file @ b21a7db0
......@@ -232,7 +232,7 @@
<tr>
<td align="left" class="footer">
Generated by Epydoc 3.0.1
on Fri Sep 13 01:55:28 2019
on Sun Nov 10 02:55:34 2019
</td>
<td align="right" class="footer">
<a target="mainFrame" href="http://epydoc.sourceforge.net"
......
client/doc/api/Gnumed.business.gmATC-pysrc.html
View file @ b21a7db0
......@@ -2812,7 +2812,7 @@ expandto(location.href);
<tr>
<td align="left" class="footer">
Generated by Epydoc 3.0.1
on Fri Sep 13 01:55:28 2019
on Sun Nov 10 02:55:34 2019
</td>
<td align="right" class="footer">
<a target="mainFrame" href="http://epydoc.sourceforge.net"
......
client/doc/api/Gnumed.business.gmAllergy-module.html
View file @ b21a7db0
......@@ -233,7 +233,7 @@
<tr>
<td align="left" class="footer">
Generated by Epydoc 3.0.1
on Fri Sep 13 01:55:28 2019
on Sun Nov 10 02:55:34 2019
</td>
<td align="right" class="footer">
<a target="mainFrame" href="http://epydoc.sourceforge.net"
......
client/doc/api/Gnumed.business.gmAllergy-pysrc.html
View file @ b21a7db0
......@@ -1564,7 +1564,7 @@ expandto(location.href);
<tr>
<td align="left" class="footer">
Generated by Epydoc 3.0.1
on Fri Sep 13 01:55:28 2019
on Sun Nov 10 02:55:34 2019
</td>
<td align="right" class="footer">
<a target="mainFrame" href="http://epydoc.sourceforge.net"
......
client/doc/api/Gnumed.business.gmAllergy.cAllergy-class.html
View file @ b21a7db0
......@@ -260,7 +260,7 @@
<tr>
<td align="left" class="footer">
Generated by Epydoc 3.0.1
on Fri Sep 13 01:55:28 2019
on Sun Nov 10 02:55:34 2019
</td>
<td align="right" class="footer">
<a target="mainFrame" href="http://epydoc.sourceforge.net"
......
client/doc/api/Gnumed.business.gmAllergy.cAllergyState-class.html
View file @ b21a7db0
......@@ -271,7 +271,7 @@
<tr>
<td align="left" class="footer">
Generated by Epydoc 3.0.1
on Fri Sep 13 01:55:28 2019
on Sun Nov 10 02:55:34 2019
</td>
<td align="right" class="footer">
<a target="mainFrame" href="http://epydoc.sourceforge.net"
......