Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .idea/deploymentTargetSelector.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
<!-- <activity-->
<!-- android:name=".ui.Chatbot"-->
<!-- android:exported="false" />-->
<activity
android:name=".ui.VisaoGeralEstoque"
android:exported="false" />
<activity
android:name=".ui.Conversa"
android:exported="false" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package com.example.projetosaveit.adapter

import android.app.AlertDialog
import android.content.Intent
import android.graphics.Color
import android.graphics.drawable.ColorDrawable
import android.os.Bundle
import android.util.Log
import android.view.LayoutInflater
Expand Down Expand Up @@ -79,6 +81,9 @@ class AdapterProduto : RecyclerView.Adapter<AdapterProduto.ViewHolder>() {
val builder = AlertDialog.Builder(activity).setView(dialogView)
val dialog = builder.create()

dialog.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))


val cancelBtn = dialogView!!.findViewById<Button>(R.id.button)
val saveBtn = dialogView.findViewById<Button>(R.id.button3)
val editQuantidade = dialogView.findViewById<EditText>(R.id.editTextNumber)
Expand Down Expand Up @@ -106,7 +111,7 @@ class AdapterProduto : RecyclerView.Adapter<AdapterProduto.ViewHolder>() {
produto.name
)

var estoque : EstoqueDTO = EstoqueDTO(0, 0, quantidadeAtual - quantidade, produto.batchId, produto.id, 0, "", currentDate)
var estoque : EstoqueDTO = EstoqueDTO(0, 0, quantidade, produto.batchId, produto.id, 0, "", currentDate)
repositoryEstoque.postEstoque(estoque).enqueue(object : retrofit2.Callback<ResponseBody> {
override fun onResponse(
call: retrofit2.Call<ResponseBody>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import com.example.projetosaveit.api.repository.VitrineRepository
import com.example.projetosaveit.model.VitrineDTO
import com.example.projetosaveit.ui.ProdutoVitrine
import java.text.SimpleDateFormat
import java.time.LocalDate
import java.time.format.DateTimeFormatter
import java.util.Locale

class AdapterVitrine() : RecyclerView.Adapter<AdapterVitrine.ViewHolder>() {
Expand Down Expand Up @@ -58,14 +60,20 @@ class AdapterVitrine() : RecyclerView.Adapter<AdapterVitrine.ViewHolder>() {
bundle.putString("empresaVitrine", response.body()?.empresa)
bundle.putInt("quantidadeVitrine", response.body()?.quantidadeGeral ?: 0)
val validadeOriginal = response.body()?.validade
val sdfEntrada = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
val sdfSaida = SimpleDateFormat("dd/MM/yyyy", Locale.getDefault())
val validadeFormatada = try {
validadeOriginal?.let { sdfSaida.format(sdfEntrada.parse(it)!!) }
val formatoEntrada = if (validadeOriginal?.contains("T") == true) {
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.getDefault())
} else {
SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
}
val formatoSaida = SimpleDateFormat("dd/MM/yyyy", Locale.getDefault())
validadeOriginal?.let { formatoSaida.format(formatoEntrada.parse(it)!!) }
} catch (e: Exception) {
null
"Data inválida"
}



bundle.putString("validadeVitrine", validadeFormatada ?: "Data inválida")
bundle.putString("pesoVitrine", response.body()?.tipoPeso)
intent.putExtras(bundle)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.example.projetosaveit.adapter.recycleView

class ProdutoEstoqueRelatorio(
val productName: String,
val quantity: Long,
val maxQuantity: Long
) {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.example.projetosaveit.adapter.recycleView

class Venda(
val productName: String,
val quantityOutput: String
) {}
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
package com.example.projetosaveit.api.network

import com.example.projetosaveit.adapter.recycleView.ProdutoEstoqueRelatorio
import com.example.projetosaveit.adapter.recycleView.Venda
import com.example.projetosaveit.adapter.recycleView.Produto
import com.example.projetosaveit.adapter.recycleView.Vitrine
import com.example.projetosaveit.model.ChatDTO
import com.example.projetosaveit.model.ChatRequest
import com.example.projetosaveit.model.ChatResponse
//import com.example.projetosaveit.model.ChatRequest
//import com.example.projetosaveit.model.ChatResponse
import com.example.projetosaveit.model.EmpresaDTO
import com.example.projetosaveit.model.EmpresaInsertDTO
import com.example.projetosaveit.model.EstoqueDTO
import com.example.projetosaveit.model.FuncionarioDTO
import com.example.projetosaveit.model.FuncionarioInsertDTO
import com.example.projetosaveit.model.HistoricoResponse
//import com.example.projetosaveit.model.HistoricoResponse
import com.example.projetosaveit.model.ImagemDTO
import com.example.projetosaveit.model.IniciarChatRequest
import com.example.projetosaveit.model.IniciarChatResponse
//import com.example.projetosaveit.model.IniciarChatRequest
//import com.example.projetosaveit.model.IniciarChatResponse
import com.example.projetosaveit.model.LoteDTO
import com.example.projetosaveit.model.LoteInsertDTO
import com.example.projetosaveit.model.ProdutoInfoDTO
Expand All @@ -27,7 +29,6 @@ import retrofit2.http.Body
import retrofit2.http.GET
import retrofit2.http.PATCH
import retrofit2.http.POST
import retrofit2.http.PUT
import retrofit2.http.Path
import retrofit2.http.Query

Expand All @@ -54,6 +55,12 @@ interface ApiService {
@GET("api/image/showcase-images/{showcaseId}")
fun getVitrine(@Path("showcaseId") showcaseId : Long): Call<VitrineDTO>

@GET("/api/stock/listarQuantidadesProduto/{enterpriseId}")
fun getQuantidadesProduto(@Path("enterpriseId") enterpriseId: Long): Call<List<ProdutoEstoqueRelatorio>>

@GET("/api/stock/listarMovimentacoesEstoque/{enterpriseId}")
fun getListaMovimentacoesEstoque(@Path("enterpriseId") enterpriseId: Long) : Call<List<Venda>>

@GET("api/batch/informacoesProduto/{batchId}")
fun getProdutoId(@Path("batchId") idProduto : Long): Call<ProdutoInfoDTO>

Expand Down Expand Up @@ -125,12 +132,12 @@ interface ApiService {

// API de Chatbot

@POST("iniciar_chat")
fun iniciarChat(@Body request: IniciarChatRequest): Call<IniciarChatResponse>

@POST("executar_fluxo")
fun enviarMensagem(@Body request: ChatRequest): Call<ChatResponse>

@GET("obter_historico")
fun obterHistorico(@Query("session_id") sessionId: String): Call<HistoricoResponse>
// @POST("iniciar_chat")
// fun iniciarChat(@Body request: IniciarChatRequest): Call<IniciarChatResponse>
//
// @POST("executar_fluxo")
// fun enviarMensagem(@Body request: ChatRequest): Call<ChatResponse>
//
// @GET("obter_historico")
// fun obterHistorico(@Query("session_id") sessionId: String): Call<HistoricoResponse>
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package com.example.projetosaveit.api.repository

import com.example.projetosaveit.api.network.ApiService
import com.example.projetosaveit.adapter.recycleView.ProdutoEstoqueRelatorio
import com.example.projetosaveit.adapter.recycleView.Venda
import com.example.projetosaveit.api.network.RetrofitClientSql
import com.example.projetosaveit.model.EstoqueDTO
import com.example.projetosaveit.model.EstoqueInsertDTO
import com.example.projetosaveit.model.RelatorioDTO
import com.example.projetosaveit.model.RelatorioProdutoDTO
import okhttp3.Response
import okhttp3.ResponseBody
import retrofit2.Call

Expand All @@ -23,4 +22,12 @@ class EstoqueRepository {
fun getRelatorioProduto(enterpriseId : Long, productId : Long) : Call<List<RelatorioProdutoDTO>> {
return RetrofitClientSql.instance.getRelatorioProduto(enterpriseId, productId)
}

fun getQuantidadesProduto(enterpriseId : Long) : Call<List<ProdutoEstoqueRelatorio>> {
return RetrofitClientSql.instance.getQuantidadesProduto(enterpriseId)
}

fun getMovimentacoesProduto(enterpriseId: Long) : Call<List<Venda>> {
return RetrofitClientSql.instance.getListaMovimentacoesEstoque(enterpriseId)
}
}
Loading
Loading