yaro/inventory
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More condition work.

Browse source
This commit is contained in:
Yaro Kasear 2025-10-24 11:05:57 -05:00
parent f9d950c425
commit acefd96958
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/routes/entry.py
View file

@ -53,7 +53,7 @@ def _fields_for_model(model: str):
"attrs": {"class": "form-control"}, "label_attrs": {"class": "form-label"}, "attrs": {"class": "form-control"}, "label_attrs": {"class": "form-label"},
"label_spec": "{name} - {room_function.description}"}, "label_spec": "{name} - {room_function.description}"},
{"name": "condition", "label": "Condition", "row": "status", "wrap": {"class": "col"}, {"name": "condition", "label": "Condition", "row": "status", "wrap": {"class": "col"},
"label_attrs": {"class": "form-label"}}, "label_attrs": {"class": "form-label"}, "label_spec": "{description}"},
# {"name": "condition", "label": "Condition", "row": "status", "wrap": {"class": "col"}, # {"name": "condition", "label": "Condition", "row": "status", "wrap": {"class": "col"},
# "type": "select", "options": [ # "type": "select", "options": [
# {"label": "Deployed", "value": "Deployed"}, # {"label": "Deployed", "value": "Deployed"},

4
inventory/routes/listing.py
View file

@ -36,7 +36,7 @@ def init_listing_routes(app):
if model.lower() == 'inventory': if model.lower() == 'inventory':
spec = {"fields": [ spec = {"fields": [
"label", "name", "barcode", "serial", "brand.name", "model", "label", "name", "barcode", "serial", "brand.name", "model",
"device_type.description", "condition", "owner.label", "location.label", "device_type.description", "condition.description", "owner.label", "location.label",
]} ]}
columns = [ columns = [
{"field": "label"}, {"field": "label"},
@ -46,7 +46,7 @@ def init_listing_routes(app):
{"field": "brand.name", "label": "Brand"}, {"field": "brand.name", "label": "Brand"},
{"field": "model"}, {"field": "model"},
{"field": "device_type.description", "label": "Device Type"}, {"field": "device_type.description", "label": "Device Type"},
{"field": "condition"}, {"field": "condition.description", "label": "Condition"},
{"field": "owner.label", "label": "Contact", {"field": "owner.label", "label": "Contact",
"link": {"endpoint": "entry.entry", "params": {"id": "{owner.id}", "model": "user"}}}, "link": {"endpoint": "entry.entry", "params": {"id": "{owner.id}", "model": "user"}}},
{"field": "location.label", "label": "Room"}, {"field": "location.label", "label": "Room"},

2
inventory/templates/entry_buttons.html
View file

@ -1,7 +1,7 @@
<div class="btn-group"> <div class="btn-group">
<button type="submit" class="btn btn-outline-primary" id="submit">Save</button> <button type="submit" class="btn btn-outline-primary" id="submit">Save</button>
<button type="button" class="btn btn-outline-success" <button type="button" class="btn btn-outline-success"
onclick="location.assign({{ url_for('entry.entry_new', model=field['attrs']['data-model']) | tojson }})" onclick="location.href='{{ url_for('entry.entry_new', model=field['attrs']['data-model']) }}'"
id="new">New</button> id="new">New</button>
<button type="button" class="btn btn-outline-danger" id="delete" onclick="deleteEntry()">Delete</button> <button type="button" class="btn btn-outline-danger" id="delete" onclick="deleteEntry()">Delete</button>
</div> </div>