Download as
Browse Code »

Commit 51ee79ea22d45a503bb817c327193c0d1dad00f4

Authored by luis.camargo
1 parent d759b348
Exists in master

redmine #4589 Padronização para entrega da release 1.0.0;

Showing 14 changed files with 88 additions and 71 deletions   Show diff stats
cit-contratos-api/src/main/resources/script-bd/v1.0.0-alpha13/01-cit-contratos-1.0.0-ALFA-13-postgres.sql 0 → 100644
  Diff comments   View file @51ee79e
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
  1 +-- luis.camargo INÍCIO 20/04/2016
  2 +update internacionalizacao set valor = 'Consulta de Relatórios' where chave = 'CONTRATOS.LABEL.CONSULTA_RELATORIOS'
  3 +-- luis.camargo FIM 20/04/2016
0 \ No newline at end of file 4 \ No newline at end of file
cit-contratos-web/src/main/java/br/com/centralit/listener/StartupListenerContratos.java
  Diff comments   View file @51ee79e
@@ -991,7 +991,7 @@ public class StartupListenerContratos extends UtilStartup implements Application @@ -991,7 +991,7 @@ public class StartupListenerContratos extends UtilStartup implements Application
991 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.DATA_EMISSAO_12_MESES_POSTERIOR", "Data de emissão não permitida, pois infere intervalo de 12 meses em relação ao aditivo subsequente.", dominio, modulo)); 991 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.DATA_EMISSAO_12_MESES_POSTERIOR", "Data de emissão não permitida, pois infere intervalo de 12 meses em relação ao aditivo subsequente.", dominio, modulo));
992 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.ADITIVO_DATA_EMISSAO_MAIOR_DATA_INICIO", "Data de emissão deve ser menor que a data de início do aditivo.", dominio, modulo)); 992 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.ADITIVO_DATA_EMISSAO_MAIOR_DATA_INICIO", "Data de emissão deve ser menor que a data de início do aditivo.", dominio, modulo));
993 993
994 - internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.LABEL.CONSULTA_RELATORIOS", "Consulta de relatórios", dominio, modulo)); 994 + internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.LABEL.CONSULTA_RELATORIOS", "Consulta de Relatórios", dominio, modulo));
995 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.LABEL.CONSULTA_TERMOS", "Consulta de termos", dominio, modulo)); 995 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.LABEL.CONSULTA_TERMOS", "Consulta de termos", dominio, modulo));
996 } 996 }
997 997
cit-contratos-web/src/main/resources/reports/consultaTermo.jrxml
  Diff comments   View file @51ee79e
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="consultaTermo" pageWidth="554" pageHeight="802" orientation="Landscape" whenNoDataType="AllSectionsNoDetail" columnWidth="554" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="2a9bde7e-349d-4f0b-b96c-98310606be6f"> 2 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="consultaTermo" pageWidth="554" pageHeight="802" orientation="Landscape" whenNoDataType="AllSectionsNoDetail" columnWidth="554" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="2a9bde7e-349d-4f0b-b96c-98310606be6f">
3 - <property name="ireport.zoom" value="2.3579476910000055"/> 3 + <property name="ireport.zoom" value="1.7715610000000037"/>
4 <property name="ireport.x" value="0"/> 4 <property name="ireport.x" value="0"/>
5 <property name="ireport.y" value="0"/> 5 <property name="ireport.y" value="0"/>
6 <style name="table"> 6 <style name="table">
@@ -96,75 +96,78 @@ ORDER BY EVENTO.DATAEVENTO, EVENTO.ID]]&gt; @@ -96,75 +96,78 @@ ORDER BY EVENTO.DATAEVENTO, EVENTO.ID]]&gt;
96 <columnHeader> 96 <columnHeader>
97 <band height="118"> 97 <band height="118">
98 <textField> 98 <textField>
99 - <reportElement stretchType="RelativeToTallestObject" x="14" y="6" width="528" height="25" uuid="20c74dcc-74ea-422d-b29c-0edd615af210"/> 99 + <reportElement stretchType="RelativeToTallestObject" x="14" y="6" width="530" height="25" uuid="20c74dcc-74ea-422d-b29c-0edd615af210"/>
100 <textElement textAlignment="Justified" verticalAlignment="Middle"> 100 <textElement textAlignment="Justified" verticalAlignment="Middle">
101 <font isBold="true"/> 101 <font isBold="true"/>
102 </textElement> 102 </textElement>
103 - <textFieldExpression><![CDATA["Período:" + $P{periodo}]]></textFieldExpression> 103 + <textFieldExpression><![CDATA["Período: " + $P{periodo}]]></textFieldExpression>
104 </textField> 104 </textField>
105 <textField> 105 <textField>
106 - <reportElement x="14" y="32" width="528" height="25" uuid="61da4245-d0d0-4625-904e-fc7d6f0b554f"/> 106 + <reportElement x="14" y="32" width="530" height="25" uuid="61da4245-d0d0-4625-904e-fc7d6f0b554f"/>
107 <textElement textAlignment="Left" verticalAlignment="Middle"> 107 <textElement textAlignment="Left" verticalAlignment="Middle">
108 <font size="10" isBold="true"/> 108 <font size="10" isBold="true"/>
109 </textElement> 109 </textElement>
110 - <textFieldExpression><![CDATA["Número / Ano do contrato:" + $P{contrato}]]></textFieldExpression> 110 + <textFieldExpression><![CDATA["Número / Ano do contrato: " + $P{contrato}]]></textFieldExpression>
111 </textField> 111 </textField>
  112 + <line>
  113 + <reportElement x="14" y="57" width="530" height="1" uuid="4857acf0-952d-4442-a550-da6b384e20f7"/>
  114 + </line>
