Stazioni: sorgenti camera lette dall'acquisitore, link Acquisizione (#88)
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Jbf7qKuxsnAVjxthRy7dnB
This commit is contained in:
@@ -97,7 +97,7 @@
|
||||
</span>
|
||||
<a :href="calibrationUrl" target="_blank" rel="noopener"
|
||||
x-show="calibrationUrl"
|
||||
class="font-medium text-primary hover:underline">{{ _('Calibra') }}</a>
|
||||
class="font-medium text-primary hover:underline">{{ _('Acquisizione') }}</a> {# #88: era «Calibra» #}
|
||||
</div>
|
||||
</template>
|
||||
</td>
|
||||
@@ -165,7 +165,7 @@
|
||||
</div>
|
||||
|
||||
<!-- Modal: Create / Edit Station -->
|
||||
<div x-show="showModal" x-cloak
|
||||
<div x-show="showModal"
|
||||
class="fixed inset-0 z-50 flex items-center justify-center p-4"
|
||||
@keydown.escape.window="closeModal()">
|
||||
<div class="absolute inset-0 bg-black/50" @click="closeModal()"></div>
|
||||
@@ -238,21 +238,42 @@
|
||||
{# Camera della stazione (#72): servizio camera (vs-gui) e sorgente da cui prendere il frame #}
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-[var(--text-primary)] mb-1">{{ _('Camera (URL)') }}</label>
|
||||
<input type="text" x-model="form.camera_url"
|
||||
<input type="text" x-model="form.camera_url" @change="loadCameraSources()"
|
||||
class="w-full px-3 py-2 rounded-lg border border-[var(--border-color)] bg-[var(--bg-card)]
|
||||
text-sm font-mono text-[var(--text-primary)] focus:outline-none focus:ring-2 focus:ring-primary/30 focus:border-primary transition-colors"
|
||||
placeholder="host:8765"
|
||||
maxlength="500">
|
||||
<p class="mt-1 text-xs text-[var(--text-secondary)]">{{ _('Vuoto = nessuna camera. Indirizzo del servizio camera, con http o https, senza / finale') }}</p>
|
||||
</div>
|
||||
{# Sorgente camera (#88): testo libero con suggerimenti letti dall'acquisitore (datalist) #}
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-[var(--text-primary)] mb-1">{{ _('Sorgente camera') }}</label>
|
||||
<input type="text" x-model="form.camera_source"
|
||||
class="w-full px-3 py-2 rounded-lg border border-[var(--border-color)] bg-[var(--bg-card)]
|
||||
text-sm font-mono text-[var(--text-primary)] focus:outline-none focus:ring-2 focus:ring-primary/30 focus:border-primary transition-colors"
|
||||
placeholder="camera:folder"
|
||||
maxlength="200">
|
||||
<p class="mt-1 text-xs text-[var(--text-secondary)]">{{ _('Es. camera:<seriale> oppure camera:folder') }}</p>
|
||||
<div class="flex gap-2">
|
||||
<input type="text" x-model="form.camera_source" list="cameraSourcesList"
|
||||
class="flex-1 min-w-0 px-3 py-2 rounded-lg border border-[var(--border-color)] bg-[var(--bg-card)]
|
||||
text-sm font-mono text-[var(--text-primary)] focus:outline-none focus:ring-2 focus:ring-primary/30 focus:border-primary transition-colors"
|
||||
placeholder="camera:folder"
|
||||
maxlength="200">
|
||||
<datalist id="cameraSourcesList">
|
||||
<template x-for="s in cameraSources" :key="s.name">
|
||||
<option :value="s.name" :label="s.label"></option>
|
||||
</template>
|
||||
</datalist>
|
||||
<button type="button" @click="loadCameraSources()"
|
||||
:disabled="!(form.camera_url || '').trim() || cameraSourcesLoading"
|
||||
class="px-3 py-2 rounded-lg border border-[var(--border-color)] bg-[var(--bg-card)] text-sm font-medium
|
||||
text-[var(--text-primary)] hover:bg-[var(--bg-secondary)] disabled:opacity-50 disabled:cursor-not-allowed transition-colors whitespace-nowrap">
|
||||
{{ _('Leggi sorgenti') }}
|
||||
</button>
|
||||
</div>
|
||||
<p class="mt-1 text-xs"
|
||||
:class="cameraSourcesError ? 'text-red-600 dark:text-red-400' : 'text-[var(--text-secondary)]'"
|
||||
x-text="cameraSourcesStatus || {{ _('Es. camera:<seriale> oppure camera:folder')|tojson_attr }}"></p>
|
||||
<p x-show="cameraSourceMissing" class="mt-1 text-xs text-amber-700 dark:text-amber-300">{{ _("Sorgente non presente nell'acquisitore") }}</p>
|
||||
<a x-show="(form.camera_url || '').trim()"
|
||||
:href="(form.camera_url || '').trim().replace(/\/+$/, '') + '/acquisizione'"
|
||||
target="_blank" rel="noopener"
|
||||
class="mt-1 inline-block text-xs font-medium text-primary hover:underline">{{ _('Apri pagina acquisizione') }}</a>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
@@ -289,14 +310,14 @@
|
||||
class="px-4 py-2 bg-primary text-white text-sm font-medium rounded-lg
|
||||
hover:bg-primary-700 transition-colors shadow-sm disabled:opacity-50">
|
||||
<span x-show="!saving" x-text="isEditing ? {{ _('Salva Modifiche')|tojson_attr }} : {{ _('Crea Stazione')|tojson_attr }}"></span>
|
||||
<span x-show="saving" x-cloak>{{ _('Salvataggio...') }}</span>
|
||||
<span x-show="saving">{{ _('Salvataggio...') }}</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Modal: Recipe Assignments -->
|
||||
<div x-show="showAssignments" x-cloak
|
||||
<div x-show="showAssignments"
|
||||
class="fixed inset-0 z-50 flex items-center justify-center p-4"
|
||||
@keydown.escape.window="closeAssignmentsModal()">
|
||||
<div class="absolute inset-0 bg-black/50" @click="closeAssignmentsModal()"></div>
|
||||
@@ -417,7 +438,7 @@
|
||||
</div>
|
||||
|
||||
<!-- Confirm Reset Modal -->
|
||||
<div x-show="showResetConfirm" x-cloak
|
||||
<div x-show="showResetConfirm"
|
||||
class="fixed inset-0 z-50 flex items-center justify-center p-4"
|
||||
@keydown.escape.window="showResetConfirm = false">
|
||||
<div class="absolute inset-0 bg-black/50" @click="showResetConfirm = false"></div>
|
||||
@@ -449,7 +470,7 @@
|
||||
</div>
|
||||
|
||||
<!-- Confirm Delete Modal -->
|
||||
<div x-show="showDeleteConfirm" x-cloak
|
||||
<div x-show="showDeleteConfirm"
|
||||
class="fixed inset-0 z-50 flex items-center justify-center p-4">
|
||||
<div class="absolute inset-0 bg-black/50" @click="showDeleteConfirm = false"></div>
|
||||
<div x-show="showDeleteConfirm"
|
||||
@@ -509,6 +530,12 @@ function stationManagement(initialStations, initialRecipes) {
|
||||
camera_source: '', // #72
|
||||
active: true,
|
||||
},
|
||||
// #88: sorgenti lette dall'acquisitore per il datalist della sorgente camera
|
||||
cameraSources: [],
|
||||
cameraSourcesLoaded: false,
|
||||
cameraSourcesLoading: false,
|
||||
cameraSourcesStatus: '',
|
||||
cameraSourcesError: false,
|
||||
|
||||
get csrfToken() {
|
||||
const meta = document.querySelector('meta[name=csrf-token]');
|
||||
@@ -556,11 +583,46 @@ function stationManagement(initialStations, initialRecipes) {
|
||||
return '{{ _("Nessuna ricetta assegnata") }}';
|
||||
},
|
||||
|
||||
// #88: legge le sorgenti dall'acquisitore (proxy admin) e riempie il datalist
|
||||
async loadCameraSources() {
|
||||
const url = (this.form.camera_url || '').trim();
|
||||
this.cameraSources = [];
|
||||
this.cameraSourcesLoaded = false;
|
||||
this.cameraSourcesError = false;
|
||||
if (!url) { this.cameraSourcesStatus = ''; return; }
|
||||
this.cameraSourcesLoading = true;
|
||||
this.cameraSourcesStatus = '{{ _("Lettura...") }}';
|
||||
try {
|
||||
const resp = await fetch('/admin/api/camera/sources?url=' + encodeURIComponent(url));
|
||||
const result = await resp.json();
|
||||
if (!resp.ok) {
|
||||
this.cameraSourcesError = true;
|
||||
this.cameraSourcesStatus = result.detail || '{{ _("Risposta non valida dal servizio camera") }}';
|
||||
return;
|
||||
}
|
||||
this.cameraSources = result.sources || [];
|
||||
this.cameraSourcesLoaded = true;
|
||||
this.cameraSourcesStatus = '{{ _("%(n)s sorgenti trovate", n="__N__") }}'.replace('__N__', this.cameraSources.length);
|
||||
} catch (e) {
|
||||
this.cameraSourcesError = true;
|
||||
this.cameraSourcesStatus = '{{ _("Risposta non valida dal servizio camera") }}';
|
||||
} finally {
|
||||
this.cameraSourcesLoading = false;
|
||||
}
|
||||
},
|
||||
|
||||
// #88: avviso se la sorgente scritta non e' fra quelle lette
|
||||
get cameraSourceMissing() {
|
||||
const src = (this.form.camera_source || '').trim();
|
||||
return this.cameraSourcesLoaded && src !== '' && !this.cameraSources.some(s => s.name === src);
|
||||
},
|
||||
|
||||
openCreateModal() {
|
||||
this.isEditing = false;
|
||||
this.editingId = null;
|
||||
this.errorMsg = '';
|
||||
this.form = { code: '', name: '', location: '', notes: '', vision_worker_url: '', camera_url: '', camera_source: '', active: true };
|
||||
this.loadCameraSources(); // #88: svuota lo stato delle sorgenti
|
||||
this.showModal = true;
|
||||
},
|
||||
|
||||
@@ -578,6 +640,7 @@ function stationManagement(initialStations, initialRecipes) {
|
||||
camera_source: station.camera_source || '', // #72
|
||||
active: station.active,
|
||||
};
|
||||
this.loadCameraSources(); // #88: se la camera e' valorizzata legge subito le sorgenti
|
||||
this.showModal = true;
|
||||
},
|
||||
|
||||
|
||||
Reference in New Issue
Block a user