home
·
contact
·
privacy
projects
/
plomtask
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Todo/Process.blockers for Conditions that block rather than enable.
[plomtask]
/
plomtask
/
conditions.py
diff --git
a/plomtask/conditions.py
b/plomtask/conditions.py
index cba606d1a71dd19a0e410677f0ee8fc528d5bdbf..8ab4282080b4898f8d08da4e443f8ac3d64131ee 100644
(file)
--- a/
plomtask/conditions.py
+++ b/
plomtask/conditions.py
@@
-11,6
+11,7
@@
class Condition(BaseModel[int]):
"""Non-Process dependency for ProcessSteps and Todos."""
table_name = 'conditions'
to_save = ['is_active']
"""Non-Process dependency for ProcessSteps and Todos."""
table_name = 'conditions'
to_save = ['is_active']
+ to_save_versioned = ['title', 'description']
def __init__(self, id_: int | None, is_active: bool = False) -> None:
super().__init__(id_)
def __init__(self, id_: int | None, is_active: bool = False) -> None:
super().__init__(id_)
@@
-30,12
+31,6
@@
class Condition(BaseModel[int]):
getattr(condition, name).history_from_row(row_)
return condition
getattr(condition, name).history_from_row(row_)
return condition
- def save(self, db_conn: DatabaseConnection) -> None:
- """Save self and its VersionedAttributes to DB and cache."""
- self.save_core(db_conn)
- self.title.save(db_conn)
- self.description.save(db_conn)
-
def remove(self, db_conn: DatabaseConnection) -> None:
"""Remove from DB, with VersionedAttributes.
def remove(self, db_conn: DatabaseConnection) -> None:
"""Remove from DB, with VersionedAttributes.
@@
-45,18
+40,22
@@
class Condition(BaseModel[int]):
if self.id_ is None:
raise HandledException('cannot remove unsaved item')
for item in ('process', 'todo'):
if self.id_ is None:
raise HandledException('cannot remove unsaved item')
for item in ('process', 'todo'):
- for attr in ('conditions', 'enables', 'disables'):
+ for attr in ('conditions', '
blockers', '
enables', 'disables'):
table_name = f'{item}_{attr}'
for _ in db_conn.row_where(table_name, 'condition', self.id_):
raise HandledException('cannot remove Condition in use')
table_name = f'{item}_{attr}'
for _ in db_conn.row_where(table_name, 'condition', self.id_):
raise HandledException('cannot remove Condition in use')
- db_conn.delete_where('condition_titles', 'parent', self.id_)
- db_conn.delete_where('condition_descriptions', 'parent', self.id_)
super().remove(db_conn)
class ConditionsRelations:
"""Methods for handling relations to Conditions, for Todo and Process."""
super().remove(db_conn)
class ConditionsRelations:
"""Methods for handling relations to Conditions, for Todo and Process."""
+ def __init__(self) -> None:
+ self.conditions: list[Condition] = []
+ self.blockers: list[Condition] = []
+ self.enables: list[Condition] = []
+ self.disables: list[Condition] = []
+
def set_conditions(self, db_conn: DatabaseConnection, ids: list[int],
target: str = 'conditions') -> None:
"""Set self.[target] to Conditions identified by ids."""
def set_conditions(self, db_conn: DatabaseConnection, ids: list[int],
target: str = 'conditions') -> None:
"""Set self.[target] to Conditions identified by ids."""
@@
-66,6
+65,11
@@
class ConditionsRelations:
for id_ in ids:
target_list += [Condition.by_id(db_conn, id_)]
for id_ in ids:
target_list += [Condition.by_id(db_conn, id_)]
+ def set_blockers(self, db_conn: DatabaseConnection,
+ ids: list[int]) -> None:
+ """Set self.enables to Conditions identified by ids."""
+ self.set_conditions(db_conn, ids, 'blockers')
+
def set_enables(self, db_conn: DatabaseConnection,
ids: list[int]) -> None:
"""Set self.enables to Conditions identified by ids."""
def set_enables(self, db_conn: DatabaseConnection,
ids: list[int]) -> None:
"""Set self.enables to Conditions identified by ids."""