hobbyhimmel/open_workshop
11
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed color to color_hex

Browse Source
This commit is contained in:
gitea 2025-04-02 18:10:52 +00:00
parent 6e70c95a7c
commit 63932ec8a7
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/demo_data.xml
View File

@ -3,22 +3,22 @@
<!-- Bereiche --> <!-- Bereiche -->
<record id="area_fablab" model="ows.machine.area"> <record id="area_fablab" model="ows.machine.area">
<field name="name">Fablab</field> <field name="name">Fablab</field>
<field name="color">3</field> <field name="color_hex">#008000</field>
</record> </record>
<record id="area_holz" model="ows.machine.area"> <record id="area_holz" model="ows.machine.area">
<field name="name">Holzbereich</field> <field name="name">Holzbereich</field>
<field name="color">1</field> <field name="color_hex">#ff0000</field>
</record> </record>
<record id="area_metall" model="ows.machine.area"> <record id="area_metall" model="ows.machine.area">
<field name="name">Metallbereich</field> <field name="name">Metallbereich</field>
<field name="color">2</field> <field name="color_hex">#0000ff</field>
</record> </record>
<record id="area_elektronik" model="ows.machine.area"> <record id="area_elektronik" model="ows.machine.area">
<field name="name">Elektronikbereich</field> <field name="name">Elektronikbereich</field>
<field name="color">4</field> <field name="color_hex">#ffff00</field>
</record> </record>
<!-- Maschinen im Fablab --> <!-- Maschinen im Fablab -->

9
models/ows_models.py
View File

@ -10,7 +10,8 @@ class OwsMachineArea(models.Model):
_order = 'name' _order = 'name'
name = fields.Char(required=True, translate=True) 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): class OwsMachine(models.Model):
@ -50,7 +51,11 @@ class OwsMachine(models.Model):
'name': machine.name, 'name': machine.name,
'has_access': has_access, '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 return res

17
static/src/xml/partner_access_popup.xml
View File

@ -1,21 +1,18 @@
<templates id="template" xml:space="preserve"> <templates id="template" xml:space="preserve">
<t t-name="PartnerMachineAccessList"> <t t-name="PartnerMachineAccessList">
<div class="client-detail">
<h3>Maschinenfreigaben</h3>
<t t-foreach="areas" t-as="area"> <t t-foreach="areas" t-as="area">
<div class="access-area"> #<div class='client-details-briefing_fablab'>
<strong><t t-esc="area.area"/></strong> <div class='client-details-area' t-att-style="'border: solid 3px %s; margin: 5px;' % area.color_hex">
<ul> <ul>
<t t-foreach="area.machines" t-as="machine"> <t t-foreach="area.machines" t-as="machine">
<li> <div class='client-detail'>
<t t-esc="machine.name" /> <span class='briefinglabel'><t t-esc="machine.name" /></span>
<t t-if="machine.has_access"> ✅</t> <t t-if="machine.has_access"><span class='detail client-details-vvow_briefing'></span></t>
<t t-if="!machine.has_access"> ❌</t> <t t-if='!machine.has_access'><span class='detail client-details-vvow_briefing_error'>❌</span></t>
</li> </div>
</t> </t>
</ul> </ul>
</div> </div>
</t> </t>
</div>
</t> </t>
</templates> </templates>