Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Task fixes

This commit is contained in:
Hillel Coren 2019-01-30 17:52:08 +02:00
parent 2f1c8daccd
commit aba66b70b1
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/data/models/task_model.dart
View File

@ -209,9 +209,10 @@ abstract class TaskEntity extends Object
bool isBetween(String startDate, String endDate) { bool isBetween(String startDate, String endDate) {
final times = taskTimes; final times = taskTimes;
return DateTime.parse(startDate).compareTo(times.first.endDate.toLocal()) <= final firstEndDate = times.first.endDate ?? DateTime.now();
0 && final lastEndDate = times.first.endDate ?? DateTime.now();
DateTime.parse(endDate).compareTo(times.last.endDate.toLocal()) == 1; return DateTime.parse(startDate).compareTo(firstEndDate.toLocal()) <= 0 &&
DateTime.parse(endDate).compareTo(lastEndDate.toLocal()) == 1;
} }
List<TaskTime> get taskTimes { List<TaskTime> get taskTimes {
@ -228,8 +229,9 @@ abstract class TaskEntity extends Object
final taskTime = TaskTime( final taskTime = TaskTime(
startDate: convertTimestampToDate(startDate).toUtc(), startDate: convertTimestampToDate(startDate).toUtc(),
endDate: endDate: (endDate ?? 0) > 0
endDate > 0 ? convertTimestampToDate(endDate).toUtc() : null); ? convertTimestampToDate(endDate).toUtc()
: null);
details.add(taskTime); details.add(taskTime);
}); });
@ -326,8 +328,6 @@ abstract class TaskEntity extends Object
@BuiltValueField(wireName: 'custom_value2') @BuiltValueField(wireName: 'custom_value2')
String get customValue2; String get customValue2;
List<EntityAction> getEntityActions({UserEntity user, ClientEntity client}) { List<EntityAction> getEntityActions({UserEntity user, ClientEntity client}) {
final actions = <EntityAction>[]; final actions = <EntityAction>[];