diff --git a/.idea/modules.xml b/.idea/modules.xml
index ad566b9..cc87edb 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,6 +4,7 @@
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml
index 9a6bced..85571b0 100644
--- a/GSKMTOrange/src/main/AndroidManifest.xml
+++ b/GSKMTOrange/src/main/AndroidManifest.xml
@@ -100,14 +100,12 @@
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustPan" />
-
-
+ android:screenOrientation="portrait"
+ android:theme="@style/AppTheme.NoActionBar" />
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
index b49eea9..d11ad1a 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
@@ -14,6 +14,7 @@ import java.util.HashMap;
import java.util.List;
import cpm.com.gskmtorange.GetterSetter.AddittionalGetterSetter;
+import cpm.com.gskmtorange.GetterSetter.BrandAvabilityGetterSetter;
import cpm.com.gskmtorange.GetterSetter.CoverageBean;
import cpm.com.gskmtorange.GetterSetter.GeotaggingBeans;
import cpm.com.gskmtorange.GetterSetter.StoreBean;
@@ -128,6 +129,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.execSQL(TableBean.getAdditionalDisplay());
db.execSQL(TableBean.getMappingSosTarget());
+ db.execSQL(CommonString.CREATE_TABLE_INSERT_BRAND_AVAIBILITY_DATA);
+
} catch (SQLException e) {
e.printStackTrace();
Toast.makeText(context, "Error -" + e.toString(), Toast.LENGTH_SHORT).show();
@@ -2620,6 +2623,21 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
+
+ ArrayList brand = data.get(i).getBrandlist();
+
+ for (int k = 0; k < brand.size(); k++) {
+
+ values.put("COMMON_ID", l);
+ values.put("BRAND_NAME", brand.get(i).getBRAND());
+ values.put("BRAND_ID", brand.get(i).getBRAND_ID());
+
+ db.insert(CommonString.TABLE_INSERT_BRAND_AVAIBILITY_DATA, null, values);
+
+ }
+
+
+
}
} catch (Exception ex) {
Log.d("Exception ", " in T2P_COMPLIANCE " + ex.toString());
@@ -3546,4 +3564,96 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
}
+ public ArrayList getBrandAvailbilitydata(String store_id, String category_id,String keyAccount_id,String class_id,String storeType_id) {
+ Cursor cursordata = null;
+ ArrayList Data = new ArrayList();
+
+ try {
+
+ cursordata = db.rawQuery("SELECT DISTINCT BR.BRAND_ID, BR.BRAND FROM SKU_MASTER SK INNER JOIN BRAND_MASTER BR ON SK.BRAND_ID = BR.BRAND_ID " +
+ "INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID " +
+ "INNER JOIN CATEGORY_MASTER CA ON SB.CATEGORY_ID = CA.CATEGORY_ID " +
+ "INNER JOIN " +
+ "(SELECT DISTINCT SKU_ID FROM MAPPING_STOCK WHERE KEYACCOUNT_ID = '"+ keyAccount_id+ "' AND STORETYPE_ID = '" +storeType_id+ "' AND CLASS_ID = '" +class_id +"') A " +
+ "ON SK.SKU_ID = A.SKU_ID " +
+ "WHERE CA.CATEGORY_ID = '"+category_id+"'", null);
+
+ if (cursordata != null) {
+ cursordata.moveToFirst();
+ while (!cursordata.isAfterLast()) {
+ BrandAvabilityGetterSetter sb = new BrandAvabilityGetterSetter();
+
+ sb.setBRAND_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("BRAND_ID")));
+
+ sb.setBRAND(cursordata.getString(cursordata.getColumnIndexOrThrow("BRAND")));
+
+ Data.add(sb);
+ cursordata.moveToNext();
+ }
+ cursordata.close();
+
+ }
+
+
+ } catch (Exception ex) {
+
+ }
+ return Data;
+
+ }
+
+ public void InsertBrandAvabilitydata(BrandAvabilityGetterSetter data,ArrayList list) {
+
+ db.delete("Camera_Not_Allowed ", null, null);
+
+ ContentValues values = new ContentValues();
+ try {
+ for (int i = 0; i < list.size(); i++) {
+
+ values.put("STORETYPE_ID", data.getStoreType_id());
+ values.put("class_id", data.getClass_id());
+ values.put("CATEGORY_ID", data.getCategoryId());
+ values.put("keyAccount_id", data.getKeyAccount_id());
+ values.put("STORE_ID", data.getStore_id());
+ values.put("BRAND_NAME", list.get(i).getBRAND());
+ values.put("BRAND_ID", list.get(i).getBRAND_ID());
+
+
+ db.insert(CommonString.TABLE_INSERT_BRAND_AVAIBILITY_DATA, null, values);
+ }
+ } catch (Exception ex) {
+ Log.d("Exception ", " Camera_Not_Allowed " + ex.toString());
+ }
+ }
+
+
+ // get T2P brand data
+ public ArrayList getT2BrandData(String common_id) {
+
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+ try {
+ dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_BRAND_AVAIBILITY_DATA + " where " +
+ CommonString.KEY_COMMON_ID + "='" + common_id + "'", null);
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ BrandAvabilityGetterSetter BG = new BrandAvabilityGetterSetter();
+
+ BG.setBRAND(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_NAME")));
+ BG.setBRAND_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_ID")));
+
+ list.add(BG);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+ } catch (Exception e) {
+ return list;
+ }
+ return list;
+ }
+
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/BrandAvabilityGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/BrandAvabilityGetterSetter.java
new file mode 100644
index 0000000..7a8bd25
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/BrandAvabilityGetterSetter.java
@@ -0,0 +1,84 @@
+package cpm.com.gskmtorange.GetterSetter;
+
+import java.util.ArrayList;
+
+/**
+ * Created by ashishc on 07-02-2017.
+ */
+
+public class BrandAvabilityGetterSetter {
+
+ String BRAND_ID;
+ String BRAND;
+ String keyAccount_id;
+ String class_id;
+ String categoryId;
+
+ public String getStore_id() {
+ return store_id;
+ }
+
+ public void setStore_id(String store_id) {
+ this.store_id = store_id;
+ }
+
+ String store_id;
+
+ public String getStoreType_id() {
+ return storeType_id;
+ }
+
+ public void setStoreType_id(String storeType_id) {
+ this.storeType_id = storeType_id;
+ }
+
+ public String getCategoryId() {
+ return categoryId;
+ }
+
+ public void setCategoryId(String categoryId) {
+ this.categoryId = categoryId;
+ }
+
+ public String getClass_id() {
+ return class_id;
+ }
+
+ public void setClass_id(String class_id) {
+ this.class_id = class_id;
+ }
+
+ public String getKeyAccount_id() {
+ return keyAccount_id;
+ }
+
+ public void setKeyAccount_id(String keyAccount_id) {
+ this.keyAccount_id = keyAccount_id;
+ }
+
+ String storeType_id;
+
+
+ public String getBRAND() {
+ return BRAND;
+ }
+
+ public void setBRAND(String BRAND) {
+ this.BRAND = BRAND;
+ }
+
+ public String getBRAND_ID() {
+ return BRAND_ID;
+ }
+
+ public void setBRAND_ID(String BRAND_ID) {
+ this.BRAND_ID = BRAND_ID;
+ }
+
+
+
+
+
+
+
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
index 3f66fa9..3735025 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
@@ -550,4 +550,27 @@ public class CommonString {
+ KEY_SKU + " VARCHAR"
+ ")";
+
+ public static final String TABLE_INSERT_BRAND_AVAIBILITY_DATA = "Camera_Not_Allowed";
+
+ public static final String CREATE_TABLE_INSERT_BRAND_AVAIBILITY_DATA = "CREATE TABLE IF NOT EXISTS "
+ + TABLE_INSERT_BRAND_AVAIBILITY_DATA
+ + "("
+ + "KEY_ID"
+ + " INTEGER PRIMARY KEY AUTOINCREMENT ,"
+
+ + "COMMON_ID"
+ + " VARCHAR,"
+
+ + "BRAND_NAME"
+ + " VARCHAR,"
+
+ + "BRAND_ID"
+ + " VARCHAR"
+
+ + ")";
+
+
+
+
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
index 75d805f..4348a44 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
@@ -169,6 +169,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
str = CommonString.FILE_PATH;
///band List
+
brand_list = db.getBrandMasterData(store_id, categoryId);
BrandMasterGetterSetter brand = new BrandMasterGetterSetter();
String str = getResources().getString(R.string.select);
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
index 5b5c435..5f8479c 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
@@ -24,6 +24,7 @@ import android.provider.MediaStore;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.CardView;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
@@ -38,10 +39,12 @@ import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
+import android.widget.BaseAdapter;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
+import android.widget.ListView;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.ToggleButton;
@@ -54,7 +57,9 @@ import java.util.List;
import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
+import cpm.com.gskmtorange.GetterSetter.AdditionalDialogGetterSetter;
import cpm.com.gskmtorange.GetterSetter.AddittionalGetterSetter;
+import cpm.com.gskmtorange.GetterSetter.BrandAvabilityGetterSetter;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
@@ -71,7 +76,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
ArrayList t2PGetterSetters;
T2PAdapter t2PAdapter;
RecyclerView rec_t2p;
-
+ MyAdaptorStock adapterData;
String categoryName, categoryId;
String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow;
String str = CommonString.FILE_PATH,
@@ -81,7 +86,13 @@ public class T2PComplianceActivity extends AppCompatActivity {
int child_position = -1, child_position1 = -1, child_position2 = -1;
String error_msg;
private SharedPreferences preferences;
-
+ Spinner spinner_brand;
+ Button btn_add,btn_close;
+ ListView listview;
+ LinearLayout linearlay;
+ CardView cardlay;
+ String brand_name="",brand_id="";
+ ArrayList brand_new_list=new ArrayList();
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -170,9 +181,12 @@ public class T2PComplianceActivity extends AppCompatActivity {
ArrayList gapsList = db.getGapsData(t2PGetterSetters.get(i).getKey_id());
ArrayList skuList = db.getT2PSKUData(t2PGetterSetters.get(i).getKey_id());
+ ArrayList brandList = db.getT2BrandData(t2PGetterSetters.get(i).getKey_id());
t2PGetterSetters.get(i).setGapsChecklist(gapsList);
t2PGetterSetters.get(i).setSkulist(skuList);
+ t2PGetterSetters.get(i).setBrandlist(brandList);
+
}
}
@@ -330,7 +344,11 @@ public class T2PComplianceActivity extends AppCompatActivity {
});
if (mItem.getImage().equals("")) {
+
+
+
if (mItem.isPresent()) {
+
holder.img_cam.setBackgroundResource(R.mipmap.camera_orange);
} else {
//if not present camera disabled
@@ -357,6 +375,8 @@ public class T2PComplianceActivity extends AppCompatActivity {
if (mItem.getImage1().equals("")) {
if (mItem.isPresent()) {
+
+ holder.img_cam1.setVisibility(View.VISIBLE);
holder.img_cam1.setBackgroundResource(R.mipmap.camera_orange);
} else {
//if not present camera disabled
@@ -383,6 +403,8 @@ public class T2PComplianceActivity extends AppCompatActivity {
if (mItem.getImage2().equals("")) {
if (mItem.isPresent()) {
+
+ holder.img_cam2.setVisibility(View.VISIBLE);
holder.img_cam2.setBackgroundResource(R.mipmap.camera_orange);
} else {
//if not present camera disabled
@@ -396,13 +418,32 @@ public class T2PComplianceActivity extends AppCompatActivity {
holder.img_cam.setBackgroundResource(R.mipmap.camera_grey);
holder.img_cam1.setBackgroundResource(R.mipmap.camera_grey);
holder.img_cam2.setBackgroundResource(R.mipmap.camera_grey);
+ holder.img_cam1.setVisibility(View.INVISIBLE);
+ holder.img_cam2.setVisibility(View.INVISIBLE);
+
+ holder.img_cam.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+
+ /* Intent in =new Intent(T2PComplianceActivity.this,T2pBrand_Avaibility.class);
+ in.putExtra("categoryName", categoryName);
+ in.putExtra("categoryId", categoryId);
+ startActivity(in);*/
+
+ showBrandAvabilitydialog(mItem.getBrandlist());
+
+
+
+ }
+ });
+
}
boolean is_enabled = mItem.isPresent();
holder.toggle_btn.setChecked(is_enabled);
- holder.img_cam.setEnabled(is_enabled);
+ // holder.img_cam.setEnabled(is_enabled);
holder.img_cam1.setEnabled(is_enabled);
holder.img_cam2.setEnabled(is_enabled);
holder.btn_gaps.setEnabled(is_enabled);
@@ -574,7 +615,6 @@ public class T2PComplianceActivity extends AppCompatActivity {
spinner_sku.setSelection(0);
-
brand_selected[0] = null;
sku_selected[0] = null;
}
@@ -1204,4 +1244,245 @@ public class T2PComplianceActivity extends AppCompatActivity {
super.onPageStarted(view, url, favicon);
}
}
+
+
+ //// new
+
+
+
+ public void showBrandAvabilitydialog(final ArrayList brandGetdata) {
+
+ final ArrayList brandList = db.getBrandAvailbilitydata(store_id, categoryId,keyAccount_id,class_id,storeType_id);
+
+ BrandAvabilityGetterSetter brand = new BrandAvabilityGetterSetter();
+ brand.setBRAND(getResources().getString(R.string.select));
+ brandList.add(0, brand);
+
+ final Dialog dialog = new Dialog(T2PComplianceActivity.this);
+ dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+ dialog.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT));
+ dialog.setContentView(R.layout.t2pbranddialoglayout);
+ dialog.setCancelable(false);
+ //pb = (ProgressBar) dialog.findViewById(R.id.progressBar1);
+ //dialog.setCancelable(false);
+ spinner_brand = (Spinner) dialog.findViewById(R.id.spinner_brand);
+
+ btn_add = (Button) dialog.findViewById(R.id.btn_add);
+ btn_close = (Button) dialog.findViewById(R.id.btn_cancel);
+
+ listview = (ListView) dialog.findViewById(R.id.lv);
+ linearlay = (LinearLayout) dialog.findViewById(R.id.list_layout);
+ cardlay = (CardView) dialog.findViewById(R.id.cardId);
+
+ // Create custom adapter object ( see below CustomAdapter.java )
+ T2PComplianceActivity.CustomBRANDAdapter adapter = new T2PComplianceActivity.CustomBRANDAdapter(T2PComplianceActivity.this, R.layout.custom_spinner_item, brandList);
+
+ spinner_brand.setAdapter(adapter);
+
+ if (brandGetdata.size() > 0) {
+ linearlay.setVisibility(View.VISIBLE);
+ cardlay.setVisibility(View.VISIBLE);
+ adapterData = new T2PComplianceActivity.MyAdaptorStock(T2PComplianceActivity.this, brandGetdata);
+ listview.setAdapter(adapterData);
+ listview.invalidateViews();
+ } else {
+ linearlay.setVisibility(View.GONE);
+ cardlay.setVisibility(View.GONE);
+ }
+
+ spinner_brand.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+ @Override
+ public void onItemSelected(AdapterView> parent, View view, int position, long id) {
+
+ if (position != 0) {
+
+ brand_name = brandList.get(position).getBRAND();
+ brand_id = brandList.get(position).getBRAND_ID();
+ }
+ }
+
+ @Override
+ public void onNothingSelected(AdapterView> parent) {
+
+ }
+ });
+
+ btn_close.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+
+ //brandGetdata.add(brand_new_list);
+ dialog.cancel();
+ t2PAdapter.notifyDataSetChanged();
+
+ }
+ });
+
+
+ btn_add.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ BrandAvabilityGetterSetter ab = new BrandAvabilityGetterSetter();
+
+ if (!brand_name.equalsIgnoreCase("") && brand_name!=null){
+
+ BrandAvabilityGetterSetter brand = new BrandAvabilityGetterSetter();
+
+ brand.setBRAND(brand_name);
+ brand.setBRAND_ID(brand_id);
+
+ brandGetdata.add(brand);
+
+ adapterData = new T2PComplianceActivity.MyAdaptorStock(T2PComplianceActivity.this, brandGetdata);
+ listview.setAdapter(adapterData);
+ listview.invalidateViews();
+
+ cardlay.setVisibility(View.VISIBLE);
+ linearlay.setVisibility(View.VISIBLE);
+ spinner_brand.setSelection(0);
+ brand_name="";
+ brand_id="";
+
+ }
+ else
+ {
+ Snackbar.make(v, "Please select dropdown", Snackbar.LENGTH_LONG)
+ .setAction("Action", null).show();
+ }
+
+ }
+ });
+
+ dialog.show();
+
+ }
+
+
+ public class MyAdaptorStock extends BaseAdapter {
+
+ private LayoutInflater mInflater;
+ private Context mcontext;
+ private ArrayList list;
+
+ public MyAdaptorStock(Activity activity, ArrayList list1) {
+
+ mInflater = LayoutInflater.from(getBaseContext());
+ mcontext = activity;
+ list = list1;
+ }
+
+ @Override
+ public int getCount() {
+
+ return list.size();
+ }
+
+ @Override
+ public Object getItem(int position1) {
+
+ return position1;
+ }
+
+ @Override
+ public long getItemId(int position1) {
+
+ return position1;
+ }
+
+ class ViewHolder {
+ TextView brand;
+
+
+ }
+
+ @Override
+ public View getView(final int position1, View convertView, ViewGroup parent) {
+
+ final T2PComplianceActivity.MyAdaptorStock.ViewHolder holder;
+
+ if (convertView == null) {
+
+ convertView = mInflater
+ .inflate(R.layout.brandavabilityadpterlayout, null);
+ holder = new T2PComplianceActivity.MyAdaptorStock.ViewHolder();
+
+ holder.brand = (TextView) convertView.findViewById(R.id.brand_name);
+
+ convertView.setTag(holder);
+ } else {
+ holder = (T2PComplianceActivity.MyAdaptorStock.ViewHolder) convertView.getTag();
+ }
+
+ holder.brand.setText(list.get(position1).getBRAND());
+
+ holder.brand.setId(position1);
+
+
+ return convertView;
+ }
+ }
+
+ public class CustomBRANDAdapter extends ArrayAdapter {
+
+ BrandAvabilityGetterSetter tempValues = null;
+ LayoutInflater inflater;
+ private Activity activity;
+ private ArrayList data;
+
+ /*************
+ * CustomAdapter Constructor
+ *****************/
+ public CustomBRANDAdapter(
+ T2PComplianceActivity activitySpinner,
+ int textViewResourceId,
+ ArrayList objects
+
+ ) {
+ super(activitySpinner, textViewResourceId, objects);
+
+ /********** Take passed values **********/
+ activity = activitySpinner;
+ data = objects;
+ /*********** Layout inflator to call external xml layout () **********************/
+ inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+ }
+
+ @Override
+ public View getDropDownView(int position, View convertView, ViewGroup parent) {
+ return getCustomView(position, convertView, parent);
+ }
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ return getCustomView(position, convertView, parent);
+ }
+
+ // This funtion called for each row ( Called data.size() times )
+ public View getCustomView(int position, View convertView, ViewGroup parent) {
+
+ /********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/
+ View row = inflater.inflate(R.layout.custom_spinner_item, parent, false);
+
+ /***** Get each Model object from Arraylist ********/
+ tempValues = null;
+ tempValues = (BrandAvabilityGetterSetter) data.get(position);
+
+ TextView label = (TextView) row.findViewById(R.id.tv_text);
+
+ if (position == 0) {
+
+ // Default selected Spinner item
+ label.setText(getString(R.string.select));
+ //sub.setText("");
+ } else {
+ // Set values for spinner each row
+ label.setText(tempValues.getBRAND());
+ }
+
+ return row;
+ }
+ }
+
+
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2pBrand_Avaibility.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2pBrand_Avaibility.java
new file mode 100644
index 0000000..a604b36
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2pBrand_Avaibility.java
@@ -0,0 +1,343 @@
+package cpm.com.gskmtorange.dailyentry;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.Snackbar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.CardView;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.BaseAdapter;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+
+import cpm.com.gskmtorange.Database.GSKOrangeDB;
+import cpm.com.gskmtorange.GetterSetter.AddittionalGetterSetter;
+import cpm.com.gskmtorange.GetterSetter.BrandAvabilityGetterSetter;
+import cpm.com.gskmtorange.GetterSetter.StoreBean;
+import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
+
+public class T2pBrand_Avaibility extends AppCompatActivity {
+ GSKOrangeDB db;
+ private SharedPreferences preferences;
+ String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow;
+ Spinner spinner_brand;
+ Button add;
+ ArrayList brand_list;
+ String categoryName,categoryId,brand_name="",brand_id="";
+ RecyclerView recyclerView;
+ ArrayList brand_new_list=new ArrayList();
+
+
+ T2pBrand_Avaibility.ValueAdapter adapteravabiblity;
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_t2p_brand__avaibility);
+ Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ setSupportActionBar(toolbar);
+ spinner_brand = (Spinner) findViewById(R.id.spinner);
+ add = (Button) findViewById(R.id.button2);
+ recyclerView = (RecyclerView) findViewById(R.id.layout_recycle);
+
+
+ db = new GSKOrangeDB(T2pBrand_Avaibility.this);
+ db.open();
+
+ //preference data
+ preferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+ updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
+ 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, "");
+ categoryName = getIntent().getStringExtra("categoryName");
+ categoryId = getIntent().getStringExtra("categoryId");
+/////
+ brand_list = db.getBrandAvailbilitydata(store_id, categoryId,keyAccount_id,class_id,storeType_id);
+ BrandAvabilityGetterSetter brand = new BrandAvabilityGetterSetter();
+ String str = getResources().getString(R.string.select);
+ brand.setBRAND(str);
+ brand_list.add(0, brand);
+ T2pBrand_Avaibility.CustomAdapter adapter = new T2pBrand_Avaibility.CustomAdapter(T2pBrand_Avaibility.this, R.layout.custom_spinner_item, brand_list);
+ spinner_brand.setAdapter(adapter);
+
+ FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+ fab.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ if(brand_new_list.size()>0)
+ {
+ BrandAvabilityGetterSetter br=new BrandAvabilityGetterSetter();
+
+ br.setCategoryId(categoryId);
+ br.setClass_id(class_id);
+ br.setKeyAccount_id(keyAccount_id);
+ br.setStoreType_id(storeType_id);
+ br.setStore_id(store_id);
+ db.InsertBrandAvabilitydata( br, brand_new_list);
+
+ brand_new_list.clear();
+ finish();
+
+
+ }
+ else{
+ Snackbar.make(view, "Please add data", Snackbar.LENGTH_LONG).setAction("Action", null).show();
+ }
+
+
+
+
+ }
+ });
+
+
+ add.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+
+ if (!brand_name.equalsIgnoreCase("") && brand_name!=null){
+
+ BrandAvabilityGetterSetter brand = new BrandAvabilityGetterSetter();
+
+ brand.setBRAND(brand_name);
+ brand.setBRAND_ID(brand_id);
+
+ brand_new_list.add(brand);
+
+ adapteravabiblity = new T2pBrand_Avaibility.ValueAdapter(T2pBrand_Avaibility.this, brand_new_list);
+ recyclerView.setAdapter(adapteravabiblity);
+ recyclerView.setLayoutManager(new LinearLayoutManager(T2pBrand_Avaibility.this));
+
+ spinner_brand.setSelection(0);
+ brand_name="";
+ brand_id="";
+
+ }
+ else
+ {
+ Snackbar.make(view, "Please select dropdown", Snackbar.LENGTH_LONG)
+ .setAction("Action", null).show();
+ }
+
+ }
+ });
+
+
+ spinner_brand.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+ @Override
+ public void onItemSelected(AdapterView> parent, View view, int position, long id) {
+
+ if (position != 0) {
+
+ brand_name = brand_list.get(position).getBRAND();
+ brand_id = brand_list.get(position).getBRAND_ID();
+
+ }
+ }
+
+ @Override
+ public void onNothingSelected(AdapterView> parent) {
+
+ }
+ });
+
+
+
+ }
+
+
+ public class CustomAdapter extends ArrayAdapter {
+
+ private Activity activity;
+ private ArrayList data;
+ BrandAvabilityGetterSetter tempValues = null;
+ LayoutInflater inflater;
+
+ /*************
+ * CustomAdapter Constructor
+ *****************/
+ public CustomAdapter(
+ T2pBrand_Avaibility activitySpinner,
+ int textViewResourceId,
+ ArrayList objects
+
+ ) {
+ super(activitySpinner, textViewResourceId, objects);
+
+ /********** Take passed values **********/
+ activity = activitySpinner;
+ data = objects;
+ /*********** Layout inflator to call external xml layout () **********************/
+ inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+ }
+
+ @Override
+ public View getDropDownView(int position, View convertView, ViewGroup parent) {
+ return getCustomView(position, convertView, parent);
+ }
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ return getCustomView(position, convertView, parent);
+ }
+
+ // This funtion called for each row ( Called data.size() times )
+ public View getCustomView(int position, View convertView, ViewGroup parent) {
+
+ /********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/
+ View row = inflater.inflate(R.layout.custom_spinner_item, parent, false);
+
+ /***** Get each Model object from Arraylist ********/
+ tempValues = null;
+ tempValues = (BrandAvabilityGetterSetter) data.get(position);
+
+ TextView label = (TextView) row.findViewById(R.id.tv_text);
+
+ if (position == 0) {
+
+ // Default selected Spinner item
+ label.setText(getResources().getString(R.string.select));
+ //sub.setText("");
+ } else {
+ // Set values for spinner each row
+ label.setText(tempValues.getBRAND());
+ }
+
+ return row;
+ }
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ private static boolean updateResources(Context context, String language) {
+
+ String lang;
+
+ if (language.equalsIgnoreCase("English")) {
+ lang = "EN";
+ } else if (language.equalsIgnoreCase("UAE")) {
+ lang = "AR";
+ } else {
+ lang = "TR";
+ }
+
+ Locale locale = new Locale(lang);
+ Locale.setDefault(locale);
+
+ Resources resources = context.getResources();
+
+ Configuration configuration = resources.getConfiguration();
+ configuration.locale = locale;
+
+ resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+
+ return true;
+ }
+
+
+ public class ValueAdapter extends RecyclerView.Adapter {
+
+ private LayoutInflater inflator;
+
+ List data = Collections.emptyList();
+
+ public ValueAdapter(Context context, List data) {
+
+ inflator = LayoutInflater.from(context);
+ this.data = data;
+
+ }
+
+ @Override
+ public T2pBrand_Avaibility.ValueAdapter.MyViewHolder onCreateViewHolder(ViewGroup parent, int i) {
+
+ View view = inflator.inflate(R.layout.brandavabilityadpterlayout, parent, false);
+
+ T2pBrand_Avaibility.ValueAdapter.MyViewHolder holder = new T2pBrand_Avaibility.ValueAdapter.MyViewHolder(view);
+
+ return holder;
+ }
+
+ @Override
+ public void onBindViewHolder(final T2pBrand_Avaibility.ValueAdapter.MyViewHolder viewHolder, final int position) {
+
+ final BrandAvabilityGetterSetter current = data.get(position);
+
+ viewHolder.txt.setText(current.getBRAND());
+
+ }
+
+
+ @Override
+ public int getItemCount() {
+ return data.size();
+ }
+
+ class MyViewHolder extends RecyclerView.ViewHolder {
+
+ TextView txt, address;
+
+
+ public MyViewHolder(View itemView) {
+ super(itemView);
+ txt = (TextView) itemView.findViewById(R.id.brand_name);
+
+
+ }
+ }
+
+ }
+
+
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java
index b9f6616..b835b43 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java
@@ -2,6 +2,8 @@ package cpm.com.gskmtorange.xmlGetterSetter;
import java.util.ArrayList;
+import cpm.com.gskmtorange.GetterSetter.BrandAvabilityGetterSetter;
+
/**
* Created by yadavendras on 02-01-2017.
*/
@@ -14,6 +16,16 @@ public class T2PGetterSetter {
ArrayList gapsChecklist = new ArrayList<>();
ArrayList skulist = new ArrayList<>();
+ public ArrayList getBrandlist() {
+ return brandlist;
+ }
+
+ public void setBrandlist(ArrayList brandlist) {
+ this.brandlist = brandlist;
+ }
+
+ ArrayList brandlist = new ArrayList<>();
+
public String getBrand_id() {
return brand_id;
}
diff --git a/GSKMTOrange/src/main/res/layout/activity_t2p_brand__avaibility.xml b/GSKMTOrange/src/main/res/layout/activity_t2p_brand__avaibility.xml
new file mode 100644
index 0000000..9d8c871
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/activity_t2p_brand__avaibility.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/GSKMTOrange/src/main/res/layout/brandavabilityadpterlayout.xml b/GSKMTOrange/src/main/res/layout/brandavabilityadpterlayout.xml
new file mode 100644
index 0000000..cc23762
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/brandavabilityadpterlayout.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/GSKMTOrange/src/main/res/layout/content_t2p_brand__avaibility.xml b/GSKMTOrange/src/main/res/layout/content_t2p_brand__avaibility.xml
new file mode 100644
index 0000000..be80f3a
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/content_t2p_brand__avaibility.xml
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/GSKMTOrange/src/main/res/layout/t2pbranddialoglayout.xml b/GSKMTOrange/src/main/res/layout/t2pbranddialoglayout.xml
new file mode 100644
index 0000000..9c7acae
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/t2pbranddialoglayout.xml
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/GSKMTOrange/src/main/res/values/dimens.xml b/GSKMTOrange/src/main/res/values/dimens.xml
index e96451e..468fdf7 100644
--- a/GSKMTOrange/src/main/res/values/dimens.xml
+++ b/GSKMTOrange/src/main/res/values/dimens.xml
@@ -3,7 +3,7 @@
16dp
160dp
- 16dp
+ 5dp
16dp
16dp
diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml
index 02c5da4..5025cdf 100644
--- a/GSKMTOrange/src/main/res/values/strings.xml
+++ b/GSKMTOrange/src/main/res/values/strings.xml
@@ -266,4 +266,5 @@
New Update Available \n\n Yeni güncelleme var
Data not found in
+ T2pBrand_Avaibility