Skip to content

Commit

Permalink
Online Student Scheduling: Variable Title Courses
Browse files Browse the repository at this point in the history 
- added ability to include student id in the course lookup
- added ability to provide a different SQL for each campus
- moved the dash checking (query may include course title) into the SQL query
  • Loading branch information
@tomas-muller
tomas-muller committed Jan 28, 2022
1 parent bcb4fc6 commit 4162f61
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 22 deletions.
4 changes: 2 additions & 2 deletions JavaSource/org/unitime/timetable/gwt/server/SectioningServlet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3909,7 +3909,7 @@ public Collection<VariableTitleCourseInfo> listVariableTitleCourses(StudentSecti
VariableTitleCourseProvider provider = Customization.VariableTitleCourseProvider.getProvider();
OnlineSectioningHelper helper = new OnlineSectioningHelper(SessionDAO.getInstance().getSession(), currentUser(cx));

return provider.getVariableTitleCourses(query, limit, server, helper);
return provider.getVariableTitleCourses(query, limit, cx.getStudentId(), server, helper);
}

@Override
Expand All @@ -3927,7 +3927,7 @@ public VariableTitleCourseInfo getVariableTitleCourse(StudentSectioningContext c
VariableTitleCourseProvider provider = Customization.VariableTitleCourseProvider.getProvider();
OnlineSectioningHelper helper = new OnlineSectioningHelper(SessionDAO.getInstance().getSession(), currentUser(cx));

return provider.getVariableTitleCourse(course, server, helper);
return provider.getVariableTitleCourse(course, cx.getStudentId(), server, helper);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions JavaSource/org/unitime/timetable/onlinesectioning/custom/VariableTitleCourseProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
*/
public interface VariableTitleCourseProvider {

public Collection<VariableTitleCourseInfo> getVariableTitleCourses(String query, int limit, OnlineSectioningServer server, OnlineSectioningHelper helper);
public VariableTitleCourseInfo getVariableTitleCourse(String course, OnlineSectioningServer server, OnlineSectioningHelper helper);
public Collection<VariableTitleCourseInfo> getVariableTitleCourses(String query, int limit, Long studentId, OnlineSectioningServer server, OnlineSectioningHelper helper);
public VariableTitleCourseInfo getVariableTitleCourse(String course, Long studentId, OnlineSectioningServer server, OnlineSectioningHelper helper);

public void dispose();
}
39 changes: 21 additions & 18 deletions ...g/unitime/timetable/onlinesectioning/custom/purdue/PurdueVariableTitleCourseProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.unitime.timetable.gwt.shared.OnlineSectioningInterface.GradeMode;
import org.unitime.timetable.gwt.shared.SpecialRegistrationInterface.VariableTitleCourseInfo;
import org.unitime.timetable.model.DepartmentalInstructor;
import org.unitime.timetable.onlinesectioning.AcademicSessionInfo;
import org.unitime.timetable.onlinesectioning.OnlineSectioningHelper;
import org.unitime.timetable.onlinesectioning.OnlineSectioningServer;
import org.unitime.timetable.onlinesectioning.custom.CourseDetailsProvider;
Expand Down Expand Up @@ -61,16 +62,20 @@ public PurdueVariableTitleCourseProvider() {
}
}

