From 4fb70ba1e834256960a924d6082f7cc5ac70050b Mon Sep 17 00:00:00 2001
From: Grahame Grieve <grahameg@gmail.ccom>
Date: Tue, 18 Jul 2023 11:08:57 +1000
Subject: [PATCH] other missed code

---
 .../org/hl7/fhir/utilities/Utilities.java     | 39 ++++++++++++++++++-
 .../fhir/utilities/i18n/I18nConstants.java    |  1 +
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java
index 0a48d8351..3b53e5b09 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java
@@ -1373,6 +1373,21 @@ public class Utilities {
     }
   }
 
+  public static String describeDuration(long ms) {
+    long days = ms / (1000 * 60 * 60 * 24);
+    long hours = ms / (1000 * 60 * 60) % 24;
+    long mins = ms / (1000 * 60) % 60;
+    long secs = ms / (1000) % 60;
+    ms = ms % 1000;
+    if (days > 0) {
+      return ""+days+"d "+hours+":"+mins+":"+secs+"."+ms;      
+    } else {
+      return ""+hours+":"+mins+":"+secs+"."+ms;
+    }
+    
+
+  }
+
   public static boolean startsWithInList(String s, String... list) {
     if (s == null) {
       return false;
@@ -1650,9 +1665,23 @@ public class Utilities {
     if (b.length() == 19) {
       b.append(".000");
     }
-    return applyDatePrecision(b.toString(), precision)+res[1];
+    String tz;
+    if (precision <= 10) {
+      tz = "";
+    } else {
+      tz = Utilities.noString(res[1]) ? defLowTimezone(b.toString()) : res[1];
+    }
+    return applyDatePrecision(b.toString(), precision)+tz;
   }
 
+  private static String defLowTimezone(String string) {
+    return "+14:00"; // Kiribati permanent timezone since 1994 and we don't worry about before then 
+  }
+
+  private static String defHighTimezone(String string) {
+    return "-12:00"; // Parts of Russia, Antarctica, Baker Island and Midway Atoll 
+  }
+  
   public static String lowBoundaryForTime(String value, int precision) {
     String[] res = splitTimezone(value);
     StringBuilder b = new StringBuilder(res[0]);
@@ -1748,7 +1777,13 @@ public class Utilities {
     if (b.length() == 19) {
       b.append(".999");
     }
-    return applyDatePrecision(b.toString(), precision)+res[1];
+    String tz;
+    if (precision <= 10) {
+      tz = "";
+    } else {
+      tz = Utilities.noString(res[1]) ? defHighTimezone(b.toString()) : res[1];
+    }
+    return applyDatePrecision(b.toString(), precision)+tz;
   }
 
   private static String dayCount(int y, int m) {
diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/I18nConstants.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/I18nConstants.java
index 0365ab0e3..2b27e79a1 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/I18nConstants.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/I18nConstants.java
@@ -921,6 +921,7 @@ public class I18nConstants {
   public static final String EXTENSION_CONTEXT_UNABLE_TO_FIND_PROFILE = "EXTENSION_CONTEXT_UNABLE_TO_FIND_PROFILE";
   public static final String TERMINOLOGY_TX_HINT = "TERMINOLOGY_TX_HINT";
   public static final String TERMINOLOGY_TX_WARNING = "TERMINOLOGY_TX_WARNING";
+  public static final String SD_ED_TYPE_PROFILE_WRONG_TYPE = "SD_ED_TYPE_PROFILE_WRONG_TYPE";
 
 }