Add user creation and update functionality; refactor user template and helpers
This commit is contained in:
parent
f4369348c5
commit
26e55b9a3e
6 changed files with 134 additions and 24 deletions
|
@ -1,4 +1,4 @@
|
|||
from flask import render_template
|
||||
from flask import render_template, request, jsonify
|
||||
|
||||
from . import main
|
||||
from .helpers import ACTIVE_STATUSES, user_headers, inventory_headers, worklog_headers
|
||||
|
@ -63,4 +63,61 @@ def user(id):
|
|||
worklog=worklog,
|
||||
worklog_headers=filtered_worklog_headers,
|
||||
worklog_rows=[{"id": log.id, "cells": [fn(log) for fn in filtered_worklog_headers.values()]} for log in worklog]
|
||||
)
|
||||
)
|
||||
|
||||
@main.route("/user/new", methods=["GET"])
|
||||
def new_user():
|
||||
rooms = eager_load_room_relationships(db.session.query(Room)).all()
|
||||
users = eager_load_user_relationships(db.session.query(User)).all()
|
||||
|
||||
user = User(
|
||||
active=True
|
||||
)
|
||||
|
||||
return render_template(
|
||||
"user.html",
|
||||
title="New User",
|
||||
user=user,
|
||||
users=users,
|
||||
rooms=rooms
|
||||
)
|
||||
|
||||
@main.route("/api/user", methods=["POST"])
|
||||
def create_user():
|
||||
try:
|
||||
data = request.get_json(force=True)
|
||||
|
||||
new_user = User.from_dict(data)
|
||||
|
||||
db.session.add(new_user)
|
||||
db.session.commit()
|
||||
|
||||
return jsonify({"success": True, "id": new_user.id}), 201
|
||||
|
||||
except Exception as e:
|
||||
db.session.rollback()
|
||||
return jsonify({"success": False, "error": str(e)}), 400
|
||||
|
||||
@main.route("/api/user/<int:id>", methods=["PUT"])
|
||||
def update_user(id):
|
||||
try:
|
||||
data = request.get_json(force=True)
|
||||
user = db.session.query(User).get(id)
|
||||
|
||||
if not user:
|
||||
return jsonify({"success": False, "error": f"User with ID {id} not found."}), 404
|
||||
|
||||
user.staff = bool(data.get("staff", user.staff))
|
||||
user.active = bool(data.get("active", user.active))
|
||||
user.last_name = data.get("last_name", user.last_name)
|
||||
user.first_name = data.get("first_name", user.first_name)
|
||||
user.location_id = data.get("location_id", user.location_id)
|
||||
user.supervisor_id = data.get("supervisor_id", user.supervisor_id)
|
||||
|
||||
db.session.commit()
|
||||
|
||||
return jsonify({"success": True, "id": user.id}), 200
|
||||
|
||||
except Exception as e:
|
||||
db.session.rollback()
|
||||
return jsonify({"success": False, "error": str(e)}), 400
|
Loading…
Add table
Add a link
Reference in a new issue