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

Day Seperation bug fixed

Browse Source
This commit is contained in:
Sewmina
2022-03-11 04:01:44 +05:30
parent 3cd1ffdc1c
commit 959cada3a7
4 changed files with 129 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/Activities.dart
View File

@@ -230,7 +230,8 @@ class _ActivitiesState extends State<Activities> {
}
Widget DateSeperator(date, prodActs, unprodActs) {
double prodPercentage = (prodActs / (prodActs + unprodActs)) * 100;
// double prodPercentage = (prodActs / (prodActs + unprodActs)) * 100;
double prodPercentage = (prodActs / 1440) * 100;
return Padding(
padding: const EdgeInsets.fromLTRB(0, 20, 10, 0),
child: Column(
@@ -256,24 +257,26 @@ class _ActivitiesState extends State<Activities> {
children: [
Row(
children: [
if(prodPercentage < 35)Text(Main.MinutesToTimeString(prodActs),),
Container(
child: Align(
child: FittedBox(fit: BoxFit.fitWidth,child: Text(Main.MinutesToTimeString(prodActs),)),
child: (prodPercentage >= 35) ?Text(Main.MinutesToTimeString(prodActs),) : Container(),
alignment: Alignment.center,
),
width: (prodPercentage) * 1.7,
height: 25,
width: (prodPercentage) * 1,
height: 20,
decoration: BoxDecoration(color: Colors.green, borderRadius: BorderRadius.horizontal(left: Radius.circular(10))),
),
Container(
child: Align(
child: Text(Main.MinutesToTimeString(unprodActs)),
child: (prodPercentage < 35) ?Text(Main.MinutesToTimeString(unprodActs)) :Container(),
alignment: Alignment.center,
),
width: (100 - prodPercentage) * 1.7,
height: 25,
width: (100 - prodPercentage) * 1,
height: 20,
decoration: BoxDecoration(color: Colors.red, borderRadius: BorderRadius.horizontal(right: Radius.circular(10))),
),
if(prodPercentage >= 35)Text(Main.MinutesToTimeString(unprodActs))
],
),
SizedBox(
@@ -357,7 +360,7 @@ class _ActivitiesState extends State<Activities> {
child: Column(
children: [
Row(mainAxisSize: MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
Row(children: [
Row(mainAxisSize: MainAxisSize.max,children: [
Text(name + " [$timeSpan]", style: TextStyle(fontSize: 17)),
if (containsMetadata)
Icon(
@@ -365,11 +368,13 @@ class _ActivitiesState extends State<Activities> {
size: 20,
),
if (containsMetadata)
FittedBox(
child: Text(
activity.metadata ?? '',
),
)
SizedBox(
width: 150,
child: Text(
activity.metadata ?? '',
),
),
]),
// Icon(Icons.analytics, color: color, size: 20,),
@@ -403,6 +408,11 @@ class _ActivitiesState extends State<Activities> {
]),
),
if(selecting)InkWell(child: Container(margin:EdgeInsets.all(10),child: Icon(Icons.edit)),onTap: (){
selecting=false;
selectedActivities=[];
setState(() {
});
Navigator.of(context).push(MaterialPageRoute(builder: (context) => NewActivity(sTime: activity.startTime,eTime: activity.endTime,metadata: activity.metadata,selectedTask: activity.taskType.name,))).then((value) => UpdateList());
},)
]);