Merge branch 'main' into Feature-Publish-Assignment

Author: SamuelVch98

app.py

@@ -40,11 +40,15 @@ def get_organization():
     return db.session.query(Organization).all()
 
 
+def is_researcher():
+    return db.session.query(Researcher).filter_by(user_id=session['user_id']).first() is not None
+
+
 @app.context_processor
 def inject_configurations():
     return dict(configurations=get_configurations(), organizations_code=get_organization(), quadri=QUADRI,
                 language=LANGUAGES, researcher_type=RESEARCHERS_TYPE, dynamic_year=get_current_year(),
-                tasks=TASK, evaluation_hour=EVALUATION_HOUR, workloads=WORKLOAD)
+                tasks=TASK, evaluation_hour=EVALUATION_HOUR, workloads=WORKLOAD, is_researcher=is_researcher())
 
 
 # Routes

course.py

@@ -57,8 +57,8 @@ def validate_form_data(form, extra_fields_needed=False):
 def assign_teachers_to_course(course_id, course_year, assigned_teachers):
     try:
         for teacher_id in assigned_teachers:
-            new_teacher = Teacher(user_id=teacher_id, course_id=course_id, course_year=course_year)
-            db.session.add(new_teacher)
+            teacher = Teacher(user_id=teacher_id, course_id=course_id, course_year=course_year)
+            db.session.add(teacher)
         db.session.commit()
     except Exception as e:
         db.session.rollback()
@@ -125,8 +125,10 @@ def search_teachers():
     if not validate_string_pattern(search_term):
         return make_response("Invalid search term", 400)
 
-    teachers = db.session.query(User).filter(User.active == True, User.is_teacher == True,
-                                             User.name.ilike(f'%{search_term}%')).all()
+    teachers = db.session.query(User).join(Teacher).filter(
+        User.active == True,
+        User.name.ilike(f'%{search_term}%')
+    ).all()
     results = [{'id': teacher.id, 'text': f'{teacher.name} {teacher.first_name}'} for teacher in teachers]
     return jsonify(results)
 
@@ -178,9 +180,7 @@ def update_course_info():
 
     # Remove all teachers assigned to the course
     try:
-        db.session.query(Teacher).filter(Teacher.course_id == course_id,
-                                         Teacher.course_year == year,
-                                         Teacher.user_id.in_(assigned_teachers)).delete()
+        db.session.query(Teacher).filter(Teacher.course_id == course_id, Teacher.course_year == year).delete()
         db.session.commit()
     except Exception as e:
         db.session.rollback()

db.py

@@ -22,7 +22,6 @@ class User(db.Model):
     email = db.Column(db.String(200), nullable=True, unique=True)
     is_admin = db.Column(db.Boolean, default=False)
     is_teacher = db.Column(db.Boolean, default=False)
-    is_researcher = db.Column(db.Boolean, default=False)
     active = db.Column(db.Boolean, default=True)
     supervisor_id = db.Column(db.Integer, db.ForeignKey('user.id'))
     organization_id = db.Column(db.Integer, db.ForeignKey('organization.id'))
@@ -42,7 +41,7 @@ def validate_active(self, key, value):
     def allowed(self, access_level):
         role_access = {
             Role.ADMIN: self.is_admin,
-            Role.RESEARCHER: self.is_researcher,
+            Role.RESEARCHER: self.researcher_profile is not None,
             Role.TEACHER: self.is_teacher
         }
 
@@ -75,12 +74,11 @@ class Researcher(db.Model):
     __tablename__ = 'researcher'
     id = db.Column(db.Integer, primary_key=True)
     user_id = db.Column(db.Integer, db.ForeignKey('user.id'), nullable=False)
-    research_field = db.Column(db.String(30))
     max_loads = db.Column(db.Integer)
     jokers = db.Column(db.Integer)
     researcher_type = db.Column(db.String(30))
 
