Merge pull request #64 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_StockFacing_PromoCompliance_Changes

//Stock_FacingActivity Changes today

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

@@ -230,7 +230,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
                                         toggle_add_promoAnnouncer.setChecked(true);
                                         toggle_add_runningPos.setChecked(true);
 
-                                        Snackbar.make(v, "promo is add", Snackbar.LENGTH_LONG).setAction("Action", null).show();
+                                        Snackbar.make(v, "promo is added", Snackbar.LENGTH_LONG).setAction("Action", null).show();
                                         //Toast.makeText(getApplicationContext(), "promo is add", Toast.LENGTH_LONG).show();
                                     }
                                 })

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

@@ -7,6 +7,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
@@ -14,6 +15,7 @@ import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
+import android.graphics.Matrix;
 import android.graphics.Typeface;
 import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
@@ -38,6 +40,8 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
 import android.widget.AbsListView;
 import android.widget.BaseExpandableListAdapter;
 import android.widget.Button;
@@ -67,6 +71,8 @@ import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter;
 
+import static android.R.attr.angle;
+
 public class Stock_FacingActivity extends AppCompatActivity {
     static int child_position = -1;
     ExpandableListView expandableListView;
@@ -265,7 +271,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
                         getCurrentFocus().clearFocus();
                     }
 
-                    fab.setVisibility(View.INVISIBLE);
+                    fab.setVisibility(View.VISIBLE);
                 }
             });
 
@@ -334,8 +340,9 @@ public class Stock_FacingActivity extends AppCompatActivity {
                     //Camera allow enable
                     if (camera_allow.equalsIgnoreCase("1")) {
 
-                        if (!imagePath.equals("") || !imagePath1.equals("")) {
+                        //if (!imagePath.equals("") || !imagePath1.equals("")) {
-                            if (!stock.equals("0")) {
+                        if (!stock.equals("0")) {
+                            if (!imagePath.equals("") || !imagePath1.equals("")) {
                                 if (stock.equals("") || faceup.equals("")) {
                                     if (!checkHeaderArray.contains(i)) {
                                         checkHeaderArray.add(i);
@@ -346,17 +353,26 @@ public class Stock_FacingActivity extends AppCompatActivity {
                                     break;
                                 }
                             } else {
-                                if (stock.equals("")) {
+                                if (!checkHeaderArray.contains(i)) {
-                                    if (!checkHeaderArray.contains(i)) {
+                                    checkHeaderArray.add(i);
-                                        checkHeaderArray.add(i);
-                                    }
-
-                                    flag = false;
-                                    Error_Message = getResources().getString(R.string.fill_data);
-                                    break;
                                 }
+
+                                flag = false;
+                                Error_Message = getResources().getString(R.string.click_image);
+                                break;
                             }
                         } else {
+                            if (stock.equals("")) {
+                                if (!checkHeaderArray.contains(i)) {
+                                    checkHeaderArray.add(i);
+                                }
+
+                                flag = false;
+                                Error_Message = getResources().getString(R.string.fill_data);
+                                break;
+                            }
+                        }
+                        /*} else {
                             if (!checkHeaderArray.contains(i)) {
                                 checkHeaderArray.add(i);
                             }
@@ -364,7 +380,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
                             flag = false;
                             Error_Message = getResources().getString(R.string.click_image);
                             break;
-                        }
+                        }*/
 
                     } else {
                         //Camera allow disable
@@ -660,7 +676,6 @@ public class Stock_FacingActivity extends AppCompatActivity {
             builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
                     .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int id) {
-
                             finish();
                         }
                     })
@@ -683,24 +698,35 @@ public class Stock_FacingActivity extends AppCompatActivity {
             //dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
             dialog.setContentView(R.layout.planogram_dialog_layout);
             dialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
-
+            dialog.setCancelable(false);
-            ImageView img_planogram = (ImageView) dialog.findViewById(R.id.img_planogram);
 
             ArrayList<MAPPING_PLANOGRAM_DataGetterSetter> mp = db.getMappingPlanogramData("");
 
+            //ImageView img_planogram = (ImageView) dialog.findViewById(R.id.img_planogram);
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+
+            WebView webView = (WebView) dialog.findViewById(R.id.webview);
+            webView.setWebViewClient(new MyWebViewClient());
+
+            webView.getSettings().setAllowFileAccess(true);
+            webView.getSettings().setJavaScriptEnabled(true);
+            webView.getSettings().setBuiltInZoomControls(true);
+
             String planogram_image = mp.get(0).getPLANOGRAM_IMAGE();
             if (new File(str + planogram_image).exists()) {
                 Bitmap bmp = BitmapFactory.decodeFile(str + planogram_image);
-                img_planogram.setImageBitmap(bmp);
+                // img_planogram.setRotation(90);
-            } else {
+                //img_planogram.setImageBitmap(bmp);
-                img_planogram.setBackgroundResource(R.drawable.sad_cloud);
-            }
 
-            /*if (new File(str + "Stock_Cam1_3_9_01122017_162052.jpg").exists()) {
+                String imagePath = "file://" + CommonString.FILE_PATH + "/" + planogram_image;
-                Bitmap bmp = BitmapFactory.decodeFile(str + "Stock_Cam1_3_9_01122017_162052.jpg");
+                String html = "<html><head></head><body><img src=\"" + imagePath + "\"></body></html>";
-                img_planogram.setImageBitmap(bmp);
+                webView.loadDataWithBaseURL("", html, "text/html", "utf-8", "");
-            } else {
+
-                img_planogram.setBackgroundResource(R.drawable.sad_cloud);
+                dialog.show();
+            } /*else {
+                //webView.loadUrl(String.valueOf(R.drawable.sad_cloud));
+
+                //img_planogram.setBackgroundResource(R.drawable.sad_cloud);
             }*/
 
 
@@ -708,17 +734,39 @@ public class Stock_FacingActivity extends AppCompatActivity {
             cancel.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
+                    setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
                     dialog.dismiss();
                 }
             });
 
-            dialog.show();
+            //dialog.show();
             return true;
         }
 
         return super.onOptionsItemSelected(item);
     }
 
+    private class MyWebViewClient extends WebViewClient {
+
+        @Override
+        public boolean shouldOverrideUrlLoading(WebView view, String url) {
+            view.loadUrl(url);
+            return true;
+        }
+
+        @Override
+        public void onPageFinished(WebView view, String url) {
+            super.onPageFinished(view, url);
+            view.clearCache(true);
+        }
+
+        @Override
+        public void onPageStarted(WebView view, String url, Bitmap favicon) {
+            super.onPageStarted(view, url, favicon);
+        }
+    }
+
+
     @Override
     public void onBackPressed() {
         //super.onBackPressed();
@@ -728,14 +776,12 @@ public class Stock_FacingActivity extends AppCompatActivity {
         builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
                 .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
-
                         finish();
                     }
                 })
                 .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-
                     }
                 });
         android.app.AlertDialog alert = builder.create();
