changed color to color_hex
This commit is contained in:
parent
6e70c95a7c
commit
63932ec8a7
|
|
@ -3,22 +3,22 @@
|
|||
<!-- Bereiche -->
|
||||
<record id="area_fablab" model="ows.machine.area">
|
||||
<field name="name">Fablab</field>
|
||||
<field name="color">3</field>
|
||||
<field name="color_hex">#008000</field>
|
||||
</record>
|
||||
|
||||
<record id="area_holz" model="ows.machine.area">
|
||||
<field name="name">Holzbereich</field>
|
||||
<field name="color">1</field>
|
||||
<field name="color_hex">#ff0000</field>
|
||||
</record>
|
||||
|
||||
<record id="area_metall" model="ows.machine.area">
|
||||
<field name="name">Metallbereich</field>
|
||||
<field name="color">2</field>
|
||||
<field name="color_hex">#0000ff</field>
|
||||
</record>
|
||||
|
||||
<record id="area_elektronik" model="ows.machine.area">
|
||||
<field name="name">Elektronikbereich</field>
|
||||
<field name="color">4</field>
|
||||
<field name="color_hex">#ffff00</field>
|
||||
</record>
|
||||
|
||||
<!-- Maschinen im Fablab -->
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +1,18 @@
|
|||
<templates id="template" xml:space="preserve">
|
||||
<t t-name="PartnerMachineAccessList">
|
||||
<div class="client-detail">
|
||||
<h3>Maschinenfreigaben</h3>
|
||||
<t t-foreach="areas" t-as="area">
|
||||
<div class="access-area">
|
||||
<strong><t t-esc="area.area"/></strong>
|
||||
#<div class='client-details-briefing_fablab'>
|
||||
<div class='client-details-area' t-att-style="'border: solid 3px %s; margin: 5px;' % area.color_hex">
|
||||
<ul>
|
||||
<t t-foreach="area.machines" t-as="machine">
|
||||
<li>
|
||||
<t t-esc="machine.name" />
|
||||
<t t-if="machine.has_access"> ✅</t>
|
||||
<t t-if="!machine.has_access"> ❌</t>
|
||||
</li>
|
||||
<div class='client-detail'>
|
||||
<span class='briefinglabel'><t t-esc="machine.name" /></span>
|
||||
<t t-if="machine.has_access"><span class='detail client-details-vvow_briefing'></span></t>
|
||||
<t t-if='!machine.has_access'><span class='detail client-details-vvow_briefing_error'>❌</span></t>
|
||||
</div>
|
||||
</t>
|
||||
</ul>
|
||||
</div>
|
||||
</t>
|
||||
</div>
|
||||
</t>
|
||||
</templates>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user