diff --git a/web/src/p2k16/core/tool.py b/web/src/p2k16/core/tool.py index bd19809..9d986a1 100644 --- a/web/src/p2k16/core/tool.py +++ b/web/src/p2k16/core/tool.py @@ -16,47 +16,51 @@ class DummyClient(object): @event_management.converter_for("tool", "checkout") class ToolCheckoutEvent(object): - def __init__(self, tool_name: str, created_at: Optional[datetime] = None, created_by: Optional[Account] = None): + def __init__(self, tool_name: str, tool_description: Optional[str] = None, created_at: Optional[datetime] = None, created_by: Optional[Account] = None): self.tool_name = tool_name + self.tool_description = tool_description or tool_name self.created_at = created_at self.created_by = created_by def to_event(self): - return {"text1": self.tool_name} + return {"text1": self.tool_name, "text2": self.tool_description} @staticmethod def from_event(event: Event) -> "ToolCheckoutEvent": - return ToolCheckoutEvent(event.text1, event.created_at, event.created_by) + return ToolCheckoutEvent(event.text1, event.text2, event.created_at, event.created_by) def to_dict(self): return {**event_management.base_dict(self), **{ "created_at": self.created_at, "created_by": self.created_by, "created_by_username": self.created_by.username, - "tool_name": self.tool_name + "tool_name": self.tool_name, + "tool_description": self.tool_description }} @event_management.converter_for("tool", "checkin") class ToolCheckinEvent(object): - def __init__(self, tool_name: str, created_at: Optional[datetime] = None, created_by: Optional[Account] = None): + def __init__(self, tool_name: str, tool_description: Optional[str] = None, created_at: Optional[datetime] = None, created_by: Optional[Account] = None): self.tool_name = tool_name + self.tool_description = tool_description or tool_name self.created_at = created_at self.created_by = created_by def to_event(self): - return {"text1": self.tool_name} + return {"text1": self.tool_name, "text2": self.tool_description} @staticmethod def from_event(event: Event) -> "ToolCheckinEvent": - return ToolCheckinEvent(event.text1, event.created_at, event.created_by) + return ToolCheckinEvent(event.text1, event.text2, event.created_at, event.created_by) def to_dict(self): return {**event_management.base_dict(self), **{ "created_at": self.created_at, "created_by": self.created_by, "created_by_username": self.created_by.username, - "tool_name": self.tool_name + "tool_name": self.tool_name, + "tool_description": self.tool_description }} @@ -108,7 +112,7 @@ def checkout_tool(self, account: Account, tool: ToolDescription): self.checkin_tool(checkout.account, checkout.tool_description) # Make a new checkout reservation - event_management.save_event(ToolCheckoutEvent(tool.name, datetime.now(), account)) + event_management.save_event(ToolCheckoutEvent(tool.name, tool.description, datetime.now(), account)) checkout = ToolCheckout(tool, account, datetime.now()) db.session.add(checkout) @@ -129,7 +133,7 @@ def checkout_tool(self, account: Account, tool: ToolDescription): def checkin_tool(self, account: Account, tool: ToolDescription): logger.info('Checking in tool. username={}, tool={}'.format(account.username, tool.name)) - event_management.save_event(ToolCheckinEvent(tool.name, datetime.now(), account)) + event_management.save_event(ToolCheckinEvent(tool.name, tool.description, datetime.now(), account)) checkout = ToolCheckout.find_by_tool(tool) db.session.delete(checkout) db.session.flush() diff --git a/web/src/p2k16/web/static/admin-tool-detail.html b/web/src/p2k16/web/static/admin-tool-detail.html index 9d4f7fc..a9cd51e 100644 --- a/web/src/p2k16/web/static/admin-tool-detail.html +++ b/web/src/p2k16/web/static/admin-tool-detail.html @@ -10,7 +10,7 @@

-
-

Available - @@ -50,9 +49,9 @@

Recent events