Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aggiunta migration descrizione righe inv

Browse Source
This commit is contained in:
Valerio Castellana 2022-11-21 09:37:42 +01:00
parent 9b5beeb028
commit b127130bc7
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/it/integry/integrywmsnative/core/data_store/db/AppDatabase.java
View File

@ -39,7 +39,7 @@ import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
InventarioRoomDTO.class, InventarioRoomDTO.class,
InventarioRowRoomDTO.class InventarioRowRoomDTO.class
}, },
version = 14, version = 15,
exportSchema = true) exportSchema = true)
@TypeConverters({ @TypeConverters({
DateConverter.class, DateConverter.class,
@ -66,7 +66,8 @@ public abstract class AppDatabase extends RoomDatabase {
.addMigrations(MIGRATION_10_11) .addMigrations(MIGRATION_10_11)
.addMigrations(MIGRATION_11_12) .addMigrations(MIGRATION_11_12)
.addMigrations(MIGRATION_12_13) .addMigrations(MIGRATION_12_13)
.addMigrations(MIGRATION_13_14); .addMigrations(MIGRATION_13_14)
.addMigrations(MIGRATION_14_15);
sInstance = builder.build(); sInstance = builder.build();
} }
@ -97,7 +98,7 @@ public abstract class AppDatabase extends RoomDatabase {
database.execSQL("CREATE INDEX IF NOT EXISTS index_inventari__id ON inventari (_id)"); database.execSQL("CREATE INDEX IF NOT EXISTS index_inventari__id ON inventari (_id)");
} }
}; };
static final Migration MIGRATION_11_12 = new Migration(11, 12) { static final Migration MIGRATION_11_12 = new Migration(11, 12) {
@Override @Override
public void migrate(SupportSQLiteDatabase database) { public void migrate(SupportSQLiteDatabase database) {
@ -105,14 +106,14 @@ public abstract class AppDatabase extends RoomDatabase {
database.execSQL("CREATE INDEX IF NOT EXISTS index_inventari_id_inventario ON inventari (id_inventario)"); database.execSQL("CREATE INDEX IF NOT EXISTS index_inventari_id_inventario ON inventari (id_inventario)");
} }
}; };
static final Migration MIGRATION_12_13 = new Migration(12, 13) { static final Migration MIGRATION_12_13 = new Migration(12, 13) {
@Override @Override
public void migrate(SupportSQLiteDatabase database) { public void migrate(SupportSQLiteDatabase database) {
database.execSQL("ALTER TABLE inventari ADD COLUMN zona TEXT"); database.execSQL("ALTER TABLE inventari ADD COLUMN zona TEXT");
} }
}; };
static final Migration MIGRATION_13_14 = new Migration(13, 14) { static final Migration MIGRATION_13_14 = new Migration(13, 14) {
@Override @Override
public void migrate(SupportSQLiteDatabase database) { public void migrate(SupportSQLiteDatabase database) {
@ -121,6 +122,12 @@ public abstract class AppDatabase extends RoomDatabase {
database.execSQL("CREATE INDEX IF NOT EXISTS index_inventario_rows__parent_id ON inventario_rows (parent_id)"); database.execSQL("CREATE INDEX IF NOT EXISTS index_inventario_rows__parent_id ON inventario_rows (parent_id)");
} }
}; };
static final Migration MIGRATION_14_15 = new Migration(14, 15) {
@Override
public void migrate(SupportSQLiteDatabase database) {
database.execSQL("ALTER TABLE inventario_rows ADD COLUMN descrizione TEXT");
}
};
} }

14
app/src/main/java/it/integry/integrywmsnative/gest/inventario/ElencoInventariViewModel.java
View File

@ -9,10 +9,10 @@ import it.integry.integrywmsnative.core.data_store.db.respository_new.Inventario
import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.core.expansion.RunnableArgss; import it.integry.integrywmsnative.core.expansion.RunnableArgss;
import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener; import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
import it.integry.integrywmsnative.core.rest.consumers.InventarioRESTConsumer;
import it.integry.integrywmsnative.core.rest.model.inventario.InventarioArtDTO; import it.integry.integrywmsnative.core.rest.model.inventario.InventarioArtDTO;
import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.settings.SettingsManager;
import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityDate;
import it.integry.integrywmsnative.core.rest.consumers.InventarioRESTConsumer;
public class ElencoInventariViewModel { public class ElencoInventariViewModel {
@ -56,7 +56,8 @@ public class ElencoInventariViewModel {
inventarioRESTConsumer.loadInventario(inventoryId, loadedInventario -> { inventarioRESTConsumer.loadInventario(inventoryId, loadedInventario -> {
this.sendOnLoadingEnded(); this.sendOnLoadingEnded();
if(loadedInventario == null || loadedInventario.getMtbInvent() == null) this.sendCreateInventarioRequest(inventoryId, zone); if (loadedInventario == null || loadedInventario.getMtbInvent() == null)
this.sendCreateInventarioRequest(inventoryId, zone);
else this.createNewInventario(inventoryId, zone, (inventarioRoom, listaArts) -> { else this.createNewInventario(inventoryId, zone, (inventarioRoom, listaArts) -> {
}); });
@ -65,7 +66,6 @@ public class ElencoInventariViewModel {
} }
public void loadInventarioData(long inventoryId, RunnableArgs<List<InventarioArtDTO>> onComplete) { public void loadInventarioData(long inventoryId, RunnableArgs<List<InventarioArtDTO>> onComplete) {
this.sendOnLoadingStarted(); this.sendOnLoadingStarted();
inventarioRESTConsumer.loadInventarioArts(inventoryId, inventarioArts -> { inventarioRESTConsumer.loadInventarioArts(inventoryId, inventarioArts -> {
@ -76,7 +76,6 @@ public class ElencoInventariViewModel {
} }
public void createNewInventario(long inventoryId, String zone, RunnableArgss<InventarioRoomDTO, List<InventarioArtDTO>> onComplete) { public void createNewInventario(long inventoryId, String zone, RunnableArgss<InventarioRoomDTO, List<InventarioArtDTO>> onComplete) {
this.sendOnLoadingStarted(); this.sendOnLoadingStarted();
@ -97,13 +96,6 @@ public class ElencoInventariViewModel {
} }
public void setListener(Listener listener) { public void setListener(Listener listener) {
this.listener = listener; this.listener = listener;
} }