Brewery/brewery-website
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects 2 Releases Wiki Activity

Merge branch 'dev' into 3-sample_controls

Browse Source
This commit is contained in:
Chris Giacofei 2024-06-07 08:47:04 -04:00
commit a6c244756e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/extras.py
View File

@ -30,7 +30,7 @@ class AveryLabel:
labelSheet = AveryLabel(18294, debug=True) labelSheet = AveryLabel(18294, debug=True)
labelSheet.render(test_labels, 'filelabels.pdf', 5) labelSheet.render(test_labels, 'filelabels.pdf', 5)
""" """
AVERY = { AVERY = {
18294: ( 4, 15, LETTER, (44.45, 16.764), (7.62, 13.97)), 18294: ( 4, 15, LETTER, (44.45, 16.764), (7.62, 13.97)),
5263: ( 2, 5, LETTER, (101.6, 50.8), (3.95, 12.7)), 5263: ( 2, 5, LETTER, (101.6, 50.8), (3.95, 12.7)),

2
equipment/templates/equipment/equipment.html
View File

@ -13,7 +13,7 @@
<ul> <ul>
<li>Type: {{ equipment.keg_type.name }}</li> <li>Type: {{ equipment.keg_type.name }}</li>
<li>Size: {{ equipment.keg_type.size_gal }} Gallons</li> <li>Size: {{ equipment.keg_type.size_gal }} Gallons</li>
<li>Status: {{ equipment.kegstate.name }}</li> <li>Status: {{ equipment.state.name }}</li>
</ul> </ul>