Download as
Browse Code »

Commit 2216a72b55367472c75fd7fd76912ad8131693a2

Authored by joyfas.silva
2 parents 2bd43ac9 79b7442a
Exists in master

Merge branch 'master' of http://ferramentasgo.centralit.com.br:8080/scm/git/cit-grp-corporativo

Showing 2 changed files with 11 additions and 56 deletions   Show diff stats
cit-portal-web/src/main/java/br/com/centralit/listener/StartupListener.java
  Diff comments   View file @2216a72
... ... @@ -1440,6 +1440,10 @@ public class StartupListener extends UtilStartup implements ApplicationListener<
1440 1440 internacionalizacaoList.add(new Internacionalizacao("PORTAL.LABEL.TRANSFERIR_RASCUNHO_USUARIO", "Transferir para o usuário", dominio, modulo));
1441 1441 internacionalizacaoList.add(new Internacionalizacao("PORTAL.LABEL.TRANSFERIR", "Transferir", dominio, modulo));
1442 1442  
  1443 + internacionalizacaoList.add(new Internacionalizacao("INTERFACE_USUARIO.INSERIR", "Inserir", dominio, modulo));
  1444 + internacionalizacaoList.add(new Internacionalizacao("LABEL.DETENTOR", "Detentor", dominio, modulo));
  1445 +
  1446 +
