Browse Source

cambios buscar po clave

master
dolivaresr 10 months ago
parent
commit
4af0ce6e1f
10 changed files with 406 additions and 17 deletions
  1. +318
    -0
      .idea/other.xml
  2. +6
    -0
      .idea/vcs.xml
  3. +1
    -1
      app/src/main/java/jumapacelaya/gob/mx/almacen/bean/DetalleConteo.java
  4. +1
    -1
      app/src/main/java/jumapacelaya/gob/mx/almacen/dao/AppDatabase.java
  5. +4
    -0
      app/src/main/java/jumapacelaya/gob/mx/almacen/dao/PostViewModel.java
  6. +3
    -0
      app/src/main/java/jumapacelaya/gob/mx/almacen/dao/inventarioDao.java
  7. +40
    -2
      app/src/main/java/jumapacelaya/gob/mx/almacen/ui/main/PendienteFragment.java
  8. +1
    -1
      app/src/main/java/jumapacelaya/gob/mx/almacen/ui/main/PlaceholderFragment.java
  9. +29
    -10
      app/src/main/res/layout/fragment_item_list.xml
  10. +3
    -2
      app/src/main/res/layout/fragment_main.xml

+ 318
- 0
.idea/other.xml View File

@ -0,0 +1,318 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="direct_access_persist.xml">
<option name="deviceSelectionList">
<list>
<PersistentDeviceSelectionData>
<option name="api" value="27" />
<option name="brand" value="DOCOMO" />
<option name="codename" value="F01L" />
<option name="id" value="F01L" />
<option name="manufacturer" value="FUJITSU" />
<option name="name" value="F-01L" />
<option name="screenDensity" value="360" />
<option name="screenX" value="720" />
<option name="screenY" value="1280" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="28" />
<option name="brand" value="DOCOMO" />
<option name="codename" value="SH-01L" />
<option name="id" value="SH-01L" />
<option name="manufacturer" value="SHARP" />
<option name="name" value="AQUOS sense2 SH-01L" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1080" />
<option name="screenY" value="2160" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="31" />
<option name="brand" value="samsung" />
<option name="codename" value="a51" />
<option name="id" value="a51" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy A51" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="akita" />
<option name="id" value="akita" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 8a" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="samsung" />
<option name="codename" value="b0q" />
<option name="id" value="b0q" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S22 Ultra" />
<option name="screenDensity" value="600" />
<option name="screenX" value="1440" />
<option name="screenY" value="3088" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="32" />
<option name="brand" value="google" />
<option name="codename" value="bluejay" />
<option name="id" value="bluejay" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 6a" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="caiman" />
<option name="id" value="caiman" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 9 Pro" />
<option name="screenDensity" value="360" />
<option name="screenX" value="960" />
<option name="screenY" value="2142" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="comet" />
<option name="id" value="comet" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 9 Pro Fold" />
<option name="screenDensity" value="390" />
<option name="screenX" value="2076" />
<option name="screenY" value="2152" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="29" />
<option name="brand" value="samsung" />
<option name="codename" value="crownqlteue" />
<option name="id" value="crownqlteue" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Note9" />
<option name="screenDensity" value="420" />
<option name="screenX" value="2220" />
<option name="screenY" value="1080" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="dm3q" />
<option name="id" value="dm3q" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S23 Ultra" />
<option name="screenDensity" value="600" />
<option name="screenX" value="1440" />
<option name="screenY" value="3088" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="e1q" />
<option name="id" value="e1q" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S24" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="google" />
<option name="codename" value="felix" />
<option name="id" value="felix" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel Fold" />
<option name="screenDensity" value="420" />
<option name="screenX" value="2208" />
<option name="screenY" value="1840" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="felix" />
<option name="id" value="felix" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel Fold" />
<option name="screenDensity" value="420" />
<option name="screenX" value="2208" />
<option name="screenY" value="1840" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="google" />
<option name="codename" value="felix_camera" />
<option name="id" value="felix_camera" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel Fold (Camera-enabled)" />
<option name="screenDensity" value="420" />
<option name="screenX" value="2208" />
<option name="screenY" value="1840" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="samsung" />
<option name="codename" value="gts8uwifi" />
<option name="id" value="gts8uwifi" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Tab S8 Ultra" />
<option name="screenDensity" value="320" />
<option name="screenX" value="1848" />
<option name="screenY" value="2960" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="husky" />
<option name="id" value="husky" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 8 Pro" />
<option name="screenDensity" value="390" />
<option name="screenX" value="1008" />
<option name="screenY" value="2244" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="30" />
<option name="brand" value="motorola" />
<option name="codename" value="java" />
<option name="id" value="java" />
<option name="manufacturer" value="Motorola" />
<option name="name" value="G20" />
<option name="screenDensity" value="280" />
<option name="screenX" value="720" />
<option name="screenY" value="1600" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="komodo" />
<option name="id" value="komodo" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 9 Pro XL" />
<option name="screenDensity" value="360" />
<option name="screenX" value="1008" />
<option name="screenY" value="2244" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="google" />
<option name="codename" value="lynx" />
<option name="id" value="lynx" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 7a" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="31" />
<option name="brand" value="google" />
<option name="codename" value="oriole" />
<option name="id" value="oriole" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 6" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="google" />
<option name="codename" value="panther" />
<option name="id" value="panther" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 7" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="q5q" />
<option name="id" value="q5q" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Z Fold5" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1812" />
<option name="screenY" value="2176" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="30" />
<option name="brand" value="google" />
<option name="codename" value="r11" />
<option name="id" value="r11" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel Watch" />
<option name="screenDensity" value="320" />
<option name="screenX" value="384" />
<option name="screenY" value="384" />
<option name="type" value="WEAR_OS" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="30" />
<option name="brand" value="google" />
<option name="codename" value="redfin" />
<option name="id" value="redfin" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 5" />
<option name="screenDensity" value="440" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="shiba" />
<option name="id" value="shiba" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 8" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="google" />
<option name="codename" value="tangorpro" />
<option name="id" value="tangorpro" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel Tablet" />
<option name="screenDensity" value="320" />
<option name="screenX" value="1600" />
<option name="screenY" value="2560" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="tokay" />
<option name="id" value="tokay" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 9" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2424" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="29" />
<option name="brand" value="samsung" />
<option name="codename" value="x1q" />
<option name="id" value="x1q" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S20" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1440" />
<option name="screenY" value="3200" />
</PersistentDeviceSelectionData>
</list>
</option>
</component>
</project>

