Add setting to control whether kinship import is allowed during business hours

bbimber · bbimber · commit 335b23119c18 · 2024-02-28T06:52:22.000-08:00
diff --git a/ehr/resources/web/ehr/panel/GeneticCalculationSettingsPanel.js b/ehr/resources/web/ehr/panel/GeneticCalculationSettingsPanel.js
@@ -24,6 +24,10 @@ Ext4.define('EHR.panel.GeneticCalculationSettingsPanel', {
                 xtype: 'checkbox',
                 fieldLabel: 'Is Enabled?',
                 itemId: 'enabled'
+            },{
+                xtype: 'checkbox',
+                fieldLabel: 'Allow Import During Business Hours?',
+                itemId: 'allowImportDuringBusinessHours'
             },{
                 xtype: 'checkbox',
                 fieldLabel: 'Kinship validation?',
@@ -107,6 +111,7 @@ Ext4.define('EHR.panel.GeneticCalculationSettingsPanel', {
         this.down('#containerPath').setValue(results.containerPath);
         this.down('#kinshipValidation').setValue(results.kinshipValidation);
         this.down('#mergeSpeciesWithHybrids').setValue(results.mergeSpeciesWithHybrids);
+        this.down('#allowImportDuringBusinessHours').setValue(results.allowImportDuringBusinessHours)
     },
 
     saveData: function(){
@@ -118,7 +123,8 @@ Ext4.define('EHR.panel.GeneticCalculationSettingsPanel', {
                 enabled: this.down('#enabled').getValue(),
                 hourOfDay: this.down('#hourOfDay').getValue(),
                 kinshipValidation: this.down('#kinshipValidation').getValue(),
-                mergeSpeciesWithHybrids: this.down('#mergeSpeciesWithHybrids').getValue()
+                mergeSpeciesWithHybrids: this.down('#mergeSpeciesWithHybrids').getValue(),
+                allowImportDuringBusinessHours: this.down('#allowImportDuringBusinessHours').getValue()
             },
             method : 'POST',
             scope: this,
diff --git a/ehr/src/org/labkey/ehr/EHRController.java b/ehr/src/org/labkey/ehr/EHRController.java
@@ -83,6 +83,7 @@
 import org.labkey.api.settings.AppProps;
 import org.labkey.api.study.DatasetTable;
 import org.labkey.api.util.ExceptionUtil;
+import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.HtmlStringBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Path;
@@ -639,7 +640,7 @@ public ApiResponse execute(ScheduleGeneticCalculationForm form, BindException er
                 errors.reject(ERROR_MSG, "Unable to find container for path: " + form.getContainerPath());
                 return null;
             }
-            GeneticCalculationsJob.setProperties(form.isEnabled(), c, form.getHourOfDay(), form.isKinshipValidation(), form.isMergeSpeciesWithHybrids());
+            GeneticCalculationsJob.setProperties(form.isEnabled(), c, form.getHourOfDay(), form.isKinshipValidation(), form.isMergeSpeciesWithHybrids(), form.isAllowImportDuringBusinessHours());
 
             return new ApiSimpleResponse("success", true);
         }
@@ -760,6 +761,7 @@ public static class ScheduleGeneticCalculationForm
 
         private boolean _kinshipValidation;
         private boolean _mergeSpeciesWithHybrids;
+        private boolean _allowImportDuringBusinessHours;
 
         public boolean isEnabled()
         {
@@ -810,6 +812,16 @@ public void setMergeSpeciesWithHybrids(boolean mergeSpeciesWithHybrids)
         {
             _mergeSpeciesWithHybrids = mergeSpeciesWithHybrids;
         }
+
+        public boolean isAllowImportDuringBusinessHours()
+        {
+            return _allowImportDuringBusinessHours;
+        }
+
+        public void setAllowImportDuringBusinessHours(boolean allowImportDuringBusinessHours)
+        {
+            _allowImportDuringBusinessHours = allowImportDuringBusinessHours;
+        }
     }
 
     @RequiresPermission(AdminPermission.class)
@@ -829,6 +841,7 @@ public ApiResponse execute(ScheduleGeneticCalculationForm form, BindException er
             ret.put("hourOfDay", GeneticCalculationsJob.getHourOfDay());
             ret.put("kinshipValidation", GeneticCalculationsJob.isKinshipValidation());
             ret.put("mergeSpeciesWithHybrids", GeneticCalculationsJob.isMergeSpeciesWithHybrids());
+            ret.put("allowImportDuringBusinessHours", GeneticCalculationsJob.isAllowImportDuringBusinessHours());
 
             return new ApiSimpleResponse(ret);
         }
@@ -1262,7 +1275,7 @@ public void validateCommand(Object form, Errors errors)
         @Override
         public ModelAndView getConfirmView(Object form, BindException errors)
         {
-            return new HtmlView("This will cause the system to recalculate kinship and inbreeding coefficients on the colony.  Do you want to continue?");
+            return new HtmlView(HtmlString.of("This will cause the system to recalculate kinship and inbreeding coefficients on the colony.  Do you want to continue?"));
         }
 
         @Override
diff --git a/ehr/src/org/labkey/ehr/pipeline/GeneticCalculationsJob.java b/ehr/src/org/labkey/ehr/pipeline/GeneticCalculationsJob.java
@@ -132,6 +132,17 @@ public static boolean isMergeSpeciesWithHybrids()
             return false;
     }
 
+
+    public static boolean isAllowImportDuringBusinessHours()
+    {
+        Map<String, String> saved = PropertyManager.getProperties(GENETICCALCULATIONS_PROPERTY_DOMAIN);
+
+        if (saved.containsKey("allowImportDuringBusinessHours"))
+            return Boolean.parseBoolean(saved.get("allowImportDuringBusinessHours"));
+        else
+            return false;
+    }
+
     public static boolean isEnabled()
     {
         Map<String, String> saved = PropertyManager.getProperties(GENETICCALCULATIONS_PROPERTY_DOMAIN);
@@ -162,14 +173,15 @@ public static Integer getHourOfDay()
         return null;
     }
 
-    public static void setProperties(Boolean isEnabled, Container c, Integer hourOfDay, Boolean isKinshipValidation, Boolean mergeSpeciesWithHybrids)
+    public static void setProperties(Boolean isEnabled, Container c, Integer hourOfDay, Boolean isKinshipValidation, Boolean mergeSpeciesWithHybrids, Boolean allowImportDuringBusinessHours)
     {
         PropertyManager.PropertyMap props = PropertyManager.getWritableProperties(GENETICCALCULATIONS_PROPERTY_DOMAIN, true);
         props.put("enabled", isEnabled.toString());
         props.put("container", c.getId());
         props.put("hourOfDay", hourOfDay.toString());
         props.put("kinshipValidation", isKinshipValidation.toString());
         props.put("mergeSpeciesWithHybrids", mergeSpeciesWithHybrids.toString());
+        props.put("allowImportDuringBusinessHours", allowImportDuringBusinessHours.toString());
         props.save();
 
         //unschedule in case settings have changed
@@ -193,7 +205,7 @@ public void execute(JobExecutionContext context) throws JobExecutionException
         try
         {
             _log.info("Running Scheduled Genetic Calculations Job");
-            new GeneticCalculationsRunnable().run(c, false);
+            new GeneticCalculationsRunnable().run(c, isAllowImportDuringBusinessHours());
         }
         catch (PipelineJobException e)
         {
diff --git a/ehr/src/org/labkey/ehr/pipeline/GeneticCalculationsRunnable.java b/ehr/src/org/labkey/ehr/pipeline/GeneticCalculationsRunnable.java
@@ -85,7 +85,7 @@ private void startCalculation(User u, Container c, boolean allowRunningDuringDay
             String protocolName = "EHR Kinship Calculation";
             String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                 "<bioml>\n" +
-                    (allowRunningDuringDay ? "\t<note label=\"allowRunningDuringDay\" type=\"input\">true</note>" : "") +
+                    "\t<note label=\"allowRunningDuringDay\" type=\"input\">" + allowRunningDuringDay + "</note>" +
                     "\t<note label=\"kinshipValidation\" type=\"input\">" + GeneticCalculationsJob.isKinshipValidation() + "</note>" +
                     "\t<note label=\"mergeSpeciesWithHybrids\" type=\"input\">" + GeneticCalculationsJob.isMergeSpeciesWithHybrids() + "</note>" +
                 "</bioml>";

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@`
`83`	`83`	`import org.labkey.api.settings.AppProps;`
`84`	`84`	`import org.labkey.api.study.DatasetTable;`
`85`	`85`	`import org.labkey.api.util.ExceptionUtil;`
	`86`	`+import org.labkey.api.util.HtmlString;`
`86`	`87`	`import org.labkey.api.util.HtmlStringBuilder;`
`87`	`88`	`import org.labkey.api.util.PageFlowUtil;`
`88`	`89`	`import org.labkey.api.util.Path;`
`@@ -639,7 +640,7 @@ public ApiResponse execute(ScheduleGeneticCalculationForm form, BindException er`
`639`	`640`	`errors.reject(ERROR_MSG, "Unable to find container for path: " + form.getContainerPath());`
`640`	`641`	`return null;`
`641`	`642`	`}`
`642`		`- GeneticCalculationsJob.setProperties(form.isEnabled(), c, form.getHourOfDay(), form.isKinshipValidation(), form.isMergeSpeciesWithHybrids());`
	`643`	`+ GeneticCalculationsJob.setProperties(form.isEnabled(), c, form.getHourOfDay(), form.isKinshipValidation(), form.isMergeSpeciesWithHybrids(), form.isAllowImportDuringBusinessHours());`
`643`	`644`
`644`	`645`	`return new ApiSimpleResponse("success", true);`
`645`	`646`	`}`
`@@ -760,6 +761,7 @@ public static class ScheduleGeneticCalculationForm`
`760`	`761`
`761`	`762`	`private boolean _kinshipValidation;`
`762`	`763`	`private boolean _mergeSpeciesWithHybrids;`
	`764`	`+ private boolean _allowImportDuringBusinessHours;`
`763`	`765`
`764`	`766`	`public boolean isEnabled()`
`765`	`767`	`{`
`@@ -810,6 +812,16 @@ public void setMergeSpeciesWithHybrids(boolean mergeSpeciesWithHybrids)`
`810`	`812`	`{`
`811`	`813`	`_mergeSpeciesWithHybrids = mergeSpeciesWithHybrids;`
`812`	`814`	`}`
	`815`	`+`
	`816`	`+ public boolean isAllowImportDuringBusinessHours()`
	`817`	`+ {`
	`818`	`+ return _allowImportDuringBusinessHours;`
	`819`	`+ }`
	`820`	`+`
	`821`	`+ public void setAllowImportDuringBusinessHours(boolean allowImportDuringBusinessHours)`
	`822`	`+ {`
	`823`	`+ _allowImportDuringBusinessHours = allowImportDuringBusinessHours;`
	`824`	`+ }`
`813`	`825`	`}`
`814`	`826`
`815`	`827`	`@RequiresPermission(AdminPermission.class)`
`@@ -829,6 +841,7 @@ public ApiResponse execute(ScheduleGeneticCalculationForm form, BindException er`
`829`	`841`	`ret.put("hourOfDay", GeneticCalculationsJob.getHourOfDay());`
`830`	`842`	`ret.put("kinshipValidation", GeneticCalculationsJob.isKinshipValidation());`
`831`	`843`	`ret.put("mergeSpeciesWithHybrids", GeneticCalculationsJob.isMergeSpeciesWithHybrids());`
	`844`	`+ ret.put("allowImportDuringBusinessHours", GeneticCalculationsJob.isAllowImportDuringBusinessHours());`
`832`	`845`
`833`	`846`	`return new ApiSimpleResponse(ret);`
`834`	`847`	`}`
`@@ -1262,7 +1275,7 @@ public void validateCommand(Object form, Errors errors)`
`1262`	`1275`	`@Override`
`1263`	`1276`	`public ModelAndView getConfirmView(Object form, BindException errors)`
`1264`	`1277`	`{`
`1265`		`- return new HtmlView("This will cause the system to recalculate kinship and inbreeding coefficients on the colony. Do you want to continue?");`
	`1278`	`+ return new HtmlView(HtmlString.of("This will cause the system to recalculate kinship and inbreeding coefficients on the colony. Do you want to continue?"));`
`1266`	`1279`	`}`
`1267`	`1280`
`1268`	`1281`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,17 @@ public static boolean isMergeSpeciesWithHybrids()`
`132`	`132`	`return false;`
`133`	`133`	`}`
`134`	`134`
	`135`	`+`
	`136`	`+ public static boolean isAllowImportDuringBusinessHours()`
	`137`	`+ {`
	`138`	`+ Map<String, String> saved = PropertyManager.getProperties(GENETICCALCULATIONS_PROPERTY_DOMAIN);`
	`139`	`+`
	`140`	`+ if (saved.containsKey("allowImportDuringBusinessHours"))`
	`141`	`+ return Boolean.parseBoolean(saved.get("allowImportDuringBusinessHours"));`
	`142`	`+ else`
	`143`	`+ return false;`
	`144`	`+ }`
	`145`	`+`
`135`	`146`	`public static boolean isEnabled()`
`136`	`147`	`{`
`137`	`148`	`Map<String, String> saved = PropertyManager.getProperties(GENETICCALCULATIONS_PROPERTY_DOMAIN);`
`@@ -162,14 +173,15 @@ public static Integer getHourOfDay()`
`162`	`173`	`return null;`
`163`	`174`	`}`
`164`	`175`
`165`		`- public static void setProperties(Boolean isEnabled, Container c, Integer hourOfDay, Boolean isKinshipValidation, Boolean mergeSpeciesWithHybrids)`
	`176`	`+ public static void setProperties(Boolean isEnabled, Container c, Integer hourOfDay, Boolean isKinshipValidation, Boolean mergeSpeciesWithHybrids, Boolean allowImportDuringBusinessHours)`
`166`	`177`	`{`
`167`	`178`	`PropertyManager.PropertyMap props = PropertyManager.getWritableProperties(GENETICCALCULATIONS_PROPERTY_DOMAIN, true);`
`168`	`179`	`props.put("enabled", isEnabled.toString());`
`169`	`180`	`props.put("container", c.getId());`
`170`	`181`	`props.put("hourOfDay", hourOfDay.toString());`
`171`	`182`	`props.put("kinshipValidation", isKinshipValidation.toString());`
`172`	`183`	`props.put("mergeSpeciesWithHybrids", mergeSpeciesWithHybrids.toString());`
	`184`	`+ props.put("allowImportDuringBusinessHours", allowImportDuringBusinessHours.toString());`
`173`	`185`	`props.save();`
`174`	`186`
`175`	`187`	`//unschedule in case settings have changed`
`@@ -193,7 +205,7 @@ public void execute(JobExecutionContext context) throws JobExecutionException`
`193`	`205`	`try`
`194`	`206`	`{`
`195`	`207`	`_log.info("Running Scheduled Genetic Calculations Job");`
`196`		`- new GeneticCalculationsRunnable().run(c, false);`
	`208`	`+ new GeneticCalculationsRunnable().run(c, isAllowImportDuringBusinessHours());`
`197`	`209`	`}`
`198`	`210`	`catch (PipelineJobException e)`
`199`	`211`	`{`