added sound during countdown, and upgraded minsdkversion
This commit is contained in:
@ -15,7 +15,7 @@ class ActionsDao extends DatabaseAccessor<AppDatabase> with _$ActionsDaoMixin {
|
||||
return await (select(actions)..where((action) => action.id.equals(id) )).getSingle();
|
||||
}
|
||||
|
||||
Future<List<Action>> fromActivity(Activity activity) async {
|
||||
Future<List<Action>> fromActivity(Activity activity, Session session) async {
|
||||
final result = select(db.activityActions).join(
|
||||
[
|
||||
innerJoin(
|
||||
@ -24,7 +24,8 @@ class ActionsDao extends DatabaseAccessor<AppDatabase> with _$ActionsDaoMixin {
|
||||
),
|
||||
],
|
||||
)
|
||||
..where(db.activityActions.activityId.equals(activity.id));
|
||||
..where(db.activityActions.activityId.equals(activity.id))
|
||||
..where(db.activityActions.sessionId.equals(session.id));
|
||||
|
||||
final actions = (await result.get())
|
||||
.map((e) => e.readTable(db.actions))
|
||||
@ -33,5 +34,31 @@ class ActionsDao extends DatabaseAccessor<AppDatabase> with _$ActionsDaoMixin {
|
||||
return actions;
|
||||
}
|
||||
|
||||
Stream<List<Action>> watchActivityActions(Activity activity, Session session) {
|
||||
final result = select(db.activityActions).join(
|
||||
[
|
||||
innerJoin(
|
||||
db.actions,
|
||||
db.actions.id.equalsExp(db.activityActions.actionId),
|
||||
),
|
||||
],
|
||||
)
|
||||
..where(db.activityActions.activityId.equals(activity.id))
|
||||
..where(db.activityActions.sessionId.equals(session.id));
|
||||
|
||||
// final actions = result.watch().map((rows) {
|
||||
// return rows.map((row) {
|
||||
// row.readTable(db.actions);
|
||||
// }).toList();
|
||||
// });
|
||||
|
||||
final actions = (result.watch()).map((rows) {
|
||||
return rows.map((row) => row.readTable(db.actions)).toList();
|
||||
});
|
||||
|
||||
return actions;
|
||||
}
|
||||
|
||||
Future createOrUpdate(ActionsCompanion action) => into(actions).insertOnConflictUpdate(action);
|
||||
Future replace(Action action) => update(actions).replace(action);
|
||||
}
|
||||
|
@ -12,6 +12,7 @@ class ActivityActionsDao extends DatabaseAccessor<AppDatabase> with _$ActivityAc
|
||||
Future insert(ActivityAction activityAction) => into(activityActions).insert(activityAction);
|
||||
Future replace(ActivityAction activityAction) => update(activityActions).replace(activityAction);
|
||||
Future remove(ActivityAction activityAction) => delete(activityActions).delete(activityAction);
|
||||
Future createOrUpdate(ActivityActionsCompanion activityAction) => into(activityActions).insertOnConflictUpdate(activityAction);
|
||||
|
||||
// Future<List<ActivityAction>> all() async {
|
||||
// return await select(activityActions).get();
|
||||
|
@ -6,5 +6,6 @@ part of 'activity_actions_dao.dart';
|
||||
mixin _$ActivityActionsDaoMixin on DatabaseAccessor<AppDatabase> {
|
||||
$ActivitiesTable get activities => attachedDatabase.activities;
|
||||
$ActionsTable get actions => attachedDatabase.actions;
|
||||
$SessionsTable get sessions => attachedDatabase.sessions;
|
||||
$ActivityActionsTable get activityActions => attachedDatabase.activityActions;
|
||||
}
|
||||
|
Reference in New Issue
Block a user