Merge pull request #36 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_T2P_Update

Gg t2 p update

GSKMTOrange/build.gradle

@@ -15,8 +15,8 @@ android {
         minSdkVersion 15
         targetSdkVersion 22
 
-        versionCode 5
+        versionCode 6
-        versionName "1.4"
+        versionName "1.5"
         
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java

@@ -149,7 +149,7 @@ public class MainActivity extends AppCompatActivity
         if (drawer.isDrawerOpen(GravityCompat.START)) {
             drawer.closeDrawer(GravityCompat.START);
         } else {
-            super.onBackPressed();
+           // super.onBackPressed();
         }
     }
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java

@@ -131,6 +131,8 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
                 @Override
                 public void onClick(final View view) {
 
+                    expandableListView.clearFocus();
+
                     if (validateData(hashMapListHeaderData, hashMapListChildData)) {
                         AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
                         builder.setMessage(getResources().getString(R.string.check_save_message))
@@ -708,6 +710,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
                 holder.stock.setVisibility(View.GONE);
             }
 
+
             final ViewHolder finalHolder = holder;
             holder.toggle_available.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
                 @Override
@@ -715,24 +718,30 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
                     if (isChecked) {
                         childData.setToggleValue("1");
                         finalHolder.stock.setVisibility(View.GONE);
-                        childData.setStock("");
+                        /*childData.setStock("");
-                        childData.setFacing("");
+                        childData.setFacing("");*/
                     } else {
-                        childData.setStock("");
+                        /*childData.setStock("");
-                        childData.setFacing("");
+                        childData.setFacing("");*/
-
                         childData.setToggleValue("0");
                         finalHolder.stock.setVisibility(View.VISIBLE);
 
+                        //If MBQ Value is 0
                         if (Integer.parseInt(childData.getMbq()) == 0) {
                             childData.setStock("0");
                             childData.setFacing("0");
-
+                        }/* else {
-                            /*finalHolder.stock.setText("0");
+                            if (finalHolder.facing.getText().toString() != null && !finalHolder.facing.getText().toString().equals("")) {
-                            finalHolder.facing.setText("0");*/
+                                if (Integer.parseInt(finalHolder.facing.getText().toString()) >= 0
+                                        && Integer.parseInt(finalHolder.facing.getText().toString()) >= Integer.parseInt(childData.getMbq())) {
+                                    childData.setFacing("");
+                                    finalHolder.facing.setText("");
                                 }
                             }
+                        }*/
+                    }
 
+                    expandableListView.clearFocus();
                     expandableListView.invalidateViews();
                 }
             });
@@ -740,24 +749,49 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
             if (childData.getToggleValue().equals("1")) {
                 holder.toggle_available.setChecked(true);
                 finalHolder.stock.setVisibility(View.GONE);
+                childData.setStock("");
             } else {
                 holder.toggle_available.setChecked(false);
                 finalHolder.stock.setVisibility(View.VISIBLE);
             }
 
 