112 <staticText> 115 <staticText>
113 - <reportElement mode="Opaque" x="134" y="98" width="234" height="20" backcolor="#CCCCCC" uuid="61ae4db4-49cf-4a88-aa67-b1df85575d1a"/>  
114 - <box leftPadding="5"> 116 + <reportElement x="14" y="65" width="530" height="25" uuid="a2d929bd-2976-4e39-b091-2c6a4364e97d"/>
  117 + <box topPadding="0" leftPadding="5"/>
  118 + <textElement textAlignment="Left" verticalAlignment="Middle">
  119 + <font size="13" isBold="true"/>
  120 + </textElement>
  121 + <text><![CDATA[1. Termos]]></text>
  122 + </staticText>
  123 + <staticText>
  124 + <reportElement mode="Opaque" x="14" y="98" width="121" height="20" backcolor="#CCCCCC" uuid="920daa9b-8004-4bca-acc3-8519246473af"/>
  125 + <box>
  126 + <pen lineWidth="1.0"/>
115 <topPen lineWidth="1.0"/> 127 <topPen lineWidth="1.0"/>
116 <leftPen lineWidth="1.0"/> 128 <leftPen lineWidth="1.0"/>
117 <bottomPen lineWidth="1.0"/> 129 <bottomPen lineWidth="1.0"/>
118 <rightPen lineWidth="1.0"/> 130 <rightPen lineWidth="1.0"/>
119 </box> 131 </box>
120 <textElement textAlignment="Center" verticalAlignment="Middle"> 132 <textElement textAlignment="Center" verticalAlignment="Middle">
121 - <font isBold="true" pdfFontName="Times-Bold"/> 133 + <font isBold="true"/>
122 </textElement> 134 </textElement>
123 - <text><![CDATA[Nome do termo]]></text> 135 + <text><![CDATA[Nº do termo]]></text>
124 </staticText> 136 </staticText>
125 <staticText> 137 <staticText>
126 - <reportElement mode="Opaque" x="368" y="98" width="176" height="20" backcolor="#CCCCCC" uuid="57ee7efe-90ea-45c0-9b53-0dde366a740e"/>  
127 - <box leftPadding="5"> 138 + <reportElement mode="Opaque" x="135" y="98" width="235" height="20" backcolor="#CCCCCC" uuid="8a57ccc5-82b0-4ecc-9d10-fa7e79c05755"/>
  139 + <box>
  140 + <pen lineWidth="1.0"/>
128 <topPen lineWidth="1.0"/> 141 <topPen lineWidth="1.0"/>
129 <leftPen lineWidth="1.0"/> 142 <leftPen lineWidth="1.0"/>
130 <bottomPen lineWidth="1.0"/> 143 <bottomPen lineWidth="1.0"/>
131 <rightPen lineWidth="1.0"/> 144 <rightPen lineWidth="1.0"/>
132 </box> 145 </box>
133 <textElement textAlignment="Center" verticalAlignment="Middle"> 146 <textElement textAlignment="Center" verticalAlignment="Middle">
134 - <font isBold="true" pdfFontName="Times-Bold"/> 147 + <font isBold="true"/>
135 </textElement> 148 </textElement>
136 - <text><![CDATA[Data da emissão do termo]]></text> 149 + <text><![CDATA[Nome do termo]]></text>
137 </staticText> 150 </staticText>
138 <staticText> 151 <staticText>
139 - <reportElement mode="Opaque" x="14" y="98" width="121" height="20" backcolor="#CCCCCC" uuid="104d68ad-9219-4aa7-8674-de2194e2315c"/>  
140 - <box leftPadding="5"> 152 + <reportElement mode="Opaque" x="370" y="98" width="174" height="20" backcolor="#CCCCCC" uuid="b1668a29-2418-4db7-bb75-2c4b0b5ac3a3"/>
  153 + <box>
  154 + <pen lineWidth="1.0"/>
