diff --git a/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/DataObject.java b/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/DataObject.java index ad598cc..61c59ff 100644 --- a/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/DataObject.java +++ b/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/DataObject.java @@ -43,7 +43,7 @@ public class DataObject extends PersistentObjectAudit { @Id @GeneratedValue(strategy = GenerationType.AUTO) - @JsonView({Views.EsiDataObjectListView.class, Views.EsiDataObjectEditView.class }) + @JsonView({Views.GenericView.class}) protected Long id; @ManyToOne(fetch=FetchType.LAZY, optional=false) diff --git a/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/DataSource.java b/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/DataSource.java index 328022d..b55c267 100644 --- a/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/DataSource.java +++ b/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/DataSource.java @@ -30,7 +30,7 @@ public class DataSource extends PersistentObjectAudit { @Id @GeneratedValue(strategy = GenerationType.AUTO) - @JsonView({Views.EsiDataObjectListView.class, Views.EsiDataObjectEditView.class }) + @JsonView({Views.GenericView.class }) protected Long id; @Column(nullable = false, length=100) diff --git a/cit-esi-api/src/main/java/br/com/centralit/esi/api/enumerated/ReportParameterTypeEnum.java b/cit-esi-api/src/main/java/br/com/centralit/esi/api/enumerated/ReportParameterTypeEnum.java index 3d152fe..028994e 100644 --- a/cit-esi-api/src/main/java/br/com/centralit/esi/api/enumerated/ReportParameterTypeEnum.java +++ b/cit-esi-api/src/main/java/br/com/centralit/esi/api/enumerated/ReportParameterTypeEnum.java @@ -4,7 +4,8 @@ public enum ReportParameterTypeEnum { DATAOBJECT("ESI.ENUMERADO.DATASOURCE_OBJETO_DADOS"), FLOW("ESI.ENUMERADO.DATASOURCE_FLUXO_ESI"), SCRIPT("ESI.ENUMERADO.DATASOURCE_SCRIPT"), - IMAGE("ESI.ENUMERADO.DATASOURCE_IMAGEM"); + IMAGE("ESI.ENUMERADO.DATASOURCE_IMAGEM"), + CONSTANT("ESI.ENUMERADO.DATASOURCE_CONSTANTE"); private String id; private String description; diff --git a/cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/model/ReportParameter.java b/cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/model/ReportParameter.java index 644d00e..13d26b1 100644 --- a/cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/model/ReportParameter.java +++ b/cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/model/ReportParameter.java @@ -1,5 +1,6 @@ package br.com.centralit.esi.api.resource.model; +import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; @@ -7,9 +8,12 @@ import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.Lob; import javax.persistence.ManyToOne; import javax.persistence.Table; +import org.hibernate.annotations.Type; + import br.com.centralit.esi.api.data.model.CustomSQL; import br.com.centralit.esi.api.data.model.DataObject; import br.com.centralit.esi.api.design.model.Flow; @@ -58,6 +62,12 @@ public class ReportParameter extends PersistentObject { @Embedded @JsonView({ Views.EsiResourceEditView.class, Views.EsiPackageExportView.class}) private ScriptCode scriptCode; + + @Lob + @Basic(fetch = FetchType.LAZY) + @Type(type="org.hibernate.type.StringClobType") + @JsonView({ Views.EsiResourceEditView.class, Views.EsiPackageExportView.class}) + private String constant; @Column(nullable = true) @JsonView({ Views.EsiResourceEditView.class, Views.EsiPackageExportView.class}) @@ -166,5 +176,13 @@ public class ReportParameter extends PersistentObject { public void setCustomSQL(CustomSQL customSQL) { this.customSQL = customSQL; } + + public String getConstant() { + return constant; + } + + public void setConstant(String constant) { + this.constant = constant; + } } diff --git a/cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/service/impl/ReportVersionServiceImpl.java b/cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/service/impl/ReportVersionServiceImpl.java index 94d82a3..5319e90 100644 --- a/cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/service/impl/ReportVersionServiceImpl.java +++ b/cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/service/impl/ReportVersionServiceImpl.java @@ -27,6 +27,7 @@ import br.com.centralit.esi.api.resource.service.PentahoReportManager; import br.com.centralit.esi.api.resource.service.ReportDataSourceService; import br.com.centralit.esi.api.resource.service.ReportParameterService; import br.com.centralit.esi.api.resource.service.ReportVersionService; +import br.com.centralit.esi.api.resource.service.ResourceService; import br.com.centralit.framework.util.UtilString; @Service("reportVersionService") @@ -55,6 +56,9 @@ public class ReportVersionServiceImpl extends ResourceVersionServiceImpl impleme @Autowired private FlowService flowService; + + @Autowired + private ResourceService resourceService; @Autowired private CustomSQLService customSQLService; @@ -103,16 +107,25 @@ public class ReportVersionServiceImpl extends ResourceVersionServiceImpl impleme parameter.setCustomSQL(customSQLService.find(parameter.getCustomSQL().getId())); } parameter.setFlow(null); + parameter.setImage(null); break; case FLOW: parameter.setFlow(flowService.find(parameter.getFlow().getId())); parameter.setDataObject(null); - parameter.setCustomSQL(null); + parameter.setCustomSQL(null); + parameter.setImage(null); + break; + case IMAGE: + parameter.setFlow(null); + parameter.setDataObject(null); + parameter.setCustomSQL(null); + parameter.setImage(resourceService.find(parameter.getImage().getId())); break; default: parameter.setFlow(null); parameter.setDataObject(null); parameter.setCustomSQL(null); + parameter.setImage(null); break; } } diff --git a/cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java b/cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java index 6f57b18..d3b70ec 100644 --- a/cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java +++ b/cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java @@ -2176,6 +2176,7 @@ public class StartupListenerEsi extends UtilStartup implements ApplicationListen internacionalizacaoList.add(new Internacionalizacao("ESI.ENUMERADO.DATASOURCE_OBJETO_DADOS", "Objeto de dados", dominio, modulo)); internacionalizacaoList.add(new Internacionalizacao("ESI.ENUMERADO.DATASOURCE_FLUXO_ESI", "Fluxo ESI", dominio, modulo)); internacionalizacaoList.add(new Internacionalizacao("ESI.ENUMERADO.DATASOURCE_SCRIPT", "Script", dominio, modulo)); + internacionalizacaoList.add(new Internacionalizacao("ESI.ENUMERADO.DATASOURCE_CONSTANTE", "Constante", dominio, modulo)); internacionalizacaoList.add(new Internacionalizacao("ESI.ENUMERADO.DATASOURCE_IMAGEM", "Imagem", dominio, modulo)); internacionalizacaoList.add(new Internacionalizacao("ESI.ENUMERADO.TIPO_ENGINE_REGRA_DROOLS", "Drools", dominio, modulo)); diff --git a/cit-esi-web/src/main/webapp/assets/js/angular/custom/controller/ReportController.js b/cit-esi-web/src/main/webapp/assets/js/angular/custom/controller/ReportController.js index f7ac04e..e288da9 100644 --- a/cit-esi-web/src/main/webapp/assets/js/angular/custom/controller/ReportController.js +++ b/cit-esi-web/src/main/webapp/assets/js/angular/custom/controller/ReportController.js @@ -1,7 +1,7 @@ 'use strict'; -citApp.controller('ReportController', ["$scope", "appService", "ReportRepository", "FlowRepository", "FormWidgetRepository", "ParameterRepository", "MenuRepository", "FormBuilderRepository", "DataSourceRepository", "DataObjectRepository", "$filter", "$translate", "DomainRepository", "$timeout", "$http", "$rootScope", "$modal", - function ReportController($scope, appService, ReportRepository, FlowRepository, FormWidgetRepository, ParameterRepository, MenuRepository, FormBuilderRepository, DataSourceRepository, DataObjectRepository, $filter, $translate, DomainRepository, $timeout, $http, $rootScope, $modal) { +citApp.controller('ReportController', ["$scope", "appService", "ReportRepository", "FlowRepository", "FormWidgetRepository", "ResourceRepository", "ParameterRepository", "MenuRepository", "FormBuilderRepository", "DataSourceRepository", "DataObjectRepository", "$filter", "$translate", "DomainRepository", "$timeout", "$http", "$rootScope", "$modal", + function ReportController($scope, appService, ReportRepository, FlowRepository, FormWidgetRepository, ResourceRepository, ParameterRepository, MenuRepository, FormBuilderRepository, DataSourceRepository, DataObjectRepository, $filter, $translate, DomainRepository, $timeout, $http, $rootScope, $modal) { var componentsPage = '/cit-esi-web/assets/js/angular/custom/directive/html/formComponents.html'; $scope.appController = angular.element("#citapp-controller").scope(); @@ -357,7 +357,7 @@ citApp.controller('ReportController', ["$scope", "appService", "ReportRepository $scope.showAlert("success", $translate.instant('MSG.REGISTRO_SALVO')); $scope.reportForm.$submitted = false; - $scope.getReport(result.originalElement, true); + $scope.getReport($scope.report, true); }; @@ -509,5 +509,33 @@ citApp.controller('ReportController', ["$scope", "appService", "ReportRepository }else{ $scope.showAlert('error', $translate.instant('VALIDACAO.ALERTA_OBRIGATORIOS')); } - }; + }; + + $scope.findImage = function(value) { + var imageVH = { + nome : value + }; + return ResourceRepository.findResource(imageVH).then(function(result) { + var images = []; + if (result && result.length > 0) { + for (var i = 0; i < result.length; i++) { + var resource = result[i].originalElement; + if (resource.type == 'IMAGE') { + images.push(result[i]); + } + } + } + return images; + }); + }; + + $scope.setImage = function(item) { + $scope.parameter.image = item; + }; + + $scope.clearAutoCompleteImage = function() { + $scope.parameter.image = null; + }; + + }]); diff --git a/cit-esi-web/src/main/webapp/html/report/dialogReportParameter.html b/cit-esi-web/src/main/webapp/html/report/dialogReportParameter.html index b60f5a0..0d505fe 100644 --- a/cit-esi-web/src/main/webapp/html/report/dialogReportParameter.html +++ b/cit-esi-web/src/main/webapp/html/report/dialogReportParameter.html @@ -82,6 +82,27 @@ + +
+
+ + +
+
+ +
+
+ +
+
-- libgit2 0.21.2