From 5afda5c321be36e35bcb6bc6148bc26b5081e176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Fri, 6 May 2011 15:09:05 +0200 Subject: [PATCH] insert commission presidents in the format requested by PFB --- addon/Tabellio.py | 17 ++++++++++------- ods2xmls/data.ots | Bin 7696 -> 8246 bytes 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/addon/Tabellio.py b/addon/Tabellio.py index 2f7a4c9..b909104 100644 --- a/addon/Tabellio.py +++ b/addon/Tabellio.py @@ -517,9 +517,10 @@ class PresCom(RemoteObject): ''' Class to handle a president of commission ''' - _attrs = ('id', 'firstname', 'name', 'title', 'classname', 'com_code', 'sexe') + _attrs = ('id', 'firstname', 'name', 'title', 'classname', 'com_code', 'sexe', 'function') _download_file = 'PresComs.xml' _node_name = 'SPresComSpeaker' + classname = 'PresCom' def get_name(self): return u'%s %s (%s)' % (self.name, self.firstname, self.com_code) @@ -527,16 +528,18 @@ class PresCom(RemoteObject): def get_long_name(self, ctx): if get_mode(ctx) == 'PCF': if self.sexe == 'M': - title = u'le président' + function = u'le président' else: - title = u'la présidente' - return u'%s %s' % (self.title, title) + function = u'la présidente' + return u'%s %s' % (self.title, function) else: + if self.function: + return u'%s %s %s, %s' % (self.title, self.firstname, self.name, self.function) if self.sexe == 'M': - title = u'président' + function = u'président' else: - title = u'présidente' - return u'%s %s %s, %s' % (self.title, self.firstname, self.name, title) + function = u'présidente' + return u'%s %s %s, %s' % (self.title, self.firstname, self.name, function) def insert_as_speaker(self, ctx, doc, cursor): # Add an annotation next to the document, with a reference to minister diff --git a/ods2xmls/data.ots b/ods2xmls/data.ots index 79b1f6fb546695f0a2cd0f99bce63f8430cf8c04..9b8e3154a9df3b9d7c249e63903f51dceb0885c4 100644 GIT binary patch literal 8246 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 delta 5833 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