141 <topPen lineWidth="1.0"/> 155 <topPen lineWidth="1.0"/>
142 <leftPen lineWidth="1.0"/> 156 <leftPen lineWidth="1.0"/>
143 <bottomPen lineWidth="1.0"/> 157 <bottomPen lineWidth="1.0"/>
144 <rightPen lineWidth="1.0"/> 158 <rightPen lineWidth="1.0"/>
145 </box> 159 </box>
146 <textElement textAlignment="Center" verticalAlignment="Middle"> 160 <textElement textAlignment="Center" verticalAlignment="Middle">
147 - <font isBold="true" pdfFontName="Times-Bold"/>  
148 - </textElement>  
149 - <text><![CDATA[Nº do termo]]></text>  
150 - </staticText>  
151 - <line>  
152 - <reportElement x="14" y="59" width="528" height="1" uuid="4857acf0-952d-4442-a550-da6b384e20f7"/>  
153 - </line>  
154 - <staticText>  
155 - <reportElement x="14" y="65" width="530" height="25" uuid="a2d929bd-2976-4e39-b091-2c6a4364e97d"/>  
156 - <box topPadding="0" leftPadding="5"/>  
157 - <textElement textAlignment="Left" verticalAlignment="Middle">  
158 - <font size="13" isBold="true"/> 161 + <font isBold="true"/>
159 </textElement> 162 </textElement>
160 - <text><![CDATA[1. Termos]]></text> 163 + <text><![CDATA[Data da emissão do termo]]></text>
161 </staticText> 164 </staticText>
162 </band> 165 </band>
163 </columnHeader> 166 </columnHeader>
164 <detail> 167 <detail>
165 <band height="20" splitType="Prevent"> 168 <band height="20" splitType="Prevent">
166 <textField> 169 <textField>
167 - <reportElement x="135" y="0" width="233" height="20" uuid="337a7b8a-96c3-4df5-876d-6ba8458e224e"/> 170 + <reportElement x="135" y="0" width="235" height="20" uuid="337a7b8a-96c3-4df5-876d-6ba8458e224e"/>
168 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="0"> 171 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="0">
169 <pen lineWidth="1.0"/> 172 <pen lineWidth="1.0"/>
170 <topPen lineWidth="1.0"/> 173 <topPen lineWidth="1.0"/>
@@ -240,7 +243,7 @@ ORDER BY EVENTO.DATAEVENTO, EVENTO.ID]]&gt; @@ -240,7 +243,7 @@ ORDER BY EVENTO.DATAEVENTO, EVENTO.ID]]&gt;
240 .concat($F{rescisao}.substring($F{rescisao}.length() - 4))]]></textFieldExpression> 243 .concat($F{rescisao}.substring($F{rescisao}.length() - 4))]]></textFieldExpression>
241 </textField> 244 </textField>
242 <textField pattern="dd/MM/yyyy"> 245 <textField pattern="dd/MM/yyyy">
243 - <reportElement x="368" y="0" width="176" height="20" uuid="a66fe6cc-dd3a-4b77-8998-5240463081fb"/> 246 + <reportElement x="370" y="0" width="174" height="20" uuid="a66fe6cc-dd3a-4b77-8998-5240463081fb"/>
244 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="0"> 247 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="0">
245 <pen lineWidth="1.0"/> 248 <pen lineWidth="1.0"/>
246 <topPen lineWidth="1.0"/> 249 <topPen lineWidth="1.0"/>
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/ContratoListController.js
  Diff comments   View file @51ee79e
