jpt/tt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix callbacks

Browse Source
This commit is contained in:
James Turk 2025-01-05 06:59:34 -06:00
parent 6d3b82ece2
commit 86b80f87f8
3 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tt/controller.py
View File

@ -11,8 +11,8 @@ def category_lookup(category):
return category.id return category.id
def get_task(task_id: int) -> Task: def get_task(item_id: int) -> Task:
return Task.get_by_id(task_id) return Task.get_by_id(item_id)
def add_task( def add_task(
@ -35,15 +35,15 @@ def add_task(
def update_task( def update_task(
task_id: int, item_id: int,
**kwargs, **kwargs,
) -> Task: ) -> Task:
with db.atomic(): with db.atomic():
if category := kwargs.pop("category", None): if category := kwargs.pop("category", None):
kwargs["category_id"] = category_lookup(category) kwargs["category_id"] = category_lookup(category)
query = Task.update(kwargs).where(Task.id == task_id) query = Task.update(kwargs).where(Task.id == item_id)
query.execute() query.execute()
task = Task.get_by_id(task_id) task = Task.get_by_id(item_id)
return task return task

24
src/tt/tui/editor.py
View File

@ -113,7 +113,7 @@ class TableEditor(App):
def __init__(self, default_view="default"): def __init__(self, default_view="default"):
super().__init__() super().__init__()
self.filters = {} self.filters = {}
self.sort_string = "due,status" self.sort_string = "" # TODO: default sort
self._load_view(default_view) self._load_view(default_view)
self.search_query = "" self.search_query = ""
self.saved_cursor_pos = (1, 0) self.saved_cursor_pos = (1, 0)
@ -192,20 +192,23 @@ class TableEditor(App):
if self.table.cursor_column == 0: if self.table.cursor_column == 0:
cur_row = self.table.cursor_row cur_row = self.table.cursor_row
item_id = int(self.table.get_cell_at((cur_row, 0))) item_id = int(self.table.get_cell_at((cur_row, 0)))
# TODO: deletable items need a delete
self.update_item_callback(item_id, deleted=True) self.update_item_callback(item_id, deleted=True)
self._save_cursor() self._save_cursor()
self.refresh_data() self.refresh_data()
def action_add_item(self): def action_add_item(self):
# if filtering on type, status, or category # the new item should use the selected value if filtered
# the new item should use the selected value
# prepopulate with either the field default or the current filter # prepopulate with either the field default or the current filter
prepopulated = { prepopulated = {}
field.name: self.filters.get(field.name, field.default) for fc in self.TABLE_CONFIG:
for field in self.TABLE_CONFIG val = self.filters.get(fc.field, fc.default)
} if val is not None:
# TODO: need to split type_ and status # enums use comma separated filters
if fc.enum:
prepopulated[fc.field] = val.split(",")[0]
else:
prepopulated[fc.field] = val
new_item = self.add_item_callback(**prepopulated) new_item = self.add_item_callback(**prepopulated)
self.refresh_data(restore_cursor=False) self.refresh_data(restore_cursor=False)
@ -232,6 +235,7 @@ class TableEditor(App):
# trigger item_id to be saved on the next cursor move # trigger item_id to be saved on the next cursor move
# this avoids filtered columns disappearing right away # this avoids filtered columns disappearing right away
# and tons of DB writes # and tons of DB writes
# TODO: status hard coded here
self._register_save_on_move(item_id, status=next_val) self._register_save_on_move(item_id, status=next_val)
def _register_save_on_move(self, item_id, **kwargs): def _register_save_on_move(self, item_id, **kwargs):
@ -245,7 +249,6 @@ class TableEditor(App):
self.update_item_callback(**self.save_on_move) self.update_item_callback(**self.save_on_move)
self._save_cursor() self._save_cursor()
self.refresh_data() self.refresh_data()
# reset status
self.save_on_move = None self.save_on_move = None
def move_cursor_to_item(self, item_id): def move_cursor_to_item(self, item_id):
@ -356,6 +359,7 @@ class TableEditor(App):
# preprocess/validate the field being saved # preprocess/validate the field being saved
try: try:
update_data[field] = cconf.preprocessor(new_value) update_data[field] = cconf.preprocessor(new_value)
# raise Exception(update_data)
self.update_item_callback(item_id, **update_data) self.update_item_callback(item_id, **update_data)
self.refresh_data() self.refresh_data()
except NotifyValidationError as e: except NotifyValidationError as e:

7
src/tt/tui/tasks.py
View File

@ -55,9 +55,6 @@ class TT(TableEditor):
TableColumnConfig("due", "Due", default="", preprocessor=due_preprocessor), TableColumnConfig("due", "Due", default="", preprocessor=due_preprocessor),
TableColumnConfig("category", "Category", default="main"), TableColumnConfig("category", "Category", default="main"),
) )
update_item_callback = update_task
update_item_callback = add_task
get_item_callback = get_task
BINDINGS = [ BINDINGS = [
# saved views # saved views
@ -68,6 +65,9 @@ class TT(TableEditor):
def __init__(self, default_view="default"): def __init__(self, default_view="default"):
super().__init__() super().__init__()
self._load_view(default_view) self._load_view(default_view)
self.update_item_callback = update_task
self.add_item_callback = add_task
self.get_item_callback = get_task
def _load_view(self, name): def _load_view(self, name):
try: try:
@ -122,7 +122,6 @@ class TT(TableEditor):
def run(default_view): def run(default_view):
initialize_db()
app = TT(default_view) app = TT(default_view)
app.run() app.run()