Todos Done!?
This commit is contained in:
@@ -268,7 +268,7 @@ class _TodosPageState extends State<TodosPage> {
|
|||||||
}
|
}
|
||||||
setState(() {});
|
setState(() {});
|
||||||
} else {
|
} else {
|
||||||
Navigator.of(context).push(MaterialPageRoute(builder: (context)=> NewActivity(selectedTask: TaskType.getDisplayName(todo.task!), metadata: todo.metadata ,)));
|
Navigator.of(context).push(MaterialPageRoute(builder: (context)=> NewActivity(selectedTask: TaskType.getDisplayName(todo.task!), metadata: todo.metadata ,todo: todo,)));
|
||||||
setState(() {
|
setState(() {
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -553,7 +553,7 @@ class _MyHomePageState extends State<MyHomePage> {
|
|||||||
: InkWell(
|
: InkWell(
|
||||||
onTap: () {
|
onTap: () {
|
||||||
setState(() async {
|
setState(() async {
|
||||||
//await User.refreshUserData();
|
await User.refreshUserData();
|
||||||
LoadStats();
|
LoadStats();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -12,20 +12,22 @@ DateFormat dateTimeFormat = DateFormat("yyyy-MM-dd HH:mm:ss");
|
|||||||
DateFormat durationFormat = DateFormat("HH:mm:ss");
|
DateFormat durationFormat = DateFormat("HH:mm:ss");
|
||||||
|
|
||||||
class NewActivity extends StatefulWidget {
|
class NewActivity extends StatefulWidget {
|
||||||
NewActivity({Key? key, this.selectedTask, this.sTime, this.eTime, this.metadata}) : super(key: key);
|
NewActivity({Key? key, this.selectedTask, this.sTime, this.eTime, this.metadata, this.todo}) : super(key: key);
|
||||||
|
late Todo? todo;
|
||||||
late DateTime? sTime;
|
late DateTime? sTime;
|
||||||
late DateTime? eTime;
|
late DateTime? eTime;
|
||||||
late String? metadata;
|
late String? metadata;
|
||||||
late String? selectedTask;
|
late String? selectedTask;
|
||||||
@override
|
@override
|
||||||
_NewActivity createState() => _NewActivity(eTime: eTime, sTime: sTime, selectedCat: selectedTask, metadata: metadata);
|
_NewActivity createState() => _NewActivity(eTime: eTime, sTime: sTime, selectedCat: selectedTask, metadata: metadata,todo:todo);
|
||||||
}
|
}
|
||||||
|
|
||||||
class _NewActivity extends State<NewActivity> {
|
class _NewActivity extends State<NewActivity> {
|
||||||
late DateTime init_sTime;
|
late DateTime init_sTime;
|
||||||
late DateTime init_eTime;
|
late DateTime init_eTime;
|
||||||
late String init_selectedTask;
|
late String init_selectedTask;
|
||||||
_NewActivity({DateTime? eTime, DateTime? sTime, String? metadata, String? selectedCat}) {
|
Todo? todo;
|
||||||
|
_NewActivity({DateTime? eTime, DateTime? sTime, String? metadata, String? selectedCat, this.todo}) {
|
||||||
editing = sTime != null && eTime != null && selectedCat != null;
|
editing = sTime != null && eTime != null && selectedCat != null;
|
||||||
|
|
||||||
this.init_sTime = this.startTime = sTime ?? DateTime.now();
|
this.init_sTime = this.startTime = sTime ?? DateTime.now();
|
||||||
@@ -409,6 +411,9 @@ class _NewActivity extends State<NewActivity> {
|
|||||||
|
|
||||||
if (!failed) {
|
if (!failed) {
|
||||||
print("popping : ${navigatorKey.currentWidget?.toStringShort() ?? "n/a"}");
|
print("popping : ${navigatorKey.currentWidget?.toStringShort() ?? "n/a"}");
|
||||||
|
if(todo!=null){
|
||||||
|
await User.UserOperations.deleteTodo(todo!.id);
|
||||||
|
}
|
||||||
Navigator.of(navigatorKey.currentContext!).popUntil((route) {
|
Navigator.of(navigatorKey.currentContext!).popUntil((route) {
|
||||||
return route.isFirst;
|
return route.isFirst;
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user