Skip to content

Commit b90a91b

Browse files
tomas-mullertomas-muller
committed
Dependent Courses: Custom Course Request Validation
- a few message changes
1 parent 7227aca commit b90a91b

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

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

Lines changed: 10 additions & 10 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} in the same request.")
1063+
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Prerequisite course {parent} on the same request line.")
10641064
.replace("{parent}", parent.getCourseName())
10651065
.replace("{course}", rc.getCourseName()),
10661066
!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} in the same request.")
1113+
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Prerequisite course {parent} on the same request line.")
11141114
.replace("{parent}", parent.getCourseName())
11151115
.replace("{course}", rc.getCourseName()),
11161116
!alreadyExist ? CONF_UNITIME : CONF_NONE);
@@ -1260,11 +1260,11 @@ 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 in the same request. You will not be able to get both coures."),
1263+
"A course and its prerequisite 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 coures."),
1267+
"A prerequisite 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" : "") +
@@ -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} in the same request.")
1973+
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Prerequisite course {parent} on the same request line.")
19741974
.replace("{parent}", parent.getCourseName())
19751975
.replace("{course}", rc.getCourseName())
19761976
, 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} in the same request.")
2012+
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Prerequisite 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} in the same request.")
4117+
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Prerequisite course {parent} on the same request line.")
41184118
.replace("{parent}", parent.getCourseName())
41194119
.replace("{course}", rc.getCourseName()),
41204120
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} in the same request.")
4159+
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Prerequisite course {parent} on the same request line.")
41604160
.replace("{parent}", parent.getCourseName())
41614161
.replace("{course}", rc.getCourseName()),
41624162
CONF_UNITIME);
@@ -4206,11 +4206,11 @@ 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 in the same request. The student will not be able to get both coures."),
4209+
"A course and its prerequisite 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 coures."),
4213+
"A prerequisite 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" : "") +

