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 79b1f6f..9b8e315 100644 Binary files a/ods2xmls/data.ots and b/ods2xmls/data.ots differ