bossanyit/workouttest_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wt1.1.2f fix for 1.1.3

Browse Source
This commit is contained in:
Bossanyi Tibor
2020-10-28 14:05:31 +01:00
parent 27c1d26dfd
commit db95c9a6f7
26 changed files with 672 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/repository/exercise_repository.dart
+8 -4
View File
@@ -87,10 +87,14 @@ class ExerciseRepository {
Future<List<Exercise>> getExercisesByCustomer( int customerId ) async {
final results = await ExerciseApi().getExercisesByCustomer(customerId);
this.exerciseList = results;
if ( customerId == Cache().userLoggedIn.customerId) {
Cache().setExercises(exerciseList);
} else if ( Cache().getTrainee() != null && customerId == Cache().getTrainee().customerId ) {
Cache().setExercisesTrainee(exerciseList);
if ( Cache().userLoggedIn != null ) {
if (customerId == Cache().userLoggedIn.customerId) {
Cache().setExercises(exerciseList);
} else if (Cache().getTrainee() != null && customerId == Cache()
.getTrainee()
.customerId) {
Cache().setExercisesTrainee(exerciseList);
}
}
return this.exerciseList;
}
lib/repository/user_repository.dart
+20 -2
View File
@@ -1,5 +1,7 @@
import 'package:aitrainer_app/model/cache.dart';
import 'package:aitrainer_app/model/user.dart';
import 'package:aitrainer_app/service/customer_service.dart';
import 'package:aitrainer_app/service/firebase_api.dart';
class UserRepository {
User user;
@@ -22,11 +24,27 @@ class UserRepository {
Future<void> addUser() async {
final User modelUser = this.user;
await CustomerApi().addUser(modelUser);
String rc = await FirebaseApi().registerEmail(modelUser.email, modelUser.password);
if ( rc == FirebaseApi.SIGN_IN_OK ) {
modelUser.firebaseUid = Cache().firebaseUid;
await CustomerApi().addUser(modelUser);
}
}
Future<void> getUser() async {
final User modelUser = this.user;
await CustomerApi().getUser(modelUser);
String rc = await FirebaseApi().signInEmail(modelUser.email, modelUser.password);
if ( rc == FirebaseApi.SIGN_IN_NOT_FOUND ) {
rc = await FirebaseApi().registerEmail(modelUser.email, modelUser.password);
}
if ( rc == FirebaseApi.SIGN_IN_OK ) {
await CustomerApi().getUserByEmail(modelUser.email);
Cache().afterFirebaseLogin();
}
}
Future<void> resetPassword() async {
final User modelUser = this.user;
await FirebaseApi().resetPassword(modelUser.email);
}
}