Squashed commit of the following:
commit 1eeea9f83ad9230a5c1f7a75662770eaab0df837 Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 21:15:41 2025 +0200 Disable resuming of old time entries. commit 3e3ec2f01cb7943622b819a19179388078ae1315 Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 20:59:19 2025 +0200 Refactor db migrations. commit 15a51a569da36c6b7c9e01ab17b6fdbdee6ad994 Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 19:58:04 2025 +0200 Apply new style for Time Tracking view. commit 77e5278b303e060d2b03853b06277f8aa567ae68 Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 18:06:04 2025 +0200 Allow direct registrations as a Company. commit 188a8772757cbef374243d3a5f29e4440ddecabe Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 18:04:45 2025 +0200 Add email invitation feature. commit d9ebaa02aa01b518960a20dccdd5a327d82f30c6 Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 17:12:32 2025 +0200 Apply common style for Company, User, Team management pages. commit 81149caf4d8fc6317e2ab1b4f022b32fc5aa6d22 Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 16:44:32 2025 +0200 Move export functions to own module. commit 1a26e19338e73f8849c671471dd15cc3c1b1fe82 Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 15:51:15 2025 +0200 Split up models.py. commit 61f1ccd10f721b0ff4dc1eccf30c7a1ee13f204d Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 12:05:28 2025 +0200 Move utility function into own modules. commit 84b341ed35e2c5387819a8b9f9d41eca900ae79f Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 11:44:24 2025 +0200 Refactor auth functions use. commit 923e311e3da5b26d85845c2832b73b7b17c48adb Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 11:35:52 2025 +0200 Refactor route nameing and fix bugs along the way. commit f0a5c4419c340e62a2615c60b2a9de28204d2995 Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 10:34:33 2025 +0200 Fix URL endpoints in announcement template. commit b74d74542a1c8dc350749e4788a9464d067a88b5 Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 09:25:53 2025 +0200 Move announcements to own module. commit 9563a28021ac46c82c04fe4649b394dbf96f92c7 Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 09:16:30 2025 +0200 Combine Company view and edit templates. commit 6687c373e681d54e4deab6b2582fed5cea9aadf6 Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 08:17:42 2025 +0200 Move Users, Company and System Administration to own modules. commit 8b7894a2e3eb84bb059f546648b6b9536fea724e Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 07:40:57 2025 +0200 Move Teams and Projects to own modules. commit d11bf059d99839ecf1f5d7020b8c8c8a2454c00b Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 07:09:33 2025 +0200 Move Tasks and Sprints to own modules.
This commit is contained in:
191
routes/teams.py
Normal file
191
routes/teams.py
Normal file
@@ -0,0 +1,191 @@
|
||||
"""
|
||||
Team Management Routes
|
||||
Handles all team-related views and operations
|
||||
"""
|
||||
|
||||
from flask import Blueprint, render_template, request, redirect, url_for, flash, g, abort
|
||||
from models import db, Team, User
|
||||
from routes.auth import admin_required, company_required
|
||||
from utils.validation import FormValidator
|
||||
from utils.repository import TeamRepository
|
||||
|
||||
teams_bp = Blueprint('teams', __name__, url_prefix='/admin/teams')
|
||||
|
||||
|
||||
@teams_bp.route('')
|
||||
@admin_required
|
||||
@company_required
|
||||
def admin_teams():
|
||||
team_repo = TeamRepository()
|
||||
teams = team_repo.get_with_member_count(g.user.company_id)
|
||||
return render_template('admin_teams.html', title='Team Management', teams=teams)
|
||||
|
||||
|
||||
@teams_bp.route('/create', methods=['GET', 'POST'])
|
||||
@admin_required
|
||||
@company_required
|
||||
def create_team():
|
||||
if request.method == 'POST':
|
||||
validator = FormValidator()
|
||||
team_repo = TeamRepository()
|
||||
|
||||
name = request.form.get('name')
|
||||
description = request.form.get('description')
|
||||
|
||||
# Validate input
|
||||
validator.validate_required(name, 'Team name')
|
||||
|
||||
if validator.is_valid() and team_repo.exists_by_name_in_company(name, g.user.company_id):
|
||||
validator.errors.add('Team name already exists in your company')
|
||||
|
||||
if validator.is_valid():
|
||||
new_team = team_repo.create(
|
||||
name=name,
|
||||
description=description,
|
||||
company_id=g.user.company_id
|
||||
)
|
||||
team_repo.save()
|
||||
|
||||
flash(f'Team "{name}" created successfully!', 'success')
|
||||
return redirect(url_for('teams.admin_teams'))
|
||||
|
||||
validator.flash_errors()
|
||||
|
||||
return render_template('team_form.html', title='Create Team', team=None)
|
||||
|
||||
|
||||
@teams_bp.route('/edit/<int:team_id>', methods=['GET', 'POST'])
|
||||
@admin_required
|
||||
@company_required
|
||||
def edit_team(team_id):
|
||||
team_repo = TeamRepository()
|
||||
team = team_repo.get_by_id_and_company(team_id, g.user.company_id)
|
||||
|
||||
if not team:
|
||||
abort(404)
|
||||
|
||||
if request.method == 'POST':
|
||||
validator = FormValidator()
|
||||
|
||||
name = request.form.get('name')
|
||||
description = request.form.get('description')
|
||||
|
||||
# Validate input
|
||||
validator.validate_required(name, 'Team name')
|
||||
|
||||
if validator.is_valid() and name != team.name:
|
||||
if team_repo.exists_by_name_in_company(name, g.user.company_id):
|
||||
validator.errors.add('Team name already exists in your company')
|
||||
|
||||
if validator.is_valid():
|
||||
team_repo.update(team, name=name, description=description)
|
||||
team_repo.save()
|
||||
|
||||
flash(f'Team "{name}" updated successfully!', 'success')
|
||||
return redirect(url_for('teams.admin_teams'))
|
||||
|
||||
validator.flash_errors()
|
||||
|
||||
return render_template('edit_team.html', title='Edit Team', team=team)
|
||||
|
||||
|
||||
@teams_bp.route('/delete/<int:team_id>', methods=['POST'])
|
||||
@admin_required
|
||||
@company_required
|
||||
def delete_team(team_id):
|
||||
team_repo = TeamRepository()
|
||||
team = team_repo.get_by_id_and_company(team_id, g.user.company_id)
|
||||
|
||||
if not team:
|
||||
abort(404)
|
||||
|
||||
# Check if team has members
|
||||
if team.users:
|
||||
flash('Cannot delete team with members. Remove all members first.', 'error')
|
||||
return redirect(url_for('teams.admin_teams'))
|
||||
|
||||
team_name = team.name
|
||||
team_repo.delete(team)
|
||||
team_repo.save()
|
||||
|
||||
flash(f'Team "{team_name}" deleted successfully!', 'success')
|
||||
return redirect(url_for('teams.admin_teams'))
|
||||
|
||||
|
||||
@teams_bp.route('/<int:team_id>', methods=['GET', 'POST'])
|
||||
@admin_required
|
||||
@company_required
|
||||
def manage_team(team_id):
|
||||
team_repo = TeamRepository()
|
||||
team = team_repo.get_by_id_and_company(team_id, g.user.company_id)
|
||||
|
||||
if not team:
|
||||
abort(404)
|
||||
|
||||
if request.method == 'POST':
|
||||
action = request.form.get('action')
|
||||
|
||||
if action == 'update_team':
|
||||
# Update team details
|
||||
validator = FormValidator()
|
||||
name = request.form.get('name')
|
||||
description = request.form.get('description')
|
||||
|
||||
# Validate input
|
||||
validator.validate_required(name, 'Team name')
|
||||
|
||||
if validator.is_valid() and name != team.name:
|
||||
if team_repo.exists_by_name_in_company(name, g.user.company_id):
|
||||
validator.errors.add('Team name already exists in your company')
|
||||
|
||||
if validator.is_valid():
|
||||
team_repo.update(team, name=name, description=description)
|
||||
team_repo.save()
|
||||
flash(f'Team "{name}" updated successfully!', 'success')
|
||||
else:
|
||||
validator.flash_errors()
|
||||
|
||||
elif action == 'add_member':
|
||||
# Add user to team
|
||||
user_id = request.form.get('user_id')
|
||||
if user_id:
|
||||
user = User.query.get(user_id)
|
||||
if user:
|
||||
user.team_id = team.id
|
||||
db.session.commit()
|
||||
flash(f'User {user.username} added to team!', 'success')
|
||||
else:
|
||||
flash('User not found', 'error')
|
||||
else:
|
||||
flash('No user selected', 'error')
|
||||
|
||||
elif action == 'remove_member':
|
||||
# Remove user from team
|
||||
user_id = request.form.get('user_id')
|
||||
if user_id:
|
||||
user = User.query.get(user_id)
|
||||
if user and user.team_id == team.id:
|
||||
user.team_id = None
|
||||
db.session.commit()
|
||||
flash(f'User {user.username} removed from team!', 'success')
|
||||
else:
|
||||
flash('User not found or not in this team', 'error')
|
||||
else:
|
||||
flash('No user selected', 'error')
|
||||
|
||||
# Get team members
|
||||
team_members = User.query.filter_by(team_id=team.id).all()
|
||||
|
||||
# Get users not in this team for the add member form (company-scoped)
|
||||
available_users = User.query.filter(
|
||||
User.company_id == g.user.company_id,
|
||||
(User.team_id != team.id) | (User.team_id == None)
|
||||
).all()
|
||||
|
||||
return render_template(
|
||||
'team_form.html',
|
||||
title=f'Manage Team: {team.name}',
|
||||
team=team,
|
||||
team_members=team_members,
|
||||
available_users=available_users
|
||||
)
|
||||
Reference in New Issue
Block a user