Mercurial > lada > lada-server
comparison 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 |
comparison
equal
deleted
inserted
replaced
1034:61354a9fa58d | 1035:4d95cc7f0a43 |
---|---|
8 package de.intevation.lada.validation.rules.status; | 8 package de.intevation.lada.validation.rules.status; |
9 | 9 |
10 import java.util.List; | 10 import java.util.List; |
11 | 11 |
12 import javax.inject.Inject; | 12 import javax.inject.Inject; |
13 | |
14 import org.apache.log4j.Logger; | |
13 | 15 |
14 import de.intevation.lada.model.land.StatusProtokoll; | 16 import de.intevation.lada.model.land.StatusProtokoll; |
15 import de.intevation.lada.model.stammdaten.StatusKombi; | 17 import de.intevation.lada.model.stammdaten.StatusKombi; |
16 import de.intevation.lada.util.annotation.RepositoryConfig; | 18 import de.intevation.lada.util.annotation.RepositoryConfig; |
17 import de.intevation.lada.util.data.QueryBuilder; | 19 import de.intevation.lada.util.data.QueryBuilder; |
27 * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a> | 29 * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a> |
28 */ | 30 */ |
29 @ValidationRule("Status") | 31 @ValidationRule("Status") |
30 public class StatusKombination implements Rule { | 32 public class StatusKombination implements Rule { |
31 | 33 |
34 @Inject Logger logger; | |
35 | |
32 @Inject | 36 @Inject |
33 @RepositoryConfig(type=RepositoryType.RO) | 37 @RepositoryConfig(type=RepositoryType.RO) |
34 private Repository repository; | 38 private Repository repository; |
35 | 39 |
36 @Override | 40 @Override |
37 public Violation execute(Object object) { | 41 public Violation execute(Object object) { |
38 /* | |
39 StatusProtokoll status = (StatusProtokoll)object; | 42 StatusProtokoll status = (StatusProtokoll)object; |
40 QueryBuilder<StatusKombi> kombi = new QueryBuilder<StatusKombi>( | 43 QueryBuilder<StatusKombi> kombi = new QueryBuilder<StatusKombi>( |
41 repository.entityManager("stamm"), | 44 repository.entityManager("stamm"), |
42 StatusKombi.class); | 45 StatusKombi.class); |
43 kombi.and("stufeId", status.getStatusStufe()); | 46 kombi.and("id", status.getStatusKombi()); |
44 kombi.and("wertId", status.getStatusWert()); | |
45 List<StatusKombi> result = | 47 List<StatusKombi> result = |
46 repository.filterPlain(kombi.getQuery(), "stamm"); | 48 repository.filterPlain(kombi.getQuery(), "stamm"); |
47 if (result.isEmpty()) { | 49 if (result.isEmpty()) { |
48 Violation violation = new Violation(); | 50 Violation violation = new Violation(); |
49 violation.addError("kombi", 632); | 51 violation.addError("kombi", 632); |
50 return violation; | 52 return violation; |
51 } | 53 } |
52 return null; | 54 return null; |
53 */ | |
54 Violation violation = new Violation(); | |
55 violation.addError("status", 000); | |
56 return violation; | |
57 } | 55 } |
58 } | 56 } |