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

version 23.24Beta-205

This commit is contained in:
Sergio De la torre 2023-06-20 08:07:18 +02:00
parent 485dd17f88
commit b78e60873e
7 changed files with 65 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/misc.xml
View File

@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">
@ -276,7 +275,7 @@
</option>
</component>
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

103
.idea/workspace.xml
View File

@ -38,7 +38,6 @@
<device id="pixel_5" />
<device id="_device_class_phone" />
<locale>fr</locale>
<option name="nonWearDeviceLastStateName" value="Portrait" />
<target>android-28</target>
</config>
</shared>
@ -83,14 +82,14 @@
</select>
</component>
<component name="ChangeListManager">
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="version 23.24Beta">
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #4678">
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.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/alpha/release/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/alpha/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/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LogExpeditionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LogExpeditionFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/SummaryFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/SummaryFragment.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/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/ajustes/fragment/AjustesFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -101,7 +100,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" />
@ -119,7 +118,17 @@
</task>
<projects_view>
<tree_state>
<expand />
<expand>
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="Gestor Almacén" type="f1a62948:ProjectNode" />
</path>
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="Gestor Almacén" type="f1a62948:ProjectNode" />
<item name="Run Configurations" type="7b0102dc:RunConfigurationsNode" />
</path>
</expand>
<select />
</tree_state>
</projects_view>
@ -251,11 +260,11 @@
&quot;com.developerphil.adbidea.selecteddevices&quot;: &quot;21114523025303&quot;,
&quot;com.google.services.firebase.aqiPopupShown&quot;: &quot;true&quot;,
&quot;last_opened_file_path&quot;: &quot;C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable&quot;,
&quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
&quot;project.structure.last.edited&quot;: &quot;Project&quot;,
&quot;project.structure.proportion&quot;: &quot;0.17&quot;,
&quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
&quot;run.code.analysis.last.selected.profile&quot;: &quot;pProject Default&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;preferences.sourceCode.Shell Script&quot;
&quot;settings.editor.selected.configurable&quot;: &quot;reference.settingsdialog.project.gradle&quot;
},
&quot;keyToStringList&quot;: {
&quot;ExportApk.BuildVariants&quot;: [
@ -271,7 +280,7 @@
}
}</component>
<component name="PsdUISettings">
<option name="MODULE_TAB" value="Default Config" />
<option name="MODULE_TAB" value="Properties" />
<option name="LAST_EDITED_SIGNING_CONFIG" value="debug" />
<option name="LAST_EDITED_BUILD_TYPE" value="release" />
</component>
@ -412,34 +421,6 @@
<option name="presentableId" value="Default" />
<updated>1618825571576</updated>
</task>
<task id="LOCAL-00113" summary="refs #4755 mostrar tickets">
<created>1679305084809</created>
<option name="number" value="00113" />
<option name="presentableId" value="LOCAL-00113" />
<option name="project" value="LOCAL" />
<updated>1679305084810</updated>
</task>
<task id="LOCAL-00114" summary="refs #5117 autoconsumo">
<created>1679378828592</created>
<option name="number" value="00114" />
<option name="presentableId" value="LOCAL-00114" />
<option name="project" value="LOCAL" />
<updated>1679378828593</updated>
</task>
<task id="LOCAL-00115" summary="refs #4755 añadirTickets">
<created>1679389139208</created>
<option name="number" value="00115" />
<option name="presentableId" value="LOCAL-00115" />
<option name="project" value="LOCAL" />
<updated>1679389139208</updated>
</task>
<task id="LOCAL-00116" summary="refs #4755 añadirTickets">
<created>1679389189173</created>
<option name="number" value="00116" />
<option name="presentableId" value="LOCAL-00116" />
<option name="project" value="LOCAL" />
<updated>1679389189174</updated>
</task>
<task id="LOCAL-00117" summary="refs #4755 añadirTickets">
<created>1679389331215</created>
<option name="number" value="00117" />
@ -755,7 +736,35 @@
<option name="project" value="LOCAL" />
<updated>1686551912841</updated>
</task>
<option name="localTasksCounter" value="162" />
<task id="LOCAL-00162" summary="Error codigo barras largo">
<created>1686926081595</created>
<option name="number" value="00162" />
<option name="presentableId" value="LOCAL-00162" />
<option name="project" value="LOCAL" />
<updated>1686926081596</updated>
</task>
<task id="LOCAL-00163" summary="Actualizaciones">
<created>1686926096721</created>
<option name="number" value="00163" />
<option name="presentableId" value="LOCAL-00163" />
<option name="project" value="LOCAL" />
<updated>1686926096721</updated>
</task>
<task id="LOCAL-00164" summary="refs #5339">
<created>1687175254984</created>
<option name="number" value="00164" />
<option name="presentableId" value="LOCAL-00164" />
<option name="project" value="LOCAL" />
<updated>1687175254984</updated>
</task>
<task id="LOCAL-00165" summary="refs #4678">
<created>1687175742657</created>
<option name="number" value="00165" />
<option name="presentableId" value="LOCAL-00165" />
<option name="project" value="LOCAL" />
<updated>1687175742657</updated>
</task>
<option name="localTasksCounter" value="166" />
<servers />
</component>
<component name="Vcs.Log.History.Properties">
@ -797,7 +806,7 @@
<entry key="branch">
<value>
<list>
<option value="dev" />
<option value="dev_5057_nuevoSacado" />
</list>
</value>
</entry>
@ -856,9 +865,6 @@
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="refs #5442" />
<MESSAGE value="version 23.18.2Beta - Solucionado doble pitido, fusionada pantalla sacador, filtro a ubicador, quitado baldas." />
<MESSAGE value="version 23.18.3Beta solucionado fallo ubicador. Añadido bbdd" />
<MESSAGE value="refs #4902 retrocompatibilidad etd-eta" />
<MESSAGE value="refs #5071 summaryFragment" />
<MESSAGE value="refs #4678 Carga/descarga" />
@ -877,18 +883,21 @@
<MESSAGE value="strings" />
<MESSAGE value="Translation" />
<MESSAGE value="refs #5513" />
<MESSAGE value="refs #4678" />
<MESSAGE value="refs #5713" />
<MESSAGE value="refs #5322 NaturePhotos" />
<MESSAGE value="version 23.24Beta" />
<option name="LAST_COMMIT_MESSAGE" value="version 23.24Beta" />
<MESSAGE value="Error codigo barras largo" />
<MESSAGE value="Actualizaciones" />
<MESSAGE value="refs #5339" />
<MESSAGE value="refs #4678" />
<option name="LAST_COMMIT_MESSAGE" value="refs #4678" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint type="kotlin-function">
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt</url>
<line>866</line>
<line>865</line>
<properties class="es.verdnatura.domain.VerdnaturaService" method="route_getExpeditionSummary">
<option name="WATCH_EXIT" value="false" />
</properties>

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

