From 26ca7242605261c3bf1c27fb427ece203504ee51 Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Fri, 19 Mar 2021 15:51:40 +0100
Subject: time-zone-fix

---
 .../uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java   | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java')

diff --git a/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java b/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java
index 78deb8a..5bc419c 100644
--- a/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java
+++ b/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java
@@ -881,7 +881,7 @@ public class Api2OpenAsnEncoder {
 			
 		asnData.setTariffs(encodeTariffCollection(document.getTariffs()));
 		
-		asnData.setActivatedDays(document.getActivatedDays(),document.getValidFrom());
+		asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays()));
 
 		if (document.getClassCode() != ITravelClassType.second){
 			asnData.setClassCode(convertTravelClass(document.getClassCode()));
@@ -1558,13 +1558,7 @@ public class Api2OpenAsnEncoder {
 		}
 
 		
-		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()));
 		
 		asnData.setClassCode(convertTravelClass(document.getClassCode()));
 		
@@ -1697,9 +1691,7 @@ public class Api2OpenAsnEncoder {
 		
 		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()));				
 		
-- 
cgit v1.2.3


From 9f75546ee8fe2ad3ab07fee7bd9503340a5174fe Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Mon, 22 Mar 2021 11:47:46 +0100
Subject: additional tests for time zones fix for fip ticket

---
 .../uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java')

diff --git a/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java b/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java
index 5bc419c..d3136e1 100644
--- a/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java
+++ b/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java
@@ -881,7 +881,9 @@ public class Api2OpenAsnEncoder {
 			
 		asnData.setTariffs(encodeTariffCollection(document.getTariffs()));
 		
-		asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays()));
+		if (document.getActivatedDays() != null && !document.getActivatedDays().isEmpty()) {
+			asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays()));
+		}
 
 		if (document.getClassCode() != ITravelClassType.second){
 			asnData.setClassCode(convertTravelClass(document.getClassCode()));
@@ -1557,8 +1559,9 @@ public class Api2OpenAsnEncoder {
 			}
 		}
 
-		
-		asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays()));
+		if (document.getActivatedDays() != null && !document.getActivatedDays().isEmpty()) {
+			asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays()));
+		}
 		
 		asnData.setClassCode(convertTravelClass(document.getClassCode()));
 		
@@ -1691,7 +1694,9 @@ public class Api2OpenAsnEncoder {
 		
 		asnData.setValidityDates(document.getValidFrom(), document.getValidUntil(), issuingDate);
 		
-		asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays()));
+		if (document.getActivatedDays() != null && !document.getActivatedDays().isEmpty()) {
+			asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays()));
+		}
 		
 		asnData.setExtension(encodeExtension(document.getExtension()));				
 		
-- 
cgit v1.2.3