-    user = db.relationship('User', backref=db.backref('user_researcher', uselist=False))
+    user = db.relationship('User', backref=db.backref('researcher_profile', uselist=False))
 
 
 class Teacher(db.Model):

templates/home.html

@@ -5,7 +5,7 @@
     {% include "toast.html" %}
     <h1>{{ session.first_name }} {{ session.name }}</h1>
     <hr>
-    {% if user.is_researcher %}
+    {% if is_researcher %}
         <h2 class="sub-header">Course(s) assigned this year ({{ dynamic_year }} - {{ dynamic_year + 1 }})</h2>
         <table class="table table-hover">
             <thead>

templates/user_profile.html

@@ -27,7 +27,7 @@ <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 requested_user.is_researcher == true %}
+                    {% if is_researcher %}
                         <li class="nav-item"><a class="nav-link" data-bs-toggle="tab" href="#preferences">My
                             preferences</a></li>
                     {% endif %}
@@ -89,8 +89,8 @@ <h2>Your informations</h2>
 
                                             <input type="checkbox" class="form-check-input" id="is_admin"
                                                    name="is_admin"
-                                                   {% if requested_user.admin %}checked{% endif %}
-                                                    {% if current_user and not requested_user.admin %} disabled {% endif %}>
+                                                   {% if requested_user.is_admin %}checked{% endif %}
+                                                    {% if not session.is_admin %} disabled {% endif %}>
                                             <label class="form-check-label" for="is_admin">Admin</label>
                                         </div>
                                     {% endif %}
@@ -105,7 +105,7 @@ <h2>Your informations</h2>
                                     <div class="form-check">
                                         <input type="checkbox" class="form-check-input" id="is_researcher"
                                                name="is_researcher"
-                                               {% if requested_user.is_researcher %}checked{% endif %}
+                                               {% if researcher %}checked{% endif %}
                                                 {% if not session.is_admin %} disabled {% endif %}>
                                         <label class="form-check-label" for="is_researcher">Researcher</label>
                                     </div>
@@ -133,7 +133,7 @@ <h2>Your informations</h2>
                                     <dd>
                                         <select class="form-select" id="researcher_type" name="researcher_type"
                                                 {% if not session.is_admin %} disabled {% endif %}>
-                                            {% if requested_user.is_researcher and not session.is_admin %}
+                                            {% if is_researcher and not session.is_admin %}
                                                 <option value="" selected>None</option>
                                             {% else %}
                                                 {% for type in researcher_type %}
@@ -165,7 +165,7 @@ <h2>Your informations</h2>
                     </div>
                 </form>
             </div>
-            {% if requested_user.is_researcher %}
+            {% if is_researcher %}
                 <div class="tab-pane" id="preferences">
                     <div class="container-fluid">
                         {% if current_user %}

user.py

@@ -9,12 +9,25 @@
 user_bp = Blueprint('user', __name__)
 
 
+def get_teachers():
+    return db.session.query(User).filter(User.is_teacher == True, User.active == True).all()
+
+
+def create_researcher(user_id, researcher_type, max_loads):
+    new_researcher = Researcher(user_id=user_id, researcher_type=researcher_type, max_loads=max_loads)
+    db.session.add(new_researcher)
+    db.session.commit()
+
+
+def get_researchers():
+    return db.session.query(User).join(Researcher).filter(User.active == True).all()
+
+
 @user_bp.route('/register')
 @login_required
 @check_access_level(Role.ADMIN)
 def register():
-    supervisors = db.session.query(User).filter(User.is_teacher == True, User.active == True).all()
-    return render_template('register.html', supervisors=supervisors)
+    return render_template('register.html', supervisors=get_teachers())
 
 
 def is_valid_email(email):
@@ -56,18 +69,14 @@ def add_user():
         if db.session.query(User).filter(User.email == email).first():
             flash("Email already exists")
         else:
