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

Compare commits

base: 3wordchant:f7edf1839172aa30d4b5228aba0cdcab9a064248
Branches Tags
3wordchant:main
3wordchant:tui
...
compare: 3wordchant:0c58555b43e1fc80037ee24465c82d484a1c8f71
Branches Tags
3wordchant:main
3wordchant:tui

3 Commits
f7edf18391 ... 0c58555b43

Author SHA1 Message Date
3wc
0c58555b43 Hot damn working date filtering 2023-10-29 23:12:39 +00:00
3wc
8e2eead540 smol tweaks 2023-10-29 22:28:01 +00:00
3wc
4b8df70527 More formatting 2023-10-29 21:56:39 +00:00
3 changed files with 169 additions and 117 deletions
Show Stats Expand all files Collapse all files

209
hamstertools/app.py
View File

@ -1,3 +1,5 @@
from datetime import datetime
from textual import on from textual import on
from textual.app import App, ComposeResult from textual.app import App, ComposeResult
from textual.binding import Binding from textual.binding import Binding
@ -33,12 +35,13 @@ from .kimai import (
class ListScreen(Screen): class ListScreen(Screen):
def compose(self) -> ComposeResult: def compose(self) -> ComposeResult:
"""create child widgets for the app."""
yield Header() yield Header()
with Vertical(): with Vertical():
yield DataTable() yield DataTable()
with Horizontal(): with Horizontal(id="filter"):
yield Input(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 Footer() yield Footer()
def action_refresh(self) -> None: def action_refresh(self) -> None:
@ -53,29 +56,28 @@ class ListScreen(Screen):
event.data_table.cursor_type = "row" event.data_table.cursor_type = "row"
def action_filter(self) -> None: def action_filter(self) -> None:
filter_input = self.query_one("#filter") self.query_one("#filter").display = True
filter_input.display = True self._refresh()
self._refresh(filter_input.value) self.query_one("#filter #search").focus()
filter_input.focus()
def on_input_submitted(self, event): def on_input_submitted(self, event):
self.table.focus() self.table.focus()
def action_cancelfilter(self) -> None: def action_cancelfilter(self) -> None:
filter_input = self.query_one("#filter") self.query_one("#filter").display = False
filter_input.display = False self.query_one("#filter #search").clear()
filter_input.clear() self.query_one("#filter #date").clear()
self.table.focus() self.table.focus()
self._refresh() self._refresh()
def on_input_changed(self, event): @on(Input.Changed, '#filter Input')
self._refresh(event.value) def filter(self, event):
self._refresh()
class ActivityEditScreen(ModalScreen): class ActivityEditScreen(ModalScreen):
BINDINGS = [ BINDINGS = [("escape", "cancel", "Cancel")]
("escape", "cancel", "Cancel")
]
def compose(self) -> ComposeResult: def compose(self) -> ComposeResult:
yield Grid( yield Grid(
@ -93,7 +95,7 @@ class ActivityMappingScreen(ModalScreen):
BINDINGS = [ BINDINGS = [
("ctrl+g", "global", "Toggle global"), ("ctrl+g", "global", "Toggle global"),
("ctrl+s", "save", "Save"), ("ctrl+s", "save", "Save"),
("escape", "cancel", "Cancel") ("escape", "cancel", "Cancel"),
] ]
customer_id = None customer_id = None
@ -111,12 +113,8 @@ class ActivityMappingScreen(ModalScreen):
return sorted(matches, key=lambda v: v.main.plain.startswith(value.lower())) return sorted(matches, key=lambda v: v.main.plain.startswith(value.lower()))
def _get_customers(self, input_state): def _get_customers(self, input_state):
customers = [ customers = [DropdownItem(c.name, str(c.id)) for c in KimaiCustomer.select()]
DropdownItem(c.name, str(c.id)) return ActivityMappingScreen._filter_dropdowns(customers, input_state.value)
for c in KimaiCustomer.select()
]
return ActivityMappingScreen._filter_dropdowns(customers,
input_state.value)
def _get_projects(self, input_state): def _get_projects(self, input_state):
projects = [ projects = [
@ -125,24 +123,21 @@ class ActivityMappingScreen(ModalScreen):
KimaiProject.customer_id == self.customer_id KimaiProject.customer_id == self.customer_id
) )
] ]
return ActivityMappingScreen._filter_dropdowns(projects, return ActivityMappingScreen._filter_dropdowns(projects, input_state.value)
input_state.value)
def _get_activities(self, input_state): def _get_activities(self, input_state):
activities = KimaiActivity.select() activities = KimaiActivity.select()
if self.query_one('#global').value: if self.query_one("#global").value:
activities = activities.where( activities = activities.where(
KimaiActivity.project_id.is_null(), KimaiActivity.project_id.is_null(),
) )
else: else:
activities = activities.where( activities = activities.where(KimaiActivity.project_id == self.project_id)
KimaiActivity.project_id == self.project_id
)
return ActivityMappingScreen._filter_dropdowns([ return ActivityMappingScreen._filter_dropdowns(
DropdownItem(a.name, str(a.id)) [DropdownItem(a.name, str(a.id)) for a in activities], input_state.value
for a in activities], input_state.value) )
def compose(self) -> ComposeResult: def compose(self) -> ComposeResult:
yield Vertical( yield Vertical(
@ -154,78 +149,88 @@ class ActivityMappingScreen(ModalScreen):
AutoComplete( AutoComplete(
Input(placeholder="Type to search...", id="customer"), Input(placeholder="Type to search...", id="customer"),
Dropdown(items=self._get_customers), Dropdown(items=self._get_customers),
) ),
), ),
Horizontal( Horizontal(
Label("Project"), Label("Project"),
AutoComplete( AutoComplete(
Input(placeholder="Type to search...", id='project'), Input(placeholder="Type to search...", id="project"),
Dropdown(items=self._get_projects), Dropdown(items=self._get_projects),
) ),
), ),
Horizontal( Horizontal(
Label("Activity"), Label("Activity"),
AutoComplete( AutoComplete(
Input(placeholder="Type to search...", id='activity'), Input(placeholder="Type to search...", id="activity"),
Dropdown(items=self._get_activities), Dropdown(items=self._get_activities),
) ),
), ),
Horizontal( Horizontal(
Label("Description"), Label("Description"),
Input(id='description'), Input(id="description"),
), ),
Horizontal( Horizontal(
Label("Tags"), Label("Tags"),
Input(id='tags'), Input(id="tags"),
), ),
Horizontal(Checkbox("Global", id='global')), Horizontal(Checkbox("Global", id="global")),
) )
@on(Input.Submitted, '#customer') @on(Input.Submitted, "#customer")
def customer_submitted(self, event): def customer_submitted(self, event):
if event.control.parent.dropdown.selected_item is not None: if event.control.parent.dropdown.selected_item is not None:
self.customer_id = str(event.control.parent.dropdown.selected_item.left_meta) self.customer_id = str(
self.query_one('#project').focus() event.control.parent.dropdown.selected_item.left_meta
)
self.query_one("#project").focus()
@on(DescendantBlur, '#customer') @on(DescendantBlur, "#customer")
def customer_blur(self, event): def customer_blur(self, event):
if event.control.parent.dropdown.selected_item is not None: if event.control.parent.dropdown.selected_item is not None:
self.customer_id = str(event.control.parent.dropdown.selected_item.left_meta) self.customer_id = str(
event.control.parent.dropdown.selected_item.left_meta
)
@on(Input.Submitted, '#project') @on(Input.Submitted, "#project")
def project_submitted(self, event): def project_submitted(self, event):
if event.control.parent.dropdown.selected_item is not None: if event.control.parent.dropdown.selected_item is not None:
self.project_id = str(event.control.parent.dropdown.selected_item.left_meta) self.project_id = str(event.control.parent.dropdown.selected_item.left_meta)
self.query_one('#activity').focus() self.query_one("#activity").focus()
@on(DescendantBlur, '#project') @on(DescendantBlur, "#project")
def project_blur(self, event): def project_blur(self, event):
if event.control.parent.dropdown.selected_item is not None: if event.control.parent.dropdown.selected_item is not None:
self.project_id = str(event.control.parent.dropdown.selected_item.left_meta) self.project_id = str(event.control.parent.dropdown.selected_item.left_meta)
@on(Input.Submitted, '#activity') @on(Input.Submitted, "#activity")
def activity_submitted(self, event): def activity_submitted(self, event):
if event.control.parent.dropdown.selected_item is not None: if event.control.parent.dropdown.selected_item is not None:
self.activity_id = str(event.control.parent.dropdown.selected_item.left_meta) self.activity_id = str(
self.query_one('#activity').focus() event.control.parent.dropdown.selected_item.left_meta
)
self.query_one("#activity").focus()
@on(DescendantBlur, '#activity') @on(DescendantBlur, "#activity")
def activity_blur(self, event): def activity_blur(self, event):
if event.control.parent.dropdown.selected_item is not None: if event.control.parent.dropdown.selected_item is not None:
self.activity_id = str(event.control.parent.dropdown.selected_item.left_meta) self.activity_id = str(
event.control.parent.dropdown.selected_item.left_meta
)
def action_global(self): def action_global(self):
self.query_one('#global').value = not self.query_one('#global').value self.query_one("#global").value = not self.query_one("#global").value
def action_save(self): def action_save(self):
self.dismiss({ self.dismiss(
'kimai_customer_id': self.customer_id, {
'kimai_project_id': self.project_id, "kimai_customer_id": self.customer_id,
'kimai_activity_id': self.activity_id, "kimai_project_id": self.project_id,
'kimai_description': self.query_one('#description').value, "kimai_activity_id": self.activity_id,
'kimai_tags': self.query_one('#tags').value, "kimai_description": self.query_one("#description").value,
'global': self.query_one('#global').value, "kimai_tags": self.query_one("#tags").value,
}) "global": self.query_one("#global").value,
}
)
def action_cancel(self): def action_cancel(self):
self.dismiss(None) self.dismiss(None)
@ -243,7 +248,7 @@ class ActivityListScreen(ListScreen):
Binding(key="escape", action="cancelfilter", show=False), Binding(key="escape", action="cancelfilter", show=False),
] ]
def _refresh(self, filter_query=None): def _refresh(self):
self.table.clear() self.table.clear()
facts_count_query = ( facts_count_query = (
@ -267,6 +272,7 @@ class ActivityListScreen(ListScreen):
HamsterActivity.select( HamsterActivity.select(
HamsterActivity, HamsterActivity,
HamsterCategory.id, HamsterCategory.id,
HamsterFact.start_time,
fn.COALESCE(HamsterCategory.name, "None").alias("category_name"), fn.COALESCE(HamsterCategory.name, "None").alias("category_name"),
fn.COALESCE(facts_count_query.c.facts_count, 0).alias("facts_count"), fn.COALESCE(facts_count_query.c.facts_count, 0).alias("facts_count"),
fn.COALESCE(mappings_count_query.c.mappings_count, 0).alias( fn.COALESCE(mappings_count_query.c.mappings_count, 0).alias(
@ -275,6 +281,8 @@ class ActivityListScreen(ListScreen):
) )
.join(HamsterCategory, JOIN.LEFT_OUTER) .join(HamsterCategory, JOIN.LEFT_OUTER)
.switch(HamsterActivity) .switch(HamsterActivity)
.join(HamsterFact, JOIN.LEFT_OUTER)
.switch(HamsterActivity)
.join( .join(
facts_count_query, facts_count_query,
JOIN.LEFT_OUTER, JOIN.LEFT_OUTER,
@ -289,12 +297,22 @@ class ActivityListScreen(ListScreen):
.group_by(HamsterActivity) .group_by(HamsterActivity)
) )
if filter_query: filter_search = self.query_one('#filter #search').value
if filter_search is not None:
activities = activities.where( activities = activities.where(
HamsterActivity.name.contains(filter_query) HamsterActivity.name.contains(filter_search)
| HamsterCategory.name.contains(filter_query) | HamsterCategory.name.contains(filter_search)
) )
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')
)
except ValueError:
pass
self.table.add_rows( self.table.add_rows(
[ [
[ [
@ -354,8 +372,7 @@ class ActivityListScreen(ListScreen):
HamsterFact.update({HamsterFact.activity: move_to_activity}).where( HamsterFact.update({HamsterFact.activity: move_to_activity}).where(
HamsterFact.activity == self.move_from_activity HamsterFact.activity == self.move_from_activity
).execute() ).execute()
filter_input = self.query_one("#filter") self._refresh()
self._refresh(filter_input.value)
del self.move_from_activity del self.move_from_activity
def action_edit(self): def action_edit(self):
@ -365,27 +382,38 @@ class ActivityListScreen(ListScreen):
self.app.push_screen(ActivityEditScreen(), handle_edit) self.app.push_screen(ActivityEditScreen(), handle_edit)
def action_mapping(self): def action_mapping(self):
selected_activity = HamsterActivity.select( selected_activity = (
HamsterActivity.select(
HamsterActivity, HamsterActivity,
fn.COALESCE(HamsterCategory.name, "None").alias("category_name"), fn.COALESCE(HamsterCategory.name, "None").alias("category_name"),
).join(HamsterCategory, JOIN.LEFT_OUTER).where( )
HamsterActivity.id == self.table.get_cell_at( .join(HamsterCategory, JOIN.LEFT_OUTER)
.where(
HamsterActivity.id
== self.table.get_cell_at(
Coordinate(self.table.cursor_coordinate.row, 2), Coordinate(self.table.cursor_coordinate.row, 2),
) )
).get() )
.get()
)
def handle_mapping(mapping): def handle_mapping(mapping):
if mapping is None: if mapping is None:
return return
m = HamsterKimaiMapping.create(hamster_activity=selected_activity, **mapping) m = HamsterKimaiMapping.create(
hamster_activity=selected_activity, **mapping
)
m.save() m.save()
filter_input = self.query_one("#filter") filter_search = self.query_one("#search")
self._refresh(filter_input.value) self._refresh()
self.app.push_screen(ActivityMappingScreen( self.app.push_screen(
ActivityMappingScreen(
category=selected_activity.category_name, category=selected_activity.category_name,
activity=selected_activity.name activity=selected_activity.name,
), handle_mapping) ),
handle_mapping,
)
class CategoryListScreen(ListScreen): class CategoryListScreen(ListScreen):
@ -397,19 +425,34 @@ class CategoryListScreen(ListScreen):
Binding(key="escape", action="cancelfilter", show=False), Binding(key="escape", action="cancelfilter", show=False),
] ]
def _refresh(self, filter_query=None): def _refresh(self):
self.table.clear() self.table.clear()
categories = ( categories = (
HamsterCategory.select( HamsterCategory.select(
HamsterCategory, fn.Count(HamsterActivity.id).alias("activities_count") HamsterCategory,
fn.Count(HamsterActivity.id).alias("activities_count"),
HamsterFact.start_time
) )
.join(HamsterActivity, JOIN.LEFT_OUTER) .join(HamsterActivity, JOIN.LEFT_OUTER)
.join(HamsterFact, JOIN.LEFT_OUTER)
.group_by(HamsterCategory) .group_by(HamsterCategory)
) )
if filter_query: filter_search = self.query_one('#filter #search').value
categories = categories.where(HamsterCategory.name.contains(filter_query)) if filter_search is not None:
categories = categories.where(
HamsterCategory.name.contains(filter_search)
)
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')
)
except ValueError:
pass
self.table.add_rows( self.table.add_rows(
[ [
@ -432,7 +475,6 @@ class CategoryListScreen(ListScreen):
self._refresh() self._refresh()
def action_delete(self) -> None: def action_delete(self) -> None:
# get the keys for the row and column under the cursor.
row_key, _ = self.table.coordinate_to_cell_key(self.table.cursor_coordinate) row_key, _ = self.table.coordinate_to_cell_key(self.table.cursor_coordinate)
category_id = self.table.get_cell_at( category_id = self.table.get_cell_at(
@ -441,7 +483,6 @@ class CategoryListScreen(ListScreen):
category = HamsterCategory.get(id=category_id) category = HamsterCategory.get(id=category_id)
category.delete_instance() category.delete_instance()
# supply the row key to `remove_row` to delete the row.
self.table.remove_row(row_key) self.table.remove_row(row_key)
@ -569,5 +610,5 @@ class HamsterToolsApp(App):
self.switch_mode("activities") self.switch_mode("activities")
def action_quit(self) -> None: def action_quit(self) -> None:
self.exit()
db.close() db.close()
self.exit()

4
hamstertools/app.tcss
View File

@ -14,6 +14,10 @@ DataTable:focus .datatable--cursor {
display: none; display: none;
} }
#filter Input {
width: 50%;
}
ActivityEditScreen, ActivityMappingScreen { ActivityEditScreen, ActivityMappingScreen {
align: center middle; align: center middle;
} }

65
hamstertools/kimai.py
View File

@ -9,24 +9,24 @@ class NotFound(Exception):
class KimaiAPI(object): class KimaiAPI(object):
# temporary hardcoded config # temporary hardcoded config
KIMAI_API_URL = 'https://kimai.autonomic.zone/api' KIMAI_API_URL = "https://kimai.autonomic.zone/api"
KIMAI_USERNAME = '3wordchant' KIMAI_USERNAME = "3wordchant"
KIMAI_API_KEY = os.environ['KIMAI_API_KEY'] KIMAI_API_KEY = os.environ["KIMAI_API_KEY"]
auth_headers = { auth_headers = {"X-AUTH-USER": KIMAI_USERNAME, "X-AUTH-TOKEN": KIMAI_API_KEY}
'X-AUTH-USER': KIMAI_USERNAME,
'X-AUTH-TOKEN': KIMAI_API_KEY
}
def __init__(self): def __init__(self):
requests_cache.install_cache('kimai', backend='sqlite', expire_after=1800) requests_cache.install_cache("kimai", backend="sqlite", expire_after=1800)
self.customers_json = requests.get( self.customers_json = requests.get(
f'{self.KIMAI_API_URL}/customers?visible=3', headers=self.auth_headers).json() f"{self.KIMAI_API_URL}/customers?visible=3", headers=self.auth_headers
).json()
self.projects_json = requests.get( self.projects_json = requests.get(
f'{self.KIMAI_API_URL}/projects?visible=3', headers=self.auth_headers).json() f"{self.KIMAI_API_URL}/projects?visible=3", headers=self.auth_headers
).json()
self.activities_json = requests.get( self.activities_json = requests.get(
f'{self.KIMAI_API_URL}/activities?visible=3', headers=self.auth_headers).json() f"{self.KIMAI_API_URL}/activities?visible=3", headers=self.auth_headers
).json()
class BaseAPI(object): class BaseAPI(object):
@ -41,19 +41,17 @@ class Customer(BaseAPI):
@staticmethod @staticmethod
def list(api): def list(api):
return [ return [Customer(api, c["id"], c["name"]) for c in api.customers_json]
Customer(api, c['id'], c['name']) for c in api.customers_json
]
@staticmethod @staticmethod
def get_by_id(api, id): def get_by_id(api, id):
for value in api.customers_json: for value in api.customers_json:
if value['id'] == id: if value["id"] == id:
return Customer(api, value['id'], value['name']) return Customer(api, value["id"], value["name"])
raise NotFound() raise NotFound()
def __repr__(self): def __repr__(self):
return f'Customer (id={self.id}, name={self.name})' return f"Customer (id={self.id}, name={self.name})"
class Project(BaseAPI): class Project(BaseAPI):
@ -63,20 +61,25 @@ class Project(BaseAPI):
@staticmethod @staticmethod
def list(api): def list(api):
return [ return [
Project(api, p['id'], p['name'], Customer.get_by_id(api, p['customer'])) for p in api.projects_json Project(api, p["id"], p["name"], Customer.get_by_id(api, p["customer"]))
for p in api.projects_json
] ]
@staticmethod @staticmethod
def get_by_id(api, id, none=False): def get_by_id(api, id, none=False):
for value in api.projects_json: for value in api.projects_json:
if value['id'] == id: if value["id"] == id:
return Project(api, value['id'], value['name'], return Project(
Customer.get_by_id(api, value['customer'])) api,
value["id"],
value["name"],
Customer.get_by_id(api, value["customer"]),
)
if not none: if not none:
raise NotFound() raise NotFound()
def __repr__(self): def __repr__(self):
return f'Project (id={self.id}, name={self.name}, customer={self.customer})' return f"Project (id={self.id}, name={self.name}, customer={self.customer})"
class Activity(BaseAPI): class Activity(BaseAPI):
@ -86,20 +89,24 @@ class Activity(BaseAPI):
@staticmethod @staticmethod
def list(api): def list(api):
return [ return [
Activity(api, a['id'], a['name'], Project.get_by_id(api, Activity(
a['project'], api, a["id"], a["name"], Project.get_by_id(api, a["project"], none=True)
none=True)) )
for a in api.activities_json for a in api.activities_json
] ]
@staticmethod @staticmethod
def get_by_id(api, id, none=False): def get_by_id(api, id, none=False):
for value in api.activities_json: for value in api.activities_json:
if value['id'] == id: if value["id"] == id:
return Activity(api, value['id'], value['name'], return Activity(
Project.get_by_id(api, value['project'])) api,
value["id"],
value["name"],
Project.get_by_id(api, value["project"]),
)
if not none: if not none:
raise NotFound() raise NotFound()
def __repr__(self): def __repr__(self):
return f'Activity (id={self.id}, name={self.name}, project={self.project})' return f"Activity (id={self.id}, name={self.name}, project={self.project})"