Skip to content

probeer alleen de voor de transformatie benodigde datasources te openen #704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mprins merged 1 commit into from
Oct 1, 2019
Merged

probeer alleen de voor de transformatie benodigde datasources te openen #704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions brmo-service/src/main/java/nl/b3p/brmo/service/scanner/LaadprocesTransformatieUitvoeren.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,14 @@ public void execute(final ProgressUpdateListener listener) {
BrmoFramework brmo = null;
try {
DataSource dataSourceStaging = ConfigUtil.getDataSourceStaging();
DataSource dataSourceRsgbBgt = ConfigUtil.getDataSourceRsgbBgt();
DataSource dataSourceTopNL = ConfigUtil.getDataSourceTopNL();
DataSource dataSourceRsgbBgt = null;
DataSource dataSourceTopNL = null;
if (LaadprocesTransformatieProces.LaadprocesSoorten.BR_TOPNL.getSoort().equalsIgnoreCase(this.config.getSoort())) {
dataSourceTopNL = ConfigUtil.getDataSourceTopNL();
}
if (LaadprocesTransformatieProces.LaadprocesSoorten.BR_BGTLIGHT.getSoort().equalsIgnoreCase(this.config.getSoort())) {
dataSourceRsgbBgt = ConfigUtil.getDataSourceRsgbBgt();
}
brmo = new BrmoFramework(dataSourceStaging, null, dataSourceRsgbBgt, dataSourceTopNL);
long[] lpIds = null;

Expand Down
2 changes: 1 addition & 1 deletion brmo-service/src/main/webapp/WEB-INF/jsp/laadproces/list.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<h1>Overzicht Laadprocessen</h1>
<p><b>Shift-click:</b> Selecteer meerdere records,
<b>Ctrl-click:</b> De-selecteer record.
<b>Let op:</b> Als U "bgtlight" wilt transformeren mogen alleen processen van deze soort geselecteerd worden.
<b>Let op:</b> Als U "bgtlight" of "topnl" wilt transformeren mogen alleen processen van deze een enkele soort geselecteerd worden.
</p>
<div id="comment-div"></div>
<div id="laadproces-grid" class="grid-container"></div>
Expand Down