warlock/TaskTracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Start activity edit

Browse Source
This commit is contained in:
Sewmina
2022-03-08 20:27:40 +05:30
parent 8785ef3d05
commit 42c29cdab2
2 changed files with 57 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/Activities.dart
View File

@@ -87,7 +87,7 @@ class _ActivitiesState extends State<Activities> {
});},
child: Container(
padding: EdgeInsets.symmetric(horizontal: 10),
margin: EdgeInsets.all( 10),
child: Icon(Icons.cancel),
),
)
@@ -104,20 +104,21 @@ class _ActivitiesState extends State<Activities> {
onTap: () {
DeleteSelectedTasks();
},
child: Icon(
Icons.delete,
size: 30,
child: Container(
margin: EdgeInsets.all(5),
child: Icon(
Icons.delete,
size: 30,
),
)),
SizedBox(
width: 20,
),
InkWell(
onTap: () {
setState(() {
selecting = false;
});
},
child: Icon(Icons.close, size: 30),
child: Container(margin:EdgeInsets.all(10),child: Icon(Icons.close, size: 30)),
)
])
: Row(
@@ -130,13 +131,13 @@ class _ActivitiesState extends State<Activities> {
});
},
child: Icon(
Icons.search,
size: 30,
child: Container(
margin: EdgeInsets.all(10),
child: Icon(
Icons.search,
size: 30,
),
)),
SizedBox(
width: 20,
),
InkWell(
onTap: () {
UpdateList();
@@ -144,7 +145,7 @@ class _ActivitiesState extends State<Activities> {
});
},
child: Icon(Icons.refresh, size: 30),
child: Container(margin: EdgeInsets.all(10),child: Icon(Icons.refresh, size: 30)),
)
],
),
@@ -196,7 +197,10 @@ class _ActivitiesState extends State<Activities> {
print(productivtyActs);
for (var element in User.activities) {
if(searching){
if(element.metadata!.toLowerCase().contains(searchController.text.toLowerCase()) || element.taskType.name.toLowerCase().contains(searchController.text.toLowerCase())){
bool matchMetadata = element.metadata!.toLowerCase().contains(searchController.text.toLowerCase());
bool matchTaskType=element.taskType.name.toLowerCase().contains(searchController.text.toLowerCase());
bool matchCategory = element.taskType.cat!.name.toLowerCase().contains(searchController.text.toLowerCase());
if(matchMetadata || matchTaskType || matchCategory){
//Good to go
}else{
continue;
@@ -398,6 +402,9 @@ class _ActivitiesState extends State<Activities> {
)),
]),
),
if(selecting)InkWell(child: Container(margin:EdgeInsets.all(10),child: Icon(Icons.edit)),onTap: (){
Navigator.of(context).push(MaterialPageRoute(builder: (context) => NewActivity(sTime: activity.startTime,eTime: activity.endTime,metadata: activity.metadata,selectedTask: activity.taskType.name,))).then((value) => UpdateList());
},)
]);
}

52
lib/newActivity.dart
View File

@@ -3,37 +3,53 @@ import 'package:flutter/painting.dart';
import 'package:flutter_datetime_picker/flutter_datetime_picker.dart';
import 'package:intl/intl.dart';
import 'package:tasktracker/main.dart';
import 'Data.dart';
import 'User.dart' as User;
DateFormat dateFormat = DateFormat("yyyy-MM-dd HH:mm:ss");
DateFormat durationFormat = DateFormat("HH:mm:ss");
class NewActivity extends StatefulWidget {
const NewActivity({Key? key}) : super(key: key);
NewActivity({Key? key, this.selectedTask, this.sTime, this.eTime, this.metadata}) : super(key: key);
late DateTime? sTime;
late DateTime? eTime;
late String? metadata;
late String? selectedTask;
@override
_NewActivity createState() => _NewActivity();
_NewActivity createState() => _NewActivity(eTime: eTime, sTime: sTime,selectedCat: selectedTask, metadata: metadata);
}
String selectedCat = User.taskTypes[0].name;
List<String> getActivities(){
List<String> _cats = [];
print(User.taskTypes[0].name + " : " + selectedCat);
User.taskTypes.forEach((element) {
String name = element.name;
if(_cats.contains(element.name)){
}else{
_cats.add(name);}
});
return _cats;
}
class _NewActivity extends State<NewActivity> {
late DateTime init_sTime;
late DateTime init_eTime;
late String init_selectedTask;
_NewActivity({DateTime? eTime, DateTime? sTime, String? metadata, String? selectedCat}){
this.init_sTime=this.startTime = sTime ?? DateTime.now();
this.init_eTime=this.endTime = eTime ??DateTime.now().add(Duration(minutes: 30));
this.metadataController.text = metadata ?? "";
this.init_selectedTask=this.selectedCat = selectedCat ?? User.taskTypes[0].name;
print("etime:$eTime, sTime:$sTime, meta:$metadata, task: $selectedCat");
DateTime startTime = DateTime.now();
DateTime endTime = DateTime.now().add(Duration(minutes: 30));
}
late DateTime startTime;
late DateTime endTime;
TextEditingController metadataController = TextEditingController();
late String selectedCat;
List<String> getActivities(){
List<String> _cats = [];
print(User.taskTypes[0].name + " : " + selectedCat);
User.taskTypes.forEach((element) {
String name = element.name;
if(_cats.contains(element.name)){
}else{
_cats.add(name);}
});
return _cats;
}
@override
Widget build(BuildContext context) {
return Scaffold(