From 65af2317c1081f9a64b70a3504a5e702187f34e0 Mon Sep 17 00:00:00 2001 From: jallentxbiomed Date: Thu, 25 Jun 2026 10:33:24 -0500 Subject: [PATCH 1/3] Added null check on sort order --- .../labkey/snprc_ehr/controllers/AnimalGroupsController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snprc_ehr/src/org/labkey/snprc_ehr/controllers/AnimalGroupsController.java b/snprc_ehr/src/org/labkey/snprc_ehr/controllers/AnimalGroupsController.java index cbf395195..5970d9910 100644 --- a/snprc_ehr/src/org/labkey/snprc_ehr/controllers/AnimalGroupsController.java +++ b/snprc_ehr/src/org/labkey/snprc_ehr/controllers/AnimalGroupsController.java @@ -464,7 +464,7 @@ public ApiResponse execute(SimpleApiJsonForm simpleApiJsonForm, BindException er if (mappedRows.get("code") != null && (Integer) mappedRows.get("code") != 0) { mappedRows.put("category_code", o.get("categoryCode")); - mappedRows.put("sort_order", o.get("sortOrder")); + mappedRows.put("sort_order", o.isNull("sortOrder") ? null : o.get("sortOrder")); // update existing row rowsList.add(mappedRows); @@ -482,7 +482,7 @@ public ApiResponse execute(SimpleApiJsonForm simpleApiJsonForm, BindException er //mappedRows.put("code", -1); mappedRows.put("objectId", GUID.makeGUID()); mappedRows.put("category_code", o.get("categoryCode")); - mappedRows.put("sort_order", o.get("sortOrder")); + mappedRows.put("sort_order", o.isNull("sortOrder") ? null : o.get("sortOrder")); rowsList.add(mappedRows); qus.insertRows(getUser(), getContainer(), rowsList, batchErrors, null, null); if (batchErrors.hasErrors()) throw batchErrors; From 2d978b2be736f9ee360b71fda88386a8d69e0b21 Mon Sep 17 00:00:00 2001 From: jallentxbiomed Date: Thu, 25 Jun 2026 10:59:44 -0500 Subject: [PATCH 2/3] added fix for date shifting on save --- .../web/snprc_ehr/lib/stores/AnimalGroupsStore.js | 9 ++++----- .../src/org/labkey/snprc_ehr/domain/AnimalGroup.java | 6 +++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/snprc_ehr/resources/web/snprc_ehr/lib/stores/AnimalGroupsStore.js b/snprc_ehr/resources/web/snprc_ehr/lib/stores/AnimalGroupsStore.js index fe2aacda0..f9731c31c 100644 --- a/snprc_ehr/resources/web/snprc_ehr/lib/stores/AnimalGroupsStore.js +++ b/snprc_ehr/resources/web/snprc_ehr/lib/stores/AnimalGroupsStore.js @@ -8,11 +8,10 @@ */ Ext4.define("AnimalGroupsStore", { extend: 'Ext.data.Store', - fields: ['code', 'categoryCode', 'name', {name: 'date', type: 'date', submitFormat: 'Y-m-d'}, { - name: 'endDate', - type: 'date', - submitFormat: 'Y-m-d' - }, 'comment', 'sortOrder'], + fields: ['code', 'categoryCode', 'name', + {name: 'date', type: 'date', dateReadFormat: 'Y-m-d', submitFormat: 'Y-m-d'}, + {name: 'endDate', type: 'date', dateReadFormat: 'Y-m-d', submitFormat: 'Y-m-d' }, + 'comment', 'sortOrder'], autoLoad: false, proxy: { type: 'ajax', diff --git a/snprc_ehr/src/org/labkey/snprc_ehr/domain/AnimalGroup.java b/snprc_ehr/src/org/labkey/snprc_ehr/domain/AnimalGroup.java index 68651c4cb..f7abe0ca1 100644 --- a/snprc_ehr/src/org/labkey/snprc_ehr/domain/AnimalGroup.java +++ b/snprc_ehr/src/org/labkey/snprc_ehr/domain/AnimalGroup.java @@ -17,6 +17,7 @@ import org.json.JSONObject; import org.labkey.api.data.Entity; +import org.labkey.api.util.DateUtil; import java.util.Date; @@ -111,6 +112,9 @@ public void setSortOrder(String sortOrder) public JSONObject toJSON() { - return new JSONObject(this); + JSONObject json = new JSONObject(this); + json.put("date", date == null ? null : DateUtil.toISO(date).substring(0, 10)); + json.put("endDate", endDate == null ? null : DateUtil.toISO(endDate).substring(0, 10)); + return json; } } From 0bbe5850989a015843557fc23b99deb64c816175 Mon Sep 17 00:00:00 2001 From: jallentxbiomed Date: Thu, 25 Jun 2026 13:35:03 -0500 Subject: [PATCH 3/3] updated to use official iso formatting --- snprc_ehr/src/org/labkey/snprc_ehr/domain/AnimalGroup.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snprc_ehr/src/org/labkey/snprc_ehr/domain/AnimalGroup.java b/snprc_ehr/src/org/labkey/snprc_ehr/domain/AnimalGroup.java index f7abe0ca1..bd11fc4cf 100644 --- a/snprc_ehr/src/org/labkey/snprc_ehr/domain/AnimalGroup.java +++ b/snprc_ehr/src/org/labkey/snprc_ehr/domain/AnimalGroup.java @@ -113,8 +113,8 @@ public void setSortOrder(String sortOrder) public JSONObject toJSON() { JSONObject json = new JSONObject(this); - json.put("date", date == null ? null : DateUtil.toISO(date).substring(0, 10)); - json.put("endDate", endDate == null ? null : DateUtil.toISO(endDate).substring(0, 10)); + json.put("date", DateUtil.formatIsoDate(date)); + json.put("endDate", DateUtil.formatIsoDate(endDate)); return json; } }