From 4398f17a0decc7657197777b168c66d84a47e3d8 Mon Sep 17 00:00:00 2001
From: Ronan Tavares Camargo <ronan.camargo@centralit.com.br>
Date: Wed, 11 May 2016 14:57:31 -0300
Subject: [PATCH] Redmine #4859

---
 cit-core/src/main/java/br/com/centralit/framework/util/UtilString.java               | 15 +++++++++++++++
 cit-portal-web/src/main/java/br/com/centralit/listener/StartupListener.java          |  2 ++
 cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/html/listView.html |  3 ++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/cit-core/src/main/java/br/com/centralit/framework/util/UtilString.java b/cit-core/src/main/java/br/com/centralit/framework/util/UtilString.java
index e7411c7..f7aa86c 100644
--- a/cit-core/src/main/java/br/com/centralit/framework/util/UtilString.java
+++ b/cit-core/src/main/java/br/com/centralit/framework/util/UtilString.java
@@ -1,6 +1,9 @@
 package br.com.centralit.framework.util;
 
 import java.io.UnsupportedEncodingException;
+import java.text.ParseException;
+
+import javax.swing.text.MaskFormatter;
 
 
 /**
@@ -209,4 +212,16 @@ public class UtilString {
 		else
 			return str.substring(0, 1).toLowerCase() + str.substring(1);
 	}
+	
+	public static String formatarString(String texto, String mascara){
+		String result = texto;
+		try {
+			MaskFormatter mf = new MaskFormatter(mascara);
+			mf.setValueContainsLiteralCharacters(false);
+			result = mf.valueToString(texto);
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+        return result;
+    }
 }
diff --git a/cit-portal-web/src/main/java/br/com/centralit/listener/StartupListener.java b/cit-portal-web/src/main/java/br/com/centralit/listener/StartupListener.java
index f5afc86..60e4e5f 100644
--- a/cit-portal-web/src/main/java/br/com/centralit/listener/StartupListener.java
+++ b/cit-portal-web/src/main/java/br/com/centralit/listener/StartupListener.java
@@ -1466,6 +1466,8 @@ public class StartupListener extends UtilStartup implements ApplicationListener<
 		internacionalizacaoList.add(new Internacionalizacao("LABEL.DETALHES_AUDITORIA", "Detalhes Auditoria", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("LABEL.DOCUMENTOS", "Documentos", dominio, modulo));
 		
+		internacionalizacaoList.add(new Internacionalizacao("LABEL.CPF_CNPJ", "CPF/CNPJ", dominio, modulo));
+		
 	}
 
 	/**
diff --git a/cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/html/listView.html b/cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/html/listView.html
index 5bb770e..46d1636 100644
--- a/cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/html/listView.html
+++ b/cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/html/listView.html
@@ -29,7 +29,8 @@
 				<th ng-if="(isCheckBox == undefined || !isCheckBox) && exibirColunaSelecao" class="text-center" style="width: 5%"></th>
                 <th ng-if="exibirExpandir" class="text-center" style="width: 5%"></th>
                 <th class="text-center" ng-repeat="header in headers" style="width: {{header.tamanho ? header.tamanho : divisaoColunas}}%">
-                    <sort-by onsort="onSort" sortdir="filterCriteria.dir" sortedby="filterCriteria.sort" sortvalue="{{ header.value }}">{{ header.title }}</sort-by>
+                	<div ng-if="!header.notSort"><sort-by onsort="onSort" sortdir="filterCriteria.dir" sortedby="filterCriteria.sort" sortvalue="{{ header.value }}">{{ header.title }}</sort-by></div>
+                	<div ng-if="header.notSort">{{ header.title }}</div>
                 </th>
             </tr>
 		</thead>
--
libgit2 0.21.2