1443 1447 }
1444 1448  
1445 1449 /**
... ... @@ -1471,7 +1475,7 @@ public class StartupListener extends UtilStartup implements ApplicationListener<
1471 1475 this.widgetParametroService.saveListIfNotExist(listaWidgetParametrosHigChart);
1472 1476  
1473 1477 Widget widgetGoogleChart = new Widget("Google Chart", "Google Chart", this.dominioService.findByChaveAndCodigo("tipoWidget", 5L), Boolean.TRUE);
1474   - this.widgetService.saveIfNotExist(widgetGoogleChart);
  1478 + widgetGoogleChart = this.widgetService.saveIfNotExist(widgetGoogleChart);
1475 1479  
1476 1480 List<WidgetParametro> listaParametrosGoogleCharts = new LinkedList<WidgetParametro>();
1477 1481 listaParametrosGoogleCharts.add(new WidgetParametro("hAxis titulo", this.dominioService.findByChaveAndNome("tipoDado", "TEXT_FIELD"), null, null, null, null, null, null, widgetGoogleChart));
... ... @@ -1482,10 +1486,9 @@ public class StartupListener extends UtilStartup implements ApplicationListener&lt;
1482 1486 this.widgetParametroService.saveListIfNotExist(listaParametrosGoogleCharts);
1483 1487  
1484 1488 Widget widgetGoogleGouge = new Widget("Google Chart Gauge", "Google Chart Gauge", this.dominioService.findByChaveAndCodigo("tipoWidget", 6L), Boolean.TRUE);
  1489 + widgetGoogleGouge = this.widgetService.saveIfNotExist(widgetGoogleGouge);
1485 1490  
1486   - this.widgetService.saveIfNotExist(widgetGoogleGouge);
1487 1491 List<WidgetParametro> listaParametroGoogleGouge = new LinkedList<WidgetParametro>();
1488   -
1489 1492 listaParametroGoogleGouge.add(new WidgetParametro("max", this.dominioService.findByChaveAndNome("tipoDado", "NUMBER"), null, null, 100L, null, null, null, widgetGoogleGouge));
1490 1493 listaParametroGoogleGouge.add(new WidgetParametro("yellowFrom", this.dominioService.findByChaveAndNome("tipoDado", "NUMBER"), null, null, 70L, null, null, null, widgetGoogleGouge));
1491 1494 listaParametroGoogleGouge.add(new WidgetParametro("yellowTo", this.dominioService.findByChaveAndNome("tipoDado", "NUMBER"), null, null, 80L, null, null, null, widgetGoogleGouge));
... ... @@ -1497,23 +1500,19 @@ public class StartupListener extends UtilStartup implements ApplicationListener&lt;
1497 1500 this.widgetParametroService.saveListIfNotExist(listaParametroGoogleGouge);
1498 1501  
1499 1502 Widget widgetHtml = new Widget("Html", "Html", this.dominioService.findByChaveAndCodigo("tipoWidget", 7L), Boolean.TRUE);
1500   -
1501   - this.widgetService.saveIfNotExist(widgetHtml);
  1503 + widgetHtml = this.widgetService.saveIfNotExist(widgetHtml);
1502 1504  
1503 1505 Widget widgetNoticia = new Widget("Notícia", "Notícia", this.dominioService.findByChaveAndCodigo("tipoWidget", 4L), Boolean.TRUE);
1504   -
1505   - this.widgetService.saveIfNotExist(widgetNoticia);
  1506 + widgetNoticia = this.widgetService.saveIfNotExist(widgetNoticia);
1506 1507  
1507 1508 Widget widgetTemperatura = new Widget("Temperatura", "Temperatura", this.dominioService.findByChaveAndCodigo("tipoWidget", 3L), Boolean.TRUE);
1508   -
1509   - this.widgetService.saveIfNotExist(widgetTemperatura);
  1509 + widgetTemperatura = this.widgetService.saveIfNotExist(widgetTemperatura);
1510 1510  
1511 1511 Widget widgetlink = new Widget("Link", "Link", this.dominioService.findByChaveAndCodigo("tipoWidget", 2L), Boolean.TRUE);
1512   -
1513   - this.widgetService.saveIfNotExist(widgetlink);
  1512 + widgetlink = this.widgetService.saveIfNotExist(widgetlink);
1514 1513  
1515 1514 Widget widgetBpeTask = new Widget("Tarefas Workflow", "Tarefas Workflow", this.dominioService.findByChaveAndCodigo("tipoWidget", 8L), Boolean.FALSE);
1516   - this.widgetService.saveIfNotExist(widgetBpeTask);
  1515 + widgetBpeTask = this.widgetService.saveIfNotExist(widgetBpeTask);
1517 1516  
1518 1517 List<WidgetParametro> listaParametrosBpeTask = new LinkedList<WidgetParametro>();
1519 1518 listaParametrosBpeTask.add(new WidgetParametro("Nome da tarefa", "taskName", this.dominioService.findByChaveAndNome("tipoDado", "TEXT_FIELD"), null, null, null, null, null, null, widgetBpeTask));
... ...
cit-portal-web/src/main/webapp/html/configuracao/configuracao.html
  Diff comments   View file @2216a72
... ... @@ -608,50 +608,6 @@
608 608 <div class="row">
609 609 <div class="col-sm-12">
610 610 <div class="form-group">
611   - <label-text-area ng-id="parametro.DEVERES_RESPONSABILIDADES_CONTRATANTE"
612   - name="definicoesContrato.deveresResponsabilidadeContratante"
613   - ng-model="parametro.DEVERES_RESPONSABILIDADES_CONTRATANTE"
614   - ng-label="PORTAL.LABEL.DEVERES_RESPONSABILIDADES_CONTRATANTE" ng-custom-maxlength="100000"
615   - ng-obrigatorio="false" form="definicoesContratoForm" ng-disabled="edit" rows="20"/>
616   - </div><!-- .form-group -->
617   - </div><!-- .col -->
618   - </div><!-- .row -->
619   - <div class="row">
620   - <div class="col-sm-12">
621   - <div class="form-group">
622   - <label-text-area ng-id="parametro.DEVERES_RESPONSABILIDADES_CONTRATADA"
623   - name="definicoesContrato.deveresResponsabilidadeContratada"
624   - ng-model="parametro.DEVERES_RESPONSABILIDADES_CONTRATADA"
625   - ng-label="PORTAL.LABEL.DEVERES_RESPONSABILIDADES_CONTRATADA" ng-custom-maxlength="100000"
626   - ng-obrigatorio="false" form="definicoesContratoForm" ng-disabled="edit" rows="20"/>
627   - </div><!-- .form-group -->
628   - </div><!-- .col -->
629   - </div><!-- .row -->
630   - <div class="row">
631   - <div class="col-sm-12">
632   - <div class="form-group">
633   - <label-text-area ng-id="parametro.DEVERES_RESPONSABILIDADES_ORGAO"
634   - name="definicoesContrato.deveresResponsabilidadeOrgao"
635   - ng-model="parametro.DEVERES_RESPONSABILIDADES_ORGAO"
636   - ng-label="PORTAL.LABEL.DEVERES_RESPONSABILIDADES_ORGAO" ng-custom-maxlength="100000"
637   - ng-obrigatorio="false" form="definicoesContratoForm" ng-disabled="edit" rows="20"/>
638   - </div><!-- .form-group -->
639   - </div><!-- .col -->
640   - </div><!-- .row -->
641   - <div class="row">
642   - <div class="col-sm-12">
643   - <div class="form-group">
644   - <label-text-area ng-id="parametro.MECANISMOS_FORMAIS_COMUNICACAO"
645   - name="definicoesContrato.mecanismosFormaisComunicacao"
646   - ng-model="parametro.MECANISMOS_FORMAIS_COMUNICACAO"
647   - ng-label="PORTAL.LABEL.MECANISMOS_FORMAIS_COMUNICACAO" ng-custom-maxlength="100000"
648   - ng-obrigatorio="false" form="definicoesContratoForm" ng-disabled="edit" rows="20"/>
649   - </div><!-- .form-group -->
650   - </div><!-- .col -->
651   - </div><!-- .row -->
652   - <div class="row">
653   - <div class="col-sm-12">
654   - <div class="form-group">
655 611 <label-text-area ng-id="parametro.TERMO_ENCERRAMENTO_INTRODUCAO"
656 612 name="definicoesContrato.termoEncerramentoIntroducao"
657 613 ng-model="parametro.TERMO_ENCERRAMENTO_INTRODUCAO"
... ...