diff --git a/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java b/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java index 9e588acf06..b47ed578fa 100644 --- a/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java +++ b/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java @@ -41,6 +41,7 @@ import org.labkey.api.security.permissions.UpdatePermission; import org.labkey.api.study.Study; import org.labkey.api.study.StudyService; +import org.labkey.api.usageMetrics.SimpleMetricsService; import org.labkey.api.util.PageFlowUtil; import org.labkey.api.util.Pair; import org.labkey.api.util.URIUtil; @@ -55,6 +56,7 @@ import org.labkey.api.view.RedirectException; import org.labkey.api.view.ViewBackgroundInfo; import org.labkey.api.view.template.PageConfig; +import org.labkey.flow.FlowModule; import org.labkey.flow.FlowPreference; import org.labkey.flow.analysis.model.ExternalAnalysis; import org.labkey.flow.analysis.model.FCS; @@ -1357,6 +1359,12 @@ private void stepChooseAnalysis(ImportAnalysisForm form, BindException errors) } Container targetStudy = getTargetStudy(form.getTargetStudy(), errors); + if (form.getStudyChanged()) + { + // Estabilish & increment a metric to measure usage of the Study Linkage feature of the Flow data import process + SimpleMetricsService.get().increment(FlowModule.NAME, "SampleImport", "StudyLinkChanged"); + } + if (errors.hasErrors()) return; diff --git a/flow/src/org/labkey/flow/controllers/executescript/ImportAnalysisForm.java b/flow/src/org/labkey/flow/controllers/executescript/ImportAnalysisForm.java index 7cab46c650..2e941ccaed 100644 --- a/flow/src/org/labkey/flow/controllers/executescript/ImportAnalysisForm.java +++ b/flow/src/org/labkey/flow/controllers/executescript/ImportAnalysisForm.java @@ -62,6 +62,18 @@ public enum SelectFCSFileOption implements SafeToRenderEnum private String[] keywordDir; private boolean confirm; + private boolean studyChanged = false; + + public void setStudyChanged(boolean studyChanged) + { + this.studyChanged = studyChanged; + } + + public boolean getStudyChanged() + { + return this.studyChanged; + } + public int getStep() { return step; diff --git a/flow/src/org/labkey/flow/controllers/executescript/importAnalysisChooseAnalysis.jsp b/flow/src/org/labkey/flow/controllers/executescript/importAnalysisChooseAnalysis.jsp index 94154f88b5..477546ef6d 100644 --- a/flow/src/org/labkey/flow/controllers/executescript/importAnalysisChooseAnalysis.jsp +++ b/flow/src/org/labkey/flow/controllers/executescript/importAnalysisChooseAnalysis.jsp @@ -52,6 +52,7 @@ +