verdnatura/vn-warehouse
verdnatura
/
vn-warehouse
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

version 23.38Beta

This commit is contained in:
Sergio De la torre 2023-09-19 10:49:02 +02:00
parent 2ddbd2d903
commit bef565c064
9 changed files with 143 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

229
.idea/workspace.xml
View File

@ -82,52 +82,16 @@
</select>
</component>
<component name="ChangeListManager">
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #5996 cmrAdd">
<change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixCallback.kt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/activity/SignedActivity.kt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/ic_sign.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/ic_sign_ticket.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/ic_sort.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_sign.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/assetWizardSettings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/assetWizardSettings.xml" afterDir="false" />
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #4677 add scan manual">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/beta/release/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/beta/release/output-metadata.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/db/database.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/db/database.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixService.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SilexCallback.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SilexCallback.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseActivity.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/ToolBarAdapterTooltip.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/ToolBarAdapterTooltip.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/UICallbacks.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/UICallbacks.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/UIExtensions.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/UIExtensions.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoUsuarioFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoUsuarioFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/RouteAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/RouteAdapter.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/TicketAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/TicketAdapter.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LoadUnloadFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LoadUnloadFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/RoutesFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/RoutesFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/ClientTicket.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/ClientTicket.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DatabaseViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DatabaseViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryParkingFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryParkingFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/model/ItemInventaryVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/model/ItemInventaryVO.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_inventory_parking.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_inventory_parking.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_tickets.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_tickets.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_route_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_route_row.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_ticket_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_ticket_row.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_ticket_sub_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_ticket_sub_row.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values-fr/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-fr/strings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values-pt/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-pt/strings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values/styles.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/styles.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -138,7 +102,7 @@
<component name="CodeInsightWorkspaceSettings">
<option name="optimizeImportsOnTheFly" value="true" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\sergiodt\.android\avd\Pixel_6_API_30.avd]" />
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[21114523025303]" />
<component name="ExportToHTMLSettings">
<option name="OPEN_IN_BROWSER" value="true" />
<option name="OUTPUT_DIRECTORY" value="C:\Program Files\Android\Android Studio\inspections" />
@ -235,7 +199,7 @@
</option>
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
<entry key="$PROJECT_DIR$" value="dev-5613_no_guardar_user" />
<entry key="$PROJECT_DIR$" value="dev" />
</map>
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@ -298,7 +262,7 @@
"com.developerphil.adbidea.selecteddevices": "21114523025303",
"com.google.services.firebase.aqiPopupShown": "true",
"last_directory_selection": "C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable",
"last_opened_file_path": "C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout",
"last_opened_file_path": "C:/Users/sergiodt/Downloads/AJVoIPTest/AJVoIPTest",
"project.structure.last.edited": "Project",
"project.structure.proportion": "0.17",
"project.structure.side.proportion": "0.2",
@ -307,7 +271,7 @@
},
"keyToStringList": {
"ExportApk.BuildVariants": [
"betaRelease"
"generalRelease"
],
"com.android.tools.idea.sqlite.queryhistory": [
"delete from expedition;",
@ -463,76 +427,6 @@
<option name="presentableId" value="Default" />
<updated>1618825571576</updated>
</task>
<task id="LOCAL-00131" summary="refs #4979">
<created>1682575765188</created>
<option name="number" value="00131" />
<option name="presentableId" value="LOCAL-00131" />
<option name="project" value="LOCAL" />
<updated>1682575765188</updated>
</task>
<task id="LOCAL-00132" summary="refs #4815">
<created>1683107082308</created>
<option name="number" value="00132" />
<option name="presentableId" value="LOCAL-00132" />
<option name="project" value="LOCAL" />
<updated>1683107082308</updated>
</task>
<task id="LOCAL-00133" summary="refs #5430">
<created>1683114511357</created>
<option name="number" value="00133" />
<option name="presentableId" value="LOCAL-00133" />
<option name="project" value="LOCAL" />
<updated>1683114511357</updated>
</task>
<task id="LOCAL-00134" summary="refs #5442">
<created>1683183005751</created>
<option name="number" value="00134" />
<option name="presentableId" value="LOCAL-00134" />
<option name="project" value="LOCAL" />
<updated>1683183005751</updated>
</task>
<task id="LOCAL-00135" summary="refs #4902 retrocompatibilidad etd-eta">
<created>1684304895723</created>
<option name="number" value="00135" />
<option name="presentableId" value="LOCAL-00135" />
<option name="project" value="LOCAL" />
<updated>1684304895724</updated>
</task>
<task id="LOCAL-00136" summary="refs #5618 traducciones">
<created>1684997085511</created>
<option name="number" value="00136" />
<option name="presentableId" value="LOCAL-00136" />
<option name="project" value="LOCAL" />
<updated>1684997085512</updated>
</task>
<task id="LOCAL-00137" summary="refs #5071 summaryFragment">
<created>1684999085300</created>
<option name="number" value="00137" />
<option name="presentableId" value="LOCAL-00137" />
<option name="project" value="LOCAL" />
<updated>1684999085300</updated>
</task>
<task id="LOCAL-00138" summary="refs #4678 Carga/descarga">
<created>1684999128361</created>
<option name="number" value="00138" />
<option name="presentableId" value="LOCAL-00138" />
<option name="project" value="LOCAL" />
<updated>1684999128361</updated>
</task>
<task id="LOCAL-00139" summary="refs #4678 Carga/descarga">
<created>1684999166457</created>
<option name="number" value="00139" />
<option name="presentableId" value="LOCAL-00139" />
<option name="project" value="LOCAL" />
<updated>1684999166457</updated>
</task>
<task id="LOCAL-00140" summary="refs #5675 fallo parking">
<created>1684999232201</created>
<option name="number" value="00140" />
<option name="presentableId" value="LOCAL-00140" />
<option name="project" value="LOCAL" />
<updated>1684999232201</updated>
</task>
<task id="LOCAL-00141" summary="refs #5618 traducciones">
<created>1685001238898</created>
<option name="number" value="00141" />
@ -806,7 +700,77 @@
<option name="project" value="LOCAL" />
<updated>1691481694750</updated>
</task>
<option name="localTasksCounter" value="180" />
<task id="LOCAL-00180" summary="refs #5998 modify imageError">
<created>1693476791383</created>
<option name="number" value="00180" />
<option name="presentableId" value="LOCAL-00180" />
<option name="project" value="LOCAL" />
<updated>1693476791384</updated>
</task>
<task id="LOCAL-00181" summary="refs #5764 modify dayOfSale">
<created>1694769010620</created>
<option name="number" value="00181" />
<option name="presentableId" value="LOCAL-00181" />
<option name="project" value="LOCAL" />
<updated>1694769010621</updated>
</task>
<task id="LOCAL-00182" summary="refs #5134 Refactor silex→salix">
<created>1695100583023</created>
<option name="number" value="00182" />
<option name="presentableId" value="LOCAL-00182" />
<option name="project" value="LOCAL" />
<updated>1695100583024</updated>
</task>
<task id="LOCAL-00183" summary="refs #4677 Modificar pantalla delivery en picking">
<created>1695100788673</created>
<option name="number" value="00183" />
<option name="presentableId" value="LOCAL-00183" />
<option name="project" value="LOCAL" />
<updated>1695100788673</updated>
</task>
<task id="LOCAL-00184" summary="refs #5652 Botones dinámicos">
<created>1695100832241</created>
<option name="number" value="00184" />
<option name="presentableId" value="LOCAL-00184" />
<option name="project" value="LOCAL" />
<updated>1695100832241</updated>
</task>
<task id="LOCAL-00185" summary="refs #4815 interacción">
<created>1695101289796</created>
<option name="number" value="00185" />
<option name="presentableId" value="LOCAL-00185" />
<option name="project" value="LOCAL" />
<updated>1695101289796</updated>
</task>
<task id="LOCAL-00186" summary="refs #5224 serialNumber">
<created>1695105071093</created>
<option name="number" value="00186" />
<option name="presentableId" value="LOCAL-00186" />
<option name="project" value="LOCAL" />
<updated>1695105071093</updated>
</task>
<task id="LOCAL-00187" summary="refs #5134 silex→salix">
<created>1695105587728</created>
<option name="number" value="00187" />
<option name="presentableId" value="LOCAL-00187" />
<option name="project" value="LOCAL" />
<updated>1695105587728</updated>
</task>
<task id="LOCAL-00188" summary="refs varios">
<created>1695105693226</created>
<option name="number" value="00188" />
<option name="presentableId" value="LOCAL-00188" />
<option name="project" value="LOCAL" />
<updated>1695105693226</updated>
</task>
<task id="LOCAL-00189" summary="refs #4677 add scan manual">
<created>1695105770477</created>
<option name="number" value="00189" />
<option name="presentableId" value="LOCAL-00189" />
<option name="project" value="LOCAL" />
<updated>1695105770477</updated>
</task>
<option name="localTasksCounter" value="190" />
<servers />
</component>
<component name="Vcs.Log.History.Properties">
@ -848,7 +812,7 @@
<entry key="branch">
<value>
<list>
<option value="dev_5057_nuevoSacado" />
<option value="testBeta" />
</list>
</value>
</entry>
@ -907,16 +871,6 @@
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="refs #5764 Añadir onclick pantalla Día de venta" />
<MESSAGE value="refs #5322 Nature" />
<MESSAGE value="strings" />
<MESSAGE value="Translation" />
<MESSAGE value="refs #5513" />
<MESSAGE value="refs #5713" />
<MESSAGE value="refs #5322 NaturePhotos" />
<MESSAGE value="version 23.24Beta" />
<MESSAGE value="Error codigo barras largo" />
<MESSAGE value="Actualizaciones" />
<MESSAGE value="refs #5339" />
<MESSAGE value="refs #4678" />
<MESSAGE value="version 23.26 refs #4678" />
@ -932,26 +886,31 @@
<MESSAGE value="version 23.30Beta" />
<MESSAGE value="refs #5652 add dynamic buttons for mermas" />
<MESSAGE value="refs #5996 cmrAdd" />
<option name="LAST_COMMIT_MESSAGE" value="refs #5996 cmrAdd" />
<MESSAGE value="refs #5998 modify imageError" />
<MESSAGE value="refs #5764 modify dayOfSale" />
<MESSAGE value="refs #5134 Refactor silex→salix" />
<MESSAGE value="refs #4677 Modificar pantalla delivery en picking" />
<MESSAGE value="refs #5652 Botones dinámicos" />
<MESSAGE value="refs #4815 interacción" />
<MESSAGE value="refs #5224 serialNumber" />
<MESSAGE value="refs #5134 silex→salix" />
<MESSAGE value="refs varios" />
<MESSAGE value="refs #4677 add scan manual" />
<option name="LAST_COMMIT_MESSAGE" value="refs #4677 add scan manual" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt</url>
<line>457</line>
<line>475</line>
<option name="timeStamp" value="3" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt</url>
<line>525</line>
<line>530</line>
<option name="timeStamp" value="6" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/ApiSalixUtils.kt</url>
<line>48</line>
<option name="timeStamp" value="13" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/ApiUtils.kt</url>
<line>48</line>
@ -959,12 +918,12 @@
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt</url>
<line>121</line>
<line>122</line>
<option name="timeStamp" value="18" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt</url>
<line>259</line>
<line>260</line>
<option name="timeStamp" value="52" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">

4
app/beta/release/output-metadata.json
View File

@ -11,8 +11,8 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 227,
"versionName": "23.36Beta",
"versionCode": 228,
"versionName": "23.38Beta",
"outputFile": "app-beta-release.apk"
}
],