@@ -10,11 +10,11 @@ citApp.controller(&#39;ContratoListController&#39;, [&#39;$scope&#39;, &#39;ContratoRepository&#39;, &#39;Do @@ -10,11 +10,11 @@ citApp.controller(&#39;ContratoListController&#39;, [&#39;$scope&#39;, &#39;ContratoRepository&#39;, &#39;Do
10 }; 10 };
11 11
12 // DEFINE CABEÇALHOS DA LISTAGEM 12 // DEFINE CABEÇALHOS DA LISTAGEM
13 - $scope.headers = [ { title : $translate.instant('LABEL.NUMERO_ANO_CONTRATO'), value : 'numeroAnoContrato', typeMask: 'MASK_CONTRATO', mask : [new RegExp(/(\d{3})(\d{1,4})$/), '$1/$2'] } ,  
14 - { title : $translate.instant('LABEL.TIPO_CONTRATO'), value : 'dominioTipoContrato.descricao' } ,  
15 - { title : $translate.instant('LABEL.DATA_VIGENCIA_INICIAL'), value : 'dataVigenciaInicial', filter : 'dateBR' },  
16 - { title : $translate.instant('LABEL.DATA_VIGENCIA_FINAL'), value : 'dataVigenciaFinal', filter : 'dateBR' },  
17 - { title : $translate.instant('LABEL.SITUACAO_ATUAL'), value : 'dominioSituacaoAtual.descricao' }]; 13 + $scope.headers = [ { title : $translate.instant('LABEL.NUMERO_ANO_CONTRATO'), value : 'numeroAnoContrato', typeMask: 'MASK_CONTRATO', mask : [new RegExp(/(\d{3})(\d{1,4})$/), '$1/$2'], tamanho : 20 } ,
  14 + { title : $translate.instant('LABEL.TIPO_CONTRATO'), value : 'dominioTipoContrato.descricao', tamanho : 15 } ,
  15 + { title : $translate.instant('LABEL.DATA_VIGENCIA_INICIAL'), value : 'dataVigenciaInicial', filter : 'dateBR', tamanho : 20 },
  16 + { title : $translate.instant('LABEL.DATA_VIGENCIA_FINAL'), value : 'dataVigenciaFinal', filter : 'dateBR', tamanho : 20 },
  17 + { title : $translate.instant('LABEL.SITUACAO_ATUAL'), value : 'dominioSituacaoAtual.descricao', tamanho : 20 }];
