diff --git a/lib/src/components/drawer_menu.dart b/lib/src/components/drawer_menu.dart index b04a19a..3daa705 100644 --- a/lib/src/components/drawer_menu.dart +++ b/lib/src/components/drawer_menu.dart @@ -30,7 +30,7 @@ class _DrawerMenuState extends State { } if (scoresModel == null) { - ScoresModel.scoreFrom(uid.toString(), false).then( + ScoresModel.scoreTo(uid.toString(), false, false).then( (ScoresModel s) => setState(() => scoresModel = s), ); } diff --git a/lib/src/components/drawer_professional.dart b/lib/src/components/drawer_professional.dart index 03aa058..5fef18f 100644 --- a/lib/src/components/drawer_professional.dart +++ b/lib/src/components/drawer_professional.dart @@ -34,7 +34,7 @@ class _DrawerProfessionalState extends State { } if (scoresModel == null) { - ScoresModel.scoreTo(uid.toString(), false).then( + ScoresModel.scoreTo(uid.toString(), true, false).then( (ScoresModel s) => setState(() => scoresModel = s), ); } diff --git a/lib/src/models/scores_model.dart b/lib/src/models/scores_model.dart index e2d8f9d..682ac92 100644 --- a/lib/src/models/scores_model.dart +++ b/lib/src/models/scores_model.dart @@ -21,9 +21,11 @@ class ScoresModel { } // Me - static Future scoreTo(String userReceived, bool userInfo) async { + static Future scoreTo( + String userReceived, bool isFromClient, bool userInfo) async { final receivedScoresQuery = FirebaseFirestore.instance .collection('scores') + .where('is_from_client', isEqualTo: isFromClient) .where('to_user', isEqualTo: userReceived); final receivedScoresSnapshot = await receivedScoresQuery.get(); @@ -59,6 +61,7 @@ class ScoreDetailModel { final String fromUser; final String toUser; final String comment; + final bool isFromClient; final String name; final Reference? avatar; @@ -69,6 +72,7 @@ class ScoreDetailModel { required this.fromUser, required this.toUser, required this.comment, + required this.isFromClient, required this.name, required this.avatar, }); @@ -85,6 +89,7 @@ class ScoreDetailModel { fromUser: data['from_user'], toUser: data['to_user'], comment: data['comment'], + isFromClient: data['is_from_client'], name: user?.name ?? "...", avatar: user?.photo); } catch (e) { diff --git a/lib/src/screens/professional.dart b/lib/src/screens/professional.dart index 034e5b3..daf2953 100644 --- a/lib/src/screens/professional.dart +++ b/lib/src/screens/professional.dart @@ -121,7 +121,7 @@ Future> getProfessionals() async { professionalRef: storage.ref().child(_photo), professionalEspecializado: especializaciones, ubicacion: data['ubicacion'] ?? '', - scores: await ScoresModel.scoreTo(user.id, true), + scores: await ScoresModel.scoreTo(user.id, true, true), ); professionals.add(professional); }