EuskadiTech/TeleSec
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

two

Browse Source
This commit is contained in:
naielv
2025-09-09 16:16:31 +02:00
parent 673d64e720
commit ac68228e26
2 changed files with 219 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

469
src/app_modules.js
View File

@@ -768,281 +768,240 @@ function TS_IndexElement(
return false; return false;
} }
function render() { // --- Optimized render function ---
function sorter(a, b) { let lastSearchValue = "";
// If both items have Fecha field, sort by date first let lastFilteredSorted = [];
if (a.Fecha && b.Fecha) { function sorter(a, b) {
// Primary sort by date if (a.Fecha && b.Fecha) {
if (a.Fecha < b.Fecha) return -1; if (a.Fecha < b.Fecha) return -1;
if (a.Fecha > b.Fecha) return 1; if (a.Fecha > b.Fecha) return 1;
// Secondary sort by Nombre if dates are equal and both have names
if (a.Nombre && b.Nombre) {
const nameA = a.Nombre.toLowerCase();
const nameB = b.Nombre.toLowerCase();
if (nameA < nameB) return -1;
if (nameA > nameB) return 1;
}
return 0;
}
// If persona field exists, sort by Region, then by Nombre
if (a.Persona && b.Persona) {
console.log(a.Persona, SC_Personas[a.Persona])
const personaA = SC_Personas[a.Persona] || { Nombre: "", Region: "" };
const personaB = SC_Personas[b.Persona] || { Nombre: "", Region: "" };
if (personaA.Region < personaB.Region) return -1;
if (personaA.Region > personaB.Region) return 1;
if (personaA.Nombre < personaB.Nombre) return -1;
if (personaA.Nombre > personaB.Nombre) return 1;
return 0;
}
// If no Fecha field exists, sort only by Nombre
if (a.Nombre && b.Nombre) { if (a.Nombre && b.Nombre) {
const nameA = a.Nombre.toLowerCase(); const nameA = a.Nombre.toLowerCase();
const nameB = b.Nombre.toLowerCase(); const nameB = b.Nombre.toLowerCase();
if (nameA < nameB) return -1; if (nameA < nameB) return -1;
if (nameA > nameB) return 1; if (nameA > nameB) return 1;
return 0;
} }
return 0; return 0;
} }
if (a.Persona && b.Persona) {
const searchValue = searchKeyEl.value.toLowerCase().trim(); const personaA = SC_Personas[a.Persona] || { Nombre: "", Region: "" };
tablebody_EL.innerHTML = ""; const personaB = SC_Personas[b.Persona] || { Nombre: "", Region: "" };
Object.entries(rows) if (personaA.Region < personaB.Region) return -1;
if (personaA.Region > personaB.Region) return 1;
if (personaA.Nombre < personaB.Nombre) return -1;
if (personaA.Nombre > personaB.Nombre) return 1;
return 0;
}
if (a.Nombre && b.Nombre) {
const nameA = a.Nombre.toLowerCase();
const nameB = b.Nombre.toLowerCase();
if (nameA < nameB) return -1;
if (nameA > nameB) return 1;
return 0;
}
return 0;
}
function getFilteredSortedRows(searchValue) {
// Only use cache if searchValue is not empty and cache is valid
if (searchValue && searchValue === lastSearchValue && lastFilteredSorted.length > 0) {
return lastFilteredSorted;
}
const filtered = Object.entries(rows)
.filter(([_, data]) => searchInData(data, searchValue, config)) .filter(([_, data]) => searchInData(data, searchValue, config))
.map(([_, data]) => data) .map(([_, data]) => data)
.sort(sorter) .sort(sorter);
.forEach((data) => { lastSearchValue = searchValue;
var new_tr = document.createElement("tr"); lastFilteredSorted = filtered;
return filtered;
if (canAddCallback != undefined) { }
if (canAddCallback(data) == true) {
return; function render() {
const searchValue = searchKeyEl.value.toLowerCase().trim();
// Use document fragment for batch DOM update
const fragment = document.createDocumentFragment();
const filteredSorted = getFilteredSortedRows(searchValue);
for (let i = 0; i < filteredSorted.length; i++) {
const data = filteredSorted[i];
if (canAddCallback != undefined && canAddCallback(data) === true) {
continue;
}
const new_tr = document.createElement("tr");
if (rowCallback != undefined) {
rowCallback(data, new_tr);
}
config.forEach((key) => {
switch (key.type) {
case "raw":
case "text": {
const tdRaw = document.createElement("td");
const rawContent = (String(data[key.key]) || key.default || "").replace(/\n/g, "<br>");
tdRaw.innerHTML = rawContent;
new_tr.appendChild(tdRaw);
break;
} }
} case "fecha":
tablebody_EL.append(new_tr); case "fecha-iso": {
if (rowCallback != undefined) { const tdFechaISO = document.createElement("td");
rowCallback(data, new_tr); if (data[key.key]) {
} const fechaArray = data[key.key].split("-");
config.forEach((key) => { tdFechaISO.innerText = fechaArray[2] + "/" + fechaArray[1] + "/" + fechaArray[0];
switch (key.type) { }
case "raw": new_tr.appendChild(tdFechaISO);
case "text": break;
const tdRaw = document.createElement("td"); }
const rawContent = (String(data[key.key]) || key.default || "").replace( case "template": {
/\n/g, const tdCustomTemplate = document.createElement("td");
"<br>" new_tr.appendChild(tdCustomTemplate);
); key.template(data, tdCustomTemplate);
tdRaw.innerHTML = rawContent; break;
new_tr.appendChild(tdRaw); }
break; case "comanda": {
case "fecha": const tdComanda = document.createElement("td");
case "fecha-iso": tdComanda.style.verticalAlign = "top";
const tdFechaISO = document.createElement("td"); const parsedComanda = JSON.parse(data.Comanda);
if (data[key.key]) { const precio = SC_priceCalc(parsedComanda)[0];
const fechaArray = data[key.key].split("-"); const tempDiv = document.createElement("div");
tdFechaISO.innerText = fechaArray[2] + "/" + fechaArray[1] + "/" + fechaArray[0]; tempDiv.innerHTML = setLayeredImages(parsedComanda, data._key);
tdComanda.appendChild(tempDiv.firstChild);
const pre = document.createElement("pre");
pre.style.fontSize = "15px";
pre.style.display = "inline-block";
pre.style.margin = "0";
pre.style.verticalAlign = "top";
pre.style.padding = "5px";
pre.style.background = "rgba(255, 255, 0, 0.5)";
pre.style.border = "1px solid rgba(0, 0, 0, 0.2)";
pre.style.borderRadius = "5px";
pre.style.boxShadow = "2px 2px 5px rgba(0, 0, 0, 0.1)";
pre.style.height = "100%";
const spanPrecio = document.createElement("span");
spanPrecio.style.fontSize = "20px";
spanPrecio.innerHTML = SC_Personas[data.Persona].Puntos >= 10 ? `Total: Gratis!(${precio}c)` : `Total: ${precio}c`;
pre.innerHTML = "<b>Ticket de compra</b> ";
pre.appendChild(document.createTextNode("\n"));
pre.innerHTML += SC_parse_short(parsedComanda) + "<hr>" + data.Notas + "<hr>";
pre.appendChild(spanPrecio);
tdComanda.appendChild(pre);
new_tr.appendChild(tdComanda);
break;
}
case "comanda-status": {
var sc_nobtn = "";
if (urlParams.get("sc_nobtn") == "yes") {
sc_nobtn = "pointer-events: none; opacity: 0.5";
}
const td = document.createElement("td");
td.style.fontSize = "17px";
if (sc_nobtn) {
td.style.pointerEvents = "none";
td.style.opacity = "0.5";
}
const createButton = (text, state) => {
const button = document.createElement("button");
button.textContent = text;
if (data.Estado === state) {
button.className = "rojo";
} }
new_tr.appendChild(tdFechaISO); button.onclick = (event) => {
break;
case "template":
const tdCustomTemplate = document.createElement("td");
new_tr.appendChild(tdCustomTemplate);
key.template(data, tdCustomTemplate);
break;
case "comanda":
const tdComanda = document.createElement("td");
tdComanda.style.verticalAlign = "top";
const parsedComanda = JSON.parse(data.Comanda);
const precio = SC_priceCalc(parsedComanda)[0];
// Create a temporary div to parse the HTML from setLayeredImages
const tempDiv = document.createElement("div");
tempDiv.innerHTML = setLayeredImages(parsedComanda, data._key);
tdComanda.appendChild(tempDiv.firstChild);
const pre = document.createElement("pre");
pre.style.fontSize = "15px";
pre.style.display = "inline-block";
pre.style.margin = "0";
pre.style.verticalAlign = "top";
pre.style.padding = "5px";
//looking like a post-it
pre.style.background = "rgba(255, 255, 0, 0.5)";
pre.style.border = "1px solid rgba(0, 0, 0, 0.2)";
pre.style.borderRadius = "5px";
pre.style.boxShadow = "2px 2px 5px rgba(0, 0, 0, 0.1)";
pre.style.height = "100%";
const spanPrecio = document.createElement("span");
spanPrecio.style.fontSize = "20px";
spanPrecio.innerHTML =
SC_Personas[data.Persona].Puntos >= 10 ?
`Total: Gratis!(${precio}c)` :
`Total: ${precio}c`;
pre.innerHTML = "<b>Ticket de compra</b> ";
pre.appendChild(document.createTextNode("\n"));
pre.innerHTML +=
SC_parse_short(parsedComanda) + "<hr>" + data.Notas + "<hr>";
pre.appendChild(spanPrecio);
tdComanda.appendChild(pre);
new_tr.appendChild(tdComanda);
break;
case "comanda-status":
var sc_nobtn = "";
if (urlParams.get("sc_nobtn") == "yes") {
sc_nobtn = "pointer-events: none; opacity: 0.5";
}
const td = document.createElement("td");
td.style.fontSize = "17px";
if (sc_nobtn) {
td.style.pointerEvents = "none";
td.style.opacity = "0.5";
}
// Create buttons
const createButton = (text, state) => {
const button = document.createElement("button");
button.textContent = text;
if (data.Estado === state) {
button.className = "rojo";
}
button.onclick = (event) => {
event.preventDefault();
event.stopPropagation();
data.Estado = state;
var enc = TS_encrypt(data, SECRET, (encrypted) => {
betterGunPut(ref.get(data._key), encrypted);
toastr.success("Guardado!");
});
return false;
};
return button;
};
// Create all buttons
const buttons = [
createButton("Pedido", "Pedido"),
createButton("En preparación", "En preparación"),
createButton("Listo", "Listo"),
createButton("Entregado", "Entregado"),
createButton("Deuda", "Deuda"),
];
// Create paid button separately due to different behavior
const paidButton = document.createElement("button");
paidButton.textContent = "Pagado";
paidButton.onclick = (event) => {
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
if ( data.Estado = state;
!confirm( TS_encrypt(data, SECRET, (encrypted) => {
"¿Quieres marcar como pagado? - Se borrara la comanda y se actualizarán los puntos." betterGunPut(ref.get(data._key), encrypted);
) toastr.success("Guardado!");
) {
return false;
}
data.Estado = "Pagado";
betterGunPut(ref.get(data._key), null);
toastr.success("Guardado!");
if (SC_Personas[data.Persona].Puntos >= 10 && confirm("¿Pagar con Puntos? - Cancela para pagar con Efectivo.")) {
SC_Personas[data.Persona].Puntos = parseInt(SC_Personas[data.Persona].Puntos) - 10;
toastr.success(
"¡Comada gratis para " +
SC_Personas[data.Persona].Nombre +
"!"
);
toastr.success(
"¡Comada gratis para " +
SC_Personas[data.Persona].Nombre +
"!"
);
} else {
SC_Personas[data.Persona].Puntos = parseInt(SC_Personas[data.Persona].Puntos) + 1;
toastr.success("¡Comada DE PAGO!");
}
TS_encrypt(SC_Personas[data.Persona], SECRET, (encrypted) => {
betterGunPut(
gun.get(TABLE).get("personas").get(data.Persona),
encrypted
);
}); });
return false; return false;
}; };
return button;
// Add all buttons to td with line breaks between };
buttons.forEach((button) => { const buttons = [
td.appendChild(button); createButton("Pedido", "Pedido"),
td.appendChild(document.createElement("br")); createButton("En preparación", "En preparación"),
}); createButton("Listo", "Listo"),
td.appendChild(paidButton); createButton("Entregado", "Entregado"),
new_tr.appendChild(td); createButton("Deuda", "Deuda"),
];
// Event handlers are now attached during button creation const paidButton = document.createElement("button");
break; paidButton.textContent = "Pagado";
case "persona": paidButton.onclick = (event) => {
if (key.self == true) { event.preventDefault();
var persona = data event.stopPropagation();
} else { if (!confirm("¿Quieres marcar como pagado? - Se borrara la comanda y se actualizarán los puntos.")) {
var persona = SC_Personas[data[key.key]] || {}; return false;
} }
data.Estado = "Pagado";
const regco = stringToColour( betterGunPut(ref.get(data._key), null);
(persona.Region || "?").toLowerCase() toastr.success("Guardado!");
); if (SC_Personas[data.Persona].Puntos >= 10 && confirm("¿Pagar con Puntos? - Cancela para pagar con Efectivo.")) {
SC_Personas[data.Persona].Puntos = parseInt(SC_Personas[data.Persona].Puntos) - 10;
const tdPersona = document.createElement("td"); toastr.success("¡Comada gratis para " + SC_Personas[data.Persona].Nombre + "!");
tdPersona.style.textAlign = "center"; toastr.success("¡Comada gratis para " + SC_Personas[data.Persona].Nombre + "!");
tdPersona.style.fontSize = "20px"; } else {
tdPersona.style.backgroundColor = regco; SC_Personas[data.Persona].Puntos = parseInt(SC_Personas[data.Persona].Puntos) + 1;
tdPersona.style.color = colorIsDarkAdvanced(regco); toastr.success("¡Comada DE PAGO!");
}
const regionSpan = document.createElement("span"); TS_encrypt(SC_Personas[data.Persona], SECRET, (encrypted) => {
regionSpan.style.fontSize = "40px"; betterGunPut(gun.get(TABLE).get("personas").get(data.Persona), encrypted);
regionSpan.style.textTransform = "capitalize"; });
regionSpan.textContent = (persona.Region || "?").toLowerCase(); return false;
tdPersona.appendChild(regionSpan); };
buttons.forEach((button) => {
tdPersona.appendChild(document.createElement("br")); td.appendChild(button);
td.appendChild(document.createElement("br"));
const infoSpan = document.createElement("span"); });
infoSpan.style.backgroundColor = "white"; td.appendChild(paidButton);
infoSpan.style.border = "2px solid black"; new_tr.appendChild(td);
infoSpan.style.borderRadius = "5px"; break;
infoSpan.style.display = "inline-block";
infoSpan.style.padding = "5px";
infoSpan.style.color = "black";
const img = document.createElement("img");
img.src = persona.Foto || "static/ico/user_generic.png";
img.height = 70;
infoSpan.appendChild(img);
infoSpan.appendChild(document.createElement("br"));
infoSpan.appendChild(
document.createTextNode(persona.Nombre || "")
);
infoSpan.appendChild(document.createElement("br"));
const pointsSpan = document.createElement("span");
pointsSpan.style.fontSize = "17px";
pointsSpan.textContent = (persona.Puntos || "0") + " puntos.";
infoSpan.appendChild(pointsSpan);
tdPersona.appendChild(infoSpan);
new_tr.appendChild(tdPersona);
break;
default:
break;
} }
}); case "persona": {
new_tr.onclick = (event) => { let persona = key.self === true ? data : SC_Personas[data[key.key]] || {};
setUrlHash(pageco + "," + data._key); const regco = stringToColour((persona.Region || "?").toLowerCase());
}; const tdPersona = document.createElement("td");
tdPersona.style.textAlign = "center";
tdPersona.style.fontSize = "20px";
tdPersona.style.backgroundColor = regco;
tdPersona.style.color = colorIsDarkAdvanced(regco);
const regionSpan = document.createElement("span");
regionSpan.style.fontSize = "40px";
regionSpan.style.textTransform = "capitalize";
regionSpan.textContent = (persona.Region || "?").toLowerCase();
tdPersona.appendChild(regionSpan);
tdPersona.appendChild(document.createElement("br"));
const infoSpan = document.createElement("span");
infoSpan.style.backgroundColor = "white";
infoSpan.style.border = "2px solid black";
infoSpan.style.borderRadius = "5px";
infoSpan.style.display = "inline-block";
infoSpan.style.padding = "5px";
infoSpan.style.color = "black";
const img = document.createElement("img");
img.src = persona.Foto || "static/ico/user_generic.png";
img.height = 70;
infoSpan.appendChild(img);
infoSpan.appendChild(document.createElement("br"));
infoSpan.appendChild(document.createTextNode(persona.Nombre || ""));
infoSpan.appendChild(document.createElement("br"));
const pointsSpan = document.createElement("span");
pointsSpan.style.fontSize = "17px";
pointsSpan.textContent = (persona.Puntos || "0") + " puntos.";
infoSpan.appendChild(pointsSpan);
tdPersona.appendChild(infoSpan);
new_tr.appendChild(tdPersona);
break;
}
default:
break;
}
}); });
new_tr.onclick = (event) => {
setUrlHash(pageco + "," + data._key);
};
fragment.appendChild(new_tr);
}
// Replace tbody in one operation
tablebody_EL.innerHTML = "";
tablebody_EL.appendChild(fragment);
} }
ref.map().on((data, key, _msg, _ev) => { ref.map().on((data, key, _msg, _ev) => {
EventListeners.GunJS.push(_ev); EventListeners.GunJS.push(_ev);

11
src/page/materiales.js
View File

@@ -175,12 +175,11 @@ PAGES.materiales = {
gun.get(TABLE).get("materiales"), gun.get(TABLE).get("materiales"),
document.getElementById("tableContainer"), document.getElementById("tableContainer"),
undefined, undefined,
undefined, function(data) {
//function(data) { if (data.Ubicacion == filtroUbicacion) {return false}
// if (data.Ubicacion == filtroUbicacion) {return false} if (filtroUbicacion == "") {return false}
// if (filtroUbicacion == "") {return false} return true
// return true }
//}
); );
} }