Start activity edit
This commit is contained in:
@@ -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());
|
||||
},)
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user