Commit 7e20b74f4481fb4da5efae34ab452094e9672e6b
Exists in
master
Merge branch 'ecm-release-0001-sprint3' of http://ferramentasgo.centralit.com.br…
…:8080/scm/git/cit-grp-corporativo into ecm-release-0001-sprint3
Showing
4 changed files
with
19 additions
and
4 deletions
Show diff stats
cit-core/src/main/java/br/com/centralit/framework/json/Views.java
| ... | ... | @@ -411,5 +411,6 @@ public class Views { |
| 411 | 411 | public static class UnidadeProcessoListView extends GenericView{}; |
| 412 | 412 | |
| 413 | 413 | public static class ProcessoVHView extends GenericView{}; |
| 414 | - | |
| 414 | + | |
| 415 | + public static class AssinaturaEdit extends GenericView {}; | |
| 415 | 416 | } |
| 416 | 417 | \ No newline at end of file | ... | ... |
cit-core/src/main/java/br/com/centralit/framework/util/UtilDate.java
| ... | ... | @@ -452,6 +452,10 @@ public class UtilDate { |
| 452 | 452 | public static String getHoraAtual() { |
| 453 | 453 | return formatarData(getDataAtual(), "HH:mm"); |
| 454 | 454 | } |
| 455 | + | |
| 456 | + public static String getHoraAtualHHMMSS() { | |
| 457 | + return formatarData(getDataAtual(), "HH:mm:ss"); | |
| 458 | + } | |
| 455 | 459 | |
| 456 | 460 | public static String getMes(Date data) { |
| 457 | 461 | return formatarData(data, "MM"); | ... | ... |
cit-portal-api/src/main/java/br/com/centralit/api/dao/impl/UsuarioDaoHibernate.java
| ... | ... | @@ -24,6 +24,7 @@ import br.com.centralit.framework.model.GrupoPrivilegio; |
| 24 | 24 | import br.com.centralit.framework.model.Privilegio; |
| 25 | 25 | import br.com.centralit.framework.model.Usuario; |
| 26 | 26 | import br.com.centralit.framework.model.arquitetura.PersistentObject; |
| 27 | +import br.com.centralit.framework.util.UtilColecao; | |
| 27 | 28 | import br.com.centralit.framework.util.UtilObjeto; |
| 28 | 29 | |
| 29 | 30 | import com.googlecode.genericdao.search.Search; |
| ... | ... | @@ -90,9 +91,10 @@ public class UsuarioDaoHibernate extends CitGenericDAOImpl implements UsuarioDao |
| 90 | 91 | // |
| 91 | 92 | // user.getUsuarioPrivilegios().add(new UsuarioPrivilegio(user, (Privilegio) this.getReference(1L, Privilegio.class))); |
| 92 | 93 | // user.getUsuarioPrivilegios().add(new UsuarioPrivilegio(user, (Privilegio) this.getReference(2L, Privilegio.class))); |
| 93 | - | |
| 94 | - for (GrantedAuthority grantedAuthority : user.getAuthorities()) { | |
| 95 | - System.out.println("Lazy: " + grantedAuthority.getAuthority()); | |
| 94 | + if(!UtilColecao.isVazio(user.getAuthorities())){ | |
| 95 | + for (GrantedAuthority grantedAuthority : user.getAuthorities()) { | |
| 96 | + System.out.println("Lazy: " + grantedAuthority.getAuthority()); | |
| 97 | + } | |
| 96 | 98 | } |
| 97 | 99 | |
| 98 | 100 | return (UserDetails) users.get(0); | ... | ... |
cit-portal-web/src/main/webapp/assets/css/bootstrap-layout.css
| ... | ... | @@ -5257,4 +5257,12 @@ span.menu-manager-item-buttons { |
| 5257 | 5257 | bottom: 0; |
| 5258 | 5258 | right: 0; |
| 5259 | 5259 | min-height: 140px; |
| 5260 | +} | |
| 5261 | + | |
| 5262 | +/* Iframe Assinatura */ | |
| 5263 | +.iframe-assinatura { | |
| 5264 | + width: 96%; | |
| 5265 | + margin-left: 2%; | |
| 5266 | + margin-right: 2%; | |
| 5267 | + min-height: 450px; | |
| 5260 | 5268 | } |
| 5261 | 5269 | \ No newline at end of file | ... | ... |