diff --git a/models/holiday.py b/models/holiday.py index 426c9d2..3d64c79 100644 --- a/models/holiday.py +++ b/models/holiday.py @@ -7,8 +7,6 @@ class Holiday(db.Model): name = db.Column(db.String(80), unique=True, nullable=True) type = db.Column(db.String(80), nullable=True) date = db.Column(db.Date, nullable=True) - estado = db.Column(db.String(80), nullable=True) - municipio = db.Column(db.String(80), nullable=True) recorrente = db.Column(db.Boolean, default=True, nullable=False) # Se o feriado é recorrente (todo ano) adicional_he = db.Column(db.Integer, nullable=False) # Percentual adicional de horas extras (%) diff --git a/routes/holiday.py b/routes/holiday.py index c08c5f9..feb495a 100644 --- a/routes/holiday.py +++ b/routes/holiday.py @@ -16,8 +16,6 @@ def create_holiday(): name = data.get('name') type = data.get('type') date = data.get('date') - estado = data.get('estado') - municipio = data.get('municipio') parent_id = data.get('parent_id') adicional_he = data.get('adicional_he') recorrente = data.get('recorrente', True) # Default True se não enviado @@ -27,8 +25,6 @@ def create_holiday(): name=name, type=type, date=date, - estado=estado, - municipio=municipio, parent_id=parent_id, service_instance_id=service_instance_id, recorrente=recorrente, @@ -54,16 +50,14 @@ def update_holiday(holiday_id): holiday.date = data['date'] if 'type' in data: holiday.type = data['type'] - if 'estado' in data: - holiday.estado = data['estado'] - if 'municipio' in data: - holiday.municipio = data['municipio'] if 'service_instance_id' in data: # 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'] + if 'recorrente' in data: + holiday.recorrente = data['recorrente'] db.session.commit() return jsonify({'message': 'Feriado atualizado com sucesso'}), 200 @@ -83,8 +77,6 @@ def list_holiday(): 'holiday_list': [{ 'id': holiday.id, 'name': holiday.name, - 'estado': holiday.estado, - 'municipio': holiday.municipio, 'type': holiday.type, 'date': holiday.date.strftime("%Y-%m-%d") if holiday.date else None, 'parent_id': holiday.parent_id, @@ -104,8 +96,6 @@ def get_holiday_id(holiday_id): return jsonify({ 'id': holiday.id, 'name': holiday.name, - 'estado': holiday.estado, - 'municipio': holiday.municipio, 'type': holiday.type, 'date': holiday.date.strftime("%Y-%m-%d") if holiday.date else None, 'parent_id': holiday.parent_id,