Solucion final sprint 1

isunican · Oct 24, 2024 · 76d6f2e · 76d6f2e
1 parent 411cf5e
commit 76d6f2e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/...main/java/es/unican/gasolineras/activities/RegistrarRepostajeMenu/RegistrarPresenter.java b/...main/java/es/unican/gasolineras/activities/RegistrarRepostajeMenu/RegistrarPresenter.java
@@ -52,8 +52,8 @@ public void onBtnGuardarClicked(String litros, String precioTotal) {
 
         try {
             // Conversión de litros y precio total
-            double litrosNum = Double.parseDouble(litros);
-            double precioTotalNum = Double.parseDouble(precioTotal);
+            double litrosNum = Double.parseDouble(litros.replace(",","."));
+            double precioTotalNum = Double.parseDouble(precioTotal.replace(",","."));
 
             // Validar que los valores sean positivos
             if (litrosNum <= 0 || precioTotalNum <= 0) {
@@ -90,13 +90,13 @@ public void onBtnGuardarClicked(String litros, String precioTotal) {
             errorPrecioTotal = false;
 
             try{
-                Double.parseDouble(litros);
+                Double.parseDouble(litros.replace(",","."));
             }catch(NumberFormatException ex) {
                 errorLitros = true;
             }
 
             try{
-                Double.parseDouble(precioTotal);
+                Double.parseDouble(precioTotal.replace(",","."));
             }catch(NumberFormatException ex) {
                 errorPrecioTotal = true;
             }

diff --git a/AndroidProject/app/src/main/java/es/unican/gasolineras/model/Gasolinera.java b/AndroidProject/app/src/main/java/es/unican/gasolineras/model/Gasolinera.java
@@ -64,10 +64,10 @@ public String  getHorario() {
     }
 
     public double getGasoleoA() {
-        return Double.parseDouble(String.format("%.2f", gasoleoA));
+        return Double.parseDouble(String.format("%.2f", gasoleoA).replace(",","."));
     }
 
     public double getGasolina95E5() {
-        return Double.parseDouble(String.format("%.2f",gasolina95E5));
+        return Double.parseDouble(String.format("%.2f",gasolina95E5).replace(",","."));
     }
 }
diff --git a/AndroidProject/app/src/main/java/es/unican/gasolineras/repository/AppDatabase.java b/AndroidProject/app/src/main/java/es/unican/gasolineras/repository/AppDatabase.java
@@ -7,7 +7,7 @@
 import es.unican.gasolineras.model.Repostaje;
 import lombok.Getter;
 
-@Database(entities = {Repostaje.class}, version = 1)
+@Database(entities = {Repostaje.class}, version = 2)
 public abstract class AppDatabase extends RoomDatabase {
     public abstract RepostajeDAO repostajeDao();
 

diff --git a/AndroidProject/app/src/main/java/es/unican/gasolineras/repository/DatabaseFunction.java b/AndroidProject/app/src/main/java/es/unican/gasolineras/repository/DatabaseFunction.java
@@ -14,6 +14,7 @@ public static AppDatabase getDatabase(Context context) {
             database = Room.databaseBuilder(context.getApplicationContext(),
                             AppDatabase.class, "database-name")
                     .allowMainThreadQueries()
+                    .fallbackToDestructiveMigration()
                     .build();
         }
         return database;

diff --git a/AndroidProject/app/src/main/res/layout/activity_consulta_repostaje_list_item_view.xml b/AndroidProject/app/src/main/res/layout/activity_consulta_repostaje_list_item_view.xml
@@ -34,7 +34,7 @@
         android:textSize="20sp"
         app:layout_constraintStart_toStartOf="@+id/tvLitrosNum"
         app:layout_constraintTop_toBottomOf="@+id/tvLitrosNum"
-        tools:text="1,432" />
+        tools:text="1.432" />
 
     <TextView
         android:id="@+id/litrosTexto"

diff --git a/AndroidProject/app/src/main/res/layout/activity_consulta_repostaje_view.xml b/AndroidProject/app/src/main/res/layout/activity_consulta_repostaje_view.xml
@@ -59,7 +59,7 @@
         android:textSize="24sp"
         app:layout_constraintStart_toStartOf="@+id/tvRepostajesMes"
         app:layout_constraintTop_toBottomOf="@+id/tvRepostajesMes"
-        tools:text="1,534" />
+        tools:text="1.534" />
 
     <TextView
         android:id="@+id/resumenMes"