From 960e52d621ff2378bb29f522a61bbcc164cb13f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Mon, 5 Dec 2011 19:21:29 +0100
Subject: [PATCH] split a refno() method out of reftitle()

---
 tabellio/documents/document.py | 29 +++++++++++++++++------------
 tabellio/documents/dossier.py  |  7 +++++++
 tabellio/documents/question.py |  7 +++++++
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/tabellio/documents/document.py b/tabellio/documents/document.py
index e941ecb..1f7f224 100644
--- a/tabellio/documents/document.py
+++ b/tabellio/documents/document.py
@@ -63,22 +63,27 @@ class Document(Item, BasePublication):
         if self.doctype is None: return _('Unknown')
         return typenames.MAPPING.get(self.doctype, self.doctype)
 
+    @property
+    def refno(self):
+        if not self.no:
+            return '(%s)' % self.session
+        if self.nodoc:
+            if self.noannexe:
+                return u'%s (%s) - N° %s (Annexe %s)' % (
+                                self.no, self.session, self.nodoc, self.noannexe)
+            else:
+                return u'%s (%s) - N° %s' % (self.no, self.session, self.nodoc)
+        else:
+            if self.noannexe:
+                return '%s (%s) (Annexe %s)' % (self.no, self.session, self.noannexe)
+            else:
+                return '%s (%s)' % (self.no, self.session)
+
     @property
     def reftitle(self):
         if not self.no:
             return '%s (%s)' % (self.doctype_str, self.session)
-        if self.nodoc:
-            if self.noannexe:
-                return u'%s - %s (%s) - N° %s (Annexe %s)' % (
-                                self.doctype_str, self.no, self.session, self.nodoc, self.noannexe)
-            else:
-                return u'%s - %s (%s) - N° %s' % (self.doctype_str, self.no, self.session, self.nodoc)
-        else:
-            if self.noannexe:
-                return '%s - %s (%s) (Annexe %s)' % (
-                                self.doctype_str, self.no, self.session, self.noannexe)
-            else:
-                return '%s - %s (%s)' % (self.doctype_str, self.no, self.session)
+        return u'%s - %s' % (self.doctype_str, self.refno)
 
     @property
     def associated_docs(self):
diff --git a/tabellio/documents/dossier.py b/tabellio/documents/dossier.py
index 0829f59..e03ffa4 100644
--- a/tabellio/documents/dossier.py
+++ b/tabellio/documents/dossier.py
@@ -194,6 +194,13 @@ class Dossier(Item, BasePublication):
                 'S_SYS_ACTIVE': u'Autre',
                 'S_SCE': u'En séance'}.get(self.state, u'Autre')
 
+    @property
+    def refno(self):
+        if self.no:
+            return '%s (%s)' % (self.no, self.session)
+        else:
+            return '(%s)' % self.session
+
     @property
     def reftitle(self):
         if self.no:
diff --git a/tabellio/documents/question.py b/tabellio/documents/question.py
index 95b6243..240763e 100644
--- a/tabellio/documents/question.py
+++ b/tabellio/documents/question.py
@@ -123,6 +123,13 @@ class Question(Item, BasePublication):
                 'S_SYS_ACTIVE': u'Autre',
                 'S_SCE': u'En séance'}.get(self.state, u'Autre')
 
+    @property
+    def refno(self):
+        if self.no:
+            return '%s (%s)' % (self.no, self.session)
+        else:
+            return '(%s)' % self.session
+
     @property
     def reftitle(self):
         if self.no: