diff options
| author | CGantert345 <57003061+CGantert345@users.noreply.github.com> | 2023-08-11 10:43:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-11 10:43:36 +0200 |
| commit | 91c78a9c0dbb20ce141a0122267b4f6d367646ec (patch) | |
| tree | 960657a9b89eee67f09cc4e23675996f7f902440 /src/main/java/org/uic/barcode/ticket/api/asn/omv2/IncludedOpenTicketType.java | |
| parent | Merge pull request #70 from UnionInternationalCheminsdeFer/1.4.3 (diff) | |
| parent | version number update (diff) | |
| download | UIC-barcode-91c78a9c0dbb20ce141a0122267b4f6d367646ec.tar UIC-barcode-91c78a9c0dbb20ce141a0122267b4f6d367646ec.tar.gz UIC-barcode-91c78a9c0dbb20ce141a0122267b4f6d367646ec.tar.bz2 UIC-barcode-91c78a9c0dbb20ce141a0122267b4f6d367646ec.tar.lz UIC-barcode-91c78a9c0dbb20ce141a0122267b4f6d367646ec.tar.xz UIC-barcode-91c78a9c0dbb20ce141a0122267b4f6d367646ec.tar.zst UIC-barcode-91c78a9c0dbb20ce141a0122267b4f6d367646ec.zip | |
Diffstat (limited to 'src/main/java/org/uic/barcode/ticket/api/asn/omv2/IncludedOpenTicketType.java')
| -rw-r--r-- | src/main/java/org/uic/barcode/ticket/api/asn/omv2/IncludedOpenTicketType.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/IncludedOpenTicketType.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/IncludedOpenTicketType.java index e0465d9..4cfe708 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/IncludedOpenTicketType.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/IncludedOpenTicketType.java @@ -417,6 +417,11 @@ public class IncludedOpenTicketType extends Object { return null;
}
+ //set to 23:59
+ if (this.getValidUntilTime() == null) {
+ this.setValidUntilTime(1439L);
+ }
+
return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime);
}
@@ -426,10 +431,11 @@ public class IncludedOpenTicketType extends Object { }
public Date getUTCValidUntilDate(Date issuingDate){
+ this.getValidUntilDate(issuingDate);
if (this.validUntilUTCOffset == null) {
- return DateTimeUtils.getUTCDate(issuingDate, this.validFromDay, this.validFromTime, this.validFromUTCOffset);
+ return DateTimeUtils.getUTCDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime, this.validUntilUTCOffset);
} else {
- return DateTimeUtils.getUTCDate(issuingDate, this.validFromDay, this.validUntilTime, this.validFromUTCOffset);
+ return DateTimeUtils.getUTCDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime, this.validFromUTCOffset);
}
}
|