small fix + rebase

course_preference.py

@@ -9,12 +9,11 @@
 course_preference_bp = Blueprint('course_preference', __name__)
 
 
-def delete_old_preferences(researcher_id, course_ids, current_year):
+def delete_old_preferences(researcher_id, current_year):
  try:
  db.session.query(PreferenceAssignment).filter(
  PreferenceAssignment.researcher_id == researcher_id,
  PreferenceAssignment.course_year == current_year,
- PreferenceAssignment.course_id.in_(course_ids)
  ).delete()
  db.session.commit()
  except Exception as e:
@@ -41,8 +40,7 @@ def save_preference():
  if researcher is None:
  flash("Researcher not found", "error")
 
- new_course_ids = {preference['course_id'] for preference in preferences}
- delete_old_preferences(researcher.id, new_course_ids, current_year)
+ delete_old_preferences(researcher.id, current_year)
 
  rank = 0
  for preference in preferences:

db.py

@@ -125,7 +125,7 @@ class PreferenceAssignment(db.Model):
  )
 
  course = db.relationship('Course', backref=db.backref('course_preference_assignment', lazy=True))
- researcher = db.relationship('Researcher', backref=db.backref('researcher_preference_assignment', lazy=True))
+ researcher = db.relationship('Researcher', backref=db.backref('preferences', lazy=True))
 
 
 class Configuration(db.Model):

templates/layout.html

@@ -39,10 +39,12 @@
  href="{{ url_for('user.user_profile', user_id=session.user_id) }}">My
  Profile</a>
  </li>
- <li>
- <a class="nav-link"
- href="{{ url_for('user.preferences', user_id=session.user_id, current_year=dynamic_year) }}">Preferences</a>
- </li>
+ {% if is_researcher %}
+ <li>
+ <a class="nav-link"
+ href="{{ url_for('user.preferences', user_id=session.user_id, current_year=dynamic_year) }}">Preferences</a>
+ </li>
+ {% endif %}
  <li>
  <a class="nav-link"
  href="{{ url_for('course.evaluations', user_id=session.user_id, current_year=dynamic_year) }}">Evaluations</a>
@@ -96,8 +98,8 @@
  </ul>
  </li>
  <li>
- <a class="nav-link"
- href="{{ url_for('config.manage_years', configurations=configurations) }}">Configurations</a>
+  <a class="nav-link"
+  href="{{ url_for('config.manage_years', configurations=configurations) }}">Configurations</a>
  </li>
  {% endif %}
  {% block additionalnav %}{% endblock %}
@@ -106,7 +108,8 @@
  <div class="me-0">
  <div class="navbar-text me-2">
  <input type="text" class="form-control form-control-sm" id="dynamicYearInput"
- value="{{ dynamic_year }} - {{ dynamic_year + 1 }}" style="width: 100px;" disabled>
+ value="{{ dynamic_year }} - {{ dynamic_year + 1 }}" style="width: 100px;"
+ disabled>
  </div>
  </div>
 

templates/user_profile.html

@@ -27,10 +27,6 @@ <h1>{{ requested_user.first_name }} {{ requested_user.name }}</h1>
  <ul class="nav nav-tabs">
  <li class="nav-item"><a class="nav-link active" data-bs-toggle="tab" href="#profile">My profile</a>
  </li>
- {% if is_researcher %}
- <li class="nav-item"><a class="nav-link" data-bs-toggle="tab" href="#preferences">My
- preferences</a></li>
- {% endif %}
  </ul>
  </div>
  </div>

user.py

@@ -19,6 +19,7 @@ def create_researcher(user_id, researcher_type, max_loads):
  db.session.commit()
  return new_researcher
 
+
 def get_researchers():
  return db.session.query(User).join(Researcher).filter(User.active == True).all()
 
@@ -80,7 +81,8 @@ def add_user():
 
  if supervisor_ids:
  supervisors = db.session.query(User).filter(User.id.in_(supervisor_ids)).all()
- new_researcher.supervisors = [ResearcherSupervisor(researcher=new_researcher, supervisor=s) for s in supervisors]
+ new_researcher.supervisors = [ResearcherSupervisor(researcher=new_researcher, supervisor=s) for s in
+ supervisors]
  db.session.commit()
 
  flash("User added successfully.", "success")
@@ -139,7 +141,7 @@ def user_profile(user_id, ):
  if researcher:
  preferences = db.session.query(PreferenceAssignment).filter_by(researcher_id=researcher.id,
  course_year=current_year).order_by(
- PreferenceAssignment.id).all()
+ PreferenceAssignment.rank).all()
  courses = []
  if current_user and requested_user.organization:
  courses = db.session.query(Course).filter(Course.year == current_year,
@@ -238,7 +240,8 @@ def update_user_profile(user_id):
  if supervisor_ids:
  db.session.query(ResearcherSupervisor).filter_by(researcher_id=researcher.id).delete()
  supervisors = db.session.query(User).filter(User.id.in_(supervisor_ids)).all()
- researcher.supervisors = [ResearcherSupervisor(researcher=researcher, supervisor=s) for s in supervisors]
+ researcher.supervisors = [ResearcherSupervisor(researcher=researcher, supervisor=s) for s in
+ supervisors]
  else:
  delete_researcher(user.id)
  db.session.commit()