More formatting
This commit is contained in:
@ -73,9 +73,7 @@ class ListScreen(Screen):
|
||||
|
||||
|
||||
class ActivityEditScreen(ModalScreen):
|
||||
BINDINGS = [
|
||||
("escape", "cancel", "Cancel")
|
||||
]
|
||||
BINDINGS = [("escape", "cancel", "Cancel")]
|
||||
|
||||
def compose(self) -> ComposeResult:
|
||||
yield Grid(
|
||||
@ -93,7 +91,7 @@ class ActivityMappingScreen(ModalScreen):
|
||||
BINDINGS = [
|
||||
("ctrl+g", "global", "Toggle global"),
|
||||
("ctrl+s", "save", "Save"),
|
||||
("escape", "cancel", "Cancel")
|
||||
("escape", "cancel", "Cancel"),
|
||||
]
|
||||
|
||||
customer_id = None
|
||||
@ -111,12 +109,8 @@ class ActivityMappingScreen(ModalScreen):
|
||||
return sorted(matches, key=lambda v: v.main.plain.startswith(value.lower()))
|
||||
|
||||
def _get_customers(self, input_state):
|
||||
customers = [
|
||||
DropdownItem(c.name, str(c.id))
|
||||
for c in KimaiCustomer.select()
|
||||
]
|
||||
return ActivityMappingScreen._filter_dropdowns(customers,
|
||||
input_state.value)
|
||||
customers = [DropdownItem(c.name, str(c.id)) for c in KimaiCustomer.select()]
|
||||
return ActivityMappingScreen._filter_dropdowns(customers, input_state.value)
|
||||
|
||||
def _get_projects(self, input_state):
|
||||
projects = [
|
||||
@ -125,24 +119,21 @@ class ActivityMappingScreen(ModalScreen):
|
||||
KimaiProject.customer_id == self.customer_id
|
||||
)
|
||||
]
|
||||
return ActivityMappingScreen._filter_dropdowns(projects,
|
||||
input_state.value)
|
||||
return ActivityMappingScreen._filter_dropdowns(projects, input_state.value)
|
||||
|
||||
def _get_activities(self, input_state):
|
||||
activities = KimaiActivity.select()
|
||||
|
||||
if self.query_one('#global').value:
|
||||
if self.query_one("#global").value:
|
||||
activities = activities.where(
|
||||
KimaiActivity.project_id.is_null(),
|
||||
)
|
||||
else:
|
||||
activities = activities.where(
|
||||
KimaiActivity.project_id == self.project_id
|
||||
)
|
||||
activities = activities.where(KimaiActivity.project_id == self.project_id)
|
||||
|
||||
return ActivityMappingScreen._filter_dropdowns([
|
||||
DropdownItem(a.name, str(a.id))
|
||||
for a in activities], input_state.value)
|
||||
return ActivityMappingScreen._filter_dropdowns(
|
||||
[DropdownItem(a.name, str(a.id)) for a in activities], input_state.value
|
||||
)
|
||||
|
||||
def compose(self) -> ComposeResult:
|
||||
yield Vertical(
|
||||
@ -154,78 +145,88 @@ class ActivityMappingScreen(ModalScreen):
|
||||
AutoComplete(
|
||||
Input(placeholder="Type to search...", id="customer"),
|
||||
Dropdown(items=self._get_customers),
|
||||
)
|
||||
),
|
||||
),
|
||||
Horizontal(
|
||||
Label("Project"),
|
||||
AutoComplete(
|
||||
Input(placeholder="Type to search...", id='project'),
|
||||
Input(placeholder="Type to search...", id="project"),
|
||||
Dropdown(items=self._get_projects),
|
||||
)
|
||||
),
|
||||
),
|
||||
Horizontal(
|
||||
Label("Activity"),
|
||||
AutoComplete(
|
||||
Input(placeholder="Type to search...", id='activity'),
|
||||
Input(placeholder="Type to search...", id="activity"),
|
||||
Dropdown(items=self._get_activities),
|
||||
)
|
||||
),
|
||||
),
|
||||
Horizontal(
|
||||
Label("Description"),
|
||||
Input(id='description'),
|
||||
Input(id="description"),
|
||||
),
|
||||
Horizontal(
|
||||
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):
|
||||
if event.control.parent.dropdown.selected_item is not None:
|
||||
self.customer_id = str(event.control.parent.dropdown.selected_item.left_meta)
|
||||
self.query_one('#project').focus()
|
||||
self.customer_id = str(
|
||||
event.control.parent.dropdown.selected_item.left_meta
|
||||
)
|
||||
self.query_one("#project").focus()
|
||||
|
||||
@on(DescendantBlur, '#customer')
|
||||
@on(DescendantBlur, "#customer")
|
||||
def customer_blur(self, event):
|
||||
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):
|
||||
if event.control.parent.dropdown.selected_item is not None:
|
||||
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):
|
||||
if event.control.parent.dropdown.selected_item is not None:
|
||||
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):
|
||||
if event.control.parent.dropdown.selected_item is not None:
|
||||
self.activity_id = str(event.control.parent.dropdown.selected_item.left_meta)
|
||||
self.query_one('#activity').focus()
|
||||
self.activity_id = str(
|
||||
event.control.parent.dropdown.selected_item.left_meta
|
||||
)
|
||||
self.query_one("#activity").focus()
|
||||
|
||||
@on(DescendantBlur, '#activity')
|
||||
@on(DescendantBlur, "#activity")
|
||||
def activity_blur(self, event):
|
||||
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):
|
||||
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):
|
||||
self.dismiss({
|
||||
'kimai_customer_id': self.customer_id,
|
||||
'kimai_project_id': self.project_id,
|
||||
'kimai_activity_id': self.activity_id,
|
||||
'kimai_description': self.query_one('#description').value,
|
||||
'kimai_tags': self.query_one('#tags').value,
|
||||
'global': self.query_one('#global').value,
|
||||
})
|
||||
self.dismiss(
|
||||
{
|
||||
"kimai_customer_id": self.customer_id,
|
||||
"kimai_project_id": self.project_id,
|
||||
"kimai_activity_id": self.activity_id,
|
||||
"kimai_description": self.query_one("#description").value,
|
||||
"kimai_tags": self.query_one("#tags").value,
|
||||
"global": self.query_one("#global").value,
|
||||
}
|
||||
)
|
||||
|
||||
def action_cancel(self):
|
||||
self.dismiss(None)
|
||||
@ -365,27 +366,38 @@ class ActivityListScreen(ListScreen):
|
||||
self.app.push_screen(ActivityEditScreen(), handle_edit)
|
||||
|
||||
def action_mapping(self):
|
||||
selected_activity = HamsterActivity.select(
|
||||
HamsterActivity,
|
||||
fn.COALESCE(HamsterCategory.name, "None").alias("category_name"),
|
||||
).join(HamsterCategory, JOIN.LEFT_OUTER).where(
|
||||
HamsterActivity.id == self.table.get_cell_at(
|
||||
Coordinate(self.table.cursor_coordinate.row, 2),
|
||||
selected_activity = (
|
||||
HamsterActivity.select(
|
||||
HamsterActivity,
|
||||
fn.COALESCE(HamsterCategory.name, "None").alias("category_name"),
|
||||
)
|
||||
).get()
|
||||
.join(HamsterCategory, JOIN.LEFT_OUTER)
|
||||
.where(
|
||||
HamsterActivity.id
|
||||
== self.table.get_cell_at(
|
||||
Coordinate(self.table.cursor_coordinate.row, 2),
|
||||
)
|
||||
)
|
||||
.get()
|
||||
)
|
||||
|
||||
def handle_mapping(mapping):
|
||||
if mapping is None:
|
||||
return
|
||||
m = HamsterKimaiMapping.create(hamster_activity=selected_activity, **mapping)
|
||||
m = HamsterKimaiMapping.create(
|
||||
hamster_activity=selected_activity, **mapping
|
||||
)
|
||||
m.save()
|
||||
filter_input = self.query_one("#filter")
|
||||
self._refresh(filter_input.value)
|
||||
|
||||
self.app.push_screen(ActivityMappingScreen(
|
||||
category=selected_activity.category_name,
|
||||
activity=selected_activity.name
|
||||
), handle_mapping)
|
||||
self.app.push_screen(
|
||||
ActivityMappingScreen(
|
||||
category=selected_activity.category_name,
|
||||
activity=selected_activity.name,
|
||||
),
|
||||
handle_mapping,
|
||||
)
|
||||
|
||||
|
||||
class CategoryListScreen(ListScreen):
|
||||
|
||||
Reference in New Issue
Block a user