18 18
19 // DIFINE FILTROS DE PESQUISA E CAMPOS QUE DEVEM SER APRESENTADOS NA LISTAGEM 19 // DIFINE FILTROS DE PESQUISA E CAMPOS QUE DEVEM SER APRESENTADOS NA LISTAGEM
20 $scope.filterCriteria = { 20 $scope.filterCriteria = {
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/CronogramaExecucaoListController.js
  Diff comments   View file @51ee79e
@@ -10,18 +10,19 @@ citApp.controller(&#39;CronogramaExecucaoListController&#39;, [&#39;$scope&#39;, &#39;$translate&#39;, &#39; @@ -10,18 +10,19 @@ citApp.controller(&#39;CronogramaExecucaoListController&#39;, [&#39;$scope&#39;, &#39;$translate&#39;, &#39;
10 { 10 {
11 value : 'codigo', 11 value : 'codigo',
12 title : $translate.instant('CONTRATOS.LABEL.CODIGO_CRONOGRAMA'), 12 title : $translate.instant('CONTRATOS.LABEL.CODIGO_CRONOGRAMA'),
13 - tamanho : 15 13 + tamanho : 25
14 },{ 14 },{
15 value : 'contrato.numeroAnoContrato', 15 value : 'contrato.numeroAnoContrato',
16 title : $translate.instant('LABEL.NUMERO_CONTRATO'), 16 title : $translate.instant('LABEL.NUMERO_CONTRATO'),
17 typeMask: 'MASK_CONTRATO', 17 typeMask: 'MASK_CONTRATO',
18 filter : 'maskContrato', 18 filter : 'maskContrato',
19 - tamanho : 15 19 + tamanho : 35
20 },{ 20 },{
21 value : 'valorTotal', 21 value : 'valorTotal',
22 title : $translate.instant('CONTRATOS.LABEL.VALOR_TOTAL'), 22 title : $translate.instant('CONTRATOS.LABEL.VALOR_TOTAL'),
23 filter : 'currency', 23 filter : 'currency',
24 - tamanho : 15 24 + tamanho : 35,
  25 + align : 'text-right'
25 }]; 26 }];
26 27
27 // default criteria that will be sent to the server 28 // default criteria that will be sent to the server
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/EncerramentoContratoListController.js
  Diff comments   View file @51ee79e
@@ -13,28 +13,30 @@ citApp.controller(&#39;EncerramentoContratoListController&#39;, [&#39;$scope&#39;, &#39;Encerramento @@ -13,28 +13,30 @@ citApp.controller(&#39;EncerramentoContratoListController&#39;, [&#39;$scope&#39;, &#39;Encerramento
13 13
14 $scope.headers = [ 14 $scope.headers = [
15 { 15 {
  16 + value : 'numTermo',
  17 + title : $translate.instant('LABEL.NUM_TERMO'),
  18 + tamanho : 20,
  19 + align : 'text-center',
  20 + typeMask: 'MASK_10_CODE_ANO',
  21 + mask : [new RegExp(/(\d{2})(\d{1,4})$/), '$1/$2']
  22 + },{
16 value : 'contrato.numeroAnoContrato', 23 value : 'contrato.numeroAnoContrato',
17 title : $translate.instant('LABEL.NUM_CONTRATO'), 24 title : $translate.instant('LABEL.NUM_CONTRATO'),
18 filter : 'maskContrato', 25 filter : 'maskContrato',
19 typeMask: 'MASK_CONTRATO', 26 typeMask: 'MASK_CONTRATO',
20 - tamanho : 15, 27 + tamanho : 20,
21 align : 'text-center' 28 align : 'text-center'
22 },{ 29 },{
23 value : 'contrato.fornecedor.pessoa.nome', 30 value : 'contrato.fornecedor.pessoa.nome',
24 title : $translate.instant('LABEL.CONTRATADA'), 31 title : $translate.instant('LABEL.CONTRATADA'),
25 - align : 'text-left' 32 + align : 'text-left',
  33 + tamanho : 35
26 },{ 34 },{
27 value : 'dataEmissao', 35 value : 'dataEmissao',
28 title : $translate.instant('LABEL.DATA_EMISSAO'), 36 title : $translate.instant('LABEL.DATA_EMISSAO'),
29 filter : 'dateBR', 37 filter : 'dateBR',
30 - align : 'text-center'  
31 - },{  
32 - value : 'numTermo',  
33 - title : $translate.instant('LABEL.NUM_TERMO'),  
34 - tamanho : 8,  
35 align : 'text-center', 38 align : 'text-center',
36 - typeMask: 'MASK_10_CODE_ANO',  
37 - mask : [new RegExp(/(\d{2})(\d{1,4})$/), '$1/$2'] 39 + tamanho : 20
38 }]; 40 }];
39 41
40 // default criteria that will be sent to the server 42 // default criteria that will be sent to the server
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/EstudoTecnicoListController.js
  Diff comments   View file @51ee79e
@@ -16,11 +16,13 @@ citApp.controller(&#39;EstudoTecnicoListController&#39;, [&#39;$scope&#39;, &#39;EstudoTecnicoReposi @@ -16,11 +16,13 @@ citApp.controller(&#39;EstudoTecnicoListController&#39;, [&#39;$scope&#39;, &#39;EstudoTecnicoReposi
16 value : 'registroSequencial.sequencialAno', 16 value : 'registroSequencial.sequencialAno',
17 title : $translate.instant('LABEL.NUM_ESTUDO_TECNICO'), 17 title : $translate.instant('LABEL.NUM_ESTUDO_TECNICO'),
18 align : 'text-center', 18 align : 'text-center',
  19 + tamanho : 20,
19 typeMask: 'MASK_10_CODE_ANO', 20 typeMask: 'MASK_10_CODE_ANO',
20 mask : [new RegExp(/(\d{3})(\d{1,4})$/), '$1/$2'] 21 mask : [new RegExp(/(\d{3})(\d{1,4})$/), '$1/$2']
21 },{ 22 },{
22 value : 'descricaoSolucao', 23 value : 'descricaoSolucao',
23 title : $translate.instant('CONTRATOS.LABEL.DESCRICAO_SOLUCAO'), 24 title : $translate.instant('CONTRATOS.LABEL.DESCRICAO_SOLUCAO'),
  25 + tamanho : 75,
24 align : 'text-justify' 26 align : 'text-justify'
25 }]; 27 }];
26 28
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/NotificacaoContratoListController.js
  Diff comments   View file @51ee79e
