Skip to content

Luciano Barletta / Pruebas-RTO

Go to a project
Toggle navigation
Toggle navigation pinning
Commit ed9a5698 by Tu Nombre
Options

SeReporte para separar linea, combustible, tipo

1 parent fc0f9a3a
Inline Side-by-side
Showing 4 changed files with 175 additions and 6 deletions
data/reportes_nafta.json 0 → 100644
{
"1":{
"N1":{
"2":"ReportePruebaN1L1.doc",
"3":""
},
"M1":{
"2":"",
"3":""
},
"N2":{
"2":"",
"3":""
},
"M2":{
"2":"",
"3":""
},
"N3":{
"2":"",
"3":""
},
"M3":{
"2":"",
"3":""
},
"O1":{
"2":"",
"3":"",
"4":""
},
"O2":{
"2":"",
"3":"",
"4":""
},
"O3":{
"2":"",
"3":"",
"4":""
},
"O4":{
"2":"",
"3":"",
"4":""
},
"UP":{
"2":"",
"3":"",
"4":""
}
},
"2":{
"N1":{
"2":"",
"3":""
},
"M1":{
"2":"",
"3":""
},
"N2":{
"2":"",
"3":""
},
"M2":{
"2":"",
"3":""
},
"N3":{
"2":"",
"3":""
},
"M3":{
"2":"",
"3":""
},
"O1":{
"2":"",
"3":"",
"4":""
},
"O2":{
"2":"",
"3":"",
"4":""
},
"O3":{
"2":"",
"3":"",
"4":""
},
"O4":{
"2":"",
"3":"",
"4":""
},
"UP":{
"2":"",
"3":"",
"4":""
}},
"3":{
"N1":{
"2":"",
"3":""
},
"M1":{
"2":"",
"3":""
},
"N2":{
"2":"",
"3":""
},
"M2":{
"2":"",
"3":""
},
"N3":{
"2":"",
"3":""
},
"M3":{
"2":"",
"3":""
},
"O1":{
"2":"",
"3":"",
"4":""
},
"O2":{
"2":"",
"3":"",
"4":""
},
"O3":{
"2":"",
"3":"",
"4":""
},
"O4":{
"2":"",
"3":"",
"4":""
},
"UP":{
"2":"",
"3":"",
"4":""
}
}
}
reportes.py
import json, configuracion
def BuscarReporteDefecto(linea,tipo,cantidadEjes=2):
def BuscarReporteDefecto(linea,tipo,cantidadEjes=2,conbustible="Nafta"):
"""Convustible Nafta , Gas Oil"""
conbustible = conbustible.upper().replace(" ","_")
archivos_json = {
"GAS_OIL":"data/reportes_gas_oil.json",
"NAFTA":"data/reportes_nafta.json"
}
if conbustible in archivos_json.keys():
reporte = archivos_json[conbustible]
else:
reporte = archivos_json["GAS_OIL"]
linea = str(linea)
cantidadEjes = str(cantidadEjes)
tipo = str(tipo).upper()
with open("data/reportes.json", 'r') as f:
with open(reporte, 'r') as f:
data = json.load(f)
try:
rta = data[linea][tipo][cantidadEjes]
except:
print(f"reporte defecto linea: {linea}, tipo: {tipo}, ejes {cantidadEjes}")
rta = configuracion.reporte_defecto[cantidadEjes]
if rta in ["",False]:
rta = configuracion.reporte_defecto[cantidadEjes]
rta =f"Error, reporte no encontrado {linea}, tipo: {tipo}, ejes {cantidadEjes}"
# rta = configuracion.reporte_defecto[cantidadEjes]
print(rta = "")
#if rta in ["",False]:
# rta = configuracion.reporte_defecto[cantidadEjes]
#print(rta)
return rta
......
static/src/carbone.js
......@@ -21,7 +21,11 @@ function agregarCampoAObjetoID(nombreCampo,reportCampo, objeto) {
function Reportar (){
///ACA hay que determinar el template
const template = document.getElementById('ReporteInspeccion');
if (template.value !== "") {
generarReporteTemplate(template.value)
} else {
message("Error en la carga de reporte anote el numero de planilla y consulte a soporte")
}
}
function generarReporteTemplate (template) {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!