diff --git a/routes/holiday.py b/routes/holiday.py index 62c1ab6..c08c5f9 100644 --- a/routes/holiday.py +++ b/routes/holiday.py @@ -62,6 +62,8 @@ def update_holiday(holiday_id): # Validação para garantir que a instância de serviço existe ServiceInstance.query.get_or_404(data['service_instance_id']) holiday.service_instance_id = data['service_instance_id'] + if 'adicional_he' in data: + holiday.adicional_he = data['adicional_he'] db.session.commit() return jsonify({'message': 'Feriado atualizado com sucesso'}), 200 @@ -107,7 +109,8 @@ def get_holiday_id(holiday_id): 'type': holiday.type, 'date': holiday.date.strftime("%Y-%m-%d") if holiday.date else None, 'parent_id': holiday.parent_id, - 'service_instance_id': holiday.service_instance_id + 'service_instance_id': holiday.service_instance_id, + 'adicional_he': holiday.adicional_he, }), 200 # Deletar feriado diff --git a/routes/user.py b/routes/user.py index 9eb6852..bc871f5 100644 --- a/routes/user.py +++ b/routes/user.py @@ -342,6 +342,6 @@ def delete_user(user_id): return jsonify({'message': 'Usuário já está inativo'}), 400 # Atualiza o status para inativo - user.status = "inativo" + user.status = "Inativo" db.session.commit() return jsonify({'message': 'Usuário excluído com sucesso'}), 200 \ No newline at end of file