Mercurial > lada > lada-server
diff src/main/java/de/intevation/lada/validation/rules/status/StatusKombination.java @ 1035:4d95cc7f0a43 schema-update
Updated status workflow.
* Using status_kombi instead of status_wert and status_stufe
* new service for status_kombi
* updated validators
author | Raimund Renkert <raimund.renkert@intevation.de> |
---|---|
date | Wed, 31 Aug 2016 15:52:15 +0200 |
parents | 1c41c7b8f7c2 |
children |
line wrap: on
line diff
--- a/src/main/java/de/intevation/lada/validation/rules/status/StatusKombination.java Wed Aug 31 15:50:54 2016 +0200 +++ b/src/main/java/de/intevation/lada/validation/rules/status/StatusKombination.java Wed Aug 31 15:52:15 2016 +0200 @@ -11,6 +11,8 @@ import javax.inject.Inject; +import org.apache.log4j.Logger; + import de.intevation.lada.model.land.StatusProtokoll; import de.intevation.lada.model.stammdaten.StatusKombi; import de.intevation.lada.util.annotation.RepositoryConfig; @@ -29,19 +31,19 @@ @ValidationRule("Status") public class StatusKombination implements Rule { + @Inject Logger logger; + @Inject @RepositoryConfig(type=RepositoryType.RO) private Repository repository; @Override public Violation execute(Object object) { - /* StatusProtokoll status = (StatusProtokoll)object; QueryBuilder<StatusKombi> kombi = new QueryBuilder<StatusKombi>( repository.entityManager("stamm"), StatusKombi.class); - kombi.and("stufeId", status.getStatusStufe()); - kombi.and("wertId", status.getStatusWert()); + kombi.and("id", status.getStatusKombi()); List<StatusKombi> result = repository.filterPlain(kombi.getQuery(), "stamm"); if (result.isEmpty()) { @@ -50,9 +52,5 @@ return violation; } return null; - */ - Violation violation = new Violation(); - violation.addError("status", 000); - return violation; } }