leca/barcode_scanner_for_employees
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 7 Wiki Activity

updating abstract products are now uploaded

Browse Source
This commit is contained in:
leca
2024-11-06 04:21:12 +03:00
parent 3e5150754a
commit 94d309c491
3 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/main/java/org/foxarmy/barcodescannerforemployees/Net.kt
View File

@@ -116,7 +116,7 @@ class Net {
return response
}
fun changeUsername( newUsername: String): Response {
fun changeUsername(newUsername: String): Response {
lateinit var response: Response
@@ -257,7 +257,7 @@ class Net {
return responseText
}
fun getGroupName(id: Int) : String {
fun getGroupName(id: Int): String {
lateinit var response: Response
thread {
@@ -352,4 +352,35 @@ class Net {
return response
}
fun updateAbstractProduct(groupId: Int, abstractProduct: AbstractProduct, imageFile: File): Response {
lateinit var response: Response
thread {
val client = OkHttpClient()
val body = MultipartBody.Builder()
.setType("multipart/form-data".toMediaType())
.addFormDataPart("file", imageFile.name, imageFile.asRequestBody("image/png".toMediaTypeOrNull()))
.addFormDataPart("groupId", groupId.toString())
.addFormDataPart("localId", abstractProduct.id.toString())
.addFormDataPart("barcode", abstractProduct.barcode)
.addFormDataPart("name", abstractProduct.name)
.addFormDataPart("net_weight", abstractProduct.netWeight.toString())
.addFormDataPart("category", abstractProduct.category.toString())
.addFormDataPart("unit", abstractProduct.unit.toString())
.build()
val request = Request.Builder()
.url("https://$server/api/abstractproduct/update")
.post(body)
.addHeader("Authorization", "Bearer $token")
.addHeader("accept-language", language)
.build()
response = client.newCall(request).execute()
}.join()
return response
}
}

27
app/src/main/java/org/foxarmy/barcodescannerforemployees/activities/AddAbstractProductActivity.kt
View File

@@ -157,22 +157,23 @@ class AddAbstractProductActivity : AppCompatActivity() {
val currentGroup = sharedPreferences.getString("currentGroup", "")!!
lateinit var response: Response
abstractProduct = AbstractProduct(
if(abstractProduct == null) 0 else abstractProduct!!.id,
barcode,
productName,
netWeight.toString().toDouble(),
pictureFile.nameWithoutExtension,
categorySpinner.selectedItemPosition,
unitTypeSpinner.selectedItemPosition
)
val pictureFile = File(File(filesDir, "pictures"), "${abstractProduct!!.imageHash}.png")
if (action == "update") {
DAO.updateAbstractProduct(abstractProduct!!, this)
DAO.updateAbstractProduct(abstractProduct!!)
response = net.updateAbstractProduct(currentGroup.toInt(), abstractProduct!!, pictureFile)
} else if (action == "new" || action == "new_from_barcode") {
abstractProduct = AbstractProduct(
0,
barcode,
productName,
netWeight.toString().toDouble(),
pictureFile.nameWithoutExtension,
categorySpinner.selectedItemPosition,
unitTypeSpinner.selectedItemPosition
)
abstractProduct!!.id = DAO.addAbstractProduct(abstractProduct!!).toInt()
val pictureFile = File(File(filesDir, "pictures"), "${abstractProduct!!.imageHash}.png")
response = net.uploadAbstractProduct(currentGroup.toInt(), abstractProduct!!, pictureFile);
}
Toast.makeText(this, response.body!!.string(), Toast.LENGTH_LONG).show()

2
app/src/main/java/org/foxarmy/barcodescannerforemployees/database/AbstractProductDAO.kt
View File

@@ -244,7 +244,7 @@ class AbstractProductDAO(private val dbHelper: DBStorageController) {
return id
}
fun updateAbstractProduct(abstractProduct: AbstractProduct, context: Context) {
fun updateAbstractProduct(abstractProduct: AbstractProduct) {
val db = dbHelper.writableDatabase