diff --git a/src/main/java/org/olat/modules/curriculum/CurriculumElementManagedFlag.java b/src/main/java/org/olat/modules/curriculum/CurriculumElementManagedFlag.java
index 81e3f5dba554908be0e803472a6ba707d78c517a..c53d1eb4974c28c9ac8ae91744b214da242e02ff 100644
--- a/src/main/java/org/olat/modules/curriculum/CurriculumElementManagedFlag.java
+++ b/src/main/java/org/olat/modules/curriculum/CurriculumElementManagedFlag.java
@@ -39,6 +39,7 @@ public enum CurriculumElementManagedFlag {
displayName(all),
description(all),
externalId(all),
+ status(all),
dates(all),
type(all),
calendars(all),
diff --git a/src/main/java/org/olat/modules/curriculum/CurriculumService.java b/src/main/java/org/olat/modules/curriculum/CurriculumService.java
index a4b32c04f71c9b5e1477710b3b6d0389e8d63fa4..7cf7e87852c7974fba3645460b57d9946dbb0e8e 100644
--- a/src/main/java/org/olat/modules/curriculum/CurriculumService.java
+++ b/src/main/java/org/olat/modules/curriculum/CurriculumService.java
@@ -213,7 +213,8 @@ public interface CurriculumService {
public boolean deleteCurriculumElementType(CurriculumElementTypeRef typeRef);
- public CurriculumElement createCurriculumElement(String identifier, String displayName, Date beginDate, Date endDate,
+ public CurriculumElement createCurriculumElement(String identifier, String displayName,
+ CurriculumElementStatus status, Date beginDate, Date endDate,
CurriculumElementRef parent, CurriculumElementType elementType, CurriculumCalendars calendars,
CurriculumLectures lectures, Curriculum curriculum);
diff --git a/src/main/java/org/olat/modules/curriculum/manager/CurriculumElementDAO.java b/src/main/java/org/olat/modules/curriculum/manager/CurriculumElementDAO.java
index ffa582cfaa52b504066be23b644a5782bf695e0a..e55306664b0152ea71c7688640cc4475e554fe9b 100644
--- a/src/main/java/org/olat/modules/curriculum/manager/CurriculumElementDAO.java
+++ b/src/main/java/org/olat/modules/curriculum/manager/CurriculumElementDAO.java
@@ -80,7 +80,8 @@ public class CurriculumElementDAO {
@Autowired
private GroupDAO groupDao;
- public CurriculumElement createCurriculumElement(String identifier, String displayName, Date beginDate, Date endDate,
+ public CurriculumElement createCurriculumElement(String identifier, String displayName, CurriculumElementStatus status,
+ Date beginDate, Date endDate,
CurriculumElementRef parentRef, CurriculumElementType elementType,
CurriculumCalendars calendars, CurriculumLectures lectures, Curriculum curriculum) {
CurriculumElementImpl element = new CurriculumElementImpl();
@@ -94,7 +95,11 @@ public class CurriculumElementDAO {
element.setType(elementType);
element.setCalendars(calendars);
element.setLectures(lectures);
- element.setStatus(CurriculumElementStatus.active.name());
+ if(status == null) {
+ element.setStatus(CurriculumElementStatus.active.name());
+ } else {
+ element.setStatus(status.name());
+ }
element.setGroup(groupDao.createGroup());
CurriculumElement parent = parentRef == null ? null : loadByKey(parentRef.getKey());
element.setParent(parent);
diff --git a/src/main/java/org/olat/modules/curriculum/manager/CurriculumServiceImpl.java b/src/main/java/org/olat/modules/curriculum/manager/CurriculumServiceImpl.java
index 59cb4392006b645e66881af88415a8e9f8d88d5a..be5ece7ab3024eaadb1721f0d4a7ee4f4eb04bb2 100644
--- a/src/main/java/org/olat/modules/curriculum/manager/CurriculumServiceImpl.java
+++ b/src/main/java/org/olat/modules/curriculum/manager/CurriculumServiceImpl.java
@@ -257,10 +257,11 @@ public class CurriculumServiceImpl implements CurriculumService, OrganisationDat
}
@Override
- public CurriculumElement createCurriculumElement(String identifier, String displayName, Date beginDate, Date endDate,
- CurriculumElementRef parentRef, CurriculumElementType elementType,
+ public CurriculumElement createCurriculumElement(String identifier, String displayName, CurriculumElementStatus status,
+ Date beginDate, Date endDate, CurriculumElementRef parentRef, CurriculumElementType elementType,
CurriculumCalendars calendars, CurriculumLectures lectures, Curriculum curriculum) {
- return curriculumElementDao.createCurriculumElement(identifier, displayName, beginDate, endDate, parentRef, elementType, calendars, lectures, curriculum);
+ return curriculumElementDao.createCurriculumElement(identifier, displayName, status,
+ beginDate, endDate, parentRef, elementType, calendars, lectures, curriculum);
}
@Override
@@ -285,7 +286,7 @@ public class CurriculumServiceImpl implements CurriculumService, OrganisationDat
displayName += " (Copy)";
}
- CurriculumElement clone = curriculumElementDao.createCurriculumElement(identifier, displayName,
+ CurriculumElement clone = curriculumElementDao.createCurriculumElement(identifier, displayName, CurriculumElementStatus.active,
beginDate, endDate, parentElement, elementToClone.getType(), elementToClone.getCalendars(), elementToClone.getLectures(),
curriculum);
diff --git a/src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementsWebService.java b/src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementsWebService.java
index 3bde07dc0b9281c6715bd0b8cd757b57ee414afc..4acd045a4054b85f4a8fee970a420d95c453adfa 100644
--- a/src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementsWebService.java
+++ b/src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementsWebService.java
@@ -246,7 +246,7 @@ public class CurriculumElementsWebService {
boolean move = false;
if(curriculumElement.getKey() == null) {
elementToSave = curriculumService.createCurriculumElement(curriculumElement.getIdentifier(), curriculumElement.getDisplayName(),
- curriculumElement.getBeginDate(), curriculumElement.getEndDate(), parentElement, type,
+ null, curriculumElement.getBeginDate(), curriculumElement.getEndDate(), parentElement, type,
CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
} else {
elementToSave = curriculumService.getCurriculumElement(new CurriculumElementRefImpl(curriculumElement.getKey()));
diff --git a/src/main/java/org/olat/modules/curriculum/ui/CurriculumElementListController.java b/src/main/java/org/olat/modules/curriculum/ui/CurriculumElementListController.java
index 04b3029b7ca995b3c54733fecc03092e62d66fb2..93cac76e0fc1cb602131db6d59bf016d25976e52 100644
--- a/src/main/java/org/olat/modules/curriculum/ui/CurriculumElementListController.java
+++ b/src/main/java/org/olat/modules/curriculum/ui/CurriculumElementListController.java
@@ -39,6 +39,7 @@ import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.form.flexible.FormItem;
import org.olat.core.gui.components.form.flexible.FormItemContainer;
import org.olat.core.gui.components.form.flexible.elements.FlexiTableElement;
+import org.olat.core.gui.components.form.flexible.elements.FlexiTableFilter;
import org.olat.core.gui.components.form.flexible.elements.FormLink;
import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
import org.olat.core.gui.components.form.flexible.impl.FormEvent;
@@ -173,12 +174,22 @@ public class CurriculumElementListController extends FormBasicController impleme
tableEl.setCustomizeColumns(true);
tableEl.setEmtpyTableMessageKey("table.curriculum.empty");
tableEl.setCssDelegate(this);
+ tableEl.setFilters("activity", getFilters(), false);
+ tableEl.setSelectedFilterKey("active");
VelocityContainer row = createVelocityContainer("curriculum_element_row");
row.setDomReplacementWrapperRequired(false); // sets its own DOM id in velocity container
tableEl.setRowRenderer(row, this);
- tableEl.setAndLoadPersistedPreferences(ureq, "my-curriculum-elements-v2-" + curriculum.getKey());
+ tableEl.setAndLoadPersistedPreferences(ureq, "my-curriculum-elements-v3-" + curriculum.getKey());
+ }
+
+ private List<FlexiTableFilter> getFilters() {
+ List<FlexiTableFilter> filters = new ArrayList<>(5);
+ filters.add(new FlexiTableFilter(translate("filter.active"), "active"));
+ filters.add(FlexiTableFilter.SPACER);
+ filters.add(new FlexiTableFilter(translate("show.all"), "all", true));
+ return filters;
}
@Override
@@ -288,24 +299,11 @@ public class CurriculumElementListController extends FormBasicController impleme
Collections.sort(rows, new CurriculumElementViewsRowComparator(getLocale()));
removeByPermissions(rows);
- removeDeactivated(rows);
tableModel.setObjects(rows);
tableEl.reset(true, true, true);
}
- private void removeDeactivated(List<CurriculumElementWithViewsRow> rows) {
- for(Iterator<CurriculumElementWithViewsRow> it=rows.iterator(); it.hasNext(); ) {
- CurriculumElementWithViewsRow row = it.next();
- for(CurriculumElementWithViewsRow parent=row; parent.getParent() != null; parent=parent.getParent()) {
- if(!parent.isActive()) {
- it.remove();
- break;
- }
- }
- }
- }
-
private void removeByPermissions(List<CurriculumElementWithViewsRow> rows) {
// propagate the member marker along the parent line
for(CurriculumElementWithViewsRow row:rows) {
diff --git a/src/main/java/org/olat/modules/curriculum/ui/CurriculumElementWithViewsDataModel.java b/src/main/java/org/olat/modules/curriculum/ui/CurriculumElementWithViewsDataModel.java
index 9a783b08ccdb5f064f9073062b06a75b187ba135..7037208b65f6d672366ee528568b50760e9c4bad 100644
--- a/src/main/java/org/olat/modules/curriculum/ui/CurriculumElementWithViewsDataModel.java
+++ b/src/main/java/org/olat/modules/curriculum/ui/CurriculumElementWithViewsDataModel.java
@@ -26,6 +26,7 @@ import org.olat.core.gui.components.form.flexible.elements.FlexiTableFilter;
import org.olat.core.gui.components.form.flexible.impl.elements.table.DefaultFlexiTreeTableDataModel;
import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiSortableColumnDef;
import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiTableColumnModel;
+import org.olat.modules.curriculum.CurriculumElementStatus;
/**
*
@@ -41,7 +42,41 @@ public class CurriculumElementWithViewsDataModel extends DefaultFlexiTreeTableDa
@Override
public void filter(String searchString, List<FlexiTableFilter> filters) {
- setObjects(new ArrayList<>(backupRows));
+ if(filters != null && !filters.isEmpty() && filters.get(0) != null) {
+ FlexiTableFilter filter = filters.get(0);
+ if(filter == null || filter.isShowAll()) {
+ setUnfilteredObjects();
+ } else {
+ List<CurriculumElementWithViewsRow> filteredRows = new ArrayList<>(backupRows.size());
+ // curriculum element inactive -> all repo are inactives
+ // parent inactive, child is active -> parent is forced active
+ for(CurriculumElementWithViewsRow row:backupRows) {
+ boolean accept = active(row);
+ if(accept) {
+ filteredRows.add(row);
+ }
+ }
+ setFilteredObjects(filteredRows);
+ }
+ } else {
+ setUnfilteredObjects();
+ }
+ }
+
+ private boolean active(CurriculumElementWithViewsRow row) {
+ boolean active = true;
+ if(row.isCurriculumElementOnly() || row.isCurriculumElementWithEntry()) {
+ active = row.getCurriculumElementStatus() == CurriculumElementStatus.active;
+ }
+
+ if(active) {
+ for(CurriculumElementWithViewsRow parent=row.getParent(); parent != null; parent=parent.getParent()) {
+ if(row.isCurriculumElementOnly() || row.isCurriculumElementWithEntry()) {
+ active &= row.getCurriculumElementStatus() == CurriculumElementStatus.active;
+ }
+ }
+ }
+ return active;
}
@Override
diff --git a/src/main/java/org/olat/modules/curriculum/ui/CurriculumElementWithViewsRow.java b/src/main/java/org/olat/modules/curriculum/ui/CurriculumElementWithViewsRow.java
index 20c6a523661c5b90687c0f4a9128b385f98c87ec..a35d20f0a7cadd1dd898e5963b2211ff02348cb8 100644
--- a/src/main/java/org/olat/modules/curriculum/ui/CurriculumElementWithViewsRow.java
+++ b/src/main/java/org/olat/modules/curriculum/ui/CurriculumElementWithViewsRow.java
@@ -164,6 +164,10 @@ public class CurriculumElementWithViewsRow implements CurriculumElementWithView,
return element == null ? null : element.getExternalId();
}
+ public CurriculumElementStatus getCurriculumElementStatus() {
+ return element == null ? null : element.getElementStatus();
+ }
+
public String getCurriculumElementDisplayName() {
return repositoryEntry == null || singleEntry ? element.getDisplayName() : null;
}
diff --git a/src/main/java/org/olat/modules/curriculum/ui/EditCurriculumElementController.java b/src/main/java/org/olat/modules/curriculum/ui/EditCurriculumElementController.java
index 114694fc10101cd8b6e6c27fa6d67cc54d36aef5..d5b2984161b0df69a2d2e31c3407ccb32ce7aa07 100644
--- a/src/main/java/org/olat/modules/curriculum/ui/EditCurriculumElementController.java
+++ b/src/main/java/org/olat/modules/curriculum/ui/EditCurriculumElementController.java
@@ -43,6 +43,7 @@ import org.olat.modules.curriculum.Curriculum;
import org.olat.modules.curriculum.CurriculumCalendars;
import org.olat.modules.curriculum.CurriculumElement;
import org.olat.modules.curriculum.CurriculumElementManagedFlag;
+import org.olat.modules.curriculum.CurriculumElementStatus;
import org.olat.modules.curriculum.CurriculumElementType;
import org.olat.modules.curriculum.CurriculumElementTypeRef;
import org.olat.modules.curriculum.CurriculumElementTypeToType;
@@ -76,6 +77,10 @@ public class EditCurriculumElementController extends FormBasicController {
private static final String[] lecturesTypedKeys = new String[] {
CurriculumLectures.enabled.name(), CurriculumLectures.disabled.name(), CurriculumLectures.inherited.name()
};
+
+ private static final String[] statusKey = new String[] {
+ CurriculumElementStatus.active.name(), CurriculumElementStatus.inactive.name(), CurriculumElementStatus.deleted.name()
+ };
private DateChooser endEl;
private DateChooser beginEl;
@@ -83,6 +88,7 @@ public class EditCurriculumElementController extends FormBasicController {
private TextElement displayNameEl;
private RichTextElement descriptionEl;
+ private SingleSelection statusEl;
private SingleSelection lecturesEnabledEl;
private SingleSelection calendarsEnabledEl;
private SingleSelection curriculumElementTypeEl;
@@ -153,6 +159,17 @@ public class EditCurriculumElementController extends FormBasicController {
displayNameEl.setEnabled(!CurriculumElementManagedFlag.isManaged(element, CurriculumElementManagedFlag.displayName) && secCallback.canEditCurriculumElement());
displayNameEl.setMandatory(true);
+ String[] statusValues = new String[] {
+ translate("status.active"), translate("status.inactive"), translate("status.deleted")
+ };
+ statusEl = uifactory.addRadiosHorizontal("status", "curriculum.element.status", formLayout, statusKey, statusValues);
+ statusEl.setEnabled(!CurriculumElementManagedFlag.isManaged(element, CurriculumElementManagedFlag.status) && secCallback.canEditCurriculumElement() );
+ if(element == null || element.getElementStatus() == null) {
+ statusEl.select(CurriculumElementStatus.active.name(), true);
+ } else {
+ statusEl.select(element.getElementStatus().name(), true);
+ }
+
List<CurriculumElementType> types = getTypes();
String[] typeKeys = new String[types.size() + 1];
String[] typeValues = new String[types.size() + 1];
@@ -354,6 +371,12 @@ public class EditCurriculumElementController extends FormBasicController {
allOk &= false;
}
+ statusEl.clearError();
+ if(!statusEl.isOneSelected()) {
+ statusEl.setErrorKey("form.legende.mandatory", null);
+ allOk &= false;
+ }
+
return allOk;
}
@@ -362,10 +385,11 @@ public class EditCurriculumElementController extends FormBasicController {
CurriculumElementType elementType = getSelectedType();
CurriculumLectures lectures = CurriculumLectures.valueOf(lecturesEnabledEl.getSelectedKey());
CurriculumCalendars calendars = CurriculumCalendars.valueOf(calendarsEnabledEl.getSelectedKey());
+ CurriculumElementStatus status = CurriculumElementStatus.valueOf(statusEl.getSelectedKey());
if(element == null) {
//create a new one
element = curriculumService.createCurriculumElement(identifierEl.getValue(), displayNameEl.getValue(),
- beginEl.getDate(), endEl.getDate(), parentElement, elementType, calendars, lectures, curriculum);
+ status, beginEl.getDate(), endEl.getDate(), parentElement, elementType, calendars, lectures, curriculum);
} else {
element = curriculumService.getCurriculumElement(element);
element.setIdentifier(identifierEl.getValue());
@@ -376,6 +400,7 @@ public class EditCurriculumElementController extends FormBasicController {
element.setType(elementType);
element.setCalendars(calendars);
element.setLectures(lectures);
+ element.setElementStatus(status);
element = curriculumService.updateCurriculumElement(element);
}
diff --git a/src/main/java/org/olat/modules/curriculum/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/curriculum/ui/_i18n/LocalStrings_de.properties
index 08fca3ce146c1aad6bc19a03fe09315c3becdf09..a2df5ff6651cbc66340da32a2ef17f111a9f7337 100644
--- a/src/main/java/org/olat/modules/curriculum/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/modules/curriculum/ui/_i18n/LocalStrings_de.properties
@@ -38,6 +38,7 @@ curriculum.element.from.to=Von {0} bis {1}
curriculum.element.key=ID
curriculum.element.metadata=Metadaten
curriculum.element.resources.txt=Kurse im Element
+curriculum.element.status=Status
curriculum.element.taxonomy=Taxonomy
curriculum.element.title=Curriculum Element
curriculum.element.to=Bis {0}
diff --git a/src/main/java/org/olat/modules/curriculum/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/modules/curriculum/ui/_i18n/LocalStrings_en.properties
index a56d868b85d1afb71d5d639aabff413f2c00af00..7e52cf3104972b5f3dab7e213c4fcb70051fa2fc 100644
--- a/src/main/java/org/olat/modules/curriculum/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/modules/curriculum/ui/_i18n/LocalStrings_en.properties
@@ -38,6 +38,7 @@ curriculum.element.identifier=Identifier
curriculum.element.key=ID
curriculum.element.metadata=Metadata
curriculum.element.resources.txt=Courses in element
+curriculum.element.status=Status
curriculum.element.taxonomy=Taxonomy
curriculum.element.title=Curriculum element
curriculum.element.to=Until {0}
diff --git a/src/test/java/org/olat/course/assessment/manager/AssessmentModeManagerTest.java b/src/test/java/org/olat/course/assessment/manager/AssessmentModeManagerTest.java
index e6ec0e3e2e91c1f2aca1715f60635bf2753f1444..1e78ab73d4d6e8f4500290cdc8f4109463544a72 100644
--- a/src/test/java/org/olat/course/assessment/manager/AssessmentModeManagerTest.java
+++ b/src/test/java/org/olat/course/assessment/manager/AssessmentModeManagerTest.java
@@ -44,6 +44,7 @@ import org.olat.group.manager.BusinessGroupRelationDAO;
import org.olat.modules.curriculum.Curriculum;
import org.olat.modules.curriculum.CurriculumCalendars;
import org.olat.modules.curriculum.CurriculumElement;
+import org.olat.modules.curriculum.CurriculumElementStatus;
import org.olat.modules.curriculum.CurriculumLectures;
import org.olat.modules.curriculum.CurriculumRoles;
import org.olat.modules.curriculum.CurriculumService;
@@ -744,8 +745,8 @@ public class AssessmentModeManagerTest extends OlatTestCase {
Identity coach = JunitTestHelper.createAndPersistIdentityAsRndUser("as-mode-32");
Curriculum curriculum = curriculumService.createCurriculum("cur-as-mode-1", "Curriculum for assessment", "Curriculum", null);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-for-rel", "Element for assessment", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-for-rel", "Element for assessment", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
curriculumService.addRepositoryEntry(element, entry, false);
curriculumService.addMember(element, participant, CurriculumRoles.participant);
@@ -788,8 +789,8 @@ public class AssessmentModeManagerTest extends OlatTestCase {
Identity coach = JunitTestHelper.createAndPersistIdentityAsRndUser("as-mode-37");
Curriculum curriculum = curriculumService.createCurriculum("cur-as-mode-2", "Curriculum for assessment", "Curriculum", null);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-for-rel", "Element for assessment", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-for-rel", "Element for assessment", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
curriculumService.addRepositoryEntry(element, entry, false);
curriculumService.addMember(element, participant, CurriculumRoles.participant);
@@ -911,8 +912,8 @@ public class AssessmentModeManagerTest extends OlatTestCase {
Identity coach1 = JunitTestHelper.createAndPersistIdentityAsRndUser("as-mode-39");
Curriculum curriculum = curriculumService.createCurriculum("cur-as-mode-3", "Curriculum for assessment", "Curriculum", null);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-for-rel", "Element for assessment", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-for-rel", "Element for assessment", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
curriculumService.addRepositoryEntry(element, entry, false);
curriculumService.addMember(element, participant1, CurriculumRoles.participant);
diff --git a/src/test/java/org/olat/modules/curriculum/manager/CurriculumDAOTest.java b/src/test/java/org/olat/modules/curriculum/manager/CurriculumDAOTest.java
index ef7c6069f0fc2a0e56d8d82e5ea2a32cf94ef117..494c2d637b8040c681778b7a86e5006cb9a8ac0e 100644
--- a/src/test/java/org/olat/modules/curriculum/manager/CurriculumDAOTest.java
+++ b/src/test/java/org/olat/modules/curriculum/manager/CurriculumDAOTest.java
@@ -36,6 +36,7 @@ import org.olat.core.id.Organisation;
import org.olat.modules.curriculum.Curriculum;
import org.olat.modules.curriculum.CurriculumCalendars;
import org.olat.modules.curriculum.CurriculumElement;
+import org.olat.modules.curriculum.CurriculumElementStatus;
import org.olat.modules.curriculum.CurriculumLectures;
import org.olat.modules.curriculum.CurriculumRoles;
import org.olat.modules.curriculum.CurriculumService;
@@ -228,8 +229,8 @@ public class CurriculumDAOTest extends OlatTestCase {
Identity manager = JunitTestHelper.createAndPersistIdentityAsRndUser("cur-manager-1");
Identity owner = JunitTestHelper.createAndPersistIdentityAsRndUser("cur-course-owner-1");
Curriculum curriculum = curriculumDao.createAndPersist("Curriculum for owners", "Owners", "Short desc.", null);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-1", "1. Element", new Date(), new Date(),
- null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-1", "1. Element", CurriculumElementStatus.active,
+ new Date(), new Date(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
RepositoryEntry entry = JunitTestHelper.createRandomRepositoryEntry(owner);
curriculumService.addRepositoryEntry(element, entry, true);
dbInstance.commit();
@@ -277,8 +278,8 @@ public class CurriculumDAOTest extends OlatTestCase {
// add a curriculum with a coach in an element
Identity id = JunitTestHelper.createAndPersistIdentityAsRndUser("cur-manager-1");
Curriculum curriculum = curriculumService.createCurriculum("CUR-MY-1", "My Curriculum 1", "Short desc.", null);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-1", "1. Element", new Date(), new Date(), null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-1", "1. Element", CurriculumElementStatus.active,
+ new Date(), new Date(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
curriculumService.addMember(element, id, CurriculumRoles.participant);
dbInstance.commitAndCloseSession();
@@ -311,8 +312,8 @@ public class CurriculumDAOTest extends OlatTestCase {
// make a curriculum with an element with a course
Identity owner = JunitTestHelper.createAndPersistIdentityAsRndUser("cur-owner-1");
Curriculum curriculum = curriculumService.createCurriculum("CUR-1", "Curriculum 1", "Short desc.", null);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-1", "1. Element", new Date(), new Date(),
- null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-1", "1. Element", CurriculumElementStatus.active,
+ new Date(), new Date(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
RepositoryEntry entry = JunitTestHelper.createRandomRepositoryEntry(owner);
curriculumService.addRepositoryEntry(element, entry, true);
dbInstance.commit();
diff --git a/src/test/java/org/olat/modules/curriculum/manager/CurriculumElementDAOTest.java b/src/test/java/org/olat/modules/curriculum/manager/CurriculumElementDAOTest.java
index 2ff51111dbe7ec3c39807ae4ca1925e46c1453f4..724d59a414e4851e1debcd86b5d978005b5b6f8c 100644
--- a/src/test/java/org/olat/modules/curriculum/manager/CurriculumElementDAOTest.java
+++ b/src/test/java/org/olat/modules/curriculum/manager/CurriculumElementDAOTest.java
@@ -74,8 +74,8 @@ public class CurriculumElementDAOTest extends OlatTestCase {
public void createCurriculumElement() {
Curriculum curriculum = curriculumDao.createAndPersist("Cur-for-el-1", "Curriculum for element", "Curriculum", null);
CurriculumElementType type = curriculumElementTypeDao.createCurriculumElementType("typ-for-cur-el-1", "Type for", "First element", "AC-234");
- CurriculumElement element = curriculumElementDao.createCurriculumElement("Element-1", "1. Element", new Date(), new Date(), null,
- type, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumElementDao.createCurriculumElement("Element-1", "1. Element", CurriculumElementStatus.active,
+ new Date(), new Date(), null, type, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
Assert.assertNotNull(element);
dbInstance.commitAndCloseSession();
@@ -98,19 +98,19 @@ public class CurriculumElementDAOTest extends OlatTestCase {
public void createCurriculumElement_rootElement() {
Curriculum curriculum = curriculumDao.createAndPersist("Cur-for-el-1", "Curriculum for element", "Curriculum", null);
CurriculumElementType type = curriculumElementTypeDao.createCurriculumElementType("typ-for-cur-el-1", "Type for", "First element", "AC-234");
- CurriculumElement root1 = curriculumElementDao.createCurriculumElement("Element-1", "1. Element", new Date(), new Date(), null,
- type, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement root1 = curriculumElementDao.createCurriculumElement("Element-1", "1. Element", CurriculumElementStatus.active,
+ new Date(), new Date(), null, type, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
Assert.assertNotNull(root1);
dbInstance.commit();
curriculum = curriculumDao.loadByKey(curriculum.getKey());
- CurriculumElement root2 = curriculumElementDao.createCurriculumElement("Element-2", "2. Element", new Date(), new Date(), null,
- type, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement root2 = curriculumElementDao.createCurriculumElement("Element-2", "2. Element", CurriculumElementStatus.active,
+ new Date(), new Date(), null, type, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
curriculum = curriculumDao.loadByKey(curriculum.getKey());
- CurriculumElement root3 = curriculumElementDao.createCurriculumElement("Element-3", "3. Element", new Date(), new Date(), null,
- type, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element3_1 = curriculumElementDao.createCurriculumElement("Element-2", "2. Element", new Date(), new Date(), root3,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement root3 = curriculumElementDao.createCurriculumElement("Element-3", "3. Element", CurriculumElementStatus.active,
+ new Date(), new Date(), null, type, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element3_1 = curriculumElementDao.createCurriculumElement("Element-2", "2. Element", CurriculumElementStatus.active,
+ new Date(), new Date(), root3, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
//check the curriculum to elements list
@@ -131,8 +131,8 @@ public class CurriculumElementDAOTest extends OlatTestCase {
public void loadByKey() {
Curriculum curriculum = curriculumDao.createAndPersist("Cur-for-el-2", "Curriculum for element", "Curriculum", null);
CurriculumElementType type = curriculumElementTypeDao.createCurriculumElementType("typ-for-cur-el-2", "Type for", "First element", "AC-234");
- CurriculumElement element = curriculumElementDao.createCurriculumElement("Element-2", "2. Element", new Date(), new Date(), null,
- type, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumElementDao.createCurriculumElement("Element-2", "2. Element", CurriculumElementStatus.active,
+ new Date(), new Date(), null, type, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
Assert.assertNotNull(element);
dbInstance.commitAndCloseSession();
@@ -155,12 +155,12 @@ public class CurriculumElementDAOTest extends OlatTestCase {
@Test
public void loadByKeys() {
Curriculum curriculum = curriculumDao.createAndPersist("Cur-for-el-2", "Curriculum for element", "Curriculum", null);
- CurriculumElement element1 = curriculumElementDao.createCurriculumElement("Element-2", "2. Element", new Date(), new Date(), null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element2 = curriculumElementDao.createCurriculumElement("Element-2", "2. Element", new Date(), new Date(), null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement otherElement = curriculumElementDao.createCurriculumElement("Element-2", "2. Element", new Date(), new Date(), null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1 = curriculumElementDao.createCurriculumElement("Element-2", "2. Element", CurriculumElementStatus.active,
+ new Date(), new Date(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element2 = curriculumElementDao.createCurriculumElement("Element-2", "2. Element", CurriculumElementStatus.active,
+ new Date(), new Date(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement otherElement = curriculumElementDao.createCurriculumElement("Element-2", "2. Element", CurriculumElementStatus.active,
+ new Date(), new Date(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
List<CurriculumElement> elements = curriculumElementDao.loadByKeys(Arrays.asList(element1, element2));
@@ -173,12 +173,12 @@ public class CurriculumElementDAOTest extends OlatTestCase {
@Test
public void loadElements_curricullum() {
Curriculum curriculum = curriculumDao.createAndPersist("Cur-for-el-6", "Curriculum for element", "Curriculum", null);
- CurriculumElement element1 = curriculumElementDao.createCurriculumElement("Element-6", "6.1 Element", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element2 = curriculumElementDao.createCurriculumElement("Element-6", "6.1.1 Element", null, null, element1,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element3 = curriculumElementDao.createCurriculumElement("Element-6", "6.2 Element", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1 = curriculumElementDao.createCurriculumElement("Element-6", "6.1 Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element2 = curriculumElementDao.createCurriculumElement("Element-6", "6.1.1 Element", CurriculumElementStatus.active,
+ null, null, element1, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element3 = curriculumElementDao.createCurriculumElement("Element-6", "6.2 Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
//load all elements of the curriculum
@@ -194,8 +194,8 @@ public class CurriculumElementDAOTest extends OlatTestCase {
@Test
public void loadElementsWithInfos() {
Curriculum curriculum = curriculumService.createCurriculum("cur-el-rel-1", "Curriculum for relation", "Curriculum", null);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-for-rel", "Element for relation", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-for-rel", "Element for relation", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
Identity author = JunitTestHelper.createAndPersistIdentityAsRndUser("cur-el-re-auth");
RepositoryEntry entry1 = JunitTestHelper.createRandomRepositoryEntry(author);
RepositoryEntry entry2 = JunitTestHelper.createRandomRepositoryEntry(author);
@@ -214,8 +214,8 @@ public class CurriculumElementDAOTest extends OlatTestCase {
@Test
public void loadElements_repoEntry() {
Curriculum curriculum = curriculumService.createCurriculum("cur-el-rel-1", "Curriculum for relation", "Curriculum", null);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-for-rel", "Element for relation", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-for-rel", "Element for relation",
+ CurriculumElementStatus.active, null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
Identity author = JunitTestHelper.createAndPersistIdentityAsRndUser("cur-el-re-auth");
RepositoryEntry entry = JunitTestHelper.createRandomRepositoryEntry(author);
dbInstance.commit();
@@ -230,18 +230,18 @@ public class CurriculumElementDAOTest extends OlatTestCase {
@Test
public void loadElementsByCurriculums() {
Curriculum curriculum1 = curriculumDao.createAndPersist("Cur-for-load-1", "Curriculum to load 1", null, null);
- CurriculumElement parentElement = curriculumElementDao.createCurriculumElement("El-load-1", "Element 1", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum1);
- CurriculumElement element1 = curriculumElementDao.createCurriculumElement("El-load-2", "Element 2", null, null, parentElement,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum1);
- CurriculumElement element2 = curriculumElementDao.createCurriculumElement("El-load-3", "Element 3", null, null, parentElement,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum1);
+ CurriculumElement parentElement = curriculumElementDao.createCurriculumElement("El-load-1", "Element 1", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum1);
+ CurriculumElement element1 = curriculumElementDao.createCurriculumElement("El-load-2", "Element 2", CurriculumElementStatus.active,
+ null, null, parentElement, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum1);
+ CurriculumElement element2 = curriculumElementDao.createCurriculumElement("El-load-3", "Element 3", CurriculumElementStatus.active,
+ null, null, parentElement, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum1);
Curriculum curriculum2 = curriculumDao.createAndPersist("Cur-for-load-2", "Curriculum to load 2", null, null);
- CurriculumElement parentElement2 = curriculumElementDao.createCurriculumElement("El-load-4", "Element 4", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum2);
+ CurriculumElement parentElement2 = curriculumElementDao.createCurriculumElement("El-load-4", "Element 4", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum2);
Curriculum otherCurriculum = curriculumDao.createAndPersist("Cur-for-load-3", "Curriculum to load3", null, null);
- CurriculumElement otherElement = curriculumElementDao.createCurriculumElement("El-load-5", "Element 5", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, otherCurriculum);
+ CurriculumElement otherElement = curriculumElementDao.createCurriculumElement("El-load-5", "Element 5", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, otherCurriculum);
dbInstance.commitAndCloseSession();
Collection<CurriculumRef> curriculumRefs = Arrays.asList(curriculum1, curriculum2);
@@ -255,18 +255,18 @@ public class CurriculumElementDAOTest extends OlatTestCase {
@Test
public void createCurriculumElementParentChildren() {
Curriculum curriculum = curriculumDao.createAndPersist("cur-for-el-3", "Curriculum for element", "Curriculum", null);
- CurriculumElement parentElement = curriculumElementDao.createCurriculumElement("Element-3", "3. Element", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement parentElement = curriculumElementDao.createCurriculumElement("Element-3", "3. Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
// save 3 children
- CurriculumElement element1 = curriculumElementDao.createCurriculumElement("Element-3-1", "3.1 Element", null, null, parentElement,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1 = curriculumElementDao.createCurriculumElement("Element-3-1", "3.1 Element", CurriculumElementStatus.active,
+ null, null, parentElement, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
- CurriculumElement element2 = curriculumElementDao.createCurriculumElement("Element-3-2", "3.2 Element", null, null, parentElement,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element2 = curriculumElementDao.createCurriculumElement("Element-3-2", "3.2 Element", CurriculumElementStatus.active,
+ null, null, parentElement, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
- CurriculumElement element3 = curriculumElementDao.createCurriculumElement("Element-3-3", "3.3 Element", null, null, parentElement,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element3 = curriculumElementDao.createCurriculumElement("Element-3-3", "3.3 Element", CurriculumElementStatus.active,
+ null, null, parentElement, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
//reload parents
@@ -282,18 +282,18 @@ public class CurriculumElementDAOTest extends OlatTestCase {
@Test
public void getParentLine() {
Curriculum curriculum = curriculumDao.createAndPersist("cur-for-el-4", "Curriculum for element", "Curriculum", null);
- CurriculumElement parentElement = curriculumElementDao.createCurriculumElement("Element-4", "4. Element", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement parentElement = curriculumElementDao.createCurriculumElement("Element-4", "4. Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
// save 3 children
- CurriculumElement element1 = curriculumElementDao.createCurriculumElement("Element-4-1", "4.1 Element", null, null, parentElement,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1 = curriculumElementDao.createCurriculumElement("Element-4-1", "4.1 Element", CurriculumElementStatus.active,
+ null, null, parentElement, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
- CurriculumElement element2 = curriculumElementDao.createCurriculumElement("Element-4-2", "4.1.1 Element", null, null, element1,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element2 = curriculumElementDao.createCurriculumElement("Element-4-2", "4.1.1 Element", CurriculumElementStatus.active,
+ null, null, element1, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
- CurriculumElement element3 = curriculumElementDao.createCurriculumElement("Element-4-3", "4.1.1.1 Element", null, null, element2,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element3 = curriculumElementDao.createCurriculumElement("Element-4-3", "4.1.1.1 Element", CurriculumElementStatus.active,
+ null, null, element2, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
//reload parents
@@ -311,8 +311,8 @@ public class CurriculumElementDAOTest extends OlatTestCase {
Curriculum curriculum = curriculumDao.createAndPersist("cur-for-el-6", "Curriculum for element", "Curriculum", null);
String externalId = UUID.randomUUID().toString();
String identifier = UUID.randomUUID().toString();
- CurriculumElement element = curriculumElementDao.createCurriculumElement(identifier, "6.1 Element", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumElementDao.createCurriculumElement(identifier, "6.1 Element",
+ CurriculumElementStatus.active, null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
element.setExternalId(externalId);
element = curriculumElementDao.update(element);
@@ -340,18 +340,18 @@ public class CurriculumElementDAOTest extends OlatTestCase {
@Test
public void getDescendants() {
Curriculum curriculum = curriculumDao.createAndPersist("cur-for-el-5", "Curriculum for element", "Curriculum", null);
- CurriculumElement parentElement = curriculumElementDao.createCurriculumElement("Element-5", "5. Element", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement parentElement = curriculumElementDao.createCurriculumElement("Element-5", "5. Element",
+ CurriculumElementStatus.active, null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
// save 3 children
- CurriculumElement element1 = curriculumElementDao.createCurriculumElement("Element-5-1", "5.1 Element", null, null, parentElement,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1 = curriculumElementDao.createCurriculumElement("Element-5-1", "5.1 Element", CurriculumElementStatus.active,
+ null, null, parentElement, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
- CurriculumElement element1_1 = curriculumElementDao.createCurriculumElement("Element-5-1-1", "5.1.1 Element", null, null, element1,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1_1 = curriculumElementDao.createCurriculumElement("Element-5-1-1", "5.1.1 Element", CurriculumElementStatus.active,
+ null, null, element1, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
- CurriculumElement element2 = curriculumElementDao.createCurriculumElement("Element-5-2", "5.2 Element", null, null, parentElement,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element2 = curriculumElementDao.createCurriculumElement("Element-5-2", "5.2 Element", CurriculumElementStatus.active,
+ null, null, parentElement, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
// load descendants of the root element
@@ -366,18 +366,18 @@ public class CurriculumElementDAOTest extends OlatTestCase {
@Test
public void getChildren() {
Curriculum curriculum = curriculumDao.createAndPersist("cur-for-el-15", "Curriculum for element", "Curriculum", null);
- CurriculumElement parentElement = curriculumElementDao.createCurriculumElement("Element-15", "15. Element", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement parentElement = curriculumElementDao.createCurriculumElement("Element-15", "15. Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
// save 3 children
- CurriculumElement element1 = curriculumElementDao.createCurriculumElement("Element-15-1", "15.1 Element", null, null, parentElement,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1 = curriculumElementDao.createCurriculumElement("Element-15-1", "15.1 Element", CurriculumElementStatus.active,
+ null, null, parentElement, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
- CurriculumElement element2 = curriculumElementDao.createCurriculumElement("Element-15-2", "15.2 Element", null, null, parentElement,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element2 = curriculumElementDao.createCurriculumElement("Element-15-2", "15.2 Element", CurriculumElementStatus.active,
+ null, null, parentElement, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
- CurriculumElement element2_1 = curriculumElementDao.createCurriculumElement("Element-15-2-1", "15.2.1 Element", null, null, element2,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element2_1 = curriculumElementDao.createCurriculumElement("Element-15-2-1", "15.2.1 Element", CurriculumElementStatus.active,
+ null, null, element2, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
// get children of the root element
@@ -397,18 +397,18 @@ public class CurriculumElementDAOTest extends OlatTestCase {
@Test
public void moveCurriculumElement_elementToOtherElement() {
Curriculum curriculum = curriculumDao.createAndPersist("cur-for-el-7", "Curriculum for element", "Curriculum", null);
- CurriculumElement rootElement = curriculumElementDao.createCurriculumElement("Element-7", "7. Element", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element1 = curriculumElementDao.createCurriculumElement("Element-7-1", "7.1 Element", null, null, rootElement,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element1_1 = curriculumElementDao.createCurriculumElement("Element-7-1-1", "7.1.1 Element", null, null, element1,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element1_1_1 = curriculumElementDao.createCurriculumElement("Element-7-1-1", "7.1.1 Element", null, null, element1_1,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element1_1_2 = curriculumElementDao.createCurriculumElement("Element-7-1-2", "7.1.2 Element", null, null, element1_1,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element2 = curriculumElementDao.createCurriculumElement("Element-7-2", "7.2 Element", null, null, rootElement,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement rootElement = curriculumElementDao.createCurriculumElement("Element-7", "7. Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1 = curriculumElementDao.createCurriculumElement("Element-7-1", "7.1 Element", CurriculumElementStatus.active,
+ null, null, rootElement, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1_1 = curriculumElementDao.createCurriculumElement("Element-7-1-1", "7.1.1 Element", CurriculumElementStatus.active,
+ null, null, element1, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1_1_1 = curriculumElementDao.createCurriculumElement("Element-7-1-1", "7.1.1 Element", CurriculumElementStatus.active,
+ null, null, element1_1, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1_1_2 = curriculumElementDao.createCurriculumElement("Element-7-1-2", "7.1.2 Element", CurriculumElementStatus.active,
+ null, null, element1_1, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element2 = curriculumElementDao.createCurriculumElement("Element-7-2", "7.2 Element", CurriculumElementStatus.active,
+ null, null, rootElement, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
// move element1_1 under element2
@@ -437,18 +437,18 @@ public class CurriculumElementDAOTest extends OlatTestCase {
@Test
public void moveCurriculumElement_underSameElement() {
Curriculum curriculum = curriculumDao.createAndPersist("cur-for-el-8", "Curriculum for element", "Curriculum", null);
- CurriculumElement rootElement = curriculumElementDao.createCurriculumElement("Element-8", "8. Element", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element1_1 = curriculumElementDao.createCurriculumElement("Element-8-1-1", "8.1.1 Element", null, null, rootElement,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element1_2 = curriculumElementDao.createCurriculumElement("Element-8-1-2", "8.1.2 Element", null, null, rootElement,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element1_3 = curriculumElementDao.createCurriculumElement("Element-8-1-3", "8.1.3 Element", null, null, rootElement,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element1_4 = curriculumElementDao.createCurriculumElement("Element-8-1-4", "8.1.4 Element", null, null, rootElement,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element1_5 = curriculumElementDao.createCurriculumElement("Element-8-1-5", "8.1.5 Element", null, null, rootElement,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement rootElement = curriculumElementDao.createCurriculumElement("Element-8", "8. Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1_1 = curriculumElementDao.createCurriculumElement("Element-8-1-1", "8.1.1 Element", CurriculumElementStatus.active,
+ null, null, rootElement, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1_2 = curriculumElementDao.createCurriculumElement("Element-8-1-2", "8.1.2 Element", CurriculumElementStatus.active,
+ null, null, rootElement, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1_3 = curriculumElementDao.createCurriculumElement("Element-8-1-3", "8.1.3 Element", CurriculumElementStatus.active,
+ null, null, rootElement, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1_4 = curriculumElementDao.createCurriculumElement("Element-8-1-4", "8.1.4 Element", CurriculumElementStatus.active,
+ null, null, rootElement, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1_5 = curriculumElementDao.createCurriculumElement("Element-8-1-5", "8.1.5 Element", CurriculumElementStatus.active,
+ null, null, rootElement, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
// move element1_1 at third posistion
@@ -467,18 +467,18 @@ public class CurriculumElementDAOTest extends OlatTestCase {
@Test
public void moveCurriculumElement_underSameElement_v2() {
Curriculum curriculum = curriculumDao.createAndPersist("cur-for-el-8", "Curriculum for element", "Curriculum", null);
- CurriculumElement rootElement = curriculumElementDao.createCurriculumElement("Element-8", "8. Element", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element1_1 = curriculumElementDao.createCurriculumElement("Element-8-1-1", "8.1.1 Element", null, null, rootElement,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element1_2 = curriculumElementDao.createCurriculumElement("Element-8-1-2", "8.1.2 Element", null, null, rootElement,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element1_3 = curriculumElementDao.createCurriculumElement("Element-8-1-3", "8.1.3 Element", null, null, rootElement,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element1_4 = curriculumElementDao.createCurriculumElement("Element-8-1-4", "8.1.4 Element", null, null, rootElement,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element1_5 = curriculumElementDao.createCurriculumElement("Element-8-1-5", "8.1.5 Element", null, null, rootElement,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement rootElement = curriculumElementDao.createCurriculumElement("Element-8", "8. Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1_1 = curriculumElementDao.createCurriculumElement("Element-8-1-1", "8.1.1 Element", CurriculumElementStatus.active,
+ null, null, rootElement, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1_2 = curriculumElementDao.createCurriculumElement("Element-8-1-2", "8.1.2 Element", CurriculumElementStatus.active,
+ null, null, rootElement, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1_3 = curriculumElementDao.createCurriculumElement("Element-8-1-3", "8.1.3 Element", CurriculumElementStatus.active,
+ null, null, rootElement, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1_4 = curriculumElementDao.createCurriculumElement("Element-8-1-4", "8.1.4 Element", CurriculumElementStatus.active,
+ null, null, rootElement, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1_5 = curriculumElementDao.createCurriculumElement("Element-8-1-5", "8.1.5 Element", CurriculumElementStatus.active,
+ null, null, rootElement, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
// move element1_5 at third position
@@ -498,16 +498,16 @@ public class CurriculumElementDAOTest extends OlatTestCase {
public void moveCurriculumElement_rootElement() {
Curriculum curriculum = curriculumDao.createAndPersist("cur-for-el-", "Curriculum for element", "Curriculum", null);
- CurriculumElement element1 = curriculumElementDao.createCurriculumElement("Element-9-1", "9.1 Element", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element2 = curriculumElementDao.createCurriculumElement("Element-9-2", "9.2 Element", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element3 = curriculumElementDao.createCurriculumElement("Element-9-3", "9.3 Element", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element4 = curriculumElementDao.createCurriculumElement("Element-9-4", "9.4 Element", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element5 = curriculumElementDao.createCurriculumElement("Element-9-5", "9.5 Element", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1 = curriculumElementDao.createCurriculumElement("Element-9-1", "9.1 Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element2 = curriculumElementDao.createCurriculumElement("Element-9-2", "9.2 Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element3 = curriculumElementDao.createCurriculumElement("Element-9-3", "9.3 Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element4 = curriculumElementDao.createCurriculumElement("Element-9-4", "9.4 Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element5 = curriculumElementDao.createCurriculumElement("Element-9-5", "9.5 Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
// move element1_1 under element2
@@ -527,22 +527,22 @@ public class CurriculumElementDAOTest extends OlatTestCase {
@Test
public void moveCurriculumElement_rootToElement() {
Curriculum curriculum = curriculumDao.createAndPersist("cur-for-el-7", "Curriculum for element", "Curriculum", null);
- CurriculumElement rootElement1 = curriculumElementDao.createCurriculumElement("Element-10-1", "10.1 Element", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element1_1 = curriculumElementDao.createCurriculumElement("Element-10-1-1", "10.1.1 Element", null, null, rootElement1,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element1_1_1 = curriculumElementDao.createCurriculumElement("Element-10-1-1-1", "10.1.1.1 Element", null, null, element1_1,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element1_1_2 = curriculumElementDao.createCurriculumElement("Element-10-1-1-2", "10.1.1.2 Element", null, null, element1_1,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element1_2 = curriculumElementDao.createCurriculumElement("Element-10-1-2", "10.1.2 Element", null, null, rootElement1,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement rootElement1 = curriculumElementDao.createCurriculumElement("Element-10-1", "10.1 Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1_1 = curriculumElementDao.createCurriculumElement("Element-10-1-1", "10.1.1 Element", CurriculumElementStatus.active,
+ null, null, rootElement1, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1_1_1 = curriculumElementDao.createCurriculumElement("Element-10-1-1-1", "10.1.1.1 Element", CurriculumElementStatus.active,
+ null, null, element1_1, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1_1_2 = curriculumElementDao.createCurriculumElement("Element-10-1-1-2", "10.1.1.2 Element", CurriculumElementStatus.active,
+ null, null, element1_1, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1_2 = curriculumElementDao.createCurriculumElement("Element-10-1-2", "10.1.2 Element", CurriculumElementStatus.active,
+ null, null, rootElement1, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
Assert.assertNotNull(element1_2);
curriculum = curriculumDao.loadByKey(curriculum.getKey());
- CurriculumElement rootElement2 = curriculumElementDao.createCurriculumElement("Element-10-2", "10.2 Element", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement rootElement2 = curriculumElementDao.createCurriculumElement("Element-10-2", "10.2 Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
// move element1_1 under element2
@@ -569,16 +569,16 @@ public class CurriculumElementDAOTest extends OlatTestCase {
@Test
public void moveCurriculumElement_elementToRoot() {
Curriculum curriculum = curriculumDao.createAndPersist("cur-for-el-7", "Curriculum for element", "Curriculum", null);
- CurriculumElement rootElement1 = curriculumElementDao.createCurriculumElement("Element-10-1", "10.1 Element", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element1_1 = curriculumElementDao.createCurriculumElement("Element-10-1-1", "10.1.1 Element", null, null, rootElement1,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element1_1_1 = curriculumElementDao.createCurriculumElement("Element-10-1-1-1", "10.1.1.1 Element", null, null, element1_1,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element1_1_2 = curriculumElementDao.createCurriculumElement("Element-10-1-1-2", "10.1.1.2 Element", null, null, element1_1,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element1_1_3 = curriculumElementDao.createCurriculumElement("Element-10-1-1-3", "10.1.1.3 Element", null, null, element1_1,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement rootElement1 = curriculumElementDao.createCurriculumElement("Element-10-1", "10.1 Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1_1 = curriculumElementDao.createCurriculumElement("Element-10-1-1", "10.1.1 Element", CurriculumElementStatus.active,
+ null, null, rootElement1, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1_1_1 = curriculumElementDao.createCurriculumElement("Element-10-1-1-1", "10.1.1.1 Element", CurriculumElementStatus.active,
+ null, null, element1_1, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1_1_2 = curriculumElementDao.createCurriculumElement("Element-10-1-1-2", "10.1.1.2 Element", CurriculumElementStatus.active,
+ null, null, element1_1, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1_1_3 = curriculumElementDao.createCurriculumElement("Element-10-1-1-3", "10.1.1.3 Element", CurriculumElementStatus.active,
+ null, null, element1_1, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
@@ -609,8 +609,8 @@ public class CurriculumElementDAOTest extends OlatTestCase {
public void getMembersIdentity() {
Identity supervisor = JunitTestHelper.createAndPersistIdentityAsRndUser("cur-supervisor-1");
Curriculum curriculum = curriculumService.createCurriculum("cur-for-el-4", "Curriculum for element", "Curriculum", null);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-4", "4. Element", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-4", "4. Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
curriculumService.addMember(element, supervisor, CurriculumRoles.curriculummanager);
dbInstance.commitAndCloseSession();
@@ -624,8 +624,8 @@ public class CurriculumElementDAOTest extends OlatTestCase {
public void getMembersIdentity_elementKeys() {
Identity supervisor = JunitTestHelper.createAndPersistIdentityAsRndUser("cur-supervisor-1");
Curriculum curriculum = curriculumService.createCurriculum("cur-for-el-4", "Curriculum for element", "Curriculum", null);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-4", "4. Element", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-4", "4. Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
curriculumService.addMember(element, supervisor, CurriculumRoles.curriculummanager);
dbInstance.commitAndCloseSession();
@@ -646,8 +646,8 @@ public class CurriculumElementDAOTest extends OlatTestCase {
public void getMemberKeys() {
Identity coach = JunitTestHelper.createAndPersistIdentityAsRndUser("cur-supervisor-1");
Curriculum curriculum = curriculumService.createCurriculum("cur-for-el-24", "Curriculum for element", "Curriculum", null);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-24", "4. Element", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-24", "4. Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
curriculumService.addMember(element, coach, CurriculumRoles.coach);
dbInstance.commitAndCloseSession();
@@ -664,8 +664,8 @@ public class CurriculumElementDAOTest extends OlatTestCase {
public void getMembershipInfos_elements() {
Identity supervisor = JunitTestHelper.createAndPersistIdentityAsRndUser("cur-supervisor-1");
Curriculum curriculum = curriculumService.createCurriculum("cur-for-el-4", "Curriculum for element", "Curriculum", null);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-4", "4. Element", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-4", "4. Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
curriculumService.addMember(element, supervisor, CurriculumRoles.curriculummanager);
dbInstance.commitAndCloseSession();
@@ -684,8 +684,8 @@ public class CurriculumElementDAOTest extends OlatTestCase {
public void getMembershipInfos_curriculum() {
Identity supervisor = JunitTestHelper.createAndPersistIdentityAsRndUser("cur-supervisor-1");
Curriculum curriculum = curriculumService.createCurriculum("cur-for-el-5", "Curriculum for element", "Curriculum", null);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-5", "5. Element", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-5", "5. Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
curriculumService.addMember(element, supervisor, CurriculumRoles.curriculummanager);
dbInstance.commitAndCloseSession();
diff --git a/src/test/java/org/olat/modules/curriculum/manager/CurriculumElementToTaxonomyLevelDAOTest.java b/src/test/java/org/olat/modules/curriculum/manager/CurriculumElementToTaxonomyLevelDAOTest.java
index cae3ebfe9c89956136dfbcb339531dbe7c78ad45..30070acdeb3730f3f66115416193552eb3c71f98 100644
--- a/src/test/java/org/olat/modules/curriculum/manager/CurriculumElementToTaxonomyLevelDAOTest.java
+++ b/src/test/java/org/olat/modules/curriculum/manager/CurriculumElementToTaxonomyLevelDAOTest.java
@@ -29,6 +29,7 @@ import org.olat.core.commons.persistence.DB;
import org.olat.modules.curriculum.Curriculum;
import org.olat.modules.curriculum.CurriculumCalendars;
import org.olat.modules.curriculum.CurriculumElement;
+import org.olat.modules.curriculum.CurriculumElementStatus;
import org.olat.modules.curriculum.CurriculumElementToTaxonomyLevel;
import org.olat.modules.curriculum.CurriculumLectures;
import org.olat.modules.taxonomy.Taxonomy;
@@ -62,8 +63,8 @@ public class CurriculumElementToTaxonomyLevelDAOTest extends OlatTestCase {
@Test
public void createRelation() {
Curriculum curriculum = curriculumDao.createAndPersist("Cur-for-rela-1", "Curriculum for relation to taxonomy", "Curriculum", null);
- CurriculumElement element = curriculumElementDao.createCurriculumElement("Element-1", "1. Element", new Date(), new Date(), null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumElementDao.createCurriculumElement("Element-1", "1. Element", CurriculumElementStatus.active,
+ new Date(), new Date(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
Taxonomy taxonomy = taxonomyDao.createTaxonomy("ID-98", "Leveled taxonomy", null, null);
TaxonomyLevel level = taxonomyLevelDao.createTaxonomyLevel("ID-Level-0", "My first taxonomy level", "A basic level", null, null, null, null, taxonomy);
@@ -75,8 +76,8 @@ public class CurriculumElementToTaxonomyLevelDAOTest extends OlatTestCase {
@Test
public void createAndGetRelation() {
Curriculum curriculum = curriculumDao.createAndPersist("Cur-for-rela-2", "Curriculum for relation to taxonomy", "Curriculum", null);
- CurriculumElement element = curriculumElementDao.createCurriculumElement("Element-2", "2. Element", new Date(), new Date(), null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumElementDao.createCurriculumElement("Element-2", "2. Element", CurriculumElementStatus.active,
+ new Date(), new Date(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
Taxonomy taxonomy = taxonomyDao.createTaxonomy("ID-301", "Leveled taxonomy", null, null);
TaxonomyLevel level = taxonomyLevelDao.createTaxonomyLevel("ID-Level-0", "My first taxonomy level", "A basic level", null, null, null, null, taxonomy);
@@ -95,8 +96,8 @@ public class CurriculumElementToTaxonomyLevelDAOTest extends OlatTestCase {
@Test
public void getTaxonomyLevels() {
Curriculum curriculum = curriculumDao.createAndPersist("Cur-for-rela-3", "Curriculum for relation to taxonomy", "Curriculum", null);
- CurriculumElement element = curriculumElementDao.createCurriculumElement("Element-3", "3. Element", new Date(), new Date(), null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumElementDao.createCurriculumElement("Element-3", "3. Element", CurriculumElementStatus.active,
+ new Date(), new Date(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
Taxonomy taxonomy = taxonomyDao.createTaxonomy("ID-302", "Leveled taxonomy", null, null);
TaxonomyLevel level = taxonomyLevelDao.createTaxonomyLevel("ID-Level-0", "My first taxonomy level", "A basic level", null, null, null, null, taxonomy);
@@ -112,8 +113,8 @@ public class CurriculumElementToTaxonomyLevelDAOTest extends OlatTestCase {
@Test
public void getCurriculumElements() {
Curriculum curriculum = curriculumDao.createAndPersist("Cur-for-rela-4", "Curriculum for relation to taxonomy", "Curriculum", null);
- CurriculumElement element = curriculumElementDao.createCurriculumElement("Element-4", "4. Element", new Date(), new Date(), null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumElementDao.createCurriculumElement("Element-4", "4. Element", CurriculumElementStatus.active,
+ new Date(), new Date(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
Taxonomy taxonomy = taxonomyDao.createTaxonomy("ID-303", "Leveled taxonomy", null, null);
TaxonomyLevel level = taxonomyLevelDao.createTaxonomyLevel("ID-Level-0", "My first taxonomy level", "A basic level", null, null, null, null, taxonomy);
diff --git a/src/test/java/org/olat/modules/curriculum/manager/CurriculumMemberQueriesTest.java b/src/test/java/org/olat/modules/curriculum/manager/CurriculumMemberQueriesTest.java
index 197f588f7bc7ca374d994c45ec976750cfe431a2..70a16fb0a4eb5428b301802eb4959e9144a1d2fc 100644
--- a/src/test/java/org/olat/modules/curriculum/manager/CurriculumMemberQueriesTest.java
+++ b/src/test/java/org/olat/modules/curriculum/manager/CurriculumMemberQueriesTest.java
@@ -28,6 +28,7 @@ import org.olat.core.id.Identity;
import org.olat.modules.curriculum.Curriculum;
import org.olat.modules.curriculum.CurriculumCalendars;
import org.olat.modules.curriculum.CurriculumElement;
+import org.olat.modules.curriculum.CurriculumElementStatus;
import org.olat.modules.curriculum.CurriculumLectures;
import org.olat.modules.curriculum.CurriculumRoles;
import org.olat.modules.curriculum.CurriculumService;
@@ -74,8 +75,8 @@ public class CurriculumMemberQueriesTest extends OlatTestCase {
public void getCurriculumElementMembers() {
Identity supervisor = JunitTestHelper.createAndPersistIdentityAsRndUser("cur-supervisor-1");
Curriculum curriculum = curriculumService.createCurriculum("cur-for-el-4", "Curriculum for element", "Curriculum", null);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-4", "4. Element", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-4", "4. Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
curriculumService.addMember(element, supervisor, CurriculumRoles.curriculummanager);
dbInstance.commitAndCloseSession();
diff --git a/src/test/java/org/olat/modules/curriculum/manager/CurriculumRepositoryEntryRelationDAOTest.java b/src/test/java/org/olat/modules/curriculum/manager/CurriculumRepositoryEntryRelationDAOTest.java
index 6b6fb3dc8e28e41647536d20f8009e7543af73d3..a71acb88258ce3c5cd1ef7a62bf040ecfc49a7a5 100644
--- a/src/test/java/org/olat/modules/curriculum/manager/CurriculumRepositoryEntryRelationDAOTest.java
+++ b/src/test/java/org/olat/modules/curriculum/manager/CurriculumRepositoryEntryRelationDAOTest.java
@@ -31,6 +31,7 @@ import org.olat.modules.curriculum.Curriculum;
import org.olat.modules.curriculum.CurriculumCalendars;
import org.olat.modules.curriculum.CurriculumElement;
import org.olat.modules.curriculum.CurriculumElementRef;
+import org.olat.modules.curriculum.CurriculumElementStatus;
import org.olat.modules.curriculum.CurriculumLectures;
import org.olat.modules.curriculum.CurriculumRoles;
import org.olat.modules.curriculum.CurriculumService;
@@ -62,8 +63,8 @@ public class CurriculumRepositoryEntryRelationDAOTest extends OlatTestCase {
@Test
public void getRepositoryEntries() {
Curriculum curriculum = curriculumService.createCurriculum("cur-el-rel-2", "Curriculum for relation", "Curriculum", null);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-for-rel", "Element for relation", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-for-rel", "Element for relation", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
Identity author = JunitTestHelper.createAndPersistIdentityAsRndUser("cur-el-re-auth");
RepositoryEntry entry = JunitTestHelper.createRandomRepositoryEntry(author);
dbInstance.commit();
@@ -81,8 +82,8 @@ public class CurriculumRepositoryEntryRelationDAOTest extends OlatTestCase {
@Test
public void getRepositoryEntries_withLectures() {
Curriculum curriculum = curriculumService.createCurriculum("cur-el-rel-2", "Curriculum for relation", "Curriculum", null);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-for-rel", "Element for relation", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.enabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-for-rel", "Element for relation", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.enabled, curriculum);
Identity author = JunitTestHelper.createAndPersistIdentityAsRndUser("cur-el-re-auth");
RepositoryEntry entryLecture = JunitTestHelper.createRandomRepositoryEntry(author);
RepositoryEntry entry = JunitTestHelper.createRandomRepositoryEntry(author);
@@ -105,8 +106,8 @@ public class CurriculumRepositoryEntryRelationDAOTest extends OlatTestCase {
@Test
public void getRepositoryEntries_withPermissions() {
Curriculum curriculum = curriculumService.createCurriculum("cur-el-rel-2", "Curriculum for checked relation", "Curriculum", null);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-for-rel", "Element for checked relation", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-for-rel", "Element for checked relation", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
Identity user = JunitTestHelper.createAndPersistIdentityAsRndUser("cur-el-re-not-user");
Identity author = JunitTestHelper.createAndPersistIdentityAsRndUser("cur-el-re-auth");
RepositoryEntry entryLecture = JunitTestHelper.createRandomRepositoryEntry(author);
@@ -137,8 +138,8 @@ public class CurriculumRepositoryEntryRelationDAOTest extends OlatTestCase {
@Test
public void getCurriculumElements() {
Curriculum curriculum = curriculumService.createCurriculum("cur-el-rel-2", "Curriculum for relation", "Curriculum", null);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-for-rel", "Element for relation", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-for-rel", "Element for relation", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
Identity author = JunitTestHelper.createAndPersistIdentityAsRndUser("cur-el-re-auth");
RepositoryEntry entry = JunitTestHelper.createRandomRepositoryEntry(author);
dbInstance.commit();
@@ -154,8 +155,8 @@ public class CurriculumRepositoryEntryRelationDAOTest extends OlatTestCase {
@Test
public void getCurriculumElementsRepositoryEntryAnsUser() {
Curriculum curriculum = curriculumService.createCurriculum("cur-el-rel-2", "Curriculum for relation", "Curriculum", null);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-for-rel", "Element for relation", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-for-rel", "Element for relation", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
Identity author = JunitTestHelper.createAndPersistIdentityAsRndUser("cur-el-re-auth");
RepositoryEntry entry = JunitTestHelper.createRandomRepositoryEntry(author);
dbInstance.commit();
diff --git a/src/test/java/org/olat/modules/curriculum/manager/CurriculumServiceTest.java b/src/test/java/org/olat/modules/curriculum/manager/CurriculumServiceTest.java
index 7241c0f20f31e3c9eb14ae6fae47ad89f4fc66e6..ac100772a502242a86b3df5c936000d5149915f6 100644
--- a/src/test/java/org/olat/modules/curriculum/manager/CurriculumServiceTest.java
+++ b/src/test/java/org/olat/modules/curriculum/manager/CurriculumServiceTest.java
@@ -31,6 +31,7 @@ import org.olat.modules.curriculum.Curriculum;
import org.olat.modules.curriculum.CurriculumCalendars;
import org.olat.modules.curriculum.CurriculumElement;
import org.olat.modules.curriculum.CurriculumElementMembership;
+import org.olat.modules.curriculum.CurriculumElementStatus;
import org.olat.modules.curriculum.CurriculumLectures;
import org.olat.modules.curriculum.CurriculumRef;
import org.olat.modules.curriculum.CurriculumRoles;
@@ -81,8 +82,8 @@ public class CurriculumServiceTest extends OlatTestCase {
@Test
public void getCurriculumElements() {
Curriculum curriculum = curriculumService.createCurriculum("CUR-2", "Curriculum 2", "Curriculum", null);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-for-rel", "Element for relation", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-for-rel", "Element for relation", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
Identity author = JunitTestHelper.createAndPersistIdentityAsRndUser("cur-el-re-auth");
RepositoryEntry publishedEntry = JunitTestHelper.createRandomRepositoryEntry(author);
RepositoryEntry reviewedEntry = JunitTestHelper.createRandomRepositoryEntry(author);
diff --git a/src/test/java/org/olat/modules/quality/analysis/manager/AnalysisFilterDAOTest.java b/src/test/java/org/olat/modules/quality/analysis/manager/AnalysisFilterDAOTest.java
index 7a890afc84f2c5b5df18e669c67c824db723a31d..6f6743d1dfe5292c97b63fefcbc3cd1005e03485 100644
--- a/src/test/java/org/olat/modules/quality/analysis/manager/AnalysisFilterDAOTest.java
+++ b/src/test/java/org/olat/modules/quality/analysis/manager/AnalysisFilterDAOTest.java
@@ -48,6 +48,7 @@ import org.olat.core.id.Organisation;
import org.olat.modules.curriculum.Curriculum;
import org.olat.modules.curriculum.CurriculumCalendars;
import org.olat.modules.curriculum.CurriculumElement;
+import org.olat.modules.curriculum.CurriculumElementStatus;
import org.olat.modules.curriculum.CurriculumElementType;
import org.olat.modules.curriculum.CurriculumLectures;
import org.olat.modules.curriculum.CurriculumService;
@@ -804,8 +805,10 @@ public class AnalysisFilterDAOTest extends OlatTestCase {
CurriculumElementType type1 = curriculumService.createCurriculumElementType("a", "b", null, null);
CurriculumElementType type2 = curriculumService.createCurriculumElementType("a", "b", null, null);
Curriculum curriculum = qualityTestHelper.createCurriculum();
- CurriculumElement element1 = curriculumService.createCurriculumElement("el", "Element", null, null, null, type1, disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element2 = curriculumService.createCurriculumElement("el", "Element", null, null, null, type2, disabled, CurriculumLectures.disabled, curriculum);;
+ CurriculumElement element1 = curriculumService.createCurriculumElement("el", "Element", CurriculumElementStatus.active,
+ null, null, null, type1, disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element2 = curriculumService.createCurriculumElement("el", "Element", CurriculumElementStatus.active,
+ null, null, null, type2, disabled, CurriculumLectures.disabled, curriculum);;
// Participation with curriculum element of type1
QualityDataCollection dc1 = qualityService.createDataCollection(asList(dcOrganisation), formEntry);
List<EvaluationFormParticipation> participations1 = qualityService.addParticipations(dc1, Collections.singletonList(executor));
@@ -1693,8 +1696,8 @@ public class AnalysisFilterDAOTest extends OlatTestCase {
Curriculum curriculum = qualityTestHelper.createCurriculum();
CurriculumElement element1 = qualityTestHelper.createCurriculumElement();
CurriculumElement element2 = qualityTestHelper.createCurriculumElement();
- CurriculumElement subElement = curriculumService.createCurriculumElement("el", "Element", null, null, element1, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement subElement = curriculumService.createCurriculumElement("el", "Element", CurriculumElementStatus.active,
+ null, null, element1, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
CurriculumElement otherElement = qualityTestHelper.createCurriculumElement();
// Participation with curriculum element
QualityDataCollection dc1 = qualityService.createDataCollection(asList(dcOrganisation), formEntry);
@@ -1738,8 +1741,8 @@ public class AnalysisFilterDAOTest extends OlatTestCase {
Curriculum curriculum = qualityTestHelper.createCurriculum();
CurriculumElement element1 = qualityTestHelper.createCurriculumElement();
CurriculumElement element2 = qualityTestHelper.createCurriculumElement();
- CurriculumElement subElement = curriculumService.createCurriculumElement("el", "Element", null, null, element1, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement subElement = curriculumService.createCurriculumElement("el", "Element", CurriculumElementStatus.active,
+ null, null, element1, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
CurriculumElement otherElement = qualityTestHelper.createCurriculumElement();
// Participation with curriculum element
QualityDataCollection dc1 = qualityService.createDataCollection(asList(dcOrganisation), formEntry);
@@ -1783,10 +1786,14 @@ public class AnalysisFilterDAOTest extends OlatTestCase {
CurriculumElementType type = curriculumService.createCurriculumElementType("a", "b", null, null);
CurriculumElementType typeOther = curriculumService.createCurriculumElementType("y", "z", null, null);
Curriculum curriculum = qualityTestHelper.createCurriculum();
- CurriculumElement element1 = curriculumService.createCurriculumElement("el", "Element", null, null, null, type, disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element2 = curriculumService.createCurriculumElement("el", "Element", null, null, null, type, disabled, CurriculumLectures.disabled, curriculum);;
- CurriculumElement elementNull = curriculumService.createCurriculumElement("el", "Element", null, null, null, null, disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement elementOther = curriculumService.createCurriculumElement("el", "Element", null, null, null, typeOther, disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1 = curriculumService.createCurriculumElement("el", "Element", CurriculumElementStatus.active,
+ null, null, null, type, disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element2 = curriculumService.createCurriculumElement("el", "Element", CurriculumElementStatus.active,
+ null, null, null, type, disabled, CurriculumLectures.disabled, curriculum);;
+ CurriculumElement elementNull = curriculumService.createCurriculumElement("el", "Element", CurriculumElementStatus.active,
+ null, null, null, null, disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement elementOther = curriculumService.createCurriculumElement("el", "Element", CurriculumElementStatus.active,
+ null, null, null, typeOther, disabled, CurriculumLectures.disabled, curriculum);
// Participation with curriculum element of type
QualityDataCollection dc1 = qualityService.createDataCollection(asList(dcOrganisation), formEntry);
List<EvaluationFormParticipation> participations1 = qualityService.addParticipations(dc1, Collections.singletonList(executor));
diff --git a/src/test/java/org/olat/modules/quality/data/ExampleData.java b/src/test/java/org/olat/modules/quality/data/ExampleData.java
index 7eb3b58b94e84ef9c04856785cfd11963183ab1d..c545dab6fc1aefec28f133236875a8da287edd17 100644
--- a/src/test/java/org/olat/modules/quality/data/ExampleData.java
+++ b/src/test/java/org/olat/modules/quality/data/ExampleData.java
@@ -43,6 +43,7 @@ import org.olat.core.id.Organisation;
import org.olat.modules.curriculum.Curriculum;
import org.olat.modules.curriculum.CurriculumCalendars;
import org.olat.modules.curriculum.CurriculumElement;
+import org.olat.modules.curriculum.CurriculumElementStatus;
import org.olat.modules.curriculum.CurriculumLectures;
import org.olat.modules.curriculum.CurriculumRoles;
import org.olat.modules.curriculum.CurriculumService;
@@ -163,8 +164,8 @@ public class ExampleData extends OlatTestCase {
return curriculumElements.get(0);
}
- return curriculumService.createCurriculumElement(identifier, displayName, null, null, input.getParent(), null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, input.getCurriculum());
+ return curriculumService.createCurriculumElement(identifier, displayName, CurriculumElementStatus.active,
+ null, null, input.getParent(), null, CurriculumCalendars.disabled, CurriculumLectures.disabled, input.getCurriculum());
}
private void createCurriculum(Organisation org, Parameter param) {
diff --git a/src/test/java/org/olat/modules/quality/generator/manager/titlecreator/CurriculumElementHandlerTest.java b/src/test/java/org/olat/modules/quality/generator/manager/titlecreator/CurriculumElementHandlerTest.java
index 4f2a57cbad13c8125116d0dd7cd99e2cb21af867..c0d21a943e6024af12ea2e58e9b79b8c18b157b8 100644
--- a/src/test/java/org/olat/modules/quality/generator/manager/titlecreator/CurriculumElementHandlerTest.java
+++ b/src/test/java/org/olat/modules/quality/generator/manager/titlecreator/CurriculumElementHandlerTest.java
@@ -30,6 +30,7 @@ import org.olat.core.id.Organisation;
import org.olat.modules.curriculum.Curriculum;
import org.olat.modules.curriculum.CurriculumCalendars;
import org.olat.modules.curriculum.CurriculumElement;
+import org.olat.modules.curriculum.CurriculumElementStatus;
import org.olat.modules.curriculum.CurriculumElementType;
import org.olat.modules.curriculum.CurriculumLectures;
import org.olat.modules.curriculum.CurriculumService;
@@ -96,8 +97,8 @@ public class CurriculumElementHandlerTest extends OlatTestCase {
String value = random();
Organisation organisation = organisationService.getDefaultOrganisation();
Curriculum curriculum = curriculumService.createCurriculum(random(), value, null, organisation);
- CurriculumElement element = curriculumService.createCurriculumElement(random(), random(), null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement(random(), random(), CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
String template = "$" + CurriculumElementHandler.CURRICULUM_DISPLAY_NAME;
String merged = titleCreator.merge(template, asList(element));
@@ -134,7 +135,7 @@ public class CurriculumElementHandlerTest extends OlatTestCase {
private CurriculumElement createCurriculumElement() {
Organisation organisation = organisationService.getDefaultOrganisation();
Curriculum curriculum = curriculumService.createCurriculum(random(), random(), null, organisation);
- return curriculumService.createCurriculumElement(random(), random(),
+ return curriculumService.createCurriculumElement(random(), random(), CurriculumElementStatus.active,
null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
}
diff --git a/src/test/java/org/olat/modules/quality/generator/provider/courselectures/manager/CourseLecturesProviderDAOTest.java b/src/test/java/org/olat/modules/quality/generator/provider/courselectures/manager/CourseLecturesProviderDAOTest.java
index cf7a3ee66ea36e7eed5588c87417b2c6c54c974b..15ebd381eb062ecb44327f81622148dcfd315000 100644
--- a/src/test/java/org/olat/modules/quality/generator/provider/courselectures/manager/CourseLecturesProviderDAOTest.java
+++ b/src/test/java/org/olat/modules/quality/generator/provider/courselectures/manager/CourseLecturesProviderDAOTest.java
@@ -37,6 +37,7 @@ import org.olat.core.id.Organisation;
import org.olat.modules.curriculum.Curriculum;
import org.olat.modules.curriculum.CurriculumCalendars;
import org.olat.modules.curriculum.CurriculumElement;
+import org.olat.modules.curriculum.CurriculumElementStatus;
import org.olat.modules.curriculum.CurriculumLectures;
import org.olat.modules.curriculum.CurriculumService;
import org.olat.modules.lecture.LectureBlock;
@@ -205,10 +206,10 @@ public class CourseLecturesProviderDAOTest extends OlatTestCase {
Identity teacher = JunitTestHelper.createAndPersistIdentityAsRndUser("");
Organisation organisation = organisationService.createOrganisation("org", "Org", null, null, null);
Curriculum curriculum = curriculumService.createCurriculum("Curriculum", "Curriculum", null, organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element", "Element", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement otherElement = curriculumService.createCurriculumElement("Element", "Element", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element", "Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement otherElement = curriculumService.createCurriculumElement("Element", "Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
RepositoryEntry course1 = JunitTestHelper.createAndPersistRepositoryEntry();
RepositoryEntry course2 = JunitTestHelper.createAndPersistRepositoryEntry();
RepositoryEntry otherCourse = JunitTestHelper.createAndPersistRepositoryEntry();
diff --git a/src/test/java/org/olat/modules/quality/generator/provider/curriculumelement/manager/CurriculumElementProviderDAOTest.java b/src/test/java/org/olat/modules/quality/generator/provider/curriculumelement/manager/CurriculumElementProviderDAOTest.java
index ce6cd601f1e718a205430ca7905dc5c54ffa82a3..abfc3970d5aa96381b9214380c5f6076b20b4feb 100644
--- a/src/test/java/org/olat/modules/quality/generator/provider/curriculumelement/manager/CurriculumElementProviderDAOTest.java
+++ b/src/test/java/org/olat/modules/quality/generator/provider/curriculumelement/manager/CurriculumElementProviderDAOTest.java
@@ -74,7 +74,7 @@ public class CurriculumElementProviderDAOTest extends OlatTestCase {
Organisation organisation = organisationService.createOrganisation(random(), random(), null, null, null);
CurriculumElementType ceType = curriculumService.createCurriculumElementType(random(), random(), null, null);
Curriculum curriculum = curriculumService.createCurriculum(random(), random(), null, organisation);
- CurriculumElement curriculumElement = curriculumService.createCurriculumElement(random(), random(),
+ CurriculumElement curriculumElement = curriculumService.createCurriculumElement(random(), random(), CurriculumElementStatus.active,
oneDayAgo(), inOneDay(), null, ceType, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
@@ -89,12 +89,12 @@ public class CurriculumElementProviderDAOTest extends OlatTestCase {
Organisation organisation = organisationService.createOrganisation(random(), random(), null, null, null);
List<Organisation> organisations = Collections.singletonList(organisation);
Curriculum curriculum = curriculumService.createCurriculum(random(), random(), null, organisation);
- CurriculumElement curriculumElement = curriculumService.createCurriculumElement(random(), random(),
+ CurriculumElement curriculumElement = curriculumService.createCurriculumElement(random(), random(), CurriculumElementStatus.active,
oneDayAgo(), inOneDay(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
QualityGenerator generator = generatorService.createGenerator(random(), organisations);
dbInstance.commitAndCloseSession();
- CurriculumElement curriculumElementCreated = curriculumService.createCurriculumElement(random(), random(),
+ CurriculumElement curriculumElementCreated = curriculumService.createCurriculumElement(random(), random(), CurriculumElementStatus.active,
oneDayAgo(), inOneDay(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
RepositoryEntry formEntry = JunitTestHelper.createAndPersistRepositoryEntry();
qualityService.createDataCollection(organisations, formEntry, generator, curriculumElementCreated.getKey());
@@ -111,22 +111,22 @@ public class CurriculumElementProviderDAOTest extends OlatTestCase {
public void shouldFilterByOrganisation() {
Organisation organisationSuper = organisationService.createOrganisation(random(), random(), null, null, null);
Curriculum curriculumSuper = curriculumService.createCurriculum(random(), random(), null, organisationSuper);
- CurriculumElement curriculumElementSuperOrg = curriculumService.createCurriculumElement(random(), random(),
+ CurriculumElement curriculumElementSuperOrg = curriculumService.createCurriculumElement(random(), random(), CurriculumElementStatus.active,
oneDayAgo(), inOneDay(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculumSuper);
Organisation organisation = organisationService.createOrganisation(random(), random(), null, organisationSuper, null);
Curriculum curriculum = curriculumService.createCurriculum(random(), random(), null, organisation);
- CurriculumElement curriculumElement = curriculumService.createCurriculumElement(random(), random(),
+ CurriculumElement curriculumElement = curriculumService.createCurriculumElement(random(), random(), CurriculumElementStatus.active,
oneDayAgo(), inOneDay(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
Organisation organisationSub = organisationService.createOrganisation(random(), random(), null, organisation, null);
Curriculum curriculumSubOrg = curriculumService.createCurriculum(random(), random(), null, organisationSub);
- CurriculumElement curriculumElementSubOrg = curriculumService.createCurriculumElement(random(), random(),
+ CurriculumElement curriculumElementSubOrg = curriculumService.createCurriculumElement(random(), random(), CurriculumElementStatus.active,
oneDayAgo(), inOneDay(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculumSubOrg);
Organisation otherOrganisation = organisationService.createOrganisation(random(), random(), null, null, null);
Curriculum otherCurriculum = curriculumService.createCurriculum(random(), random(), null, otherOrganisation);
- CurriculumElement otherCurriculumElement = curriculumService.createCurriculumElement(random(), random(),
+ CurriculumElement otherCurriculumElement = curriculumService.createCurriculumElement(random(), random(), CurriculumElementStatus.active,
oneDayAgo(), inOneDay(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, otherCurriculum);
dbInstance.commitAndCloseSession();
@@ -144,12 +144,12 @@ public class CurriculumElementProviderDAOTest extends OlatTestCase {
Organisation organisation = organisationService.createOrganisation(random(), random(), null, null, null);
CurriculumElementType ceType = curriculumService.createCurriculumElementType(random(), random(), null, null);
Curriculum curriculum = curriculumService.createCurriculum(random(), random(), null, organisation);
- CurriculumElement curriculumElement = curriculumService.createCurriculumElement(random(), random(),
+ CurriculumElement curriculumElement = curriculumService.createCurriculumElement(random(), random(), CurriculumElementStatus.active,
oneDayAgo(), inOneDay(), null, ceType, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
CurriculumElementType otherCeType = curriculumService.createCurriculumElementType(random(), random(), null, null);
- CurriculumElement otherCurriculumElement = curriculumService.createCurriculumElement(random(), random(),
+ CurriculumElement otherCurriculumElement = curriculumService.createCurriculumElement(random(), random(), CurriculumElementStatus.active,
oneDayAgo(), inOneDay(), null, otherCeType, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
@@ -166,11 +166,11 @@ public class CurriculumElementProviderDAOTest extends OlatTestCase {
Curriculum curriculum = curriculumService.createCurriculum(random(), random(), null, organisation);
dbInstance.commitAndCloseSession();
- CurriculumElement curriculumElement1 = curriculumService.createCurriculumElement(random(), random(),
+ CurriculumElement curriculumElement1 = curriculumService.createCurriculumElement(random(), random(), CurriculumElementStatus.active,
oneDayAgo(), inOneDay(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement curriculumElement2 = curriculumService.createCurriculumElement(random(), random(),
+ CurriculumElement curriculumElement2 = curriculumService.createCurriculumElement(random(), random(), CurriculumElementStatus.active,
oneDayAgo(), inOneDay(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement otherCurriculumElement = curriculumService.createCurriculumElement(random(), random(),
+ CurriculumElement otherCurriculumElement = curriculumService.createCurriculumElement(random(), random(), CurriculumElementStatus.active,
oneDayAgo(), inOneDay(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
@@ -189,13 +189,13 @@ public class CurriculumElementProviderDAOTest extends OlatTestCase {
Curriculum curriculum = curriculumService.createCurriculum(random(), random(), null, organisation);
dbInstance.commitAndCloseSession();
- CurriculumElement beginBeforeFrom = curriculumService.createCurriculumElement(random(), random(),
+ CurriculumElement beginBeforeFrom = curriculumService.createCurriculumElement(random(), random(), CurriculumElementStatus.active,
oneYearAgo(), oneYearAgo(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement beginBetweenFromAndTo = curriculumService.createCurriculumElement(random(), random(),
+ CurriculumElement beginBetweenFromAndTo = curriculumService.createCurriculumElement(random(), random(), CurriculumElementStatus.active,
oneDayAgo(), oneDayAgo(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement beginAfterTo = curriculumService.createCurriculumElement(random(), random(),
+ CurriculumElement beginAfterTo = curriculumService.createCurriculumElement(random(), random(), CurriculumElementStatus.active,
inOneDay(), inOneDay(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement beginNull = curriculumService.createCurriculumElement(random(), random(),
+ CurriculumElement beginNull = curriculumService.createCurriculumElement(random(), random(), CurriculumElementStatus.active,
null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
beginAfterTo.setBeginDate(inOneDay());
dbInstance.commitAndCloseSession();
@@ -215,13 +215,13 @@ public class CurriculumElementProviderDAOTest extends OlatTestCase {
Curriculum curriculum = curriculumService.createCurriculum(random(), random(), null, organisation);
dbInstance.commitAndCloseSession();
- CurriculumElement endBeforeFrom = curriculumService.createCurriculumElement(random(), random(),
+ CurriculumElement endBeforeFrom = curriculumService.createCurriculumElement(random(), random(), CurriculumElementStatus.active,
oneYearAgo(), oneYearAgo(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement endBetweenFromAndTo = curriculumService.createCurriculumElement(random(), random(),
+ CurriculumElement endBetweenFromAndTo = curriculumService.createCurriculumElement(random(), random(), CurriculumElementStatus.active,
oneDayAgo(), oneDayAgo(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement endAfterTo = curriculumService.createCurriculumElement(random(), random(),
+ CurriculumElement endAfterTo = curriculumService.createCurriculumElement(random(), random(), CurriculumElementStatus.active,
inOneDay(), inOneDay(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement endNull = curriculumService.createCurriculumElement(random(), random(),
+ CurriculumElement endNull = curriculumService.createCurriculumElement(random(), random(), CurriculumElementStatus.active,
null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
endAfterTo.setBeginDate(inOneDay());
dbInstance.commitAndCloseSession();
@@ -239,15 +239,15 @@ public class CurriculumElementProviderDAOTest extends OlatTestCase {
public void shouldFilterActiveOnly() {
Organisation organisation = organisationService.createOrganisation(random(), random(), null, null, null);
Curriculum curriculum = curriculumService.createCurriculum(random(), random(), null, organisation);
- CurriculumElement active = curriculumService.createCurriculumElement(random(), random(),
+ CurriculumElement active = curriculumService.createCurriculumElement(random(), random(), CurriculumElementStatus.active,
oneDayAgo(), inOneDay(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
- CurriculumElement inactive = curriculumService.createCurriculumElement(random(), random(),
+ CurriculumElement inactive = curriculumService.createCurriculumElement(random(), random(), CurriculumElementStatus.active,
oneDayAgo(), inOneDay(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
inactive.setElementStatus(CurriculumElementStatus.inactive);
inactive = curriculumService.updateCurriculumElement(inactive);
- CurriculumElement deleted = curriculumService.createCurriculumElement(random(), random(),
+ CurriculumElement deleted = curriculumService.createCurriculumElement(random(), random(), CurriculumElementStatus.active,
oneDayAgo(), inOneDay(), null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
deleted.setElementStatus(CurriculumElementStatus.deleted);
deleted = curriculumService.updateCurriculumElement(deleted);
diff --git a/src/test/java/org/olat/modules/quality/manager/CurriculumElementQualityContextBuilderTest.java b/src/test/java/org/olat/modules/quality/manager/CurriculumElementQualityContextBuilderTest.java
index f127489702a6f2c3c42b58635bfd4b14a37c123c..6987910c4fb76dcc424c480d9cb4774da9df616f 100644
--- a/src/test/java/org/olat/modules/quality/manager/CurriculumElementQualityContextBuilderTest.java
+++ b/src/test/java/org/olat/modules/quality/manager/CurriculumElementQualityContextBuilderTest.java
@@ -36,6 +36,7 @@ import org.olat.core.id.Organisation;
import org.olat.modules.curriculum.Curriculum;
import org.olat.modules.curriculum.CurriculumCalendars;
import org.olat.modules.curriculum.CurriculumElement;
+import org.olat.modules.curriculum.CurriculumElementStatus;
import org.olat.modules.curriculum.CurriculumLectures;
import org.olat.modules.curriculum.CurriculumRoles;
import org.olat.modules.curriculum.CurriculumService;
@@ -111,12 +112,12 @@ public class CurriculumElementQualityContextBuilderTest extends OlatTestCase {
Curriculum curriculum2 = curriculumService.createCurriculum(UUID.randomUUID().toString(), "Curriculum 2", "",
curriculumOrganisation2);
- CurriculumElement curriculumElementParent = curriculumService
- .createCurriculumElement(UUID.randomUUID().toString(), "Element", null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum2);
- CurriculumElement curriculumElement = curriculumService.createCurriculumElement(UUID.randomUUID().toString(),
- "Element 1", null, null, curriculumElementParent, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum1);
- CurriculumElement otherCurriculumElement = curriculumService.createCurriculumElement(UUID.randomUUID().toString(),
- "Element 2", null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum2);
+ CurriculumElement curriculumElementParent = curriculumService.createCurriculumElement(UUID.randomUUID().toString(), "Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum2);
+ CurriculumElement curriculumElement = curriculumService.createCurriculumElement(UUID.randomUUID().toString(), "Element 1", CurriculumElementStatus.active,
+ null, null, curriculumElementParent, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum1);
+ CurriculumElement otherCurriculumElement = curriculumService.createCurriculumElement(UUID.randomUUID().toString(), "Element 2", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum2);
RepositoryEntry entry = JunitTestHelper.createAndPersistRepositoryEntry();
curriculumService.addRepositoryEntry(curriculumElement, entry, true);
@@ -192,8 +193,8 @@ public class CurriculumElementQualityContextBuilderTest extends OlatTestCase {
Curriculum curriculum = curriculumService.createCurriculum(UUID.randomUUID().toString(), "Curriculum", "",
organisationExecutorAndCurriculum);
- CurriculumElement curriculumElement = curriculumService.createCurriculumElement(UUID.randomUUID().toString(), "Element", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement curriculumElement = curriculumService.createCurriculumElement(UUID.randomUUID().toString(), "Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
curriculumElement = curriculumService.getCurriculumElement(curriculumElement);
@@ -225,8 +226,8 @@ public class CurriculumElementQualityContextBuilderTest extends OlatTestCase {
Curriculum curriculum = curriculumService.createCurriculum(UUID.randomUUID().toString(), "Curriculum", "",
organisationCurriculumOnly);
- CurriculumElement curriculumElement = curriculumService.createCurriculumElement(UUID.randomUUID().toString(), "Element", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement curriculumElement = curriculumService.createCurriculumElement(UUID.randomUUID().toString(), "Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
curriculumElement = curriculumService.getCurriculumElement(curriculumElement);
@@ -259,8 +260,8 @@ public class CurriculumElementQualityContextBuilderTest extends OlatTestCase {
Curriculum curriculum = curriculumService.createCurriculum(UUID.randomUUID().toString(), "Curriculum", "",
organisationExecutorAndCurriculumButManager);
- CurriculumElement curriculumElement = curriculumService.createCurriculumElement(UUID.randomUUID().toString(), "Element", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement curriculumElement = curriculumService.createCurriculumElement(UUID.randomUUID().toString(), "Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
curriculumElement = curriculumService.getCurriculumElement(curriculumElement);
@@ -280,8 +281,8 @@ public class CurriculumElementQualityContextBuilderTest extends OlatTestCase {
@Test
public void shouldNotDeleteContextOfOtherRoles() {
Curriculum curriculum = curriculumService.createCurriculum(UUID.randomUUID().toString(), "Curriculum", "", null);
- CurriculumElement curriculumElement = curriculumService.createCurriculumElement(UUID.randomUUID().toString(),
- "Curriculum", null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement curriculumElement = curriculumService.createCurriculumElement(UUID.randomUUID().toString(), "Curriculum", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
Identity executor = JunitTestHelper.createAndPersistIdentityAsRndAuthor("");
QualityDataCollection dataCollection = qualityTestHelper.createDataCollection();
List<EvaluationFormParticipation> participations = qualityService.addParticipations(dataCollection,
diff --git a/src/test/java/org/olat/modules/quality/manager/QualityTestHelper.java b/src/test/java/org/olat/modules/quality/manager/QualityTestHelper.java
index 98b14ce01a8b226212d7b8aa36159728b3cc32cd..8c81a9e7d24edc02c14092698fc7cea75626f171 100644
--- a/src/test/java/org/olat/modules/quality/manager/QualityTestHelper.java
+++ b/src/test/java/org/olat/modules/quality/manager/QualityTestHelper.java
@@ -34,6 +34,7 @@ import org.olat.core.id.Organisation;
import org.olat.modules.curriculum.Curriculum;
import org.olat.modules.curriculum.CurriculumCalendars;
import org.olat.modules.curriculum.CurriculumElement;
+import org.olat.modules.curriculum.CurriculumElementStatus;
import org.olat.modules.curriculum.CurriculumLectures;
import org.olat.modules.curriculum.CurriculumService;
import org.olat.modules.forms.EvaluationFormManager;
@@ -248,7 +249,8 @@ public class QualityTestHelper {
}
public CurriculumElement createCurriculumElement(Curriculum curriculum) {
- return curriculumService.createCurriculumElement("i", "d", null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ return curriculumService.createCurriculumElement("i", "d", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
}
public RepositoryEntry createRepositoryEntry() {
diff --git a/src/test/java/org/olat/modules/quality/manager/RepositoryEntryQualityContextBuilderTest.java b/src/test/java/org/olat/modules/quality/manager/RepositoryEntryQualityContextBuilderTest.java
index 81ee4a6270633bba7976d91fb8d89bc4f2927e7a..1014ce0138745b4d1bb56c5497ac9b90f0e97392 100644
--- a/src/test/java/org/olat/modules/quality/manager/RepositoryEntryQualityContextBuilderTest.java
+++ b/src/test/java/org/olat/modules/quality/manager/RepositoryEntryQualityContextBuilderTest.java
@@ -39,6 +39,7 @@ import org.olat.core.id.Organisation;
import org.olat.modules.curriculum.Curriculum;
import org.olat.modules.curriculum.CurriculumCalendars;
import org.olat.modules.curriculum.CurriculumElement;
+import org.olat.modules.curriculum.CurriculumElementStatus;
import org.olat.modules.curriculum.CurriculumLectures;
import org.olat.modules.curriculum.CurriculumRoles;
import org.olat.modules.curriculum.CurriculumService;
@@ -126,14 +127,14 @@ public class RepositoryEntryQualityContextBuilderTest extends OlatTestCase {
Curriculum curriculum3 = curriculumService.createCurriculum(UUID.randomUUID().toString(), "Curriculum 3", "",
curriculumOrganisation3);
CurriculumElement curriculumElement1 = curriculumService.createCurriculumElement(UUID.randomUUID().toString(),
- "Element 1", null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum1);
+ "Element 1", CurriculumElementStatus.active, null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum1);
CurriculumElement curriculumElement2Parent = curriculumService
- .createCurriculumElement(UUID.randomUUID().toString(), "Element 2 parent", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum2);
- CurriculumElement curriculumElement2 = curriculumService.createCurriculumElement(UUID.randomUUID().toString(),
- "Element 2", null, null, curriculumElement2Parent, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum2);
+ .createCurriculumElement(UUID.randomUUID().toString(), "Element 2 parent", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum2);
+ CurriculumElement curriculumElement2 = curriculumService.createCurriculumElement(UUID.randomUUID().toString(), "Element 2",
+ CurriculumElementStatus.active, null, null, curriculumElement2Parent, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum2);
CurriculumElement curriculumElement3 = curriculumService.createCurriculumElement(UUID.randomUUID().toString(),
- "Element 3", null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum3);
+ "Element 3", CurriculumElementStatus.active, null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum3);
curriculumService.addRepositoryEntry(curriculumElement1, entry, true);
curriculumService.addRepositoryEntry(curriculumElement2, entry, true);
curriculumService.addRepositoryEntry(curriculumElement3, entry, true);
@@ -223,14 +224,14 @@ public class RepositoryEntryQualityContextBuilderTest extends OlatTestCase {
Curriculum curriculumOther = curriculumService.createCurriculum(UUID.randomUUID().toString(), "Other curriculum", "",
curriculumOrganisationOther);
CurriculumElement curriculumElement1 = curriculumService.createCurriculumElement(UUID.randomUUID().toString(),
- "Element 1", null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum1);
+ "Element 1", CurriculumElementStatus.active, null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum1);
CurriculumElement curriculumElement2Parent = curriculumService
- .createCurriculumElement(UUID.randomUUID().toString(), "Element 2 parent", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum2);
+ .createCurriculumElement(UUID.randomUUID().toString(), "Element 2 parent", CurriculumElementStatus.active,
+ null, null, null, null, null, CurriculumLectures.disabled, curriculum2);
CurriculumElement curriculumElement2 = curriculumService.createCurriculumElement(UUID.randomUUID().toString(),
- "Element 2", null, null, curriculumElement2Parent, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum2);
+ "Element 2", CurriculumElementStatus.active, null, null, curriculumElement2Parent, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum2);
CurriculumElement curriculumElementOther = curriculumService.createCurriculumElement(UUID.randomUUID().toString(),
- "Other element", null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculumOther);
+ "Other element", CurriculumElementStatus.active, null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculumOther);
curriculumService.addRepositoryEntry(curriculumElement1, entry, true);
curriculumService.addRepositoryEntry(curriculumElement2, entry, true);
Taxonomy taxonomy = taxonomyService.createTaxonomy(UUID.randomUUID().toString(), "Taxonomy", "", null);
@@ -312,22 +313,22 @@ public class RepositoryEntryQualityContextBuilderTest extends OlatTestCase {
Curriculum curriculum1 = curriculumService.createCurriculum(UUID.randomUUID().toString(), "Curriculum 1", "",
organisationExecutorAndCurriculum1);
- CurriculumElement curriculumElement1 = curriculumService.createCurriculumElement(UUID.randomUUID().toString(), "Element 1", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum1);
+ CurriculumElement curriculumElement1 = curriculumService.createCurriculumElement(UUID.randomUUID().toString(), "Element 1", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum1);
curriculumService.addMember(curriculumElement1, executor, CurriculumRoles.participant);
curriculumService.addRepositoryEntry(curriculumElement1, entry, true);
Curriculum curriculum2 = curriculumService.createCurriculum(UUID.randomUUID().toString(), "Curriculum 2", "",
organisationExecutorAndCurriculum2);
- CurriculumElement curriculumElement2 = curriculumService.createCurriculumElement(UUID.randomUUID().toString(), "Element 2", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum2);
+ CurriculumElement curriculumElement2 = curriculumService.createCurriculumElement(UUID.randomUUID().toString(), "Element 2", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum2);
curriculumService.addMember(curriculumElement2, executor, CurriculumRoles.participant);
curriculumService.addRepositoryEntry(curriculumElement2, entry, true);
Curriculum curriculum3 = curriculumService.createCurriculum(UUID.randomUUID().toString(), "Curriculum 3", "",
organisationExecutorAndCurriculumButManager);
- CurriculumElement curriculumElement3 = curriculumService.createCurriculumElement(UUID.randomUUID().toString(), "Element 3", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum3);
+ CurriculumElement curriculumElement3 = curriculumService.createCurriculumElement(UUID.randomUUID().toString(), "Element 3", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum3);
curriculumService.addMember(curriculumElement3, executor, CurriculumRoles.participant);
curriculumService.addRepositoryEntry(curriculumElement3, entry, true);
@@ -373,8 +374,8 @@ public class RepositoryEntryQualityContextBuilderTest extends OlatTestCase {
Curriculum curriculum3 = curriculumService.createCurriculum(UUID.randomUUID().toString(), "Curriculum", "",
organisationExecutorAndCurriculumButManager);
- CurriculumElement curriculumElement3 = curriculumService.createCurriculumElement(UUID.randomUUID().toString(),
- "Element", null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum3);
+ CurriculumElement curriculumElement3 = curriculumService.createCurriculumElement(UUID.randomUUID().toString(), "Element", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum3);
curriculumService.addMember(curriculumElement3, executor, CurriculumRoles.participant);
curriculumService.addRepositoryEntry(curriculumElement3, entry, true);
diff --git a/src/test/java/org/olat/restapi/CurriculumElementsWebServiceTest.java b/src/test/java/org/olat/restapi/CurriculumElementsWebServiceTest.java
index d5ce90fcb1d4586e59d502479c55a250d5c82452..ab7beeb9883728de7aa7bf9fe9262e9f98e3a204 100644
--- a/src/test/java/org/olat/restapi/CurriculumElementsWebServiceTest.java
+++ b/src/test/java/org/olat/restapi/CurriculumElementsWebServiceTest.java
@@ -51,6 +51,7 @@ import org.olat.modules.curriculum.Curriculum;
import org.olat.modules.curriculum.CurriculumCalendars;
import org.olat.modules.curriculum.CurriculumElement;
import org.olat.modules.curriculum.CurriculumElementManagedFlag;
+import org.olat.modules.curriculum.CurriculumElementStatus;
import org.olat.modules.curriculum.CurriculumElementToTaxonomyLevel;
import org.olat.modules.curriculum.CurriculumElementType;
import org.olat.modules.curriculum.CurriculumLectures;
@@ -106,10 +107,10 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Organisation organisation = organisationService.createOrganisation("Curriculum org.", "curr-org", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element1 = curriculumService.createCurriculumElement("Element-1", "Element 1", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element1_1 = curriculumService.createCurriculumElement("Element-1.1", "Element 1.1", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1 = curriculumService.createCurriculumElement("Element-1", "Element 1", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1_1 = curriculumService.createCurriculumElement("Element-1.1", "Element 1.1", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
RestConnection conn = new RestConnection();
@@ -142,8 +143,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Organisation organisation = organisationService.createOrganisation("Curriculum org.", "curr-org", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-1", "Element 1", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-1", "Element 1", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
RestConnection conn = new RestConnection();
@@ -165,14 +166,14 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Organisation organisation = organisationService.createOrganisation("Curriculum org.", "curr-org", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-1", "Element 1", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element_1 = curriculumService.createCurriculumElement("Element-1.1", "Element 1.1", null, null, element, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element_2 = curriculumService.createCurriculumElement("Element-1.2", "Element 1.2", null, null, element, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element_3 = curriculumService.createCurriculumElement("Element-1.3", "Element 1.3", null, null, element, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-1", "Element 1", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element_1 = curriculumService.createCurriculumElement("Element-1.1", "Element 1.1", CurriculumElementStatus.active,
+ null, null, element, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element_2 = curriculumService.createCurriculumElement("Element-1.2", "Element 1.2", CurriculumElementStatus.active,
+ null, null, element, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element_3 = curriculumService.createCurriculumElement("Element-1.3", "Element 1.3", CurriculumElementStatus.active,
+ null, null, element, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
RestConnection conn = new RestConnection();
@@ -213,8 +214,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Organisation organisation = organisationService.createOrganisation("Curriculum org.", "curr-org", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element1 = curriculumService.createCurriculumElement("Element-3", "Element 3", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1 = curriculumService.createCurriculumElement("Element-3", "Element 3", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
CurriculumElementVO vo = new CurriculumElementVO();
@@ -270,8 +271,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Organisation organisation = organisationService.createOrganisation("REST Parent Organisation 2 ", "REST-p-2-organisation", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-5", "Element 5", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-5", "Element 5", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
CurriculumElementType type = curriculumService.createCurriculumElementType("TYPE-2", "Type 2", "", "");
dbInstance.commitAndCloseSession();
@@ -334,10 +335,10 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", defOrganisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-5", "Element 5", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element_1 = curriculumService.createCurriculumElement("Element-5.1", "Element 5.1", null, null, element, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-5", "Element 5", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element_1 = curriculumService.createCurriculumElement("Element-5.1", "Element 5.1", CurriculumElementStatus.active,
+ null, null, element, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
CurriculumElementVO vo = new CurriculumElementVO();
@@ -368,8 +369,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Organisation organisation = organisationService.createOrganisation("REST Parent Organisation 2 ", "REST-p-2-organisation", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-6", "Element 6", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-6", "Element 6", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
CurriculumElementVO vo = CurriculumElementVO.valueOf(element);
@@ -413,12 +414,12 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Organisation organisation = organisationService.createOrganisation("REST Parent Organisation 2 ", "REST-p-2-organisation", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element1 = curriculumService.createCurriculumElement("Element-8", "Element 8", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element1_1 = curriculumService.createCurriculumElement("Element-8.1", "Element 8.1", null, null, element1, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
- CurriculumElement element2 = curriculumService.createCurriculumElement("Element-9", "Element 9", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1 = curriculumService.createCurriculumElement("Element-8", "Element 8", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element1_1 = curriculumService.createCurriculumElement("Element-8.1", "Element 8.1", CurriculumElementStatus.active,
+ null, null, element1, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element2 = curriculumService.createCurriculumElement("Element-9", "Element 9", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
@@ -454,8 +455,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Organisation organisation = organisationService.createOrganisation("REST Parent Organisation 2 ", "REST-p-2-organisation", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-10", "Element 10", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-10", "Element 10", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
Curriculum otherCurriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
dbInstance.commitAndCloseSession();
@@ -482,8 +483,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Organisation organisation = organisationService.createOrganisation("REST Parent Organisation 4", "REST-p-4-organisation", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-11", "Element 11", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-11", "Element 11", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
Identity author = JunitTestHelper.createAndPersistIdentityAsRndAuthor("rest-auth-1");
RepositoryEntry course = JunitTestHelper.createRandomRepositoryEntry(author);
@@ -512,8 +513,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Organisation organisation = organisationService.createOrganisation("REST Parent Organisation 4", "REST-p-4-organisation", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-11", "Element 11", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-11", "Element 11", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
Identity author = JunitTestHelper.createAndPersistIdentityAsRndAuthor("rest-auth-1");
RepositoryEntry course = JunitTestHelper.createRandomRepositoryEntry(author);
@@ -546,8 +547,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Organisation organisation = organisationService.createOrganisation("REST Parent Organisation 4", "REST-p-4-organisation", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-11", "Element 11", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-11", "Element 11", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
Identity author = JunitTestHelper.createAndPersistIdentityAsRndAuthor("rest-auth-1");
RepositoryEntry course = JunitTestHelper.createRandomRepositoryEntry(author);
@@ -582,8 +583,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Organisation organisation = organisationService.createOrganisation("REST Parent Organisation 4", "REST-p-4-organisation", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-11", "Element 11", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-11", "Element 11", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
RestConnection conn = new RestConnection();
@@ -622,8 +623,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Organisation organisation = organisationService.createOrganisation("REST Parent Organisation 5", "REST-p-5-organisation", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-12", "Element 12", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-12", "Element 12", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
RestConnection conn = new RestConnection();
@@ -661,8 +662,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Organisation organisation = organisationService.createOrganisation("REST Parent Organisation 5", "REST-p-5-organisation", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-12", "Element 12", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-12", "Element 12", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
RestConnection conn = new RestConnection();
@@ -692,8 +693,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Organisation organisation = organisationService.createOrganisation("REST Parent Organisation 8", "REST-p-8-organisation", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-14", "Element 14", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-14", "Element 14", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
RestConnection conn = new RestConnection();
@@ -722,8 +723,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Organisation organisation = organisationService.createOrganisation("REST Parent Organisation 8", "REST-p-8-organisation", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-14", "Element 14", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-14", "Element 14", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
RestConnection conn = new RestConnection();
@@ -752,8 +753,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Organisation organisation = organisationService.createOrganisation("REST Parent Organisation 9", "REST-p-9-organisation", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-15", "Element 15", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-15", "Element 15", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
RestConnection conn = new RestConnection();
@@ -782,8 +783,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Organisation organisation = organisationService.createOrganisation("REST Parent Organisation 10", "REST-p-10-organisation", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-16", "Element 16", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-16", "Element 16", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
RestConnection conn = new RestConnection();
@@ -812,8 +813,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Organisation organisation = organisationService.createOrganisation("REST Parent Organisation 10", "REST-p-10-organisation", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-16", "Element 16", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-16", "Element 16", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
RestConnection conn = new RestConnection();
@@ -842,8 +843,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Identity member = JunitTestHelper.createAndPersistIdentityAsRndUser("element-member-1");
Organisation organisation = organisationService.createOrganisation("REST Parent Organisation 5", "REST-p-5-organisation", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-12", "Element 12", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-12", "Element 12", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
RestConnection conn = new RestConnection();
@@ -878,8 +879,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Identity participant = JunitTestHelper.createAndPersistIdentityAsRndUser("element-member-11");
Organisation organisation = organisationService.createOrganisation("REST Parent Organisation 11", "REST-p-11-organisation", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-17", "Element 17", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-17", "Element 17", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
RestConnection conn = new RestConnection();
@@ -906,8 +907,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Identity coach = JunitTestHelper.createAndPersistIdentityAsRndUser("element-member-12");
Organisation organisation = organisationService.createOrganisation("REST Parent Organisation 12", "REST-p-12-organisation", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-18", "Element 18", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-18", "Element 18", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
RestConnection conn = new RestConnection();
@@ -935,8 +936,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Identity participant2 = JunitTestHelper.createAndPersistIdentityAsRndUser("element-member-14");
Organisation organisation = organisationService.createOrganisation("REST Parent Organisation 13", "REST-p-13-organisation", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-18", "Element 18", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-18", "Element 18", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
RestConnection conn = new RestConnection();
@@ -968,8 +969,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Identity coach2 = JunitTestHelper.createAndPersistIdentityAsRndUser("element-member-16");
Organisation organisation = organisationService.createOrganisation("REST Parent Organisation 16", "REST-p-16-organisation", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-20", "Element 20", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-20", "Element 20", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
RestConnection conn = new RestConnection();
@@ -1000,8 +1001,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Identity member = JunitTestHelper.createAndPersistIdentityAsRndUser("element-member-1");
Organisation organisation = organisationService.createOrganisation("REST Parent Organisation 5", "REST-p-5-organisation", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-12", "Element 12", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-12", "Element 12", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
RestConnection conn = new RestConnection();
@@ -1032,8 +1033,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Identity coach = JunitTestHelper.createAndPersistIdentityAsRndUser("element-member-22");
Organisation organisation = organisationService.createOrganisation("REST Parent Organisation 21", "REST-p-21-organisation", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-21", "Element 21", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-21", "Element 21", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
RestConnection conn = new RestConnection();
@@ -1065,8 +1066,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Identity coach = JunitTestHelper.createAndPersistIdentityAsRndUser("element-member-24");
Organisation organisation = organisationService.createOrganisation("REST Parent Organisation 24", "REST-p-24-organisation", "", defOrganisation, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-24", "Element 24", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-24", "Element 24", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
RestConnection conn = new RestConnection();
@@ -1095,8 +1096,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
throws IOException, URISyntaxException {
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", defOrganisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-24", "Element 24", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-24", "Element 24", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
Taxonomy taxonomy = taxonomyDao.createTaxonomy("ID-350", "Leveled taxonomy", null, null);
@@ -1123,8 +1124,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
throws IOException, URISyntaxException {
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", defOrganisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-24", "Element 24", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-24", "Element 24", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
Taxonomy taxonomy = taxonomyDao.createTaxonomy("ID-351", "Leveled taxonomy", null, null);
TaxonomyLevel level = taxonomyLevelDao.createTaxonomyLevel("ID-Level-0", "My first taxonomy level", "A basic level", null, null, null, null, taxonomy);
@@ -1154,8 +1155,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
throws IOException, URISyntaxException {
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", defOrganisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-24", "Element 24", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-24", "Element 24", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
Taxonomy taxonomy = taxonomyDao.createTaxonomy("ID-352", "Leveled taxonomy", null, null);
TaxonomyLevel level = taxonomyLevelDao.createTaxonomyLevel("ID-Level-0", "My first taxonomy level", "A basic level", null, null, null, null, taxonomy);
@@ -1190,8 +1191,8 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
throws IOException, URISyntaxException {
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", defOrganisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Element-30", "Element 24", null, null, null, null,
- CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Element-30", "Element 24", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
Taxonomy taxonomy = taxonomyDao.createTaxonomy("ID-353", "Leveled taxonomy", null, null);
TaxonomyLevel level1 = taxonomyLevelDao.createTaxonomyLevel("ID-Level-1", "My first taxonomy level", "A basic level", null, null, null, null, taxonomy);
diff --git a/src/test/java/org/olat/restapi/CurriculumsWebServiceTest.java b/src/test/java/org/olat/restapi/CurriculumsWebServiceTest.java
index 9f38b8cbb08473d8dcb7d0cd1ab70eba01d07114..a647e3f62deb521f5c1e6065751abd52c51129a5 100644
--- a/src/test/java/org/olat/restapi/CurriculumsWebServiceTest.java
+++ b/src/test/java/org/olat/restapi/CurriculumsWebServiceTest.java
@@ -51,6 +51,7 @@ import org.olat.core.logging.Tracing;
import org.olat.modules.curriculum.Curriculum;
import org.olat.modules.curriculum.CurriculumCalendars;
import org.olat.modules.curriculum.CurriculumElement;
+import org.olat.modules.curriculum.CurriculumElementStatus;
import org.olat.modules.curriculum.CurriculumLectures;
import org.olat.modules.curriculum.CurriculumManagedFlag;
import org.olat.modules.curriculum.CurriculumRoles;
@@ -314,8 +315,8 @@ public class CurriculumsWebServiceTest extends OlatJerseyTestCase {
throws IOException, URISyntaxException {
Organisation organisation = organisationService.createOrganisation("Curriculum org.", "curr-org", "", null, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("Unkown", "Element 1", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("Unkown", "Element 1", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commit();
String externalId = UUID.randomUUID().toString();
element.setExternalId(externalId);
@@ -343,8 +344,8 @@ public class CurriculumsWebServiceTest extends OlatJerseyTestCase {
Organisation organisation = organisationService.createOrganisation("Curriculum org.", "curr-org", "", null, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
String identifier = UUID.randomUUID().toString();
- CurriculumElement element = curriculumService.createCurriculumElement(identifier, "Element 1", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement(identifier, "Element 1", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
RestConnection conn = new RestConnection();
@@ -367,8 +368,8 @@ public class CurriculumsWebServiceTest extends OlatJerseyTestCase {
throws IOException, URISyntaxException {
Organisation organisation = organisationService.createOrganisation("Curriculum org.", "curr-org", "", null, null);
Curriculum curriculum = curriculumService.createCurriculum("REST-Curriculum-elements", "REST Curriculum", "A curriculum accessible by REST API for elemets", organisation);
- CurriculumElement element = curriculumService.createCurriculumElement("by-key", "Element 1", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement element = curriculumService.createCurriculumElement("by-key", "Element 1", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
dbInstance.commitAndCloseSession();
RestConnection conn = new RestConnection();
diff --git a/src/test/java/org/olat/restapi/LecturesBlocksTest.java b/src/test/java/org/olat/restapi/LecturesBlocksTest.java
index 7921842afbe17339514f659104e8881206b1f70c..f701db17e5b17ac9606c7758cb788b5751356b82 100644
--- a/src/test/java/org/olat/restapi/LecturesBlocksTest.java
+++ b/src/test/java/org/olat/restapi/LecturesBlocksTest.java
@@ -54,6 +54,7 @@ import org.olat.course.ICourse;
import org.olat.modules.curriculum.Curriculum;
import org.olat.modules.curriculum.CurriculumCalendars;
import org.olat.modules.curriculum.CurriculumElement;
+import org.olat.modules.curriculum.CurriculumElementStatus;
import org.olat.modules.curriculum.CurriculumLectures;
import org.olat.modules.curriculum.CurriculumService;
import org.olat.modules.lecture.LectureBlock;
@@ -481,8 +482,8 @@ public class LecturesBlocksTest extends OlatJerseyTestCase {
dbInstance.commit();
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Curriculum curriculum = curriculumService.createCurriculum("add-group", "Add group REST", "", defOrganisation);
- CurriculumElement curriculumElement = curriculumService.createCurriculumElement("add-group", "Add element group", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement curriculumElement = curriculumService.createCurriculumElement("add-group", "Add element group", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
curriculumService.addRepositoryEntry(curriculumElement, entry, true);
dbInstance.commit();
@@ -518,8 +519,8 @@ public class LecturesBlocksTest extends OlatJerseyTestCase {
dbInstance.commit();
Organisation defOrganisation = organisationService.getDefaultOrganisation();
Curriculum curriculum = curriculumService.createCurriculum("rm-group", "Remove group REST", "", defOrganisation);
- CurriculumElement curriculumElement = curriculumService.createCurriculumElement("rm-group", "Remove element group", null, null, null,
- null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
+ CurriculumElement curriculumElement = curriculumService.createCurriculumElement("rm-group", "Remove element group", CurriculumElementStatus.active,
+ null, null, null, null, CurriculumCalendars.disabled, CurriculumLectures.disabled, curriculum);
curriculumService.addRepositoryEntry(curriculumElement, entry, true);
dbInstance.commit();
lectureService.save(block, Collections.singletonList(curriculumElement.getGroup()));