@@ -951,7 +997,11 @@ public class Stock_FacingActivity extends AppCompatActivity {
             }
 
             if (childData.getStock().equals("0")) {
-                holder.ed_facing.setEnabled(false);
+                if (childData.getCompany_id().equals("1")) {
+                    holder.ed_facing.setEnabled(false);
+                } else {
+                    holder.ed_facing.setEnabled(true);
+                }
             } else {
                 holder.ed_facing.setEnabled(true);
             }
@@ -971,6 +1021,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
                         if (stock.equals("0")) {
                             childData.setFacing("0");
                             finalHolder.ed_facing.setText("0");
+
                             finalHolder.ed_facing.setEnabled(false);
                         } else {
                             childData.setFacing(childData.getFacing());

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

@@ -76,7 +76,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="0dp"
                             android:layout_weight="1"
-                            android:background="#70888888"
+                            android:background="@color/colorPrimaryDark"
                             android:orientation="vertical">
 
                             <TextView

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

@@ -36,12 +36,18 @@
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
-                <ImageView
+<!--                <ImageView
                     android:id="@+id/img_planogram"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_margin="10dp"
-                    android:src="@drawable/sad_cloud"/>
+                    android:src="@drawable/sad_cloud" />-->
+
+                <WebView
+                    android:id="@+id/webview"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent" />
+
             </LinearLayout>
         </LinearLayout>
 

GSKMTOrange/src/main/res/menu/planogram.xml

@@ -5,6 +5,6 @@
         android:id="@+id/action_planogram"
         android:icon="@mipmap/ref_images_white"
         android:orderInCategory="100"
-        android:title="planogram"
+        android:title="@string/stock_facing_planogram_dialog_title"
         app:showAsAction="always" />
 </menu>

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

@@ -73,26 +73,28 @@
     <string name="daily_data_menu_additional_promotions">Promosyon</string>
 
     <string name="msl_availability_sku">Ürün Adı</string>
-    <string name="msl_availability_mbq">MBQ</string>
+    <string name="msl_availability_mbq">X</string>
     <string name="msl_availability_availability">Bulunurluk</string>
 
     <string name="stock_facing_reference_image">Örnek Fotoğraf</string>
     <string name="stock_facing_sku_name">Ürün Adı</string>
-    <string name="stock_facing_stock">Stock</string>
+    <string name="stock_facing_stock">Stock</string>            <!--change string-->
     <string name="stock_facing_faceup">Önyüz</string>
     <string name="stock_facing_sos_target">Raf Payı Hedefi</string>
     <string name="stock_facing_sos">Raf Payi</string>
+    <!--Gagan end code-->
 
+    <!--Gagan start new code 1-->
     <string name="title_activity_promo_compliance">Promosyon</string>
 
-    <string name="promo_compliance_additional_promo">Additional Promos</string>
+    <string name="promo_compliance_additional_promo">Ek Promosyon</string>
-    <string name="promo_compliance_promo">Promos</string>
+    <string name="promo_compliance_promo">Promosyon</string>
     <string name="promo_compliance_promos_sku">Promosyon Ürünü</string>
     <string name="promo_compliance_sku">Promosyon Ürünü</string>
     <string name="promo_compliance_inStock">Ürün Bulunuyor</string>
     <string name="promo_compliance_promoAnnouncer">Duyuru Var</string>
     <string name="promo_compliance_runningPOS">Kasa Okuyor</string>
-    <string name="promo_compliance_add">Add</string>
+    <string name="promo_compliance_add">Ekle</string>
 
     <string name="category_performance_period">Zaman</string>
     <string name="category_performance_msl_availability">Bulunurluk</string>
@@ -106,11 +108,7 @@
     <string name="category_performance_lsv">Son Ziyaret</string>
 
     <string name="title_activity_store_wise_performance">Mağaza Performansı</string>
-    <!--Gagan End Code -->
+    <!--Gagan end new code 1-->
-
-    <!--Gagan start new code 2-->
-    <string name="stock_facing_planogram_dialog_title">Planogram</string>
-    <!--Gagan end new code 2-->
 
     <string name="stock">Stock</string>
     <string name="AdditionalDisplay">Ek Teşhir</string>
@@ -163,6 +161,18 @@
     <string name="delete">Delete</string>
     <string name="adddatatoclick">Click Yes To Add Data</string>
 
+    <!--Gagan start new code 2-->
+    <string name="stock_facing_planogram_dialog_title">Örnek Fotoğraf</string>
+    <string name="title_activity_settings">Ayarlar</string>
+
+    <string name="ok">Tamam</string>
+    <string name="check_save_message">Veriyi saklamak istiyor musunuz?</string>
+    <string name="save_message">Veriler Kaydedildi</string>
+    <string name="update_message">Veriler Kaydedildi</string>
+    <string name="empty_field">Tüm alanlari doldurunuz </string>
+    <string name="fill_data">Tüm alanlari doldurunuz</string>
+    <string name="dialog_title">Parinaam</string>
+    <!--Gagan end new code 2-->
 
 
 </resources>

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

@@ -68,7 +68,6 @@
     <string name="title_activity_t2_pcompliance">T2P Compliance</string>
 
     <!--Gagan start code-->
-
     <string name="title_activity_category_list">Category List</string>
     <string name="title_activity_category_wise_performance">Categorywise Performance</string>
     <string name="title_activity_daily_main_menu">Daily Data Menu</string>
@@ -93,7 +92,6 @@
     <string name="stock_facing_faceup">Facing</string>
     <string name="stock_facing_sos_target">SOS Target</string>
     <string name="stock_facing_sos">SOS</string>
-
     <!--Gagan end code-->
 
     <string name="title_geo_tag_activity_upload_data">Store Uploaded</string>
@@ -195,7 +193,7 @@
     <string name="daily_activity_menu">Daily Data Menu</string>
 
     <!--Gagan start new code 2-->
-    <string name="stock_facing_planogram_dialog_title">Planogram</string>
+    <string name="stock_facing_planogram_dialog_title">Reference Image</string>
     <string name="title_activity_settings">Settings</string>
 
     <string name="ok">OK</string>
@@ -205,7 +203,6 @@
     <string name="empty_field">Fill the value </string>
     <string name="fill_data">Please fill all the data</string>
     <string name="dialog_title">Parinaam</string>
-
     <!--Gagan end new code 2-->
 
     <string name="select_language_item">Select language</string>