diff options
| author | CGantert345 <57003061+CGantert345@users.noreply.github.com> | 2021-03-19 15:51:40 +0100 |
|---|---|---|
| committer | CGantert345 <57003061+CGantert345@users.noreply.github.com> | 2021-03-19 15:51:40 +0100 |
| commit | 26ca7242605261c3bf1c27fb427ece203504ee51 (patch) | |
| tree | 87ba2e32aef122c6878c0354ae6c554ca9b5816e /src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java | |
| parent | new release (diff) | |
| download | UIC-barcode-26ca7242605261c3bf1c27fb427ece203504ee51.tar UIC-barcode-26ca7242605261c3bf1c27fb427ece203504ee51.tar.gz UIC-barcode-26ca7242605261c3bf1c27fb427ece203504ee51.tar.bz2 UIC-barcode-26ca7242605261c3bf1c27fb427ece203504ee51.tar.lz UIC-barcode-26ca7242605261c3bf1c27fb427ece203504ee51.tar.xz UIC-barcode-26ca7242605261c3bf1c27fb427ece203504ee51.tar.zst UIC-barcode-26ca7242605261c3bf1c27fb427ece203504ee51.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java b/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java index 97abcfa..48583b9 100644 --- a/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java +++ b/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java @@ -886,7 +886,7 @@ public class Api2OpenAsnEncoderV2 { asnData.setTariffs(encodeTariffCollection(document.getTariffs()));
- asnData.setActivatedDays(document.getActivatedDays(),document.getValidFrom());
+ asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays()));
if (document.getClassCode() != ITravelClassType.second && document.getClassCode() != null){
asnData.setClassCode(TravelClassType.valueOf(document.getClassCode().name()));
@@ -1562,14 +1562,8 @@ public class Api2OpenAsnEncoderV2 { }
}
-
- if(document.getActivatedDays()!= null && document.getActivatedDays().size() > 0) {
- if (document.getValidFrom() != null) {
- asnData.setActivatedDays(document.getActivatedDays(),document.getValidFrom());
- } else {
- asnData.setActivatedDays(document.getActivatedDays(),issuingDate);
- }
- }
+ asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays()));
+
if (document.getClassCode() != null) {
asnData.setClassCode(TravelClassType.valueOf(document.getClassCode().name()));
}
@@ -1703,9 +1697,7 @@ public class Api2OpenAsnEncoderV2 { asnData.setValidityDates(document.getValidFrom(), document.getValidUntil(), issuingDate);
- if(document.getActivatedDays()!= null && document.getActivatedDays().size() > 0) {
- asnData.setActivatedDays(document.getActivatedDays(), document.getValidFrom());
- }
+ asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays()));
asnData.setExtension(encodeExtension(document.getExtension()));
|