@@ -10,22 +10,22 @@ citApp.controller(&#39;NotificacaoContratoListController&#39;, [&#39;$scope&#39;, &#39;$translate&#39;, @@ -10,22 +10,22 @@ citApp.controller(&#39;NotificacaoContratoListController&#39;, [&#39;$scope&#39;, &#39;$translate&#39;,
10 { 10 {
11 value : 'emissao', 11 value : 'emissao',
12 title : $translate.instant('NOTIFICACAO_CONTRATO.DATA_EMISSAO'), 12 title : $translate.instant('NOTIFICACAO_CONTRATO.DATA_EMISSAO'),
13 - tamanho : 15, 13 + tamanho : 20,
14 filter : 'dateBR' 14 filter : 'dateBR'
15 },{ 15 },{
16 value : 'codigo', 16 value : 'codigo',
17 title : $translate.instant('NOTIFICACAO_CONTRATO.NUMERO_NOTIFICACAO_ABREV'), 17 title : $translate.instant('NOTIFICACAO_CONTRATO.NUMERO_NOTIFICACAO_ABREV'),
18 - tamanho : 20, 18 + tamanho : 25,
19 typeMask: 'MASK_10_CODE_ANO', 19 typeMask: 'MASK_10_CODE_ANO',
20 mask : [new RegExp(/(\d{2})(\d{1,4})$/), '$1/$2'] 20 mask : [new RegExp(/(\d{2})(\d{1,4})$/), '$1/$2']
21 },{ 21 },{
22 value : 'dominioTipoSancao.descricao', 22 value : 'dominioTipoSancao.descricao',
23 title : $translate.instant('NOTIFICACAO_CONTRATO.TIPO_SANCAO'), 23 title : $translate.instant('NOTIFICACAO_CONTRATO.TIPO_SANCAO'),
24 - tamanho : 15 24 + tamanho : 25
25 },{ 25 },{
26 value : 'contrato.numeroAnoContrato', 26 value : 'contrato.numeroAnoContrato',
27 title : $translate.instant('NOTIFICACAO_CONTRATO.NUMERO_CONTRATO_ABREV'), 27 title : $translate.instant('NOTIFICACAO_CONTRATO.NUMERO_CONTRATO_ABREV'),
28 - tamanho : 15, 28 + tamanho : 25,
29 typeMask: 'MASK_CONTRATO', 29 typeMask: 'MASK_CONTRATO',
30 mask : [new RegExp(/(\d{3})(\d{1,4})$/), '$1/$2'] 30 mask : [new RegExp(/(\d{3})(\d{1,4})$/), '$1/$2']
31 }]; 31 }];
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/ObjetivoEstrategicoListController.js
  Diff comments   View file @51ee79e
