Skip to content

fix(spools): mostrar tara do modelo no lugar do campo oculto (v1.33.3) #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iscarelli merged 1 commit into from
Jun 10, 2026
Merged

fix(spools): mostrar tara do modelo no lugar do campo oculto (v1.33.3) #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ Versioning follows [SemVer](https://semver.org/): **MAJOR.MINOR.PATCH**

---

## [1.33.3] — 2026-06-10

### Fixed
- **Tara do modelo exibida no lugar do campo oculto.** Ao selecionar um modelo de carretel, o campo "Tara Personalizada" e seu rótulo são substituídos pelo rótulo "Tara do modelo" e o valor em gramas. Ao voltar para "Tara personalizada / desconhecida", o campo de entrada reaparece.
- Placeholder do campo tara personalizada corrigido para "Preencha com o peso do carretel".

## [1.33.2] — 2026-06-10

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.33.2
1.33.3
29 changes: 20 additions & 9 deletions templates/spools/form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,17 @@ <h4 class="mb-0 fw-bold">{% if spool %}{{ _('Editar') }} SP-{{ '%04d'|format(spo
{% endfor %}
</select>
</div>
<div class="col-md-6" id="customTareCol">
<label class="form-label fw-semibold">{{ _('Tara Personalizada (g)') }}</label>
<input type="number" name="custom_tare_g" id="customTare" class="form-control" step="0.1" min="0"
value="{{ spool.custom_tare_g if spool and spool.custom_tare_g else '' }}"
placeholder="{{ _('Deixe em branco se usar o modelo ao lado') }}">
<div class="col-md-6">
<div id="customTareForm">
<label class="form-label fw-semibold">{{ _('Tara Personalizada (g)') }}</label>
<input type="number" name="custom_tare_g" id="customTare" class="form-control" step="0.1" min="0"
value="{{ spool.custom_tare_g if spool and spool.custom_tare_g else '' }}"
placeholder="{{ _('Preencha com o peso do carretel') }}">
</div>
<div id="tareModelDisplay" style="display:none">
<label class="form-label fw-semibold text-muted">{{ _('Tara do modelo') }}</label>
<p id="tareModelValue" class="form-control-plaintext fw-semibold mb-0"></p>
</div>
</div>
<div class="col-md-6">
<label class="form-label fw-semibold">{{ _('Peso Nominal do Filamento (g)') }}</label>
Expand Down Expand Up @@ -122,17 +128,22 @@ <h4 class="mb-0 fw-bold">{% if spool %}{{ _('Editar') }} SP-{{ '%04d'|format(spo
filamentSel.addEventListener('change', updateFilamentPreview);
updateFilamentPreview();

// Tara — esconde/mostra campo personalizado conforme modelo selecionado
// Tara — alterna entre campo livre e exibição da tara do modelo
const sel = document.getElementById('spoolModelSelect');
const customTare = document.getElementById('customTare');
const customTareCol = document.getElementById('customTareCol');
const customTareForm = document.getElementById('customTareForm');
const tareModelDisplay = document.getElementById('tareModelDisplay');
const tareModelValue = document.getElementById('tareModelValue');
function updateTareState() {
const opt = sel.options[sel.selectedIndex];
if (opt.dataset.tare) {
customTareCol.style.visibility = 'hidden';
customTareForm.style.display = 'none';
customTare.value = '';
tareModelDisplay.style.display = '';
tareModelValue.textContent = parseFloat(opt.dataset.tare).toFixed(0) + ' g';
} else {
customTareCol.style.visibility = '';
customTareForm.style.display = '';
tareModelDisplay.style.display = 'none';
}
}
sel.addEventListener('change', updateTareState);
Expand Down
6 changes: 2 additions & 4 deletions translations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,7 @@
"Modelo de Carretel Vazio": "Empty Spool Model",
"Tara personalizada / desconhecida": "Custom / unknown tare",
"Tara Personalizada (g)": "Custom Tare (g)",
"Deixe em branco se usar o modelo acima": "Leave blank if using the model above",
"Deixe em branco se usar o modelo ao lado": "Leave blank if using the model to the left",
"Preencha com o peso do carretel": "Enter the spool weight",
"Peso Nominal do Filamento (g)": "Nominal Filament Weight (g)",
"Peso declarado na embalagem (ex: 1000g).": "Weight stated on the package (e.g.: 1000g).",
"Local de Armazenamento": "Storage Location",
Expand Down Expand Up @@ -621,8 +620,7 @@
"Modelo de Carretel Vazio": "Modelo de Carrete Vacío",
"Tara personalizada / desconhecida": "Tara personalizada / desconocida",
"Tara Personalizada (g)": "Tara Personalizada (g)",
"Deixe em branco se usar o modelo acima": "Deja en blanco si usas el modelo de arriba",
"Deixe em branco se usar o modelo ao lado": "Deja en blanco si usas el modelo de al lado",
"Preencha com o peso do carretel": "Ingresa el peso del carrete",
"Peso Nominal do Filamento (g)": "Peso Nominal del Filamento (g)",
"Peso declarado na embalagem (ex: 1000g).": "Peso indicado en el empaque (ej.: 1000g).",
"Local de Armazenamento": "Lugar de Almacenamiento",
Expand Down