Merge branch 'master' into T2P_save_Y

GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java

@@ -1457,8 +1457,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
     }
 
     public void InsertAdditionalPromoData(Promo_Compliance_DataGetterSetter data) {
-        ContentValues values = new ContentValues();
         try {
+            ContentValues values = new ContentValues();
+
             values.put("STORE_ID", Integer.parseInt(data.getStore_id()));
             values.put("PROMO_ID", Integer.parseInt(data.getPromo_id()));
             values.put("PROMO", data.getPromo());
@@ -1504,14 +1505,16 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         return list;
     }
 
-    public void InsertPromoSkuData(ArrayList<Promo_Compliance_DataGetterSetter> promoSkuListData) {
+    public void InsertPromoSkuData(ArrayList<Promo_Compliance_DataGetterSetter> promoSkuListData, String category_id) {
         ContentValues values = new ContentValues();
         try {
             db.beginTransaction();
+
             for (int i = 0; i < promoSkuListData.size(); i++) {
                 Promo_Compliance_DataGetterSetter data = promoSkuListData.get(i);
 
                 values.put("STORE_ID", Integer.parseInt(data.getStore_id()));
+                values.put("CATEGORY_ID", Integer.parseInt(category_id));
                 values.put("SKU_ID", Integer.parseInt(data.getSku_id()));
                 values.put("SKU", data.getSku());
                 values.put("PROMO_ID", Integer.parseInt(data.getPromo_id()));
@@ -1529,9 +1532,44 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         }
     }
 
+    public boolean checkPromoComplianceData(String store_id, String category_id) {
+        Log.d("PromoCompliance ", "PromoCompliance data--------------->Start<------------");
+        ArrayList<Promo_Compliance_DataGetterSetter> list = new ArrayList<>();
+        Cursor dbcursor = null;
+
+        try {
+            dbcursor = db.rawQuery("Select * from Promo_SKU_Data " +
+                    "where CATEGORY_ID='" + category_id + "' and STORE_ID='" + store_id + "'", null);
+
+            if (dbcursor != null) {
+                if (dbcursor.moveToFirst()) {
+                    do {
+                        Promo_Compliance_DataGetterSetter sb = new Promo_Compliance_DataGetterSetter();
+
+                        sb.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
+                        list.add(sb);
+                    } while (dbcursor.moveToNext());
+                }
+                dbcursor.close();
+
+                if (list.size() > 0) {
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+        } catch (Exception e) {
+            Log.d("Exception ", "when fetching Records!!!!!!!!!!!!!!!!!!!!!" + e.toString());
+            return false;
+        }
+
+        Log.d("Stock_Facing ", "midday---------------------->Stop<-----------");
+        return false;
+    }
+
     //Gagan End Method
 
-//Non Working data
+    //Non Working data
 
     public void insertNonWorkingData(NonWorkingReasonGetterSetter data) {
         db.delete("NON_WORKING_REASON", null, null);
@@ -1702,4 +1740,67 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
     }
 
 
+    //Gagan start new code 1
+
+    public void updatePromoComplianceSKU(ArrayList<Promo_Compliance_DataGetterSetter> promoSkuListData,
+                                         String categoryId, String storeId) {
+        ContentValues values = new ContentValues();
+
+        try {
+            db.beginTransaction();
+            for (int i = 0; i < promoSkuListData.size(); i++) {
+                Promo_Compliance_DataGetterSetter data = promoSkuListData.get(i);
+
+                values.put("IN_STOCK_VALUE", Integer.parseInt(data.getIn_stock()));
+                values.put("PROMO_ANNOUNCER_VALUE", Integer.parseInt(data.getPromo_announcer()));
+                values.put("RUNNING_POS_VALUE", Integer.parseInt(data.getRunning_pos()));
+
+                db.update(CommonString.TABLE_INSERT_PROMO_SKU, values,
+                        "CATEGORY_ID='" + categoryId + "' AND STORE_ID='" + storeId +
+                                "' AND SKU_ID='" + data.getSku_id() + "' AND PROMO_ID='" + data.getPromo_id() + "'", null);
+            }
+            db.setTransactionSuccessful();
+            db.endTransaction();
+        } catch (Exception ex) {
+            Log.d("Exception ", " in Insert MSL_Availability " + ex.toString());
+        }
+
+    }
+
+    public ArrayList<Promo_Compliance_DataGetterSetter> getPromoComplianceSkuAfterData(String store_id, String category_id) {
+        ArrayList<Promo_Compliance_DataGetterSetter> list = new ArrayList<>();
+        Cursor dbcursor = null;
+
+        try {
+            dbcursor = db.rawQuery("Select * from Promo_SKU_Data " +
+                    "where STORE_ID='" + store_id + "' AND CATEGORY_ID='" + category_id + "'", null);
+
+            if (dbcursor != null) {
+                dbcursor.moveToFirst();
+                while (!dbcursor.isAfterLast()) {
+                    Promo_Compliance_DataGetterSetter cd = new Promo_Compliance_DataGetterSetter();
+
+                    cd.setStore_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STORE_ID")));
+                    cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
+                    cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
+                    cd.setPromo_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO_ID")));
+                    cd.setPromo(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO")));
+                    cd.setIn_stock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IN_STOCK_VALUE")));
+                    cd.setPromo_announcer(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO_ANNOUNCER_VALUE")));
+                    cd.setRunning_pos(dbcursor.getString(dbcursor.getColumnIndexOrThrow("RUNNING_POS_VALUE")));
+
+                    list.add(cd);
+                    dbcursor.moveToNext();
+                }
+                dbcursor.close();
+                return list;
+            }
+        } catch (Exception e) {
+            Log.d("Exception ", "getPromoComplianceSkuAfterData!" + e.toString());
+            return list;
+        }
+        return list;
+    }
+    //Gagan end new code 1
+
 }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java

@@ -312,6 +312,9 @@ public class CommonString {
             + "STORE_ID"
             + " INTEGER,"
 
+            + "CATEGORY_ID"
+            + " INTEGER,"
+
             + "SKU_ID"
             + " INTEGER,"
 

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

@@ -2,7 +2,10 @@ package cpm.com.gskmtorange.gsk_dailyentry;
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -20,7 +23,9 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import cpm.com.gskmtorange.Database.GSKOrangeDB;
 import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonString;
 import cpm.com.gskmtorange.dailyentry.T2PComplianceActivity;
 import cpm.com.gskmtorange.xmlGetterSetter.DailyDataMenuGetterSetter;
 
@@ -29,11 +34,17 @@ public class DailyDataMenuActivity extends AppCompatActivity {
     ArrayList<DailyDataMenuGetterSetter> categoryList;
     DailyDataMenuAdapter adapter;
     TextView txt_categoryName;
+
+    GSKOrangeDB db;
     String categoryName = "", categoryId;
 
+    private SharedPreferences preferences;
+    String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        try {
             setContentView(R.layout.activity_daily_data_menu);
 
             Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
@@ -44,6 +55,21 @@ public class DailyDataMenuActivity extends AppCompatActivity {
             recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
             txt_categoryName = (TextView) findViewById(R.id.txt_categoryName);
 
+            db = new GSKOrangeDB(this);
+            db.open();
+
+            //preference data
+            preferences = PreferenceManager.getDefaultSharedPreferences(this);
+            store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
+            visit_date = preferences.getString(CommonString.KEY_DATE, null);
+            date = preferences.getString(CommonString.KEY_DATE, null);
+            username = preferences.getString(CommonString.KEY_USERNAME, null);
+            intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, "");
+            keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
+            class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
+            storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
+
+            //Intent data
             categoryName = getIntent().getStringExtra("categoryName");
             categoryId = getIntent().getStringExtra("categoryId");
 
@@ -58,42 +84,58 @@ public class DailyDataMenuActivity extends AppCompatActivity {
                         .setAction("Action", null).show();
             }
         });*/
+        } catch (Resources.NotFoundException e) {
+            e.printStackTrace();
+        }
     }
 
     @Override
     protected void onResume() {
         super.onResume();
 
+        try {
             categoryList = new ArrayList<>();
 
             DailyDataMenuGetterSetter data = new DailyDataMenuGetterSetter();
             //data.setCategory_name("MSL Availability");
             data.setCategory_name(getResources().getString(R.string.daily_data_menu_msl_availability));
-        data.setCategory_img(R.drawable.category);
+            if (db.checkMsl_AvailabilityData(store_id, categoryId)) {
+                data.setCategory_img(R.mipmap.msl_availability_done);
+            } else {
+                data.setCategory_img(R.mipmap.msl_availability);
+            }
             categoryList.add(data);
 
             data = new DailyDataMenuGetterSetter();
-        data.setCategory_name(getResources().getString(R.string.daily_data_menu_stock_facing));
             //data.setCategory_name("Stock & Facing");
-        data.setCategory_img(R.drawable.category);
+            data.setCategory_name(getResources().getString(R.string.daily_data_menu_stock_facing));
+            if (db.checkStockAndFacingData(store_id, categoryId)) {
+                data.setCategory_img(R.mipmap.stock_and_facing_done);
+            } else {
+                data.setCategory_img(R.mipmap.stock_and_facing);
+            }
             categoryList.add(data);
 
             data = new DailyDataMenuGetterSetter();
-        data.setCategory_name(getResources().getString(R.string.daily_data_menu_t2p));
             //data.setCategory_name("T2P Compliance");
-        data.setCategory_img(R.drawable.category);
+            data.setCategory_name(getResources().getString(R.string.daily_data_menu_t2p));
+            data.setCategory_img(R.mipmap.t2p_compliance);
             categoryList.add(data);
 
             data = new DailyDataMenuGetterSetter();
-        data.setCategory_name(getResources().getString(R.string.daily_data_menu_additional_visibility));
             //data.setCategory_name("Additional Visibility");
-        data.setCategory_img(R.drawable.category);
+            data.setCategory_name(getResources().getString(R.string.daily_data_menu_additional_visibility));
+            data.setCategory_img(R.mipmap.additional_visibility);
             categoryList.add(data);
 
             data = new DailyDataMenuGetterSetter();
-        data.setCategory_name(getResources().getString(R.string.daily_data_menu_promo_compliance));
             //data.setCategory_name("Promo Compliance");
-        data.setCategory_img(R.drawable.category);
+            data.setCategory_name(getResources().getString(R.string.daily_data_menu_promo_compliance));
+            if (db.checkPromoComplianceData(store_id, categoryId)) {
+                data.setCategory_img(R.mipmap.promo_compliance_done);
+            } else {
+                data.setCategory_img(R.mipmap.promo_compliance);
+            }
             categoryList.add(data);
 
             /*data = new DailyDataMenuGetterSetter();
@@ -111,6 +153,10 @@ public class DailyDataMenuActivity extends AppCompatActivity {
             adapter = new DailyDataMenuAdapter(DailyDataMenuActivity.this, categoryList);
             recyclerView.setAdapter(adapter);
             recyclerView.setLayoutManager(new GridLayoutManager(getApplicationContext(), 2));
+
+        } catch (Resources.NotFoundException e) {
+            e.printStackTrace();
+        }
     }
 
     public class DailyDataMenuAdapter extends RecyclerView.Adapter<DailyDataMenuAdapter.MyViewHolder> {
@@ -156,7 +202,7 @@ public class DailyDataMenuActivity extends AppCompatActivity {
                         intent.putExtra("categoryName", dailyData.getCategory_name());
                         intent.putExtra("categoryId", categoryId);
                         startActivity(intent);
-                    } else if(dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.daily_data_menu_t2p)))){
+                    } else if (dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.daily_data_menu_t2p)))) {
                         Intent intent = new Intent(DailyDataMenuActivity.this, T2PComplianceActivity.class);
                         intent.putExtra("categoryName", dailyData.getCategory_name());
                         intent.putExtra("categoryId", categoryId);

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

@@ -4,6 +4,7 @@ import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
+import android.content.res.Resources;
 import android.graphics.Typeface;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
@@ -60,6 +61,7 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        try {
             setContentView(R.layout.activity_msl__availability);
 
             Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
@@ -97,7 +99,7 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
             final FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
             fab.setOnClickListener(new View.OnClickListener() {
                 @Override
-            public void onClick(View view) {
+                public void onClick(final View view) {
 
                     //if (validateData(listDataHeader, listDataChild)) {
                     AlertDialog.Builder builder = new AlertDialog.Builder(MSL_AvailabilityActivity.this);
@@ -109,11 +111,13 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
 
                                     if (db.checkMsl_AvailabilityData(store_id, categoryId)) {
                                         db.updateMSL_Availability(store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
+                                        Snackbar.make(view, "Data has been updated", Snackbar.LENGTH_LONG).setAction("Action", null).show();
                                     } else {
                                         db.InsertMSL_Availability(store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
+                                        Snackbar.make(view, "Data has been saved", Snackbar.LENGTH_LONG).setAction("Action", null).show();
                                     }
 
-                                Toast.makeText(getApplicationContext(), "Data has been saved", Toast.LENGTH_LONG).show();
+                                    //Toast.makeText(getApplicationContext(), "Data has been saved", Toast.LENGTH_LONG).show();
                                     finish();
                                     overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
                                 }
@@ -211,9 +215,13 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
                     return false;
                 }
             });
+        } catch (Resources.NotFoundException e) {
+            e.printStackTrace();
+        }
     }
 
     private void prepareList() {
+        try {
             hashMapListHeaderData = new ArrayList<>();
             hashMapListChildData = new HashMap<>();
 
@@ -236,6 +244,9 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
 
             adapter = new ExpandableListAdapter(this, hashMapListHeaderData, hashMapListChildData);
             expandableListView.setAdapter(adapter);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     public class ExpandableListAdapter extends BaseExpandableListAdapter {

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

@@ -9,6 +9,8 @@ import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.Snackbar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
@@ -33,7 +35,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
     ToggleButton toggle_add_InStock, toggle_add_promoAnnouncer, toggle_add_runningPos;
     Button btn_add;
 
-    ArrayList<Promo_Compliance_DataGetterSetter> promoSkuListData;
+    ArrayList<Promo_Compliance_DataGetterSetter> promoSkuListData, promoSkuListAfterData;
     ArrayList<Promo_Compliance_DataGetterSetter> promoSpinnerListData;
     ArrayList<Promo_Compliance_DataGetterSetter> additionalPromoListData;
 
@@ -46,6 +48,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        try {
             setContentView(R.layout.activity_promo_compliance);
 
             Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
@@ -86,7 +89,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
             promoSkuListView();
 
             additionalPromoListData = new ArrayList<>();
-        //AdditionalPromoListView();
+            AdditionalPromoListView();
 
             final Promo_Compliance_DataGetterSetter cd = new Promo_Compliance_DataGetterSetter();
             cd.setStore_id(store_id);
@@ -152,8 +155,8 @@ public class PromoComplianceActivity extends AppCompatActivity {
                 @Override
                 public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                     String item = parent.getItemAtPosition(position).toString();
-//                childData.setSp_condition(position);
+                    //                childData.setSp_condition(position);
-//                childData.setConditionName(item);
+                    //                childData.setConditionName(item);
 
                     for (int i = 0; i < promoSpinnerListData.size(); i++) {
                         if (position == i) {
@@ -188,6 +191,11 @@ public class PromoComplianceActivity extends AppCompatActivity {
                                     db.InsertAdditionalPromoData(cd);
                                     AdditionalPromoListView();
 
+                                    sp_promo.setSelection(0);
+                                    toggle_add_InStock.setChecked(true);
+                                    toggle_add_promoAnnouncer.setChecked(true);
+                                    toggle_add_runningPos.setChecked(true);
+
                                     Snackbar.make(v, "promo is add", Snackbar.LENGTH_LONG).setAction("Action", null).show();
                                     //Toast.makeText(getApplicationContext(), "promo is add", Toast.LENGTH_LONG).show();
                                 }
@@ -212,10 +220,14 @@ public class PromoComplianceActivity extends AppCompatActivity {
                             .setPositiveButton("Yes", new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialog, int id) {
 
-                                db.InsertPromoSkuData(promoSkuListData);
+                                    if (db.checkPromoComplianceData(store_id, categoryId)) {
-
+                                        db.updatePromoComplianceSKU(promoSkuListData, categoryId, store_id);
+                                        Snackbar.make(view, "Data has been updated", Snackbar.LENGTH_LONG).setAction("Action", null).show();
+                                    } else {
+                                        db.InsertPromoSkuData(promoSkuListData, categoryId);
                                         Snackbar.make(view, "Data has been saved", Snackbar.LENGTH_LONG).setAction("Action", null).show();
-                                //Toast.makeText(getApplicationContext(), "Data has been saved", Toast.LENGTH_LONG).show();
+                                    }
+
                                     finish();
                                     overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
                                 }
@@ -238,11 +250,18 @@ public class PromoComplianceActivity extends AppCompatActivity {
 
             }
         };*/
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     private void prepareList() {
+        try {
             //Promo SKU List
+            promoSkuListData = db.getPromoComplianceSkuAfterData(store_id, categoryId);
+            if (!(promoSkuListData.size() > 0)) {
                 promoSkuListData = db.getPromoComplianceSkuData(store_id);
+            }
 
             //Promo Spinner List
             promoSpinnerListData = db.getPromoSpinnerData(store_id);
@@ -252,9 +271,13 @@ public class PromoComplianceActivity extends AppCompatActivity {
                 sp_promo_adapter.add(promoSpinnerListData.get(i).getPromo());
             }
             sp_promo.setAdapter(sp_promo_adapter);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     private void promoSkuListView() {
+        try {
             View view;
 
             for (int i = 0; i < promoSkuListData.size(); i++) {
@@ -325,9 +348,13 @@ public class PromoComplianceActivity extends AppCompatActivity {
 
                 lin_promo_sku.addView(view);
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     private void AdditionalPromoListView() {
+        try {
             additionalPromoListData.clear();
             lin_addtional_promo.removeAllViews();
 
@@ -371,5 +398,34 @@ public class PromoComplianceActivity extends AppCompatActivity {
 
                 lin_addtional_promo.addView(view);
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.main, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+
+        if (id == android.R.id.home) {
+            finish();
+        }
+
+        //noinspection SimplifiableIfStatement
+        if (id == R.id.action_settings) {
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
     }
 }

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

@@ -7,6 +7,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.graphics.Typeface;
 import android.net.Uri;
 import android.os.Build;
@@ -76,6 +77,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        try {
             setContentView(R.layout.activity_stock_facing);
 
             Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
@@ -113,7 +115,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
             final FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
             fab.setOnClickListener(new View.OnClickListener() {
                 @Override
-            public void onClick(View view) {
+                public void onClick(final View view) {
                     /*Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
                             .setAction("Action", null).show();*/
 
@@ -127,11 +129,13 @@ public class Stock_FacingActivity extends AppCompatActivity {
 
                                         if (db.checkStockAndFacingData(store_id, categoryId)) {
                                             db.updateStockAndFacing(store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
+                                            Snackbar.make(view, "Data has been updated", Snackbar.LENGTH_LONG).setAction("Action", null).show();
                                         } else {
                                             db.InsertStock_Facing(store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
+                                            Snackbar.make(view, "Data has been saved", Snackbar.LENGTH_LONG).setAction("Action", null).show();
+                                            //Toast.makeText(getApplicationContext(), "Data has been saved", Toast.LENGTH_LONG).show();
                                         }
 
-                                    Toast.makeText(getApplicationContext(), "Data has been saved", Toast.LENGTH_LONG).show();
                                         finish();
                                         overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
                                     }
@@ -227,9 +231,13 @@ public class Stock_FacingActivity extends AppCompatActivity {
                     return false;
                 }
             });
+        } catch (Resources.NotFoundException e) {
+            e.printStackTrace();
+        }
     }
 
     private void prepareList() {
+        try {
             hashMapListHeaderData = new ArrayList<>();
             hashMapListChildData = new HashMap<>();
 
@@ -256,6 +264,9 @@ public class Stock_FacingActivity extends AppCompatActivity {
 
             adapter = new ExpandableListAdapter(this, hashMapListHeaderData, hashMapListChildData);
             expandableListView.setAdapter(adapter);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     public class ExpandableListAdapter extends BaseExpandableListAdapter {
@@ -326,9 +337,9 @@ public class Stock_FacingActivity extends AppCompatActivity {
             }
 
             if (headerTitle.getImage1().equals("")) {
-                img_camera1.setBackgroundResource(R.drawable.ic_menu_camera);
+                img_camera1.setBackgroundResource(R.mipmap.camera);
             } else {
-                img_camera1.setBackgroundResource(R.drawable.ic_menu_gallery);
+                img_camera1.setBackgroundResource(R.mipmap.camera_done);
             }
 
 
@@ -354,9 +365,9 @@ public class Stock_FacingActivity extends AppCompatActivity {
             }
 
             if (headerTitle.getImage2().equals("")) {
-                img_camera2.setBackgroundResource(R.drawable.ic_menu_camera);
+                img_camera2.setBackgroundResource(R.mipmap.camera);
             } else {
-                img_camera2.setBackgroundResource(R.drawable.ic_menu_gallery);
+                img_camera2.setBackgroundResource(R.mipmap.camera_done);
             }
 
 

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

@@ -10,13 +10,30 @@
     tools:context="cpm.com.gskmtorange.gsk_dailyentry.PromoComplianceActivity"
     tools:showIn="@layout/activity_promo_compliance">
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/txt_promoComplianceName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="#FFF1710F"
+            android:paddingBottom="10dp"
+            android:paddingLeft="20dp"
+            android:paddingTop="10dp"
+            android:text="@string/title_activity_promo_compliance"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@android:color/black" />
+
         <ScrollView
             android:id="@+id/scrollView_promoCompliance"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-        android:layout_alignParentTop="true"
             android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true">
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -64,7 +81,7 @@
                                 android:paddingBottom="5dp"
                                 android:paddingLeft="10dp"
                                 android:paddingTop="5dp"
-                            android:text="Additional Promos"
+                                android:text="@string/promo_compliance_additional_promo"
                                 android:textAppearance="?android:attr/textAppearanceSmall"
                                 android:textColor="@color/black" />
                         </LinearLayout>
@@ -86,7 +103,7 @@
                                 android:paddingBottom="5dp"
                                 android:paddingLeft="10dp"
                                 android:paddingTop="5dp"
-                            android:text="Promos"
+                                android:text="@string/promo_compliance_promo"
                                 android:textAppearance="?android:attr/textAppearanceSmall"
                                 android:textColor="@color/black" />
 
@@ -124,7 +141,7 @@
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
                                         android:paddingLeft="10dp"
-                                    android:text="In Stock"
+                                        android:text="@string/promo_compliance_inStock"
                                         android:textAppearance="?android:attr/textAppearanceSmall" />
                                 </LinearLayout>
 
@@ -139,8 +156,8 @@
                                         android:id="@+id/toggle_add_InStock"
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                    android:textOff="No"
+                                        android:textOff="@string/no"
-                                    android:textOn="Yes" />
+                                        android:textOn="@string/yes" />
                                 </LinearLayout>
                             </LinearLayout>
 
@@ -162,7 +179,7 @@
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
                                         android:paddingLeft="10dp"
-                                    android:text="Promo Announcer"
+                                        android:text="@string/promo_compliance_promoAnnouncer"
                                         android:textAppearance="?android:attr/textAppearanceSmall" />
                                 </LinearLayout>
 
@@ -177,8 +194,8 @@
                                         android:id="@+id/toggle_add_promoAnnouncer"
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                    android:textOff="No"
+                                        android:textOff="@string/no"
-                                    android:textOn="Yes" />
+                                        android:textOn="@string/yes" />
                                 </LinearLayout>
                             </LinearLayout>
 
@@ -200,7 +217,7 @@
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
                                         android:paddingLeft="10dp"
-                                    android:text="Running on POS"
+                                        android:text="@string/promo_compliance_runningPOS"
                                         android:textAppearance="?android:attr/textAppearanceSmall" />
                                 </LinearLayout>
 
@@ -215,8 +232,8 @@
                                         android:id="@+id/toggle_add_runningPos"
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                    android:textOff="No"
+                                        android:textOff="@string/no"
-                                    android:textOn="Yes" />
+                                        android:textOn="@string/yes" />
                                 </LinearLayout>
                             </LinearLayout>
                         </LinearLayout>
@@ -236,7 +253,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="right"
                                 android:background="@color/colorPrimaryDark"
-                            android:text="Add"
+                                android:text="@string/promo_compliance_add"
                                 android:textColor="@color/white" />
                         </LinearLayout>
 
@@ -259,4 +276,5 @@
             </LinearLayout>
 
         </ScrollView>
+    </LinearLayout>
 </RelativeLayout>

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

@@ -23,7 +23,7 @@
                 android:paddingBottom="5dp"
                 android:paddingLeft="10dp"
                 android:paddingTop="5dp"
-                android:text="Promos SKU"
+                android:text="@string/promo_compliance_promos_sku"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textColor="@color/black" />
 
@@ -73,7 +73,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:paddingLeft="10dp"
-                            android:text="In Stock"
+                            android:text="@string/promo_compliance_inStock"
                             android:textAppearance="?android:attr/textAppearanceSmall" />
                     </LinearLayout>
 
@@ -94,7 +94,7 @@
                             android:id="@+id/txt_inStock"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="Yes"
+                            android:text="@string/yes"
                             android:textAppearance="?android:attr/textAppearanceSmall"
                             android:textColor="@color/black" />
                     </LinearLayout>
@@ -118,7 +118,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:paddingLeft="10dp"
-                            android:text="Promo Announcer"
+                            android:text="@string/promo_compliance_promoAnnouncer"
                             android:textAppearance="?android:attr/textAppearanceSmall" />
                     </LinearLayout>
 
@@ -139,7 +139,7 @@
                             android:id="@+id/txt_promoAnnouncer"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="Yes"
+                            android:text="@string/yes"
                             android:textAppearance="?android:attr/textAppearanceSmall"
                             android:textColor="@color/black" />
                     </LinearLayout>
@@ -184,7 +184,7 @@
                             android:id="@+id/txt_runningPos"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="Yes"
+                            android:text="@string/yes"
                             android:textAppearance="?android:attr/textAppearanceSmall"
                             android:textColor="@color/black" />
 

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

@@ -23,7 +23,7 @@
                 android:paddingBottom="5dp"
                 android:paddingLeft="10dp"
                 android:paddingTop="5dp"
-                android:text="Promos SKU"
+                android:text="@string/promo_compliance_promos_sku"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textColor="@color/black" />
 
@@ -73,7 +73,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:paddingLeft="10dp"
-                            android:text="In Stock"
+                            android:text="@string/promo_compliance_inStock"
                             android:textAppearance="?android:attr/textAppearanceSmall" />
                     </LinearLayout>
 
@@ -88,8 +88,8 @@
                             android:id="@+id/toggle_inStock"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textOff="No"
+                            android:textOff="@string/no"
-                            android:textOn="Yes" />
+                            android:textOn="@string/yes" />
                     </LinearLayout>
                 </LinearLayout>
 
@@ -111,7 +111,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:paddingLeft="10dp"
-                            android:text="Promo Announcer"
+                            android:text="@string/promo_compliance_promoAnnouncer"
                             android:textAppearance="?android:attr/textAppearanceSmall" />
                     </LinearLayout>
 
@@ -126,8 +126,8 @@
                             android:id="@+id/toggle_promoAnnouncer"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textOff="No"
+                            android:textOff="@string/no"
-                            android:textOn="Yes" />
+                            android:textOn="@string/yes"/>
                     </LinearLayout>
                 </LinearLayout>
 
@@ -149,7 +149,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:paddingLeft="10dp"
-                            android:text="Running on POS"
+                            android:text="@string/promo_compliance_runningPOS"
                             android:textAppearance="?android:attr/textAppearanceSmall" />
                     </LinearLayout>
 
@@ -164,8 +164,8 @@
                             android:id="@+id/toggle_runningPos"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textOff="No"
+                            android:textOff="@string/no"
-                            android:textOn="Yes" />
+                            android:textOn="@string/yes"/>
                     </LinearLayout>
                 </LinearLayout>
             </LinearLayout>

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

@@ -51,7 +51,7 @@
                     android:layout_width="30dp"
                     android:layout_height="30dp"
                     android:layout_marginRight="10dp"
-                    android:src="@android:drawable/btn_star_big_off" />
+                    android:src="@mipmap/star" />
 
                 <ImageView
                     android:id="@+id/img_camera1"
@@ -72,7 +72,7 @@
                     android:layout_width="25dp"
                     android:layout_height="25dp"
                     android:layout_marginRight="20dp"
-                    android:src="@android:drawable/ic_menu_edit" />
+                    android:src="@mipmap/no_camera" />
             </LinearLayout>
         </LinearLayout>
     </android.support.v7.widget.CardView>

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

@@ -34,6 +34,8 @@
     <string name="select">Select</string>
     <string name="add">Add</string>
     <string name="cancel">Cancel</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
 
     <string name="select_language">Please select language</string>
     <string name="title_activity_select_language">SelectLanguageActivity</string>
@@ -96,9 +98,7 @@
 
     <string name="title_store_list_checkout_current">Please checkout from current store</string>
     <string name="title_store_list_checkout_Already_filled">Data already filled</string>
-    <string name="title_activity_promo_compliance">PromoCompliance</string>
     <string name="title_store_list_download_data">Please Download Data First</string>
-
     <string name="enter_the_values">Enter the values</string>
 
     <string name="yes">Yes</string>
@@ -108,4 +108,19 @@
     <string name="no_data_for_upload">No Data For Upload</string>
     <string name="first_checkout_store">First checkout of store</string>
 
+    <!--Gagan start new code 1-->
+    <string name="title_activity_promo_compliance">Promotion Compliance</string>
+
+    <string name="promo_compliance_additional_promo">Additional Promos</string>
+    <string name="promo_compliance_promo">Promos</string>
+    <string name="promo_compliance_promos_sku">Promos SKU</string>
+    <string name="promo_compliance_sku">SKU</string>
+    <string name="promo_compliance_inStock">In Stock</string>
+    <string name="promo_compliance_promoAnnouncer">Promo Announcer</string>
+    <string name="promo_compliance_runningPOS">Running on POS</string>
+    <string name="promo_compliance_add">Add</string>
+
+    <!--Gagan end new code 1-->
+
+
 </resources>