@ -11,7 +11,7 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 201,
"versionCode": 205,
"versionName": "23.24Beta",
"outputFile": "app-beta-release.apk"
}

2
app/build.gradle
View File

@ -13,7 +13,7 @@ android {
applicationId "es.verdnatura"
minSdkVersion 24 //21
targetSdkVersion 33
versionCode 201
versionCode 205
versionName = "23.24Beta"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

7
app/src/main/java/es/verdnatura/domain/SalixService.kt
View File

@ -194,14 +194,15 @@ interface SalixService {
):
Call<Any>
@POST("Operators/udpate")
@PUT("Operators/udpate")
fun update_operator(
@Body params: Any,
@Query("") update:String
@Query("where[workerFk]") workerFk:Int
):
Call<Void>
@GET("Operators")//NO SALIX
@GET("Operators")
fun operator_getData(
@Query("filter") filter:String
):

2
app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt
View File

@ -417,7 +417,7 @@ class AjustesFragment :
editor.apply()
viewModel.ajustesitem.get(2).selected = it.name
/* viewModel.worker_updatePrinterSalix(
/* viewModel.worker_updatePrinterSalix(
it.id!!, getDataInt(USERFK)
)*/
viewModel.worker_updatePrinter(

2
app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt
View File

@ -480,7 +480,7 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
}
fun worker_updatePrinterSalix(printerFk: Int, workerFk : Int) {
ProgressLoading(VISIBLE)
salix.update_operator(OperatorPrinter(printerFk), "[workerFk]=19591")
salix.update_operator(OperatorPrinter(printerFk), workerFk)
.enqueue(object : SilexCallback<Void>(context) {
override fun onError(t: Throwable) {
ProgressLoading(GONE)