From 7ab4bdc5ce71ccb9eb82b3574394de9cfde990f5 Mon Sep 17 00:00:00 2001
From: erick.sato <erick.sato@centralit.com.br>
Date: Fri, 1 Apr 2016 11:09:04 -0300
Subject: [PATCH] [Redmine Atendimento #4206]Apostilamento máscara

---
 cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/EventoApostilamentoServiceImpl.java     |  2 +-
 cit-contratos-api/src/main/resources/script-bd/v1.0.0-alpha10/01-cit-contratos-1.0.0-ALFA-10-postgres.sql | 23 +++++++++++++++++++++++
 cit-contratos-web/src/main/resources/reports/eventoApostilamento.jrxml                                    |  2 +-
 cit-contratos-web/src/main/webapp/html/eventos/cnt_ev_apostilamentoModal.html                             |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/EventoApostilamentoServiceImpl.java b/cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/EventoApostilamentoServiceImpl.java
index 545d7bf..c0050fd 100644
--- a/cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/EventoApostilamentoServiceImpl.java
+++ b/cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/EventoApostilamentoServiceImpl.java
@@ -207,7 +207,7 @@ public class EventoApostilamentoServiceImpl extends GenericServiceImpl<EventoApo
 		} else {
 			sequencial = 1l;
 		}
-		DecimalFormat sequencialFormatado = new DecimalFormat("0000");
+		DecimalFormat sequencialFormatado = new DecimalFormat("00000");
 		String sequencialAno = sequencialFormatado.format(sequencial) + entity.getDataEmissao().get(Calendar.YEAR);
 		RegistroSequencial registroSequencial = new RegistroSequencial(sequencial, sequencialAno);
 		entity.setRegistroSequencial(registroSequencial);
diff --git a/cit-contratos-api/src/main/resources/script-bd/v1.0.0-alpha10/01-cit-contratos-1.0.0-ALFA-10-postgres.sql b/cit-contratos-api/src/main/resources/script-bd/v1.0.0-alpha10/01-cit-contratos-1.0.0-ALFA-10-postgres.sql
index b6f4a73..4d4401e 100644
--- a/cit-contratos-api/src/main/resources/script-bd/v1.0.0-alpha10/01-cit-contratos-1.0.0-ALFA-10-postgres.sql
+++ b/cit-contratos-api/src/main/resources/script-bd/v1.0.0-alpha10/01-cit-contratos-1.0.0-ALFA-10-postgres.sql
@@ -121,5 +121,28 @@ BEGIN
   END LOOP;
 END$$;
 
+DO $$
+DECLARE
+  r RECORD;
+BEGIN
+  FOR r IN
+	SELECT lpad(sequencialano,9,'0') AS SEQUENCIALANO , ID as ID FROM cnt_ev_apostilamento
+  LOOP
+	UPDATE cnt_ev_apostilamento SET sequencialano = r.SEQUENCIALANO WHERE ID = r.ID;
+  END LOOP;
+END$$;
+
+DO $$
+DECLARE
+  r RECORD;
+BEGIN
+  FOR r IN
+	SELECT   concat(substring(descricao, 0, 26),lpad(substring(descricao, 26, 4),5,'0'),substring(descricao, 30, length(descricao))) AS DESCRICAO,
+	ID as ID  FROM cnt_cn_evento WHERE descricao like 'Apostilamento%'
+  LOOP
+	UPDATE cnt_cn_evento SET descricao = r.DESCRICAO WHERE ID = r.ID;
+  END LOOP;
+END$$;
+
 -- ERICK FIM 31/03/2016
 
diff --git a/cit-contratos-web/src/main/resources/reports/eventoApostilamento.jrxml b/cit-contratos-web/src/main/resources/reports/eventoApostilamento.jrxml
index e1763b6..68f0a1d 100644
--- a/cit-contratos-web/src/main/resources/reports/eventoApostilamento.jrxml
+++ b/cit-contratos-web/src/main/resources/reports/eventoApostilamento.jrxml
@@ -2,7 +2,7 @@
 <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="eventoApostilamento" pageWidth="554" pageHeight="802" orientation="Landscape" whenNoDataType="AllSectionsNoDetail" columnWidth="554" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="2a9bde7e-349d-4f0b-b96c-98310606be6f">
 	<property name="ireport.zoom" value="1.6105100000000048"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="71"/>
+	<property name="ireport.y" value="0"/>
 	<style name="table">
 		<box>
 			<pen lineWidth="1.0" lineColor="#000000"/>
diff --git a/cit-contratos-web/src/main/webapp/html/eventos/cnt_ev_apostilamentoModal.html b/cit-contratos-web/src/main/webapp/html/eventos/cnt_ev_apostilamentoModal.html
index 40f064d..df97913 100644
--- a/cit-contratos-web/src/main/webapp/html/eventos/cnt_ev_apostilamentoModal.html
+++ b/cit-contratos-web/src/main/webapp/html/eventos/cnt_ev_apostilamentoModal.html
@@ -58,7 +58,7 @@
 						<div class="row">
 							<div class="col-sm-4" ng-show="eventoApostilamento.id">
 								<label-input ng-type="text" ng-id="eventoApostilamento.registroSequencial.sequencialAno" ng-label="CONTRATOS.LABEL.NUMERO_APOSTILAMENTO" ng-disabled="true"
-								ng-custom-maxlength="30" ng-model="eventoApostilamento.registroSequencial.sequencialAno" ng-mask="9999/9999" form="cnt_ev_apostilamentoForm"/>
+								ng-custom-maxlength="30" ng-model="eventoApostilamento.registroSequencial.sequencialAno" ng-mask="99999/9999" form="cnt_ev_apostilamentoForm"/>
 							</div><!-- .col -->
 							<div class="col-sm-4">
 								<label-input-data ng-id="eventoApostilamento.dataEmissao" ng-label="CONTRATOS.LABEL.DATA_EMISSAO_APOSTILAMENTO" ng-disabled="!edit || eventoApostilamento.id"
--
libgit2 0.21.2