kml/front_ponto_eletronico
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tela dash, nav bar

Browse Source
This commit is contained in:
ka-lucas 2025-04-30 14:48:25 -03:00
parent 34d4c0df7f
commit b8d4fdfcde
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/holiday.py
View File

@ -7,8 +7,6 @@ class Holiday(db.Model):
name = db.Column(db.String(80), unique=True, nullable=True) name = db.Column(db.String(80), unique=True, nullable=True)
type = db.Column(db.String(80), nullable=True) type = db.Column(db.String(80), nullable=True)
date = db.Column(db.Date, 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) 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 (%) adicional_he = db.Column(db.Integer, nullable=False) # Percentual adicional de horas extras (%)

14
routes/holiday.py
View File

@ -16,8 +16,6 @@ def create_holiday():
name = data.get('name') name = data.get('name')
type = data.get('type') type = data.get('type')
date = data.get('date') date = data.get('date')
estado = data.get('estado')
municipio = data.get('municipio')
parent_id = data.get('parent_id') parent_id = data.get('parent_id')
adicional_he = data.get('adicional_he') adicional_he = data.get('adicional_he')
recorrente = data.get('recorrente', True) # Default True se não enviado recorrente = data.get('recorrente', True) # Default True se não enviado
@ -27,8 +25,6 @@ def create_holiday():
name=name, name=name,
type=type, type=type,
date=date, date=date,
estado=estado,
municipio=municipio,
parent_id=parent_id, parent_id=parent_id,
service_instance_id=service_instance_id, service_instance_id=service_instance_id,
recorrente=recorrente, recorrente=recorrente,
@ -54,16 +50,14 @@ def update_holiday(holiday_id):
holiday.date = data['date'] holiday.date = data['date']
if 'type' in data: if 'type' in data:
holiday.type = data['type'] 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: if 'service_instance_id' in data:
# Validação para garantir que a instância de serviço existe # Validação para garantir que a instância de serviço existe
ServiceInstance.query.get_or_404(data['service_instance_id']) ServiceInstance.query.get_or_404(data['service_instance_id'])
holiday.service_instance_id = data['service_instance_id'] holiday.service_instance_id = data['service_instance_id']
if 'adicional_he' in data: if 'adicional_he' in data:
holiday.adicional_he = data['adicional_he'] holiday.adicional_he = data['adicional_he']
if 'recorrente' in data:
holiday.recorrente = data['recorrente']
db.session.commit() db.session.commit()
return jsonify({'message': 'Feriado atualizado com sucesso'}), 200 return jsonify({'message': 'Feriado atualizado com sucesso'}), 200
@ -83,8 +77,6 @@ def list_holiday():
'holiday_list': [{ 'holiday_list': [{
'id': holiday.id, 'id': holiday.id,
'name': holiday.name, 'name': holiday.name,
'estado': holiday.estado,
'municipio': holiday.municipio,
'type': holiday.type, 'type': holiday.type,
'date': holiday.date.strftime("%Y-%m-%d") if holiday.date else None, 'date': holiday.date.strftime("%Y-%m-%d") if holiday.date else None,
'parent_id': holiday.parent_id, 'parent_id': holiday.parent_id,
@ -104,8 +96,6 @@ def get_holiday_id(holiday_id):
return jsonify({ return jsonify({
'id': holiday.id, 'id': holiday.id,
'name': holiday.name, 'name': holiday.name,
'estado': holiday.estado,
'municipio': holiday.municipio,
'type': holiday.type, 'type': holiday.type,
'date': holiday.date.strftime("%Y-%m-%d") if holiday.date else None, 'date': holiday.date.strftime("%Y-%m-%d") if holiday.date else None,
'parent_id': holiday.parent_id, 'parent_id': holiday.parent_id,