feat issues refs #7636
This commit is contained in:
parent
6c3952d10d
commit
9ccc8e83b3
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="AnalysisUIOptions">
|
<component name="AnalysisUIOptions">
|
||||||
<option name="SPLITTER_PROPORTION" value="0.5641026" />
|
<option name="SPLITTER_PROPORTION" value="0.39301553" />
|
||||||
<option name="GROUP_BY_SEVERITY" value="true" />
|
<option name="GROUP_BY_SEVERITY" value="true" />
|
||||||
<option name="CUSTOM_SCOPE_NAME" value="All Places" />
|
<option name="CUSTOM_SCOPE_NAME" value="All Places" />
|
||||||
<option name="SHOW_STRUCTURE" value="true" />
|
<option name="SHOW_STRUCTURE" value="true" />
|
||||||
|
@ -49,6 +49,11 @@
|
||||||
<theme>@style/AppTheme</theme>
|
<theme>@style/AppTheme</theme>
|
||||||
</config>
|
</config>
|
||||||
</layout>
|
</layout>
|
||||||
|
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_sign.xml">
|
||||||
|
<config>
|
||||||
|
<theme>@style/AppTheme</theme>
|
||||||
|
</config>
|
||||||
|
</layout>
|
||||||
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/component_custom_edit_dialog.xml">
|
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/component_custom_edit_dialog.xml">
|
||||||
<config>
|
<config>
|
||||||
<theme>@style/AppTheme</theme>
|
<theme>@style/AppTheme</theme>
|
||||||
|
@ -260,6 +265,11 @@
|
||||||
<theme>@style/AppTheme</theme>
|
<theme>@style/AppTheme</theme>
|
||||||
</config>
|
</config>
|
||||||
</layout>
|
</layout>
|
||||||
|
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/item_ubication_row.xml">
|
||||||
|
<config>
|
||||||
|
<theme>@style/AppTheme</theme>
|
||||||
|
</config>
|
||||||
|
</layout>
|
||||||
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/sale_row_fragment.xml">
|
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/sale_row_fragment.xml">
|
||||||
<config>
|
<config>
|
||||||
<theme>@style/AppTheme</theme>
|
<theme>@style/AppTheme</theme>
|
||||||
|
@ -312,33 +322,45 @@
|
||||||
</select>
|
</select>
|
||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="feat issues refs #7636">
|
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="feat reservas #refs 6861">
|
||||||
<change afterPath="$PROJECT_DIR$/app/general/release/baselineProfiles/0/app-general-release.dm" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/deploymentTargetDropDown.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deploymentTargetDropDown.xml" afterDir="false" />
|
||||||
<change afterPath="$PROJECT_DIR$/app/general/release/baselineProfiles/1/app-general-release.dm" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/appInsightsSettings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/appInsightsSettings.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/assetWizardSettings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/assetWizardSettings.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<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/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/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/ApiSalixUtils.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/ApiSalixUtils.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/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/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNew.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNew.kt" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/SalixBackItems.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/SalixBackItems.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/common/UtilFunctions.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/UtilFunctions.kt" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/itemScanned.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/itemScanned.kt" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/testing/testPrint.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/testing/testPrint.kt" 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/articulo/fragment/ItemCardViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/CollectionVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/CollectionVO.kt" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapterNew.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapterNew.kt" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/adapter/ItemShelvingLogAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/adapter/ItemShelvingLogAdapter.kt" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogFragment.kt" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/activity/SignedActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/activity/SignedActivity.kt" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogViewModel.kt" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/ExpeditionSummaryAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/ExpeditionSummaryAdapter.kt" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/model/ItemShelvingLog.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/model/ItemShelvingLog.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/inventario/adapter/InventoryAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryAdapter.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/login/model/LoginItemVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/model/LoginItemVO.kt" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/model/errorMessage.kt" beforeDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/modelViewModel/FragmentsViewModel.kt" beforeDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroFragment.kt" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/EntrySalix.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/EntrySalix.kt" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/SectorCollectionReserveFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/SectorCollectionReserveFragment.kt" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/SectorCollectionReserveFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/SectorCollectionReserveFragment.kt" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragmentNew.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragmentNew.kt" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_shelvinglog_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_shelvinglog_row.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ticket/fragment/TicketViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ticket/fragment/TicketViewModel.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/java/es/verdnatura/presentation/view/feature/workermistake/adapter/WorkermistakeAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/adapter/WorkermistakeAdapter.kt" 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/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeFragment.kt" 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$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
|
|
||||||
</list>
|
</list>
|
||||||
<list id="7b98f93d-6980-4bf1-8e61-c7afd10e56f2" name="Change_category" comment="Change_category" />
|
<list id="7b98f93d-6980-4bf1-8e61-c7afd10e56f2" name="Change_category" comment="Change_category" />
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
|
@ -353,7 +375,7 @@
|
||||||
<component name="CodeInsightWorkspaceSettings">
|
<component name="CodeInsightWorkspaceSettings">
|
||||||
<option name="optimizeImportsOnTheFly" value="true" />
|
<option name="optimizeImportsOnTheFly" value="true" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[23086B3FFD]" />
|
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\sergiodt\.android\avd\Pixel_7a_API_30.avd]" />
|
||||||
<component name="ExportToHTMLSettings">
|
<component name="ExportToHTMLSettings">
|
||||||
<option name="OPEN_IN_BROWSER" value="true" />
|
<option name="OPEN_IN_BROWSER" value="true" />
|
||||||
<option name="OUTPUT_DIRECTORY" value="C:\Program Files\Android\Android Studio\inspections" />
|
<option name="OUTPUT_DIRECTORY" value="C:\Program Files\Android\Android Studio\inspections" />
|
||||||
|
@ -371,12 +393,7 @@
|
||||||
</task>
|
</task>
|
||||||
<projects_view>
|
<projects_view>
|
||||||
<tree_state>
|
<tree_state>
|
||||||
<expand>
|
<expand />
|
||||||
<path>
|
|
||||||
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
|
|
||||||
<item name="Gestor Almacén" type="f1a62948:ProjectNode" />
|
|
||||||
</path>
|
|
||||||
</expand>
|
|
||||||
<select />
|
<select />
|
||||||
</tree_state>
|
</tree_state>
|
||||||
</projects_view>
|
</projects_view>
|
||||||
|
@ -503,57 +520,62 @@
|
||||||
<option name="showLibraryContents" value="true" />
|
<option name="showLibraryContents" value="true" />
|
||||||
<option name="showMembers" value="true" />
|
<option name="showMembers" value="true" />
|
||||||
</component>
|
</component>
|
||||||
<component name="PropertiesComponent">{
|
<component name="PropertiesComponent"><![CDATA[{
|
||||||
"keyToString": {
|
"keyToString": {
|
||||||
"Android App.app.executor": "Run",
|
"Android App.app.executor": "Run",
|
||||||
"ApkExportedModule": "Gestor_Almacén.app",
|
"ApkExportedModule": "Gestor_Almacén.app",
|
||||||
"ExportApk.ApkPathForGestor_Almacén.app": "C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app",
|
"DEBUGGABLE_DEVICE": "zebra_technologies-tc27-23208524700332",
|
||||||
"Gradle.vn-warehouseManager [clean].executor": "Run",
|
"DEBUGGABLE_PROCESS": "es.verdnatura.sfusion",
|
||||||
"Gradle.vn-warehouseManager.executor": "Run",
|
"DEBUGGER_ID": "Auto",
|
||||||
"KotlinFunctionFindUsagesOptions.isSearchForTextOccurrences": "true",
|
"ExportApk.ApkPathForGestor_Almacén.app": "C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app",
|
||||||
"PROJECT_TRUSTED_KEY": "true",
|
"Gradle.vn-warehouseManager [clean].executor": "Run",
|
||||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
"Gradle.vn-warehouseManager.executor": "Run",
|
||||||
"RunOnceActivity.cidr.known.project.marker": "true",
|
"KotlinFunctionFindUsagesOptions.isSearchForTextOccurrences": "true",
|
||||||
"RunOnceActivity.readMode.enableVisualFormatting": "true",
|
"PROJECT_TRUSTED_KEY": "true",
|
||||||
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
|
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
||||||
"ScreenRecorder.SavePath": "C:\\Users\\sergiodt",
|
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||||
"android-custom-viewC:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.2.1/f0f93e67af3f7417bdd560d5142f6dec4fe629c3/recyclerview-1.2.1-sources.jar!/androidx/recyclerview/widget/RecyclerView.java_SELECTED": "RecyclerView",
|
"RunOnceActivity.cidr.known.project.marker": "true",
|
||||||
"android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-29/android/widget/TextView.java_SELECTED": "TextView",
|
"RunOnceActivity.readMode.enableVisualFormatting": "true",
|
||||||
"android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-33/android/view/View.java_SELECTED": "View",
|
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
|
||||||
"android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/view/View.java_SELECTED": "View",
|
"SHOW_ALL_PROCESSES": "false",
|
||||||
"android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/widget/CompoundButton.java_SELECTED": "CompoundButton",
|
"ScreenRecorder.SavePath": "C:\\Users\\sergiodt",
|
||||||
"android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/widget/TextView.java_SELECTED": "TextView",
|
"android-custom-viewC:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.2.1/f0f93e67af3f7417bdd560d5142f6dec4fe629c3/recyclerview-1.2.1-sources.jar!/androidx/recyclerview/widget/RecyclerView.java_SELECTED": "RecyclerView",
|
||||||
"cf.first.check.clang-format": "false",
|
"android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-29/android/widget/TextView.java_SELECTED": "TextView",
|
||||||
"cidr.known.project.marker": "true",
|
"android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-33/android/view/View.java_SELECTED": "View",
|
||||||
"com.developerphil.adbidea.selecteddevices": "G65TY9DQN7X4BIE6",
|
"android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/view/View.java_SELECTED": "View",
|
||||||
"com.google.services.firebase.aqiPopupShown": "true",
|
"android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/widget/CompoundButton.java_SELECTED": "CompoundButton",
|
||||||
"git-widget-placeholder": "dev",
|
"android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/widget/TextView.java_SELECTED": "TextView",
|
||||||
"ignore.virus.scanning.warn.message": "true",
|
"cf.first.check.clang-format": "false",
|
||||||
"kotlin-language-version-configured": "true",
|
"cidr.known.project.marker": "true",
|
||||||
"last_directory_selection": "C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable",
|
"com.developerphil.adbidea.selecteddevices": "G65TY9DQN7X4BIE6",
|
||||||
"last_opened_file_path": "C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable",
|
"com.google.services.firebase.aqiPopupShown": "true",
|
||||||
"project.structure.last.edited": "Modules",
|
"git-widget-placeholder": "dev",
|
||||||
"project.structure.proportion": "0.17",
|
"ignore.virus.scanning.warn.message": "true",
|
||||||
"project.structure.side.proportion": "0.2",
|
"kotlin-language-version-configured": "true",
|
||||||
"run.code.analysis.last.selected.profile": "pProject Default",
|
"last_directory_selection": "C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable",
|
||||||
"settings.editor.selected.configurable": "reference.settingsdialog.project.gradle"
|
"last_opened_file_path": "C:/Users/sergiodt/AndroidStudioProjects/Rocket.Chat.Android",
|
||||||
|
"project.structure.last.edited": "Modules",
|
||||||
|
"project.structure.proportion": "0.17",
|
||||||
|
"project.structure.side.proportion": "0.2",
|
||||||
|
"run.code.analysis.last.selected.profile": "pProject Default",
|
||||||
|
"settings.editor.selected.configurable": "preferences.editor.code.editing"
|
||||||
},
|
},
|
||||||
"keyToStringList": {
|
"keyToStringList": {
|
||||||
"ExportApk.BuildVariants": [
|
"ExportApk.BuildVariants": [
|
||||||
"generalRelease"
|
"generalRelease"
|
||||||
],
|
],
|
||||||
"com.android.tools.idea.sqlite.queryhistory": [
|
"com.android.tools.idea.sqlite.queryhistory": [
|
||||||
"select * from expedition where routeFk=182933;",
|
"select * from expedition where routeFk=182933;",
|
||||||
"select * from expedition;",
|
"select * from expedition;",
|
||||||
"select * from expeditionPending;",
|
"select * from expeditionPending;",
|
||||||
"select * from expedition where id = 7753995;\n\n",
|
"select * from expedition where id = 7753995;\n\n",
|
||||||
"\nselect * from expedition where id = 7753995;"
|
"\nselect * from expedition where id = 7753995;"
|
||||||
],
|
],
|
||||||
"kotlin-gradle-user-dirs": [
|
"kotlin-gradle-user-dirs": [
|
||||||
"C:\\Users\\sergiodt\\.gradle"
|
"C:\\Users\\sergiodt\\.gradle"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}</component>
|
}]]></component>
|
||||||
<component name="PsdUISettings">
|
<component name="PsdUISettings">
|
||||||
<option name="MODULE_TAB" value="Properties" />
|
<option name="MODULE_TAB" value="Properties" />
|
||||||
<option name="LAST_EDITED_SIGNING_CONFIG" value="debug" />
|
<option name="LAST_EDITED_SIGNING_CONFIG" value="debug" />
|
||||||
|
@ -582,11 +604,11 @@
|
||||||
<recent name="es.verdnatura.presentation.view.feature.historicoshelving.fragment" />
|
<recent name="es.verdnatura.presentation.view.feature.historicoshelving.fragment" />
|
||||||
</key>
|
</key>
|
||||||
<key name="CopyKotlinDeclarationDialog.RECENTS_KEY">
|
<key name="CopyKotlinDeclarationDialog.RECENTS_KEY">
|
||||||
|
<recent name="es.verdnatura.presentation.view.feature.collection.fragment" />
|
||||||
<recent name="es.verdnatura.domain" />
|
<recent name="es.verdnatura.domain" />
|
||||||
<recent name="es.verdnatura.presentation.view.feature.truck.adapter" />
|
<recent name="es.verdnatura.presentation.view.feature.truck.adapter" />
|
||||||
<recent name="es.verdnatura.presentation.view.feature.truck.fragment" />
|
<recent name="es.verdnatura.presentation.view.feature.truck.fragment" />
|
||||||
<recent name="es.verdnatura.presentation.view.feature.main.activity" />
|
<recent name="es.verdnatura.presentation.view.feature.main.activity" />
|
||||||
<recent name="es.verdnatura.presentation.view.feature.ubicador.adapter" />
|
|
||||||
</key>
|
</key>
|
||||||
<key name="CopyClassDialog.RECENTS_KEY">
|
<key name="CopyClassDialog.RECENTS_KEY">
|
||||||
<recent name="es.verdnatura.presentation.view.feature.delivery.activity" />
|
<recent name="es.verdnatura.presentation.view.feature.delivery.activity" />
|
||||||
|
@ -1090,7 +1112,7 @@
|
||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1709725795643</updated>
|
<updated>1709725795643</updated>
|
||||||
</task>
|
</task>
|
||||||
<option name="localTasksCounter" value="306" />
|
<option name="localTasksCounter" value="326" />
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="Vcs.Log.History.Properties">
|
<component name="Vcs.Log.History.Properties">
|
||||||
|
@ -1104,12 +1126,6 @@
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="Vcs.Log.Tabs.Properties">
|
<component name="Vcs.Log.Tabs.Properties">
|
||||||
<option name="OPEN_GENERIC_TABS">
|
|
||||||
<map>
|
|
||||||
<entry key="4102e045-fbcd-48a7-a1de-98444b8d2da6" value="TOOL_WINDOW" />
|
|
||||||
<entry key="ed934433-ed61-40bd-bd2b-f0df4ea52659" value="TOOL_WINDOW" />
|
|
||||||
</map>
|
|
||||||
</option>
|
|
||||||
<option name="RECENT_FILTERS">
|
<option name="RECENT_FILTERS">
|
||||||
<map>
|
<map>
|
||||||
<entry key="Branch">
|
<entry key="Branch">
|
||||||
|
@ -1144,11 +1160,6 @@
|
||||||
</State>
|
</State>
|
||||||
</value>
|
</value>
|
||||||
</entry>
|
</entry>
|
||||||
<entry key="4102e045-fbcd-48a7-a1de-98444b8d2da6">
|
|
||||||
<value>
|
|
||||||
<State />
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="MAIN">
|
<entry key="MAIN">
|
||||||
<value>
|
<value>
|
||||||
<State>
|
<State>
|
||||||
|
@ -1197,24 +1208,11 @@
|
||||||
</State>
|
</State>
|
||||||
</value>
|
</value>
|
||||||
</entry>
|
</entry>
|
||||||
<entry key="ed934433-ed61-40bd-bd2b-f0df4ea52659">
|
|
||||||
<value>
|
|
||||||
<State />
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
</map>
|
</map>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="VcsManagerConfiguration">
|
<component name="VcsManagerConfiguration">
|
||||||
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
|
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
|
||||||
<MESSAGE value="version 24.8beta" />
|
|
||||||
<MESSAGE value="modify gitIgnore" />
|
|
||||||
<MESSAGE value="refs #6284 feat:update and review xml" />
|
|
||||||
<MESSAGE value="refs #6560 refactor:settings" />
|
|
||||||
<MESSAGE value="refs #6964 refactor:settings" />
|
|
||||||
<MESSAGE value="refs #6964 feat:hasOlderItem" />
|
|
||||||
<MESSAGE value="version 24.5Beta" />
|
|
||||||
<MESSAGE value="version 24.8Beta" />
|
|
||||||
<MESSAGE value="refs #6607 feat:checking_boxes" />
|
<MESSAGE value="refs #6607 feat:checking_boxes" />
|
||||||
<MESSAGE value="refs #7278 feat:newUI SummaryFragment" />
|
<MESSAGE value="refs #7278 feat:newUI SummaryFragment" />
|
||||||
<MESSAGE value="refs #3520 feat:refactorSilex→Salix" />
|
<MESSAGE value="refs #3520 feat:refactorSilex→Salix" />
|
||||||
|
@ -1226,13 +1224,21 @@
|
||||||
<MESSAGE value="feat lilium" />
|
<MESSAGE value="feat lilium" />
|
||||||
<MESSAGE value="feat bugs" />
|
<MESSAGE value="feat bugs" />
|
||||||
<MESSAGE value="feat ticketQr #refs 6602" />
|
<MESSAGE value="feat ticketQr #refs 6602" />
|
||||||
<MESSAGE value="feat itemShelvingLog #refs 7597" />
|
|
||||||
<MESSAGE value="feat itemToBarCode refs #7614" />
|
<MESSAGE value="feat itemToBarCode refs #7614" />
|
||||||
<MESSAGE value="feat roadMap #refs 7195" />
|
|
||||||
<MESSAGE value="feat boxPicking #refs 7357" />
|
<MESSAGE value="feat boxPicking #refs 7357" />
|
||||||
<MESSAGE value="feat reservas #refs 6861" />
|
<MESSAGE value="feat itemShelvingLog #refs 7597" />
|
||||||
|
<MESSAGE value="feat roadMap #refs 7195" />
|
||||||
|
<MESSAGE value="feat inventory #refs 7023" />
|
||||||
|
<MESSAGE value="feat version24.28" />
|
||||||
|
<MESSAGE value="feat Ticketobservation refs #7541" />
|
||||||
|
<MESSAGE value="feat isF11Allowed refs #6435" />
|
||||||
|
<MESSAGE value="feat boxPickingCheck refs #7751" />
|
||||||
|
<MESSAGE value="feat barCode in ItemShelvingLog refs #7739" />
|
||||||
|
<MESSAGE value="feat Rename refs #7763" />
|
||||||
|
<MESSAGE value="feat getAddress #refs 7622" />
|
||||||
<MESSAGE value="feat issues refs #7636" />
|
<MESSAGE value="feat issues refs #7636" />
|
||||||
<option name="LAST_COMMIT_MESSAGE" value="feat issues refs #7636" />
|
<MESSAGE value="feat reservas #refs 6861" />
|
||||||
|
<option name="LAST_COMMIT_MESSAGE" value="feat reservas #refs 6861" />
|
||||||
</component>
|
</component>
|
||||||
<component name="XDebuggerManager">
|
<component name="XDebuggerManager">
|
||||||
<pin-to-top-manager>
|
<pin-to-top-manager>
|
||||||
|
|
|
@ -65,7 +65,7 @@ class ApiSalixUtils {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (!url.contains("http")) {
|
if (!url.contains("http")) {
|
||||||
url = "https://" + url
|
url = "https://$url"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,9 +3,9 @@ package es.verdnatura.domain
|
||||||
import com.google.gson.JsonObject
|
import com.google.gson.JsonObject
|
||||||
import es.verdnatura.presentation.common.ExpeditionPrintOut
|
import es.verdnatura.presentation.common.ExpeditionPrintOut
|
||||||
import es.verdnatura.presentation.common.ItemBarCodeSalix
|
import es.verdnatura.presentation.common.ItemBarCodeSalix
|
||||||
|
import es.verdnatura.presentation.common.PackingSiteSalix
|
||||||
import es.verdnatura.presentation.common.SaleTrackingSalix
|
import es.verdnatura.presentation.common.SaleTrackingSalix
|
||||||
import es.verdnatura.presentation.common.TicketState
|
import es.verdnatura.presentation.common.TicketState
|
||||||
import es.verdnatura.presentation.common.packingSiteSalix
|
|
||||||
import es.verdnatura.presentation.view.feature.ajustes.model.Printers
|
import es.verdnatura.presentation.view.feature.ajustes.model.Printers
|
||||||
import es.verdnatura.presentation.view.feature.ajustes.model.SectorItemVO
|
import es.verdnatura.presentation.view.feature.ajustes.model.SectorItemVO
|
||||||
import es.verdnatura.presentation.view.feature.ajustes.model.Train
|
import es.verdnatura.presentation.view.feature.ajustes.model.Train
|
||||||
|
@ -18,7 +18,6 @@ import es.verdnatura.presentation.view.feature.buscaritem.model.ItemLocationVO
|
||||||
import es.verdnatura.presentation.view.feature.calidad.model.BuyerVO
|
import es.verdnatura.presentation.view.feature.calidad.model.BuyerVO
|
||||||
import es.verdnatura.presentation.view.feature.claim.fragment.reubication.model.Reubication
|
import es.verdnatura.presentation.view.feature.claim.fragment.reubication.model.Reubication
|
||||||
import es.verdnatura.presentation.view.feature.collection.SalixSaleQuantity
|
import es.verdnatura.presentation.view.feature.collection.SalixSaleQuantity
|
||||||
import es.verdnatura.presentation.view.feature.collection.listSaleSalix
|
|
||||||
import es.verdnatura.presentation.view.feature.controlvehiculo.fragment.model.DeviceId
|
import es.verdnatura.presentation.view.feature.controlvehiculo.fragment.model.DeviceId
|
||||||
import es.verdnatura.presentation.view.feature.delivery.model.ClientTicketSalix
|
import es.verdnatura.presentation.view.feature.delivery.model.ClientTicketSalix
|
||||||
import es.verdnatura.presentation.view.feature.delivery.model.DeliveryInfo
|
import es.verdnatura.presentation.view.feature.delivery.model.DeliveryInfo
|
||||||
|
@ -50,9 +49,9 @@ import es.verdnatura.presentation.view.feature.login.model.VersionApp
|
||||||
import es.verdnatura.presentation.view.feature.main.model.WorkerActionSalix
|
import es.verdnatura.presentation.view.feature.main.model.WorkerActionSalix
|
||||||
import es.verdnatura.presentation.view.feature.packaging.model.EntrySalix
|
import es.verdnatura.presentation.view.feature.packaging.model.EntrySalix
|
||||||
import es.verdnatura.presentation.view.feature.packaging.model.ItemSupplier
|
import es.verdnatura.presentation.view.feature.packaging.model.ItemSupplier
|
||||||
|
import es.verdnatura.presentation.view.feature.packaging.model.NotificationQueue
|
||||||
|
import es.verdnatura.presentation.view.feature.packaging.model.ObervationEntry
|
||||||
import es.verdnatura.presentation.view.feature.packaging.model.Supplier
|
import es.verdnatura.presentation.view.feature.packaging.model.Supplier
|
||||||
import es.verdnatura.presentation.view.feature.packaging.model.notificationQueue
|
|
||||||
import es.verdnatura.presentation.view.feature.packaging.model.obervationEntry
|
|
||||||
import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionScanVO
|
import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionScanVO
|
||||||
import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionTruckSalix
|
import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionTruckSalix
|
||||||
import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionTruckVO
|
import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionTruckVO
|
||||||
|
@ -838,10 +837,6 @@ interface SalixService {
|
||||||
):
|
):
|
||||||
Call<EntrySalix>
|
Call<EntrySalix>
|
||||||
|
|
||||||
@POST("tickets/{idTicket}/transferSales") //-->saleMove en Silex
|
|
||||||
fun transferSalesSalix(
|
|
||||||
@Path("idTicket") idTicket: String, @Body params: listSaleSalix
|
|
||||||
): Call<Any>
|
|
||||||
|
|
||||||
@GET("Departments")
|
@GET("Departments")
|
||||||
fun department_getHasMistake(
|
fun department_getHasMistake(
|
||||||
|
@ -947,7 +942,7 @@ interface SalixService {
|
||||||
|
|
||||||
@POST("PackingSiteAdvanceds")
|
@POST("PackingSiteAdvanceds")
|
||||||
fun ticket_advancePackaging(
|
fun ticket_advancePackaging(
|
||||||
@Body parms: packingSiteSalix
|
@Body parms: PackingSiteSalix
|
||||||
): Call<Unit>
|
): Call<Unit>
|
||||||
|
|
||||||
@PUT("ItemBarCodes")
|
@PUT("ItemBarCodes")
|
||||||
|
@ -1010,7 +1005,7 @@ interface SalixService {
|
||||||
@PATCH("Entries/{entryId}")
|
@PATCH("Entries/{entryId}")
|
||||||
fun entry_updateObserv(
|
fun entry_updateObserv(
|
||||||
@Path("entryId") entryId: Int,
|
@Path("entryId") entryId: Int,
|
||||||
@Body entry: obervationEntry
|
@Body entry: ObervationEntry
|
||||||
):
|
):
|
||||||
Call<EntrySalix>
|
Call<EntrySalix>
|
||||||
|
|
||||||
|
@ -1044,7 +1039,7 @@ interface SalixService {
|
||||||
|
|
||||||
@POST("notificationQueues")
|
@POST("notificationQueues")
|
||||||
fun notificationQueues(
|
fun notificationQueues(
|
||||||
@Body notificationQueue: notificationQueue
|
@Body notificationQueue: NotificationQueue
|
||||||
):
|
):
|
||||||
Call<Void>
|
Call<Void>
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@ data class SaleTrackingSalix(
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
class packingSiteSalix(
|
class PackingSiteSalix(
|
||||||
var ticketFk: Int,
|
var ticketFk: Int,
|
||||||
var workerFk: Int
|
var workerFk: Int
|
||||||
|
|
||||||
|
|
|
@ -46,11 +46,11 @@ interface OnPasillerosItemClickListener {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
interface onMistakeWorkerClickListener {
|
interface OnMistakeWorkerClickListener {
|
||||||
fun onMistakeWorkerClickListener(item: WorkerFromMistake)
|
fun onMistakeWorkerClickListener(item: WorkerFromMistake)
|
||||||
}
|
}
|
||||||
|
|
||||||
interface hideBottomNavigation {
|
interface HideBottomNavigation {
|
||||||
fun hideBottomNavigation(entryPoint: String)
|
fun hideBottomNavigation(entryPoint: String)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -217,7 +217,7 @@ interface OnQuantityClickSaleListener {
|
||||||
fun onQuantityClick(sale: Sale)
|
fun onQuantityClick(sale: Sale)
|
||||||
}
|
}
|
||||||
|
|
||||||
interface onPackingClickListener {
|
interface OnPackingClickListener {
|
||||||
fun onPackingClick(sale: SaleVO)
|
fun onPackingClick(sale: SaleVO)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -257,7 +257,7 @@ interface OnStarSelectedListener {
|
||||||
fun onStarSelected(vId: String, vStars: String)
|
fun onStarSelected(vId: String, vStars: String)
|
||||||
}
|
}
|
||||||
|
|
||||||
interface onVehicleSelected {
|
interface OnVehicleSelected {
|
||||||
fun onVehicleClick(userFk: String)
|
fun onVehicleClick(userFk: String)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -223,6 +223,6 @@ fun convertToDateString(date: String?): String? {
|
||||||
}
|
}
|
||||||
val formatoEntrada = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.getDefault()) // Formato de entrada
|
val formatoEntrada = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.getDefault()) // Formato de entrada
|
||||||
val formatoSalida = SimpleDateFormat("yyyy-MM-dd",Locale.getDefault()) // Formato de salida
|
val formatoSalida = SimpleDateFormat("yyyy-MM-dd",Locale.getDefault()) // Formato de salida
|
||||||
val fechaDate = formatoEntrada.parse(date) // Convertir fecha de String a objeto Date
|
val dateToConvert = formatoEntrada.parse(date) // Convertir fecha de String a objeto Date
|
||||||
return formatoSalida.format(fechaDate) // Convertir fecha a String con formato deseado
|
return formatoSalida.format(dateToConvert!!) // Convertir fecha a String con formato deseado
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,7 @@ class FunctionUtils{
|
||||||
var tutorialMap: Map<String, Any> =
|
var tutorialMap: Map<String, Any> =
|
||||||
gson.fromJson(json, object : TypeToken<Map<String, Any>>() {}.type)
|
gson.fromJson(json, object : TypeToken<Map<String, Any>>() {}.type)
|
||||||
tutorialMap.forEach {
|
tutorialMap.forEach {
|
||||||
if (it.key.equals("Message")) {
|
if (it.key == "Message") {
|
||||||
message = it.value.toString()
|
message = it.value.toString()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ import java.io.IOException
|
||||||
import java.io.UnsupportedEncodingException
|
import java.io.UnsupportedEncodingException
|
||||||
|
|
||||||
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||||
class testPrint(
|
class TestPrint(
|
||||||
var entryPoint: String = ""
|
var entryPoint: String = ""
|
||||||
) : BaseFragment<FragmentTestingPrintBinding, QrFragmentViewModel>(QrFragmentViewModel::class) {
|
) : BaseFragment<FragmentTestingPrintBinding, QrFragmentViewModel>(QrFragmentViewModel::class) {
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@ class testPrint(
|
||||||
private var itemscaned = ""
|
private var itemscaned = ""
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
fun newInstance(entryPoint: String) = testPrint(entryPoint)
|
fun newInstance(entryPoint: String) = TestPrint(entryPoint)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun init() {
|
override fun init() {
|
||||||
|
@ -402,7 +402,7 @@ class testPrint(
|
||||||
if (resultCode == 0) {
|
if (resultCode == 0) {
|
||||||
// Result code 0 indicates success
|
// Result code 0 indicates success
|
||||||
val printerStatusMap =
|
val printerStatusMap =
|
||||||
resultData!!.getSerializable("PrinterStatusMap") as HashMap<String, String>?
|
resultData!!.getSerializable("PrinterStatusMap") as HashMap<*, *>?
|
||||||
Toast.makeText(context, printerStatusMap.toString(), Toast.LENGTH_LONG)
|
Toast.makeText(context, printerStatusMap.toString(), Toast.LENGTH_LONG)
|
||||||
.show()
|
.show()
|
||||||
} else {
|
} else {
|
||||||
|
@ -436,8 +436,9 @@ class testPrint(
|
||||||
|
|
||||||
if (resultCode == 0) {
|
if (resultCode == 0) {
|
||||||
// Result code 0 indicates success
|
// Result code 0 indicates success
|
||||||
|
|
||||||
val printerStatusMap =
|
val printerStatusMap =
|
||||||
resultData!!.getSerializable("PrinterStatusMap") as HashMap<String, String>?
|
resultData!!.getSerializable("PrinterStatusMap") as HashMap<*, *>?
|
||||||
Toast.makeText(context, printerStatusMap.toString(), Toast.LENGTH_LONG)
|
Toast.makeText(context, printerStatusMap.toString(), Toast.LENGTH_LONG)
|
||||||
.show()
|
.show()
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -19,13 +19,13 @@ import es.verdnatura.domain.toast
|
||||||
import es.verdnatura.presentation.base.BaseFragment
|
import es.verdnatura.presentation.base.BaseFragment
|
||||||
import es.verdnatura.presentation.common.OnMistakeClickListener
|
import es.verdnatura.presentation.common.OnMistakeClickListener
|
||||||
import es.verdnatura.presentation.common.OnOptionsSelectedListener
|
import es.verdnatura.presentation.common.OnOptionsSelectedListener
|
||||||
|
import es.verdnatura.presentation.common.OnPackingClickListener
|
||||||
import es.verdnatura.presentation.common.OnPasillerosItemClickListener
|
import es.verdnatura.presentation.common.OnPasillerosItemClickListener
|
||||||
import es.verdnatura.presentation.common.OnQuantityClickListener
|
import es.verdnatura.presentation.common.OnQuantityClickListener
|
||||||
import es.verdnatura.presentation.common.OnSaleClickListener
|
import es.verdnatura.presentation.common.OnSaleClickListener
|
||||||
import es.verdnatura.presentation.common.ToolBarAdapterTooltip
|
import es.verdnatura.presentation.common.ToolBarAdapterTooltip
|
||||||
import es.verdnatura.presentation.common.hideKeyboard
|
import es.verdnatura.presentation.common.hideKeyboard
|
||||||
import es.verdnatura.presentation.common.itemScanValue
|
import es.verdnatura.presentation.common.itemScanValue
|
||||||
import es.verdnatura.presentation.common.onPackingClickListener
|
|
||||||
import es.verdnatura.presentation.view.component.CustomDialog
|
import es.verdnatura.presentation.view.component.CustomDialog
|
||||||
import es.verdnatura.presentation.view.feature.collection.adapter.SaleAdapter
|
import es.verdnatura.presentation.view.feature.collection.adapter.SaleAdapter
|
||||||
import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
|
import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
|
||||||
|
@ -293,7 +293,7 @@ class CollectionShowTicketFragment(
|
||||||
}, object : OnMistakeClickListener {
|
}, object : OnMistakeClickListener {
|
||||||
override fun onMistakeClickListener(sale: SaleVO) {
|
override fun onMistakeClickListener(sale: SaleVO) {
|
||||||
}
|
}
|
||||||
}, object : onPackingClickListener {
|
}, object : OnPackingClickListener {
|
||||||
override fun onPackingClick(sale: SaleVO) {
|
override fun onPackingClick(sale: SaleVO) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -70,13 +70,13 @@ class ExpeditionSummaryAdapter(
|
||||||
private fun getColorBackground(item: ExpeditionInfoSummary): Int {
|
private fun getColorBackground(item: ExpeditionInfoSummary): Int {
|
||||||
var color: Int
|
var color: Int
|
||||||
if (item.delivery != item.total) {
|
if (item.delivery != item.total) {
|
||||||
color = res.getColor(R.color.verdnatura_pumpkin_light)
|
color = binding.root.context.getColor(R.color.verdnatura_pumpkin_light)
|
||||||
} else {
|
} else {
|
||||||
color = res.getColor(R.color.verdnatura_black)
|
color = binding.root.context.getColor(R.color.verdnatura_black)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (item.delivered == item.total) {
|
if (item.delivered == item.total) {
|
||||||
color = res.getColor(R.color.verdnatura_black)
|
color = binding.root.context.getColor(R.color.verdnatura_black)
|
||||||
}
|
}
|
||||||
return color
|
return color
|
||||||
|
|
||||||
|
|
|
@ -133,12 +133,6 @@ class LoginDevice(
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
class workerId(
|
|
||||||
val Id: Int? = null,
|
|
||||||
var isError: Boolean = false,
|
|
||||||
var errorMessage: String = ""
|
|
||||||
)
|
|
||||||
|
|
||||||
data class NameWorker(
|
data class NameWorker(
|
||||||
val firstName : String,
|
val firstName : String,
|
||||||
val lastName :String
|
val lastName :String
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
package es.verdnatura.presentation.view.feature.login.model
|
|
||||||
|
|
||||||
class errorMessage(
|
|
||||||
val message: String = ""
|
|
||||||
) {
|
|
||||||
override fun toString(): String {
|
|
||||||
return "${this.message}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,77 +0,0 @@
|
||||||
package es.verdnatura.presentation.view.feature.modelViewModel
|
|
||||||
import android.content.Context
|
|
||||||
import androidx.lifecycle.LiveData
|
|
||||||
import androidx.lifecycle.MutableLiveData
|
|
||||||
import es.verdnatura.domain.SalixCallback
|
|
||||||
import es.verdnatura.presentation.base.BaseViewModel
|
|
||||||
import es.verdnatura.presentation.base.getMessageFromAllResponse
|
|
||||||
import es.verdnatura.presentation.common.ResponseItemVO
|
|
||||||
import es.verdnatura.presentation.view.feature.articulo.model.ItemProposal
|
|
||||||
import es.verdnatura.presentation.view.feature.articulo.model.ItemProposalList
|
|
||||||
import retrofit2.Response
|
|
||||||
|
|
||||||
class FragmentsViewModel(val context: Context) : BaseViewModel(context) {
|
|
||||||
|
|
||||||
|
|
||||||
private val _responseCallBack by lazy { MutableLiveData<ResponseItemVO>() }
|
|
||||||
val responseCallBack: LiveData<ResponseItemVO>
|
|
||||||
get() = _responseCallBack
|
|
||||||
|
|
||||||
|
|
||||||
fun callBackFuncSalix(routine: String, params: ArrayList<Any>) {
|
|
||||||
salix.executeFunc(
|
|
||||||
routine = routine, params = params
|
|
||||||
).enqueue(object :
|
|
||||||
SalixCallback<Any>(context) {
|
|
||||||
override fun onError(t: Throwable) {
|
|
||||||
_responseCallBack.value = ResponseItemVO(
|
|
||||||
isError = true,
|
|
||||||
errorMessage = getMessageFromAllResponse((routine), t.message!!),
|
|
||||||
routine = routine
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onSuccess(response: Response<Any>) {
|
|
||||||
|
|
||||||
_responseCallBack.value = ResponseItemVO(
|
|
||||||
isError = false,
|
|
||||||
response = response.body()!!.toString(),
|
|
||||||
errorMessage = "",
|
|
||||||
routine = routine
|
|
||||||
|
|
||||||
)
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
})
|
|
||||||
}
|
|
||||||
fun callBackProcedSalix(routine: String, params: ArrayList<Any>) {
|
|
||||||
salix.executeProc(
|
|
||||||
routine = routine, params = params
|
|
||||||
).enqueue(object :
|
|
||||||
SalixCallback<Any>(context) {
|
|
||||||
override fun onError(t: Throwable) {
|
|
||||||
_responseCallBack.value = ResponseItemVO(
|
|
||||||
isError = true,
|
|
||||||
errorMessage = getMessageFromAllResponse((routine), t.message!!),
|
|
||||||
routine = routine
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onSuccess(response: Response<Any>) {
|
|
||||||
|
|
||||||
_responseCallBack.value = ResponseItemVO(
|
|
||||||
isError = false,
|
|
||||||
response = if (response.body()!=null){response.body()!!.toString()}else{""},
|
|
||||||
errorMessage = "",
|
|
||||||
routine = routine,
|
|
||||||
data = response.body()?.let {
|
|
||||||
ItemProposalList(it as List<ItemProposal>)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -13,11 +13,11 @@ import es.verdnatura.presentation.common.ResponseItemVO
|
||||||
import es.verdnatura.presentation.view.feature.packaging.model.EntryList
|
import es.verdnatura.presentation.view.feature.packaging.model.EntryList
|
||||||
import es.verdnatura.presentation.view.feature.packaging.model.EntrySalix
|
import es.verdnatura.presentation.view.feature.packaging.model.EntrySalix
|
||||||
import es.verdnatura.presentation.view.feature.packaging.model.ItemSupplier
|
import es.verdnatura.presentation.view.feature.packaging.model.ItemSupplier
|
||||||
|
import es.verdnatura.presentation.view.feature.packaging.model.NotificationQueue
|
||||||
|
import es.verdnatura.presentation.view.feature.packaging.model.ObervationEntry
|
||||||
import es.verdnatura.presentation.view.feature.packaging.model.Supplier
|
import es.verdnatura.presentation.view.feature.packaging.model.Supplier
|
||||||
import es.verdnatura.presentation.view.feature.packaging.model.SupplierList
|
import es.verdnatura.presentation.view.feature.packaging.model.SupplierList
|
||||||
import es.verdnatura.presentation.view.feature.packaging.model.itemSupplierList
|
import es.verdnatura.presentation.view.feature.packaging.model.itemSupplierList
|
||||||
import es.verdnatura.presentation.view.feature.packaging.model.notificationQueue
|
|
||||||
import es.verdnatura.presentation.view.feature.packaging.model.obervationEntry
|
|
||||||
import okhttp3.MediaType
|
import okhttp3.MediaType
|
||||||
import okhttp3.MultipartBody
|
import okhttp3.MultipartBody
|
||||||
import okhttp3.RequestBody
|
import okhttp3.RequestBody
|
||||||
|
@ -234,7 +234,7 @@ class PackagingViewModel(val context: Context) : BaseViewModel(context) {
|
||||||
}
|
}
|
||||||
|
|
||||||
fun entryUpdateObserv(entryId: Int, observation: String) {
|
fun entryUpdateObserv(entryId: Int, observation: String) {
|
||||||
salix.entry_updateObserv(entryId, obervationEntry(observation))
|
salix.entry_updateObserv(entryId, ObervationEntry(observation))
|
||||||
.enqueue(object :
|
.enqueue(object :
|
||||||
SalixCallback<EntrySalix>(context) {
|
SalixCallback<EntrySalix>(context) {
|
||||||
|
|
||||||
|
@ -321,7 +321,7 @@ class PackagingViewModel(val context: Context) : BaseViewModel(context) {
|
||||||
}
|
}
|
||||||
|
|
||||||
fun notificationQueues(notification: String, workerfk: Int, bodyUrl: String) {
|
fun notificationQueues(notification: String, workerfk: Int, bodyUrl: String) {
|
||||||
salix.notificationQueues(notificationQueue(notification, workerfk, bodyUrl))
|
salix.notificationQueues(NotificationQueue(notification, workerfk, bodyUrl))
|
||||||
.enqueue(object : SalixCallback<Void>(context) {
|
.enqueue(object : SalixCallback<Void>(context) {
|
||||||
override fun onError(t: Throwable) {
|
override fun onError(t: Throwable) {
|
||||||
_response.value = ResponseItemVO(
|
_response.value = ResponseItemVO(
|
||||||
|
|
|
@ -37,11 +37,11 @@ fun List<EntrySalix>.toDateFormat(): ArrayList<EntrySalix> {
|
||||||
return entries.sortedBy { it.dated } as ArrayList
|
return entries.sortedBy { it.dated } as ArrayList
|
||||||
}
|
}
|
||||||
|
|
||||||
data class obervationEntry(
|
data class ObervationEntry(
|
||||||
val observation: String
|
val observation: String
|
||||||
)
|
)
|
||||||
|
|
||||||
data class notificationQueue(
|
data class NotificationQueue(
|
||||||
val notificationFk: String,
|
val notificationFk: String,
|
||||||
val authorFk: Int,
|
val authorFk: Int,
|
||||||
val params: String
|
val params: String
|
||||||
|
|
|
@ -3,7 +3,7 @@ package es.verdnatura.presentation.view.feature.ticket.fragment
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import es.verdnatura.domain.SalixCallback
|
import es.verdnatura.domain.SalixCallback
|
||||||
import es.verdnatura.presentation.base.BaseViewModel
|
import es.verdnatura.presentation.base.BaseViewModel
|
||||||
import es.verdnatura.presentation.common.packingSiteSalix
|
import es.verdnatura.presentation.common.PackingSiteSalix
|
||||||
|
|
||||||
class TicketViewModel(val context: Context) : BaseViewModel(context) {
|
class TicketViewModel(val context: Context) : BaseViewModel(context) {
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ class TicketViewModel(val context: Context) : BaseViewModel(context) {
|
||||||
ticketFk: Int, workerFk: Int
|
ticketFk: Int, workerFk: Int
|
||||||
|
|
||||||
) {
|
) {
|
||||||
salix.ticket_advancePackaging(packingSiteSalix(ticketFk, workerFk))
|
salix.ticket_advancePackaging(PackingSiteSalix(ticketFk, workerFk))
|
||||||
.enqueue(object : SalixCallback<Unit>(context) {})
|
.enqueue(object : SalixCallback<Unit>(context) {})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -5,13 +5,13 @@ import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import es.verdnatura.databinding.ItemWorkermistakeRowBinding
|
import es.verdnatura.databinding.ItemWorkermistakeRowBinding
|
||||||
import es.verdnatura.presentation.common.onMistakeWorkerClickListener
|
import es.verdnatura.presentation.common.OnMistakeWorkerClickListener
|
||||||
import es.verdnatura.presentation.view.feature.workermistake.model.WorkerFromMistake
|
import es.verdnatura.presentation.view.feature.workermistake.model.WorkerFromMistake
|
||||||
|
|
||||||
|
|
||||||
class WorkermistakeAdapter(
|
class WorkermistakeAdapter(
|
||||||
private val items: List<WorkerFromMistake>,
|
private val items: List<WorkerFromMistake>,
|
||||||
private val onMistakeWorkerClickListener: onMistakeWorkerClickListener
|
private val onMistakeWorkerClickListener: OnMistakeWorkerClickListener
|
||||||
//private val onPasillerosItemClickListener: OnPasillerosItemClickListener*/
|
//private val onPasillerosItemClickListener: OnPasillerosItemClickListener*/
|
||||||
) : RecyclerView.Adapter<WorkermistakeAdapter.ItemHolder>() {
|
) : RecyclerView.Adapter<WorkermistakeAdapter.ItemHolder>() {
|
||||||
|
|
||||||
|
|
|
@ -13,8 +13,8 @@ import es.verdnatura.domain.ConstAndValues.DEPARTMENTMISTAKEID
|
||||||
import es.verdnatura.domain.toast
|
import es.verdnatura.domain.toast
|
||||||
import es.verdnatura.presentation.base.BaseFragment
|
import es.verdnatura.presentation.base.BaseFragment
|
||||||
import es.verdnatura.presentation.common.OnBarcodeRowClickListener
|
import es.verdnatura.presentation.common.OnBarcodeRowClickListener
|
||||||
|
import es.verdnatura.presentation.common.OnMistakeWorkerClickListener
|
||||||
import es.verdnatura.presentation.common.OnPasillerosItemClickListener
|
import es.verdnatura.presentation.common.OnPasillerosItemClickListener
|
||||||
import es.verdnatura.presentation.common.onMistakeWorkerClickListener
|
|
||||||
import es.verdnatura.presentation.view.component.CustomDialog
|
import es.verdnatura.presentation.view.component.CustomDialog
|
||||||
import es.verdnatura.presentation.view.component.CustomDialogInput
|
import es.verdnatura.presentation.view.component.CustomDialogInput
|
||||||
import es.verdnatura.presentation.view.component.CustomDialogList
|
import es.verdnatura.presentation.view.component.CustomDialogList
|
||||||
|
@ -156,7 +156,7 @@ class WorkermistakeFragment(
|
||||||
workerFromMistakeList.observe(viewLifecycleOwner) {
|
workerFromMistakeList.observe(viewLifecycleOwner) {
|
||||||
createWorkerList(it.list)
|
createWorkerList(it.list)
|
||||||
adapterworker =
|
adapterworker =
|
||||||
WorkermistakeAdapter(listWorker, object : onMistakeWorkerClickListener {
|
WorkermistakeAdapter(listWorker, object : OnMistakeWorkerClickListener {
|
||||||
override fun onMistakeWorkerClickListener(item: WorkerFromMistake) {
|
override fun onMistakeWorkerClickListener(item: WorkerFromMistake) {
|
||||||
viewModel.workerMistakeTypeGet(
|
viewModel.workerMistakeTypeGet(
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue