ILB
/
sigi
mirror of https://github.com/interlegis/sigi.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Alterando a ordem no form de Convenios

pull/122/head
Lude Ribeiro 3 years ago
parent
009580927c
commit
07df2908aa
1 changed files with 10 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      sigi/apps/convenios/reports.py

20
sigi/apps/convenios/reports.py
View File

@ -54,19 +54,19 @@ class ConvenioReport(ReportDefault):
), ),
Label( Label(
text=_(u"Projeto"), text=_(u"Projeto"),
left=label_left[5] * cm, left=label_left[3] * cm,
top=label_top + 0.4 * cm, top=label_top + 0.4 * cm,
width=2 * cm, width=2 * cm,
), ),
Label( Label(
text=_(u"Data do Convênio"), text=_(u"Data do Convênio"),
left=label_left[3] * cm, left=label_left[4] * cm,
top=label_top, top=label_top,
width=2 * cm, width=2 * cm,
), ),
Label( Label(
text=_(u"Data de Publicação"), text=_(u"Data de Publicação"),
left=label_left[4] * cm, left=label_left[5] * cm,
top=label_top, top=label_top,
width=2 * cm, width=2 * cm,
), ),
@ -100,17 +100,17 @@ class ConvenioReport(ReportDefault):
), ),
ObjectValue( ObjectValue(
attribute_name='projeto.sigla', attribute_name='projeto.sigla',
left=label_left[5] * cm left=label_left[3] * cm
), ),
ObjectValue( ObjectValue(
attribute_name='data_retorno_assinatura', attribute_name='data_retorno_assinatura',
left=label_left[3] * cm, left=label_left[4] * cm,
get_value=lambda instance: get_value=lambda instance:
instance.data_retorno_assinatura.strftime('%d/%m/%Y') if instance.data_retorno_assinatura is not None else '-' instance.data_retorno_assinatura.strftime('%d/%m/%Y') if instance.data_retorno_assinatura is not None else '-'
), ),
ObjectValue( ObjectValue(
attribute_name='data_pub_diario', attribute_name='data_pub_diario',
left=label_left[4] * cm, left=label_left[5] * cm,
get_value=lambda instance: get_value=lambda instance:
instance.data_pub_diario.strftime('%d/%m/%Y') if instance.data_pub_diario is not None else '-' instance.data_pub_diario.strftime('%d/%m/%Y') if instance.data_pub_diario is not None else '-'
), ),
@ -163,13 +163,13 @@ class ConvenioReportSemAceite(ConvenioReport):
), ),
Label( Label(
text=_(u"Projeto"), text=_(u"Projeto"),
left=label_left[4] * cm, left=label_left[3] * cm,
top=label_top, top=label_top,
width=2 * cm, width=2 * cm,
), ),
Label( Label(
text=_(u"Data do Convênio"), text=_(u"Data do Convênio"),
left=label_left[3] * cm, left=label_left[4] * cm,
top=label_top, top=label_top,
width=2 * cm, width=2 * cm,
), ),
@ -200,11 +200,11 @@ class ConvenioReportSemAceite(ConvenioReport):
), ),
ObjectValue( ObjectValue(
attribute_name='projeto.sigla', attribute_name='projeto.sigla',
left=label_left[4], left=label_left[3],
), ),
ObjectValue( ObjectValue(
attribute_name='data_retorno_assinatura', attribute_name='data_retorno_assinatura',
left=label_left[3] * cm, left=label_left[4] * cm,
get_value=lambda instance: get_value=lambda instance:
instance.data_retorno_assinatura.strftime('%d/%m/%Y') if instance.data_retorno_assinatura is not None else '-' instance.data_retorno_assinatura.strftime('%d/%m/%Y') if instance.data_retorno_assinatura is not None else '-'
), ),

Write Preview
Loading…
Cancel
Save