Buildings and levels for the floor map, and make every identifier searchable

plugins/printers/api/asset_routes.py

@@ -358,6 +358,7 @@ def printer_install_list():
             'iscsf': printer.iscsf,
             'locationname': asset.location.locationname if asset.location else None,
             'mapx': asset.mapx,
+            'levelid': asset.levelid,
             'mapy': asset.mapy,
         })
 
@@ -366,7 +367,7 @@ def printer_install_list():
     # hand-rolled JSON parser. The web map uses the default JSON.
     if request.args.get('format') == 'text':
         fields = ('printerid', 'windowsname', 'vendorname', 'modelnumber',
-                  'hostname', 'ipaddress', 'mapx', 'mapy')
+                  'hostname', 'ipaddress', 'mapx', 'mapy', 'levelid')
         lines = [_text_line(row, fields) for row in rows]
         return Response('\n'.join(lines), mimetype='text/plain')
 
@@ -738,6 +739,7 @@ def create_printer():
         locationid=data.get('locationid'),
         businessunitid=data.get('businessunitid'),
         mapx=data.get('mapx'),
+        levelid=data.get('levelid'),
         mapy=data.get('mapy'),
         notes=data.get('notes')
     )
@@ -819,7 +821,7 @@ def update_printer(printer_id: int):
     # Update asset fields (optional identifiers gated per-type in Settings)
     asset_fields = ['assetnumber', 'name', 'serialnumber', 'gaugelabreference',
                     'maintenancereference', 'statusid',
-                    'locationid', 'businessunitid', 'mapx', 'mapy',
+                    'locationid', 'businessunitid', 'mapx', 'mapy', 'levelid',
                     'notes', 'isactive']
     for key in asset_fields:
         if key in data:
@@ -1035,6 +1037,7 @@ def _get_low_supplies_data():
                 'model': model_number,
                 'location': location_name,
                 'mapx': asset.mapx,
+            'levelid': asset.levelid,
                 'mapy': asset.mapy,
                 'supplies': annotated
             })

plugins/printers/frontend/views/PrinterForm.vue

@@ -250,9 +250,11 @@
           <div class="map-location-control">
             <div v-if="form.mapx !== null && form.mapy !== null" class="current-position">
               Position: {{ form.mapx }}, {{ form.mapy }}
+                <span v-if="form.levelid" class="position-level">on {{ levelName(form.levelid) }}</span>
+                <span v-else class="position-level position-level-missing">level not set</span>
               <button type="button" class="btn btn-sm btn-secondary" @click="clearMapPosition">Clear</button>
             </div>
-            <button type="button" class="btn btn-secondary" @click="showMapPicker = true">
+            <button type="button" class="btn btn-secondary" @click="openMapPicker">
               Set Location on Map
             </button>
           </div>
@@ -261,8 +263,19 @@
         <!-- Map Picker Modal -->
         <Modal v-model="showMapPicker" title="Select Location on Map" size="fullscreen">
           <div class="map-modal-content">
+            <div v-if="levelOptions().length > 1" class="map-level-picker">
+              <label>Level</label>
+              <select v-model.number="pickerLevelId" class="form-control">
+                <option v-for="option in levelOptions()" :key="option.levelid"
+                        :value="option.levelid">{{ option.label }}</option>
+              </select>
+              <span class="input-hint">
+                The position is pixels on this drawing, so pick the level first.
+              </span>
+            </div>
             <ShopFloorMap
               :pickerMode="true"
+              :levelid="pickerLevelId"
               :initialPosition="form.mapx !== null ? { left: form.mapx, top: form.mapy } : null"
               :theme="currentTheme"
               @positionPicked="handlePositionPicked"
