black reformat
This commit is contained in:
@ -80,33 +80,45 @@ class ActivitiesScreen(ListScreen):
|
||||
self.table.clear()
|
||||
|
||||
facts_count_query = (
|
||||
HamsterFact
|
||||
.select(HamsterFact.activity_id, fn.COUNT(HamsterFact.id).alias('facts_count'))
|
||||
HamsterFact.select(
|
||||
HamsterFact.activity_id, fn.COUNT(HamsterFact.id).alias("facts_count")
|
||||
)
|
||||
.group_by(HamsterFact.activity_id)
|
||||
.alias('facts_count_query')
|
||||
.alias("facts_count_query")
|
||||
)
|
||||
|
||||
mappings_count_query = (
|
||||
HamsterKimaiMapping
|
||||
.select(HamsterKimaiMapping.hamster_activity_id,
|
||||
fn.COUNT(HamsterKimaiMapping.id).alias('mappings_count'))
|
||||
HamsterKimaiMapping.select(
|
||||
HamsterKimaiMapping.hamster_activity_id,
|
||||
fn.COUNT(HamsterKimaiMapping.id).alias("mappings_count"),
|
||||
)
|
||||
.group_by(HamsterKimaiMapping.hamster_activity_id)
|
||||
.alias('mappings_count_query')
|
||||
.alias("mappings_count_query")
|
||||
)
|
||||
|
||||
activities = (
|
||||
HamsterActivity.select(
|
||||
HamsterActivity,
|
||||
HamsterCategory.id,
|
||||
fn.COALESCE(HamsterCategory.name, 'None').alias("category_name"),
|
||||
fn.COALESCE(facts_count_query.c.facts_count, 0).alias('facts_count'),
|
||||
fn.COALESCE(mappings_count_query.c.mappings_count, 0).alias('mappings_count')
|
||||
fn.COALESCE(HamsterCategory.name, "None").alias("category_name"),
|
||||
fn.COALESCE(facts_count_query.c.facts_count, 0).alias("facts_count"),
|
||||
fn.COALESCE(mappings_count_query.c.mappings_count, 0).alias(
|
||||
"mappings_count"
|
||||
),
|
||||
)
|
||||
.join(HamsterCategory, JOIN.LEFT_OUTER)
|
||||
.switch(HamsterActivity)
|
||||
.join(facts_count_query, JOIN.LEFT_OUTER, on=(HamsterActivity.id == facts_count_query.c.activity_id))
|
||||
.join(
|
||||
facts_count_query,
|
||||
JOIN.LEFT_OUTER,
|
||||
on=(HamsterActivity.id == facts_count_query.c.activity_id),
|
||||
)
|
||||
.switch(HamsterActivity)
|
||||
.join(mappings_count_query, JOIN.LEFT_OUTER, on=(HamsterActivity.id == mappings_count_query.c.hamster_activity_id))
|
||||
.join(
|
||||
mappings_count_query,
|
||||
JOIN.LEFT_OUTER,
|
||||
on=(HamsterActivity.id == mappings_count_query.c.hamster_activity_id),
|
||||
)
|
||||
.group_by(HamsterActivity)
|
||||
)
|
||||
|
||||
@ -172,9 +184,9 @@ class ActivitiesScreen(ListScreen):
|
||||
move_to_activity = HamsterActivity.get(
|
||||
self.table.get_cell_at(Coordinate(event.cursor_row, 2))
|
||||
)
|
||||
HamsterFact.update({HamsterFact.activity:
|
||||
move_to_activity}).where(HamsterFact.activity ==
|
||||
self.move_from_activity).execute()
|
||||
HamsterFact.update({HamsterFact.activity: move_to_activity}).where(
|
||||
HamsterFact.activity == self.move_from_activity
|
||||
).execute()
|
||||
filter_input = self.query_one("#filter")
|
||||
self._refresh(filter_input.value)
|
||||
del self.move_from_activity
|
||||
@ -194,17 +206,14 @@ class CategoriesScreen(ListScreen):
|
||||
|
||||
categories = (
|
||||
HamsterCategory.select(
|
||||
HamsterCategory,
|
||||
fn.Count(HamsterActivity.id).alias("activities_count")
|
||||
HamsterCategory, fn.Count(HamsterActivity.id).alias("activities_count")
|
||||
)
|
||||
.join(HamsterActivity, JOIN.LEFT_OUTER)
|
||||
.group_by(HamsterCategory)
|
||||
)
|
||||
|
||||
if filter_query:
|
||||
categories = categories.where(
|
||||
HamsterCategory.name.contains(filter_query)
|
||||
)
|
||||
categories = categories.where(HamsterCategory.name.contains(filter_query))
|
||||
|
||||
self.table.add_rows(
|
||||
[
|
||||
@ -256,7 +265,7 @@ class KimaiScreen(ListScreen):
|
||||
KimaiProject.select(
|
||||
KimaiProject,
|
||||
KimaiCustomer,
|
||||
fn.Count(KimaiActivity.id).alias("activities_count")
|
||||
fn.Count(KimaiActivity.id).alias("activities_count"),
|
||||
)
|
||||
.join(KimaiCustomer, JOIN.LEFT_OUTER)
|
||||
.switch(KimaiProject)
|
||||
@ -278,7 +287,7 @@ class KimaiScreen(ListScreen):
|
||||
project.customer.name,
|
||||
project.id,
|
||||
project.name,
|
||||
project.activities_count
|
||||
project.activities_count,
|
||||
]
|
||||
for project in projects
|
||||
]
|
||||
@ -295,26 +304,37 @@ class KimaiScreen(ListScreen):
|
||||
|
||||
customers = KimaiAPICustomer.list(api)
|
||||
with db.atomic():
|
||||
KimaiCustomer.insert_many([{
|
||||
'id': customer.id,
|
||||
'name': customer.name
|
||||
} for customer in customers]).execute()
|
||||
KimaiCustomer.insert_many(
|
||||
[{"id": customer.id, "name": customer.name} for customer in customers]
|
||||
).execute()
|
||||
|
||||
projects = KimaiAPIProject.list(api)
|
||||
with db.atomic():
|
||||
KimaiProject.insert_many([{
|
||||
'id': project.id,
|
||||
'name': project.name,
|
||||
'customer_id': project.customer.id
|
||||
} for project in projects]).execute()
|
||||
KimaiProject.insert_many(
|
||||
[
|
||||
{
|
||||
"id": project.id,
|
||||
"name": project.name,
|
||||
"customer_id": project.customer.id,
|
||||
}
|
||||
for project in projects
|
||||
]
|
||||
).execute()
|
||||
|
||||
activities = KimaiAPIActivity.list(api)
|
||||
with db.atomic():
|
||||
KimaiActivity.insert_many([{
|
||||
'id': activity.id,
|
||||
'name': activity.name,
|
||||
'project_id': (activity.project and activity.project.id or None)
|
||||
} for activity in activities]).execute()
|
||||
KimaiActivity.insert_many(
|
||||
[
|
||||
{
|
||||
"id": activity.id,
|
||||
"name": activity.name,
|
||||
"project_id": (
|
||||
activity.project and activity.project.id or None
|
||||
),
|
||||
}
|
||||
for activity in activities
|
||||
]
|
||||
).execute()
|
||||
|
||||
self._refresh()
|
||||
|
||||
|
Reference in New Issue
Block a user