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

Version 9.1Beta-Quantity_y_originalQuantity_view_to_Integer.toString

This commit is contained in:
Sergio De la torre 2022-09-23 16:33:23 +02:00
parent 7b43fdd7e4
commit f058f239ab
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml
View File

@ -207,7 +207,7 @@
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_workermistake.xml" value="0.2265625" /> <entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/fragment_workermistake.xml" value="0.2265625" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_ajustes_row.xml" value="0.16666666666666666" /> <entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_ajustes_row.xml" value="0.16666666666666666" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_article_row.xml" value="0.3333333333333333" /> <entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_article_row.xml" value="0.3333333333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_article_row_fragment.xml" value="0.15982721382289417" /> <entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_article_row_fragment.xml" value="0.4298056155507559" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_article_row_presacador.xml" value="0.4466666666666667" /> <entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_article_row_presacador.xml" value="0.4466666666666667" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_article_row_reubication_fragment.xml" value="0.36614583333333334" /> <entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_article_row_reubication_fragment.xml" value="0.36614583333333334" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_barcode_row.xml" value="0.15579710144927536" /> <entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout/item_barcode_row.xml" value="0.15579710144927536" />

4
app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt
View File

@ -79,7 +79,7 @@ class GetLoginUserCase(context: Context) : RestClient(context)
fun sendChekingPresence(token:String,workerId:Int,message:String) : Call<Boolean>{ fun sendChekingPresence(token:String,workerId:Int,message:String) : Call<Boolean>{
var working_in_test=false // Enviar a grupo test Android o a los usuarios var working_in_test=true // Enviar a grupo test Android o a los usuarios
if (!working_in_test) { if (!working_in_test) {
return salixClient!!.sendChekingPresence( return salixClient!!.sendChekingPresence(
@ -89,7 +89,7 @@ fun sendChekingPresence(token:String,workerId:Int,message:String) : Call<Boolean
) )
}else{ }else{
return salixClient!!.sendGroup( return salixClientSend!!.sendGroup(
content_type = "application/json", content_type = "application/json",
authorization = token, authorization = token,
params = SalixGrupo(to = "#android-test", message = message)) params = SalixGrupo(to = "#android-test", message = message))

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

@ -159,12 +159,11 @@ interface SalixService {
interface SalixServiceSend { interface SalixServiceSend {
@POST("chats/sendCheckingPresence") @POST("chats/send")
fun sendChekingPresence( fun sendGroup(
@Header("Content-Type") content_type: String, @Header("Content-Type") content_type: String,
@Header("Authorization") authorization: String, @Header("Authorization") authorization: String,
@Body params: SalixMessageVO): @Body params: SalixGrupo
):
Call<Boolean> Call<Boolean>
} }

2
app/src/main/res/layout/item_article_row.xml
View File

@ -224,7 +224,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/layout_margin_1" android:layout_marginEnd="@dimen/layout_margin_1"
android:text="@{sale.quantity}" android:text="@{Integer.toString(sale.quantity)}"
tool:text="10" tool:text="10"
android:textColor="@color/verdnatura_white" android:textColor="@color/verdnatura_white"
android:textSize="@dimen/h6" android:textSize="@dimen/h6"

2
app/src/main/res/layout/item_article_row_presacador.xml
View File

@ -191,7 +191,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/layout_margin_min" android:layout_marginEnd="@dimen/layout_margin_min"
android:text="@{sale.quantity}" android:text="@{Integer.toString(sale.quantity)}"
tool:text="10" tool:text="10"
android:textColor="@color/verdnatura_white" android:textColor="@color/verdnatura_white"
android:textSize="@dimen/h6" android:textSize="@dimen/h6"