AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

//PromoCompliance Default Toggle Changes

Browse Source
This commit is contained in:
Gagan290
2017-02-10 17:55:24 +05:30
parent cd15dffabf
commit 6eb5517834
11 changed files with 1423 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+231
View File
@@ -48,6 +48,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.StoreWisePerformaceGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Store_wise_camera_DataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SubCategoryMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.T2PGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
@@ -135,6 +136,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_HEADER);
db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_CHILD);
db.execSQL(CommonString.CREATE_TABLE_INSERT_STORE_CAMERA);
} catch (SQLException e) {
e.printStackTrace();
Toast.makeText(context, "Error -" + e.toString(), Toast.LENGTH_SHORT).show();
@@ -3735,4 +3738,232 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
return list;
}
public void InsertStore_wise_camera(Store_wise_camera_DataGetterSetter data) {
ContentValues values = new ContentValues();
try {
values.put("Store_id", data.getStore_id());
values.put("Category_id", data.getCategory_id());
values.put("Camera1", data.getCamera1());
values.put("Camera2", data.getCamera2());
values.put("Camera3", data.getCamera3());
values.put("Camera4", data.getCamera4());
values.put("checkSaveStatus", data.getCheckSaveStatus());
db.insert(CommonString.TABLE_INSERT_STORE_CAMERA, null, values);
} catch (Exception ex) {
Log.d("Exception ", " Store_wise_camera " + ex.toString());
}
}
public Store_wise_camera_DataGetterSetter getStore_wise_camera(String store_id, String category_id) {
Store_wise_camera_DataGetterSetter data = new Store_wise_camera_DataGetterSetter();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select * from Store_wise_camera " +
"where Store_id='" + store_id + "' and Category_id='" + category_id + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
data.setStore_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Store_id")));
data.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Category_id")));
data.setCamera1(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Camera1")));
data.setCamera2(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Camera2")));
data.setCamera3(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Camera3")));
data.setCamera4(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Camera4")));
data.setCheckSaveStatus(dbcursor.getString(dbcursor.getColumnIndexOrThrow("checkSaveStatus")));
dbcursor.moveToNext();
}
dbcursor.close();
return data;
}
} catch (Exception e) {
Log.d("Exception ", "get Stock Facing Planogram server upload !" + e.toString());
return data;
}
return data;
}
//check if table is empty
public boolean isStorewiseCameraSave(String store_id, String category_id) {
boolean filled = false;
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select checkSaveStatus from Store_wise_camera " +
"where Store_id='" + store_id + "' and Category_id='" + category_id + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
String value = dbcursor.getString(dbcursor.getColumnIndexOrThrow("checkSaveStatus"));
if (value.equals("1")) {
filled = true;
} else {
filled = false;
}
//dbcursor.close();
}
} catch (Exception e) {
Log.d("Exception ", " when fetching Records!!!!!!!!!!!!!!!!!!!!! " + e.toString());
return filled;
}
return filled;
}
public void updateStore_wise_camera(Store_wise_camera_DataGetterSetter data) {
ContentValues values = new ContentValues();
try {
//values.put("Store_id", data.getStore_id());
//values.put("Category_id", data.getCategory_id());
values.put("Camera1", data.getCamera1());
values.put("Camera2", data.getCamera2());
values.put("Camera3", data.getCamera3());
values.put("Camera4", data.getCamera4());
db.update(CommonString.TABLE_INSERT_STORE_CAMERA, values,
" Store_id='" + data.getStore_id() + "' and Category_id='" + data.getCategory_id() + "'", null);
} catch (Exception ex) {
Log.d("Exception ", " Store_wise_camera " + ex.toString());
}
}
public void deleteStore_wise_camera(String store_id, String category_id) {
db.delete(CommonString.TABLE_INSERT_STORE_CAMERA, null, null);
}
//Stock Facing Planogram Server Upload Data
public ArrayList<Store_wise_camera_DataGetterSetter> getStoreWiseCameraServerUploadData(String store_id) {
ArrayList<Store_wise_camera_DataGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select * from Store_wise_camera " +
"where Store_id='" + store_id + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
Store_wise_camera_DataGetterSetter data = new Store_wise_camera_DataGetterSetter();
data.setStore_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Store_id")));
data.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Category_id")));
data.setCamera1(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Camera1")));
data.setCamera2(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Camera2")));
data.setCamera3(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Camera3")));
data.setCamera4(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Camera4")));
list.add(data);
dbcursor.moveToNext();
}
dbcursor.close();
return list;
}
} catch (Exception e) {
Log.d("Exception ", "get Stock Facing Planogram server upload !" + e.toString());
return list;
}
return list;
}
//Stock_facing Planogram Add Sku
public ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> getPlanogramAddSkuHeaderData(
String category_id, String keyAccount_id, String storeType_id, String class_id) {
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID ," +
" (SELECT SUM(SOS_TARGET) FROM MAPPING_SOS_TARGET WHERE STORE_ID = 1 AND BRAND_ID = BR.BRAND_ID)AS SOS_TARGET " +
"from MAPPING_STOCK M " +
"inner join SKU_MASTER SK " +
"on M.SKU_ID=SK.SKU_ID " +
"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 " +
"where CA.CATEGORY_ID='" + category_id + "' AND M.KEYACCOUNT_ID = '" + keyAccount_id +
"' AND M.STORETYPE_ID = '" + storeType_id + "' AND M.CLASS_ID = '" + class_id + "'" +
"order by SB.SUB_CATEGORY,BR.COMPANY_ID,BR.BRAND", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
StockFacing_PlanogramTrackerDataGetterSetter cd = new StockFacing_PlanogramTrackerDataGetterSetter();
cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID")));
cd.setSub_category_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY_ID")));
cd.setSub_category(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY")));
cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_ID")));
cd.setBrand(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND")));
list.add(cd);
dbcursor.moveToNext();
}
dbcursor.close();
return list;
}
} catch (Exception e) {
Log.d("Exception ", "get Planogram Add Sku Header!" + e.toString());
return list;
}
return list;
}
public ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> getPlanogramAddSkuChildData(
String category_id, String brand_id, String keyAccount_id, String storeType_id, String class_id) {
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID " +
"from MAPPING_STOCK M " +
"inner join SKU_MASTER SK " +
"on M.SKU_ID=SK.SKU_ID " +
"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 " +
"where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
"' AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' AND M.STORETYPE_ID = '" + storeType_id +
"' AND M.CLASS_ID = '" + class_id + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
StockFacing_PlanogramTrackerDataGetterSetter cd = new StockFacing_PlanogramTrackerDataGetterSetter();
cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
cd.setMrp(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MRP")));
cd.setSku_sequence(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_SEQUENCE")));
cd.setMbq(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MBQ")));
cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID")));
list.add(cd);
dbcursor.moveToNext();
}
dbcursor.close();
return list;
}
} catch (Exception e) {
Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString());
return list;
}
return list;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
+31
View File
@@ -614,5 +614,36 @@ public class CommonString {
+ "checkbox_sku"
+ " VARCHAR"
+ ")";
public static final String TABLE_INSERT_STORE_CAMERA = "Store_wise_camera";
public static final String CREATE_TABLE_INSERT_STORE_CAMERA = "CREATE TABLE IF NOT EXISTS "
+ TABLE_INSERT_STORE_CAMERA
+ "("
+ "KEY_ID"
+ " INTEGER PRIMARY KEY AUTOINCREMENT ,"
+ "Store_id"
+ " VARCHAR,"
+ "Category_id"
+ " VARCHAR,"
+ "Camera1"
+ " VARCHAR,"
+ "Camera2"
+ " VARCHAR,"
+ "Camera3"
+ " VARCHAR,"
+ "Camera4"
+ " VARCHAR,"
+ "checkSaveStatus"
+ " VARCHAR"
+ ")";
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java
+173 -43
View File
@@ -65,16 +65,20 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
PlanogramExpandableListAdapter adapter;
String categoryName, categoryId, Error_Message = "";
boolean checkflag = true;
List<Integer> checkHeaderArray = new ArrayList<>();
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> headerDataList = new ArrayList<>();
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> tempHeaderDataList;
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> shelfHeaderDataList = new ArrayList<>();
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> childDataList, tempChildDataList;
HashMap<StockFacing_PlanogramTrackerDataGetterSetter, List<StockFacing_PlanogramTrackerDataGetterSetter>> hashMapListChildData = new HashMap<>();
private SharedPreferences preferences;
String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow;
ExpandableListAdapter adapter1;
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> addSkuHeaderList;
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> addSkuChildList;
HashMap<StockFacing_PlanogramTrackerDataGetterSetter, List<StockFacing_PlanogramTrackerDataGetterSetter>> addSkuHashMapChildData;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -109,11 +113,11 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
expandableListView = (ExpandableListView) findViewById(R.id.exp_PlanogramListView);
Intent intent = getIntent();
brand = intent.getStringExtra("brand");
/*brand = intent.getStringExtra("brand");
brand_id = intent.getStringExtra("brand_id");
company_id = intent.getStringExtra("company_id");
sub_category = intent.getStringExtra("sub_category");
sub_category_id = intent.getStringExtra("sub_category_id");
sub_category_id = intent.getStringExtra("sub_category_id");*/
//Shelf Position Adapter
@@ -192,13 +196,11 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
public void onClick(View view) {
if (!data.getSp_addShelf_id().equals("0") && !data.getSp_shelfPosition().equals("Select")) {
tempHeaderDataList = new ArrayList<>();
headerDataList.add(data);
//tempHeaderDataList.add(data);
shelfHeaderDataList.add(data);
dialog.dismiss();
prepareHeaderList(headerDataList);
prepareHeaderList(shelfHeaderDataList);
} else {
Toast.makeText(StockFacing_PlanogramTrackerActivity.this, getResources().getString(R.string.empty_field), Toast.LENGTH_SHORT).show();
}
@@ -217,15 +219,15 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
/*Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
.setAction("Action", null).show();*/
if (validateData(headerDataList, hashMapListChildData)) {
if (validateData(shelfHeaderDataList, hashMapListChildData)) {
AlertDialog.Builder builder = new AlertDialog.Builder(StockFacing_PlanogramTrackerActivity.this);
builder.setMessage(getResources().getString(R.string.check_save_message))
.setCancelable(false)
.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
db.InsertStock_Facing_PlanogramTracker(store_id, categoryId, company_id, brand_id,
sub_category_id, headerDataList, hashMapListChildData);
/*db.InsertStock_Facing_PlanogramTracker(store_id, categoryId, company_id, brand_id,
sub_category_id, shelfHeaderDataList, hashMapListChildData);*/
finish();
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
@@ -240,7 +242,6 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
alert.show();
} else {
AlertDialog.Builder builder = new AlertDialog.Builder(StockFacing_PlanogramTrackerActivity.this);
//builder.setMessage(getResources().getString(R.string.empty_field))
builder.setMessage(Error_Message)
.setCancelable(false)
.setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
@@ -364,31 +365,31 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
}
}
private void prepareHeaderList(ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> headerDataList1) {
private void prepareHeaderList(ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> shelfHeaderDataList1) {
try {
//Header Data
if (headerDataList1.size() > 0) {
if (shelfHeaderDataList1.size() > 0) {
/*for (int i = 0; i < headerDataList.size(); i++) {
hashMapListChildData.put(headerDataList.get(i), childDataList);
/*for (int i = 0; i < shelfHeaderDataList.size(); i++) {
hashMapListChildData.put(shelfHeaderDataList.get(i), childDataList);
*//*if (childDataList != null && childDataList.size() > 0) {
if (headerDataList.get(i).getSp_addShelf_id().equals(childDataList.get(i).getSp_addShelf_id())) {
hashMapListChildData.put(headerDataList.get(i), childDataList);
if (shelfHeaderDataList.get(i).getSp_addShelf_id().equals(childDataList.get(i).getSp_addShelf_id())) {
hashMapListChildData.put(shelfHeaderDataList.get(i), childDataList);
} else {
hashMapListChildData.put(headerDataList.get(i), tempChildDataList);
hashMapListChildData.put(shelfHeaderDataList.get(i), tempChildDataList);
}
} else {
hashMapListChildData.put(headerDataList.get(i), tempChildDataList);
hashMapListChildData.put(shelfHeaderDataList.get(i), tempChildDataList);
}*//*
}*/
adapter = new PlanogramExpandableListAdapter(this, headerDataList1, hashMapListChildData);
adapter = new PlanogramExpandableListAdapter(this, shelfHeaderDataList1, hashMapListChildData);
expandableListView.setAdapter(adapter);
if (childDataList != null && childDataList.size() > 0) {
for (int j = 0; j < headerDataList.size(); j++) {
if (hashMapListChildData.get(headerDataList.get(j)).size() > 0) {
for (int j = 0; j < shelfHeaderDataList.size(); j++) {
if (hashMapListChildData.get(shelfHeaderDataList.get(j)).size() > 0) {
expandableListView.expandGroup(j);
}
}
@@ -402,19 +403,19 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
private void prepareSkuList(ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> childDataList1,
StockFacing_PlanogramTrackerDataGetterSetter object) {
try {
if (headerDataList.size() > 0) {
if (shelfHeaderDataList.size() > 0) {
hashMapListChildData.put(object, childDataList1);
/*//Child Sku Data
for (int i = 0; i < headerDataList.size(); i++) {
if (object.getSp_addShelf_id().equals(headerDataList.get(i).getSp_addShelf_id())) {
for (int i = 0; i < shelfHeaderDataList.size(); i++) {
if (object.getSp_addShelf_id().equals(shelfHeaderDataList.get(i).getSp_addShelf_id())) {
hashMapListChildData.put(object, childDataList1);
} else {
hashMapListChildData.put(headerDataList.get(i), childDataList);
hashMapListChildData.put(shelfHeaderDataList.get(i), childDataList);
}
}*/
/* adapter = new PlanogramExpandableListAdapter(this, headerDataList, hashMapListChildData);
/* adapter = new PlanogramExpandableListAdapter(this, shelfHeaderDataList, hashMapListChildData);
expandableListView.setAdapter(adapter);*/
adapter.notifyDataSetChanged();
@@ -422,8 +423,8 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
if (childDataList != null && childDataList.size() > 0) {
for (int j = 0; j < headerDataList.size(); j++) {
if (hashMapListChildData.get(headerDataList.get(j)).size() > 0) {
for (int j = 0; j < shelfHeaderDataList.size(); j++) {
if (hashMapListChildData.get(shelfHeaderDataList.get(j)).size() > 0) {
expandableListView.expandGroup(j);
}
}
@@ -489,9 +490,10 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
dialog1.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT));
dialog1.setContentView(R.layout.dialog_stock_facing_planogram_tracker_add_sku);
LinearLayout lin_addSku = (LinearLayout) dialog1.findViewById(R.id.lin_addSku);
//LinearLayout lin_addSku = (LinearLayout) dialog1.findViewById(R.id.lin_addSku);
Button addSKU = (Button) dialog1.findViewById(R.id.dialog_btn_addSku_Shelf);
Button cancel = (Button) dialog1.findViewById(R.id.dialog_btn_cancel_addSku);
ExpandableListView exp_addSkuListView = (ExpandableListView) dialog1.findViewById(R.id.exp_addSkuListView);
cancel.setOnClickListener(new View.OnClickListener() {
@Override
@@ -500,7 +502,9 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
}
});
childDataList = new ArrayList<>();
dialogAddSkuList(exp_addSkuListView);
/*childDataList = new ArrayList<>();
for (int i = 0; i < tempChildDataList.size(); i++) {
View view1 = getLayoutInflater().inflate(R.layout.item_stock_facing_planogram_child, null);
@@ -532,18 +536,12 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
childDataList.add(childData);
lin_addSku.addView(view1);
}
}*/
addSKU.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
/*headerTitle.getShelf_id();
childDataList.size();*/
/*prepareSkuList(childDataList, headerTitle);
dialog1.dismiss();*/
boolean flag = false;
/*boolean flag = false;
for (int i = 0; i < childDataList.size(); i++) {
if (childDataList.get(i).getCheckbox_sku().equals("1")) {
flag = true;
@@ -557,7 +555,7 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
} else {
Snackbar.make(view, "Please select atleast one sku", Snackbar.LENGTH_LONG)
.setAction("Action", null).show();
}
}*/
}
});
@@ -730,4 +728,136 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
return super.onOptionsItemSelected(item);
}
private void dialogAddSkuList(ExpandableListView exp_addSkuListView) {
try {
addSkuHeaderList = new ArrayList<>();
addSkuChildList = new ArrayList<>();
addSkuHashMapChildData = new HashMap<>();
//Header Data
addSkuHeaderList = db.getPlanogramAddSkuHeaderData(categoryId, keyAccount_id, storeType_id, class_id);
if (addSkuHeaderList.size() > 0) {
for (int i = 0; i < addSkuHeaderList.size(); i++) {
//Child Data
if (addSkuHeaderList.get(i).getCompany_id().equals("1")) {
addSkuChildList = db.getPlanogramAddSkuChildData(categoryId, addSkuHeaderList.get(i).getBrand_id(),
keyAccount_id, storeType_id, class_id);
addSkuHashMapChildData.put(addSkuHeaderList.get(i), addSkuChildList);
}
}
}
adapter1 = new ExpandableListAdapter(this, addSkuHeaderList, addSkuHashMapChildData);
exp_addSkuListView.setAdapter(adapter1);
} catch (Exception e) {
e.printStackTrace();
}
}
public class ExpandableListAdapter extends BaseExpandableListAdapter {
private Context _context;
private List<StockFacing_PlanogramTrackerDataGetterSetter> _listDataHeader;
private HashMap<StockFacing_PlanogramTrackerDataGetterSetter, List<StockFacing_PlanogramTrackerDataGetterSetter>> _listDataChild;
public ExpandableListAdapter(Context context, List<StockFacing_PlanogramTrackerDataGetterSetter> listDataHeader,
HashMap<StockFacing_PlanogramTrackerDataGetterSetter, List<StockFacing_PlanogramTrackerDataGetterSetter>> listChildData) {
this._context = context;
this._listDataHeader = listDataHeader;
this._listDataChild = listChildData;
}
@Override
public Object getGroup(int groupPosition) {
return this._listDataHeader.get(groupPosition);
}
@Override
public int getGroupCount() {
return this._listDataHeader.size();
}
@Override
public long getGroupId(int groupPosition) {
return groupPosition;
}
@Override
public View getGroupView(final int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) {
final StockFacing_PlanogramTrackerDataGetterSetter headerTitle = (StockFacing_PlanogramTrackerDataGetterSetter) getGroup(groupPosition);
if (convertView == null) {
LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
convertView = infalInflater.inflate(R.layout.item_stock_facing_add_sku_header, null, false);
}
TextView txt_stockFaceupHeader = (TextView) convertView.findViewById(R.id.txt_stockFaceupHeader);
txt_stockFaceupHeader.setTypeface(null, Typeface.BOLD);
txt_stockFaceupHeader.setText(headerTitle.getSub_category() + "-" + headerTitle.getBrand());
return convertView;
}
@Override
public Object getChild(int groupPosition, int childPosititon) {
return this._listDataChild.get(this._listDataHeader.get(groupPosition)).get(childPosititon);
}
@Override
public int getChildrenCount(int groupPosition) {
return this._listDataChild.get(this._listDataHeader.get(groupPosition)).size();
}
@Override
public long getChildId(int groupPosition, int childPosition) {
return childPosition;
}
@Override
public View getChildView(final int groupPosition, final int childPosition, boolean isLastChild, View convertView, ViewGroup parent) {
final StockFacing_PlanogramTrackerDataGetterSetter childData =
(StockFacing_PlanogramTrackerDataGetterSetter) getChild(groupPosition, childPosition);
ViewHolder1 holder = null;
if (convertView == null) {
LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
convertView = infalInflater.inflate(R.layout.item_stock_facing_planogram_child, null, false);
holder = new ViewHolder1();
holder.txt_skuName = (TextView) convertView.findViewById(R.id.txt_skuChild);
holder.chk_sku = (CheckBox) convertView.findViewById(R.id.chk_sku);
convertView.setTag(holder);
} else {
holder = (ViewHolder1) convertView.getTag();
}
holder.txt_skuName.setText(childData.getSku());
return convertView;
}
@Override
public boolean hasStableIds() {
return false;
}
@Override
public boolean isChildSelectable(int groupPosition, int childPosition) {
return true;
}
}
public class ViewHolder1 {
//CardView cardView;
TextView txt_skuName;
CheckBox chk_sku;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
+415 -24
View File
@@ -15,6 +15,7 @@ import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Color;
import android.graphics.LightingColorFilter;
import android.graphics.Matrix;
import android.graphics.Typeface;
import android.graphics.drawable.ColorDrawable;
@@ -70,6 +71,7 @@ import cpm.com.gskmtorange.dailyentry.T2PComplianceActivity;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Store_wise_camera_DataGetterSetter;
import static android.R.attr.angle;
@@ -93,6 +95,10 @@ public class Stock_FacingActivity extends AppCompatActivity {
String gallery_package = "";
private SharedPreferences preferences;
boolean isExpand = true;
ImageView camera1, camera2, camera3, camera4;
LinearLayout lin_camera1, lin_camera2, lin_camera3, lin_camera4;
String img3 = "", img4 = "", img5 = "", img6 = "";
Store_wise_camera_DataGetterSetter cameraData;
private static boolean updateResources(Context context, String language) {
@@ -132,6 +138,15 @@ public class Stock_FacingActivity extends AppCompatActivity {
expandableListView = (ExpandableListView) findViewById(R.id.expandableListView);
//txt_stockFacingName = (TextView) findViewById(R.id.txt_stockFacingName);
camera1 = (ImageView) findViewById(R.id.img_camera1);
camera2 = (ImageView) findViewById(R.id.img_camera2);
camera3 = (ImageView) findViewById(R.id.img_camera3);
camera4 = (ImageView) findViewById(R.id.img_camera4);
lin_camera1 = (LinearLayout) findViewById(R.id.lin_camera1);
lin_camera2 = (LinearLayout) findViewById(R.id.lin_camera2);
lin_camera3 = (LinearLayout) findViewById(R.id.lin_camera3);
lin_camera4 = (LinearLayout) findViewById(R.id.lin_camera4);
//preference data
@@ -156,10 +171,15 @@ public class Stock_FacingActivity extends AppCompatActivity {
getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
//Stock Facing List
prepareList();
str = CommonString.FILE_PATH + _pathforcheck;
//Camera
cameraMethod();
final FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() {
@Override
@@ -167,7 +187,14 @@ public class Stock_FacingActivity extends AppCompatActivity {
/*Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
.setAction("Action", null).show();*/
if (validateData(hashMapListHeaderData, hashMapListChildData)) {
/*if (db.isStorewiseCameraSave(store_id, categoryId)) {
db.updateStore_wise_camera(cameraData);
} else {
cameraData.setCheckSaveStatus("1");
db.InsertStore_wise_camera(cameraData);
}*/
if (validateData(hashMapListHeaderData, hashMapListChildData, cameraData)) {
AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this);
builder.setMessage(getResources().getString(R.string.check_save_message))
.setCancelable(false)
@@ -175,6 +202,15 @@ public class Stock_FacingActivity extends AppCompatActivity {
public void onClick(DialogInterface dialog, int id) {
db.open();
//Camera insert or update
if (db.isStorewiseCameraSave(store_id, categoryId)) {
db.updateStore_wise_camera(cameraData);
} else {
cameraData.setCheckSaveStatus("1");
db.InsertStore_wise_camera(cameraData);
}
//Stock Facing insert or update
if (db.checkStockAndFacingData(store_id, categoryId)) {
db.updateStockAndFacing(store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
Snackbar.make(view, getResources().getString(R.string.update_message), Snackbar.LENGTH_LONG).setAction("Action", null).show();
@@ -197,7 +233,6 @@ public class Stock_FacingActivity extends AppCompatActivity {
alert.show();
} else {
AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this);
//builder.setMessage(getResources().getString(R.string.empty_field))
builder.setMessage(Error_Message)
.setCancelable(false)
.setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
@@ -303,6 +338,124 @@ public class Stock_FacingActivity extends AppCompatActivity {
}
private void cameraMethod() {
cameraData = new Store_wise_camera_DataGetterSetter();
if (db.isStorewiseCameraSave(store_id, categoryId)) {
cameraData = db.getStore_wise_camera(store_id, categoryId);
} else {
cameraData.setStore_id(store_id);
cameraData.setCategory_id(categoryId);
cameraData.setCamera1("");
cameraData.setCamera2("");
cameraData.setCamera3("");
cameraData.setCamera4("");
cameraData.setCheckSaveStatus("0");
}
if (camera_allow.equals("1")) {
findViewById(R.id.view_camera2).setVisibility(View.VISIBLE);
findViewById(R.id.view_camera3).setVisibility(View.VISIBLE);
if (cameraData.getCamera1().equals("")) {
camera1.setBackgroundResource(R.mipmap.camera_orange);
} else {
camera1.setBackgroundResource(R.mipmap.camera_green);
}
if (cameraData.getCamera2().equals("")) {
camera2.setBackgroundResource(R.mipmap.camera_orange);
} else {
camera2.setBackgroundResource(R.mipmap.camera_green);
}
if (cameraData.getCamera3().equals("")) {
camera3.setBackgroundResource(R.mipmap.camera_orange);
} else {
camera3.setBackgroundResource(R.mipmap.camera_green);
}
if (cameraData.getCamera4().equals("")) {
camera4.setBackgroundResource(R.mipmap.camera_orange);
} else {
camera4.setBackgroundResource(R.mipmap.camera_green);
}
lin_camera1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
_pathforcheck = "Stock_Camera1_" + store_id + "_" + categoryId
+ "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
path = str + _pathforcheck;
startCameraActivity(3);
}
});
lin_camera2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
_pathforcheck = "Stock_Camera2_" + store_id + "_" + categoryId
+ "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
path = str + _pathforcheck;
startCameraActivity(4);
}
});
lin_camera3.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
_pathforcheck = "Stock_Camera3_" + store_id + "_" + categoryId
+ "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
path = str + _pathforcheck;
startCameraActivity(5);
}
});
lin_camera4.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
_pathforcheck = "Stock_Camera4_" + store_id + "_" + categoryId
+ "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
path = str + _pathforcheck;
startCameraActivity(6);
}
});
} else {
findViewById(R.id.view_camera2).setVisibility(View.GONE);
findViewById(R.id.view_camera3).setVisibility(View.GONE);
lin_camera2.setVisibility(View.GONE);
lin_camera3.setVisibility(View.GONE);
lin_camera4.setVisibility(View.GONE);
camera1.setBackgroundResource(R.mipmap.camera_grey);
lin_camera1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Intent intent = new Intent(Stock_FacingActivity.this, StockFacing_PlanogramTrackerActivity.class);
intent.putExtra("storeId", store_id);
intent.putExtra("keyAccount_id", keyAccount_id);
intent.putExtra("class_id", class_id);
intent.putExtra("storeType_id", storeType_id);
intent.putExtra("categoryId", categoryId);
intent.putExtra("categoryName", categoryName);
startActivity(intent);
}
});
}
}
private void prepareList() {
try {
hashMapListHeaderData = new ArrayList<>();
@@ -337,7 +490,8 @@ public class Stock_FacingActivity extends AppCompatActivity {
}
boolean validateData(List<Stock_FacingGetterSetter> listDataHeader,
HashMap<Stock_FacingGetterSetter, List<Stock_FacingGetterSetter>> listDataChild) {
HashMap<Stock_FacingGetterSetter, List<Stock_FacingGetterSetter>> listDataChild,
Store_wise_camera_DataGetterSetter cameraData) {
boolean flag = true;
checkHeaderArray.clear();
@@ -354,9 +508,12 @@ public class Stock_FacingActivity extends AppCompatActivity {
//Camera allow enable
if (camera_allow.equalsIgnoreCase("1")) {
//if (!imagePath.equals("") || !imagePath1.equals("")) {
if (!stock.equals("0")) {
if (!imagePath.equals("") || !imagePath1.equals("")) {
//Atleast Single camera is click
if (!cameraData.getCamera1().equals("") || !cameraData.getCamera2().equals("") ||
!cameraData.getCamera3().equals("") || !cameraData.getCamera4().equals("")) {
if (!stock.equals("0")) {
//if (!imagePath.equals("") || !imagePath1.equals("")) {
if (stock.equals("") || faceup.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
@@ -366,7 +523,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
Error_Message = getResources().getString(R.string.fill_data);
break;
}
} else {
/*} else {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
@@ -374,27 +531,23 @@ public class Stock_FacingActivity extends AppCompatActivity {
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 (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);
}
flag = false;
Error_Message = getResources().getString(R.string.click_image);
break;
}*/
}
} else {
//Camera allow disable
@@ -440,12 +593,152 @@ public class Stock_FacingActivity extends AppCompatActivity {
checkflag = true;
}
}
/*for (int i = 0; i < listDataHeader.size(); i++) {
String imagePath = listDataHeader.get(i).getImage1();
String imagePath1 = listDataHeader.get(i).getImage2();
for (int j = 0; j < listDataChild.get(listDataHeader.get(i)).size(); j++) {
String stock = listDataChild.get(listDataHeader.get(i)).get(j).getStock();
String faceup = listDataChild.get(listDataHeader.get(i)).get(j).getFacing();
//Company_id
if (listDataChild.get(listDataHeader.get(i)).get(j).getCompany_id().equals("1")) {
//Camera allow enable
if (camera_allow.equalsIgnoreCase("1")) {
if (!stock.equals("0")) {
if (!imagePath.equals("") || !imagePath1.equals("")) {
if (stock.equals("") || faceup.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);
}
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 {
//Camera allow disable
if (!stock.equals("0")) {
if (stock.equals("") || faceup.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
flag = false;
Error_Message = getResources().getString(R.string.fill_data);
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 (faceup.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
flag = false;
Error_Message = getResources().getString(R.string.fill_data);
break;
}
}
}
if (flag == false) {
checkflag = false;
break;
} else {
checkflag = true;
}
}*/
//expListView.invalidate();
adapter.notifyDataSetChanged();
return checkflag;
}
private void startCameraActivity(int position) {
try {
Log.e("MakeMachine", "startCameraActivity()");
File file = new File(path);
outputFileUri = Uri.fromFile(file);
String defaultCameraPackage = "";
final PackageManager packageManager = getPackageManager();
List<ApplicationInfo> list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES);
for (int n = 0; n < list.size(); n++) {
if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) {
//temp value in case camera is gallery app above jellybean
String packag = list.get(n).loadLabel(packageManager).toString();
if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri")) {
gallery_package = list.get(n).packageName;
}
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
defaultCameraPackage = list.get(n).packageName;
break;
}
} else {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
defaultCameraPackage = list.get(n).packageName;
break;
}
}
}
}
Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
intent.setPackage(defaultCameraPackage);
startActivityForResult(intent, position);
} catch (ActivityNotFoundException e) {
e.printStackTrace();
Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
intent.setPackage(gallery_package);
startActivityForResult(intent, position);
} catch (Exception e) {
e.printStackTrace();
}
}
private void startCameraActivity1(int position) {
/*try {
Log.e("Stock & Facing ", "startCameraActivity()");
@@ -661,6 +954,102 @@ public class Stock_FacingActivity extends AppCompatActivity {
Log.e("Stock & Facing", "User cancelled");
}
break;
case 3:
if (resultCode == -1) {
if (_pathforcheck != null && !_pathforcheck.equals("")) {
if (new File(str + _pathforcheck).exists()) {
img3 = _pathforcheck;
_pathforcheck = "";
if (!img3.equalsIgnoreCase("")) {
cameraData.setCamera1(img3);
img3 = "";
}
if (cameraData.getCamera1().equals("")) {
camera1.setBackgroundResource(R.mipmap.camera_orange);
} else {
camera1.setBackgroundResource(R.mipmap.camera_green);
}
}
}
} else {
Log.e("Stock & Facing", "User cancelled");
}
break;
case 4:
if (resultCode == -1) {
if (_pathforcheck != null && !_pathforcheck.equals("")) {
if (new File(str + _pathforcheck).exists()) {
img4 = _pathforcheck;
_pathforcheck = "";
if (!img4.equalsIgnoreCase("")) {
cameraData.setCamera2(img4);
img4 = "";
}
if (cameraData.getCamera2().equals("")) {
camera2.setBackgroundResource(R.mipmap.camera_orange);
} else {
camera2.setBackgroundResource(R.mipmap.camera_green);
}
}
}
} else {
Log.e("Stock & Facing", "User cancelled");
}
break;
case 5:
if (resultCode == -1) {
if (_pathforcheck != null && !_pathforcheck.equals("")) {
if (new File(str + _pathforcheck).exists()) {
img5 = _pathforcheck;
_pathforcheck = "";
if (!img5.equalsIgnoreCase("")) {
cameraData.setCamera3(img5);
img5 = "";
}
if (cameraData.getCamera3().equals("")) {
camera3.setBackgroundResource(R.mipmap.camera_orange);
} else {
camera3.setBackgroundResource(R.mipmap.camera_green);
}
}
}
} else {
Log.e("Stock & Facing", "User cancelled");
}
break;
case 6:
if (resultCode == -1) {
if (_pathforcheck != null && !_pathforcheck.equals("")) {
if (new File(str + _pathforcheck).exists()) {
img6 = _pathforcheck;
_pathforcheck = "";
if (!img6.equalsIgnoreCase("")) {
cameraData.setCamera4(img6);
img6 = "";
}
if (cameraData.getCamera4().equals("")) {
camera4.setBackgroundResource(R.mipmap.camera_orange);
} else {
camera4.setBackgroundResource(R.mipmap.camera_green);
}
}
}
} else {
Log.e("Stock & Facing", "User cancelled");
}
break;
}
super.onActivityResult(requestCode, resultCode, data);
}
@@ -790,7 +1179,6 @@ public class Stock_FacingActivity extends AppCompatActivity {
}
}
@Override
public void onBackPressed() {
//super.onBackPressed();
@@ -884,6 +1272,9 @@ public class Stock_FacingActivity extends AppCompatActivity {
img_camera2.setVisibility(View.GONE);
}
//img_camera1.setVisibility(View.GONE);
img_camera2.setVisibility(View.GONE);
//Camera allow enable
if (camera_allow.equalsIgnoreCase("1")) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
+149 -3
View File
@@ -49,6 +49,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.StockFacing_PlanogramTrackerDataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Store_wise_camera_DataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.T2PGetterSetter;
import cpm.com.gskmtorange.xmlHandlers.FailureXMLHandler;
@@ -78,6 +79,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
private int factor, k = 0;
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> stockFacingPlanogramDataList;
ArrayList<Store_wise_camera_DataGetterSetter> storeWiseCameraDataGetterSetters;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -874,12 +876,156 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
data.value = 50;
data.name = getString(R.string.stock_planogram_data_uploading);
publishProgress(data);
//Store Wise Camera
String store_wise_camera_xml = "";
onXML = "";
storeWiseCameraDataGetterSetters = db.getStoreWiseCameraServerUploadData(coverageList.get(i).getStoreId());
if (storeWiseCameraDataGetterSetters.size() > 0) {
for (int i1 = 0; i1 < storeWiseCameraDataGetterSetters.size(); i1++) {
onXML = "[STORE_WISE_CAMERA_DATA]"
+ "[MID]" + mid + "[/MID]"
+ "[USER_ID]" + userId + "[/USER_ID]"
+ "[CAMERA1]" + storeWiseCameraDataGetterSetters.get(i).getCamera1() + "[/CAMERA1]"
+ "[CAMERA2]" + storeWiseCameraDataGetterSetters.get(i).getCamera2() + "[/CAMERA2]"
+ "[CAMERA3]" + storeWiseCameraDataGetterSetters.get(i).getCamera3() + "[/CAMERA3]"
+ "[CAMERA4]" + storeWiseCameraDataGetterSetters.get(i).getCamera4() + "[/CAMERA4]"
+ "[/STORE_WISE_CAMERA_DATA]";
store_wise_camera_xml = store_wise_camera_xml + onXML;
}
final String sos_xml = "[DATA]" + store_wise_camera_xml + "[/DATA]";
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
request.addProperty("XMLDATA", sos_xml);
request.addProperty("KEYS", "STORE_WISE_CAMERA_DATA");
request.addProperty("USERNAME", userId);
request.addProperty("MID", mid);
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
}
data.value = 55;
data.name = getString(R.string.stock_planogram_data_uploading);
publishProgress(data);
//Image Upload
//Store Wise Camera Images Upload
if (storeWiseCameraDataGetterSetters.size() > 0) {
for (int i1 = 0; i1 < storeWiseCameraDataGetterSetters.size(); i1++) {
if (storeWiseCameraDataGetterSetters.get(i1).getCamera1() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera1().equals("")) {
if (new File(CommonString.FILE_PATH + storeWiseCameraDataGetterSetters.get(i1).getCamera1()).exists()) {
try {
result = UploadImage(storeWiseCameraDataGetterSetters.get(i1).getCamera1(), "StockCameraImages");
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "StockCameraImages";
}
runOnUiThread(new Runnable() {
public void run() {
message.setText("StockFacing Images Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
if (storeWiseCameraDataGetterSetters.get(i1).getCamera2() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera2().equals("")) {
if (new File(CommonString.FILE_PATH + storeWiseCameraDataGetterSetters.get(i1).getCamera2()).exists()) {
try {
result = UploadImage(storeWiseCameraDataGetterSetters.get(i1).getCamera2(), "StockCameraImages");
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "StockCameraImages";
}
runOnUiThread(new Runnable() {
public void run() {
message.setText("StockFacing Images Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
if (storeWiseCameraDataGetterSetters.get(i1).getCamera3() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera3().equals("")) {
if (new File(CommonString.FILE_PATH + storeWiseCameraDataGetterSetters.get(i1).getCamera3()).exists()) {
try {
result = UploadImage(storeWiseCameraDataGetterSetters.get(i1).getCamera3(), "StockCameraImages");
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "StockCameraImages";
}
runOnUiThread(new Runnable() {
public void run() {
message.setText("StockFacing Images Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
if (storeWiseCameraDataGetterSetters.get(i1).getCamera4() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera4().equals("")) {
if (new File(CommonString.FILE_PATH + storeWiseCameraDataGetterSetters.get(i1).getCamera4()).exists()) {
try {
result = UploadImage(storeWiseCameraDataGetterSetters.get(i1).getCamera4(), "StockCameraImages");
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "StockCameraImages";
}
runOnUiThread(new Runnable() {
public void run() {
message.setText("StockFacing Images Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
}
}
//Stock Facing Images Upload
if (stock_facingHeaderList.size() > 0) {
/*if (stock_facingHeaderList.size() > 0) {
for (int i1 = 0; i1 < stock_facingHeaderList.size(); i1++) {
if (stock_facingHeaderList.get(i1).getImage1() != null && !stock_facingHeaderList.get(i1).getImage1().equals("")) {
@@ -923,7 +1069,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
}
}
}
}
}*/
//// ashish visibility image start
if (additionalVisibilityList.size() > 0) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+151 -3
View File
@@ -52,6 +52,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.StockFacing_PlanogramTrackerDataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Store_wise_camera_DataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.T2PGetterSetter;
import cpm.com.gskmtorange.xmlHandlers.FailureXMLHandler;
@@ -84,6 +85,8 @@ public class UploadActivity extends AppCompatActivity {
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> stockFacingPlanogramDataList;
ArrayList<Store_wise_camera_DataGetterSetter> storeWiseCameraDataGetterSetters;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -887,10 +890,154 @@ public class UploadActivity extends AppCompatActivity {
publishProgress(data);
//Store Wise Camera
String store_wise_camera_xml = "";
onXML = "";
storeWiseCameraDataGetterSetters = db.getStoreWiseCameraServerUploadData(coverageList.get(i).getStoreId());
if (storeWiseCameraDataGetterSetters.size() > 0) {
for (int i1 = 0; i1 < storeWiseCameraDataGetterSetters.size(); i1++) {
onXML = "[STORE_WISE_CAMERA_DATA]"
+ "[MID]" + mid + "[/MID]"
+ "[USER_ID]" + userId + "[/USER_ID]"
+ "[CAMERA1]" + storeWiseCameraDataGetterSetters.get(i).getCamera1() + "[/CAMERA1]"
+ "[CAMERA2]" + storeWiseCameraDataGetterSetters.get(i).getCamera2() + "[/CAMERA2]"
+ "[CAMERA3]" + storeWiseCameraDataGetterSetters.get(i).getCamera3() + "[/CAMERA3]"
+ "[CAMERA4]" + storeWiseCameraDataGetterSetters.get(i).getCamera4() + "[/CAMERA4]"
+ "[/STORE_WISE_CAMERA_DATA]";
store_wise_camera_xml = store_wise_camera_xml + onXML;
}
final String sos_xml = "[DATA]" + store_wise_camera_xml + "[/DATA]";
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
request.addProperty("XMLDATA", sos_xml);
request.addProperty("KEYS", "STORE_WISE_CAMERA_DATA");
request.addProperty("USERNAME", userId);
request.addProperty("MID", mid);
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
}
data.value = 55;
data.name = getString(R.string.stock_planogram_data_uploading);
publishProgress(data);
//Image Upload
//Store Wise Camera Images Upload
if (storeWiseCameraDataGetterSetters.size() > 0) {
for (int i1 = 0; i1 < storeWiseCameraDataGetterSetters.size(); i1++) {
if (storeWiseCameraDataGetterSetters.get(i1).getCamera1() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera1().equals("")) {
if (new File(CommonString.FILE_PATH + storeWiseCameraDataGetterSetters.get(i1).getCamera1()).exists()) {
try {
result = UploadImage(storeWiseCameraDataGetterSetters.get(i1).getCamera1(), "StockCameraImages");
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "StockCameraImages";
}
runOnUiThread(new Runnable() {
public void run() {
message.setText("StockFacing Images Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
if (storeWiseCameraDataGetterSetters.get(i1).getCamera2() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera2().equals("")) {
if (new File(CommonString.FILE_PATH + storeWiseCameraDataGetterSetters.get(i1).getCamera2()).exists()) {
try {
result = UploadImage(storeWiseCameraDataGetterSetters.get(i1).getCamera2(), "StockCameraImages");
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "StockCameraImages";
}
runOnUiThread(new Runnable() {
public void run() {
message.setText("StockFacing Images Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
if (storeWiseCameraDataGetterSetters.get(i1).getCamera3() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera3().equals("")) {
if (new File(CommonString.FILE_PATH + storeWiseCameraDataGetterSetters.get(i1).getCamera3()).exists()) {
try {
result = UploadImage(storeWiseCameraDataGetterSetters.get(i1).getCamera3(), "StockCameraImages");
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "StockCameraImages";
}
runOnUiThread(new Runnable() {
public void run() {
message.setText("StockFacing Images Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
if (storeWiseCameraDataGetterSetters.get(i1).getCamera4() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera4().equals("")) {
if (new File(CommonString.FILE_PATH + storeWiseCameraDataGetterSetters.get(i1).getCamera4()).exists()) {
try {
result = UploadImage(storeWiseCameraDataGetterSetters.get(i1).getCamera4(), "StockCameraImages");
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "StockCameraImages";
}
runOnUiThread(new Runnable() {
public void run() {
message.setText("StockFacing Images Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
}
}
//Stock Facing Images Upload
if (stock_facingHeaderList.size() > 0) {
/*if (stock_facingHeaderList.size() > 0) {
for (int i1 = 0; i1 < stock_facingHeaderList.size(); i1++) {
if (stock_facingHeaderList.get(i1).getImage1() != null && !stock_facingHeaderList.get(i1).getImage1().equals("")) {
@@ -934,9 +1081,10 @@ public class UploadActivity extends AppCompatActivity {
}
}
}
}
//// ashish visibility image start
}*/
// ashish visibility image start
if (additionalVisibilityList.size() > 0) {
for (int i1 = 0; i1 < additionalVisibilityList.size(); i1++) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/Store_wise_camera_DataGetterSetter.java
+65
View File
@@ -0,0 +1,65 @@
package cpm.com.gskmtorange.xmlGetterSetter;
/**
* Created by gagang on 06-01-2017.
*/
public class Store_wise_camera_DataGetterSetter {
String store_id, category_id, camera1, camera2, camera3, camera4,checkSaveStatus;
public String getStore_id() {
return store_id;
}
public void setStore_id(String store_id) {
this.store_id = store_id;
}
public String getCategory_id() {
return category_id;
}
public void setCategory_id(String category_id) {
this.category_id = category_id;
}
public String getCamera1() {
return camera1;
}
public void setCamera1(String camera1) {
this.camera1 = camera1;
}
public String getCamera2() {
return camera2;
}
public void setCamera2(String camera2) {
this.camera2 = camera2;
}
public String getCamera3() {
return camera3;
}
public void setCamera3(String camera3) {
this.camera3 = camera3;
}
public String getCamera4() {
return camera4;
}
public void setCamera4(String camera4) {
this.camera4 = camera4;
}
public String getCheckSaveStatus() {
return checkSaveStatus;
}
public void setCheckSaveStatus(String checkSaveStatus) {
this.checkSaveStatus = checkSaveStatus;
}
}
GSKMTOrange/src/main/res/drawable/layout_click_background_effect.xml
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/grey_background" android:state_pressed="true" />
<item android:drawable="@android:color/transparent" android:state_focused="true" />
<item android:drawable="@android:color/transparent" />
</selector>
GSKMTOrange/src/main/res/layout/content_stock_facing.xml
+110 -5
View File
@@ -24,21 +24,123 @@
android:text="Stock Facing"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@android:color/black"
android:visibility="gone"/>
android:visibility="gone" />
<!--Camera Layout-->
<LinearLayout
android:id="@+id/lin_camera"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="4">
<!--camera 1-->
<LinearLayout
android:id="@+id/lin_camera1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/layout_click_background_effect"
android:gravity="center_horizontal"
android:padding="5dp">
<ImageView
android:id="@+id/img_camera1"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginRight="10dp" />
<!--android:src="@mipmap/camera_orange"-->
</LinearLayout>
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/grey_dark_background" />
<!--camera 2-->
<LinearLayout
android:id="@+id/lin_camera2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/layout_click_background_effect"
android:gravity="center_horizontal"
android:padding="5dp">
<ImageView
android:id="@+id/img_camera2"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginRight="10dp" />
</LinearLayout>
<View
android:id="@+id/view_camera2"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/grey_dark_background" />
<!--camera 3-->
<LinearLayout
android:id="@+id/lin_camera3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/layout_click_background_effect"
android:gravity="center_horizontal"
android:padding="5dp">
<ImageView
android:id="@+id/img_camera3"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginRight="10dp" />
</LinearLayout>
<View
android:id="@+id/view_camera3"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/grey_dark_background" />
<!--camera 4-->
<LinearLayout
android:id="@+id/lin_camera4"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/layout_click_background_effect"
android:gravity="center_horizontal"
android:padding="5dp">
<ImageView
android:id="@+id/img_camera4"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginRight="10dp" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/grey_dark_background" />
<!--Title Header-->
<LinearLayout
android:id="@+id/lin_category"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="5">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="2.5"
android:orientation="vertical">
android:orientation="vertical"
android:padding="5dp">
<TextView
android:layout_width="match_parent"
@@ -55,7 +157,8 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1.25"
android:orientation="vertical">
android:orientation="vertical"
android:padding="5dp">
<TextView
android:layout_width="match_parent"
@@ -72,7 +175,8 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1.25"
android:orientation="vertical">
android:orientation="vertical"
android:padding="5dp">
<TextView
android:layout_width="match_parent"
@@ -86,6 +190,7 @@
</LinearLayout>
</LinearLayout>
<!--Expandable ListView-->
<ExpandableListView
android:id="@+id/expandableListView"
android:layout_width="match_parent"
GSKMTOrange/src/main/res/layout/dialog_stock_facing_planogram_tracker_add_sku.xml
+43 -25
View File
@@ -1,50 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_margin="10dp"
card_view:cardBackgroundColor="@color/light_orange_background"
card_view:cardCornerRadius="20dp">
<!--android:background="@drawable/bg_boarder_orange_transparent"-->
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<!-- <ScrollView
android:layout_width="fill_parent"
android:layout_height="fill_parent">-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/light_orange_background"
android:orientation="vertical"
android:weightSum="10">
<!--Add Shelf View-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/light_orange_background"
android:layout_height="0dp"
android:layout_weight="9"
android:gravity="center_horizontal"
android:orientation="vertical">
<!--Add Shelf View-->
<LinearLayout
<!-- <LinearLayout
android:id="@+id/lin_addSku"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" />-->
<ExpandableListView
android:id="@+id/exp_addSkuListView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="horizontal"
android:padding="10dp">
android:layout_height="match_parent"
android:cacheColorHint="#00000000"
android:divider="@null"
android:dividerHeight="0dp"
android:scrollingCache="false" />
</LinearLayout>
<LinearLayout
android:id="@+id/lin_addSku"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" />
</LinearLayout>
<!--Bottom Buttom-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical">
<!--Bottom Buttom-->
<RelativeLayout
android:id="@+id/rel_addSku_Cancel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="10dp">
android:padding="5dp">
<Button
android:id="@+id/dialog_btn_addSku_Shelf"
@@ -70,8 +89,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white" />
</RelativeLayout>
</LinearLayout>
</ScrollView>
</LinearLayout><!--</ScrollView>-->
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/layout/item_stock_facing_add_sku_header.xml
+45
View File
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical">
<android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="5dp"
card_view:cardBackgroundColor="@color/grey_background"
card_view:cardCornerRadius="10dp">
<LinearLayout
android:id="@+id/lin_stockFaceupHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="2">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:orientation="horizontal"
android:weightSum="2">
<TextView
android:id="@+id/txt_stockFaceupHeader"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="5dp"
android:paddingLeft="20dp"
android:paddingRight="5dp"
android:paddingTop="5dp"
android:text="Brand Name"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>