4
app/build.gradle
View File

@ -13,8 +13,8 @@ android {
applicationId "es.verdnatura"
minSdkVersion 24 //21
targetSdkVersion 33
versionCode 223
versionName = "23.30.1Beta" //Esta rama viene de esta version
versionCode 228
versionName = "23.38Beta"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

7
app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt
View File

@ -4,6 +4,7 @@ import android.app.AlertDialog
import android.content.Intent
import android.graphics.drawable.Drawable
import android.os.Build
import android.text.InputType
import android.view.View
import android.view.View.GONE
import android.view.inputmethod.EditorInfo
@ -435,7 +436,7 @@ class ItemCardFragment(
.setOkButton(getString(R.string.save)) {
ma.hideKeyboard(customDialogInput.getEditText())
//Tarea 6182
//Tarea 6182
try {
editItemCardRow(item, customDialogInput.getValue().toInt())
} catch (ex: Exception) {
@ -512,7 +513,9 @@ class ItemCardFragment(
false
}
} else if (item.action == "itemStockUpdateRemove") {
println("Vamos a indicar la cantidad a falta/basura")
customDialogInput.getEditText().setRawInputType(
InputType.TYPE_CLASS_NUMBER
)
customDialogInput.setTitle(item.title!!)
.setDescription(getString(R.string.quantityToUnregister))
.setOkButton(getString(R.string.save)) {

64
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
View File

@ -173,6 +173,7 @@ class UbicadorFragment(
ItemUbicadorVO(0),
""
)
iconReload.drawable -> {
if (!shelvingFk.isNullOrEmpty()) {
@ -188,6 +189,7 @@ class UbicadorFragment(
)
}
}
iconChecker.drawable -> {
if (!shelvingFk.isNullOrEmpty()) {
ma.onPasillerosItemClickListener(
@ -201,7 +203,8 @@ class UbicadorFragment(
)
}
}
iconReset.drawable->{
iconReset.drawable -> {
customDialog.setTitle(getString(R.string.checkItemShelvingDescrip))
.setDescription(getString(R.string.checkItemShelving))
.setOkButton(getString(R.string.cancel)) {
@ -737,34 +740,39 @@ class UbicadorFragment(
.setGroupingValue(grouping).setEtiquetaValue(etiquetas).setVisibleValue(visible)
.setOkButton(getString(R.string.save)) {
var packingUpdate = false
if (packing != customDialogUbicador.getPackingValue() || etiquetas != customDialogUbicador.getEtiquetaValue()) {
packingUpdate = true
}
saveNewItem(
customDialogUbicador.getItemValue().toInt(),
if (customDialogUbicador.getEtiquetaValue().isNullOrEmpty()) {
1
} else {
customDialogUbicador.getEtiquetaValue().toInt()
},
if (customDialogUbicador.getPackingValue().isNullOrEmpty()) {
null
} else {
customDialogUbicador.getPackingValue().toInt()
},
if (customDialogUbicador.getVisibleValue().isNullOrEmpty()) {
null
} else {
customDialogUbicador.getVisibleValue().toInt()
},
if (delete) packingUpdate else null,
itemUbicador.id,
if (customDialogUbicador.getGroupingValue().isNullOrEmpty()) {
null
} else {
customDialogUbicador.getGroupingValue().toInt()
if (customDialogUbicador.getItemValue().isNullOrEmpty()) {
getString(R.string.itemNecessary).toast(context)
} else {
if (packing != customDialogUbicador.getPackingValue() || etiquetas != customDialogUbicador.getEtiquetaValue()) {
packingUpdate = true
}
)
saveNewItem(
customDialogUbicador.getItemValue().toInt(),
if (customDialogUbicador.getEtiquetaValue().isNullOrEmpty()) {
1
} else {
customDialogUbicador.getEtiquetaValue().toInt()
},
if (customDialogUbicador.getPackingValue().isNullOrEmpty()) {
null
} else {
customDialogUbicador.getPackingValue().toInt()
},
if (customDialogUbicador.getVisibleValue().isNullOrEmpty()) {
null
} else {
customDialogUbicador.getVisibleValue().toInt()
},
if (delete) packingUpdate else null,
itemUbicador.id,
if (customDialogUbicador.getGroupingValue().isNullOrEmpty()) {
null
} else {
customDialogUbicador.getGroupingValue().toInt()
}
)
}
}.setKoButton(getString(R.string.close)) {
customDialogUbicador.dismiss()
}.show()

1
app/src/main/res/values-es/strings.xml
View File

@ -658,6 +658,7 @@
<string name="permissionRequired">Permiso de Ubicación Requerido</string>
<string name="advicePermission">Para usar esta aplicación, debes otorgar permisos de ubicación.</string>
<string name="manuallyPermission">Habilita manualmente el permiso de ubicación.</string>
<string name="itemNecessary">El campo item es obligatorio</string>
</resources>

1
app/src/main/res/values-fr/strings.xml
View File

@ -658,5 +658,6 @@
<string name="permissionRequired">Permission de Localisation Requise</string>
<string name="advicePermission">Pour utiliser cette application, vous devez accorder des autorisations de localisation.</string>
<string name="manuallyPermission">Activez manuellement l\'autorisation de localisation.</string>
<string name="itemNecessary">Le champ \'item\' est requis</string>
</resources>

1
app/src/main/res/values-pt/strings.xml
View File

@ -658,5 +658,6 @@
<string name="permissionRequired">Permissão de Localização Necessária</string>
<string name="advicePermission">Para usar este aplicativo, você deve conceder permissões de localização.</string>
<string name="manuallyPermission">Habilite manualmente a permissão de localização.</string>
<string name="itemNecessary">O campo \'item\' é obrigatório</string>
</resources>

1
app/src/main/res/values/strings.xml
View File

@ -657,5 +657,6 @@
<string name="permissionRequired">Location Permission Required</string>
<string name="advicePermission">To use this application, you must grant location permissions.</string>
<string name="manuallyPermission">Manually Enable Location Permission.</string>
<string name="itemNecessary">Item fiels is required</string>
</resources>