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

Beta 23.10.Quitar checkFullyControlled

This commit is contained in:
Sergio De la torre 2023-03-13 16:12:24 +01:00
parent c606eb6d71
commit a1009d2790
5 changed files with 10 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml
View File

@ -276,7 +276,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_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

16
.idea/workspace.xml
View File

@ -83,12 +83,12 @@
</select>
</component>
<component name="ChangeListManager">
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 23.8Beta Modificado para app reparto para que abre versión si es beta o no">
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Quitar procedimiento refs #4661">
<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/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/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/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/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" 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" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -99,7 +99,7 @@
<component name="CodeInsightWorkspaceSettings">
<option name="optimizeImportsOnTheFly" value="true" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[21114523025303]" />
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\sergiodt\.android\avd\Pixel_2_API_24.avd]" />
<component name="ExportToHTMLSettings">
<option name="OPEN_IN_BROWSER" value="true" />
<option name="OUTPUT_DIRECTORY" value="C:\Program Files\Android\Android Studio\inspections" />
@ -201,6 +201,7 @@
</component>
<component name="HighlightingSettingsPerFile">
<setting file="file://$PROJECT_DIR$/app/build.gradle" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixService.kt" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseViewModel.kt" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" root0="FORCE_HIGHLIGHTING" />
@ -213,6 +214,7 @@
<setting file="file://$PROJECT_DIR$/app/src/main/res/layout/toolbar_fragment.xml" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/app/src/main/res/values/styles.xml" root0="FORCE_HIGHLIGHTING" />
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
@ -838,7 +840,6 @@
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="Version 9.2.1 Modificado fragment a fragment_general" />
<MESSAGE value="Version 9.2.1 añadido error encajado y modificado marcaje" />
<MESSAGE value="Version 9.2.1 en producción" />
<MESSAGE value="Version 9.2.1 en producción. Borrada Voz y Ajustes impresora" />
@ -863,7 +864,8 @@
<MESSAGE value="Version 23.2 Modificado orden ubicador y revisión anterior falta activar icono" />
<MESSAGE value="Version 23.2 Modificado actualizar pantalla al transferir en Ubicador. Subida version" />
<MESSAGE value="Activado impresion labelCount" />
<option name="LAST_COMMIT_MESSAGE" value="Activado impresion labelCount" />
<MESSAGE value="Quitar procedimiento refs #4661" />
<option name="LAST_COMMIT_MESSAGE" value="Quitar procedimiento refs #4661" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>

30
app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
View File

@ -1,6 +1,5 @@
package es.verdnatura.domain
//import es.verdnatura.presentation.view.feature.buscaritemall.model.ItemLocationAll
import com.google.gson.JsonObject
import es.verdnatura.presentation.view.feature.ajustes.model.Printers
import es.verdnatura.presentation.view.feature.ajustes.model.SectorItemVO
@ -44,18 +43,6 @@ import retrofit2.http.POST
@JvmSuppressWildcards
interface VerdnaturaService {
//LOGIN ========================================================================>
/* @POST("security/login")//REVISADA
fun login(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
):
Call<String>*/
@POST("security/device_checkLogin")//REVISADA
fun device_checkLogin(
@Body vararg params: Any
@ -222,23 +209,6 @@ interface VerdnaturaService {
):
Call<Any>
/* @POST("almacennew/collectionTicketGet")//REVISADA-ANULADA POT collection_getTickets
fun collectionTicketGet(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
):
Call<CollectionVO>*/
@POST("almacennew/ticket_checkFullyControlled")//NO SALIX
fun ticket_checkFullyControlled(
@Body vararg params: Any
):
Call<Any>
@POST("almacennew/ticket_isOutClosureZone")//NO SALIX
fun ticket_isOutClosureZone(
@Body vararg params: Any

30
app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
View File

@ -718,37 +718,7 @@ class CollectionFragment(
goMistakeBack = true
})
//sergio: para si hay algun ticket por revisar antes de parkinear
responsecheckfully.observe(viewLifecycleOwner, Observer {
binding.splashProgress.visibility = View.GONE
if (it.isError) {
ma.messageWithSound(it.errorMessage, it.isError, false)
} else {
//sergio: devuelve false si no hay para revisar y <> false.
if (it.response != "false") {
customDialog.setTitle(getString(R.string.warning))
.setDescription(getString(R.string.pendingReview) + it.response)
.setOkButton(getString(R.string.accept)) {
customDialog.dismiss()
}
.setKoButton(getString(R.string.review)) {
binding.splashProgress.visibility = View.VISIBLE
viewModel.collectionTicketGet(
it.response.toInt(),
getDataInt(SECTORFK),
print = "0",
type
)
customDialog.dismiss()
}
customDialog.show()
}
// if (!goBack)navigateToCollectionList(it)
//goBack = false
}
})
responseCollectionUnchecked.observe(viewLifecycleOwner, Observer {
binding.splashProgress.visibility = View.GONE
if (it.isError) {

28
app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt
View File

@ -889,34 +889,6 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
})
}
fun ticket_checkFullyControlled(
collectionFk: String
) {
silex.ticket_checkFullyControlled(
collectionFk
).enqueue(object :
SilexCallback<Any>(context) {
override fun onFailure(call: Call<Any>, t: Throwable) {
_responsecheckfully.value = ResponseItemVO(
isError = true,
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
)
}
override fun onSuccess(response: Response<Any>) {
if (response.body().toString() != "false") {
//sergio:
_responsecheckfully.value = ResponseItemVO(
isError = false,
response = response.body()!!.toString(),
errorMessage = ""
)
}
}
})
}
fun collection_getUncheckedTicket(
collectionFk: Int
) {