1 'use strict'; 1 'use strict';
2 -citApp.controller('ObjetivoEstrategicoListController', ['$scope', '$translate', '$timeout', 'ObjetivoEstrategicoRepository', '$sce',  
3 - function ObjetivoEstrategicoListController($scope, $translate, $timeout, ObjetivoEstrategicoRepository, $sce) { 2 +citApp.controller('ObjetivoEstrategicoListController', ['$scope', '$translate', '$timeout', 'ObjetivoEstrategicoRepository',
  3 + function ObjetivoEstrategicoListController($scope, $translate, $timeout, ObjetivoEstrategicoRepository) {
4 4
5 $scope.resetForm = function() { 5 $scope.resetForm = function() {
6 angular.element("#editObjetivoEstrategico").scope().resetForm(); 6 angular.element("#editObjetivoEstrategico").scope().resetForm();
@@ -10,12 +10,12 @@ citApp.controller(&#39;ObjetivoEstrategicoListController&#39;, [&#39;$scope&#39;, &#39;$translate&#39;, @@ -10,12 +10,12 @@ citApp.controller(&#39;ObjetivoEstrategicoListController&#39;, [&#39;$scope&#39;, &#39;$translate&#39;,
10 { 10 {
11 value : 'nome', 11 value : 'nome',
12 title : $translate.instant('LABEL.OBJETIVO_ESTRATEGICO'), 12 title : $translate.instant('LABEL.OBJETIVO_ESTRATEGICO'),
13 - align : 'text-left',  
14 - tamanho : 20 13 + align : 'text-justify',
  14 + tamanho : 45
15 },{ 15 },{
16 value : 'necessidadeElecandasDesricao', 16 value : 'necessidadeElecandasDesricao',
17 title : $translate.instant('CONTRATOS.LABEL.NECESSIDADE_ELENCADA'), 17 title : $translate.instant('CONTRATOS.LABEL.NECESSIDADE_ELENCADA'),
18 - tamanho : 15, 18 + tamanho : 50,
19 scapeHtml : true, 19 scapeHtml : true,
20 align : 'text-left' 20 align : 'text-left'
21 }]; 21 }];
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/OrdemFornecimentoListController.js
  Diff comments   View file @51ee79e
@@ -12,10 +12,10 @@ citApp.controller(&#39;OrdemFornecimentoListController&#39;, [&#39;$scope&#39;, &#39;OrdemFornecimen @@ -12,10 +12,10 @@ citApp.controller(&#39;OrdemFornecimentoListController&#39;, [&#39;$scope&#39;, &#39;OrdemFornecimen
12 }; 12 };
13 13
14 $scope.headers = [ 14 $scope.headers = [
15 - { title : $translate.instant('LABEL.NUM_ORDEM_FORNECIMENTO'), value : 'numOrdemFornecimento', typeMask: 'MASK_10_CODE_ANO', mask : [new RegExp(/(\d{3})(\d{1,4})$/), '$1/$2'] },  
16 - { title : $translate.instant('LABEL.DATA_EMISSAO'), value : 'dataEmissao', filter : 'dateBR' },  
17 - { title : $translate.instant('LABEL.SITUACAO'), value : 'dominioSituacao.descricao' },  
18 - { title : $translate.instant('LABEL.NUMERO_ANO_CONTRATO'), value : 'contrato.numeroAnoContrato', typeMask: 'MASK_CONTRATO', filter : 'maskContrato' }]; 15 + { title : $translate.instant('LABEL.NUM_ORDEM_FORNECIMENTO'), value : 'numOrdemFornecimento', typeMask: 'MASK_10_CODE_ANO', mask : [new RegExp(/(\d{3})(\d{1,4})$/), '$1/$2'], tamanho : 25 },
  16 + { title : $translate.instant('LABEL.DATA_EMISSAO'), value : 'dataEmissao', filter : 'dateBR', tamanho : 20 },
  17 + { title : $translate.instant('LABEL.SITUACAO'), value : 'dominioSituacao.descricao', tamanho : 25 },
  18 + { title : $translate.instant('LABEL.NUMERO_ANO_CONTRATO'), value : 'contrato.numeroAnoContrato', typeMask: 'MASK_CONTRATO', filter : 'maskContrato', tamanho : 25 }];
19 19
20 // default criteria that will be sent to the server 20 // default criteria that will be sent to the server
21 $scope.filterCriteria = { 21 $scope.filterCriteria = {
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/ProgramaListController.js
  Diff comments   View file @51ee79e
@@ -10,11 +10,12 @@ citApp.controller(&#39;ProgramaListController&#39;, [&#39;$scope&#39;, &#39;$translate&#39;, &#39;$timeout&#39;, @@ -10,11 +10,12 @@ citApp.controller(&#39;ProgramaListController&#39;, [&#39;$scope&#39;, &#39;$translate&#39;, &#39;$timeout&#39;,
10 { 10 {
11 value : 'codigo', 11 value : 'codigo',
12 title : $translate.instant('CONTRATOS.LABEL.CODIGO_PROGRAMA'), 12 title : $translate.instant('CONTRATOS.LABEL.CODIGO_PROGRAMA'),
13 - tamanho : 15 13 + tamanho : 10
14 },{ 14 },{
15 value : 'nome', 15 value : 'nome',
16 title : $translate.instant('CONTRATOS.LABEL.NOME_PROGRAMA'), 16 title : $translate.instant('CONTRATOS.LABEL.NOME_PROGRAMA'),
17 - tamanho : 20 17 + tamanho : 60,
  18 + align : 'text-justify'
18 },{ 19 },{
19 value : 'dominioTipoPrograma.descricao', 20 value : 'dominioTipoPrograma.descricao',
20 title : $translate.instant('CONTRATOS.LABEL.TIPO_PROGRAMA'), 21 title : $translate.instant('CONTRATOS.LABEL.TIPO_PROGRAMA'),
@@ -23,7 +24,7 @@ citApp.controller(&#39;ProgramaListController&#39;, [&#39;$scope&#39;, &#39;$translate&#39;, &#39;$timeout&#39;, @@ -23,7 +24,7 @@ citApp.controller(&#39;ProgramaListController&#39;, [&#39;$scope&#39;, &#39;$translate&#39;, &#39;$timeout&#39;,
23 value : 'anoExercicio', 24 value : 'anoExercicio',
24 title : $translate.instant('CONTRATOS.LABEL.ANO_EXERCICIO'), 25 title : $translate.instant('CONTRATOS.LABEL.ANO_EXERCICIO'),
25 //filter : 'dateAno', 26 //filter : 'dateAno',
26 - tamanho : 15 27 + tamanho : 10
27 }]; 28 }];
28 29
29 // default criteria that will be sent to the server 30 // default criteria that will be sent to the server
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/QuestionarioListController.js
  Diff comments   View file @51ee79e
@@ -6,10 +6,13 @@ citApp.controller(&#39;QuestionarioListController&#39;, [&#39;$scope&#39;, &#39;QuestionarioReposito @@ -6,10 +6,13 @@ citApp.controller(&#39;QuestionarioListController&#39;, [&#39;$scope&#39;, &#39;QuestionarioReposito
6 $scope.headers = [ 6 $scope.headers = [
7 { 7 {
8 value : 'nome', 8 value : 'nome',
9 - title : $translate.instant('LABEL.NOME') 9 + title : $translate.instant('LABEL.NOME'),
  10 + tamanho: 60,
  11 + align : 'text-justify'
10 },{ 12 },{
11 value : 'dominioTipoQuestionario.descricao', 13 value : 'dominioTipoQuestionario.descricao',
12 - title : $translate.instant('LABEL.TIPO_QUESTIONARIO') 14 + title : $translate.instant('LABEL.TIPO_QUESTIONARIO'),
  15 + tamanho : 35
13 }]; 16 }];
14 17
15 // default criteria that will be sent to the server 18 // default criteria that will be sent to the server
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/RegistroOcorrenciaListController.js
  Diff comments   View file @51ee79e
@@ -26,7 +26,7 @@ citApp.controller(&#39;RegistroOcorrenciaListController&#39;, [&#39;$scope&#39;, @@ -26,7 +26,7 @@ citApp.controller(&#39;RegistroOcorrenciaListController&#39;, [&#39;$scope&#39;,
26 value : 'dataEmissaoOcorrencia', 26 value : 'dataEmissaoOcorrencia',
27 title : $translate.instant('LABEL.DATA_EMISSAO_OCORRENCIA'), 27 title : $translate.instant('LABEL.DATA_EMISSAO_OCORRENCIA'),
28 filter : 'dateBR', 28 filter : 'dateBR',
29 - tamanho : 20 29 + tamanho : 10
30 }, { 30 }, {
31 value : 'registroSequencial.sequencialAno', 31 value : 'registroSequencial.sequencialAno',
32 title : $translate.instant('LABEL.NUMERO_OCORRENCIA'), 32 title : $translate.instant('LABEL.NUMERO_OCORRENCIA'),
@@ -36,11 +36,12 @@ citApp.controller(&#39;RegistroOcorrenciaListController&#39;, [&#39;$scope&#39;, @@ -36,11 +36,12 @@ citApp.controller(&#39;RegistroOcorrenciaListController&#39;, [&#39;$scope&#39;,
36 }, { 36 }, {
37 value : 'tituloOcorrencia', 37 value : 'tituloOcorrencia',
38 title : $translate.instant('LABEL.TITULO_OCORRENCIA'), 38 title : $translate.instant('LABEL.TITULO_OCORRENCIA'),
39 - tamanho : 150 39 + tamanho : 60,
  40 + align : 'text-justify'
40 }, { 41 }, {
41 value : 'contrato.numeroAnoContrato', 42 value : 'contrato.numeroAnoContrato',
42 title : $translate.instant('LABEL.NUMERO_ANO_CONTRATO'), 43 title : $translate.instant('LABEL.NUMERO_ANO_CONTRATO'),
43 - tamanho : 10, 44 + tamanho : 15,
44 typeMask: 'MASK_CONTRATO', 45 typeMask: 'MASK_CONTRATO',
45 mask : [new RegExp(/(\d{3})(\d{1,4})$/), '$1/$2'] 46 mask : [new RegExp(/(\d{3})(\d{1,4})$/), '$1/$2']
46 } 47 }
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/TermoReferenciaListController.js
  Diff comments   View file @51ee79e
@@ -16,13 +16,14 @@ citApp.controller(&#39;TermoReferenciaListController&#39;, [&#39;$scope&#39;, &#39;TermoReferenciaRe @@ -16,13 +16,14 @@ citApp.controller(&#39;TermoReferenciaListController&#39;, [&#39;$scope&#39;, &#39;TermoReferenciaRe
16 { 16 {
17 value : 'codigo', 17 value : 'codigo',
18 title : $translate.instant('LABEL.CODIGO'), 18 title : $translate.instant('LABEL.CODIGO'),
19 - tamanho : 30, 19 + tamanho : 15,
20 typeMask: 'MASK_10_CODE_ANO', 20 typeMask: 'MASK_10_CODE_ANO',
21 mask : [new RegExp(/(\d{3})(\d{1,4})$/), '$1/$2'] 21 mask : [new RegExp(/(\d{3})(\d{1,4})$/), '$1/$2']
22 },{ 22 },{
23 value : 'objetoContratacao', 23 value : 'objetoContratacao',
24 title : $translate.instant('LABEL.OBJETO_CONTRATACAO'), 24 title : $translate.instant('LABEL.OBJETO_CONTRATACAO'),
25 - tamanho : 4000 25 + tamanho : 80,
  26 + align : 'text-justify'
26 }]; 27 }];
27 28
28 // default criteria that will be sent to the server 29 // default criteria that will be sent to the server