This commit is contained in:
Juan Felipe Duarte
2023-05-10 08:43:40 -05:00
parent eeced3ac66
commit 40ee4f2ab2
30 changed files with 1175 additions and 147 deletions
+6 -1
View File
@@ -17,6 +17,7 @@ class EventoService {
double latitude,
double longitude,
String status,
int? tarifa,
) async {
try {
DateTime ahora = DateTime.now();
@@ -35,7 +36,8 @@ class EventoService {
'latitude': latitude,
'longitude': longitude,
'status': status,
'Timestamp': ahora
'Timestamp': ahora,
'tarifa': tarifa ?? 0,
}).then((value) {
FirebaseFirestore.instance.collection('users').doc(uid).update({
'services': FieldValue.arrayUnion([value.id])
@@ -135,6 +137,7 @@ class Event {
double? latitud;
String status;
ScoresModel? scoresModel;
int? tarifa;
Event({
this.id,
@@ -150,6 +153,7 @@ class Event {
this.longitud,
this.latitud,
this.status = 'pendiente',
this.tarifa,
});
factory Event.fromJson(Map<String, dynamic> json) {
@@ -167,6 +171,7 @@ class Event {
longitud: json['longitude'] ?? 0,
latitud: json['latitude'] ?? 0,
status: json['status'],
tarifa: json['tarifa'] ?? 0,
);
}
+3 -3
View File
@@ -30,7 +30,7 @@ class ScoresModel {
String userReceived, bool isFromClient, bool userInfo) async {
final receivedScoresQuery = FirebaseFirestore.instance
.collection('scores')
.where('is_from_client', isEqualTo: isFromClient)
.where('is_from_professional', isEqualTo: isFromClient)
.where('to_user', isEqualTo: userReceived);
final receivedScoresSnapshot = await receivedScoresQuery.get();
@@ -48,7 +48,7 @@ class ScoresModel {
String userGiven, bool isFromClient, bool userInfo) async {
final givenScoresQuery = FirebaseFirestore.instance
.collection('scores')
.where('is_from_client', isEqualTo: isFromClient)
.where('is_from_professional', isEqualTo: isFromClient)
.where('from_user', isEqualTo: userGiven);
final givenScoresSnapshot = await givenScoresQuery.get();
@@ -101,7 +101,7 @@ class ScoreDetailModel {
fromUser: data['from_user'],
toUser: data['to_user'],
comment: data['comment'],
isFromClient: data['is_from_client'],
isFromClient: data['is_from_professional'],
name: user?.name ?? "...",
avatar: user?.photo);
} catch (e) {
+42 -5
View File
@@ -3,17 +3,51 @@ import 'package:cloud_firestore/cloud_firestore.dart';
class SettingModel {
final bool domicilios;
final bool tarifas;
final String titulo;
final String parrafo;
final String numero;
final String email;
final String dias;
final String horas;
final String version;
final String proliticasPrivacidad;
final String terminosCondiciones;
SettingModel(this.domicilios, this.tarifas);
SettingModel(
this.domicilios,
this.tarifas,
this.titulo,
this.parrafo,
this.numero,
this.email,
this.dias,
this.horas,
this.version,
this.proliticasPrivacidad,
this.terminosCondiciones,
);
static Future<SettingModel> fromJson(Map<String, dynamic> json) async {
try {
if (json == null) return SettingModel(false, false);
if (json == null)
return SettingModel(false, false, '', '', '', '', '', '', '', '', '');
return SettingModel(json['domicilio'], json['tarifa']);
return SettingModel(
json['domicilio'],
json['tarifa'],
json['titulo_soporte'],
json['parrafo_soporte'],
json['numero_soporte'],
json['email_soporte'],
json['dias_soporte'],
json['horas_soporte'],
json['version'],
json['politicas_privacidad'],
json['terminos_condiciones'],
);
} catch (e) {
print('Error settings: $e');
return SettingModel(false, false);
return SettingModel(false, false, '', '', '', '', '', '', '', '', '');
}
}
@@ -24,11 +58,14 @@ class SettingModel {
.collection('settings')
.doc('global')
.get();
final Map<String, dynamic>? data = snapshot.data();
print('data $data');
return fromJson(data!);
} catch (e) {
print('Error getting settings: $e');
return SettingModel(false, false);
return SettingModel(false, false, '', '', '', '', '', '', '', '', '');
}
}
}
+12 -10
View File
@@ -8,25 +8,27 @@ class UserModel {
final String? profession;
final String? state;
final Reference? photo;
final int? tarifa;
UserModel(this.name, this.city, this.profession, this.state, this.photo);
UserModel(this.name, this.city, this.profession, this.state, this.photo,
this.tarifa);
static Future<UserModel> fromJson(
Map<String, dynamic>? json, String uid) async {
try {
if (json == null) return UserModel('', '', '', null, null);
if (json == null) return UserModel('', '', '', null, null, 0);
String? avatar = json['photo'];
return UserModel(
json['name'],
json['city'],
json['profesion'],
json['estado'],
avatar != null ? storage.ref().child(avatar) : null,
);
json['name'],
json['city'],
json['profesion'],
json['estado'],
avatar != null ? storage.ref().child(avatar) : null,
json['tarifa'] ?? 0);
} catch (e) {
print('XD user $e');
return UserModel('', '', '', null, null);
return UserModel('', '', '', null, null, 0);
}
}
@@ -38,7 +40,7 @@ class UserModel {
return fromJson(data, uid);
} catch (e) {
print('Error getting user: $e');
return UserModel('', '', '', null, null);
return UserModel('', '', '', null, null, 0);
}
}
}