diff --git a/backend/app/coordinator/routes/__init__.py b/backend/app/coordinator/routes/__init__.py index 2f39af8..6da1701 100644 --- a/backend/app/coordinator/routes/__init__.py +++ b/backend/app/coordinator/routes/__init__.py @@ -1,9 +1,11 @@ from flask import Blueprint from .students import bp as students_bp +from .project_supervisor import bp as project_supervisor_bp from .groups import bp as groups_bp bp = Blueprint("coordinator", __name__, url_prefix="/coordinator") bp.register_blueprint(students_bp) +bp.register_blueprint(project_supervisor_bp) bp.register_blueprint(groups_bp) diff --git a/backend/app/coordinator/routes/project_supervisor.py b/backend/app/coordinator/routes/project_supervisor.py index 3caf9f5..c8bd0a2 100644 --- a/backend/app/coordinator/routes/project_supervisor.py +++ b/backend/app/coordinator/routes/project_supervisor.py @@ -44,8 +44,7 @@ def create_project_supervisor(data: dict) -> dict: email = data['email'] limit_group = data['limit_group'] mode = data['mode'] - - project_supervisor = ProjectSupervisor.query.filter(first_name=first_name).filter(last_name=last_name).first() + project_supervisor = ProjectSupervisor.query.filter_by(first_name=first_name).filter_by(last_name=last_name).first() if project_supervisor is not None: abort(400, "Project Supervisor has already exists!") diff --git a/backend/app/coordinator/schemas.py b/backend/app/coordinator/schemas.py index d6ab649..419cbc9 100644 --- a/backend/app/coordinator/schemas.py +++ b/backend/app/coordinator/schemas.py @@ -108,8 +108,8 @@ class ProjectSupervisorsPaginationSchema(ma.Schema): class ProjectSupervisorCreateSchema(ma.Schema): first_name = fields.Str(validate=validate.Length(min=1, max=255), required=True) last_name = fields.Str(validate=validate.Length(min=1, max=255), required=True) - email = fields.Str(validate=validate.Length(min=0, max=11), required=True) - limit_group = fields.Integer(validate=validate_index) + email = fields.Str(validate=validate.Length(min=1, max=255), required=True) + limit_group = fields.Integer() mode = fields.Integer(required=True) diff --git a/frontend/src/api/leaders.ts b/frontend/src/api/leaders.ts index 6210960..bffa38e 100644 --- a/frontend/src/api/leaders.ts +++ b/frontend/src/api/leaders.ts @@ -27,15 +27,15 @@ export const getLeaders = ( }> = {}, ) => axiosInstance.get( - 'http://127.0.0.1:5000/api/coordinator/project_supervisors', + 'http://127.0.0.1:5000/api/coordinator/project_supervisor', { params }, ) export const createLeader = (payload: Leader) => - axiosInstance.post('http://127.0.0.1:5000/api/coordinator/project_supervisors/', payload) + axiosInstance.post('http://127.0.0.1:5000/api/coordinator/project_supervisor/', payload) export const deleteLeader = (payload: Number) => axiosInstance.delete( - 'http://127.0.0.1:5000/api/coordinator/project_supervisors/'+payload.toString()+'/', + 'http://127.0.0.1:5000/api/coordinator/project_supervisor/'+payload.toString()+'/', ) diff --git a/frontend/src/views/coordinator/AddLeader.tsx b/frontend/src/views/coordinator/AddLeader.tsx index aa1bb62..30503c2 100644 --- a/frontend/src/views/coordinator/AddLeader.tsx +++ b/frontend/src/views/coordinator/AddLeader.tsx @@ -25,7 +25,6 @@ const AddLeader = () => { ) const onSubmit = (data: Leader) => { - console.log(data) mutateCreateLeader(data) } @@ -36,7 +35,7 @@ const AddLeader = () => { > {isAlertVisible && (
- Udało się dodać studenta! + Udało się dodać opiekuna!
)} diff --git a/frontend/src/views/coordinator/Leaders.tsx b/frontend/src/views/coordinator/Leaders.tsx index 1b7df01..cf471cc 100644 --- a/frontend/src/views/coordinator/Leaders.tsx +++ b/frontend/src/views/coordinator/Leaders.tsx @@ -86,6 +86,7 @@ const Leaders = () => { {last_name} {email} {limit_group} + {count_group} {mode==0 ? "Stacjonarny" : mode==1 ? "Niestacjonarny" : "Nie/stacjonarny"}