3D-Druck/Filaman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 184 Wiki Activity

Merge pull request #40 from janecker/location_bambu_fix

Browse Source 
Fixes some issues with the new location tags
This commit is contained in:
Manuel Weiser
2025-07-22 17:35:02 +02:00
committed by GitHub
parent 150a178038 7f25f3e14f
commit aeb61ba462
2 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
html/rfid.js
View File

@@ -555,7 +555,10 @@ function updateNfcData(data) {
} }
// HTML für die Datenanzeige erstellen // HTML für die Datenanzeige erstellen
let html = ` let html = "";
if(data.sm_id){
html = `
<div class="nfc-card-data" style="margin-top: 10px;"> <div class="nfc-card-data" style="margin-top: 10px;">
<p><strong>Brand:</strong> ${data.brand || 'N/A'}</p> <p><strong>Brand:</strong> ${data.brand || 'N/A'}</p>
<p><strong>Type:</strong> ${data.type || 'N/A'} ${data.color_hex ? `<span style=" <p><strong>Type:</strong> ${data.type || 'N/A'} ${data.color_hex ? `<span style="
@@ -568,10 +571,27 @@ function updateNfcData(data) {
border-radius: 3px; border-radius: 3px;
margin-left: 5px; margin-left: 5px;
"></span>` : ''}</p> "></span>` : ''}</p>
`; `;
// Spoolman ID anzeigen // Spoolman ID anzeigen
html += `<p><strong>Spoolman ID:</strong> ${data.sm_id || 'No Spoolman ID'}</p>`; html += `<p><strong>Spoolman ID:</strong> ${data.sm_id || 'No Spoolman ID'}</p>`;
}
else if(data.location)
{
html = `
<div class="nfc-card-data" style="margin-top: 10px;">
<p><strong>Location:</strong> ${data.location || 'N/A'}</p>
`;
}
else
{
html = `
<div class="nfc-card-data" style="margin-top: 10px;">
<p><strong>Unknown tag</strong></p>
`;
}
// Nur wenn eine sm_id vorhanden ist, aktualisiere die Dropdowns // Nur wenn eine sm_id vorhanden ist, aktualisiere die Dropdowns
if (data.sm_id) { if (data.sm_id) {
@@ -626,11 +646,11 @@ function writeNfcTag() {
// Erstelle das NFC-Datenpaket mit korrekten Datentypen // Erstelle das NFC-Datenpaket mit korrekten Datentypen
const nfcData = { const nfcData = {
//color_hex: selectedSpool.filament.color_hex || "FFFFFF", color_hex: selectedSpool.filament.color_hex || "FFFFFF",
//type: selectedSpool.filament.material, type: selectedSpool.filament.material,
//min_temp: minTemp, min_temp: minTemp,
//max_temp: maxTemp, max_temp: maxTemp,
//brand: selectedSpool.filament.vendor.name, brand: selectedSpool.filament.vendor.name,
sm_id: String(selectedSpool.id) // Konvertiere zu String sm_id: String(selectedSpool.id) // Konvertiere zu String
}; };

12
html/rfid_bambu.html
View File

@@ -139,6 +139,18 @@
<p id="nfcInfo" class="nfc-status"></p> <p id="nfcInfo" class="nfc-status"></p>
<button id="writeNfcButton" class="btn btn-primary hidden" onclick="writeNfcTag()">Write Tag</button> <button id="writeNfcButton" class="btn btn-primary hidden" onclick="writeNfcTag()">Write Tag</button>
</div> </div>
<div class="feature-box">
<h2>Spoolman Locations</h2>
<label for="locationSelect">Location:</label>
<div style="display: flex; justify-content: space-between; align-items: center;">
<select id="locationSelect" class="styled-select">
<option value="">Please choose...</option>
</select>
</div>
<p id="nfcInfoLocation" class="nfc-status"></p>
<button id="writeLocationNfcButton" class="btn btn-primary hidden" onclick="writeLocationNfcTag()">Write Location Tag</button>
</div>
</div> </div>
<!-- Rechte Spalte --> <!-- Rechte Spalte -->