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

Fix #61 e #39 alterando relatorio de parcerias

pull/78/head
Lude Ribeiro 3 years ago
parent
38009f7a94
commit
430ce91d51
1 changed files with 32 additions and 60 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. 90
      sigi/apps/convenios/reports.py

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

@ -26,12 +26,12 @@ class SemEquipamentosReport(object):
class ConvenioReport(ReportDefault): class ConvenioReport(ReportDefault):
title = _(u'Relatório de Convênios') title = _(u'Relatório de Parcerias')
class band_page_header(ReportDefault.band_page_header): class band_page_header(ReportDefault.band_page_header):
label_top = ReportDefault.band_page_header.label_top label_top = ReportDefault.band_page_header.label_top
label_left = [0, 1.5, 7, 9, 11, 13, 15, 17] label_left = [0, 2.5, 6, 8, 10, 12, 14, 16]
elements = list(ReportDefault.band_page_header.elements) elements = list(ReportDefault.band_page_header.elements)
height = 4.7 * cm height = 4.7 * cm
@ -47,38 +47,32 @@ class ConvenioReport(ReportDefault):
top=label_top + 0.4 * cm, top=label_top + 0.4 * cm,
), ),
Label( Label(
text=_(u"Data de Adesão"), text=_(u"Número do Convênio"),
left=label_left[2] * cm, left=label_left[2] * cm,
top=label_top, top=label_top,
width=2 * cm, width=2 * cm,
), ),
Label( Label(
text=_(u"Número do Convênio"), text=_(u"Data do Convênio"),
left=label_left[3] * 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 de Publicação"),
left=label_left[4] * 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"Projeto"),
left=label_left[5] * cm, left=label_left[5] * cm,
top=label_top, top=label_top + 0.4 * cm,
width=2 * cm, width=2 * cm,
), ),
Label( Label(
text=_(u"Data de Aceite"), text=_(u"Orgão"),
left=label_left[6] * cm, left=label_left[6] * cm,
top=label_top,
width=2 * cm,
),
Label(
text=_(u"Projeto"),
left=label_left[7] * cm,
top=label_top + 0.4 * cm, top=label_top + 0.4 * cm,
width=2 * cm, width=2 * cm,
), ),
@ -89,7 +83,7 @@ class ConvenioReport(ReportDefault):
class band_detail(ReportDefault.band_detail): class band_detail(ReportDefault.band_detail):
label_left = [0, 1.5, 7, 9, 11, 13, 15, 17] label_left = [0, 2.5, 6, 8, 10, 12, 14, 16]
elements = [ elements = [
ObjectValue( ObjectValue(
@ -100,37 +94,29 @@ class ConvenioReport(ReportDefault):
attribute_name='casa_legislativa.municipio.nome', attribute_name='casa_legislativa.municipio.nome',
left=label_left[1] * cm left=label_left[1] * cm
), ),
ObjectValue(
attribute_name='data_adesao',
left=label_left[2] * cm,
get_value=lambda instance:
instance.data_adesao.strftime('%d/%m/%Y') if instance.data_adesao is not None else '-'
),
ObjectValue( ObjectValue(
attribute_name='num_convenio', attribute_name='num_convenio',
left=label_left[3] * cm left=label_left[2] * cm
), ),
ObjectValue( ObjectValue(
attribute_name='data_retorno_assinatura', attribute_name='data_retorno_assinatura',
left=label_left[4] * cm, left=label_left[3] * 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[5] * cm, left=label_left[4] * 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 '-'
), ),
ObjectValue( ObjectValue(
attribute_name='data_termo_aceite', attribute_name='projeto.sigla',
left=label_left[6] * cm, left=label_left[5] * cm
get_value=lambda instance:
instance.data_termo_aceite.strftime('%d/%m/%Y') if instance.data_termo_aceite is not None else '-'
), ),
ObjectValue( ObjectValue(
attribute_name='projeto.sigla', attribute_name='casa_legislativa.nome',
left=label_left[7] * cm left=label_left[6] * cm
), ),
] ]
@ -154,7 +140,7 @@ class ConvenioReportSemAceite(ConvenioReport):
class band_page_header(ReportDefault.band_page_header): class band_page_header(ReportDefault.band_page_header):
label_top = ReportDefault.band_page_header.label_top label_top = ReportDefault.band_page_header.label_top
label_left = [0, 1.5, 7, 9, 11, 13, 15, 17] label_left = [0, 2.5, 6, 8, 10, 12, 14, 16]
elements = list(ReportDefault.band_page_header.elements) elements = list(ReportDefault.band_page_header.elements)
height = 4.7 * cm height = 4.7 * cm
@ -169,33 +155,27 @@ class ConvenioReportSemAceite(ConvenioReport):
left=label_left[1] * cm, left=label_left[1] * cm,
top=label_top + 0.4 * cm, top=label_top + 0.4 * cm,
), ),
Label(
text=_(u"Data de Adesão"),
left=label_left[3] * cm,
top=label_top,
width=2 * cm,
),
Label( Label(
text=_(u"Número do Convênio"), text=_(u"Número do Convênio"),
left=label_left[4] * cm, left=label_left[2] * 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[5] * cm, left=label_left[3] * cm,
top=label_top, top=label_top,
width=2 * cm, width=2 * cm,
), ),
Label( Label(
text=_(u"Data de Publicação"), text=_(u"Projeto"),
left=label_left[6] * cm, left=label_left[4] * cm,
top=label_top, top=label_top,
width=2 * cm, width=2 * cm,
), ),
Label( Label(
text=_(u"Projeto"), text=_(u"Orgão"),
left=label_left[7] * cm, left=label_left[5] * cm,
top=label_top + 0.4 * cm, top=label_top + 0.4 * cm,
width=2 * cm, width=2 * cm,
), ),
@ -203,7 +183,7 @@ class ConvenioReportSemAceite(ConvenioReport):
class band_detail(ReportDefault.band_detail): class band_detail(ReportDefault.band_detail):
label_left = [0, 1.5, 7, 9, 11, 13, 15, 17] label_left = [0, 2.5, 6, 8, 10, 12, 14, 16]
elements = [ elements = [
ObjectValue( ObjectValue(
@ -214,31 +194,23 @@ class ConvenioReportSemAceite(ConvenioReport):
attribute_name='casa_legislativa.municipio.nome', attribute_name='casa_legislativa.municipio.nome',
left=label_left[1] * cm left=label_left[1] * cm
), ),
ObjectValue(
attribute_name='data_adesao',
left=label_left[3] * cm,
get_value=lambda instance:
instance.data_adesao.strftime('%d/%m/%Y') if instance.data_adesao is not None else '-'
),
ObjectValue( ObjectValue(
attribute_name='num_convenio', attribute_name='num_convenio',
left=label_left[4] * cm left=label_left[2] * cm
), ),
ObjectValue( ObjectValue(
attribute_name='data_retorno_assinatura', attribute_name='data_retorno_assinatura',
left=label_left[5] * cm, left=label_left[3] * 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='projeto.sigla',
left=label_left[6] * cm, left=label_left[4],
get_value=lambda instance:
instance.data_pub_diario.strftime('%d/%m/%Y') if instance.data_pub_diario is not None else '-'
), ),
ObjectValue( ObjectValue(
attribute_name='projeto.sigla', attribute_name='casa_legislativa.nome',
left=label_left[7] * cm left=label_left[5] * cm
), ),
] ]
@ -247,7 +219,7 @@ float_duas_casas = lambda instance: '%.2f' % (instance)
class ConvenioReportRegiao(ReportDefault): class ConvenioReportRegiao(ReportDefault):
title = _(u'Relatório de Convênios por Região') title = _(u'Relatório de Parcerias por Região')
class band_page_header(ReportDefault.band_page_header): class band_page_header(ReportDefault.band_page_header):
label_top = ReportDefault.band_page_header.label_top label_top = ReportDefault.band_page_header.label_top

Write Preview
Loading…
Cancel
Save