UIND
/
QA-App
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Feedback: 

1- Hand feel fields included
2- Resolve Section selection in draft report
main
saad.siddiq 2025-04-23 17:11:30 +05:00
parent 53f3380d93
commit fdf6b32e79
6 changed files with 214 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -10,8 +10,8 @@ android {
applicationId "com.utopiaindustries.qualitychecker" applicationId "com.utopiaindustries.qualitychecker"
minSdk 24 minSdk 24
targetSdk 34 targetSdk 34
versionCode 1 versionCode 3
versionName "1.0" versionName "1.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }

2
app/src/main/java/com/utopiaindustries/qualitychecker/apiservice/RetrofitClient.java
View File

@ -20,7 +20,7 @@ import retrofit2.converter.gson.GsonConverterFactory;
public class RetrofitClient { public class RetrofitClient {
private final static String BASE_URL = "https://portal.utopiaindustries.pk/uind/"; private final static String BASE_URL = "https://portal.utopiaindustries.pk/uind/";
//private final static String BASE_URL = "http://192.168.91.44:8081/uind/";//"http://192.168.91.44:8081/uind/";//"http://192.168.90.27:8080/uind/";//"http://192.168.91.16:8080/uind/"; //private final static String BASE_URL = "http://192.168.91.44:8080/uind/";//"http://192.168.91.44:8081/uind/";//"http://192.168.90.27:8080/uind/";//"http://192.168.91.16:8080/uind/";
private static Retrofit retrofit; private static Retrofit retrofit;

33
app/src/main/java/com/utopiaindustries/qualitychecker/ui/fragments/FirstStepFragment.java
View File

@ -85,7 +85,6 @@ public class FirstStepFragment extends Fragment implements View.OnClickListener
private InspectionReportService inspectionReportService; private InspectionReportService inspectionReportService;
private EditText aqlSampleSize, cartonWeight, cartonLength, cartonWidth, cartonHeight; private EditText aqlSampleSize, cartonWeight, cartonLength, cartonWidth, cartonHeight;
private EditText packWeight, packLength, packWidth, packHeight; private EditText packWeight, packLength, packWidth, packHeight;
private EditText etHandFeelNotOk, etHandFeelOk, etHandFeelPercent;
TextView txtTesting; TextView txtTesting;
List<String> sizes = Collections.singletonList("[Size]"); List<String> sizes = Collections.singletonList("[Size]");
@ -717,34 +716,6 @@ public class FirstStepFragment extends Fragment implements View.OnClickListener
} }
}); });
etHandFeelNotOk.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
try {
int sampleSize = Integer.parseInt(aqlSampleSize.getText().toString());
int handFeelNotOk = Integer.parseInt(s.toString());
int handFeelOk = sampleSize - handFeelNotOk;
etHandFeelOk.setText(String.valueOf(handFeelOk));
double percent = (double) handFeelNotOk / sampleSize * 100;
etHandFeelPercent.setText(String.format("%s%%", percent));
store.getReport().getItems().get(0).setHandFeelNotOkay(Long.parseLong(s.toString()));
} catch (Exception e) {
store.getReport().getItems().get(0).setHandFeelNotOkay(0);
}
}
@Override
public void afterTextChanged(Editable s) {
}
});
// generalRemarks.addTextChangedListener(new TextWatcher() { // generalRemarks.addTextChangedListener(new TextWatcher() {
// @Override // @Override
// public void beforeTextChanged(CharSequence s, int start, int count, int after) { // public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@ -1113,10 +1084,6 @@ public class FirstStepFragment extends Fragment implements View.OnClickListener
boxCartonSelected = view.findViewById(R.id.box_carton_selected); boxCartonSelected = view.findViewById(R.id.box_carton_selected);
itemPerBoxSelected = view.findViewById(R.id.item_per_box_selected); itemPerBoxSelected = view.findViewById(R.id.item_per_box_selected);
piecesSelected = view.findViewById(R.id.pieces_selected); piecesSelected = view.findViewById(R.id.pieces_selected);
etHandFeelNotOk = view.findViewById(R.id.et_hand_feel_not_ok);
etHandFeelOk = view.findViewById(R.id.et_hand_feel_ok);
etHandFeelPercent = view.findViewById(R.id.et_not_ok_percent);
txtTesting = view.findViewById(R.id.txtTesting); txtTesting = view.findViewById(R.id.txtTesting);
aqlSampleSize = view.findViewById(R.id.et_aql_sample_size); aqlSampleSize = view.findViewById(R.id.et_aql_sample_size);

