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

refs #4274 local

This commit is contained in:
Sergio De la torre 2023-03-22 11:53:37 +01:00
parent d1d7ffa42c
commit a59c313a41
5 changed files with 27 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
.idea/workspace.xml
View File

@ -83,19 +83,12 @@
</select>
</component>
<component name="ChangeListManager">
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #4923 añadirTickets">
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/ic_arrow_down.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/ic_arrow_up.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules/app/Gestor_Almacén.app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/Gestor_Almacén.app.iml" afterDir="false" />
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #4923 previas">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/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/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/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/mapper/CollectionMapper.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/mapper/CollectionMapper.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/res/layout/item_article_row_fragment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row_fragment.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.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/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/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -405,13 +398,6 @@
<option name="presentableId" value="Default" />
<updated>1618825571576</updated>
</task>
<task id="LOCAL-00069" summary="Version 8.7 Reubicación, sector = SACADOR V, controlador no puede hacer parking si no están revisados todos los tickets,">
<created>1656930096719</created>
<option name="number" value="00069" />
<option name="presentableId" value="LOCAL-00069" />
<option name="project" value="LOCAL" />
<updated>1656930096719</updated>
</task>
<task id="LOCAL-00070" summary="Version 8.8Beta precio coste artículo, modificar tallos, mensajes error para items sin buyFk y ticket eliminado o viejo">
<created>1659005042067</created>
<option name="number" value="00070" />
@ -748,7 +734,14 @@
<option name="project" value="LOCAL" />
<updated>1679389331215</updated>
</task>
<option name="localTasksCounter" value="118" />
<task id="LOCAL-00118" summary="refs #4923 previas">
<created>1679477988938</created>
<option name="number" value="00118" />
<option name="presentableId" value="LOCAL-00118" />
<option name="project" value="LOCAL" />
<updated>1679477988939</updated>
</task>
<option name="localTasksCounter" value="119" />
<servers />
</component>
<component name="Vcs.Log.History.Properties">
@ -849,7 +842,6 @@
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="Version 9.5Beta añadido inteceptor y modificado código worker_getId. Subida como 9.4.2Beta" />
<MESSAGE value="Version 9.6Beta Interteceptors, quitando userCase y arreglado click sobre carita. Cambiado .gitignore" />
<MESSAGE value="Version 9.6Beta Interteptors, quitando userCase y arreglado click sobre carita. Cambiado .gitignore" />
<MESSAGE value="Version 9.6Beta Añadido a BaseFragment(context). Quitado código repetido de las llamadas" />
@ -874,7 +866,8 @@
<MESSAGE value="refs #4755 mostrar tickets" />
<MESSAGE value="refs #5117 autoconsumo" />
<MESSAGE value="refs #4755 añadirTickets" />
<option name="LAST_COMMIT_MESSAGE" value="refs #4755 añadirTickets" />
<MESSAGE value="refs #4923 previas" />
<option name="LAST_COMMIT_MESSAGE" value="refs #4923 previas" />
</component>
<component name="XDebuggerManager">
<pin-to-top-manager>

6
app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt
View File

@ -241,10 +241,14 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginVi
R.string.Actualizar
)
) {
try {
val openURL = Intent(Intent.ACTION_VIEW)
openURL.data =
Uri.parse(it.url)
startActivity(openURL)
}catch (ex:Exception){
getString(R.string.problemUpdate).toast(requireActivity())
}
}
if (it.IsVersionCritical == 1) {
@ -489,7 +493,7 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginVi
private fun goToMain() {
val intent = Intent(activity, MainActivity::class.java)
startActivity(intent)
binding.splashProgress.visibility=View.GONE
binding.splashProgress.visibility = View.GONE
requireActivity().finish()
}

12
app/src/main/java/es/verdnatura/presentation/view/feature/login/model/LoginItemVO.kt
View File

@ -1,15 +1,5 @@
package es.verdnatura.presentation.view.feature.login.model
/*class LoginItemVO(
val id: String = "",
var isError: Boolean = false,
var errorMessage: String = ""
)*/
private val s = ""
class LoginSalixVO(
val user: String = "",
val password: String = "",
@ -37,7 +27,7 @@ class versionApp(
val appname: String = "",
val version: String = "",
var IsVersionCritical: Int = 0,
var url: String="",
var url: String? = null,
var isError: Boolean = false,
var errorMessage: String = ""
)

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

@ -545,5 +545,6 @@
<string name="errorScanned">Texto escaneado no válido</string>
<string name="deleteQuantity">Va a eliminar para Autoconsumo la cantidad del artículo:</string>
<string name="tickets">" Tickets:"</string>
<string name="problemUpdate">No es posible actualizar. Problema con la descarga de la app</string>
</resources>

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

@ -544,5 +544,6 @@
<string name="selfConsumption">Self-consumption</string>
<string name="adress">Address</string>
<string name="modify">Modify</string>
<string name="problemUpdate">It\'s not possible to update. Problem with the download of app</string>
</resources>