-            final ViewHolder finalHolder2 = holder;
             holder.stock.setOnFocusChangeListener(new View.OnFocusChangeListener() {
                 @Override
                 public void onFocusChange(View v, boolean hasFocus) {
                     final EditText caption = (EditText) v;
                     String edStock = caption.getText().toString();
 
+                    /*if (!childData.getFacing().equals("") && Integer.parseInt(stock) >= 0 && Integer.parseInt(childData.getFacing()) < Integer.parseInt(stock)) {
+
+                    }*/
+
                     if (!edStock.equals("")) {
                         String stock = edStock.replaceFirst("^0+(?!$)", "");
 
                         if (Integer.parseInt(stock) >= 0 && Integer.parseInt(stock) < Integer.parseInt(childData.getMbq())) {
+
+                            if (!childData.getFacing().equals("")) {
+                                if (Integer.parseInt(stock) >= 0 && Integer.parseInt(childData.getFacing()) <= Integer.parseInt(stock)) {
+
                                     childData.setStock(stock);
+                                } else {
+                                    AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
+                                    builder.setMessage(getString(R.string.check_faceup))
+                                            .setCancelable(false)
+                                            .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
+                                                public void onClick(DialogInterface dialog, int id) {
+                                                    finalHolder.stock.setText("");
+                                                    dialog.dismiss();
+
+                                                }
+                                            });
+                                    AlertDialog alert = builder.create();
+                                    alert.show();
+                                }
+                            } else {
+                                childData.setStock(stock);
+                            }
                         } else {
                             if (isDialogOpen) {
                                 isDialogOpen = !isDialogOpen;
@@ -766,6 +800,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
                                         .setCancelable(false)
                                         .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
                                             public void onClick(DialogInterface dialog, int id) {
+                                                finalHolder.stock.setText("");
                                                 dialog.dismiss();
                                                 isDialogOpen = !isDialogOpen;
                                             }
@@ -789,11 +824,13 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
                     final EditText caption = (EditText) v;
                     final String edFaceup = caption.getText().toString().replaceFirst("^0+(?!$)", "");
 
+                    boolean isFill = false;
+
                     //Toggle is no selected
                     if (childData.getToggleValue().equals("0")) {
 
                         //if stock is emplty
-                        if (childData.getStock().equals("")) {
+                        /*if (childData.getStock().equals("")) {
                             AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
                             builder.setMessage(getString(R.string.msl_availability_new_stock_value))
                                     .setCancelable(false)
@@ -804,25 +841,54 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
                                     });
                             AlertDialog alert = builder.create();
                             alert.show();
-                        } else {
+                        } else {*/
                         if (edFaceup != null && !edFaceup.equals("")) {
 
+                            if (Integer.parseInt(edFaceup) >= 0 && Integer.parseInt(edFaceup) < Integer.parseInt(childData.getMbq())) {
+                                if (!childData.getStock().equals("")) {
+
+                                    //if (edFaceup != null && !edFaceup.equals("")) {
+
                                     String faceup = edFaceup.replaceFirst("^0+(?!$)", "");
+
+
                                     if (Integer.parseInt(faceup) <= Integer.parseInt(childData.getStock())) {
 
-                                    if (!edFaceup.equals("")) {
+                                        isFill = true;
+
+                          /*          if (!edFaceup.equals("")) {
                                         childData.setFacing(faceup);
                                     } else {
                                         childData.setFacing("");
-                                    }
+                                    }*/
                                     } else {
                                         AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
                                         builder.setMessage(getString(R.string.check_faceup))
                                                 .setCancelable(false)
                                                 .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
                                                     public void onClick(DialogInterface dialog, int id) {
-                                                    dialog.dismiss();
                                                         finalHolder1.facing.setText("");
+                                                        dialog.dismiss();
+                                                    }
+                                                });
+                                        AlertDialog alert = builder.create();
+                                        alert.show();
+                                    }
+                                    //  }
+                                } else {
+                                    isFill = true;
+                                }
+                            } else {
+                                if (isDialogOpen) {
+                                    isDialogOpen = !isDialogOpen;
+                                    AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
+                                    builder.setMessage(getString(R.string.check_faceing))
+                                            .setCancelable(false)
+                                            .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
+                                                public void onClick(DialogInterface dialog, int id) {
+                                                    finalHolder.facing.setText("");
+                                                    dialog.dismiss();
+                                                    isDialogOpen = !isDialogOpen;
                                                 }
                                             });
                                     AlertDialog alert = builder.create();
@@ -830,7 +896,19 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
                                 }
                             }
                         }
+                        //}
                     } else {
+                        isFill = true;
+
+                        /*if (!edFaceup.equals("")) {
+                            String faceup = edFaceup.replaceFirst("^0+(?!$)", "");
+                            childData.setFacing(faceup);
+                        } else {
+                            childData.setFacing("");
+                        }*/
+                    }
+
+                    if (isFill) {
                         if (!edFaceup.equals("")) {
                             String faceup = edFaceup.replaceFirst("^0+(?!$)", "");
                             childData.setFacing(faceup);

GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java

@@ -606,6 +606,7 @@ public class UploadActivity extends AppCompatActivity {
                                     String KeyID = additionalVisibilityList.get(J).getKey_id();
 
                                     additionalVisibilitySkuList = db.getDialogStockUpload(KeyID);
+                                    //additionalVisibilitySkuList = additionalVisibilityList.get(J).getSkuDialogList();
 
                                     if (additionalVisibilitySkuList.size() > 0) {
                                         for (int k = 0; k < additionalVisibilitySkuList.size(); k++) {
@@ -679,9 +680,9 @@ public class UploadActivity extends AppCompatActivity {
                             if (t2PGetterSetters.size() > 0) {
                                 for (int i1 = 0; i1 < t2PGetterSetters.size(); i1++) {
 
-                                    ArrayList<GapsChecklistGetterSetter> gapsList = db.getGapsData(t2PGetterSetters.get(i).getKey_id());
+                                    ArrayList<GapsChecklistGetterSetter> gapsList = db.getGapsData(t2PGetterSetters.get(i1).getKey_id());
-                                    ArrayList<SkuGetterSetter> skuList = db.getT2PSKUData(t2PGetterSetters.get(i).getKey_id());
+                                    ArrayList<SkuGetterSetter> skuList = db.getT2PSKUData(t2PGetterSetters.get(i1).getKey_id());
-                                    ArrayList<BrandAvabilityGetterSetter> brandList = db.getT2BrandData(t2PGetterSetters.get(i).getKey_id());
+                                    ArrayList<BrandAvabilityGetterSetter> brandList = db.getT2BrandData(t2PGetterSetters.get(i1).getKey_id());
                                     String gaps_xml = "";
                                     String gaps_child;
 

GSKMTOrange/src/main/res/layout/additionalvisibilitydialoglayout.xml

@@ -103,8 +103,8 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="2"
-                    android:inputType="number" />
+                    android:inputType="number"
-
+                    android:maxLength="5" />
             </LinearLayout>
 
             <RelativeLayout
@@ -122,9 +122,10 @@
                     <Button
                         android:id="@+id/btn_add"
                         android:layout_width="wrap_content"
-                        android:layout_weight="1"
                         android:layout_height="wrap_content"
+                        android:layout_weight="1"
                         android:text="@string/add" />
+
                     <Button
                         android:id="@+id/btn_cancel"
                         android:layout_width="wrap_content"
@@ -153,18 +154,18 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
         android:padding="10dp"
+        android:visibility="gone"
         card_view:cardBackgroundColor="@color/colorOrange"
         card_view:cardCornerRadius="20dp"
-        android:visibility="gone"
 
         >
+
         <LinearLayout
             android:id="@+id/list_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="95"
-            android:visibility="gone"
+            android:visibility="gone">
-            >
 
             <ListView
                 android:id="@+id/lv"

GSKMTOrange/src/main/res/layout/gap_checklist_item.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    android:orientation="horizontal">
-    android:orientation="horizontal"
-    >
 
     <android.support.v7.widget.CardView
         android:layout_width="match_parent"
@@ -13,43 +12,40 @@
         android:layout_marginRight="@dimen/custom_margin"
         android:layout_marginTop="@dimen/custom_margin"
         card_view:cardBackgroundColor="@color/white"
-        card_view:cardCornerRadius="10dp"
+        card_view:cardCornerRadius="10dp">
-        >
 
         <LinearLayout
             android:id="@+id/parent_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
             android:layout_weight="2"
-            >
+            android:orientation="horizontal">
 
             <TextView
                 android:id="@+id/tv_checklist"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:paddingLeft="@dimen/custom_margin"
                 android:text="Checklist"
                 android:textColor="@color/black"
-                android:textStyle="bold"
+                android:textStyle="bold" />
-                android:gravity="center_vertical"
-                android:paddingLeft="@dimen/custom_margin"/>
 
             <RelativeLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:padding="5dp"
+                android:padding="5dp">
-                >
 
                 <ToggleButton
                     android:id="@+id/btn_is_present"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textOn="@string/yes"
+                    android:layout_centerInParent="true"
-                    android:textOff="@string/no"
                     android:background="@drawable/toggle_selector_background"
-                    android:layout_centerInParent="true"/>
+                    android:textOff="@string/no"
+                    android:textOn="@string/yes" />
 
             </RelativeLayout>
 

GSKMTOrange/src/main/res/layout/t2p_sku_dialog_layout.xml

@@ -103,7 +103,8 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="2"
-                    android:inputType="number" />
+                    android:inputType="number"
+                    android:maxLength="5" />
 
             </LinearLayout>
 
@@ -122,9 +123,10 @@
                     <Button
                         android:id="@+id/btn_add"
                         android:layout_width="wrap_content"
-                        android:layout_weight="1"
                         android:layout_height="wrap_content"
+                        android:layout_weight="1"
                         android:text="@string/add" />
+
                     <Button
                         android:id="@+id/btn_cancel"
                         android:layout_width="wrap_content"
@@ -138,10 +140,10 @@
             </RelativeLayout>
 
             <android.support.v7.widget.RecyclerView
-                android:background="@color/grey_background"
                 android:id="@+id/rec_sku"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"></android.support.v7.widget.RecyclerView>
+                android:layout_height="wrap_content"
+                android:background="@color/grey_background"></android.support.v7.widget.RecyclerView>
 
         </LinearLayout>
 

GSKMTOrange/src/main/res/values-ar/string.xml

@@ -230,4 +230,5 @@
     <string name="msl_availability_new_stock_value">أول تعبئة لقيمة المخزون</string>
     <string name="check_stock"> المخزون لا يمكن ان يكون مساوي او اكثر من الكميات التي يجب توافرها من الصنف MBQ</string>
 
+    <string name="check_faceing">المواجهه لا يمكن ان تكون اكثر من او مساويه للكميه الواجب توافرها MBQ</string>
 </resources>

GSKMTOrange/src/main/res/values-tr/string.xml

@@ -272,6 +272,7 @@
     <string name="check_stock"> Stok miktarı minimum stok miktarından daha fazla veya eşit olamaz</string>
     <string name="msl_availability_new_stock_value">  Lütfen önce stok değerini giriniz</string>
 
+    <string name="check_faceing">Önyüz miktarı minimum stok miktarından daha fazla veya eşit olamaz</string>
 </resources>
 
 

GSKMTOrange/src/main/res/values/strings.xml

@@ -301,4 +301,6 @@
     <string name="stock_value">Please fill stock value or fill 0 </string>
     <string name="check_stock">Stock can not be greater equal than MBQ value</string>
     <string name="msl_availability_new_stock_value">Please first fill the stock value </string>
+
+    <string name="check_faceing">Faceup can not be greater than or equal to MBQ value</string>
 </resources>