44
app/src/main/java/com/utopiaindustries/qualitychecker/ui/fragments/ThirdStepFragment.java
View File

@ -103,6 +103,8 @@ public class ThirdStepFragment extends Fragment implements View.OnClickListener
ArrayList<String> sectionArrayList = new ArrayList<>(); ArrayList<String> sectionArrayList = new ArrayList<>();
private EditText etHandFeelNotOk, etHandFeelOk, etHandFeelPercent;
@Nullable @Nullable
@Override @Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@ -629,6 +631,8 @@ public class ThirdStepFragment extends Fragment implements View.OnClickListener
int index = sectionArrayList.indexOf(selectedString); int index = sectionArrayList.indexOf(selectedString);
Log.e("draft-index: ",""+index); Log.e("draft-index: ",""+index);
sectionSpinner.setSelection(index); sectionSpinner.setSelection(index);
etHandFeelNotOk.setText(String.valueOf(store.getReport().getItems().get(0).getHandFeelNotOkay()));
} }
} }
@ -710,12 +714,50 @@ public class ThirdStepFragment extends Fragment implements View.OnClickListener
txtMinor = view.findViewById(R.id.txt_minor); txtMinor = view.findViewById(R.id.txt_minor);
etFloor = view.findViewById(R.id.et_floor); etFloor = view.findViewById(R.id.et_floor);
etHandFeelNotOk = view.findViewById(R.id.et_hand_feel_not_ok);
etHandFeelOk = view.findViewById(R.id.et_hand_feel_ok);
etHandFeelPercent = view.findViewById(R.id.et_not_ok_percent);
sectionArrayList.add("Comforter & Mattress Pad"); sectionArrayList.add("Comforter & Mattress Pad");
sectionArrayList.add("Bedding"); sectionArrayList.add("Bedding");
sectionArrayList.add("Blanket & Table Linen"); sectionArrayList.add("Blanket & Table Linen");
sectionArrayList.add("Pillow"); sectionArrayList.add("Pillow");
sectionArrayList.add("Terry Towel"); sectionArrayList.add("Terry Towel");
sectionArrayList.add("Garments & Mattress Protector"); sectionArrayList.add("Garments");
sectionArrayList.add("Mattress Protector");
etHandFeelNotOk.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
Log.e("onTextChanged: ","****");
try {
int sampleSize = 0;
if (store.getReport().getItems().get(0).getSampleSize() != 0) {
sampleSize = Integer.parseInt(String.valueOf(store.getReport().getItems().get(0).getSampleSize()));;
int handFeelNotOk = Integer.parseInt(s.toString());
int handFeelOk = sampleSize - handFeelNotOk;
etHandFeelOk.setText(String.valueOf(handFeelOk));
double percent = (double) handFeelNotOk / sampleSize * 100;
etHandFeelPercent.setText(String.format("%s%%", percent));
store.getReport().getItems().get(0).setHandFeelNotOkay(Long.parseLong(s.toString()));
}
} catch (Exception e) {
store.getReport().getItems().get(0).setHandFeelNotOkay(0);
}
}
@Override
public void afterTextChanged(Editable s) {
}
});
} }

79
app/src/main/res/layout/fragment_first_step.xml
View File

