[med-svn] [gnumed-client] 01/05: Imported Upstream version 1.6.2+dfsg
Andreas Tille
tille at debian.org
Mon Mar 28 15:01:27 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository gnumed-client.
commit 0515a988e05b5d121df22e61c212f50e3718b302
Author: Andreas Tille <tille at debian.org>
Date: Mon Mar 28 16:49:08 2016 +0200
Imported Upstream version 1.6.2+dfsg
---
client/CHANGELOG | 23 +++++++++++++++++++++++
client/business/gmMedication.py | 4 ++--
client/doc/schema/gnumed-entire_schema.html | 2 +-
client/gnumed.py | 2 +-
client/po/de-gnumed.mo | Bin 474046 -> 474048 bytes
client/po/de.po | 8 ++++----
client/wxpython/gmDocumentWidgets.py | 6 +++---
client/wxpython/gmHabitWidgets.py | 8 ++++----
client/wxpython/gmListWidgets.py | 6 ++++--
external-tools/check-prerequisites.sh | 20 ++++++++++----------
10 files changed, 52 insertions(+), 27 deletions(-)
diff --git a/client/CHANGELOG b/client/CHANGELOG
index 5729569..2511aa6 100644
--- a/client/CHANGELOG
+++ b/client/CHANGELOG
@@ -6,6 +6,20 @@
# rel-1-6-patches
------------------------------------------------
+ 1.6.2
+
+FIX: exception create consumable substance by ATC
+FIX: exception on showing files of new document
+FIX: exception on saving new document
+FIX: exception on saving substance abuse entry
+FIX: exception on attempting to apply sorting outside list column
+
+ 1.6.1
+
+FIX: gm-describe_file missing in tarball
+
+IMPROVED: manpages for gm-create_dicomdir/gm-create_datamatrix
+
1.6.0
NEW: plugin: list based EMR journal
@@ -1682,6 +1696,15 @@ FIX: missing cast to ::text in dem.date_trunc_utc() calls
# gnumed_v21
------------------------------------------------
+ 21.2
+
+NEW: implement commenting out of plausibility checks
+
+IMPROVED: run all plausibility checks even if any fail
+IMPROVED: more resilience against malformed plausibility checks
+
+FIX: inaccurate dem.v_staff plausibility check [thanks Marc]
+
21.0
NEW: require PG 9.2 because of pg_trigger_depth()
diff --git a/client/business/gmMedication.py b/client/business/gmMedication.py
index 05d9330..19fd7da 100644
--- a/client/business/gmMedication.py
+++ b/client/business/gmMedication.py
@@ -1582,12 +1582,12 @@ def create_consumable_substance_by_atc(substance=None, atc=None, amount=None, un
%(amount)s,
gm.nullify_empty_string(%(unit)s)
WHERE NOT EXISTS (
- SELECT 1 FROM ref.consumable_substance WHERE atc = %(atc)s
+ SELECT 1 FROM ref.consumable_substance WHERE atc_code = %(atc)s
)
RETURNING pk"""
rows, idx = gmPG2.run_rw_queries(queries = [{'cmd': cmd, 'args': args}], return_data = True, get_col_idx = False)
if len(rows) == 0:
- cmd = u"SELECT pk FROM ref.consumable_substance WHERE atc = %(atc)s LIMIT 1"
+ cmd = u"SELECT pk FROM ref.consumable_substance WHERE atc_code = %(atc)s LIMIT 1"
rows, idx = gmPG2.run_ro_queries(queries = [{'cmd': cmd, 'args': args}])
return cConsumableSubstance(aPK_obj = rows[0]['pk'])
diff --git a/client/doc/schema/gnumed-entire_schema.html b/client/doc/schema/gnumed-entire_schema.html
index ea91a99..b4a23fa 100644
--- a/client/doc/schema/gnumed-entire_schema.html
+++ b/client/doc/schema/gnumed-entire_schema.html
@@ -112,7 +112,7 @@
<body>
<!-- Primary Index -->
- <p><br><br>Dumped on 2016-03-20</p>
+ <p><br><br>Dumped on 2016-03-25</p>
<h1><a name="index">Index of database - gnumed_v21</a></h1>
<ul>
diff --git a/client/gnumed.py b/client/gnumed.py
index dd67235..1eea0e5 100644
--- a/client/gnumed.py
+++ b/client/gnumed.py
@@ -88,7 +88,7 @@ against. Please run GNUmed as a non-root user.
sys.exit(1)
#----------------------------------------------------------
-current_client_version = u'1.6.1'
+current_client_version = u'1.6.2'
current_client_branch = u'1.6'
_log = None
diff --git a/client/po/de-gnumed.mo b/client/po/de-gnumed.mo
index 30891c8..5de3baa 100644
Binary files a/client/po/de-gnumed.mo and b/client/po/de-gnumed.mo differ
diff --git a/client/po/de.po b/client/po/de.po
index 431b6ef..75c33e7 100644
--- a/client/po/de.po
+++ b/client/po/de.po
@@ -6,7 +6,7 @@ msgstr ""
"Project-Id-Version: GNUmed\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-17 16:20+0100\n"
-"PO-Revision-Date: 2016-03-17 16:25+0100\n"
+"PO-Revision-Date: 2016-03-24 16:37+0100\n"
"Last-Translator: Karsten Hilbert <Karsten.Hilbert at gmx.net>\n"
"Language-Team: Deutsch\n"
"Language: de_DE\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py 1.3\n"
-"X-Generator: Poedit 1.8.3\n"
+"X-Generator: Poedit 1.8.7.1\n"
#, python-format
msgid "unknown test status [%s]"
@@ -5787,7 +5787,7 @@ msgid "&Last modification time"
msgstr "&Letzter Bearbeitungszeitpunkt"
msgid "&Entry time"
-msgstr "&Eingabezeit"
+msgstr "&Ereigniszeit"
msgid "Show journal ordered by encounter."
msgstr "Zeige Journal nach APK sortiert."
@@ -15107,7 +15107,7 @@ msgid ""
"\n"
"Note that temporary files will be deleted anyway."
msgstr ""
-"Dateien erfolgreich als Dokument impoertiert.\n"
+"Dateien erfolgreich als Dokument importiert.\n"
"\n"
"Wollen Sie die importierten Dateien löschen ?\n"
"\n"
diff --git a/client/wxpython/gmDocumentWidgets.py b/client/wxpython/gmDocumentWidgets.py
index bfe9886..708fdf3 100644
--- a/client/wxpython/gmDocumentWidgets.py
+++ b/client/wxpython/gmDocumentWidgets.py
@@ -1156,10 +1156,10 @@ class cScanIdxDocsPnl(wxgScanIdxPnl.wxgScanIdxPnl, gmPlugin.cPatientChange_Plugi
# only one page, show that, regardless of whether selected or not
if self._LCTRL_doc_pages.ItemCount == 1:
- page_fnames = [ self._LCTRL_doc_pages.get_item_data(0) ]
+ page_fnames = [ self._LCTRL_doc_pages.get_item_data(0)[0] ]
else:
# did user select one of multiple pages ?
- page_fnames = self._LCTRL_doc_pages.get_selected_item_data()
+ page_fnames = [ data[0] for data in self._LCTRL_doc_pages.selected_item_data ]
if len(page_fnames) == 0:
gmDispatcher.send(signal = 'statustext', msg = _('No part selected for viewing.'), beep = True)
return
@@ -1213,7 +1213,7 @@ class cScanIdxDocsPnl(wxgScanIdxPnl.wxgScanIdxPnl, gmPlugin.cPatientChange_Plugi
# create document
new_doc = save_files_as_new_document (
parent = self,
- filenames = self._LCTRL_doc_pages.data,
+ filenames = [ data[0] for data in self._LCTRL_doc_pages.data ],
document_type = self._PhWheel_doc_type.GetValue().strip(),
pk_document_type = self._PhWheel_doc_type.GetData(),
unlock_patient = False,
diff --git a/client/wxpython/gmHabitWidgets.py b/client/wxpython/gmHabitWidgets.py
index d59b348..7a3246a 100644
--- a/client/wxpython/gmHabitWidgets.py
+++ b/client/wxpython/gmHabitWidgets.py
@@ -72,7 +72,7 @@ def manage_substance_abuse(parent=None, patient=None):
items.append ([
i['substance'],
i.harmful_use_type_string,
- gmDateTime.pydt_strftime(i['last_checked_when'], '%b %Y')
+ gmDateTime.pydt_strftime(i['last_checked_when'], '%b %Y', none_str = u'')
])
lctrl.set_string_items(items)
lctrl.set_data(intakes)
@@ -156,7 +156,7 @@ class cSubstanceAbuseEAPnl(wxgSubstanceAbuseEAPnl.wxgSubstanceAbuseEAPnl, gmEdit
atc = gmATC.ATC_NICOTINE,
amount = 1,
unit = u'1'
- )['pk_substance']
+ )['pk']
elif self._RBTN_c2.GetValue() is True:
pk_substance = gmMedication.create_consumable_substance_by_atc (
@@ -164,7 +164,7 @@ class cSubstanceAbuseEAPnl(wxgSubstanceAbuseEAPnl.wxgSubstanceAbuseEAPnl, gmEdit
atc = gmATC.ATC_ETHANOL,
amount = 1,
unit = _('units')
- )['pk_substance']
+ )['pk']
elif self._RBTN_other_substance.GetValue() is True:
pk_substance = self._PRW_substance.GetData()
@@ -302,7 +302,7 @@ class cSubstanceAbuseEAPnl(wxgSubstanceAbuseEAPnl.wxgSubstanceAbuseEAPnl, gmEdit
self._TCTRL_comment.SetValue(gmTools.coalesce(self.data['notes']))
self._DPRW_quit_when.SetText(data = self.data['discontinued'])
- self._LBL_confirm_date.SetLabel(gmDateTime.pydt_strftime(self.data['last_checked_when'], '%Y %b %d'))
+ self._LBL_confirm_date.SetLabel(gmDateTime.pydt_strftime(self.data['last_checked_when'], '%Y %b %d', none_str = u''))
self._CHBOX_confirm.Enable()
self._CHBOX_confirm.SetValue(True)
diff --git a/client/wxpython/gmListWidgets.py b/client/wxpython/gmListWidgets.py
index 7710ad4..6dec3cc 100644
--- a/client/wxpython/gmListWidgets.py
+++ b/client/wxpython/gmListWidgets.py
@@ -2382,9 +2382,11 @@ class cReportListCtrl(listmixins.ListCtrlAutoWidthMixin, listmixins.ColumnSorter
#------------------------------------------------------------
def OnSortOrderChanged(self):
- self._remove_sorting_indicators_from_column_headers()
- # annotate sort column
col_idx, is_ascending = self.GetSortState()
+ if col_idx == -1:
+ _log.debug(u'outside any column (idx: -1) clicked, ignoring')
+ return
+ self._remove_sorting_indicators_from_column_headers()
col_state = self.GetColumn(col_idx)
col_state.m_text += self.sort_order_tags[is_ascending]
self.SetColumn(col_idx, col_state)
diff --git a/external-tools/check-prerequisites.sh b/external-tools/check-prerequisites.sh
index af50f22..bd657e1 100755
--- a/external-tools/check-prerequisites.sh
+++ b/external-tools/check-prerequisites.sh
@@ -356,6 +356,16 @@ else
echo "found"
fi
+echo -n " 'Ginkgo CADx' DICOM viewer... "
+BIN=`which ginkgocadx`
+if [ "x${BIN}x" == "xx" ]; then
+ echo ""
+ echo " INFO : You don't seem to have the 'ginkgocadx' command installed."
+ echo " INFO : This is the recommended DICOM viewer on Linux."
+else
+ echo "found"
+fi
+
# obsolete
#echo -n " 'gm-download_data' command... "
#BIN=`which gm-download_data`
@@ -366,15 +376,5 @@ fi
#else
# echo "found"
#fi
-#
-#echo -n " 'Ginkgo CADx' DICOM viewer... "
-#BIN=`which ginkgocadx`
-#if [ "x${BIN}x" == "xx" ]; then
-# echo ""
-# echo " INFO : You don't seem to have the 'ginkgocadx' command installed."
-# echo " INFO : This is the recommended DICOM viewer."
-#else
-# echo "found"
-#fi
#=================================================================
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gnumed-client.git
More information about the debian-med-commit
mailing list