fix
This commit is contained in:
@@ -1,11 +1,10 @@
|
||||
import 'package:firebase_auth/firebase_auth.dart';
|
||||
import 'package:firebase_storage/firebase_storage.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_rating_bar/flutter_rating_bar.dart';
|
||||
import 'package:prosappco/src/authentication/authentication_repository.dart';
|
||||
import 'package:prosappco/src/components/photo_view.dart';
|
||||
import 'package:prosappco/src/models/score_model2.dart';
|
||||
import 'package:prosappco/src/models/scores_model.dart';
|
||||
import 'package:prosappco/src/models/user_model.dart';
|
||||
import 'package:prosappco/src/screens/profile.dart';
|
||||
import 'package:prosappco/src/screens/prueba.dart';
|
||||
|
||||
@@ -11,7 +11,7 @@ import 'package:prosappco/src/screens/profile.dart';
|
||||
import 'package:prosappco/src/screens/profile_pro.dart';
|
||||
import 'package:prosappco/src/screens/reputation.dart';
|
||||
|
||||
import '../models/score_model2.dart';
|
||||
import '../models/scores_model.dart';
|
||||
|
||||
class DrawerProfessional extends StatefulWidget {
|
||||
@override
|
||||
|
||||
@@ -5,19 +5,19 @@ import 'package:prosappco/src/models/user_model.dart';
|
||||
class ScoresModel {
|
||||
late int total;
|
||||
late double average;
|
||||
final List<ScoreModel2> scores;
|
||||
final List<ScoreDetailModel> details;
|
||||
|
||||
ScoresModel(this.scores) {
|
||||
total = scores.length;
|
||||
average = averageScore(scores);
|
||||
ScoresModel(this.details) {
|
||||
total = details.length;
|
||||
average = averageScore(details);
|
||||
}
|
||||
|
||||
double averageScore(List<ScoreModel2> scores) {
|
||||
if (scores.isEmpty) {
|
||||
double averageScore(List<ScoreDetailModel> details) {
|
||||
if (details.isEmpty) {
|
||||
return 0.0;
|
||||
}
|
||||
final sum = scores.map((score) => score.score).reduce((a, b) => a + b);
|
||||
return sum / scores.length;
|
||||
final sum = details.map((detail) => detail.score).reduce((a, b) => a + b);
|
||||
return sum / details.length;
|
||||
}
|
||||
|
||||
// Me
|
||||
@@ -30,7 +30,7 @@ class ScoresModel {
|
||||
|
||||
final receivedScores = await Future.wait(receivedScoresSnapshot.docs
|
||||
.map((doc) async =>
|
||||
await ScoreModel2.fromDocumentSnapshot(doc, userInfo))
|
||||
await ScoreDetailModel.fromDocumentSnapshot(doc, userInfo))
|
||||
.toList());
|
||||
|
||||
return ScoresModel(receivedScores);
|
||||
@@ -46,14 +46,14 @@ class ScoresModel {
|
||||
|
||||
final givenScores = await Future.wait(givenScoresSnapshot.docs
|
||||
.map((doc) async =>
|
||||
await ScoreModel2.fromDocumentSnapshot(doc, userInfo))
|
||||
await ScoreDetailModel.fromDocumentSnapshot(doc, userInfo))
|
||||
.toList());
|
||||
|
||||
return ScoresModel(givenScores);
|
||||
}
|
||||
}
|
||||
|
||||
class ScoreModel2 {
|
||||
class ScoreDetailModel {
|
||||
final String id;
|
||||
final double score;
|
||||
final String fromUser;
|
||||
@@ -63,7 +63,7 @@ class ScoreModel2 {
|
||||
final String name;
|
||||
final Reference? avatar;
|
||||
|
||||
ScoreModel2({
|
||||
ScoreDetailModel({
|
||||
required this.id,
|
||||
required this.score,
|
||||
required this.fromUser,
|
||||
@@ -73,13 +73,13 @@ class ScoreModel2 {
|
||||
required this.avatar,
|
||||
});
|
||||
|
||||
static Future<ScoreModel2> fromDocumentSnapshot(
|
||||
static Future<ScoreDetailModel> fromDocumentSnapshot(
|
||||
DocumentSnapshot<Map<String, dynamic>> snapshot, bool userInfo) async {
|
||||
try {
|
||||
final Map<String, dynamic> data = snapshot.data()!;
|
||||
final user = userInfo ? await UserModel.getUser(data['from_user']) : null;
|
||||
|
||||
return ScoreModel2(
|
||||
return ScoreDetailModel(
|
||||
id: snapshot.id,
|
||||
score: double.parse(data['score'].toString()),
|
||||
fromUser: data['from_user'],
|
||||
@@ -6,7 +6,7 @@ import 'package:intl/intl.dart';
|
||||
import 'package:prosappco/src/components/photo_view.dart';
|
||||
import 'package:prosappco/src/components/pop_appbar.dart';
|
||||
import 'package:prosappco/src/models/event_model.dart';
|
||||
import 'package:prosappco/src/models/score_model2.dart';
|
||||
import 'package:prosappco/src/models/scores_model.dart';
|
||||
import 'package:prosappco/src/models/user_model.dart';
|
||||
|
||||
class CitaScreen extends StatefulWidget {
|
||||
|
||||
@@ -8,7 +8,7 @@ import 'package:prosappco/src/components/photo_view.dart';
|
||||
import 'package:prosappco/src/components/pop_appbar.dart';
|
||||
import 'package:prosappco/src/screens/professional_info.dart';
|
||||
|
||||
import '../models/score_model2.dart';
|
||||
import '../models/scores_model.dart';
|
||||
|
||||
class ProfessionalScreen extends StatefulWidget {
|
||||
const ProfessionalScreen({super.key});
|
||||
|
||||
@@ -6,7 +6,7 @@ import 'package:prosappco/src/components/pop_appbar.dart';
|
||||
import 'package:prosappco/src/screens/professional.dart';
|
||||
import 'package:prosappco/src/screens/reputation.dart';
|
||||
|
||||
import '../models/score_model2.dart';
|
||||
import '../models/scores_model.dart';
|
||||
|
||||
class ProfessionalInfoScreen extends StatefulWidget {
|
||||
Professional professional;
|
||||
@@ -176,7 +176,7 @@ class _ProfessionalInfoScreenState extends State<ProfessionalInfoScreen> {
|
||||
),
|
||||
),
|
||||
),
|
||||
..._scoresList(widget.professional.scores.scores),
|
||||
..._scoresList(widget.professional.scores.details),
|
||||
const SizedBox(
|
||||
height: 10,
|
||||
),
|
||||
@@ -201,11 +201,11 @@ class _ProfessionalInfoScreenState extends State<ProfessionalInfoScreen> {
|
||||
);
|
||||
}
|
||||
|
||||
List<Widget> _scoresList(List<ScoreModel2> list) {
|
||||
List<Widget> _scoresList(List<ScoreDetailModel> list) {
|
||||
return list.map((e) => _scoreItem(e)).toList();
|
||||
}
|
||||
|
||||
Widget _scoreItem(ScoreModel2 scoreDetails) {
|
||||
Widget _scoreItem(ScoreDetailModel scoreDetails) {
|
||||
return ListTile(
|
||||
onTap: () {},
|
||||
leading: ReferencePhoto(
|
||||
|
||||
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
|
||||
import 'package:flutter_rating_bar/flutter_rating_bar.dart';
|
||||
import 'package:prosappco/src/components/photo_view.dart';
|
||||
import 'package:prosappco/src/components/pop_appbar.dart';
|
||||
import 'package:prosappco/src/models/score_model2.dart';
|
||||
import 'package:prosappco/src/models/scores_model.dart';
|
||||
import 'package:prosappco/src/screens/professional.dart';
|
||||
|
||||
class ReputationScreen extends StatelessWidget {
|
||||
@@ -22,17 +22,17 @@ class ReputationScreen extends StatelessWidget {
|
||||
body: SingleChildScrollView(
|
||||
child: Column(
|
||||
children: [
|
||||
..._scoresList(professional.scores.scores),
|
||||
..._scoresList(professional.scores.details),
|
||||
],
|
||||
)),
|
||||
));
|
||||
}
|
||||
|
||||
List<Widget> _scoresList(List<ScoreModel2> list) {
|
||||
List<Widget> _scoresList(List<ScoreDetailModel> list) {
|
||||
return list.map((e) => _scoreItem(e)).toList();
|
||||
}
|
||||
|
||||
Widget _scoreItem(ScoreModel2 scoreDetails) {
|
||||
Widget _scoreItem(ScoreDetailModel scoreDetails) {
|
||||
return ListTile(
|
||||
onTap: () {},
|
||||
leading: ReferencePhoto(
|
||||
|
||||
Reference in New Issue
Block a user