@ -515,85 +515,6 @@
android:visibility="gone" android:visibility="gone"
android:layout_margin="5dp"/> android:layout_margin="5dp"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:layout_marginTop="6dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginBottom="5dp"
android:background="@drawable/box_border"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="11dp"
android:padding="5dp"
android:orientation="horizontal">
<TextView
android:layout_width="200dp"
android:layout_height="wrap_content"
android:text="Hand Feel Not OK"
android:textColor="@color/black"
android:textStyle="bold" />
<TextView
android:layout_width="200dp"
android:layout_height="wrap_content"
android:text="Hand Feel OK"
android:textColor="@color/black"
android:textStyle="bold" />
<TextView
android:layout_width="200dp"
android:layout_height="wrap_content"
android:text="Hand Feel Not OK %"
android:textColor="@color/black"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:orientation="horizontal"
android:paddingBottom="5dp">
<EditText
android:id="@+id/et_hand_feel_not_ok"
android:layout_width="200dp"
android:layout_height="wrap_content"
android:hint="Hand Feel Not OK"
android:imeOptions="actionDone"
android:inputType="numberDecimal" />
<EditText
android:id="@+id/et_hand_feel_ok"
android:layout_width="200dp"
android:layout_height="wrap_content"
android:hint="Hand Feel OK"
android:enabled="false"
android:imeOptions="actionNext"
android:inputType="numberDecimal" />
<EditText
android:id="@+id/et_not_ok_percent"
android:layout_width="200dp"
android:layout_height="wrap_content"
android:hint="Not OK %"
android:enabled="false"
android:imeOptions="actionNext"
android:inputType="numberDecimal" />
</LinearLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

239
app/src/main/res/layout/fragment_third_step.xml
View File

