Merge branch 'Development' of code-repo.d4science.org:MaDgiK-CITE/argos into Development
This commit is contained in:
commit
90b49194ac
|
@ -82,8 +82,11 @@ public class RemoteFetcherUtils {
|
||||||
if (jarr.get(0) instanceof String) {
|
if (jarr.get(0) instanceof String) {
|
||||||
return jarr.get(0).toString();
|
return jarr.get(0).toString();
|
||||||
} else {
|
} else {
|
||||||
return ((Map<String, String>)jarr.get(0)).get("content");
|
for (Object o : jarr) {
|
||||||
|
if ((o instanceof Map) && ((Map) o).containsKey("content")) {
|
||||||
|
return ((Map<String, String>) o).get("content");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else if (value instanceof Map) {
|
} else if (value instanceof Map) {
|
||||||
return ((Map<String, String>)value).get("content");
|
return ((Map<String, String>)value).get("content");
|
||||||
|
|
|
@ -248,7 +248,7 @@ public class WordBuilder {
|
||||||
if (field.getValue() != null && !field.getValue().toString().isEmpty()) {
|
if (field.getValue() != null && !field.getValue().toString().isEmpty()) {
|
||||||
this.indent = indent;
|
this.indent = indent;
|
||||||
String format = this.formatter(field);
|
String format = this.formatter(field);
|
||||||
if(format != null){
|
if(format != null && !format.isEmpty()){
|
||||||
if(format.charAt(0) == '['){
|
if(format.charAt(0) == '['){
|
||||||
format = format.substring(1, format.length() - 1).replaceAll(",", ", ");
|
format = format.substring(1, format.length() - 1).replaceAll(",", ", ");
|
||||||
}
|
}
|
||||||
|
@ -310,6 +310,9 @@ public class WordBuilder {
|
||||||
|
|
||||||
private String formatter(Field field) throws IOException {
|
private String formatter(Field field) throws IOException {
|
||||||
String comboboxType = null;
|
String comboboxType = null;
|
||||||
|
if (field.getValue() == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
switch (field.getViewStyle().getRenderStyle()) {
|
switch (field.getViewStyle().getRenderStyle()) {
|
||||||
case "researchers":
|
case "researchers":
|
||||||
case "projects":
|
case "projects":
|
||||||
|
@ -388,12 +391,15 @@ public class WordBuilder {
|
||||||
case "datepicker":
|
case "datepicker":
|
||||||
case "datePicker":{
|
case "datePicker":{
|
||||||
Instant instant;
|
Instant instant;
|
||||||
try {
|
if (!((String)field.getValue()).isEmpty()) {
|
||||||
instant = Instant.parse((String) field.getValue());
|
try {
|
||||||
} catch (DateTimeParseException ex) {
|
instant = Instant.parse((String) field.getValue());
|
||||||
instant = Instant.from(DateTimeFormatter.ofPattern("yyyy-MM-dd").withZone(ZoneId.systemDefault()).parse((String)field.getValue()));
|
} catch (DateTimeParseException ex) {
|
||||||
|
instant = Instant.from(DateTimeFormatter.ofPattern("yyyy-MM-dd").withZone(ZoneId.systemDefault()).parse((String) field.getValue()));
|
||||||
|
}
|
||||||
|
return field.getValue() != null ? DateTimeFormatter.ofPattern("yyyy-MM-dd").withZone(ZoneId.systemDefault()).format(instant) : "";
|
||||||
}
|
}
|
||||||
return field.getValue() != null ? DateTimeFormatter.ofPattern("yyyy-MM-dd").withZone(ZoneId.systemDefault()).format(instant) : "";
|
return (String) field.getValue();
|
||||||
}
|
}
|
||||||
case "freetext":
|
case "freetext":
|
||||||
case "textarea":
|
case "textarea":
|
||||||
|
|
Loading…
Reference in New Issue