-            new_user = User(name=name, first_name=first_name, email=email, is_teacher=is_teacher,
-                            is_researcher=is_researcher, supervisor_id=supervisor_id,
+            new_user = User(name=name, first_name=first_name, email=email, supervisor_id=supervisor_id,
                             organization_id=organization_code)
             db.session.add(new_user)
             db.session.commit()
             if is_researcher:
                 all_loads = DEFAULT_MAX_LOAD
                 max_load = all_loads.get(researcher_type, 0)
-                new_researcher = Researcher(user_id=new_user.id, researcher_type=researcher_type,
-                                            max_loads=max_load)
-                db.session.add(new_researcher)
-                db.session.commit()
+                create_researcher(new_user.id, researcher_type, max_load)
     except:
         db.session.rollback()
         raise
@@ -83,16 +92,19 @@ def users(user_type):
     list_name = ''
 
     if user_type == 'teacher':
-        base_query = base_query.filter(User.is_teacher == True, User.active == True)
+        base_query = base_query.filter(User.active == True, User.is_teacher == True)
         list_name = 'Teachers'
     elif user_type == 'researcher':
-        base_query = base_query.filter(User.is_researcher == True, User.active == True)
+        base_query = base_query.join(Researcher).filter(User.active == True)
         list_name = 'Researchers'
     elif user_type == 'archived':
         base_query = base_query.filter(User.active == False)
         list_name = 'Archived Users'
     elif user_type == 'other':
-        base_query = base_query.filter(User.active == True, User.is_teacher == False, User.is_researcher == False)
+        base_query = base_query.outerjoin(Researcher).filter(
+            User.active == True,
+            User.is_teacher == False
+        )
         list_name = 'Other Users'
 
     all_users = base_query.all()
@@ -110,7 +122,7 @@ def user_profile(user_id, current_year):
         flash("Permission denied. You do not have access to this page.", "error")
         return redirect(url_for("index"))
 
-    all_users = db.session.query(User).filter(User.is_admin == False, User.is_teacher == True, User.active == True).all()
+    all_users = get_teachers()
     requested_user = db.session.query(User).filter_by(id=user_id).first()
     researcher = db.session.query(Researcher).filter(Researcher.user_id == requested_user.id).first()
     current_user = requested_user.email == session["email"]
@@ -130,6 +142,13 @@ def user_profile(user_id, current_year):
                            current_year=current_year)
 
 
+def delete_researcher(user_id):
+    researcher = db.session.query(Researcher).filter(Researcher.user_id == user_id).first()
+    if researcher:
+        db.session.delete(researcher)
+        db.session.commit()
+
+
 @user_bp.route('/update_user_profile/<int:user_id>', methods=['POST'])
 @login_required
 def update_user_profile(user_id):
@@ -163,6 +182,7 @@ def update_user_profile(user_id):
 
     user = db.session.query(User).filter(User.id == user_id).first()
     researcher = db.session.query(Researcher).filter(Researcher.user_id == user.id).first()
+    teacher = db.session.query(Teacher).filter(Teacher.user_id == user.id).first()
     if user is None:
         return make_response("User not found", 404)
 
@@ -172,17 +192,18 @@ def update_user_profile(user_id):
         if session["is_admin"]:
             user.email = email
             user.organization_id = organization_code
-            user.admin = is_admin
+            user.is_admin = is_admin
             user.is_teacher = is_teacher
-            user.is_researcher = is_researcher
             user.supervisor_id = supervisor_id
             if is_researcher:
                 if researcher is None:
-                    new_researcher = Researcher(user_id=user.id, researcher_type=researcher_type, max_loads=max_loads)
-                    db.session.add(new_researcher)
+                    create_researcher(user.id, researcher_type, max_loads)
                 else:
                     researcher.max_loads = max_loads
                     researcher.researcher_type = researcher_type
+            else:
+                delete_researcher(user.id)
+
         db.session.commit()
     except Exception as e:
         db.session.rollback()