‎JavaSource/org/unitime/timetable/onlinesectioning/custom/purdue/SimplifiedCourseRequestsValidationProvider.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ else if (original.hasAdvisorRequests() && isWaitListNoAlts())
601601
RequestedCourse parent = r.getCourse(rc.getParentCourseId());
602602
if (parent != null) {
603603
request.addConfirmationMessage(rc.getCourseId(), rc.getCourseName(), "PARENT_SAME_REQ",
604-
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Prerequisite course {parent} in the same request.")
604+
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Prerequisite course {parent} on the same request line.")
605605
.replace("{parent}", parent.getCourseName())
606606
.replace("{course}", rc.getCourseName())
607607
, ORD_UNITIME);
@@ -640,7 +640,7 @@ else if (original.hasAdvisorRequests() && isWaitListNoAlts())
640640
RequestedCourse parent = r.getCourse(rc.getParentCourseId());
641641
if (parent != null) {
642642
request.addConfirmationMessage(rc.getCourseId(), rc.getCourseName(), "PARENT_SAME_REQ",
643-
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Prerequisite course {parent} in the same request.")
643+
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Prerequisite course {parent} on the same request line.")
644644
.replace("{parent}", parent.getCourseName())
645645
.replace("{course}", rc.getCourseName())
646646
, ORD_UNITIME);
@@ -940,7 +940,7 @@ else if (original.hasAdvisorRequests() && isWaitListNoAlts())
940940
XCourseRequest cr = original.getRequestForCourse(rc.getCourseId());
941941
boolean alreadyExist = (cr != null && cr.hasCourse(rc.getParentCourseId()));
942942
response.addMessage(rc.getCourseId(), rc.getCourseName(), "PARENT_SAME_REQ",
943-
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Prerequisite course {parent} in the same request.")
943+
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Prerequisite course {parent} on the same request line.")
944944
.replace("{parent}", parent.getCourseName())
945945
.replace("{course}", rc.getCourseName()),
946946
!alreadyExist ? CONF_UNITIME : CONF_NONE);
@@ -990,7 +990,7 @@ else if (original.hasAdvisorRequests() && isWaitListNoAlts())
990990
XCourseRequest cr = original.getRequestForCourse(rc.getCourseId());
991991
boolean alreadyExist = (cr != null && cr.hasCourse(rc.getParentCourseId()));
992992
response.addMessage(rc.getCourseId(), rc.getCourseName(), "PARENT_SAME_REQ",
993-
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Prerequisite course {parent} in the same request.")
993+
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Prerequisite course {parent} on the same request line.")
994994
.replace("{parent}", parent.getCourseName())
995995
.replace("{course}", rc.getCourseName()),
996996
!alreadyExist ? CONF_UNITIME : CONF_NONE);
@@ -1499,11 +1499,11 @@ else if (server.getConfig().getPropertyBoolean("General.CheckUnavailabilitiesFro
14991499

15001500
if (questionParentSameReq)
15011501
response.addConfirmation(ApplicationProperties.getProperty("purdue.specreg.messages.question.parentSameRequest", (line > 2 ? "\n" : "") +
1502-
"A course and its prerequisite are in the same request. You will not be able to get both coures."),
1502+
"A course and its prerequisite are on the same request line. You will not be able to get both courses."),
15031503
CONF_UNITIME, line ++);
15041504
if (questionParentSubstitute)
15051505
response.addConfirmation(ApplicationProperties.getProperty("purdue.specreg.messages.question.parentSubstitute", (line > 2 ? "\n" : "") +
1506-
"A prerequisite course is requested as a substitute. You may not be able to get both coures."),
1506+
"A prerequisite course is requested as a substitute. You may not be able to get both courses."),
15071507
CONF_UNITIME, line ++);
15081508
if (questionNoParent)
15091509
response.addConfirmation(ApplicationProperties.getProperty("purdue.specreg.messages.question.noParent", (line > 2 ? "\n" : "") +
@@ -1828,7 +1828,7 @@ public void validateAdvisorRecommendations(OnlineSectioningServer server, Online
18281828
RequestedCourse parent = r.getCourse(rc.getParentCourseId());
18291829
if (parent != null) {
18301830
response.addMessage(rc.getCourseId(), rc.getCourseName(), "PARENT_SAME_REQ",
1831-
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Prerequisite course {parent} in the same request.")
1831+
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Prerequisite course {parent} on the same request line.")
18321832
.replace("{parent}", parent.getCourseName())
18331833
.replace("{course}", rc.getCourseName()),
18341834
CONF_UNITIME);
@@ -1870,7 +1870,7 @@ public void validateAdvisorRecommendations(OnlineSectioningServer server, Online
18701870
RequestedCourse parent = r.getCourse(rc.getParentCourseId());
18711871
if (parent != null) {
18721872
response.addMessage(rc.getCourseId(), rc.getCourseName(), "PARENT_SAME_REQ",
1873-
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Prerequisite course {parent} in the same request.")
1873+
ApplicationProperties.getProperty("purdue.specreg.messages.parentSameRequest", "Prerequisite course {parent} on the same request line.")
18741874
.replace("{parent}", parent.getCourseName())
18751875
.replace("{course}", rc.getCourseName()),
18761876
CONF_UNITIME);
@@ -2271,11 +2271,11 @@ else if (server.getConfig().getPropertyBoolean("General.CheckUnavailabilitiesFro
22712271
CONF_UNITIME, line ++);
22722272
if (questionParentSameReq)
22732273
response.addConfirmation(ApplicationProperties.getProperty("purdue.specreg.messages.acr.parentSameRequest", (line > 2 ? "\n" : "") +
2274-
"A course and its prerequisite are in the same request. The student will not be able to get both coures."),
2274+
"A course and its prerequisite are on the same request line. The student will not be able to get both courses."),
22752275
CONF_UNITIME, line ++);
22762276
if (questionParentSubstitute)
22772277
response.addConfirmation(ApplicationProperties.getProperty("purdue.specreg.messages.acr.parentSubstitute", (line > 2 ? "\n" : "") +
2278-
"A prerequisite course is requested as a substitute. The student may not be able to get both coures."),
2278+
"A prerequisite course is requested as a substitute. The student may not be able to get both courses."),
22792279
CONF_UNITIME, line ++);
22802280
if (questionNoParent)
22812281
response.addConfirmation(ApplicationProperties.getProperty("purdue.specreg.messages.acr.noParent", (line > 2 ? "\n" : "") +

0 commit comments

Comments
 (0)