Skip to content

Commit 6b31c02

Browse files
committed
Dependent Courses: Labels
- Prerequisite course changed to associated course
1 parent 8354f86 commit 6b31c02

File tree

12 files changed

+60
-60
lines changed

12 files changed

+60
-60
lines changed

JavaSource/org/unitime/localization/messages/CourseMessages.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5502,7 +5502,7 @@ public interface CourseMessages extends Messages {
55025502
@DefaultMessage("Course Offerings")
55035503
String rollForwardCourseOfferings();
55045504

5505-
@DefaultMessage("Prerequisite Course Offerings")
5505+
@DefaultMessage("Associated Course Offerings")
55065506
String rollForwardParentCourseOfferings();
55075507

55085508
@DefaultMessage("Class Instructors")
@@ -5617,7 +5617,7 @@ public interface CourseMessages extends Messages {
56175617
@DefaultMessage("Include Wait-Listing and Prohibited Overrides")
56185618
String checkIncludeWaitListAndOverrides();
56195619

5620-
@DefaultMessage("Include Prerequisite Course Settings")
5620+
@DefaultMessage("Include Associated Course Settings")
56215621
String checkIncludeParentOfferings();
56225622

56235623
@DefaultMessage("Scheduling Subpart Level Time Preference Options:")
@@ -6073,15 +6073,15 @@ public interface CourseMessages extends Messages {
60736073
@DefaultMessage("Show student conflicts:")
60746074
String propertyShowStudentConflicts();
60756075

6076-
@DefaultMessage("Prerequisite")
6076+
@DefaultMessage("Associated Course")
60776077
String columnParentCourse();
60786078

6079-
@DefaultMessage("Prerequisite Course:")
6079+
@DefaultMessage("Associated Course:")
60806080
String propertyParentCourseOffering();
60816081

6082-
@DefaultMessage("If both this course and the prerequisite course are requested by a student, the student scheduling student solver cannot assign the student this course when the prerequisite course is not assigned.")
6082+
@DefaultMessage("If both this course and the associated course are requested by a student, the student scheduling student solver cannot assign the student this course when the associated course is not assigned.")
60836083
String descParentCourseOffering();
60846084

6085-
@DefaultMessage("No Prerequisite Course")
6085+
@DefaultMessage("No Associated Course")
60866086
String itemNoParentCourse();
60876087
}

JavaSource/org/unitime/timetable/defaults/ApplicationProperty.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3768,7 +3768,7 @@ public enum ApplicationProperty {
37683768

37693769
@Type(Boolean.class)
37703770
@DefaultValue("false")
3771-
@Description("Student Scheduling: provide prerequisite (parent) course -- a student requesting both courses cannot get the course without also getting the prerequisite course")
3771+
@Description("Student Scheduling: provide associated (parent) course -- a student requesting both courses cannot get the course without also getting the associated course")
37723772
@Since(4.9)
37733773
StudentSchedulingParentCourse("unitime.sectioning.parentCourse"),
37743774

JavaSource/org/unitime/timetable/gwt/resources/StudentSectioningMessages.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3801,9 +3801,9 @@ public interface StudentSectioningMessages extends Messages {
38013801
@DefaultMessage("A reservation that must be followed is full.")
38023802
String unavailableMustTakeReservationIsFull();
38033803

3804-
@DefaultMessage("Not-assigned prerequisite course {0}.")
3804+
@DefaultMessage("Not-assigned associated course {0}.")
38053805
String notAssignedParentCourse(String course);
38063806

3807-
@DefaultMessage("Not-Assigned Prerequisite Course Issues")
3807+
@DefaultMessage("Not-Assigned Associated Course Issues")
38083808
String reportDependentCourseIssues();
38093809
}

JavaSource/org/unitime/timetable/onlinesectioning/custom/purdue/PurdueCourseRequestsValidationProvider.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,7 +1060,7 @@ else if (original.hasAdvisorRequests() && isWaitListNoAlts())
10601060
XCourseRequest cr = original.getRequestForCourse(rc.getCourseId());
10611061
boolean alreadyExist = (cr != null && cr.hasCourse(rc.getParentCourseId()));
10621062
response.addMessage(rc.getCourseId(), rc.getCourseName(), "PARENT_SAME_REQ",
1063-
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Prerequisite course {parent} on the same request line.")
1063+
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Associated course {parent} on the same request line.")
10641064
.replace("{parent}", parent.getCourseName())
10651065
.replace("{course}", rc.getCourseName()),
10661066
!alreadyExist ? CONF_UNITIME : CONF_NONE);
@@ -1077,7 +1077,7 @@ else if (original.hasAdvisorRequests() && isWaitListNoAlts())
10771077
XCourseRequest acr = original.getRequestForCourse(rc.getParentCourseId());
10781078
boolean alreadyExist = (cr != null && acr != null && !cr.isAlternative() && acr.isAlternative());
10791079
response.addMessage(rc.getCourseId(), rc.getCourseName(), "PARENT_SUBST",
1080-
ApplicationProperties.getProperty("purdue.specreg.messages.parentSubstitute", "Prerequisite course {parent} is requested as a substitute.")
1080+
ApplicationProperties.getProperty("purdue.specreg.messages.parentSubstitute", "Associated course {parent} is requested as a substitute.")
10811081
.replace("{parent}", parent.getCourseName())
10821082
.replace("{course}", rc.getCourseName()),
10831083
!alreadyExist ? CONF_UNITIME : CONF_NONE);
@@ -1110,7 +1110,7 @@ else if (original.hasAdvisorRequests() && isWaitListNoAlts())
11101110
XCourseRequest cr = original.getRequestForCourse(rc.getCourseId());
11111111
boolean alreadyExist = (cr != null && cr.hasCourse(rc.getParentCourseId()));
11121112
response.addMessage(rc.getCourseId(), rc.getCourseName(), "PARENT_SAME_REQ",
1113-
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Prerequisite course {parent} on the same request line.")
1113+
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Associated course {parent} on the same request line.")
11141114
.replace("{parent}", parent.getCourseName())
11151115
.replace("{course}", rc.getCourseName()),
11161116
!alreadyExist ? CONF_UNITIME : CONF_NONE);
@@ -1260,15 +1260,15 @@ else if (original.hasAdvisorRequests() && isWaitListNoAlts())
12601260
CONF_UNITIME, line ++);
12611261
if (questionParentSameReq)
12621262
response.addConfirmation(ApplicationProperties.getProperty("purdue.specreg.messages.question.parentSameRequest", (line > 2 ? "\n" : "") +
1263-
"A course and its prerequisite are on the same request line. You will not be able to get both courses."),
1263+
"A course and its associated course are on the same request line. You will not be able to get both courses."),
12641264
CONF_UNITIME, line ++);
12651265
if (questionParentSubstitute)
12661266
response.addConfirmation(ApplicationProperties.getProperty("purdue.specreg.messages.question.parentSubstitute", (line > 2 ? "\n" : "") +
1267-
"A prerequisite course is requested as a substitute. You may not be able to get both courses."),
1267+
"An associated course is requested as a substitute. You may not be able to get both courses."),
12681268
CONF_UNITIME, line ++);
12691269
if (questionNoParent)
12701270
response.addConfirmation(ApplicationProperties.getProperty("purdue.specreg.messages.question.noParent", (line > 2 ? "\n" : "") +
1271-
"A course depends on another course. You will not be able to get the course if you do not request the prerequisite course unless you have already taken the prerequisite course in the past."),
1271+
"A course depends on another course. You will not be able to get the course if you do not request the associated course unless you have already taken the associated course in the past."),
12721272
CONF_UNITIME, line ++);
12731273
if (questionTimeConflict)
12741274
response.addConfirmation(ApplicationProperties.getProperty("purdue.specreg.messages.timeConflicts", (line > 2 ? "\n" : "") +
@@ -1970,7 +1970,7 @@ else if (original.hasAdvisorRequests() && isWaitListNoAlts())
19701970
RequestedCourse parent = r.getCourse(rc.getParentCourseId());
19711971
if (parent != null) {
19721972
request.addConfirmationMessage(rc.getCourseId(), rc.getCourseName(), "PARENT_SAME_REQ",
1973-
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Prerequisite course {parent} on the same request line.")
1973+
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Associated course {parent} on the same request line.")
19741974
.replace("{parent}", parent.getCourseName())
19751975
.replace("{course}", rc.getCourseName())
19761976
, ORD_UNITIME);
@@ -1983,7 +1983,7 @@ else if (original.hasAdvisorRequests() && isWaitListNoAlts())
19831983
if (a != null) {
19841984
RequestedCourse parent = a.getCourse(rc.getParentCourseId());
19851985
request.addConfirmationMessage(rc.getCourseId(), rc.getCourseName(), "PARENT_SUBST",
1986-
ApplicationProperties.getProperty("purdue.specreg.messages.parentSubstitute", "Prerequisite course {parent} is requested as a substitute.")
1986+
ApplicationProperties.getProperty("purdue.specreg.messages.parentSubstitute", "Associated course {parent} is requested as a substitute.")
19871987
.replace("{parent}", parent.getCourseName())
19881988
.replace("{course}", rc.getCourseName())
19891989
, ORD_UNITIME);
@@ -2009,7 +2009,7 @@ else if (original.hasAdvisorRequests() && isWaitListNoAlts())
20092009
RequestedCourse parent = r.getCourse(rc.getParentCourseId());
20102010
if (parent != null) {
20112011
request.addConfirmationMessage(rc.getCourseId(), rc.getCourseName(), "PARENT_SAME_REQ",
2012-
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Prerequisite course {parent} on the same request line.")
2012+
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Associated course {parent} on the same request line.")
20132013
.replace("{parent}", parent.getCourseName())
20142014
.replace("{course}", rc.getCourseName())
20152015
, ORD_UNITIME);
@@ -4114,7 +4114,7 @@ else if (onlineOnly)
41144114
RequestedCourse parent = r.getCourse(rc.getParentCourseId());
41154115
if (parent != null) {
41164116
response.addMessage(rc.getCourseId(), rc.getCourseName(), "PARENT_SAME_REQ",
4117-
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Prerequisite course {parent} on the same request line.")
4117+
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Associated course {parent} on the same request line.")
41184118
.replace("{parent}", parent.getCourseName())
41194119
.replace("{course}", rc.getCourseName()),
41204120
CONF_UNITIME);
@@ -4128,7 +4128,7 @@ else if (onlineOnly)
41284128
if (a != null) {
41294129
RequestedCourse parent = a.getCourse(rc.getParentCourseId());
41304130
response.addMessage(rc.getCourseId(), rc.getCourseName(), "PARENT_SUBST",
4131-
ApplicationProperties.getProperty("purdue.specreg.messages.parentSubstitute", "Prerequisite course {parent} is requested as a substitute.")
4131+
ApplicationProperties.getProperty("purdue.specreg.messages.parentSubstitute", "Associated course {parent} is requested as a substitute.")
41324132
.replace("{parent}", parent.getCourseName())
41334133
.replace("{course}", rc.getCourseName()),
41344134
CONF_UNITIME);
@@ -4156,7 +4156,7 @@ else if (onlineOnly)
41564156
RequestedCourse parent = r.getCourse(rc.getParentCourseId());
41574157
if (parent != null) {
41584158
response.addMessage(rc.getCourseId(), rc.getCourseName(), "PARENT_SAME_REQ",
4159-
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Prerequisite course {parent} on the same request line.")
4159+
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Associated course {parent} on the same request line.")
41604160
.replace("{parent}", parent.getCourseName())
41614161
.replace("{course}", rc.getCourseName()),
41624162
CONF_UNITIME);
@@ -4206,15 +4206,15 @@ else if (onlineOnly)
42064206
CONF_UNITIME, line ++);
42074207
if (questionParentSameReq)
42084208
response.addConfirmation(ApplicationProperties.getProperty("purdue.specreg.messages.acr.parentSameRequest", (line > 2 ? "\n" : "") +
4209-
"A course and its prerequisite are on the same request line. The student will not be able to get both courses."),
4209+
"A course and its associated course are on the same request line. The student will not be able to get both courses."),
42104210
CONF_UNITIME, line ++);
42114211
if (questionParentSubstitute)
42124212
response.addConfirmation(ApplicationProperties.getProperty("purdue.specreg.messages.acr.parentSubstitute", (line > 2 ? "\n" : "") +
4213-
"A prerequisite course is requested as a substitute. The student may not be able to get both courses."),
4213+
"An associated course is requested as a substitute. The student may not be able to get both courses."),
42144214
CONF_UNITIME, line ++);
42154215
if (questionNoParent)
42164216
response.addConfirmation(ApplicationProperties.getProperty("purdue.specreg.messages.acr.noParent", (line > 2 ? "\n" : "") +
4217-
"A course depends on another course. The student will not be able to get the course if they do not request the prerequisite course, unless they have already taken the prerequisite course in the past."),
4217+
"A course depends on another course. The student will not be able to get the course if they do not request the associated course, unless they have already taken the associated course in the past."),
42184218
CONF_UNITIME, line ++);
42194219
if (questionTimeConflict)
42204220
response.addConfirmation(ApplicationProperties.getProperty("purdue.specreg.messages.acr.timeConflicts", (line > 2 ? "\n" : "") +

0 commit comments

Comments
 (0)