diff --git a/data/demo_data.xml b/data/demo_data.xml
index 0f65c8b..07596de 100644
--- a/data/demo_data.xml
+++ b/data/demo_data.xml
@@ -3,22 +3,22 @@
Fablab
- 3
+ #008000
Holzbereich
- 1
+ #ff0000
Metallbereich
- 2
+ #0000ff
Elektronikbereich
- 4
+ #ffff00
diff --git a/models/ows_models.py b/models/ows_models.py
index abfdfe2..efa8a40 100644
--- a/models/ows_models.py
+++ b/models/ows_models.py
@@ -10,7 +10,8 @@ class OwsMachineArea(models.Model):
_order = 'name'
name = fields.Char(required=True, translate=True)
- color = fields.Integer(string="Farbe")
+ #color = fields.Integer(string="Farbe")
+ color_hex = fields.Char(string="Farbe (Hex)", help="Hex-Farbcode wie #FF0000 für Rot")
class OwsMachine(models.Model):
@@ -50,7 +51,11 @@ class OwsMachine(models.Model):
'name': machine.name,
'has_access': has_access,
})
- res.append({'area': area.name, 'machines': machine_list})
+ res.append({
+ 'area': area.name,
+ 'color_hex': area.color_hex or '#000000',
+ 'machines': machine_list
+ })
return res
diff --git a/static/src/xml/partner_access_popup.xml b/static/src/xml/partner_access_popup.xml
index 40cc348..77fe37b 100644
--- a/static/src/xml/partner_access_popup.xml
+++ b/static/src/xml/partner_access_popup.xml
@@ -1,21 +1,18 @@
-
-
Maschinenfreigaben
-
-
+ #
+
- -
-
- ✅
- ❌
-
+
+
+
+ ❌
+
-