This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/application/model/src/main/java/net/ftlines/model/txcee/slo/StudentLearningObjectiveManager.java b/application/model/src/main/java/net/ftlines/model/txcee/slo/StudentLearningObjectiveManager.java | |
index f1c167255f..17d4a39e12 100644 | |
--- a/application/model/src/main/java/net/ftlines/model/txcee/slo/StudentLearningObjectiveManager.java | |
+++ b/application/model/src/main/java/net/ftlines/model/txcee/slo/StudentLearningObjectiveManager.java | |
@@ -1968,20 +1968,20 @@ public class StudentLearningObjectiveManager extends DiscussionManager { | |
} | |
public int countDistinctImportRecordsFromDistrictYear(DistrictYearConfiguration config, String instructorSearch, | |
- String assessmentSearch, String studentSearch, Boolean usedInSlo) { | |
+ String assessmentSearch, String studentSearch, Boolean usedInSlo, StudentLearningObjectiveImport scoreImport) { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxResponse.java | |
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxResponse.java | |
@@ -127,12 +127,22 @@ public abstract class AbstractAjaxResponse | |
} | |
/** | |
+ * Retrieves the page instance | |
+ * | |
+ * @return page instance | |
+ */ |