Fix assign teachers (#45)

Author: SamuelVch98

course.py

@@ -1,3 +1,5 @@
+from sqlalchemy import func
+
 from decorators import login_required, check_access_level
 from db import db, User, Course, Teacher, Organization, Evaluation, Year, Role
 from flask import Blueprint, render_template, flash, url_for, request, make_response, redirect, \
@@ -123,11 +125,12 @@ def search_teachers():
     search_term = request.args.get('q', '')
 
     if not validate_string_pattern(search_term):
-        return make_response("Invalid search term", 400)
+        flash("Invalid search term", "danger")
 
     teachers = db.session.query(User).filter(
+        User.active == True,
         User.is_teacher == True,
-        User.name.ilike(f'%{search_term}%')
+        func.concat(User.name, ' ', User.first_name).ilike(f'%{search_term}%')
     ).all()
     results = [{'id': teacher.id, 'text': f'{teacher.name} {teacher.first_name}'} for teacher in teachers]
     return jsonify(results)

templates/course_template.html

@@ -46,7 +46,7 @@ <h2 class="sub-header">Course informations</h2>
         $(document).ready(function () {
             $(document).on('change', '#organization_code', function () {
                 var containerSelector = $('#selected-organizations', $(this).parent());
-                addBadge($(this), containerSelector);
+                addBadge(this, containerSelector, 'organization_code');
             });
 
 

templates/layout.html

@@ -135,21 +135,6 @@
 <div id="content">
     {% block pagecontent %}{% endblock %}
 </div>
-{% block additionalfooter %}
-    <script>
-        $(document).ready(function () {
-            $('#confirmationModal').on('show.bs.modal', function (event) {
-                var button = $(event.relatedTarget);
-
-                var message = button.data('message');
-                var url = button.data('url');
-
-                var modal = $(this);
-                modal.find('.modal-body').text(message);
-                modal.find('#confirmationForm').attr('action', url);
-            });
-        });
-    </script>
-{% endblock %}
+{% block additionalfooter %}{% endblock %}
 </body>
 </html>

user.py

@@ -138,7 +138,6 @@ def user_profile(user_id, current_year):
     if researcher:
         preferences = db.session.query(PreferenceAssignment).filter_by(researcher_id=researcher.id,
                                                                        course_year=current_year).all()
-
     courses = []
     if current_user and requested_user.organization:
         courses = db.session.query(Course).filter(Course.year == current_year,
@@ -201,7 +200,6 @@ def update_user_profile(user_id):
             user.organization_id = organization_code
             user.is_admin = is_admin
             user.is_teacher = is_teacher
-            user.is_researcher = is_researcher
             if is_researcher:
                 if researcher is None:
                     create_researcher(user.id, researcher_type, max_loads)