From f1e28c1e2824631291e3b3f24272205dd144b8dc Mon Sep 17 00:00:00 2001
From: Sam Manzi <manzi.sam@gmail.com>
Date: Thu, 22 Mar 2018 15:40:53 +1100
Subject: [PATCH] List sort by number for citation confidence level (#583)

* Fix confidence level sort in list views

-based on the date-sort code.

Fixes #10506

* Fix confidence level tooltip

-Stop run on text.

Resolves #10506
---
 gramps/gui/glade/editcitation.glade              | 8 ++++----
 gramps/gui/views/treemodels/citationbasemodel.py | 5 +++++
 gramps/gui/views/treemodels/citationlistmodel.py | 2 +-
 gramps/gui/views/treemodels/citationtreemodel.py | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/gramps/gui/glade/editcitation.glade b/gramps/gui/glade/editcitation.glade
index 4f8d0fa03..9d76da4a3 100644
--- a/gramps/gui/glade/editcitation.glade
+++ b/gramps/gui/glade/editcitation.glade
@@ -199,10 +199,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">Conveys the submitter's quantitative evaluation of the credibility of a piece of information, based upon its supporting evidence. It is not intended to eliminate the receiver's need to evaluate the evidence for themselves.
-Very Low =Unreliable evidence or estimated data
-Low =Questionable reliability of evidence (interviews, census, oral genealogies, or potential for bias for example, an autobiography)
-High =Secondary evidence, data officially recorded sometime after event
-Very High =Direct and primary evidence used, or by dominance of the evidence </property>
+/Very Low =Unreliable evidence or estimated data.
+/Low =Questionable reliability of evidence (interviews, census, oral genealogies, or potential for bias for example, an autobiography).
+/High =Secondary evidence, data officially recorded sometime after event.
+/Very High =Direct and primary evidence used, or by dominance of the evidence.</property>
                     <property name="hexpand">True</property>
                     <property name="model">confidence_model</property>
                     <child>
diff --git a/gramps/gui/views/treemodels/citationbasemodel.py b/gramps/gui/views/treemodels/citationbasemodel.py
index 10c953306..cc626fe1d 100644
--- a/gramps/gui/views/treemodels/citationbasemodel.py
+++ b/gramps/gui/views/treemodels/citationbasemodel.py
@@ -114,6 +114,11 @@ class CitationBaseModel:
     def citation_page(self, data):
         return data[COLUMN_PAGE]
 
+    def citation_sort_confidence(self, data):
+        if data[COLUMN_CONFIDENCE]:
+            return str(data[COLUMN_CONFIDENCE])
+        return ''
+
     def citation_confidence(self, data):
         return _(conf_strings[data[COLUMN_CONFIDENCE]])
 
diff --git a/gramps/gui/views/treemodels/citationlistmodel.py b/gramps/gui/views/treemodels/citationlistmodel.py
index e8b0e01a7..a028509e1 100644
--- a/gramps/gui/views/treemodels/citationlistmodel.py
+++ b/gramps/gui/views/treemodels/citationlistmodel.py
@@ -81,7 +81,7 @@ class CitationListModel(CitationBaseModel, FlatBaseModel):
             self.citation_page,
             self.citation_id,
             self.citation_sort_date,
-            self.citation_confidence,
+            self.citation_sort_confidence,
             self.citation_private,
             self.citation_tags,
             self.citation_sort_change,
diff --git a/gramps/gui/views/treemodels/citationtreemodel.py b/gramps/gui/views/treemodels/citationtreemodel.py
index 770f50bde..bd1008337 100644
--- a/gramps/gui/views/treemodels/citationtreemodel.py
+++ b/gramps/gui/views/treemodels/citationtreemodel.py
@@ -147,7 +147,7 @@ class CitationTreeModel(CitationBaseModel, TreeBaseModel):
             self.citation_page,
             self.citation_id,
             self.citation_sort_date,
-            self.citation_confidence,
+            self.citation_sort_confidence,
             self.citation_private,
             self.citation_tags,
             self.citation_sort_change,