honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

other missed code

This commit is contained in:
Grahame Grieve 2023-07-18 11:08:57 +10:00
parent 8c0539136c
commit 4fb70ba1e8
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java
View File

@ -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) { public static boolean startsWithInList(String s, String... list) {
if (s == null) { if (s == null) {
return false; return false;
@ -1650,9 +1665,23 @@ public class Utilities {
if (b.length() == 19) { if (b.length() == 19) {
b.append(".000"); 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) { public static String lowBoundaryForTime(String value, int precision) {
String[] res = splitTimezone(value); String[] res = splitTimezone(value);
StringBuilder b = new StringBuilder(res[0]); StringBuilder b = new StringBuilder(res[0]);
@ -1748,7 +1777,13 @@ public class Utilities {
if (b.length() == 19) { if (b.length() == 19) {
b.append(".999"); 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) { private static String dayCount(int y, int m) {

1
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/I18nConstants.java
View File

@ -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 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_HINT = "TERMINOLOGY_TX_HINT";
public static final String TERMINOLOGY_TX_WARNING = "TERMINOLOGY_TX_WARNING"; 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";
} }