usite-sas-bic/prosappweb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix puntuaciones

Browse Source
This commit is contained in:
Juan Felipe Duarte
2023-04-28 15:56:54 -05:00
parent b3d31d3a8d
commit 9354350b26
12 changed files with 239 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/main.dart
+2
View File
@@ -19,6 +19,7 @@ import 'package:prosappco/src/screens/profile_pro.dart';
import 'package:prosappco/src/screens/register.dart';
import 'package:prosappco/src/screens/request_sent.dart';
import 'package:prosappco/src/screens/service.dart';
import 'package:prosappco/src/screens/solicitudes.dart';
import 'firebase_options.dart';
void main() async {
@@ -61,6 +62,7 @@ class MyApp extends StatelessWidget {
'/servicio': (context) => const ServiceScreen(),
'/profilePro': (context) => const ProfilePro(),
'/calendar': (context) => const CalendarScreen(),
'/solicitud': (context) => SolicitudScreen(),
},
onGenerateRoute: (settings) {
throw Exception('Ruta desconocida: ${settings.name}');
lib/src/components/drawer_menu.dart
+2 -9
View File
@@ -7,7 +7,7 @@ import 'package:prosappco/src/components/photo_view.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';
import 'package:prosappco/src/screens/solicitudes.dart';
class DrawerMenu extends StatefulWidget {
@override
@@ -295,14 +295,7 @@ class _DrawerMenuState extends State<DrawerMenu> {
} else if (user?.state == 'revision') {
Navigator.pushNamed(context, '/profesionalRevision');
} else if (user?.state == 'activo') {
Navigator.push(
context,
CupertinoPageRoute(
builder: (BuildContext context) {
return const PruebaScreen();
},
),
);
Navigator.pushNamed(context, '/solicitud');
}
},
style: ElevatedButton.styleFrom(
lib/src/components/drawer_professional.dart
+9 -3
View File
@@ -199,7 +199,14 @@ class _DrawerProfessionalState extends State<DrawerProfessional> {
return Container(
color: const Color(0xFF2BA4EC),
child: ListTile(
onTap: () {},
onTap: () {
if (ModalRoute.of(context)?.settings.name !=
'/solicitud') {
Navigator.pushNamed(context, '/solicitud');
} else {
Scaffold.of(context).openEndDrawer();
}
},
trailing: const Icon(
Icons.keyboard_arrow_right,
color: Colors.white,
@@ -239,8 +246,7 @@ class _DrawerProfessionalState extends State<DrawerProfessional> {
context,
CupertinoPageRoute(
builder: (BuildContext context) {
return ReputationScreen(
professional: professional!);
return ReputationScreen();
},
),
);
lib/src/models/event_model.dart
+24
View File
@@ -1,5 +1,6 @@
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:prosappco/src/authentication/authentication_repository.dart';
import 'package:prosappco/src/models/scores_model.dart';
final uid = AuthenticationRepository.instance.getCurrentUserUid();
@@ -46,6 +47,28 @@ Future<List<Event>> getByProId(String day) async {
}
}
Future<List<Event>> getByProIdAll() async {
try {
var snapshot = await FirebaseFirestore.instance
.collection('services')
.where('professional_id', isEqualTo: uid)
.get();
List<Event> eventos = [];
for (var element in snapshot.docs) {
final event = Event.fromJson(element.data());
event.scoresModel =
await ScoresModel.scoreTo(event.userId ?? "", false, false);
eventos.add(event);
}
print('eventos $eventos');
return eventos;
} catch (e) {
print('Error getByProId $e');
return [];
}
}
class Event {
String? title;
String? description;
@@ -54,6 +77,7 @@ class Event {
String? range1Hour2;
String? userId;
String? professionalId;
ScoresModel? scoresModel;
Event({
this.title,
lib/src/models/scores_model.dart
+13 -1
View File
@@ -12,6 +12,11 @@ class ScoresModel {
average = averageScore(details);
}
@override
String toString() {
return 'ScoresModel{total: $total, average: $average, details: $details}';
}
double averageScore(List<ScoreDetailModel> details) {
if (details.isEmpty) {
return 0.0;
@@ -39,9 +44,11 @@ class ScoresModel {
}
// You
static Future<ScoresModel> scoreFrom(String userGiven, bool userInfo) async {
static Future<ScoresModel> scoreFrom(
String userGiven, bool isFromClient, bool userInfo) async {
final givenScoresQuery = FirebaseFirestore.instance
.collection('scores')
.where('is_from_client', isEqualTo: isFromClient)
.where('from_user', isEqualTo: userGiven);
final givenScoresSnapshot = await givenScoresQuery.get();
@@ -77,6 +84,11 @@ class ScoreDetailModel {
required this.avatar,
});
@override
String toString() {
return 'ScoreDetailModel{id: $id, score: $score, fromUser: $fromUser, toUser: $toUser, comment: $comment, isFromClient: $isFromClient, name: $name, avatar: $avatar}';
}
static Future<ScoreDetailModel> fromDocumentSnapshot(
DocumentSnapshot<Map<String, dynamic>> snapshot, bool userInfo) async {
try {
lib/src/screens/calendar.dart
+1 -1
View File
@@ -69,7 +69,7 @@ class _CalendarScreenState extends State<CalendarScreen> {
}
if (scoresModel == null) {
ScoresModel.scoreFrom(uid.toString(), false).then(
ScoresModel.scoreFrom(uid.toString(), true, false).then(
(ScoresModel s) => setState(() => scoresModel = s),
);
}
lib/src/screens/cita.dart
+4 -9
View File
@@ -28,14 +28,11 @@ class _CitaScreenState extends State<CitaScreen> {
void initState() {
super.initState();
if (user == null) {
UserModel.getUser(uid.toString()).then(
(UserModel s) => setState(() => user = s),
);
}
if (scoresModel == null) {
ScoresModel.scoreFrom(uid.toString(), false).then(
(ScoresModel s) => setState(() => scoresModel = s),
ScoresModel.scoreFrom(uid.toString(), true, false).then(
(ScoresModel s) => setState(() {
scoresModel = s;
}),
);
}
}
@@ -50,8 +47,6 @@ class _CitaScreenState extends State<CitaScreen> {
});
}
final User? currentUser = FirebaseAuth.instance.currentUser;
return Scaffold(
appBar: PopAppbar(
onPressed: () {
lib/src/screens/professional.dart
+1 -1
View File
@@ -88,7 +88,7 @@ class Professional {
professionalRef: storage.ref().child(photo),
professionalEspecializado: especializaciones,
ubicacion: data['ubicacion'] ?? '',
scores: await ScoresModel.scoreFrom(uid, true),
scores: await ScoresModel.scoreFrom(uid, true, true),
);
return professional;
}
lib/src/screens/professional_info.dart
+1 -2
View File
@@ -138,8 +138,7 @@ class _ProfessionalInfoScreenState extends State<ProfessionalInfoScreen> {
Navigator.of(context).push(
CupertinoPageRoute(
builder: (BuildContext context) {
return ReputationScreen(
professional: widget.professional);
return ReputationScreen();
},
),
);
lib/src/screens/prueba.dart
-27
View File
@@ -1,27 +0,0 @@
import 'package:flutter/material.dart';
import 'package:prosappco/src/components/drawer_professional.dart';
class PruebaScreen extends StatelessWidget {
const PruebaScreen({super.key});
@override
Widget build(BuildContext context) {
return SafeArea(
child: Scaffold(
appBar: AppBar(
backgroundColor: Colors.white,
iconTheme: const IconThemeData(
color: Colors.black,
),
title: const Text(
'Prueba',
style: TextStyle(
color: Colors.black,
),
),
),
drawer: DrawerProfessional(),
),
);
}
}
lib/src/screens/reputation.dart
+27 -8
View File
@@ -1,19 +1,38 @@
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/components/pop_appbar.dart';
import 'package:prosappco/src/models/scores_model.dart';
import 'package:prosappco/src/screens/professional.dart';
import 'package:prosappco/src/models/user_model.dart';
class ReputationScreen extends StatelessWidget {
Professional professional;
class ReputationScreen extends StatefulWidget {
ReputationScreen({
super.key,
});
ReputationScreen({super.key, required this.professional});
@override
State<ReputationScreen> createState() => _ReputationScreenState();
}
class _ReputationScreenState extends State<ReputationScreen> {
ScoresModel? scoresModel;
@override
void initState() {
super.initState();
final uid = AuthenticationRepository.instance.getCurrentUserUid();
if (scoresModel == null) {
ScoresModel.scoreTo(uid.toString(), true, true).then(
(ScoresModel s) => setState(() => scoresModel = s),
);
}
}
@override
Widget build(BuildContext context) {
return SafeArea(
child: Scaffold(
return Scaffold(
appBar: PopAppbar(
onPressed: () {
Navigator.pop(context);
@@ -22,10 +41,10 @@ class ReputationScreen extends StatelessWidget {
body: SingleChildScrollView(
child: Column(
children: [
..._scoresList(professional.scores.details),
..._scoresList(scoresModel?.details ?? []),
],
)),
));
);
}
List<Widget> _scoresList(List<ScoreDetailModel> list) {
lib/src/screens/solicitudes.dart
+155
View File
@@ -0,0 +1,155 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_rating_bar/flutter_rating_bar.dart';
import 'package:intl/intl.dart';
import 'package:prosappco/src/components/drawer_professional.dart';
import 'package:prosappco/src/models/event_model.dart';
import 'package:prosappco/src/models/scores_model.dart';
import 'package:prosappco/src/screens/cita.dart';
class SolicitudScreen extends StatefulWidget {
SolicitudScreen({super.key});
@override
State<SolicitudScreen> createState() => _SolicitudScreenState();
}
class _SolicitudScreenState extends State<SolicitudScreen> {
DateTime today = DateTime.now();
@override
void initState() {
super.initState();
}
@override
Widget build(BuildContext context) {
return SafeArea(
child: Scaffold(
appBar: AppBar(
backgroundColor: Colors.white,
iconTheme: const IconThemeData(
color: Colors.black,
),
title: const Text(
'Solicitudes',
style: TextStyle(
color: Colors.black,
),
),
),
drawer: DrawerProfessional(),
body: SingleChildScrollView(
child: Column(
children: [
_eventList(),
],
),
),
),
);
}
Widget _eventList() {
return FutureBuilder(
future: getByProIdAll(),
builder: (BuildContext context, AsyncSnapshot<List<Event>> snapshot) {
if (!snapshot.hasData) {
return const Center(
child: CircularProgressIndicator(),
);
}
List<Event> eventos = [];
try {
eventos.addAll(snapshot.data!);
} catch (e) {
print("Error" + e.toString());
}
if (eventos.isEmpty) {
return const Padding(
padding: EdgeInsets.symmetric(vertical: 50),
child: Center(child: Text('No tienes citas')),
);
}
return Column(
children: [
...eventos.map(
(event) => ListTile(
onTap: () {
Navigator.push(
context,
CupertinoPageRoute(
builder: (BuildContext context) {
return CitaScreen(evento: event);
},
),
);
},
leading: Text('${event.range1Hour1}'),
title: RichText(
text: TextSpan(
children: [
TextSpan(
text: '${event.title}, ',
style: const TextStyle(
color: Colors.black,
fontWeight: FontWeight.bold,
fontSize: 16,
),
),
TextSpan(
text: DateFormat('dd MMM', 'es')
.format(DateTime.parse(event.day!)),
style: const TextStyle(
color: Colors.grey,
fontSize: 16,
),
),
],
),
),
subtitle: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
RatingBar.builder(
initialRating: event.scoresModel?.average ?? 0,
minRating: 1,
direction: Axis.horizontal,
allowHalfRating: true,
itemCount: 5,
itemSize: 25,
maxRating: 5,
itemPadding:
const EdgeInsets.symmetric(horizontal: 0),
itemBuilder: (context, _) => const Icon(
Icons.star,
color: Color(0xFF2BA4EC),
),
onRatingUpdate: (rating) {},
ignoreGestures: true,
),
const SizedBox(width: 5),
Text(
'(${event.scoresModel?.total.toString()}) ${event.scoresModel?.average.toString()}'),
],
),
Text(
'" ${event.description} "',
style: const TextStyle(fontStyle: FontStyle.italic),
),
],
),
trailing: const Icon(Icons.keyboard_arrow_right),
),
),
],
);
},
);
}
}