diff --git a/ehr/resources/queries/study/demographicsAge.sql b/ehr/resources/queries/study/demographicsAge.sql
index 10d5417c2..150e825d1 100644
--- a/ehr/resources/queries/study/demographicsAge.sql
+++ b/ehr/resources/queries/study/demographicsAge.sql
@@ -17,15 +17,15 @@ ROUND(CONVERT(age_in_months(d.birth, COALESCE(d.lastDayAtCenter, now())), DOUBLE
ROUND(CONVERT(age_in_months(d.birth, COALESCE(d.lastDayAtCenter, now())), DOUBLE) / 12, 1) AS ageInYears,
-TIMESTAMPDIFF('SQL_TSI_DAY', d.birth, COALESCE(d.lastDayAtCenter, now())) as ageInDays,
+age_in_days(d.birth, COALESCE(d.lastDayAtCenter, now())) as ageInDays,
case
when (age_in_months(d.birth, COALESCE(d.lastDayAtCenter, now()))) < 1
- then (CONVERT(CONVERT(TIMESTAMPDIFF('SQL_TSI_DAY', d.birth, COALESCE(d.lastDayAtCenter, now())), float), VARCHAR) || ' days')
+ then (CONVERT(CONVERT(age_in_days(d.birth, COALESCE(d.lastDayAtCenter, now())), float), VARCHAR) || ' days')
when (age_in_months(d.birth, COALESCE(d.lastDayAtCenter, now()))) < 12
then (CONVERT(CONVERT(ROUND(age_in_months(d.birth, COALESCE(d.lastDayAtCenter, now())), 1), float), VARCHAR) || ' months')
else
- (CONVERT(CONVERT(FLOOR(age_in_months(d.birth, COALESCE(d.lastDayAtCenter, now())) / 12), SQL_INTEGER), VARCHAR) || '.' || CONVERT(MOD(CONVERT(ROUND(age_in_months(d.birth, COALESCE(d.death, now())) / 12.0 * 10.0, 0), SQL_INTEGER), 10), VARCHAR) || ' years')
+ (CONVERT(CONVERT(FLOOR(age_in_months(d.birth, COALESCE(d.lastDayAtCenter, now())) / 12), SQL_INTEGER), VARCHAR) || '.' || CONVERT(MOD(CONVERT(ROUND(age_in_months(d.birth, COALESCE(d.lastDayAtCenter, now())) / 12.0 * 10.0, 0), SQL_INTEGER), 10), VARCHAR) || ' years')
end as ageFriendly
FROM study.Demographics d
diff --git a/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-26.002-26.003.sql b/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-26.002-26.003.sql
new file mode 100644
index 000000000..5368f65ed
--- /dev/null
+++ b/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-26.002-26.003.sql
@@ -0,0 +1,60 @@
+-- Dropping ix_ehr_lookups_request_priority_container [container] because it overlaps with uq_request_priority [container, priority]
+DROP INDEX ehr_lookups.ix_ehr_lookups_request_priority_container;
+-- Dropping ix_ehr_lookups_usda_levels_container [container] because it overlaps with uq_usda_levels [container, usda_level]
+DROP INDEX ehr_lookups.ix_ehr_lookups_usda_levels_container;
+-- Dropping ix_rooms_container [container] because it overlaps with uq_rooms [container, room]
+DROP INDEX ehr_lookups.ix_rooms_container;
+-- Dropping ix_ehr_lookups_cage_positions_container [container] because it overlaps with uq_cage_positions [container, cage]
+DROP INDEX ehr_lookups.ix_ehr_lookups_cage_positions_container;
+-- Dropping ix_ehr_lookups_blood_tube_volumes_container [container] because it overlaps with uq_blood_tube_volumes [container, volume]
+DROP INDEX ehr_lookups.ix_ehr_lookups_blood_tube_volumes_container;
+-- Dropping ix_ehr_lookups_areas_container [container] because it overlaps with uq_areas [container, area]
+DROP INDEX ehr_lookups.ix_ehr_lookups_areas_container;
+-- Dropping ix_ehr_lookups_source_container [container] because it overlaps with uq_source [container, code]
+DROP INDEX ehr_lookups.ix_ehr_lookups_source_container;
+-- Dropping ix_ehr_lookups_flag_categories_container [container] because it overlaps with uq_flag_categories [container, category]
+DROP INDEX ehr_lookups.ix_ehr_lookups_flag_categories_container;
+-- Dropping ix_ehr_lookups_routes_container [container] because it overlaps with uq_routes [container, route]
+DROP INDEX ehr_lookups.ix_ehr_lookups_routes_container;
+-- Dropping ix_ehr_lookups_cage_container [container] because it overlaps with uq_cage [container, location]
+DROP INDEX ehr_lookups.ix_ehr_lookups_cage_container;
+-- Dropping ix_ehr_lookups_blood_draw_services_container [container] because it overlaps with uq_blood_draw_services [container, service]
+DROP INDEX ehr_lookups.ix_ehr_lookups_blood_draw_services_container;
+-- Dropping ix_ehr_lookups_clinpath_tests_container [container] because it overlaps with uq_clinpath_tests [container, testname]
+DROP INDEX ehr_lookups.ix_ehr_lookups_clinpath_tests_container;
+-- Dropping ix_ehr_lookups_species_codes_container [container] because it overlaps with uq_species_codes [container, code]
+DROP INDEX ehr_lookups.ix_ehr_lookups_species_codes_container;
+-- Dropping ix_ehr_lookups_labwork_types_container [container] because it overlaps with uq_labwork_types [container, type]
+DROP INDEX ehr_lookups.ix_ehr_lookups_labwork_types_container;
+-- Dropping ix_ehr_lookups_death_remarks_container [container] because it overlaps with uq_death_remarks [container, title]
+DROP INDEX ehr_lookups.ix_ehr_lookups_death_remarks_container;
+-- Dropping ix_ehr_lookups_gender_codes_container [container] because it overlaps with uq_gender_codes [container, code]
+DROP INDEX ehr_lookups.ix_ehr_lookups_gender_codes_container;
+-- Dropping ix_buildings_container [container] because it overlaps with uq_buildings [container, name]
+DROP INDEX ehr_lookups.ix_buildings_container;
+-- Dropping ix_ehr_lookups_restraint_type_container [container] because it overlaps with uq_restraint_type [container, type]
+DROP INDEX ehr_lookups.ix_ehr_lookups_restraint_type_container;
+-- Dropping ix_ehr_lookups_conc_units_container [container] because it overlaps with uq_conc_units [container, unit]
+DROP INDEX ehr_lookups.ix_ehr_lookups_conc_units_container;
+-- Dropping ix_ehr_lookups_weight_ranges_container [container] because it overlaps with uq_weight_ranges [container, species]
+DROP INDEX ehr_lookups.ix_ehr_lookups_weight_ranges_container;
+-- Dropping ix_ehr_lookups_dosage_units_container [container] because it overlaps with uq_dosage_units [container, unit]
+DROP INDEX ehr_lookups.ix_ehr_lookups_dosage_units_container;
+-- Dropping ix_ehr_lookups_volume_units_container [container] because it overlaps with uq_volume_units [container, unit]
+DROP INDEX ehr_lookups.ix_ehr_lookups_volume_units_container;
+-- Dropping ix_ehr_lookups_blood_draw_tube_type_container [container] because it overlaps with uq_blood_draw_tube_type [container, type]
+DROP INDEX ehr_lookups.ix_ehr_lookups_blood_draw_tube_type_container;
+-- Dropping ix_ehr_lookups_cage_type_container [container] because it overlaps with uq_cage_type [container, cagetype]
+DROP INDEX ehr_lookups.ix_ehr_lookups_cage_type_container;
+-- Dropping ix_ehr_lookups_amount_units_container [container] because it overlaps with uq_amount_units [container, unit]
+DROP INDEX ehr_lookups.ix_ehr_lookups_amount_units_container;
+-- Dropping ix_treatment_codes_container [container] because it overlaps with uq_treatment_codes [container, meaning]
+DROP INDEX ehr_lookups.ix_treatment_codes_container;
+-- Dropping ix_ehr_lookups_calculated_status_codes_container [container] because it overlaps with uq_calculated_status_codes [container, code]
+DROP INDEX ehr_lookups.ix_ehr_lookups_calculated_status_codes_container;
+-- Dropping ix_ehr_lookups_species_container [container] because it overlaps with uq_species [container, common]
+DROP INDEX ehr_lookups.ix_ehr_lookups_species_container;
+-- Dropping ix_ehr_lookups_labwork_services_container [container] because it overlaps with uq_labwork_services [container, servicename]
+DROP INDEX ehr_lookups.ix_ehr_lookups_labwork_services_container;
+-- Dropping ix_ehr_lookups_parentagetypes_container [container] because it overlaps with uq_parentagetypes [container, label]
+DROP INDEX ehr_lookups.ix_ehr_lookups_parentagetypes_container;
diff --git a/ehr/resources/web/ehr/data/StoreCollection.js b/ehr/resources/web/ehr/data/StoreCollection.js
index 4efa982b0..45c893b20 100644
--- a/ehr/resources/web/ehr/data/StoreCollection.js
+++ b/ehr/resources/web/ehr/data/StoreCollection.js
@@ -12,6 +12,7 @@ Ext4.define('EHR.data.StoreCollection', {
serverStores: null,
hasLoaded: false, //will be set true after initial load
clientDataChangeBuffer: 150,
+ validationRequestsInFlight: 0,
ignoredClientEvents: {},
constructor: function(){
@@ -20,7 +21,7 @@ Ext4.define('EHR.data.StoreCollection', {
this.serverStores = Ext4.create('Ext.util.MixedCollection', false, this.getKey);
this.callParent(arguments);
- this.addEvents('commitcomplete', 'commitexception', 'validation', 'initialload', 'load', 'clientdatachanged', 'serverdatachanged');
+ this.addEvents('commitcomplete', 'commitexception', 'beforevalidation', 'validationstart', 'validation', 'validationcomplete', 'initialload', 'load', 'clientdatachanged', 'serverdatachanged');
this.on('clientdatachanged', this.onClientDataChanged, this, {buffer: this.clientDataChangeBuffer});
},
@@ -218,24 +219,48 @@ Ext4.define('EHR.data.StoreCollection', {
}
else
{
- //this really isnt the right event to fire, but it will force a recalulation of buttons on the panel
+ //this really isn't the right event to fire, but it will force a recalculation of buttons on the panel
this.fireEvent('validation', this);
}
},
validateAll: function(){
+ if(this.fireEvent('beforevalidation', this)===false)
+ return;
this.serverStores.each(function(serverStore){
serverStore.validateRecords(serverStore.getRange(), true);
}, this);
},
validateRecords: function(recordMap){
+ if(this.fireEvent('beforevalidation', this)===false)
+ return;
for (var serverStoreId in recordMap){
var serverStore = this.serverStores.get(serverStoreId);
serverStore.validateRecords(Ext4.Object.getValues(recordMap[serverStoreId]), true);
}
},
+ onValidationRequestStart: function(){
+ this.validationRequestsInFlight++;
+
+ if (this.validationRequestsInFlight === 1){
+ this.fireEvent('validationstart', this);
+ }
+ },
+
+ onValidationRequestComplete: function(){
+ if (!this.validationRequestsInFlight){
+ return;
+ }
+
+ this.validationRequestsInFlight--;
+
+ if (this.validationRequestsInFlight === 0){
+ this.fireEvent('validationcomplete', this);
+ }
+ },
+
serverToClientDataMap: null,
getServerToClientDataMap: function(){
@@ -472,11 +497,31 @@ Ext4.define('EHR.data.StoreCollection', {
if (EHR.debug)
console.log(commands);
+ var success = this.getOnCommitSuccess(recordsArr, validateOnly, retainErrors);
+ var failure = this.getOnCommitFailure(recordsArr, validateOnly);
var cfg = {
url : LABKEY.ActionURL.buildURL('query', 'saveRows', this.containerPath),
method : 'POST',
- success: this.getOnCommitSuccess(recordsArr, validateOnly, retainErrors),
- failure: this.getOnCommitFailure(recordsArr, validateOnly),
+ success: function(response, options){
+ try {
+ success.call(this, response, options);
+ }
+ finally {
+ if (validateOnly){
+ this.onValidationRequestComplete();
+ }
+ }
+ },
+ failure: function(response, options){
+ try {
+ failure.call(this, response, options);
+ }
+ finally {
+ if (validateOnly){
+ this.onValidationRequestComplete();
+ }
+ }
+ },
scope: this,
timeout: 5000000, //a little extreme?
transacted: true,
@@ -498,9 +543,20 @@ Ext4.define('EHR.data.StoreCollection', {
if (validateOnly){
cfg.jsonData.validateOnly = true;
cfg.jsonData.extraContext.isValidateOnly = true;
+ this.onValidationRequestStart();
+ }
+
+ var request;
+ try {
+ request = LABKEY.Ajax.request(cfg);
}
+ catch (e){
+ if (validateOnly){
+ this.onValidationRequestComplete();
+ }
- var request = LABKEY.Ajax.request(cfg);
+ throw e;
+ }
Ext4.Array.forEach(recordsArr, function(command){
Ext4.Array.forEach(command, function(rec){
@@ -893,4 +949,4 @@ Ext4.define('EHR.data.StoreCollection', {
s.checkForServerErrorChanges();
}, this);
}
-});
\ No newline at end of file
+});
diff --git a/ehr/resources/web/ehr/panel/DataEntryErrorPanel.js b/ehr/resources/web/ehr/panel/DataEntryErrorPanel.js
index ba21677d1..c7eff1426 100644
--- a/ehr/resources/web/ehr/panel/DataEntryErrorPanel.js
+++ b/ehr/resources/web/ehr/panel/DataEntryErrorPanel.js
@@ -19,6 +19,7 @@ Ext4.define('EHR.panel.DataEntryErrorPanel', {
this.callParent(arguments);
this.mon(this.storeCollection, 'validation', this.updateErrorMessages, this, {buffer: 1000});
+ this.mon(this.storeCollection, 'validationcomplete', this.updateErrorMessages, this, {buffer: 50});
this.mon(this.storeCollection, 'commitcomplete', this.updateErrorMessages, this, {buffer: 200});
this.mon(this.storeCollection, 'commitexception', this.updateErrorMessages, this, {buffer: 200});
},
diff --git a/ehr/resources/web/ehr/panel/DataEntryPanel.js b/ehr/resources/web/ehr/panel/DataEntryPanel.js
index ea403c084..1c7ff43ae 100644
--- a/ehr/resources/web/ehr/panel/DataEntryPanel.js
+++ b/ehr/resources/web/ehr/panel/DataEntryPanel.js
@@ -12,6 +12,7 @@ Ext4.define('EHR.panel.DataEntryPanel', {
storeCollection: null,
hideErrorPanel: false,
useSectionBorder: true,
+ validationInProgress: false,
layout: 'anchor',
border: false,
@@ -33,7 +34,10 @@ Ext4.define('EHR.panel.DataEntryPanel', {
this.storeCollection.on('initialload', this.onStoreCollectionInitialLoad, this);
this.storeCollection.on('commitcomplete', this.onStoreCollectionCommitComplete, this);
this.storeCollection.on('validation', this.onStoreCollectionValidation, this);
+ this.storeCollection.on('validationstart', this.onValidationStart, this);
+ this.storeCollection.on('validationcomplete', this.onValidationComplete, this);
this.storeCollection.on('beforecommit', this.onStoreCollectionBeforeCommit, this);
+ this.storeCollection.on('beforevalidation', this.onBeforeValidation, this);
this.storeCollection.on('commitexception', this.onStoreCollectionCommitException, this);
//this.storeCollection.on('serverdatachanged', this.onStoreCollectionServerDataChanged, this);
@@ -83,6 +87,56 @@ Ext4.define('EHR.panel.DataEntryPanel', {
}
},
+ onBeforeValidation: function(sc){
+ function processItem(item) {
+ if(item.disableOn) {
+ item.setDisabled(true);
+ if (item.setTooltip)
+ item.setTooltip('Disabled waiting on validation. Select "More Actions" -> "Re-Validate" if this is not clearing.');
+ }
+
+ if (item.menu) {
+ item.menu.items.each(function (menuItem) {
+ processItem(menuItem);
+ }, this);
+ }
+ }
+
+ var ehrContext = LABKEY.getModuleContext('ehr');
+ if (ehrContext && !ehrContext.isSubmitEnabledOnValidation) {
+ var btns = this.getToolbarItems();
+ if (btns) {
+ Ext4.Array.forEach(btns, function (toolbar) {
+ toolbar.items.each(function (item) {
+ processItem(item);
+ }, this);
+ }, this);
+ }
+ }
+ },
+
+ onValidationStart: function(){
+ // Suppress the indicator during initial form load/background reconciliation.
+ if (!this.hasStoreCollectionLoaded || !this.storeCollection || !this.storeCollection.hasLoaded){
+ return;
+ }
+
+ this.validationInProgress = true;
+ this.setValidationIndicatorVisible(true);
+ },
+
+ onValidationComplete: function(){
+ this.validationInProgress = false;
+ this.setValidationIndicatorVisible(false);
+
+ var errorPanel = this.getErrorPanel();
+ if (errorPanel){
+ errorPanel.updateErrorMessages();
+ }
+
+ this.onStoreCollectionValidation(this.storeCollection);
+ },
+
onStoreCollectionValidation: function(sc){
if (!this.hasStoreCollectionLoaded){
return;
@@ -90,6 +144,10 @@ Ext4.define('EHR.panel.DataEntryPanel', {
this.updateDirtyStateMessage();
+ if (this.storeCollection && this.storeCollection.validationRequestsInFlight > 0){
+ return;
+ }
+
var maxSeverity = sc.getMaxErrorSeverity();
if(EHR.debug && maxSeverity)
@@ -276,6 +334,19 @@ Ext4.define('EHR.panel.DataEntryPanel', {
},
items: this.getItemConfig(),
dockedItems: [{
+ xtype: 'toolbar',
+ dock: 'bottom',
+ itemId: 'validationIndicator',
+ hidden: true,
+ border: false,
+ plain: true,
+ style: 'background-color: transparent; padding: 12px 0 0 0;',
+ items: [{
+ xtype: 'container',
+ html: ' Validating...',
+ style: 'font: bold 13px tahoma,arial,verdana,sans-serif; line-height: 16px; color: #C33;'
+ }]
+ },{
xtype: 'toolbar',
dock: 'bottom',
ui: 'footer',
@@ -509,6 +580,29 @@ Ext4.define('EHR.panel.DataEntryPanel', {
return this.dirtyStateArea;
},
+ getErrorPanel: function(){
+ if (!this.errorPanel || this.errorPanel.isDestroyed){
+ this.errorPanel = this.down('#errorPanel');
+ }
+
+ return this.errorPanel;
+ },
+
+ getValidationIndicator: function(){
+ if (!this.validationIndicator || this.validationIndicator.isDestroyed){
+ this.validationIndicator = this.down('#validationIndicator');
+ }
+
+ return this.validationIndicator;
+ },
+
+ setValidationIndicatorVisible: function(visible){
+ var indicator = this.getValidationIndicator();
+ if (indicator){
+ indicator.setVisible(visible);
+ }
+ },
+
getButtons: function(){
var buttons = [{
xtype: 'container',
diff --git a/ehr/src/org/labkey/ehr/EHRManager.java b/ehr/src/org/labkey/ehr/EHRManager.java
index 085213cd3..63b92bb2c 100644
--- a/ehr/src/org/labkey/ehr/EHRManager.java
+++ b/ehr/src/org/labkey/ehr/EHRManager.java
@@ -136,6 +136,8 @@ public class EHRManager
public static final String EXPERIMENTAL_REACT_PARTICIPANT_REPORTS = "ehrReactParticipantReports";
+ public static final String EXPERIMENTAL_SUBMIT_ENABLED_ON_VALIDATION = "ehrSubmitEnabledDuringValidation";
+
// Column name constants to reduce hardcoding
private static final class ColumnNames
{
diff --git a/ehr/src/org/labkey/ehr/EHRModule.java b/ehr/src/org/labkey/ehr/EHRModule.java
index acb836e9e..953be0a11 100644
--- a/ehr/src/org/labkey/ehr/EHRModule.java
+++ b/ehr/src/org/labkey/ehr/EHRModule.java
@@ -135,7 +135,7 @@ public String getName()
@Override
public @Nullable Double getSchemaVersion()
{
- return 26.002;
+ return 26.003;
}
@Override
@@ -296,6 +296,11 @@ public void moduleStartupComplete(ServletContext servletContext)
"Use React EHR participant history",
"Links on animal Ids will go to the new React participant history.",
false);
+
+ OptionalFeatureService.get().addExperimentalFeatureFlag(EHRManager.EXPERIMENTAL_SUBMIT_ENABLED_ON_VALIDATION,
+ "Enable 'Submit' buttons during validation",
+ "User can submit form while validation is in progress",
+ false);
}
@Override
@@ -337,6 +342,9 @@ public JSONObject getPageContextJson(ContainerUser context)
// Expose the experimental React participant reports flag to client-side JavaScript
ret.put("isReactAnimalHistoryEnabled", AppProps.getInstance().isOptionalFeatureEnabled(EHRManager.EXPERIMENTAL_REACT_PARTICIPANT_REPORTS));
+ // Expose the experimental 'submit enabled on validation' flag to client-side JavaScript
+ ret.put("isSubmitEnabledOnValidation", AppProps.getInstance().isOptionalFeatureEnabled(EHRManager.EXPERIMENTAL_SUBMIT_ENABLED_ON_VALIDATION));
+
if (map.containsKey(EHRManager.EHRStudyContainerPropName) && map.get(EHRManager.EHRStudyContainerPropName) != null)
{
User u = context.getUser();
diff --git a/ehr/src/org/labkey/ehr/table/DefaultEHRCustomizer.java b/ehr/src/org/labkey/ehr/table/DefaultEHRCustomizer.java
index b46909ce3..c3bcfe483 100644
--- a/ehr/src/org/labkey/ehr/table/DefaultEHRCustomizer.java
+++ b/ehr/src/org/labkey/ehr/table/DefaultEHRCustomizer.java
@@ -1796,75 +1796,47 @@ private void appendAgeAtTimeCol(UserSchema ehrSchema, AbstractTableInfo ds, fina
@Override
public TableInfo getLookupTableInfo()
{
- String name = queryName + "_ageAtTime";
+ String lookupQueryName = queryName + "_ageAtTime";
+ String dateSql = "c." + FieldKey.fromString(dateColName).toSQLString();
+ String pkSql = "c." + pkCol.getFieldKey().toSQLString();
UserSchema targetSchema = ds.getUserSchema().getDefaultSchema().getUserSchema(targetSchemaName);
- QueryDefinition qd = QueryService.get().createQueryDef(u, targetSchemaContainer, targetSchema, name);
+ QueryDefinition qd = QueryService.get().createQueryDef(u, targetSchemaContainer, targetSchema, lookupQueryName);
+ // Compute the "as-of" date once: clamp to lastDayAtCenter when the record is after the animal left the center.
+ // All downstream age expressions reference x.effDate, so the clamp lives in one place.
//NOTE: do not need to account for QCstate b/c study.demographics only allows 1 row per subject
- qd.setSql("SELECT\n" +
- "c." + pkCol.getFieldKey().toSQLString() + ",\n" +
- "\n" +
- "CAST(\n" +
- "CASE\n" +
- "WHEN d.birth is null or c." + dateColName + " is null\n" +
- " THEN null\n" +
- "WHEN (d.lastDayAtCenter IS NOT NULL AND d.lastDayAtCenter < c." + dateColName + ") THEN\n" +
- " ROUND(CONVERT(age_in_months(d.birth, d.lastDayAtCenter), DOUBLE) / 12, 1)\n" +
- "ELSE\n" +
- " ROUND(CONVERT(age_in_months(d.birth, CAST(c." + dateColName + " as DATE)), DOUBLE) / 12, 1)\n" +
- "END AS float) as AgeAtTime,\n" +
- "\n" +
-
- "CAST(\n" +
- "CASE\n" +
- "WHEN d.birth is null or c." + dateColName + " is null\n" +
- " THEN null\n" +
- "WHEN (d.lastDayAtCenter IS NOT NULL AND d.lastDayAtCenter < c." + dateColName + ") THEN\n" +
- " ROUND(CONVERT(timestampdiff('SQL_TSI_DAY', d.birth, d.lastDayAtCenter), DOUBLE) / 365.25, 2)\n" +
- "ELSE\n" +
- " ROUND(CONVERT(timestampdiff('SQL_TSI_DAY', d.birth, CAST(c." + dateColName + " as DATE)), DOUBLE) / 365.25, 2)\n" +
- "END AS float) as AgeAtTimeYears,\n" +
- "\n" +
- "CAST(\n" +
- "CASE\n" +
- "WHEN d.birth is null or c." + dateColName + " is null\n" +
- " THEN null\n" +
- "WHEN (d.lastDayAtCenter IS NOT NULL AND d.lastDayAtCenter < c." + dateColName + ") THEN\n" +
- " floor(age(d.birth, d.lastDayAtCenter))\n" +
- "ELSE\n" +
- " floor(age(d.birth, CAST(c." + dateColName + " as DATE)))\n" +
- "END AS float) as AgeAtTimeYearsRounded,\n" +
- "\n" +
- //Added 'Age at time Days' by kollil on 02/15/2019
- "CAST(\n" +
- "CASE\n" +
- "WHEN d.birth is null or c." + dateColName + " is null\n" +
- " THEN null\n" +
- "WHEN (d.lastDayAtCenter IS NOT NULL AND d.lastDayAtCenter < c." + dateColName + ") THEN\n" +
- " CONVERT(TIMESTAMPDIFF('SQL_TSI_DAY',d.birth, d.lastDayAtCenter), INTEGER)\n" +
- "ELSE\n" +
- " CONVERT(TIMESTAMPDIFF('SQL_TSI_DAY',d.birth, CAST(c." + dateColName + " AS DATE)), INTEGER)\n" +
- "END AS float) as AgeAtTimeDays,\n" +
- "\n" +
- //
- "CAST(\n" +
- "CASE\n" +
- "WHEN d.birth is null or c." + dateColName + " is null\n" +
- " THEN null\n" +
- "WHEN (d.lastDayAtCenter IS NOT NULL AND d.lastDayAtCenter < c." + dateColName + ") THEN\n" +
- " CONVERT(age_in_months(d.birth, d.lastDayAtCenter), INTEGER)\n" +
- "ELSE\n" +
- " CONVERT(age_in_months(d.birth, CAST(c." + dateColName + " AS DATE)), INTEGER)\n" +
- "END AS float) as AgeAtTimeMonths,\n" +
- //NOTE: written as subselect so we ensure a single row returned in case data in ehr_lookups.ageclass has rows that allow dupes
- "(SELECT ac.ageclass FROM ehr_lookups.ageclass ac\n" +
- " WHERE " +
- " (CONVERT(age_in_months(d.birth, COALESCE(d.lastDayAtCenter, now())), DOUBLE) / 12) >= ac.\"min\" AND\n" +
- " ((CONVERT(age_in_months(d.birth, COALESCE(d.lastDayAtCenter, now())), DOUBLE) / 12) < ac.\"max\" OR ac.\"max\" is null) AND\n" +
- " d.species = ac.species AND\n" +
- " (d.gender = ac.gender OR ac.gender IS NULL)\n" +
- ") AS AgeClassAtTime \n" +
- "FROM \"" + schemaName + "\".\"" + queryName + "\" c " +
- "LEFT JOIN \"" + ehrPath + "\".study.demographics d ON (d.Id = c." + idCol.getFieldKey().toSQLString() + ")"
+ String pkAlias = pkCol.getFieldKey().toSQLString();
+ qd.setSql(
+ "SELECT\n" +
+ " x." + pkAlias + ",\n" +
+ " CAST(CASE WHEN x.birth IS NULL OR x.effDate IS NULL THEN NULL\n" +
+ " ELSE ROUND(CONVERT(age_in_months(x.birth, x.effDate), DOUBLE) / 12, 1) END AS float) AS AgeAtTime,\n" +
+ " CAST(CASE WHEN x.birth IS NULL OR x.effDate IS NULL THEN NULL\n" +
+ " ELSE ROUND(CONVERT(age_in_days(x.birth, x.effDate), DOUBLE) / 365.25, 2) END AS float) AS AgeAtTimeYears,\n" +
+ " CAST(CASE WHEN x.birth IS NULL OR x.effDate IS NULL THEN NULL\n" +
+ " ELSE floor(age(x.birth, x.effDate)) END AS float) AS AgeAtTimeYearsRounded,\n" +
+ " CAST(CASE WHEN x.birth IS NULL OR x.effDate IS NULL THEN NULL\n" +
+ " ELSE age_in_days(x.birth, x.effDate) END AS float) AS AgeAtTimeDays,\n" +
+ " CAST(CASE WHEN x.birth IS NULL OR x.effDate IS NULL THEN NULL\n" +
+ " ELSE CONVERT(age_in_months(x.birth, x.effDate), INTEGER) END AS float) AS AgeAtTimeMonths,\n" +
+ //NOTE: written as subselect so we ensure a single row returned in case data in ehr_lookups.ageclass has rows that allow dupes
+ " (SELECT ac.ageclass FROM ehr_lookups.ageclass ac\n" +
+ " WHERE (CONVERT(age_in_months(x.birth, x.effDate), DOUBLE) / 12) >= ac.\"min\"\n" +
+ " AND ((CONVERT(age_in_months(x.birth, x.effDate), DOUBLE) / 12) < ac.\"max\" OR ac.\"max\" IS NULL)\n" +
+ " AND x.species = ac.species\n" +
+ " AND (x.gender = ac.gender OR ac.gender IS NULL)\n" +
+ " ) AS AgeClassAtTime\n" +
+ "FROM (\n" +
+ " SELECT\n" +
+ " " + pkSql + " AS " + pkAlias + ",\n" +
+ " d.birth AS birth,\n" +
+ " d.species AS species,\n" +
+ " d.gender AS gender,\n" +
+ " CASE WHEN (d.lastDayAtCenter IS NOT NULL AND d.lastDayAtCenter < " + dateSql + ")\n" +
+ " THEN d.lastDayAtCenter\n" +
+ " ELSE CAST(" + dateSql + " AS DATE) END AS effDate\n" +
+ " FROM \"" + schemaName + "\".\"" + queryName + "\" c\n" +
+ " LEFT JOIN \"" + ehrPath + "\".study.demographics d ON (d.Id = c." + idCol.getFieldKey().toSQLString() + ")\n" +
+ ") x"
);
qd.setIsTemporary(true);
@@ -1877,12 +1849,17 @@ public TableInfo getLookupTableInfo()
{
_log.warn(e.getMessage(), e);
}
+ return null;
}
if (ti != null)
{
- ((BaseColumnInfo)ti.getColumn(pkCol.getName())).setHidden(true);
- ((BaseColumnInfo)ti.getColumn(pkCol.getName())).setKeyField(true);
+ ColumnInfo pk = ti.getColumn(pkCol.getName());
+ if (pk instanceof BaseColumnInfo basePk)
+ {
+ basePk.setHidden(true);
+ basePk.setKeyField(true);
+ }
}
else
{
@@ -1891,7 +1868,7 @@ public TableInfo getLookupTableInfo()
if (demographics != null)
{
_log.warn("Demographics table columns: ");
- _log.warn(targetSchema.getTable("demographics").getColumnNameSet());
+ _log.warn(demographics.getColumnNameSet());
}
}
diff --git a/ehr_billing/resources/schemas/dbscripts/postgresql/ehr_billing-26.000-26.001.sql b/ehr_billing/resources/schemas/dbscripts/postgresql/ehr_billing-26.000-26.001.sql
new file mode 100644
index 000000000..21c37d565
--- /dev/null
+++ b/ehr_billing/resources/schemas/dbscripts/postgresql/ehr_billing-26.000-26.001.sql
@@ -0,0 +1,6 @@
+-- Dropping unique_invoice_num [invoiceNumber] because it overlaps with pk_ehr_billing_invoice_invnum [invoiceNumber]
+ALTER TABLE ehr_billing.invoice DROP CONSTRAINT unique_invoice_num;
+-- Dropping ix_ehr_billing_invoice_invoicenumber [invoiceNumber] because it overlaps with pk_ehr_billing_invoice_invnum [invoiceNumber]
+DROP INDEX ehr_billing.ix_ehr_billing_invoice_invoicenumber;
+-- Dropping uq_ehr_billing_invoice_invoicenumber [invoiceNumber] because it overlaps with pk_ehr_billing_invoice_invnum [invoiceNumber]
+ALTER TABLE ehr_billing.invoice DROP CONSTRAINT uq_ehr_billing_invoice_invoicenumber;
diff --git a/ehr_billing/src/org/labkey/ehr_billing/EHR_BillingModule.java b/ehr_billing/src/org/labkey/ehr_billing/EHR_BillingModule.java
index 2599c5c76..f1c2d6f35 100644
--- a/ehr_billing/src/org/labkey/ehr_billing/EHR_BillingModule.java
+++ b/ehr_billing/src/org/labkey/ehr_billing/EHR_BillingModule.java
@@ -63,7 +63,7 @@ public String getName()
@Override
public @Nullable Double getSchemaVersion()
{
- return 26.000;
+ return 26.001;
}
@Override
diff --git a/snd/.babelrc b/snd/.babelrc
deleted file mode 100644
index ad2ef38ba..000000000
--- a/snd/.babelrc
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "presets": [["env", {
- "targets": {
- "browsers": ["> 0.2%", "last 2 versions", "Firefox 45", "not dead"]
- }
- }
- ], "react"],
- "env": {
- "development": {
- "presets": ["react-hmre"]
- },
- "test": {
- "plugins": ["transform-es2015-modules-commonjs"]
- }
- }
-}
\ No newline at end of file
diff --git a/snd/.gitattributes b/snd/.gitattributes
deleted file mode 100644
index 176a458f9..000000000
--- a/snd/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-* text=auto
diff --git a/snd/.gitignore b/snd/.gitignore
deleted file mode 100644
index 5e42d202c..000000000
--- a/snd/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-node_modules
-app.css
-app.css.map
-app.js
-app.js.map
-.labkey
-import
-resources/web/snd/app/style.js
-.gradle
diff --git a/snd/LICENSE.txt b/snd/LICENSE.txt
deleted file mode 100644
index 8f71f43fe..000000000
--- a/snd/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "{}"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright {yyyy} {name of copyright owner}
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
diff --git a/snd/README.md b/snd/README.md
deleted file mode 100644
index bf6f1a43e..000000000
--- a/snd/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# snd
\ No newline at end of file
diff --git a/snd/api-src/org/labkey/api/snd/AttributeData.java b/snd/api-src/org/labkey/api/snd/AttributeData.java
deleted file mode 100644
index 2e24a8afc..000000000
--- a/snd/api-src/org/labkey/api/snd/AttributeData.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 2018 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.labkey.api.snd;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.json.JSONObject;
-import org.labkey.api.data.Container;
-import org.labkey.api.gwt.client.model.GWTPropertyDescriptor;
-import org.labkey.api.query.ValidationException;
-import org.labkey.api.security.User;
-
-/**
- * Class for attribute data and related methods. Used in EventData class
- */
-public class AttributeData
-{
- private int _propertyId = -1;
- private String _propertyName;
- private GWTPropertyDescriptor _propertyDescriptor;
- private String _value;
- private ValidationException _exception;
-
- public static final String ATTRIBUTE_DATA_PROPERTY_ID = "propertyId";
- public static final String ATTRIBUTE_DATA_PROPERTY_NAME = "propertyName";
- public static final String ATTRIBUTE_DATA_PROPERTY_DESCRIPTOR = "propertyDescriptor";
- public static final String ATTRIBUTE_DATA_VALUE = "value";
-
- public static final String ATTRIBUTE_DATA_CSS_CLASS = "snd-attribute-data";
-
- public static final String DATE_TIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss"; // ISO8601 w/24-hour time and 'T' character
- public static final String DATE_FORMAT = "yyyy-MM-dd"; // ISO8601
-
- public AttributeData(int propertyId, @Nullable GWTPropertyDescriptor propertyDescriptor, @Nullable String value)
- {
- _propertyId = propertyId;
- _propertyDescriptor = propertyDescriptor;
- _value = value;
- }
-
- public AttributeData(String propertyName, @Nullable GWTPropertyDescriptor propertyDescriptor, @Nullable String value)
- {
- _propertyName = propertyName;
- _propertyDescriptor = propertyDescriptor;
- _value = value;
- }
-
- public AttributeData()
- {}
-
- public int getPropertyId()
- {
- return _propertyId;
- }
-
- public void setPropertyId(int propertyId)
- {
- _propertyId = propertyId;
- }
-
- public String getPropertyName()
- {
- return _propertyName;
- }
-
- public void setPropertyName(String propertyName)
- {
- _propertyName = propertyName;
- }
-
- public ValidationException getException()
- {
- return _exception;
- }
-
- public void setException(Event event, ValidationException exception)
- {
- _exception = exception;
- event.updateExceptionCount(exception);
- }
-
- @Nullable
- public GWTPropertyDescriptor getPropertyDescriptor()
- {
- return _propertyDescriptor;
- }
-
- public void setPropertyDescriptor(GWTPropertyDescriptor propertyDescriptor)
- {
- _propertyDescriptor = propertyDescriptor;
- }
-
- @Nullable
- public String getValue()
- {
- return _value;
- }
-
- public void setValue(String value)
- {
- _value = value;
- }
-
- @NotNull
- public JSONObject toJSON(Container c, User u)
- {
- JSONObject json = new JSONObject();
- if (getPropertyId() != 0)
- json.put(ATTRIBUTE_DATA_PROPERTY_ID, getPropertyId());
-
- if (getPropertyName() != null)
- json.put(ATTRIBUTE_DATA_PROPERTY_NAME, getPropertyName());
-
- if (getPropertyDescriptor() != null)
- json.put(ATTRIBUTE_DATA_PROPERTY_DESCRIPTOR, SNDService.get().convertPropertyDescriptorToJson(c, u, getPropertyDescriptor(), true));
-
- // We want to ensure the attribute is returned even if null
- json.put(ATTRIBUTE_DATA_VALUE, getValue() == null ? JSONObject.NULL : getValue());
-
- if (_exception != null)
- {
- JSONObject jsonException = new JSONObject();
- jsonException.put(Event.SND_EXCEPTION_MSG_JSON, _exception.getMessage());
- jsonException.put(Event.SND_EXCEPTION_SEVERITY_JSON, _exception.getSeverity());
- json.put(Event.SND_EXCEPTION_JSON, jsonException);
- }
-
- return json;
- }
-}
diff --git a/snd/api-src/org/labkey/api/snd/Category.java b/snd/api-src/org/labkey/api/snd/Category.java
deleted file mode 100644
index 8091ff902..000000000
--- a/snd/api-src/org/labkey/api/snd/Category.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 2018 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.labkey.api.snd;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.labkey.api.data.Container;
-import org.labkey.api.module.Module;
-import org.labkey.api.module.ModuleLoader;
-import org.labkey.api.security.HasPermission;
-import org.labkey.api.security.SecurableResource;
-import org.labkey.api.security.User;
-import org.labkey.api.util.GUID;
-
-import java.util.Collections;
-import java.util.List;
-
-public class Category implements SecurableResource, HasPermission
-{
- private int _categoryId;
- private String _description;
- private boolean _active;
- private GUID _objectId;
- private Container _container;
-
- public int getCategoryId()
- {
- return _categoryId;
- }
-
- public void setCategoryId(int categoryId)
- {
- _categoryId = categoryId;
- }
-
- public String getDescription()
- {
- return _description;
- }
-
- public void setDescription(String description)
- {
- _description = description;
- }
-
- public boolean isActive()
- {
- return _active;
- }
-
- public void setActive(boolean active)
- {
- _active = active;
- }
-
- public GUID getObjectId()
- {
- return _objectId;
- }
-
- public void setObjectId(GUID objectId)
- {
- _objectId = objectId;
- }
-
- public Container getContainer()
- {
- return _container;
- }
-
- public void setContainer(Container container)
- {
- _container = container;
- }
-
- @Override
- public @NotNull String getResourceId()
- {
- return _objectId.toString();
- }
-
- @Override
- public @NotNull String getResourceName()
- {
- return "SND.Category." + _categoryId;
- }
-
- @Override
- public @NotNull String getResourceDescription()
- {
- return _description;
- }
-
- @Override
- public @NotNull Module getSourceModule()
- {
- return ModuleLoader.getInstance().getModule("SND");
- }
-
- @Override
- public @Nullable SecurableResource getParentResource()
- {
- return null;
- }
-
- @Override
- public @NotNull Container getResourceContainer()
- {
- return _container;
- }
-
- @Override
- public @NotNull List getChildResources(User user)
- {
- return Collections.emptyList();
- }
-
- @Override
- public boolean mayInheritPolicy()
- {
- return false;
- }
-}
diff --git a/snd/api-src/org/labkey/api/snd/Event.java b/snd/api-src/org/labkey/api/snd/Event.java
deleted file mode 100644
index f1b307c2e..000000000
--- a/snd/api-src/org/labkey/api/snd/Event.java
+++ /dev/null
@@ -1,489 +0,0 @@
-/*
- * Copyright (c) 2018 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.labkey.api.snd;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.labkey.api.collections.ArrayListMap;
-import org.labkey.api.data.Container;
-import org.labkey.api.gwt.client.model.GWTPropertyDescriptor;
-import org.labkey.api.query.BatchValidationException;
-import org.labkey.api.query.ValidationException;
-import org.labkey.api.security.User;
-import org.labkey.api.util.DateUtil;
-
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-import static org.labkey.api.snd.EventNarrativeOption.HTML_NARRATIVE;
-import static org.labkey.api.snd.EventNarrativeOption.REDACTED_HTML_NARRATIVE;
-import static org.labkey.api.snd.EventNarrativeOption.REDACTED_TEXT_NARRATIVE;
-import static org.labkey.api.snd.EventNarrativeOption.TEXT_NARRATIVE;
-
-/**
- * Class for event data and related methods. Used when saving, updating, deleting and getting an event
- */
-public class Event
-{
- private Integer _eventId;
- private String _subjectId;
- private Date _date;
- private String _projectIdRev;
- private String _note;
- private Integer _noteId;
- private List _eventData;
- private String _parentObjectId;
- private Map narratives;
- private Map _extraFields = new HashMap<>();
- private Integer _qcState;
- private String _objectId;
-
- // This will store a count of the different severity of exceptions
- private final Map _exceptionCount = new HashMap<>();
- private ValidationException _eventException = null;
-
- public static final String EVENT_ID = "eventId";
- public static final String EVENT_SUBJECT_ID = "subjectId";
- public static final String EVENT_DATE = "date";
- public static final String EVENT_PROJECT_ID_REV = "projectIdRev";
- public static final String EVENT_NOTE = "note";
- public static final String EVENT_QCSTATE = "qcState";
- public static final String EVENT_DATA = "eventData";
- public static final String EVENT_PARENT_OBJECTID = "parentObjectId";
- public static final String EVENT_CONTAINER = "Container";
- public static final String EVENT_OBJECTID = "ObjectId";
-
- public static final String DATE_TIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss"; // ISO8601 w/24-hour time and 'T' character
-
- public static final String SND_EVENT_NAMESPACE = "SND.EventData";
-
- public static final String SND_EVENT_DATE_CSS_CLASS = "snd-event-date";
- public static final String SND_EVENT_SUBJECT_CSS_CLASS = "snd-event-subject";
- public static final String SND_EVENT_NOTE_CSS_CLASS = "snd-event-note";
-
- public static final String SND_EXCEPTION_MSG_JSON = "message";
- public static final String SND_EXCEPTION_SEVERITY_JSON = "severity";
- public static final String SND_EXCEPTION_JSON = "exception";
-
- public Event(@Nullable Integer eventId, String subjectId, @Nullable Date date, @NotNull String projectIdRev, @Nullable String note, @Nullable List eventData, @NotNull Container c, @Nullable String objectId)
- {
- _eventId = eventId != null ? eventId : SNDSequencer.EVENTID.ensureId(c, null);
- _subjectId = subjectId;
- _date = date;
- _projectIdRev = projectIdRev;
- _note = note;
- _eventData = eventData;
- _noteId = SNDSequencer.EVENTID.ensureId(c, null);
- _objectId = objectId;
- }
-
- public Event () {}
-
- @Nullable
- public Integer getEventId()
- {
- return _eventId;
- }
-
- public void setEventId(Integer eventId)
- {
- _eventId = eventId;
- }
-
- public String getSubjectId()
- {
- return _subjectId;
- }
-
- public void setSubjectId(String subjectId)
- {
- _subjectId = subjectId;
- }
-
- @Nullable
- public Date getDate()
- {
- return _date;
- }
-
- public void setDate(Date date)
- {
- _date = date;
- }
-
- @Nullable
- public String getProjectIdRev()
- {
- return _projectIdRev;
- }
-
- public void setProjectIdRev(String projectIdRev)
- {
- _projectIdRev = projectIdRev;
- }
-
- @Nullable
- public String getParentObjectId()
- {
- return _parentObjectId;
- }
-
- public void setParentObjectId(String parentObjectId)
- {
- _parentObjectId = parentObjectId;
- }
-
- @Nullable
- public String getNote()
- {
- return _note;
- }
-
- public void setNote(String note)
- {
- _note = note;
- }
-
- @Nullable
- public Integer getNoteId()
- {
- return _noteId;
- }
-
- public void setNoteId(Integer noteId)
- {
- _noteId = noteId;
- }
-
- @Nullable
- public List getEventData()
- {
- return _eventData;
- }
-
- public void setEventData(List eventData)
- {
- _eventData = eventData;
- }
-
- @NotNull
- public Map getExtraFields()
- {
- return _extraFields;
- }
-
- public void setExtraFields(@NotNull Map extraFields)
- {
- _extraFields = extraFields;
- }
-
- public Map getNarratives()
- {
- return narratives;
- }
-
- public void setNarratives(Map narratives)
- {
- this.narratives = narratives;
- }
-
- public Integer getQcState()
- {
- return _qcState;
- }
-
- @Nullable
- public QCStateEnum getQcState(Container c, User u)
- {
- if (_qcState == null)
- {
- return null;
- }
-
- return SNDService.get().getQCState(c, u, _qcState);
- }
-
- public void setQcState(Integer qcState)
- {
- _qcState = qcState;
- }
-
- public void setQcState(Container c, User u, QCStateEnum qcState)
- {
- _qcState = SNDService.get().getQCStateId(c, u, qcState);
- }
-
- public String getObjectId()
- {
- return _objectId;
- }
-
- public void setObjectId(String objectId)
- {
- _objectId = objectId;
- }
-
- public ValidationException getException()
- {
- return _eventException;
- }
-
- public void setException(ValidationException eventException)
- {
- _eventException = eventException;
- }
-
- public Map getExceptionCountMap()
- {
- return _exceptionCount;
- }
-
- public void updateExceptionCount(ValidationException e)
- {
- Integer count = _exceptionCount.get(e.getSeverity());
- if (count != null)
- {
- count++;
- }
- else
- {
- count = 1;
- }
-
- _exceptionCount.put(e.getSeverity(), count);
- }
-
- public Integer getErrorCount()
- {
- Integer count = _exceptionCount.get(ValidationException.SEVERITY.ERROR);
- return count == null ? 0 : count;
- }
-
- public void addBatchValidationExceptions(BatchValidationException bve)
- {
- int count;
- for (ValidationException ve : bve.getRowErrors())
- {
- count = 0;
- if (_exceptionCount.get(ve.getSeverity()) != null)
- {
- count = _exceptionCount.get(ve.getSeverity()) + 1;
- }
- _exceptionCount.put(ve.getSeverity(), count);
- if (ve.getSeverity() == ValidationException.SEVERITY.ERROR)
- _eventException = ve;
- }
- }
-
- public boolean hasErrors()
- {
- Integer count = _exceptionCount.get(ValidationException.SEVERITY.ERROR);
- if (count != null && count > 0)
- return true;
-
- return (_eventException != null && _eventException.getSeverity() == ValidationException.SEVERITY.ERROR);
- }
-
- public boolean hasErrorsWarningsOrInfo()
- {
- Integer errorCount = _exceptionCount.get(ValidationException.SEVERITY.ERROR);
- Integer warningCount = _exceptionCount.get(ValidationException.SEVERITY.WARN);
- Integer infoCount = _exceptionCount.get(ValidationException.SEVERITY.INFO);
- if ((errorCount != null && errorCount > 0) || (warningCount != null && warningCount > 0) || (infoCount != null && infoCount > 0))
- return true;
-
- return (_eventException != null);
- }
-
- @NotNull
- public Map getEventRow(Container c)
- {
- Map eventValues = new ArrayListMap<>();
- if (getEventId() != null)
- eventValues.put(EVENT_ID, getEventId());
-
- eventValues.put(EVENT_SUBJECT_ID, getSubjectId());
- eventValues.put(EVENT_DATE, getDate());
- eventValues.put(EVENT_PARENT_OBJECTID, getParentObjectId());
- eventValues.put(EVENT_QCSTATE, getQcState());
- eventValues.put(EVENT_CONTAINER, c.getId());
- eventValues.put(EVENT_OBJECTID, getObjectId());
-
- Map extras = getExtraFields();
- for (GWTPropertyDescriptor gpd : extras.keySet())
- {
- eventValues.put(gpd.getName(), extras.get(gpd));
- }
-
- return eventValues;
- }
-
- @NotNull
- public Map getEventNotesRow(Container c)
- {
- Map eventValues = new ArrayListMap<>();
- if (getEventId() != null)
- eventValues.put(EVENT_ID, getEventId());
-
- eventValues.put(EVENT_NOTE, getNote());
- eventValues.put(EVENT_CONTAINER, c.getId());
-
- return eventValues;
- }
-
- @NotNull
- public JSONObject toJSON(Container c, User u)
- {
- JSONObject json = new JSONObject();
- json.put(EVENT_ID, getEventId());
- json.put(EVENT_SUBJECT_ID, getSubjectId());
-
- if (getDate() != null)
- json.put(EVENT_DATE, DateUtil.formatDateTime(getDate(), DATE_TIME_FORMAT));
-
- json.put(EVENT_PROJECT_ID_REV, getProjectIdRev());
- json.put(EVENT_NOTE, getNote());
-
- if (_qcState != null)
- {
- json.put(EVENT_QCSTATE, getQcState(c, u).getName());
- }
- if (_objectId != null)
- {
- json.put(EVENT_OBJECTID, getObjectId());
- }
-
- JSONArray eventDataJson = new JSONArray();
- if (getEventData() != null)
- {
- for (EventData eventData : getEventData())
- {
- eventDataJson.put(eventData.toJSON(c, u));
- }
- }
- json.put(EVENT_DATA, eventDataJson);
-
- JSONArray extras = new JSONArray();
- Map extraFields = getExtraFields();
- if (extraFields != null)
- {
- JSONObject jsonExtra;
- Set keys = new TreeSet<>(
- Comparator.comparing(GWTPropertyDescriptor::getName)
- );
- keys.addAll(extraFields.keySet());
- for (GWTPropertyDescriptor extraPd : keys)
- {
- jsonExtra = SNDService.get().convertPropertyDescriptorToJson(c, u, extraPd, true);
- jsonExtra.put("value", extraFields.get(extraPd));
- extras.put(jsonExtra);
- }
-
- json.put("extraFields", extras);
- }
-
- if (_eventException != null)
- {
- JSONObject jsonException = new JSONObject();
- jsonException.put(Event.SND_EXCEPTION_MSG_JSON, _eventException.getMessage());
- jsonException.put(Event.SND_EXCEPTION_SEVERITY_JSON, _eventException.getSeverity());
- json.put(Event.SND_EXCEPTION_JSON, jsonException);
- }
- else
- {
- StringBuilder msg = new StringBuilder();
- Integer count = _exceptionCount.get(ValidationException.SEVERITY.ERROR);
- ValidationException.SEVERITY severity = null;
- if (count != null && count > 0)
- {
- severity = ValidationException.SEVERITY.ERROR;
- msg.append(count + " error");
- if (count > 1)
- msg.append("s");
- }
-
- count = _exceptionCount.get(ValidationException.SEVERITY.WARN);
- if (count != null && count > 0)
- {
- if (severity == null)
- severity = ValidationException.SEVERITY.WARN;
-
- if (!msg.isEmpty())
- msg.append(", ");
-
- msg.append(count + " warning");
- if (count > 1)
- msg.append("s");
- }
-
- count = _exceptionCount.get(ValidationException.SEVERITY.INFO);
- if (count != null && count > 0)
- {
- if (severity == null)
- severity = ValidationException.SEVERITY.INFO;
-
- if (!msg.isEmpty())
- msg.append(", ");
-
- msg.append(count + " info");
- if (count > 1)
- msg.append("s");
- }
-
- if (!msg.isEmpty())
- {
- msg.append(" found");
-
- JSONObject jsonException = new JSONObject();
- jsonException.put(Event.SND_EXCEPTION_MSG_JSON, msg.toString());
- jsonException.put(Event.SND_EXCEPTION_SEVERITY_JSON, severity);
- json.put(Event.SND_EXCEPTION_JSON, jsonException);
- }
- }
- Map narratives = getNarratives();
- if (narratives != null)
- {
- for (EventNarrativeOption narrativeOption : narratives.keySet())
- {
- String narrative = narratives.get(narrativeOption);
- switch (narrativeOption)
- {
- case TEXT_NARRATIVE:
- json.put(TEXT_NARRATIVE.getKey(), narrative);
- break;
- case REDACTED_TEXT_NARRATIVE:
- json.put(REDACTED_TEXT_NARRATIVE.getKey(), narrative);
- break;
- case HTML_NARRATIVE:
- json.put(HTML_NARRATIVE.getKey(), narrative);
- break;
- case REDACTED_HTML_NARRATIVE:
- json.put(REDACTED_HTML_NARRATIVE.getKey(), narrative);
- break;
- }
- }
- }
-
- return json;
- }
-}
diff --git a/snd/api-src/org/labkey/api/snd/EventData.java b/snd/api-src/org/labkey/api/snd/EventData.java
deleted file mode 100644
index a764eab22..000000000
--- a/snd/api-src/org/labkey/api/snd/EventData.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Copyright (c) 2018 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.labkey.api.snd;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.labkey.api.collections.ArrayListMap;
-import org.labkey.api.data.Container;
-import org.labkey.api.gwt.client.model.GWTPropertyDescriptor;
-import org.labkey.api.query.ValidationException;
-import org.labkey.api.security.User;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-/**
- * Class for event data and related methods. Used in Event class
- */
-public class EventData
-{
- private Integer _eventDataId;
- private int _superPkgId;
- private int _eventId;
- private Integer _parentEventDataId;
- private Integer _sortOrder;
- private String _narrativeTemplate;
- private String _objectURI;
- private List _subPackages;
- private List _attributes = new ArrayList<>();
- private Map _extraFields = new HashMap<>();
- private ValidationException _exception;
-
- public static final String EVENT_DATA_ID = "eventDataId";
- public static final String EVENT_DATA_SUPER_PACKAGE_ID = "superPkgId";
- public static final String EVENT_DATA_NARRATIVE_TEMPLATE = "narrativeTemplate";
- public static final String EVENT_DATA_SUB_PACKAGES = "subPackages";
- public static final String EVENT_DATA_ATTRIBUTES = "attributes";
- public static final String EVENT_DATA_OBJECTURI = "objectURI";
- public static final String EVENT_DATA_EVENTID = "eventId";
- public static final String EVENT_DATA_PARENT_EVENTDATAID = "parentEventDataId";
- public static final String EVENT_DATA_SORT_ORDER = "sortOrder";
- public static final String EVENT_DATA_CONTAINER = "Container";
- public static final String EVENT_DATA_CSS_CLASS = "snd-event-data";
- public static final String EVENT_DATA_EXTRA_FIELDS = "extraFields";
-
- public EventData(@Nullable Integer eventDataId, int superPkgId, @Nullable String narrative, @Nullable List subPackages, @NotNull List attributes)
- {
- this(eventDataId, superPkgId, narrative, subPackages, attributes, null);
- }
- public EventData(@Nullable Integer eventDataId, int superPkgId, @Nullable String narrative, @Nullable List subPackages, @NotNull List attributes , @Nullable Integer sortOrder)
- {
- _eventDataId = eventDataId;
- _superPkgId = superPkgId;
- _narrativeTemplate = narrative;
- _subPackages = subPackages;
- _sortOrder = sortOrder;
-
- if (attributes != null)
- _attributes = attributes;
- }
- public EventData() {}
-
- @Nullable
- public Integer getEventDataId()
- {
- return _eventDataId;
- }
-
- public void setEventDataId(Integer eventDataId)
- {
- _eventDataId = eventDataId;
- }
-
- public int getSuperPkgId()
- {
- return _superPkgId;
- }
-
- public void setSuperPkgId(int superPkgId)
- {
- _superPkgId = superPkgId;
- }
-
- @Nullable
- public Integer getParentEventDataId()
- {
- return _parentEventDataId;
- }
-
- public void setParentEventDataId(Integer parentEventDataId)
- {
- _parentEventDataId = parentEventDataId;
- }
-
- @Nullable
- public String getNarrativeTemplate()
- {
- return _narrativeTemplate;
- }
-
- public void setNarrativeTemplate(String narrative)
- {
- _narrativeTemplate = narrative;
- }
-
- @Nullable
- public String getObjectURI()
- {
- return _objectURI;
- }
-
- public void setObjectURI(String objectURI)
- {
- _objectURI = objectURI;
- }
-
- public int getEventId()
- {
- return _eventId;
- }
-
- public void setEventId(int eventId)
- {
- _eventId = eventId;
- }
-
- public ValidationException getException()
- {
- return _exception;
- }
-
- public void setException(Event event, ValidationException exception)
- {
- _exception = exception;
- event.updateExceptionCount(exception);
- }
-
- public Integer getSortOrder()
- {
- return _sortOrder;
- }
-
- public void setSortOrder(Integer sortOrder)
- {
- _sortOrder = sortOrder;
- }
-
- @Nullable
- public List getSubPackages()
- {
- return _subPackages;
- }
-
- public void setSubPackages(List subPackages)
- {
- _subPackages = subPackages;
- }
-
- @NotNull
- public List getAttributes()
- {
- return _attributes;
- }
-
- public void setAttributes(@NotNull List attributes)
- {
- _attributes = attributes;
- }
-
- @NotNull
- public Map getExtraFields()
- {
- return _extraFields;
- }
-
- public void setExtraFields(@NotNull Map extraFields)
- {
- _extraFields = extraFields;
- }
-
- @NotNull
- public Map getEventDataRow(Container c)
- {
- Map eventDataValues = new ArrayListMap<>();
- eventDataValues.put(EVENT_DATA_ID, getEventDataId());
- eventDataValues.put(EVENT_DATA_SUPER_PACKAGE_ID, getSuperPkgId());
- eventDataValues.put(EVENT_DATA_OBJECTURI, getObjectURI());
- eventDataValues.put(EVENT_DATA_EVENTID, getEventId());
- eventDataValues.put(EVENT_DATA_PARENT_EVENTDATAID, getParentEventDataId());
- eventDataValues.put(EVENT_DATA_CONTAINER, c);
- eventDataValues.put(EVENT_DATA_SORT_ORDER, getSortOrder());
-
- Map extras = getExtraFields();
- for (GWTPropertyDescriptor gpd : extras.keySet())
- {
- eventDataValues.put(gpd.getName(), extras.get(gpd));
- }
-
- return eventDataValues;
- }
-
- @NotNull
- public JSONObject toJSON(Container c, User u)
- {
- JSONObject json = new JSONObject();
- json.put(EVENT_DATA_ID, getEventDataId());
- json.put(EVENT_DATA_SUPER_PACKAGE_ID, getSuperPkgId());
- json.put(EVENT_DATA_NARRATIVE_TEMPLATE, getNarrativeTemplate());
- json.put(EVENT_DATA_SORT_ORDER, getSortOrder());
-
- JSONArray subPackagesJson = new JSONArray();
- if (getSubPackages() != null)
- {
- for (EventData eventData : getSubPackages())
- {
- subPackagesJson.put(eventData.toJSON(c, u));
- }
- }
- json.put(EVENT_DATA_SUB_PACKAGES, subPackagesJson);
-
- JSONArray attributesJson = new JSONArray();
- if (getAttributes() != null)
- {
- for (AttributeData attributeData : getAttributes())
- {
- attributesJson.put(attributeData.toJSON(c, u));
- }
- }
- json.put(EVENT_DATA_ATTRIBUTES, attributesJson);
-
- JSONArray extras = new JSONArray();
- Map extraFields = getExtraFields();
- if(extraFields != null)
- {
- JSONObject jsonExtra;
- Set keys = new TreeSet<>(
- Comparator.comparing(GWTPropertyDescriptor::getName)
- );
- keys.addAll(extraFields.keySet());
- for (GWTPropertyDescriptor extraPd : keys)
- {
- jsonExtra = SNDService.get().convertPropertyDescriptorToJson(c, u, extraPd, true);
- jsonExtra.put("value", extraFields.get(extraPd));
- extras.put(jsonExtra);
- }
-
- json.put("extraFields", extras);
- }
-
- if (_exception != null)
- {
- JSONObject jsonException = new JSONObject();
- jsonException.put(Event.SND_EXCEPTION_MSG_JSON, _exception.getMessage());
- jsonException.put(Event.SND_EXCEPTION_SEVERITY_JSON, _exception.getSeverity());
- json.put(Event.SND_EXCEPTION_JSON, jsonException);
- }
-
- return json;
- }
-}
diff --git a/snd/api-src/org/labkey/api/snd/EventNarrativeOption.java b/snd/api-src/org/labkey/api/snd/EventNarrativeOption.java
deleted file mode 100644
index a1595408b..000000000
--- a/snd/api-src/org/labkey/api/snd/EventNarrativeOption.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2018 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.labkey.api.snd;
-
-public enum EventNarrativeOption
-{
- TEXT_NARRATIVE("textNarrative"),
- REDACTED_TEXT_NARRATIVE("redactedTextNarrative"),
- HTML_NARRATIVE("htmlNarrative"),
- REDACTED_HTML_NARRATIVE("redactedHtmlNarrative");
-
- private final String _key;
-
- EventNarrativeOption(String key)
- {
- _key = key;
- }
-
- public String getKey()
- {
- return _key;
- }
-}
diff --git a/snd/api-src/org/labkey/api/snd/EventNote.java b/snd/api-src/org/labkey/api/snd/EventNote.java
deleted file mode 100644
index f13a99d60..000000000
--- a/snd/api-src/org/labkey/api/snd/EventNote.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.labkey.api.snd;
-
-public class EventNote
-{
- private Integer _eventId;
- private String _note;
- private Integer _eventNoteId;
- private String _container;
-
- public static final String EVENT_ID = "eventId";
- public static final String NOTE = "note";
- public static final String EVENT_NOTE_ID = "eventNoteId";
- public static final String CONTAINER = "Container";
-
- public EventNote(Integer eventId, String note, Integer eventNoteId) {
- _eventId = eventId;
- _note = note;
- _eventNoteId = eventNoteId;
- }
-
- public EventNote () {}
-
- public Integer getEventId()
- {
- return _eventId;
- }
-
- public void setEventId(Integer eventId)
- {
- _eventId = eventId;
- }
-
- public String getNote() { return _note; }
-
- public void setNote(String note) { _note = note; }
-
- public Integer getEventNoteId() { return _eventNoteId; }
-
- public void setEventNoteId(Integer eventNoteId) { _eventNoteId = eventNoteId; }
-
-}
diff --git a/snd/api-src/org/labkey/api/snd/EventTrigger.java b/snd/api-src/org/labkey/api/snd/EventTrigger.java
deleted file mode 100644
index 2b16abea6..000000000
--- a/snd/api-src/org/labkey/api/snd/EventTrigger.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2018 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.labkey.api.snd;
-
-import org.labkey.api.data.Container;
-import org.labkey.api.security.User;
-
-import java.util.Map;
-
-public interface EventTrigger
-{
- void onInsert(Container c, User u, TriggerAction triggerAction, Map extraContext);
- void onUpdate(Container c, User u, TriggerAction triggerAction, Map extraContext);
- default Integer getOrder()
- {
- return null;
- }
-}
diff --git a/snd/api-src/org/labkey/api/snd/EventTriggerFactory.java b/snd/api-src/org/labkey/api/snd/EventTriggerFactory.java
deleted file mode 100644
index ee80b96bb..000000000
--- a/snd/api-src/org/labkey/api/snd/EventTriggerFactory.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2018 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.labkey.api.snd;
-
-import org.jetbrains.annotations.Nullable;
-
-public interface EventTriggerFactory
-{
- @Nullable EventTrigger createTrigger(String category);
-}
diff --git a/snd/api-src/org/labkey/api/snd/Package.java b/snd/api-src/org/labkey/api/snd/Package.java
deleted file mode 100644
index 172f4adfb..000000000
--- a/snd/api-src/org/labkey/api/snd/Package.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- * Copyright (c) 2017-2018 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.labkey.api.snd;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.labkey.api.collections.ArrayListMap;
-import org.labkey.api.collections.IntHashMap;
-import org.labkey.api.data.Container;
-import org.labkey.api.gwt.client.model.GWTPropertyDescriptor;
-import org.labkey.api.security.User;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
-/**
- * Created by marty on 8/4/2017.
- *
- * Class for package data and related methods. Used when saving, updating, deleting and getting a package
- */
-public class Package
-{
- private Integer _pkgId;
- private String _description;
- private String _narrative;
- private boolean _repeatable;
- private boolean _active;
- private boolean _hasEvent;
- private boolean _hasProject;
- private Date _modified; // column will be used as a timestamp
- private Map _categories = new IntHashMap<>();
- private List _attributes = new ArrayList<>();
- private List _subpackages = new ArrayList<>();
- private Map _extraFields = new HashMap<>();
- private Map _lookups = new TreeMap<>();
- private Integer _qcState;
- private Integer _topLevelSuperPkgId;
-
- public static final String PKG_ID = "pkgId";
- public static final String PKG_DESCRIPTION = "description";
- public static final String PKG_ACTIVE = "active";
- public static final String PKG_REPEATABLE = "repeatable";
- public static final String PKG_TOPLEVEL_SUPERPKG = "superPkgId";
- public static final String PKG_QCSTATE = "qcState";
- public static final String PKG_NARRATIVE = "narrative";
- public static final String PKG_CONTAINER = "container";
- public static final String PKG_HASEVENT = "hasEvent";
- public static final String PKG_HASPROJECT = "hasProject";
-
- public static final String PKG_CATEGORIES = "categories";
- public static final String PKG_ATTRIBUTES = "attributes";
- public static final String PKG_SUBPACKAGES = "subPackages";
- public static final String PKG_MODIFIED = "modified";
-
- @Nullable
- public Integer getPkgId()
- {
- return _pkgId;
- }
-
- public void setPkgId(int pkgId)
- {
- _pkgId = pkgId;
- }
-
- @Nullable
- public String getDescription()
- {
- return _description;
- }
-
- public void setDescription(String description)
- {
- _description = description;
- }
-
- @Nullable
- public String getNarrative()
- {
- return _narrative;
- }
-
- public void setNarrative(String narrative)
- {
- _narrative = narrative;
- }
-
- public boolean isRepeatable()
- {
- return _repeatable;
- }
-
- public void setRepeatable(boolean repeatable)
- {
- _repeatable = repeatable;
- }
-
- public boolean isActive()
- {
- return _active;
- }
-
- public void setActive(boolean active)
- {
- _active = active;
- }
-
- public boolean hasEvent()
- {
- return _hasEvent;
- }
-
- public void setHasEvent(boolean hasEvent)
- {
- _hasEvent = hasEvent;
- }
-
- public boolean hasProject()
- {
- return _hasProject;
- }
-
- public void setHasProject(boolean hasProject)
- {
- _hasProject = hasProject;
- }
-
- @NotNull
- public Map getCategories()
- {
- return _categories;
- }
-
- public void setCategories(@NotNull Map categories)
- {
- _categories = categories;
- }
-
- @NotNull
- public List getAttributes()
- {
- return _attributes;
- }
-
- public void setAttributes(@NotNull List attributes)
- {
- _attributes = attributes;
- }
-
- @NotNull
- public List getSubpackages()
- {
- return _subpackages;
- }
-
- public void setSubpackages(@NotNull List subpackages)
- {
- _subpackages = subpackages;
- }
-
- @NotNull
- public Map getExtraFields()
- {
- return _extraFields;
- }
-
- public void setExtraFields(@NotNull Map extraFields)
- {
- _extraFields = extraFields;
- }
-
- @NotNull
- public Map getLookups()
- {
- return _lookups;
- }
-
- public void setLookups(@NotNull Map lookups)
- {
- _lookups = lookups;
- }
-
- @Nullable
- public Integer getQcState()
- {
- return _qcState;
- }
-
- public void setQcState(Integer qcState)
- {
- _qcState = qcState;
- }
-
- public Date getModified()
- {
- return _modified;
- }
-
- public void setModified(Date modified)
- {
- _modified = modified;
- }
-
- @Nullable
- public Integer getTopLevelSuperPkgId()
- {
- return _topLevelSuperPkgId;
- }
-
- public void setTopLevelSuperPkgId(Integer topLevelSuperPkgId)
- {
- _topLevelSuperPkgId = topLevelSuperPkgId;
- }
-
- @NotNull
- public Map getPackageRow(Container c)
- {
- Map pkgValues = new ArrayListMap<>();
- pkgValues.put(PKG_ID, getPkgId());
- pkgValues.put(PKG_NARRATIVE, getNarrative());
- pkgValues.put(PKG_DESCRIPTION, getDescription());
- pkgValues.put(PKG_ACTIVE, isActive());
- pkgValues.put(PKG_REPEATABLE, isRepeatable());
- pkgValues.put(PKG_QCSTATE, getQcState());
- pkgValues.put(PKG_CONTAINER, c);
- pkgValues.put(PKG_MODIFIED, getModified());
-
- Map extras = getExtraFields();
- for (GWTPropertyDescriptor gpd : extras.keySet())
- {
- pkgValues.put(gpd.getName(), extras.get(gpd));
- }
-
- return pkgValues;
- }
-
- @NotNull
- public List> getCategoryRows(Container c)
- {
- List> rows = new ArrayList<>();
- Map row;
-
- for (Integer categoryId : getCategories().keySet())
- {
- row = new ArrayListMap<>();
- row.put(PKG_ID, getPkgId());
- row.put("categoryId", categoryId);
- row.put(PKG_CONTAINER, c);
- rows.add(row);
- }
-
- return rows;
- }
-
- @NotNull
- public JSONArray attributesToJson(Container c, User u)
- {
- JSONArray attributes = new JSONArray();
- if(getAttributes() != null)
- {
- for (GWTPropertyDescriptor pd : getAttributes())
- {
- attributes.put(SNDService.get().convertPropertyDescriptorToJson(c, u, pd, true));
- }
- }
-
- return attributes;
- }
-
- @NotNull
- public JSONObject toJSON(Container c, User u)
- {
- JSONObject json = new JSONObject();
- json.put(PKG_ID, getPkgId());
- json.put(PKG_DESCRIPTION, getDescription());
- json.put(PKG_REPEATABLE, isRepeatable());
- json.put(PKG_ACTIVE, isActive());
- json.put(PKG_NARRATIVE, getNarrative());
- json.put(PKG_HASEVENT, hasEvent());
- json.put(PKG_HASPROJECT, hasProject());
- json.put(PKG_QCSTATE, getQcState());
- json.put(PKG_TOPLEVEL_SUPERPKG, getTopLevelSuperPkgId());
- json.put(PKG_CONTAINER, c.getId());
- json.put(PKG_MODIFIED, getModified());
-
- JSONArray categories = new JSONArray();
-
- for (Integer categoryId : getCategories().keySet())
- {
- categories.put(categoryId);
- }
- json.put(PKG_CATEGORIES, categories);
-
-
- if (getAttributes() != null)
- {
- json.put(PKG_ATTRIBUTES, attributesToJson(c, u));
- }
-
- JSONArray subPackages = new JSONArray();
- if(getSubpackages() != null)
- {
- for (SuperPackage subPackage : getSubpackages())
- {
- subPackages.put(subPackage.toJSON(c, u));
- }
- json.put(PKG_SUBPACKAGES, subPackages);
- }
-
- JSONArray extras = new JSONArray();
- Map extraFields = getExtraFields();
- if(extraFields != null)
- {
- JSONObject jsonExtra;
- Set keys = new TreeSet<>(
- Comparator.comparing(GWTPropertyDescriptor::getName)
- );
- keys.addAll(extraFields.keySet());
- for (GWTPropertyDescriptor extraPd : keys)
- {
- jsonExtra = SNDService.get().convertPropertyDescriptorToJson(c, u, extraPd, true);
- jsonExtra.put("value", extraFields.get(extraPd));
- extras.put(jsonExtra);
- }
-
- json.put("extraFields", extras);
- }
-
- JSONArray lookups = new JSONArray();
- Map lookupMap = getLookups();
-
- JSONObject jsonLookup;
- for (String key : lookupMap.keySet())
- {
- jsonLookup = new JSONObject();
- jsonLookup.put("value", key);
- jsonLookup.put("label", lookupMap.get(key));
- lookups.put(jsonLookup);
- }
-
- json.put("attributeLookups", lookups);
-
- return json;
- }
-}
diff --git a/snd/api-src/org/labkey/api/snd/PackageDomainKind.java b/snd/api-src/org/labkey/api/snd/PackageDomainKind.java
deleted file mode 100644
index ae8cca691..000000000
--- a/snd/api-src/org/labkey/api/snd/PackageDomainKind.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2017-2018 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.labkey.api.snd;
-
-import org.labkey.api.data.Container;
-import org.labkey.api.data.ContainerType;
-import org.labkey.api.exp.XarContext;
-import org.labkey.api.exp.XarFormatException;
-import org.labkey.api.exp.xar.LsidUtils;
-import org.labkey.api.module.SimpleModule;
-import org.labkey.api.query.ExtendedTableDomainKind;
-import org.labkey.api.security.User;
-import org.labkey.api.security.permissions.AdminPermission;
-
-/**
- * Created by marty on 8/14/2017.
- */
-public class PackageDomainKind extends ExtendedTableDomainKind
-{
- private static final String NAMESPACE_PREFIX = "package";
- private static final String SCHEMA_NAME = "snd";
- private static final String KIND_NAME = "Package";
-
- private static final String DOMAIN_NAMESPACE_PREFIX_TEMPLATE = NAMESPACE_PREFIX + "-${SchemaName}";
-
- @Override
- public boolean canCreateDefinition(User user, Container container)
- {
- return container.hasPermission("PackageDomainKind.canCreateDefinition", user, AdminPermission.class);
- }
-
- @Override
- public String generateDomainURI(String schemaName, String tableName, Container c, User u)
- {
- return getDomainURI(schemaName, tableName, c, u);
- }
-
- public static String getDomainURI(String schemaName, String tableName, Container c, User u)
- {
- try
- {
- XarContext xc = getXarContext(schemaName, tableName, c.getContainerFor(ContainerType.DataType.domainDefinitions), u);
- return LsidUtils.resolveLsidFromTemplate(SimpleModule.DOMAIN_LSID_TEMPLATE, xc, DOMAIN_NAMESPACE_PREFIX_TEMPLATE);
- }
- catch (XarFormatException xfe)
- {
- return null;
- }
- }
-
- @Override
- protected String getSchemaName()
- {
- return getPackageSchemaName();
- }
-
- public static String getPackageSchemaName()
- {
- return SCHEMA_NAME;
- }
-
- @Override
- protected String getNamespacePrefix()
- {
- return NAMESPACE_PREFIX;
- }
-
- @Override
- public String getKindName()
- {
- return getPackageKindName();
- }
-
- public static String getPackageKindName()
- {
- return KIND_NAME;
- }
-}
diff --git a/snd/api-src/org/labkey/api/snd/PlainTextNarrativeDisplayColumn.java b/snd/api-src/org/labkey/api/snd/PlainTextNarrativeDisplayColumn.java
deleted file mode 100644
index 9aac5c58c..000000000
--- a/snd/api-src/org/labkey/api/snd/PlainTextNarrativeDisplayColumn.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2018 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.labkey.api.snd;
-
-import org.jetbrains.annotations.NotNull;
-import org.labkey.api.data.ColumnInfo;
-import org.labkey.api.data.DataColumn;
-import org.labkey.api.data.RenderContext;
-import org.labkey.api.util.HtmlString;
-
-public class PlainTextNarrativeDisplayColumn extends DataColumn
-{
- public PlainTextNarrativeDisplayColumn(ColumnInfo col)
- {
- super(col);
- }
-
- @Override
- public @NotNull HtmlString getFormattedHtml(RenderContext ctx)
- {
- String htmlNarrative = (String)ctx.get(getColumnInfo().getFieldKey());
- return HtmlString.of(removeHtmlTagsFromNarrative(htmlNarrative));
- }
-
- @Override
- public Object getDisplayValue(RenderContext ctx)
- {
- String htmlNarrative = (String)ctx.get(getColumnInfo().getFieldKey());
- return removeHtmlTagsFromNarrative(htmlNarrative);
- }
-
- public static String removeHtmlTagsFromNarrative(String htmlNarrative)
- {
- String textNarrative;
-
- if (htmlNarrative != null && !htmlNarrative.isEmpty())
- {
- // first crudely change these three tags to newlines
- textNarrative = htmlNarrative.replace(" ", "\n");
- textNarrative = textNarrative.replace("
-
\ No newline at end of file
diff --git a/snd/resources/views/app.html b/snd/resources/views/app.html
deleted file mode 100644
index 865e670f4..000000000
--- a/snd/resources/views/app.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/snd/resources/views/app.view.xml b/snd/resources/views/app.view.xml
deleted file mode 100644
index dfe5ab995..000000000
--- a/snd/resources/views/app.view.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/snd/resources/views/appDev.html b/snd/resources/views/appDev.html
deleted file mode 100644
index dca3e6d85..000000000
--- a/snd/resources/views/appDev.html
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/snd/resources/views/appDev.view.xml b/snd/resources/views/appDev.view.xml
deleted file mode 100644
index 0737af934..000000000
--- a/snd/resources/views/appDev.view.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/snd/resources/views/importPackages.html b/snd/resources/views/importPackages.html
deleted file mode 100644
index 16b712269..000000000
--- a/snd/resources/views/importPackages.html
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
diff --git a/snd/resources/views/importPackages.view.xml b/snd/resources/views/importPackages.view.xml
deleted file mode 100644
index c9f1f6c16..000000000
--- a/snd/resources/views/importPackages.view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/snd/resources/views/test.html b/snd/resources/views/test.html
deleted file mode 100644
index ad077b778..000000000
--- a/snd/resources/views/test.html
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-
-
-
-
- Initializing data...
-
-
-
-
-
\ No newline at end of file
diff --git a/snd/resources/views/test.view.xml b/snd/resources/views/test.view.xml
deleted file mode 100644
index 61dec3bcd..000000000
--- a/snd/resources/views/test.view.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/snd/schemas/snd.xsd b/snd/schemas/snd.xsd
deleted file mode 100644
index 8c8032fd1..000000000
--- a/snd/schemas/snd.xsd
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/snd/src/client/app.tsx b/snd/src/client/app.tsx
deleted file mode 100644
index a454c95de..000000000
--- a/snd/src/client/app.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2017 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// React
-import * as React from 'react';
-import * as ReactDom from 'react-dom';
-
-// Redux
-import { applyMiddleware, compose, createStore } from 'redux';
-import { Provider } from 'react-redux';
-import { composeWithDevTools } from 'redux-devtools-extension';
-
-// Routing
-import { createBrowserHistory, createHashHistory } from 'history';
-import { Route } from 'react-router-dom';
-import { ConnectedRouter, routerMiddleware } from 'react-router-redux';
-
-// Middleware
-import thunk from 'redux-thunk';
-
-// Components
-import { App } from './containers/App/App';
-
-// Reducers
-import { reducers } from './reducers/index';
-
-// switch history to createBrowser history after servlet work
-const history = createHashHistory();
-const middleware = applyMiddleware(thunk, routerMiddleware(history));
-
-const storeCreator = compose(
- middleware
-)(createStore);
-const store = storeCreator(
- reducers
- // uncomment following line to view redux dev tools in chrome
- // ,composeWithDevTools()
-);
-
-jQuery(() => {
- ReactDom.render(
-
-
- { /* ConnectedRouter will use the store from Provider automatically */ }
-
-
-
-
-
-
- ,
- document.getElementById('app')
- );
-});
\ No newline at end of file
diff --git a/snd/src/client/components/Categories/CategoriesSelectResults.tsx b/snd/src/client/components/Categories/CategoriesSelectResults.tsx
deleted file mode 100644
index c7843cea9..000000000
--- a/snd/src/client/components/Categories/CategoriesSelectResults.tsx
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 2017-2018 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import * as React from 'react';
-import { ListGroupItem } from 'react-bootstrap'
-
-import { LabKeyQueryRowPropertyProps } from '../../query/model'
-
-// Results
-interface CategoriesSelectResultsProps {
- data?: {[key: string]: LabKeyQueryRowPropertyProps}
- dataIds?: Array
- disabled?: boolean
- handleSelect?: (id: number) => any
- focused?: boolean
- selected?: Array
-}
-
-export class CategoriesSelectResults extends React.Component {
-
- renderSelected() {
- const { data, selected } = this.props;
- if (selected && selected.length) {
- return (
-