shark/belden-inventory
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix checkin/out pages, add location refresh, and misc bugfix

Browse Source
This commit is contained in:
Cole Deck
2026-04-09 17:16:56 -05:00
parent 6952402178
commit f793bd01e1
6 changed files with 97 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
db_classes.py
View File

@@ -10,6 +10,13 @@ class ReconnectMySQLDatabase(ReconnectMixin, MySQLDatabase):
db = ReconnectMySQLDatabase('inventory', thread_safe=True, user='inventory', password='nfrwnfprifbwef', host='database', port=3306) db = ReconnectMySQLDatabase('inventory', thread_safe=True, user='inventory', password='nfrwnfprifbwef', host='database', port=3306)
search = None search = None
USERS = [
("Costa Aralis", "COSTA"),
("Mike Fisher", "MIKE"),
("Mark Lueck", "MARK"),
("Cole Deck", "COLE")
]
class user(Model): class user(Model):
name = CharField() name = CharField()
username = CharField(unique=True, primary_key=True) username = CharField(unique=True, primary_key=True)
@@ -88,13 +95,15 @@ def init():
print("Checking & creating tables...") print("Checking & creating tables...")
db.create_tables([location, office, item, component, user]) db.create_tables([location, office, item, component, user])
print("Database initialized.") print("Database initialized.")
for usr in USERS:
create_user(usr[0],usr[1],"12345")
global search global search
print("Creating cache index...", end='', flush=True) print("Creating cache index")
search = ivs() search = ivs()
add = item.select().dicts() add = item.select().dicts()
#print(add) #print(add)
#print(type(add)) #print(type(add))
for itm in add: for idx,itm in enumerate(add):
try: try:
itm["location"] = fancy_location(item.select().where(item.barcode==itm["barcode"])[0].loc) itm["location"] = fancy_location(item.select().where(item.barcode==itm["barcode"])[0].loc)
except: except:
@@ -102,9 +111,11 @@ def init():
#print(itm) #print(itm)
#print(type(itm)) #print(type(itm))
search.add_document(itm) search.add_document(itm)
print('.',end='',flush=True) print(f'{idx}/{len(add)}')
print(" " + str(len(add)), "items added.") print(" " + str(len(add)), "items added.")
print("Cache build complete.") print("Cache build complete.")
# locations_list() # locations_list()
def search_item(query, filters: dict={}) -> list: def search_item(query, filters: dict={}) -> list:
@@ -153,7 +164,10 @@ def fancy_location(loc):
# print(out) # print(out)
return out return out
except: except:
return loc.name if loc:
return loc.name
else:
return ""
def find_item_location(barcode): def find_item_location(barcode):
try: try:
@@ -296,6 +310,9 @@ def checkout(user, barcode, loc=None):
itm.checkout_user = user itm.checkout_user = user
itm.checkout_loc = loc itm.checkout_loc = loc
itm.save() itm.save()
itmdict = item.select().where(item.barcode==itm.barcode).dicts()[0]
itmdict["location"] = fancy_location(item.select().where(item.barcode==itm["barcode"])[0].loc)
search.add_document(itmdict)
return itm return itm
else: else:
return False return False
@@ -305,11 +322,15 @@ def checkin(user, barcode, loc=None):
if loc == False: if loc == False:
loc = None loc = None
if itm: if itm:
print("Found", itm.fullname)
itm.checkout = False itm.checkout = False
itm.last_user = user itm.last_user = user
if loc is not None: if loc is not None:
itm.loc = loc itm.loc = loc
itm.save() itm.save()
itmdict = item.select().where(item.barcode==itm.barcode).dicts()[0]
itmdict["location"] = fancy_location(item.select().where(item.barcode==itm["barcode"])[0].loc)
search.add_document(itmdict)
return itm return itm
else: else:
return False return False
@@ -370,12 +391,15 @@ def get_location_id(barcode):
def get_user(name): def get_user(name):
query = user.select().where(user.username == name) query = user.select().where(user.username == name)
if len(query) == 1: if len(query) == 1:
print("Found", query[0].name)
return query[0] return query[0]
query = user.select().where(user.name == name) query = user.select().where(user.name == name)
if len(query) == 1: if len(query) == 1:
print("Found", query[0].name)
return query[0] return query[0]
print(f"Did not find a user: {name}")
return False return False
def user_login(username, password): def user_login(username, password):
@@ -410,7 +434,7 @@ def dump_csv():
out = "Barcode,Part Number,Serial,MAC,FW Version,Manufacturer,Description,Location,Office,Checked out,Checkout location,Checkout user,Checkout start time,Checkout end time\r\n" out = "Barcode,Part Number,Serial,MAC,FW Version,Manufacturer,Description,Location,Office,Checked out,Checkout location,Checkout user,Checkout start time,Checkout end time\r\n"
query = item.select() query = item.select()
for itm in query: for itm in query:
out += f"\"{itm.barcode}\",\"{itm.fullname}\",\"{itm.serial}\",\"{itm.mac}\",\"{itm.fwver}\",\"{itm.manufacturer}\",\"{itm.description}\",\"{itm.loc}\",\"{itm.office}\",\"{itm.checkout}\",\"{itm.checkout_loc}\",\"{itm.checkout_user}\",\"{itm.checkout_start}\",\"{itm.checkout_end}\"\r\n" out += f"\"{itm.barcode}\",\"{itm.fullname}\",\"{itm.serial}\",\"{itm.mac}\",\"{itm.fwver}\",\"{itm.manufacturer}\",\"{itm.description}\",\"{fancy_location(itm.loc)}\",\"{itm.office.name}\",\"{itm.checkout}\",\"{itm.checkout_loc}\",\"{itm.checkout_user}\",\"{itm.checkout_start}\",\"{itm.checkout_end}\"\r\n"
return out return out

