home
·
contact
·
privacy
projects
/
plomtask
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor ProcessStep code and undo replacement of implicit steps by explicit ones.
[plomtask]
/
plomtask
/
http.py
diff --git
a/plomtask/http.py
b/plomtask/http.py
index 8ddef656be0c8ab23c8e3fe8fa82b66005912cd5..2e0fc768b97e538084a7364e8d3437952e953f71 100644
(file)
--- a/
plomtask/http.py
+++ b/
plomtask/http.py
@@
-10,7
+10,7
@@
from plomtask.days import Day
from plomtask.exceptions import HandledException, BadFormatException, \
NotFoundException
from plomtask.db import DatabaseConnection, DatabaseFile
from plomtask.exceptions import HandledException, BadFormatException, \
NotFoundException
from plomtask.db import DatabaseConnection, DatabaseFile
-from plomtask.processes import Process
+from plomtask.processes import Process
, ProcessStep
from plomtask.conditions import Condition
from plomtask.todos import Todo
from plomtask.conditions import Condition
from plomtask.todos import Todo
@@
-269,6
+269,10
@@
class TaskHandler(BaseHTTPRequestHandler):
processes.sort(key=lambda p: len(p.explicit_steps))
elif sort_by == '-steps':
processes.sort(key=lambda p: len(p.explicit_steps), reverse=True)
processes.sort(key=lambda p: len(p.explicit_steps))
elif sort_by == '-steps':
processes.sort(key=lambda p: len(p.explicit_steps), reverse=True)
+ elif sort_by == 'effort':
+ processes.sort(key=lambda p: p.effort.newest)
+ elif sort_by == '-effort':
+ processes.sort(key=lambda p: p.effort.newest, reverse=True)
elif sort_by == '-title':
processes.sort(key=lambda p: p.title.newest, reverse=True)
else:
elif sort_by == '-title':
processes.sort(key=lambda p: p.title.newest, reverse=True)
else:
@@
-374,7
+378,8
@@
class TaskHandler(BaseHTTPRequestHandler):
process.set_disables(self.conn, self.form_data.get_all_int('disables'))
process.calendarize = self.form_data.get_all_str('calendarize') != []
process.save(self.conn)
process.set_disables(self.conn, self.form_data.get_all_int('disables'))
process.calendarize = self.form_data.get_all_str('calendarize') != []
process.save(self.conn)
- steps: list[tuple[int | None, int, int | None]] = []
+ assert isinstance(process.id_, int)
+ steps: list[ProcessStep] = []
for step_id in self.form_data.get_all_int('keep_step'):
if step_id not in self.form_data.get_all_int('steps'):
raise BadFormatException('trying to keep unknown step')
for step_id in self.form_data.get_all_int('keep_step'):
if step_id not in self.form_data.get_all_int('steps'):
raise BadFormatException('trying to keep unknown step')
@@
-385,13
+390,15
@@
class TaskHandler(BaseHTTPRequestHandler):
f'step_{step_id}_process_id')
parent_id = self.form_data.get_int_or_none(
f'step_{step_id}_parent_id')
f'step_{step_id}_process_id')
parent_id = self.form_data.get_int_or_none(
f'step_{step_id}_parent_id')
- steps += [(step_id, step_process_id, parent_id)]
+ steps += [ProcessStep(step_id, process.id_, step_process_id,
+ parent_id)]
for step_id in self.form_data.get_all_int('steps'):
for step_process_id in self.form_data.get_all_int(
f'new_step_to_{step_id}'):
for step_id in self.form_data.get_all_int('steps'):
for step_process_id in self.form_data.get_all_int(
f'new_step_to_{step_id}'):
- steps += [(None, step_process_id, step_id)]
+ steps += [ProcessStep(None, process.id_, step_process_id,
+ step_id)]
for step_process_id in self.form_data.get_all_int('new_top_step'):
for step_process_id in self.form_data.get_all_int('new_top_step'):
- steps += [
(None
, step_process_id, None)]
+ steps += [
ProcessStep(None, process.id_
, step_process_id, None)]
process.uncache()
process.set_steps(self.conn, steps)
process.save(self.conn)
process.uncache()
process.set_steps(self.conn, steps)
process.save(self.conn)