3wordchant/hamster-tools
0
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

Reformatting 🧹

Browse Source
This commit is contained in:
3wc
2023-11-01 19:33:30 +00:00
parent 05928b1244
commit cb909540fa
6 changed files with 134 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
hamstertools/app.py
View File

@ -38,9 +38,15 @@ class ListScreen(Screen):
with Vertical():
yield DataTable()
with Horizontal(id="filter"):
yield Input(id="search", placeholder="Category/activity name contains text")
yield Input(id="date",
placeholder='After date, in {0} format'.format(datetime.now().strftime('%Y-%m-%d')))
yield Input(
id="search", placeholder="Category/activity name contains text"
)
yield Input(
id="date",
placeholder="After date, in {0} format".format(
datetime.now().strftime("%Y-%m-%d")
),
)
yield Footer()
def action_refresh(self) -> None:
@ -69,7 +75,7 @@ class ListScreen(Screen):
self.table.focus()
self._refresh()
@on(Input.Changed, '#filter Input')
@on(Input.Changed, "#filter Input")
def filter(self, event):
self._refresh()
@ -81,7 +87,7 @@ class ActivityEditScreen(ModalScreen):
]
category_id = None
category_name = ''
category_name = ""
def _get_categories(self, input_state):
categories = [DropdownItem(c.name, str(c.id)) for c in HamsterCategory.select()]
@ -96,15 +102,20 @@ class ActivityEditScreen(ModalScreen):
def compose(self) -> ComposeResult:
yield Vertical(
Horizontal(Label("Category:"),
Horizontal(
Label("Category:"),
AutoComplete(
Input(placeholder="Type to search...", id="category",
value=self.category_name),
Input(
placeholder="Type to search...",
id="category",
value=self.category_name,
),
Dropdown(items=self._get_categories),
),
),
Horizontal(Label("Activity:"), Input(value=self.activity_name,
id='activity')),
Horizontal(
Label("Activity:"), Input(value=self.activity_name, id="activity")
),
)
@on(Input.Submitted, "#category")
@ -129,7 +140,7 @@ class ActivityEditScreen(ModalScreen):
self.dismiss(
{
"category": self.category_id,
"activity": self.query_one('#activity').value,
"activity": self.query_one("#activity").value,
}
)
@ -340,18 +351,18 @@ class ActivityListScreen(ListScreen):
.group_by(HamsterActivity)
)
filter_search = self.query_one('#filter #search').value
filter_search = self.query_one("#filter #search").value
if filter_search is not None:
activities = activities.where(
HamsterActivity.name.contains(filter_search)
| HamsterCategory.name.contains(filter_search)
)
filter_date = self.query_one('#filter #date').value
filter_date = self.query_one("#filter #date").value
if filter_date is not None:
try:
activities = activities.where(
HamsterFact.start_time > datetime.strptime(filter_date, '%Y-%m-%d')
HamsterFact.start_time > datetime.strptime(filter_date, "%Y-%m-%d")
)
except ValueError:
pass
@ -431,15 +442,14 @@ class ActivityListScreen(ListScreen):
def handle_edit(properties):
if properties is None:
return
activity.name = properties['activity']
activity.category_id = properties['category']
activity.name = properties["activity"]
activity.category_id = properties["category"]
activity.save()
self._refresh()
self.app.push_screen(ActivityEditScreen(
category=category,
activity=activity
), handle_edit)
self.app.push_screen(
ActivityEditScreen(category=category, activity=activity), handle_edit
)
def action_mapping(self):
selected_activity = (
@ -490,26 +500,24 @@ class CategoryListScreen(ListScreen):
categories = (
HamsterCategory.select(
HamsterCategory,
HamsterCategory,
fn.Count(HamsterActivity.id).alias("activities_count"),
HamsterFact.start_time
HamsterFact.start_time,
)
.join(HamsterActivity, JOIN.LEFT_OUTER)
.join(HamsterFact, JOIN.LEFT_OUTER)
.group_by(HamsterCategory)
)
filter_search = self.query_one('#filter #search').value
filter_search = self.query_one("#filter #search").value
if filter_search is not None:
categories = categories.where(
HamsterCategory.name.contains(filter_search)
)
categories = categories.where(HamsterCategory.name.contains(filter_search))
filter_date = self.query_one('#filter #date').value
filter_date = self.query_one("#filter #date").value
if filter_date is not None:
try:
categories = categories.where(
HamsterFact.start_time > datetime.strptime(filter_date, '%Y-%m-%d')
HamsterFact.start_time > datetime.strptime(filter_date, "%Y-%m-%d")
)
except ValueError:
pass
@ -613,7 +621,7 @@ class KimaiProjectListScreen(ListScreen):
"id": project.id,
"name": project.name,
"customer_id": project.customer.id,
"allow_global_activities": project.allow_global_activities
"allow_global_activities": project.allow_global_activities,
}
for project in projects
]