protected String getVariableTitleCourseSQL() {
return ApplicationProperties.getProperty("purdue.vt.variableTitleCourseSQL",
"select c.subj_code, c.crse_numb, c.crse_title, c.credit_hr_ind, c.credit_hr_low, c.credit_hr_high, c.gmod_code, c.gmod_desc, c.gmod_default_ind " +
"from timetable.szgv_reg_vartl_course c, timetable.subject_area sa where " +
"concat(concat(c.subj_code, ' '), c.crse_numb) like :query and c.attr_code = 'VART' and " +
"c.course_effective_term <= :term and :term < c.course_end_term and " +
"c.attr_effective_term <= :term and :term < c.attr_end_term and " +
"c.gmod_effective_term <= :term and :term < c.gmod_end_term and " +
"c.subj_code = sa.subject_area_abbreviation and sa.session_id = :sessionId " +
"order by c.subj_code, c.crse_numb, c.gmod_code");
protected String getVariableTitleCourseSQL(AcademicSessionInfo session) {
return ApplicationProperties.getProperty("purdue.vt.variableTitleCourseSQL." + session.getCampus(),
ApplicationProperties.getProperty("purdue.vt.variableTitleCourseSQL",
"select c.subj_code, c.crse_numb, c.crse_title, c.credit_hr_ind, c.credit_hr_low, c.credit_hr_high, c.gmod_code, c.gmod_desc, c.gmod_default_ind " +
"from timetable.szgv_reg_vartl_course c, timetable.subject_area sa where " +
"(concat(concat(c.subj_code, ' '), c.crse_numb) like :query or concat(concat(c.subj_code, ' '), concat(c.crse_numb, concat(' - ', c.crse_title))) like :query) and "+
"c.attr_code = 'VART' and " +
"c.course_effective_term <= :term and :term < c.course_end_term and " +
"c.attr_effective_term <= :term and :term < c.attr_end_term and " +
"c.gmod_effective_term <= :term and :term < c.gmod_end_term and " +
"c.subj_code = sa.subject_area_abbreviation and sa.session_id = :sessionId and " +
":studentId is not null " +
"order by c.subj_code, c.crse_numb, c.gmod_code")
);
}

protected String getInstructorNameFormat() {
Expand All @@ -82,13 +87,12 @@ protected String getDisclaimer() {
}

@Override
public Collection<VariableTitleCourseInfo> getVariableTitleCourses(String query, int limit, OnlineSectioningServer server, OnlineSectioningHelper helper) {
org.hibernate.Query q = helper.getHibSession().createSQLQuery(getVariableTitleCourseSQL());
if (query != null && query.indexOf(" - ") >= 0)
query = query.substring(0, query.indexOf(" - "));
public Collection<VariableTitleCourseInfo> getVariableTitleCourses(String query, int limit, Long studentId, OnlineSectioningServer server, OnlineSectioningHelper helper) {
org.hibernate.Query q = helper.getHibSession().createSQLQuery(getVariableTitleCourseSQL(server.getAcademicSession()));
q.setText("query", query == null ? "%" : query.toUpperCase() + "%");
q.setText("term", iExternalTermProvider.getExternalTerm(server.getAcademicSession()));
q.setLong("sessionId", server.getAcademicSession().getUniqueId());
q.setLong("studentId", studentId);
if (limit > 0)
q.setMaxResults(5 * limit);

Expand Down Expand Up @@ -143,13 +147,12 @@ public Collection<VariableTitleCourseInfo> getVariableTitleCourses(String query,
}

@Override
public VariableTitleCourseInfo getVariableTitleCourse(String query, OnlineSectioningServer server, OnlineSectioningHelper helper) {
org.hibernate.Query q = helper.getHibSession().createSQLQuery(getVariableTitleCourseSQL());
if (query != null && query.indexOf(" - ") >= 0)
query = query.substring(0, query.indexOf(" - "));
public VariableTitleCourseInfo getVariableTitleCourse(String query, Long studentId, OnlineSectioningServer server, OnlineSectioningHelper helper) {
org.hibernate.Query q = helper.getHibSession().createSQLQuery(getVariableTitleCourseSQL(server.getAcademicSession()));
q.setText("query", query.toUpperCase());
q.setText("term", iExternalTermProvider.getExternalTerm(server.getAcademicSession()));
q.setLong("sessionId", server.getAcademicSession().getUniqueId());
q.setLong("studentId", studentId);

NameFormat nameFormat = NameFormat.fromReference(getInstructorNameFormat());

Expand Down

0 comments on commit 4162f61

Please sign in to comment.