Add visual query builder with table/column picker and SQL generator
This commit is contained in:
@@ -152,6 +152,67 @@ async def query_delete(query_id: int, user: dict = Depends(get_current_user)):
|
|||||||
return RedirectResponse("/queries", status_code=302)␍␍
|
return RedirectResponse("/queries", status_code=302)␍␍
|
||||||
␍␍
|
␍␍
|
||||||
␍␍
|
␍␍
|
||||||
|
@router.post("/esquema")␍
|
||||||
|
async def obtener_esquema(user: dict = Depends(get_current_user)):␍
|
||||||
|
from app.services.firebird_service import FirebirdService␍
|
||||||
|
conn = get_connection()␍
|
||||||
|
configs = {row["key"]: row["value"] for row in conn.execute("SELECT * FROM config").fetchall()}␍
|
||||||
|
conn.close()␍
|
||||||
|
␍
|
||||||
|
fb = FirebirdService()␍
|
||||||
|
fb_success, fb_msg = fb.connect(␍
|
||||||
|
configs.get("firebird_host", "localhost"),␍
|
||||||
|
int(configs.get("firebird_port", 3050)),␍
|
||||||
|
configs.get("firebird_database", ""),␍
|
||||||
|
configs.get("firebird_user", "SYSDBA"),␍
|
||||||
|
configs.get("firebird_password", "masterkey"),␍
|
||||||
|
)␍
|
||||||
|
if not fb_success:␍
|
||||||
|
return JSONResponse({"error": f"Error Firebird: {fb_msg}"}, status_code=400)␍
|
||||||
|
␍
|
||||||
|
success, fb_err, tablas = fb.execute_query("""␍
|
||||||
|
SELECT RDB$RELATION_NAME as nombre␍
|
||||||
|
FROM RDB$RELATIONS␍
|
||||||
|
WHERE RDB$SYSTEM_FLAG = 0␍
|
||||||
|
AND RDB$RELATION_NAME NOT LIKE 'RDB$%'␍
|
||||||
|
ORDER BY 1␍
|
||||||
|
""", {})␍
|
||||||
|
␍
|
||||||
|
if not success:␍
|
||||||
|
fb.disconnect()␍
|
||||||
|
return JSONResponse({"error": fb_err}, status_code=400)␍
|
||||||
|
␍
|
||||||
|
resultado = []␍
|
||||||
|
for t in tablas:␍
|
||||||
|
nombre = t["NOMBRE"].strip()␍
|
||||||
|
ok, err, cols = fb.execute_query("""␍
|
||||||
|
SELECT␍
|
||||||
|
rf.RDB$FIELD_NAME as COLUMN_NAME,␍
|
||||||
|
f.RDB$FIELD_TYPE as FIELD_TYPE,␍
|
||||||
|
f.RDB$FIELD_LENGTH as FIELD_LENGTH␍
|
||||||
|
FROM RDB$RELATION_FIELDS rf␍
|
||||||
|
JOIN RDB$FIELDS f ON rf.RDB$FIELD_SOURCE = f.RDB$FIELD_NAME␍
|
||||||
|
WHERE rf.RDB$RELATION_NAME = :tabla␍
|
||||||
|
ORDER BY rf.RDB$FIELD_POSITION␍
|
||||||
|
""", {"tabla": nombre})␍
|
||||||
|
columnas = []␍
|
||||||
|
if ok:␍
|
||||||
|
for c in cols:␍
|
||||||
|
tiponum = c["FIELD_TYPE"]␍
|
||||||
|
tipos = {7: "SMALLINT", 8: "INTEGER", 10: "FLOAT", 12: "DATE", 13: "TIME",␍
|
||||||
|
14: "CHAR", 16: "BIGINT", 27: "DOUBLE", 35: "TIMESTAMP", 37: "VARCHAR",␍
|
||||||
|
40: "BLOB", 45: "BLOB_ID", 261: "BLOB"}␍
|
||||||
|
columnas.append({␍
|
||||||
|
"nombre": c["COLUMN_NAME"].strip(),␍
|
||||||
|
"tipo": tipos.get(tiponum, f"UNKNOWN({tiponum})"),␍
|
||||||
|
"longitud": c["FIELD_LENGTH"]␍
|
||||||
|
})␍
|
||||||
|
resultado.append({"tabla": nombre, "columnas": columnas})␍
|
||||||
|
␍
|
||||||
|
fb.disconnect()␍
|
||||||
|
return JSONResponse({"tablas": resultado})␍
|
||||||
|
␍
|
||||||
|
␍
|
||||||
@router.post("/tablas")␍␍
|
@router.post("/tablas")␍␍
|
||||||
async def listar_tablas(user: dict = Depends(get_current_user)):␍␍
|
async def listar_tablas(user: dict = Depends(get_current_user)):␍␍
|
||||||
from app.services.firebird_service import FirebirdService␍␍
|
from app.services.firebird_service import FirebirdService␍␍
|
||||||
|
|||||||
+283
-53
@@ -2,13 +2,19 @@
|
|||||||
{% block title %}Consultas SQL{% endblock %}
|
{% block title %}Consultas SQL{% endblock %}
|
||||||
{% block header %}Consultas SQL{% endblock %}
|
{% block header %}Consultas SQL{% endblock %}
|
||||||
{% block content %}
|
{% block content %}
|
||||||
|
|
||||||
|
<div class="flex space-x-2 mb-4">
|
||||||
|
<button onclick="mostrarEditor()" class="px-4 py-2 rounded-lg text-sm font-medium bg-blue-600 text-white" id="btn-editor"><i class="fas fa-code mr-1"></i> Editor SQL</button>
|
||||||
|
<button onclick="mostrarBuilder()" class="px-4 py-2 rounded-lg text-sm font-medium bg-gray-200 text-gray-700 hover:bg-gray-300" id="btn-builder"><i class="fas fa-wrench mr-1"></i> Constructor Visual</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="panel-editor">
|
||||||
<div class="grid grid-cols-1 lg:grid-cols-3 gap-6">
|
<div class="grid grid-cols-1 lg:grid-cols-3 gap-6">
|
||||||
<div class="lg:col-span-1">
|
<div class="lg:col-span-1">
|
||||||
<div class="bg-white rounded-xl shadow-sm border border-gray-200">
|
<div class="bg-white rounded-xl shadow-sm border border-gray-200">
|
||||||
<div class="px-6 py-4 border-b border-gray-200 flex items-center justify-between">
|
<div class="px-6 py-4 border-b border-gray-200 flex items-center justify-between">
|
||||||
<h3 class="font-semibold text-gray-800"><i class="fas fa-list mr-2 text-blue-500"></i>Mis Consultas</h3>
|
<h3 class="font-semibold text-gray-800"><i class="fas fa-list mr-2 text-blue-500"></i>Mis Consultas</h3>
|
||||||
<button onclick="document.getElementById('modal-new-query').classList.remove('hidden')"␍
|
<button onclick="document.getElementById('modal-new-query').classList.remove('hidden')" class="text-blue-600 hover:text-blue-800"><i class="fas fa-plus"></i></button>
|
||||||
class="text-blue-600 hover:text-blue-800"><i class="fas fa-plus"></i></button>␍
|
|
||||||
</div>
|
</div>
|
||||||
<div class="p-4 space-y-2">
|
<div class="p-4 space-y-2">
|
||||||
{% for q in queries %}
|
{% for q in queries %}
|
||||||
@@ -16,15 +22,11 @@
|
|||||||
<div onclick="editQuery({{ q.id }}, '{{ q.name }}', '{{ q.query_type }}', `{{ q.query_text|e }}`, `{{ q.description|e }}`)" class="cursor-pointer">
|
<div onclick="editQuery({{ q.id }}, '{{ q.name }}', '{{ q.query_type }}', `{{ q.query_text|e }}`, `{{ q.description|e }}`)" class="cursor-pointer">
|
||||||
<div class="flex items-center justify-between">
|
<div class="flex items-center justify-between">
|
||||||
<span class="font-medium text-sm text-gray-800">{{ q.name }}</span>
|
<span class="font-medium text-sm text-gray-800">{{ q.name }}</span>
|
||||||
<span class="px-2 py-0.5 rounded text-xs font-medium {% if q.query_type == 'terceros' %}bg-blue-100 text-blue-700{% else %}bg-purple-100 text-purple-700{% endif %}">␍
|
<span class="px-2 py-0.5 rounded text-xs font-medium {% if q.query_type == 'terceros' %}bg-blue-100 text-blue-700{% else %}bg-purple-100 text-purple-700{% endif %}">{{ q.query_type }}</span>
|
||||||
{{ q.query_type }}␍
|
|
||||||
</span>␍
|
|
||||||
</div>
|
</div>
|
||||||
<p class="text-xs text-gray-500 mt-1 truncate">{{ q.description or 'Sin descripción' }}</p>
|
<p class="text-xs text-gray-500 mt-1 truncate">{{ q.description or 'Sin descripción' }}</p>
|
||||||
</div>
|
</div>
|
||||||
<button onclick="ejecutarTest(this, {{ q.id }})" class="mt-2 text-xs text-green-600 hover:text-green-800">␍
|
<button onclick="ejecutarTest(this, {{ q.id }})" class="mt-2 text-xs text-green-600 hover:text-green-800"><i class="fas fa-play mr-1"></i> Probar</button>
|
||||||
<i class="fas fa-play mr-1"></i> Probar␍
|
|
||||||
</button>␍
|
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</div>
|
||||||
@@ -42,13 +44,11 @@
|
|||||||
<div class="grid grid-cols-2 gap-4">
|
<div class="grid grid-cols-2 gap-4">
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-sm font-medium text-gray-700 mb-1">Nombre</label>
|
<label class="block text-sm font-medium text-gray-700 mb-1">Nombre</label>
|
||||||
<input type="text" name="name" id="q_name" required␍
|
<input type="text" name="name" id="q_name" required class="w-full px-3 py-2 border border-gray-300 rounded-lg text-sm" placeholder="Nombre descriptivo">
|
||||||
class="w-full px-3 py-2 border border-gray-300 rounded-lg text-sm" placeholder="Nombre descriptivo">␍
|
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-sm font-medium text-gray-700 mb-1">Tipo</label>
|
<label class="block text-sm font-medium text-gray-700 mb-1">Tipo</label>
|
||||||
<select name="query_type" id="q_type"␍
|
<select name="query_type" id="q_type" class="w-full px-3 py-2 border border-gray-300 rounded-lg text-sm">
|
||||||
class="w-full px-3 py-2 border border-gray-300 rounded-lg text-sm">␍
|
|
||||||
<option value="terceros">Terceros (datos paciente)</option>
|
<option value="terceros">Terceros (datos paciente)</option>
|
||||||
<option value="transaccion">Transacción (procedimientos)</option>
|
<option value="transaccion">Transacción (procedimientos)</option>
|
||||||
</select>
|
</select>
|
||||||
@@ -56,25 +56,15 @@
|
|||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-sm font-medium text-gray-700 mb-1">Consulta SQL</label>
|
<label class="block text-sm font-medium text-gray-700 mb-1">Consulta SQL</label>
|
||||||
<textarea name="query_text" id="q_text" rows="10" required␍
|
<textarea name="query_text" id="q_text" rows="10" required class="w-full px-3 py-2 border border-gray-300 rounded-lg text-sm font-mono bg-gray-50" placeholder="SELECT ... FROM ... WHERE ..."></textarea>
|
||||||
class="w-full px-3 py-2 border border-gray-300 rounded-lg text-sm font-mono bg-gray-50"␍
|
|
||||||
placeholder="SELECT ... FROM ... WHERE ..."></textarea>␍
|
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-sm font-medium text-gray-700 mb-1">Descripción</label>
|
<label class="block text-sm font-medium text-gray-700 mb-1">Descripción</label>
|
||||||
<input type="text" name="description" id="q_desc"␍
|
<input type="text" name="description" id="q_desc" class="w-full px-3 py-2 border border-gray-300 rounded-lg text-sm" placeholder="¿Qué hace esta consulta?">
|
||||||
class="w-full px-3 py-2 border border-gray-300 rounded-lg text-sm"␍
|
|
||||||
placeholder="¿Qué hace esta consulta?">␍
|
|
||||||
</div>
|
</div>
|
||||||
<div class="flex space-x-3">
|
<div class="flex space-x-3">
|
||||||
<button type="submit"␍
|
<button type="submit" class="px-4 py-2 bg-blue-600 hover:bg-blue-700 text-white rounded-lg text-sm font-medium"><i class="fas fa-save mr-1"></i> Guardar</button>
|
||||||
class="px-4 py-2 bg-blue-600 hover:bg-blue-700 text-white rounded-lg text-sm font-medium">␍
|
<button type="button" onclick="cancelEdit()" class="px-4 py-2 bg-gray-100 text-gray-700 rounded-lg text-sm font-medium hover:bg-gray-200 hidden" id="btn-cancel"><i class="fas fa-times mr-1"></i> Cancelar</button>
|
||||||
<i class="fas fa-save mr-1"></i> Guardar␍
|
|
||||||
</button>␍
|
|
||||||
<button type="button" onclick="cancelEdit()"␍
|
|
||||||
class="px-4 py-2 bg-gray-100 text-gray-700 rounded-lg text-sm font-medium hover:bg-gray-200 hidden" id="btn-cancel">␍
|
|
||||||
<i class="fas fa-times mr-1"></i> Cancelar␍
|
|
||||||
</button>␍
|
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
@@ -87,15 +77,272 @@
|
|||||||
<code class="bg-blue-100 px-1 rounded">:factura</code> para filtro por factura,
|
<code class="bg-blue-100 px-1 rounded">:factura</code> para filtro por factura,
|
||||||
<code class="bg-blue-100 px-1 rounded">:fecha_ini</code> y <code class="bg-blue-100 px-1 rounded">:fecha_fin</code> para rango de fechas.
|
<code class="bg-blue-100 px-1 rounded">:fecha_ini</code> y <code class="bg-blue-100 px-1 rounded">:fecha_fin</code> para rango de fechas.
|
||||||
</p>
|
</p>
|
||||||
<button onclick="listarTablas(this)" class="mt-3 px-3 py-1.5 bg-green-600 hover:bg-green-700 text-white text-xs rounded-lg">␍
|
<button onclick="listarTablas(this)" class="mt-3 px-3 py-1.5 bg-green-600 hover:bg-green-700 text-white text-xs rounded-lg"><i class="fas fa-table mr-1"></i> Ver tablas disponibles</button>
|
||||||
<i class="fas fa-table mr-1"></i> Ver tablas disponibles␍
|
|
||||||
</button>␍
|
|
||||||
<div id="tablas-list" class="mt-2 hidden"></div>
|
<div id="tablas-list" class="mt-2 hidden"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<script>␍
|
<div id="panel-builder" class="hidden">
|
||||||
|
<div class="bg-white rounded-xl shadow-sm border border-gray-200">
|
||||||
|
<div class="px-6 py-4 border-b border-gray-200 flex items-center justify-between">
|
||||||
|
<h3 class="font-semibold text-gray-800"><i class="fas fa-wrench mr-2 text-blue-500"></i>Constructor Visual de Consultas</h3>
|
||||||
|
<button onclick="cargarEsquema()" class="px-3 py-1.5 bg-green-600 hover:bg-green-700 text-white text-xs rounded-lg"><i class="fas fa-sync mr-1"></i> Cargar esquema</button>
|
||||||
|
</div>
|
||||||
|
<div class="p-6">
|
||||||
|
<div class="grid grid-cols-1 lg:grid-cols-3 gap-6">
|
||||||
|
<div class="lg:col-span-1">
|
||||||
|
<h4 class="text-sm font-semibold text-gray-700 mb-2"><i class="fas fa-table mr-1"></i> Tablas</h4>
|
||||||
|
<div id="builder-tablas" class="space-y-1 max-h-96 overflow-y-auto border rounded-lg p-2 bg-gray-50 text-xs">
|
||||||
|
<p class="text-gray-400 italic">Presiona "Cargar esquema"</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="lg:col-span-2">
|
||||||
|
<h4 class="text-sm font-semibold text-gray-700 mb-2">Columnas seleccionadas</h4>
|
||||||
|
<div id="builder-columnas" class="border rounded-lg p-3 bg-gray-50 min-h-[80px] text-xs mb-4">
|
||||||
|
<p class="text-gray-400 italic">Seleccioná tablas y columnas</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<h4 class="text-sm font-semibold text-gray-700 mb-2">Filtros (WHERE)</h4>
|
||||||
|
<div id="builder-where" class="space-y-2 mb-4"></div>
|
||||||
|
<button onclick="agregarFiltro()" class="text-xs text-blue-600 hover:text-blue-800"><i class="fas fa-plus mr-1"></i> Agregar filtro</button>
|
||||||
|
|
||||||
|
<div class="mt-4">
|
||||||
|
<h4 class="text-sm font-semibold text-gray-700 mb-2">SQL Generado</h4>
|
||||||
|
<textarea id="builder-sql" rows="6" readonly class="w-full px-3 py-2 border border-gray-300 rounded-lg text-xs font-mono bg-gray-100"></textarea>
|
||||||
|
<p id="builder-params" class="text-xs text-blue-600 mt-1"></p>
|
||||||
|
<div class="flex space-x-2 mt-2">
|
||||||
|
<button onclick="usarSql()" class="px-3 py-1.5 bg-blue-600 hover:bg-blue-700 text-white text-xs rounded-lg"><i class="fas fa-arrow-right mr-1"></i> Usar en editor</button>
|
||||||
|
<button onclick="copiarSql()" class="px-3 py-1.5 bg-gray-200 hover:bg-gray-300 text-gray-700 text-xs rounded-lg"><i class="fas fa-copy mr-1"></i> Copiar</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
let esquema = [];
|
||||||
|
let tablasSeleccionadas = {};
|
||||||
|
let filtros = [];
|
||||||
|
let aliasCounter = 0;
|
||||||
|
|
||||||
|
function mostrarEditor() {
|
||||||
|
document.getElementById('panel-editor').classList.remove('hidden');
|
||||||
|
document.getElementById('panel-builder').classList.add('hidden');
|
||||||
|
document.getElementById('btn-editor').className = 'px-4 py-2 rounded-lg text-sm font-medium bg-blue-600 text-white';
|
||||||
|
document.getElementById('btn-builder').className = 'px-4 py-2 rounded-lg text-sm font-medium bg-gray-200 text-gray-700 hover:bg-gray-300';
|
||||||
|
}
|
||||||
|
function mostrarBuilder() {
|
||||||
|
document.getElementById('panel-editor').classList.add('hidden');
|
||||||
|
document.getElementById('panel-builder').classList.remove('hidden');
|
||||||
|
document.getElementById('btn-editor').className = 'px-4 py-2 rounded-lg text-sm font-medium bg-gray-200 text-gray-700 hover:bg-gray-300';
|
||||||
|
document.getElementById('btn-builder').className = 'px-4 py-2 rounded-lg text-sm font-medium bg-blue-600 text-white';
|
||||||
|
if (!esquema.length) cargarEsquema();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function cargarEsquema() {
|
||||||
|
const btn = document.querySelector('#panel-builder .bg-green-600');
|
||||||
|
btn.disabled = true; btn.innerHTML = '<i class="fas fa-spinner fa-spin mr-1"></i> Cargando...';
|
||||||
|
try {
|
||||||
|
const resp = await fetch('/queries/esquema', { method: 'POST' });
|
||||||
|
const data = await resp.json();
|
||||||
|
if (data.error) { showToast(data.error, 'error'); return; }
|
||||||
|
esquema = data.tablas;
|
||||||
|
renderizarTablas();
|
||||||
|
} catch(e) { showToast('Error: ' + e.message, 'error'); }
|
||||||
|
finally { btn.disabled = false; btn.innerHTML = '<i class="fas fa-sync mr-1"></i> Cargar esquema'; }
|
||||||
|
}
|
||||||
|
|
||||||
|
function renderizarTablas() {
|
||||||
|
const div = document.getElementById('builder-tablas');
|
||||||
|
div.innerHTML = '';
|
||||||
|
esquema.forEach(t => {
|
||||||
|
const id = 'tab-' + t.tabla.replace(/[^a-zA-Z0-9]/g, '_');
|
||||||
|
const checked = tablasSeleccionadas[t.tabla] ? 'checked' : '';
|
||||||
|
const card = document.createElement('div');
|
||||||
|
card.className = 'border rounded p-2 ' + (checked ? 'border-blue-300 bg-blue-50' : 'border-gray-200 bg-white');
|
||||||
|
card.innerHTML = `
|
||||||
|
<label class="flex items-center space-x-2 cursor-pointer">
|
||||||
|
<input type="checkbox" ${checked} onchange="toggleTabla('${t.tabla}', this.checked)" class="rounded">
|
||||||
|
<span class="font-medium text-sm">${t.tabla}</span>
|
||||||
|
<span class="text-gray-400">(${t.columnas.length} cols)</span>
|
||||||
|
</label>
|
||||||
|
<div id="${id}" class="ml-5 mt-1 ${checked ? '' : 'hidden'}">${renderizarColumnas(t.tabla, t.columnas)}</div>`;
|
||||||
|
div.appendChild(card);
|
||||||
|
});
|
||||||
|
actualizarVista();
|
||||||
|
}
|
||||||
|
|
||||||
|
function renderizarColumnas(tabla, columnas) {
|
||||||
|
let html = '';
|
||||||
|
columnas.forEach(c => {
|
||||||
|
const key = tabla + '.' + c.nombre;
|
||||||
|
const sel = tablasSeleccionadas[tabla]?.columnas?.[c.nombre] ? 'checked' : '';
|
||||||
|
html += `<label class="flex items-center space-x-1 py-0.5 cursor-pointer hover:bg-blue-100 px-1 rounded">
|
||||||
|
<input type="checkbox" ${sel} onchange="toggleColumna('${tabla}','${c.nombre}',this.checked)" class="rounded">
|
||||||
|
<span>${c.nombre}</span>
|
||||||
|
<span class="text-gray-400 ml-1">(${c.tipo}${c.longitud ? ','+c.longitud : ''})</span>
|
||||||
|
</label>`;
|
||||||
|
});
|
||||||
|
return html;
|
||||||
|
}
|
||||||
|
|
||||||
|
function toggleTabla(tabla, checked) {
|
||||||
|
if (checked) {
|
||||||
|
tablasSeleccionadas[tabla] = { alias: 't' + (++aliasCounter), columnas: {} };
|
||||||
|
} else {
|
||||||
|
delete tablasSeleccionadas[tabla];
|
||||||
|
}
|
||||||
|
renderizarTablas();
|
||||||
|
actualizarVista();
|
||||||
|
}
|
||||||
|
|
||||||
|
function toggleColumna(tabla, columna, checked) {
|
||||||
|
if (!tablasSeleccionadas[tabla]) return;
|
||||||
|
if (checked) tablasSeleccionadas[tabla].columnas[columna] = true;
|
||||||
|
else delete tablasSeleccionadas[tabla].columnas[columna];
|
||||||
|
renderizarTablas();
|
||||||
|
actualizarVista();
|
||||||
|
}
|
||||||
|
|
||||||
|
function agregarFiltro() {
|
||||||
|
filtros.push({ tabla: '', campo: '', operador: '=', parametro: '', condicion: 'AND' });
|
||||||
|
renderizarFiltros();
|
||||||
|
actualizarVista();
|
||||||
|
}
|
||||||
|
|
||||||
|
function renderizarFiltros() {
|
||||||
|
const div = document.getElementById('builder-where');
|
||||||
|
div.innerHTML = '';
|
||||||
|
if (!filtros.length) {
|
||||||
|
div.innerHTML = '<p class="text-xs text-gray-400 italic">Sin filtros (seleccionar todos los registros)</p>';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
filtros.forEach((f, i) => {
|
||||||
|
const opts = [];
|
||||||
|
Object.entries(tablasSeleccionadas).forEach(([t, info]) => {
|
||||||
|
const tInfo = esquema.find(e => e.tabla === t);
|
||||||
|
if (tInfo) tInfo.columnas.forEach(c => {
|
||||||
|
opts.push({ value: `${t}.${c.nombre}`, label: `${info.alias}.${c.nombre}` });
|
||||||
|
});
|
||||||
|
});
|
||||||
|
const row = document.createElement('div');
|
||||||
|
row.className = 'flex items-center space-x-2 text-xs';
|
||||||
|
row.innerHTML = `
|
||||||
|
<select onchange="actualizarFiltro(${i},'campo',this.value)" class="border rounded px-2 py-1 text-xs">
|
||||||
|
<option value="">--campo--</option>
|
||||||
|
${opts.map(o => `<option value="${o.value}" ${f.campo===o.value?'selected':''}>${o.label}</option>`).join('')}
|
||||||
|
</select>
|
||||||
|
<select onchange="actualizarFiltro(${i},'operador',this.value)" class="border rounded px-2 py-1 text-xs w-20">
|
||||||
|
${['=','>','<','>=','<=','<>','LIKE','BETWEEN'].map(o => `<option ${f.operador===o?'selected':''}>${o}</option>`).join('')}
|
||||||
|
</select>
|
||||||
|
<input type="text" value="${f.parametro}" onchange="actualizarFiltro(${i},'parametro',this.value)" placeholder=":param" class="border rounded px-2 py-1 text-xs font-mono w-28">
|
||||||
|
<button onclick="filtros.splice(${i},1);renderizarFiltros();actualizarVista();" class="text-red-500 hover:text-red-700"><i class="fas fa-times"></i></button>
|
||||||
|
`;
|
||||||
|
if (i < filtros.length - 1) {
|
||||||
|
const op = document.createElement('div');
|
||||||
|
op.className = 'flex items-center space-x-2 mt-1';
|
||||||
|
op.innerHTML = `<select onchange="actualizarFiltro(${i+1},'condicion',this.value)" class="border rounded px-2 py-1 text-xs w-20">
|
||||||
|
<option value="AND" ${filtros[i+1]?.condicion==='AND'?'selected':''}>AND</option>
|
||||||
|
<option value="OR" ${filtros[i+1]?.condicion==='OR'?'selected':''}>OR</option>
|
||||||
|
</select>`;
|
||||||
|
div.appendChild(row);
|
||||||
|
div.appendChild(op);
|
||||||
|
} else {
|
||||||
|
div.appendChild(row);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function actualizarFiltro(i, prop, val) {
|
||||||
|
if (!filtros[i]) filtros[i] = { tabla: '', campo: '', operador: '=', parametro: '', condicion: 'AND' };
|
||||||
|
filtros[i][prop] = val;
|
||||||
|
actualizarVista();
|
||||||
|
}
|
||||||
|
|
||||||
|
function generarSql() {
|
||||||
|
const tabs = Object.entries(tablasSeleccionadas);
|
||||||
|
if (!tabs.length) return { sql: '-- Seleccioná al menos una tabla', params: [] };
|
||||||
|
|
||||||
|
const selects = [];
|
||||||
|
const froms = [];
|
||||||
|
const allParams = new Set();
|
||||||
|
|
||||||
|
tabs.forEach(([tabla, info]) => {
|
||||||
|
froms.push({ tabla, alias: info.alias });
|
||||||
|
const cols = Object.keys(info.columnas);
|
||||||
|
if (cols.length) {
|
||||||
|
cols.forEach(c => selects.push(`${info.alias}.${c}`));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!selects.length) return { sql: '-- Seleccioná al menos una columna', params: [] };
|
||||||
|
if (!froms.length) return { sql: '-- Seleccioná al menos una tabla', params: [] };
|
||||||
|
|
||||||
|
let sql = 'SELECT\n ' + selects.join(',\n ');
|
||||||
|
sql += '\nFROM ' + froms.map((f, i) => {
|
||||||
|
if (i === 0) return `${f.tabla} ${f.alias}`;
|
||||||
|
return `JOIN ${f.tabla} ${f.alias} ON 1=1`; // basic join, user refines in editor
|
||||||
|
}).join('\n');
|
||||||
|
|
||||||
|
const wheres = [];
|
||||||
|
filtros.forEach(f => {
|
||||||
|
if (f.campo && f.parametro) {
|
||||||
|
const [t, c] = f.campo.split('.');
|
||||||
|
const info = tablasSeleccionadas[t];
|
||||||
|
if (info) {
|
||||||
|
wheres.push(`${info.alias}.${c} ${f.operador} ${f.parametro}`);
|
||||||
|
if (f.parametro.startsWith(':')) allParams.add(f.parametro);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
if (wheres.length) sql += '\nWHERE ' + wheres.join(' ');
|
||||||
|
|
||||||
|
return { sql, params: Array.from(allParams) };
|
||||||
|
}
|
||||||
|
|
||||||
|
function actualizarVista() {
|
||||||
|
const { sql, params } = generarSql();
|
||||||
|
document.getElementById('builder-sql').value = sql;
|
||||||
|
document.getElementById('builder-params').textContent = params.length ? 'Parámetros: ' + params.join(', ') : 'Sin parámetros';
|
||||||
|
|
||||||
|
// Actualizar vista de columnas seleccionadas
|
||||||
|
const div = document.getElementById('builder-columnas');
|
||||||
|
const tabs = Object.entries(tablasSeleccionadas);
|
||||||
|
if (!tabs.length) {
|
||||||
|
div.innerHTML = '<p class="text-gray-400 italic">Seleccioná tablas y columnas</p>';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let html = '';
|
||||||
|
tabs.forEach(([tabla, info]) => {
|
||||||
|
const cols = Object.keys(info.columnas);
|
||||||
|
if (cols.length) {
|
||||||
|
html += `<div class="mb-1"><span class="font-medium">${info.alias}.${tabla}</span>: `;
|
||||||
|
html += cols.map(c => `<code class="bg-blue-100 px-1 rounded">${c}</code>`).join(' ');
|
||||||
|
html += '</div>';
|
||||||
|
}
|
||||||
|
});
|
||||||
|
div.innerHTML = html || '<p class="text-gray-400 italic">Seleccioná columnas</p>';
|
||||||
|
}
|
||||||
|
|
||||||
|
function usarSql() {
|
||||||
|
const sql = document.getElementById('builder-sql').value;
|
||||||
|
if (!sql || sql.startsWith('--')) { showToast('No hay SQL generado', 'warning'); return; }
|
||||||
|
document.getElementById('q_text').value = sql;
|
||||||
|
mostrarEditor();
|
||||||
|
showToast('SQL copiado al editor');
|
||||||
|
}
|
||||||
|
|
||||||
|
function copiarSql() {
|
||||||
|
const sql = document.getElementById('builder-sql').value;
|
||||||
|
if (!sql || sql.startsWith('--')) { showToast('No hay SQL generado', 'warning'); return; }
|
||||||
|
navigator.clipboard.writeText(sql).then(() => showToast('SQL copiado al portapapeles'));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Existing functions below
|
||||||
function editQuery(id, name, type, text, desc) {
|
function editQuery(id, name, type, text, desc) {
|
||||||
document.getElementById('query_id').value = id;
|
document.getElementById('query_id').value = id;
|
||||||
document.getElementById('q_name').value = name;
|
document.getElementById('q_name').value = name;
|
||||||
@@ -105,7 +352,6 @@ function editQuery(id, name, type, text, desc) {
|
|||||||
document.getElementById('btn-cancel').classList.remove('hidden');
|
document.getElementById('btn-cancel').classList.remove('hidden');
|
||||||
document.querySelector('form').action = '/queries/update/' + id;
|
document.querySelector('form').action = '/queries/update/' + id;
|
||||||
}
|
}
|
||||||
␍
|
|
||||||
function cancelEdit() {
|
function cancelEdit() {
|
||||||
document.getElementById('query_id').value = '';
|
document.getElementById('query_id').value = '';
|
||||||
document.getElementById('q_name').value = '';
|
document.getElementById('q_name').value = '';
|
||||||
@@ -114,10 +360,8 @@ function cancelEdit() {
|
|||||||
document.getElementById('btn-cancel').classList.add('hidden');
|
document.getElementById('btn-cancel').classList.add('hidden');
|
||||||
document.querySelector('form').action = '/queries/create';
|
document.querySelector('form').action = '/queries/create';
|
||||||
}
|
}
|
||||||
␍
|
|
||||||
async function listarTablas(btn) {
|
async function listarTablas(btn) {
|
||||||
btn.disabled = true;␍
|
btn.disabled = true; btn.innerHTML = '<i class="fas fa-spinner fa-spin mr-1"></i> Cargando...';
|
||||||
btn.innerHTML = '<i class="fas fa-spinner fa-spin mr-1"></i> Cargando...';␍
|
|
||||||
try {
|
try {
|
||||||
const resp = await fetch('/queries/tablas', { method: 'POST' });
|
const resp = await fetch('/queries/tablas', { method: 'POST' });
|
||||||
const data = await resp.json();
|
const data = await resp.json();
|
||||||
@@ -130,22 +374,13 @@ async function listarTablas(btn) {
|
|||||||
} catch(e) { showToast('Error: ' + e.message, 'error'); }
|
} catch(e) { showToast('Error: ' + e.message, 'error'); }
|
||||||
finally { btn.disabled = false; btn.innerHTML = '<i class="fas fa-table mr-1"></i> Ver tablas disponibles'; }
|
finally { btn.disabled = false; btn.innerHTML = '<i class="fas fa-table mr-1"></i> Ver tablas disponibles'; }
|
||||||
}
|
}
|
||||||
␍
|
|
||||||
async function ejecutarTest(btn, queryId) {
|
async function ejecutarTest(btn, queryId) {
|
||||||
btn.disabled = true;␍
|
btn.disabled = true; btn.innerHTML = '<i class="fas fa-spinner fa-spin mr-1"></i> Probando...';
|
||||||
btn.innerHTML = '<i class="fas fa-spinner fa-spin mr-1"></i> Probando...';␍
|
|
||||||
␍
|
|
||||||
try {
|
try {
|
||||||
const form = new FormData();␍
|
const form = new FormData(); form.append('query_id', queryId);
|
||||||
form.append('query_id', queryId);␍
|
|
||||||
const resp = await fetch('/queries/test', { method: 'POST', body: form });
|
const resp = await fetch('/queries/test', { method: 'POST', body: form });
|
||||||
const data = await resp.json();
|
const data = await resp.json();
|
||||||
␍
|
if (data.error) { showToast(data.error, 'error'); return; }
|
||||||
if (data.error) {␍
|
|
||||||
showToast(data.error, 'error');␍
|
|
||||||
return;␍
|
|
||||||
}␍
|
|
||||||
␍
|
|
||||||
let html = '<table class="w-full text-xs border-collapse"><thead><tr class="bg-gray-100">';
|
let html = '<table class="w-full text-xs border-collapse"><thead><tr class="bg-gray-100">';
|
||||||
data.columns.forEach(c => { html += '<th class="p-2 border text-left font-semibold">' + c + '</th>'; });
|
data.columns.forEach(c => { html += '<th class="p-2 border text-left font-semibold">' + c + '</th>'; });
|
||||||
html += '</tr></thead><tbody>';
|
html += '</tr></thead><tbody>';
|
||||||
@@ -156,17 +391,12 @@ async function ejecutarTest(btn, queryId) {
|
|||||||
});
|
});
|
||||||
html += '</tbody></table>';
|
html += '</tbody></table>';
|
||||||
html += '<p class="text-xs text-gray-500 mt-2">Total: ' + data.total + ' registros (mostrando ' + data.rows.length + ')</p>';
|
html += '<p class="text-xs text-gray-500 mt-2">Total: ' + data.total + ' registros (mostrando ' + data.rows.length + ')</p>';
|
||||||
␍
|
|
||||||
const modal = document.createElement('div');
|
const modal = document.createElement('div');
|
||||||
modal.className = 'fixed inset-0 z-50 flex items-center justify-center bg-black bg-opacity-50';
|
modal.className = 'fixed inset-0 z-50 flex items-center justify-center bg-black bg-opacity-50';
|
||||||
modal.innerHTML = '<div class="bg-white rounded-xl shadow-xl max-w-4xl w-full mx-4 max-h-[80vh] overflow-auto p-6"><div class="flex justify-between items-center mb-4"><h3 class="font-semibold text-lg">Resultado</h3><button onclick="this.closest(\'.fixed\').remove()" class="text-gray-400 hover:text-gray-600"><i class="fas fa-times text-xl"></i></button></div>' + html + '</div>';
|
modal.innerHTML = '<div class="bg-white rounded-xl shadow-xl max-w-4xl w-full mx-4 max-h-[80vh] overflow-auto p-6"><div class="flex justify-between items-center mb-4"><h3 class="font-semibold text-lg">Resultado</h3><button onclick="this.closest(\'.fixed\').remove()" class="text-gray-400 hover:text-gray-600"><i class="fas fa-times text-xl"></i></button></div>' + html + '</div>';
|
||||||
document.body.appendChild(modal);
|
document.body.appendChild(modal);
|
||||||
} catch(e) {␍
|
} catch(e) { showToast('Error: ' + e.message, 'error'); }
|
||||||
showToast('Error: ' + e.message, 'error');␍
|
finally { btn.disabled = false; btn.innerHTML = '<i class="fas fa-play mr-1"></i> Probar'; }
|
||||||
} finally {␍
|
|
||||||
btn.disabled = false;␍
|
|
||||||
btn.innerHTML = '<i class="fas fa-play mr-1"></i> Probar';␍
|
|
||||||
}␍
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
Reference in New Issue
Block a user