+ 6
- 0
.idea/vcs.xml View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

+ 1
- 1
app/src/main/java/jumapacelaya/gob/mx/almacen/bean/DetalleConteo.java View File

@ -9,7 +9,7 @@ import com.google.gson.annotations.Expose;
import java.io.Serializable;
import java.math.BigDecimal;
@Entity(primaryKeys = {"almacenpk","articulopk","conteopk"})
@Entity(primaryKeys = {"inventariopk","almacenpk","articulopk","conteopk"})
public class DetalleConteo implements Serializable {


+ 1
- 1
app/src/main/java/jumapacelaya/gob/mx/almacen/dao/AppDatabase.java View File

@ -17,7 +17,7 @@ import jumapacelaya.gob.mx.almacen.bean.DetalleConteo;
import jumapacelaya.gob.mx.almacen.dao.converts.DateConverter;
import jumapacelaya.gob.mx.almacen.dao.converts.LocalDateConverter;
@Database(entities = {Conteo.class, DetalleConteo.class, Inventario.class}, version = 8, exportSchema = false)
@Database(entities = {Conteo.class, DetalleConteo.class, Inventario.class}, version = 9, exportSchema = false)
@TypeConverters({BooleanTointeger.class, BigdecimalToLong.class, DateConverter.class})
public abstract class AppDatabase extends RoomDatabase {


+ 4
- 0
app/src/main/java/jumapacelaya/gob/mx/almacen/dao/PostViewModel.java View File

@ -31,6 +31,10 @@ public class PostViewModel extends AndroidViewModel {
return postDao.livePendiente_Detalles(inventariopk, conteo);
}
public LiveData<List<DetalleConteo>> getPendientesConteoClave(int inventariopk, Integer conteo, String filter) {
return postDao.livePendiente_Detallesclave(inventariopk, conteo, filter);
}
public LiveData<List<DetalleConteo>> getAvanceConteo(int inventariopk, Integer conteo) {
return postDao.liveAvance_Detalles(inventariopk, conteo);
}


+ 3
- 0
app/src/main/java/jumapacelaya/gob/mx/almacen/dao/inventarioDao.java View File

@ -106,6 +106,9 @@ public abstract class inventarioDao {
@Query("Select * from DetalleConteo Where inventariopk = :inventariopk And conteopk= :conteopk and (cantidad is null or cantidad = 0) Order by folio")
public abstract LiveData<List<DetalleConteo>> livePendiente_Detalles(Integer inventariopk, Integer conteopk);
@Query("Select * from DetalleConteo Where inventariopk = :inventariopk And conteopk= :conteopk and clave like '%' || :filter || '%' and (cantidad is null or cantidad = 0) Order by folio")
public abstract LiveData<List<DetalleConteo>> livePendiente_Detallesclave(Integer inventariopk, Integer conteopk, String filter);
@Query("Select * from DetalleConteo Where inventariopk = :inventariopk And conteopk= :conteopk ")
public abstract List<DetalleConteo> listContados_Detalles(Integer inventariopk, Integer conteopk);


+ 40
- 2
app/src/main/java/jumapacelaya/gob/mx/almacen/ui/main/PendienteFragment.java View File

@ -7,9 +7,14 @@ import android.os.Bundle;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.EditText;
import android.widget.TextView;
import jumapacelaya.gob.mx.almacen.MainActivity;
import jumapacelaya.gob.mx.almacen.R;
@ -34,6 +39,8 @@ public class PendienteFragment extends Fragment {
Conteo conteo;
MainActivity activity;
EditText txtfilter;
RecyclerView recyclerView;
private OnListFragmentInteractionListener mListener;
@ -73,10 +80,13 @@ public class PendienteFragment extends Fragment {
Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_item_list, container, false);
recyclerView = view.findViewById(R.id.list);
txtfilter = view.findViewById(R.id.txtfilter_pend);
// Set the adapter
if (view instanceof RecyclerView) {
if (recyclerView != null) {
Context context = view.getContext();
RecyclerView recyclerView = (RecyclerView) view;
//RecyclerView recyclerView = (RecyclerView) view;
//if (mColumnCount <= 1) {
recyclerView.setLayoutManager(new LinearLayoutManager(context));
//} else {
@ -86,6 +96,22 @@ public class PendienteFragment extends Fragment {
postViewModel.getPendientesConteo(conteo.getInventariopk(),conteo.getConteopk()).observe(getViewLifecycleOwner(), detalleConteos -> adapter.setData(detalleConteos));
recyclerView.setAdapter(adapter);
}
txtfilter.addTextChangedListener(new TextWatcher() {
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
filter(s.toString());
}
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void afterTextChanged(Editable s) {
}
});
return view;
}
@ -121,4 +147,16 @@ public class PendienteFragment extends Fragment {
// TODO: Update argument type and name
void onListFragmentInteraction(DetalleConteo item);
}
//filter list recicler view
// method to filter data based on query
private void filter(String text) {
// creating a new array list to filter data
if(text.isEmpty())
postViewModel.getPendientesConteo(conteo.getInventariopk(),conteo.getConteopk()).observe(getViewLifecycleOwner(), detalleConteos -> adapter.setData(detalleConteos));
else
postViewModel.getPendientesConteoClave(conteo.getInventariopk(),conteo.getConteopk(), text).observe(getViewLifecycleOwner(), detalleConteos -> adapter.setData(detalleConteos));
}
}

+ 1
- 1
app/src/main/java/jumapacelaya/gob/mx/almacen/ui/main/PlaceholderFragment.java View File

@ -251,7 +251,7 @@ public class PlaceholderFragment extends Fragment {
InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
imm.showSoftInput(txtCantidad, InputMethodManager.SHOW_IMPLICIT);
Toast.makeText(getContext(),detalle.getDescArticulo(), LENGTH_SHORT).show();
//Toast.makeText(getContext(),detalle.getDescArticulo(), LENGTH_SHORT).show();
}


+ 29
- 10
app/src/main/res/layout/fragment_item_list.xml View File

@ -1,14 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/list"
android:name="jumapacelaya.gob.mx.almacen.ui.main.PendienteFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
app:layoutManager="LinearLayoutManager"
tools:context=".ui.main.PendienteFragment"
tools:listitem="@layout/fragment_item"
/>
android:layout_height="wrap_content"
android:orientation="vertical"
>
<EditText
android:id="@+id/txtfilter_pend"
android:layout_width="match_parent"
android:layout_height="59dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:autofillHints=""
android:ems="10"
android:inputType="text"
android:text="" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/list"
android:name="jumapacelaya.gob.mx.almacen.ui.main.PendienteFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
app:layoutManager="LinearLayoutManager"
tools:context=".ui.main.PendienteFragment"
tools:listitem="@layout/fragment_item"
/>
</LinearLayout>

+ 3
- 2
app/src/main/res/layout/fragment_main.xml View File

@ -165,9 +165,10 @@
android:autofillHints=""
android:selectAllOnFocus="true"
android:ems="10"
android:inputType="number"
android:inputType="numberDecimal"
android:textAlignment="center"
android:textAllCaps="false" />
android:textAllCaps="false"
tools:ignore="LabelFor" />
<Button
android:id="@+id/btncap_aceptar"


Loading…
Cancel
Save