14
inventory/pages/add_location.py
View File

@@ -51,6 +51,9 @@ class AddLocationPage(rio.Component):
self.popup_show = True self.popup_show = True
self.popup_color = 'warning' self.popup_color = 'warning'
await asyncio.sleep(2) await asyncio.sleep(2)
self.session.navigate_to("/")
await asyncio.sleep(0.01)
self.session.navigate_to("/addlocation")
self.popup_show = False self.popup_show = False
else: else:
self.popup_message = "\n Location added! \n\n" self.popup_message = "\n Location added! \n\n"
@@ -61,7 +64,10 @@ class AddLocationPage(rio.Component):
self.description: str = "" self.description: str = ""
self.parent_code: str = "" self.parent_code: str = ""
self.parent: str = "" self.parent: str = ""
await asyncio.sleep(2) await asyncio.sleep(1)
self.session.navigate_to("/")
await asyncio.sleep(0.01)
self.session.navigate_to("/addlocation")
self.popup_show = False self.popup_show = False
@@ -89,7 +95,8 @@ class AddLocationPage(rio.Component):
rio.TextInput( rio.TextInput(
label="Barcode", label="Barcode",
text=self.bind().code, text=self.bind().code,
on_confirm=self._add_part_enter on_confirm=self._add_part_enter,
auto_focus=True
), ),
rio.TextInput( rio.TextInput(
label="Parent Location (optional)", label="Parent Location (optional)",
@@ -104,7 +111,8 @@ class AddLocationPage(rio.Component):
), ),
rio.MultiLineTextInput( rio.MultiLineTextInput(
label="Description (optional)", label="Description (optional)",
text=self.bind().description text=self.bind().description,
on_confirm=self._add_part_enter
), ),
rio.Button( rio.Button(
content="Add", content="Add",

2
inventory/pages/add_page.py
View File

@@ -7,7 +7,7 @@ import rio
import datetime import datetime
from mac_vendor_lookup import AsyncMacLookup, MacLookup from mac_vendor_lookup import AsyncMacLookup, MacLookup
mac = MacLookup() mac = MacLookup()
print("Updating vendors...") print("Updating MAC vendors...")
try: try:
mac.update_vendors() mac.update_vendors()
print("Update complete!") print("Update complete!")

11
inventory/pages/browse_page.py
View File

@@ -124,7 +124,8 @@ class BrowsePage(rio.Component):
async def _close_edit_popup(self): async def _close_edit_popup(self):
await self._open_info_popup(self.ibarcode) await self._open_info_popup(self.ibarcode)
self.force_refresh() # self._search(self.searchtext)
# self.force_refresh()
async def _save_edit_popup(self): async def _save_edit_popup(self):
self.edit_show = False self.edit_show = False
@@ -133,11 +134,11 @@ class BrowsePage(rio.Component):
await self._add_part_button() await self._add_part_button()
await asyncio.sleep(1) await asyncio.sleep(1)
await self._open_info_popup(self.ibarcode, skip_display=True) await self._open_info_popup(self.ibarcode, skip_display=True)
await self._search() await self._search(self.searchtext)
await asyncio.sleep(1) await asyncio.sleep(1)
self.popup_show = False self.popup_show = False
await self._open_info_popup(self.ibarcode, skip_display=True) await self._open_info_popup(self.ibarcode, skip_display=True)
await self._search() await self._search(self.searchtext)
@@ -149,10 +150,10 @@ class BrowsePage(rio.Component):
self.info_show = False self.info_show = False
self.force_refresh() self.force_refresh()
delete_item_id(self.ibarcode) delete_item_id(self.ibarcode)
await self._search() await self._search(self.searchtext)
await asyncio.sleep(1) await asyncio.sleep(1)
self.popup_show = False self.popup_show = False
await self._search() await self._search(self.searchtext)
async def _open_edit_popup(self, code: str) -> str | None: async def _open_edit_popup(self, code: str) -> str | None:

36
inventory/pages/checkin_page.py
View File

@@ -15,8 +15,8 @@ class CheckinPage(rio.Component):
popup_message: str = "" popup_message: str = ""
popup_show: bool = False popup_show: bool = False
popup_color: str = 'warning' popup_color: str = 'warning'
name: str = ""
user_code: str = "" user_code: str = ""
name: str = ""
loc_code: str = "" loc_code: str = ""
loc: str = "" loc: str = ""
@@ -25,35 +25,43 @@ class CheckinPage(rio.Component):
if get_location_id(self.loc) != False: if get_location_id(self.loc) != False:
self.loc_code = self.loc self.loc_code = self.loc
print("Found location " + get_location_id(self.loc).name) print("Found location " + get_location_id(self.loc).name)
self.loc = get_location_id(self.loc).name self.loc = '* ' + fancy_location(get_location_id(self.loc))
async def _update_user(self, event: rio.TextInputChangeEvent): async def _update_user(self, event: rio.TextInputChangeEvent):
print("Checking " + self.name) print("Checking " + self.name)
if get_location_id(self.name) != False: if get_user(self.name) != False:
self.user_code = self.name self.user_code = self.name
print("Found user " + get_user(self.name).name) print("Found user " + get_user(self.name).name)
self.name = get_user(self.name).name self.name = '* ' + get_user(self.name).name
async def _checkin_item_enter(self, event: rio.TextInputConfirmEvent): async def _checkin_item_enter(self, event: rio.TextInputConfirmEvent):
await self.check_in() await self.check_in()
async def check_in(self): async def check_in(self):
if checkin(get_user(self.user_code), self.code, get_location_id(self.loc_code)): user = get_user(self.user_code)
loc = get_location_id(self.loc_code)
if user is not False and checkin(user, self.code, loc):
self.popup_message = "\n Item checked in! \n\n" self.popup_message = "\n Item checked in! \n\n"
self.popup_show = True self.popup_show = True
self.popup_color = 'success' self.popup_color = 'success'
self.name: str = ""
self.user_code: str = "" self.user_code: str = ""
self.name: str = ""
self.code: str = "" self.code: str = ""
self.loc_code: str = "" self.loc_code: str = ""
self.loc: str = "" self.loc: str = ""
await asyncio.sleep(2) await asyncio.sleep(0.5)
self.session.navigate_to("/")
await asyncio.sleep(0.01)
self.session.navigate_to("/in")
self.popup_show = False self.popup_show = False
else: else:
self.popup_message = "\n Error! Check item & location! \n\n" self.popup_message = "\n Error! Check item & location! \n\n"
self.popup_show = True self.popup_show = True
self.popup_color = 'warning' self.popup_color = 'warning'
await asyncio.sleep(2) await asyncio.sleep(2)
self.session.navigate_to("/")
await asyncio.sleep(0.01)
self.session.navigate_to("/in")
self.popup_show = False self.popup_show = False
def build(self) -> rio.Component: def build(self) -> rio.Component:
@@ -73,7 +81,8 @@ class CheckinPage(rio.Component):
), ),
rio.TextInput( rio.TextInput(
label="Barcode", label="Barcode",
text=self.bind().code text=self.bind().code,
auto_focus=True
), ),
rio.TextInput( rio.TextInput(
label="New location", label="New location",
@@ -83,10 +92,17 @@ class CheckinPage(rio.Component):
rio.TextInput( rio.TextInput(
label="User", label="User",
text=self.bind().name, text=self.bind().name,
on_confirm=self._checkin_item_enter on_confirm=self.check_in,
on_change=self._update_user
), ),
# rio.TextInput(
# label="N/A",
# text="",
# on_confirm=self.check_in,
# ),
rio.Button( rio.Button(
content="Go" content="Go",
on_press=self.check_in
), ),
spacing=2, spacing=2,

32
inventory/pages/checkout_page.py
View File

@@ -26,20 +26,22 @@ class CheckoutPage(rio.Component):
if get_location_id(self.loc) != False: if get_location_id(self.loc) != False:
self.loc_code = self.loc self.loc_code = self.loc
print("Found location " + get_location_id(self.loc).name) print("Found location " + get_location_id(self.loc).name)
self.loc = get_location_id(self.loc).name self.loc = '* ' + fancy_location(get_location_id(self.loc))
async def _update_user(self, event: rio.TextInputChangeEvent): async def _update_user(self, event: rio.TextInputChangeEvent):
print("Checking " + self.name) print("Checking " + self.name)
if get_location_id(self.name) != False: if get_user(self.name) != False:
self.user_code = self.name self.user_code = self.name
print("Found user " + get_user(self.name).name) print("Found user " + get_user(self.name).name)
self.name = get_user(self.name).name self.name = '* ' + get_user(self.name).name
async def _checkout_item_enter(self, event: rio.TextInputConfirmEvent): async def _checkout_item_enter(self, event: rio.TextInputConfirmEvent):
await self.check_out() await self.check_out()
async def check_out(self): async def check_out(self):
if checkout(get_user(self.user_code), self.code, get_location_id(self.loc_code)): user = get_user(self.user_code)
loc = get_location_id(self.loc_code)
if user is not False and checkout(user, self.code, loc):
self.popup_message = "\n Item checked out! \n\n" self.popup_message = "\n Item checked out! \n\n"
self.popup_show = True self.popup_show = True
self.popup_color = 'success' self.popup_color = 'success'
@@ -48,13 +50,19 @@ class CheckoutPage(rio.Component):
self.code: str = "" self.code: str = ""
self.loc_code: str = "" self.loc_code: str = ""
self.loc: str = "" self.loc: str = ""
await asyncio.sleep(2) await asyncio.sleep(0.5)
self.session.navigate_to("/")
await asyncio.sleep(0.01)
self.session.navigate_to("/out")
self.popup_show = False self.popup_show = False
else: else:
self.popup_message = "\n Error! Check item & location! \n\n" self.popup_message = "\n Error! Check item & location! \n\n"
self.popup_show = True self.popup_show = True
self.popup_color = 'warning' self.popup_color = 'warning'
await asyncio.sleep(2) await asyncio.sleep(2)
self.session.navigate_to("/")
await asyncio.sleep(0.01)
self.session.navigate_to("/out")
self.popup_show = False self.popup_show = False
def build(self) -> rio.Component: def build(self) -> rio.Component:
@@ -74,7 +82,8 @@ class CheckoutPage(rio.Component):
), ),
rio.TextInput( rio.TextInput(
label="Barcode", label="Barcode",
text=self.bind().code text=self.bind().code,
auto_focus=True
), ),
rio.TextInput( rio.TextInput(
label="New location", label="New location",
@@ -84,10 +93,17 @@ class CheckoutPage(rio.Component):
rio.TextInput( rio.TextInput(
label="User", label="User",
text=self.bind().name, text=self.bind().name,
on_confirm=self._checkout_item_enter on_confirm=self.check_out,
on_change=self._update_user
), ),
# rio.TextInput(
# label="N/A",
# text="",
# on_confirm=self.check_out,
# ),
rio.Button( rio.Button(
content="Go" content="Go",
on_press=self.check_out,
), ),
spacing=2, spacing=2,