@ -138,7 +138,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginBottom="5dp" android:layout_marginBottom="2dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
@ -193,16 +193,24 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/item_dimensions_recyclerview" android:id="@+id/item_dimensions_recyclerview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="180dp" android:layout_height="130dp"
android:layout_margin="20dp"> android:layout_marginLeft="20dp"
android:layout_marginTop="10dp"
android:scrollbars="vertical"
android:fadeScrollbars="false"
android:fillViewport="true"
android:scrollbarFadeDuration="0"
android:scrollbarThumbVertical="@android:color/darker_gray"
android:layout_marginRight="20dp"
android:layout_marginBottom="10dp">
</androidx.recyclerview.widget.RecyclerView> </androidx.recyclerview.widget.RecyclerView>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Dimension Images"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:text="Dimension Images"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/black" android:textColor="@color/black"
android:textStyle="bold" /> android:textStyle="bold" />
@ -211,33 +219,34 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="100dp" android:layout_height="100dp"
android:layout_margin="5dp" android:layout_margin="5dp"
android:weightSum="1"
android:background="@drawable/box_border" android:background="@drawable/box_border"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="2dp"> android:padding="2dp"
android:weightSum="1">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/imageRecyclerView" android:id="@+id/imageRecyclerView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_weight="0.99"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal" android:layout_margin="5dp"
android:layout_margin="5dp"/> android:layout_weight="0.99"
android:orientation="horizontal" />
<ImageButton <ImageButton
android:id="@+id/image_picker" android:id="@+id/image_picker"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/image_picker"
android:background="@null" android:background="@null"
android:padding="8dp"/> android:padding="8dp"
android:src="@drawable/image_picker" />
<ImageButton <ImageButton
android:id="@+id/delete_image" android:id="@+id/delete_image"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/ic_delete"
android:background="@null" android:background="@null"
android:padding="8dp"/> android:padding="8dp"
android:src="@drawable/ic_delete" />
</LinearLayout> </LinearLayout>
<!-- <LinearLayout--> <!-- <LinearLayout-->
@ -353,6 +362,94 @@
<!-- </LinearLayout>--> <!-- </LinearLayout>-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginTop="6dp"
android:layout_marginRight="5dp"
android:layout_marginBottom="5dp"
android:background="@drawable/box_border"
android:orientation="vertical"
android:paddingTop="5dp"
android:paddingBottom="5dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="11dp"
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="3">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Hand Feel Not OK"
android:textColor="@color/black"
android:textStyle="bold" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Hand Feel OK"
android:textColor="@color/black"
android:textStyle="bold" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Hand Feel Not OK %"
android:textColor="@color/black"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:orientation="horizontal"
android:paddingBottom="5dp"
android:weightSum="3">
<EditText
android:id="@+id/et_hand_feel_not_ok"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:hint="Hand Feel Not OK"
android:textSize="15sp"
android:imeOptions="actionDone"
android:inputType="numberDecimal" />
<EditText
android:id="@+id/et_hand_feel_ok"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:enabled="false"
android:textSize="15sp"
android:hint="Hand Feel OK"
android:imeOptions="actionNext"
android:inputType="numberDecimal" />
<EditText
android:id="@+id/et_not_ok_percent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:enabled="false"
android:hint="Not OK %"
android:textSize="15sp"
android:imeOptions="actionNext"
android:inputType="numberDecimal" />
</LinearLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
@ -361,8 +458,8 @@
android:background="@drawable/box_border" android:background="@drawable/box_border"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:paddingRight="10dp"
android:paddingBottom="5dp"> android:paddingBottom="5dp">
<!-- Text Label --> <!-- Text Label -->
@ -377,54 +474,54 @@
android:textColor="@color/black" android:textColor="@color/black"
android:textStyle="bold" /> android:textStyle="bold" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="10dp">
<!--<TextView
android:id="@+id/result_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:layout_weight="0.8"
android:padding="10dp"> android:textSize="16sp"
android:textStyle="bold"
android:hint="Result Status" />-->
<Spinner
android:id="@+id/result_spinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.6"
android:prompt="@string/spinner_title" />
<!--<TextView <TextView
android:id="@+id/result_status" android:id="@+id/major_count"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.8" android:layout_weight="1"
android:textSize="16sp" android:text="Major"
android:textStyle="bold" android:textSize="16sp"
android:hint="Result Status" />--> android:textStyle="bold" />
<Spinner
android:id="@+id/result_spinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.6"
android:prompt="@string/spinner_title" />
<TextView <TextView
android:id="@+id/major_count" android:id="@+id/minor_count"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:text="Major" android:text="Minor"
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView <TextView
android:id="@+id/minor_count" android:id="@+id/critical_count"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:text="Minor" android:text="Critical"
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout>
<TextView
android:id="@+id/critical_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Critical"
android:textSize="16sp"
android:textStyle="bold" />
</LinearLayout>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -441,16 +538,16 @@
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="3dp" android:paddingLeft="3dp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:weightSum="3" android:paddingBottom="10dp"
android:paddingBottom="10dp"> android:weightSum="3">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.6" android:layout_weight="0.6"
android:hint="Accept/Reject"
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" android:textStyle="bold" />
android:hint="Accept/Reject" />
<TextView <TextView
android:id="@+id/txt_major" android:id="@+id/txt_major"
@ -564,14 +661,14 @@
android:layout_margin="5dp" android:layout_margin="5dp"
android:background="@drawable/box_border" android:background="@drawable/box_border"
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="1" android:padding="5dp"
android:padding="5dp"> android:weightSum="1">
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:layout_weight="0.35"
android:layout_weight="0.35"> android:orientation="vertical">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -586,16 +683,16 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="10dp" android:layout_marginHorizontal="10dp"
android:imeOptions="actionNext"
android:hint="General Remarks" android:hint="General Remarks"
android:imeOptions="actionNext"
android:inputType="text" /> android:inputType="text" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:layout_weight="0.3"
android:layout_weight="0.3"> android:orientation="vertical">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -633,8 +730,8 @@
android:id="@+id/section_spinner" android:id="@+id/section_spinner"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginHorizontal="10dp" android:layout_marginHorizontal="10dp"
android:layout_marginTop="10dp"
android:prompt="@string/section_title" /> android:prompt="@string/section_title" />
</LinearLayout> </LinearLayout>
@ -654,7 +751,7 @@
android:layout_weight="1" android:layout_weight="1"
android:text="Vocs" android:text="Vocs"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="20sp" android:textSize="18sp"
android:textStyle="bold" /> android:textStyle="bold" />
<!-- <Spinner--> <!-- <Spinner-->
<!-- android:id="@+id/result_spinner"--> <!-- android:id="@+id/result_spinner"-->