@@ -295,6 +308,8 @@ import { ref, onMounted, computed, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { assetsApi, vendorsApi, locationsApi, printersApi, modelsApi } from '@/api'
 import ShopFloorMap from '@/components/ShopFloorMap.vue'
+import { loadMapConfig, levelOptions, levelName, state as mapConfig }
+  from '@/composables/mapConfig'
 import Modal from '@/components/Modal.vue'
 import CustomFieldsInputs from '@/components/CustomFieldsInputs.vue'
 import { currentTheme } from '@/stores/theme'
@@ -320,6 +335,10 @@ const loading = ref(true)
 const saving = ref(false)
 const error = ref('')
 const showMapPicker = ref(false)
+// Which drawing the picker shows, and therefore which level the coordinates it
+// returns belong to (ADR-017). Opens on the position's existing level so editing
+// a marker does not silently move it to the default one.
+const pickerLevelId = ref(null)
 const tempMapPosition = ref(null)
 
 const form = ref({
@@ -337,6 +356,7 @@ const form = ref({
   notes: '',
   mapx: null,
   mapy: null,
+  levelid: null,
   // Printer-specific
   ipaddress: '',
   csfname: '',
@@ -511,6 +531,7 @@ onMounted(async () => {
         notes: printer.notes || '',
         mapx: printer.mapx ?? null,
         mapy: printer.mapy ?? null,
+        levelid: printer.levelid ?? null,
         // Printer-specific
         ipaddress: primaryComm?.ipaddress || '',
         csfname: ext.sharename || '',
@@ -534,10 +555,21 @@ function handlePositionPicked(position) {
   tempMapPosition.value = position
 }
 
+function openMapPicker() {
+  loadMapConfig().then(() => {
+    pickerLevelId.value = form.value.levelid || mapConfig.defaultlevelid
+    showMapPicker.value = true
+  })
+}
+
 function confirmMapPosition() {
   if (tempMapPosition.value) {
     form.value.mapx = tempMapPosition.value.left
     form.value.mapy = tempMapPosition.value.top
+    // Never one without the other: coordinates saved with no level render as
+    // "level unknown", and coordinates saved against the wrong level render
+    // convincingly in the wrong place.
+    form.value.levelid = pickerLevelId.value
   }
   showMapPicker.value = false
 }
@@ -545,6 +577,7 @@ function confirmMapPosition() {
 function clearMapPosition() {
   form.value.mapx = null
   form.value.mapy = null
+  form.value.levelid = null
   tempMapPosition.value = null
 }
 

plugins/printers/frontend/views/PrinterInstallerMap.vue

@@ -43,7 +43,7 @@
 import { ref, computed, onMounted, onUnmounted, watch } from 'vue'
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { loadMapConfig, blueprintUrlFor, state as mapConfig } from '@/composables/mapConfig'
+import { loadMapConfig, blueprintUrlFor, dimensionsFor, state as mapConfig } from '@/composables/mapConfig'
 import { printersApi } from '@/api'
 import { withBase } from '@/utils/basePath'
 import { currentTheme } from '@/stores/theme'
@@ -55,8 +55,10 @@ const selected = ref({})   // printerid -> true
 let map = null
 let imageOverlay = null
 let markers = {}           // printerid -> circleMarker
-let MAP_WIDTH = mapConfig.width
-let MAP_HEIGHT = mapConfig.height
+// The level being shown. The installer map runs before anyone logs in, which is
+// why /api/maplevels is public - without it there is no blueprint to draw.
+let MAP_WIDTH = 0
+let MAP_HEIGHT = 0
 
 const SELECTED_COLOR = '#e53935'
 const NORMAL_COLOR = '#4CAF50'
@@ -120,13 +122,13 @@ function renderMarkers() {
 }
 
 watch(currentTheme, (theme) => {
-  if (imageOverlay) imageOverlay.setUrl(blueprintUrlFor(theme))
+  if (imageOverlay) imageOverlay.setUrl(blueprintUrlFor(theme, mapConfig.currentlevelid))
 })
 
 onMounted(async () => {
   await loadMapConfig()
-  MAP_WIDTH = mapConfig.width
-  MAP_HEIGHT = mapConfig.height
+  MAP_WIDTH = dimensionsFor(mapConfig.currentlevelid).width
+  MAP_HEIGHT = dimensionsFor(mapConfig.currentlevelid).height
 
   try {
     const response = await printersApi.installList()
@@ -142,7 +144,7 @@ onMounted(async () => {
     attributionControl: false,
   })
   const bounds = [[0, 0], [MAP_HEIGHT, MAP_WIDTH]]
-  imageOverlay = L.imageOverlay(blueprintUrlFor(currentTheme.value), bounds).addTo(map)
+  imageOverlay = L.imageOverlay(blueprintUrlFor(currentTheme.value, mapConfig.currentlevelid), bounds).addTo(map)
   map.setView([MAP_HEIGHT / 2, MAP_WIDTH / 2], -2)
   map.setMaxBounds(bounds)
   renderMarkers()

plugins/printers/manifest.json

@@ -4,7 +4,7 @@
     "description": "Printer management plugin with Zabbix integration, supply tracking, and QR codes",
     "author": "ShopDB Team",
     "dependencies": [],
-    "core_version": ">=0.16.0,<1.0.0",
+    "core_version": ">=0.20.0,<1.0.0",
     "api_prefix": "/api/printers",
     "provides": {
         "machine_category": "Printer",