From 5c3b06496fdbcde70bd3a2b3655baecd8dc3910d Mon Sep 17 00:00:00 2001 From: ashishandroid Date: Tue, 10 Jan 2017 16:13:48 +0530 Subject: [PATCH 1/6] Merge remote-tracking branch 'origin/GeoT' into GeoT # Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml # GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java --- .../com/gskmtorange/Database/GSKOrangeDB.java | 66 ++-- .../GetterSetter/AddittionalGetterSetter.java | 11 + .../gskmtorange/constant/CommonString.java | 48 ++- .../dailyentry/AdditionalVisibility.java | 357 +++++++++++++----- .../JourneyPlanGetterSetter.java | 13 + .../gskmtorange/xmlHandlers/XMLHandlers.java | 5 + .../main/res/layout/additionallistlayout.xml | 4 +- .../res/layout/additionalvisibilitylayout.xml | 10 - .../layout/contentadditionalvisibility.xml | 10 + 9 files changed, 377 insertions(+), 147 deletions(-) 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 9ad1cfe..4279a76 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -85,11 +85,11 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.execSQL(TableBean.getMappingDisplayChecklist()); db.execSQL(CommonString.CREATE_TABLE_INSERT_MSL_AVAILABILITY); - + db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_ADDITIONAL_VISIBILITY); db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_FACING_HEADER); db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_FACING_CHILD); db.execSQL(CommonString.CREATE_TABLE_STOCK_DIALOG); - db.execSQL(CommonString.CREATE_TABLE_STOCK_ADDITIONAL_STOCK_DATA); + } @@ -143,7 +143,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put("CAMERA_ALLOW", data.getCAMERA_ALLOW().get(i)); values.put("GEO_TAG", data.getGEO_TAG().get(i)); - + values.put("CHANNEL_ID", data.getCHANNEL_ID().get(i)); db.insert("JOURNEY_PLAN", null, values); @@ -1533,7 +1533,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { public void deleteStockEntry(String id) { try { - db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_DATA, "Id" + "='" + id + "'", null); + db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL, "KEY_ID" + "='" + id + "'", null); } catch (Exception e) { System.out.println("" + e); } @@ -1625,20 +1625,44 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - public void InsertAdditionalData(AddittionalGetterSetter data) { + public void InsertAdditionalData(AddittionalGetterSetter data,ArrayList dialog) { ContentValues values = new ContentValues(); - + ContentValues values1 = new ContentValues(); try { - values.put(CommonString.KEY_STORE_ID, data.getStore_id()); - values.put(CommonString.KEY_BRAND, data.getBrand()); - values.put(CommonString.KEY_BRAND_ID, data.getBrand_id()); - values.put(CommonString.KEY_IMAGE, data.getImage()); - values.put(CommonString.KEY_SKU_ID, data.getSku_id()); - values.put(CommonString.KEY_SKUNAME, data.getSku()); + values.put("Store_Id", data.getStore_id()); + values.put("brand_name", data.getBrand()); + values.put("brand_id", data.getBrand_id()); + values.put("image_url", data.getImage()); + values.put("sku_id", data.getSku_id()); + values.put("sku_name", data.getSku()); + values.put("toggle_value", data.getBtn_toogle()); + + long key_id = db.insert(CommonString.TABLE_INSERT_STOCK_ADDITIONAL, null, values); + + for(int i=0;i list = new ArrayList(); ArrayList listdata = new ArrayList(); + + ArrayList defdata = new ArrayList(); Spinner spinner_brand, spinner_sku; Spinner spinner_brand_list, spinner_sku_list; @@ -69,7 +75,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl Button btnsku, btnaddlayout; GSKOrangeDB db; ArrayList sku_list; - String brand_name="", brand_id ="", SKU_name ="", SKU_ID="",brand_list_name="",brand_list_id="",sku_list_name="",sku_list_id=""; + String brand_name = "", brand_id = "", SKU_name = "", SKU_ID = "", brand_list_name = "", brand_list_id = "", sku_list_name = "", sku_list_id = ""; public ListView listview; LinearLayout linearlay; ArrayList brandList; @@ -79,15 +85,20 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl ArrayList empty_list = new ArrayList<>(); - String _pathforcheck,_path,str; + String _pathforcheck, _path, str,msg; private SharedPreferences preferences; - String store_id,date,intime,img_str; - ImageView img_cam,img_clicked; + String store_id, date, intime, img_str, togglevalue = "1"; + ImageView img_cam, img_clicked; Button btn_add; EditText Edt_txt; - MyAdaptorStock adapterData; + MyAdaptorStock adapterData; ListView listviewlay; + String errormsg; MyAdaptorAdditionalStock adapteradditional; + AddittionalGetterSetter adGt; + LinearLayout brandlayout, diaplylayout, cameralayout; + RelativeLayout skulayout; + ////String brand_id,SKU_ID; protected void onCreate(Bundle savedInstanceState) { // TODO Auto-generated method stub @@ -103,7 +114,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl store_id = preferences.getString(CommonString.KEY_STORE_ID, null); - store_id="1"; + // store_id = "1"; date = preferences.getString(CommonString.KEY_DATE, null); intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, ""); @@ -118,7 +129,16 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl btnsku = (Button) findViewById(R.id.btn_sku); btnaddlayout = (Button) findViewById(R.id.btadd); listviewlay = (ListView) findViewById(R.id.listviewlv); + brandlayout = (LinearLayout) findViewById(R.id.tv_brandlayout); + diaplylayout = (LinearLayout) findViewById(R.id.tv_displaylayout); + cameralayout = (LinearLayout) findViewById(R.id.tv_cameralayout); + skulayout = (RelativeLayout) findViewById(R.id.tv_skulayout); + + btntoggle.setChecked(true); + + + str = CommonString.FILE_PATH; ///band List brand_list = db.getBrandMasterData(store_id); @@ -135,7 +155,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl SkuMasterGetterSetter select = new SkuMasterGetterSetter(); select.setSKU("Select"); - skuMaster_list.add(0,select); + skuMaster_list.add(0, select); CustomSkuMasterAdpter skuadapter = new CustomSkuMasterAdpter(AdditionalVisibility.this, R.layout.custom_spinner_item, skuMaster_list); spinner_sku_list.setAdapter(skuadapter); @@ -145,8 +165,8 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl if (position != 0) { - brand_list_name=brand_list.get(position).getBRAND().get(0); - brand_list_id=brand_list.get(position).getBRAND_ID().get(0); + brand_list_name = brand_list.get(position).getBRAND().get(0); + brand_list_id = brand_list.get(position).getBRAND_ID().get(0); } } @@ -163,8 +183,8 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl if (position != 0) { - sku_list_name=skuMaster_list.get(position).getSKU().get(0); - sku_list_id=skuMaster_list.get(position).getSKU_ID().get(0); + sku_list_name = skuMaster_list.get(position).getSKU().get(0); + sku_list_id = skuMaster_list.get(position).getSKU_ID().get(0); } } @@ -175,57 +195,119 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } }); + listdata = db.getAdditionalStock(store_id); + + if (listdata.size() > 0) { + adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata); + listviewlay.setAdapter(adapteradditional); + listviewlay.invalidateViews(); + } btnaddlayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - - AddittionalGetterSetter adGt=new AddittionalGetterSetter(); - + adGt = new AddittionalGetterSetter(); adGt.setBrand(brand_list_name); adGt.setBrand_id(brand_list_id); adGt.setImage(img_str); adGt.setSku(sku_list_name); adGt.setSku_id(sku_list_id); adGt.setStore_id(store_id); + adGt.setBtn_toogle(togglevalue); - db.InsertAdditionalData(adGt); + if (validateData(adGt,defdata)) { - spinner_brand_list.setSelection(0); + AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( + AdditionalVisibility.this); - spinner_sku_list.setSelection(0); + // set title + alertDialogBuilder.setTitle("Do You Want To Save"); - img_str=""; + // set dialog message + alertDialogBuilder + .setMessage("") + .setCancelable(false) + .setPositiveButton("Yes", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { - listdata = db.getAdditionalStock(store_id); + db.InsertAdditionalData(adGt,defdata); - if(listdata.size()>0) - { - adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this,listdata); - listviewlay.setAdapter(adapteradditional); - listviewlay.invalidateViews(); + spinner_brand_list.setSelection(0); + + spinner_sku_list.setSelection(0); + + img_str = ""; + brand_list_name = ""; + brand_list_id = ""; + sku_list_name = ""; + sku_list_id = ""; + + defdata.clear(); + + + btntoggle.setChecked(true); + + togglevalue = "1"; + brandlayout.setVisibility(View.VISIBLE); + diaplylayout.setVisibility(View.VISIBLE); + cameralayout.setVisibility(View.VISIBLE); + skulayout.setVisibility(View.VISIBLE); + + listdata = db.getAdditionalStock(store_id); + + if (listdata.size() > 0) { + adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata); + listviewlay.setAdapter(adapteradditional); + listviewlay.invalidateViews(); + } else { + + } + + } + }) + .setNegativeButton("No", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + // if this button is clicked, just close + // the dialog box and do nothing + dialog.cancel(); + } + }); + + // create alert dialog + AlertDialog alertDialog = alertDialogBuilder.create(); + + // show it + alertDialog.show(); + + } else { + Snackbar.make(view, errormsg, Snackbar.LENGTH_LONG).setAction("Action", null).show(); } - else - { - - } - - - - } }); - - btntoggle.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { + if (btntoggle.isChecked()) { + togglevalue = "1"; + brandlayout.setVisibility(View.VISIBLE); + diaplylayout.setVisibility(View.VISIBLE); + cameralayout.setVisibility(View.VISIBLE); + skulayout.setVisibility(View.VISIBLE); + + } else { + togglevalue = "0"; + + brandlayout.setVisibility(View.GONE); + diaplylayout.setVisibility(View.GONE); + cameralayout.setVisibility(View.GONE); + skulayout.setVisibility(View.GONE); + } } }); @@ -233,12 +315,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl @Override public void onClick(View view) { _pathforcheck = store_id + "Store" - + "Image" + date.replace("/","") + getCurrentTime().replace(":","")+".jpg"; + + "Image" + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg"; _path = CommonString.FILE_PATH + _pathforcheck; - intime = getCurrentTime(); - startCameraActivity(); } @@ -254,6 +334,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl }); } + public String getCurrentTime() { Calendar m_cal = Calendar.getInstance(); @@ -405,9 +486,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } - - - public class CustomSkuMasterAdpter extends ArrayAdapter { private Activity activity; @@ -471,15 +549,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } - - - - - - - - - protected void startCameraActivity() { try { @@ -488,10 +557,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl File file = new File(_path); Uri outputFileUri = Uri.fromFile(file); - String defaultCameraPackage=""; + String defaultCameraPackage = ""; final PackageManager packageManager = getPackageManager(); List list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES); - for (int n=0;n0) - { + if (defdata.size() > 0) { linearlay.setVisibility(View.VISIBLE); - adapterData = new MyAdaptorStock(AdditionalVisibility.this,list); + adapterData = new MyAdaptorStock(AdditionalVisibility.this, defdata); listview.setAdapter(adapterData); listview.invalidateViews(); - } - else{ + } else { } - spinner_sku.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override public void onItemSelected(AdapterView parent, View view, int position, long id) { @@ -608,10 +673,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl }); - - - - btn_add.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -623,29 +684,40 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl //ab.setDisplay_id(data.get(position).getDisplay_id()); ab.setStore_id(store_id); - // ab.setUnique_id(data.get(position).getUnique_id()); + // ab.setUnique_id(data.get(position).getUnique_id()); ab.setSku_id(SKU_ID); ab.setSku_name(SKU_name); - // ab.setProcess_id(process_id); + // ab.setProcess_id(process_id); ab.setQuantity(Edt_txt.getText().toString()); - // ab.setCategory_id(category_id); + // ab.setCategory_id(category_id); - db.InsertStockDialog(ab); - spinner_brand.setSelection(0); - spinner_sku.setSelection(0); - Edt_txt.setText(""); + if(validateDialogData(ab)) + { - list = db.getDialogStock(store_id); + defdata.add(ab); + // db.InsertStockDialog(ab); + + spinner_brand.setSelection(0); + spinner_sku.setSelection(0); + Edt_txt.setText(""); + + // list = db.getDialogStock(store_id); linearlay.setVisibility(View.VISIBLE); - adapterData = new MyAdaptorStock(AdditionalVisibility.this,list); + adapterData = new MyAdaptorStock(AdditionalVisibility.this, defdata); listview.setAdapter(adapterData); listview.invalidateViews(); + } + else + { + Snackbar.make(v, msg, Snackbar.LENGTH_LONG).setAction("Action", null).show(); + } - // dialog.cancel(); + + // dialog.cancel(); } }); @@ -712,8 +784,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl }); - - dialog.show(); } @@ -778,7 +848,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl class ViewHolder { TextView brand, qty_bought, display; - Button save,delete; + Button save, delete; } @@ -799,7 +869,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl holder.qty_bought = (TextView) convertView.findViewById(R.id.qty_bought); - holder.delete = (Button) convertView.findViewById(R.id.delete_btn); convertView.setTag(holder); @@ -822,11 +891,12 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl alertDialogBuilder .setMessage("Click Yes To Delete!") .setCancelable(false) - .setPositiveButton("Yes",new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog,int id) { + .setPositiveButton("Yes", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + // db.deletedialogStockEntry(list.get(position1).getKEY_ID()); - db.deletedialogStockEntry(list.get(position1).getKEY_ID()); + defdata.remove(position1); adapterData.notifyDataSetChanged(); @@ -834,15 +904,15 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl list.get(position1).getDisplay_id(),list.get(position1).getUnique_id());*/ - list = db.getDialogStock(store_id); + // list = db.getDialogStock(store_id); - listview.setAdapter(new MyAdaptorStock(AdditionalVisibility.this, list)); + listview.setAdapter(new MyAdaptorStock(AdditionalVisibility.this, defdata)); listview.invalidateViews(); } }) - .setNegativeButton("No",new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog,int id) { + .setNegativeButton("No", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { // if this button is clicked, just close // the dialog box and do nothing dialog.cancel(); @@ -859,7 +929,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl }); - holder.brand.setText(list.get(position1).getBrand().toString()); holder.display.setText(list.get(position1).getSku_name().toString()); @@ -909,7 +978,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl class ViewHolder { TextView brand, qty_bought, display; - Button save,delete; + Button save, delete; } @@ -930,7 +999,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl holder.qty_bought = (TextView) convertView.findViewById(R.id.qty_bought); - holder.delete = (Button) convertView.findViewById(R.id.delete_btn); convertView.setTag(holder); @@ -953,23 +1021,25 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl alertDialogBuilder .setMessage("Click Yes To Delete!") .setCancelable(false) - .setPositiveButton("Yes",new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog,int id) { + .setPositiveButton("Yes", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { db.deleteStockEntry(listdata.get(position1).getKey_id()); - adapterData.notifyDataSetChanged(); + adapteradditional.notifyDataSetChanged(); listdata = db.getAdditionalStock(store_id); - listview.setAdapter(new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata)); - listview.invalidateViews(); + adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata); + listviewlay.setAdapter(adapteradditional); + listviewlay.invalidateViews(); + } }) - .setNegativeButton("No",new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog,int id) { + .setNegativeButton("No", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { // if this button is clicked, just close // the dialog box and do nothing dialog.cancel(); @@ -998,8 +1068,87 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } } + boolean validateData(AddittionalGetterSetter data,ArrayList dialog) { + boolean flag = true; + + String brandid = data.getBrand_id(); + String skuid = data.getSku_id(); + + String imageu = data.getImage(); + String toggleid = data.getBtn_toogle(); + if (toggleid.equalsIgnoreCase("0")) { + flag = true; + } + else { -} + if (brandid.equalsIgnoreCase("") || skuid.equalsIgnoreCase("")) { + flag = false; + + errormsg = "Please Select dropdown"; + + } else if (imageu == null || imageu.equalsIgnoreCase("")) { + flag = false; + + errormsg = "Please Take a image"; + + } + else if (dialog.size()==0) { + + errormsg = "Please fill sku data"; + flag = false; + + + } + + + else { + flag = true; + } + + + } + + + return flag; + } + + boolean validateDialogData(AdditionalDialogGetterSetter data) { + boolean flag = true; + + String brandid=data.getBrand_id(); + String displayid=data.getSku_id(); + String QTy=data.getQuantity(); + + + if(brandid.equalsIgnoreCase("")||brandid==null) + { + flag = false; + + msg="Please Select Dropdown"; + } + else if(displayid==null||displayid.equalsIgnoreCase("")) + { + flag = false; + msg="Please Select Dropdown"; + } + + + else if(QTy.equalsIgnoreCase("") || QTy==null) + { + flag = false; + msg="Please enter Quantity"; + } + else + { + flag = true; + } + + + return flag; + } + + +} \ No newline at end of file diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/JourneyPlanGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/JourneyPlanGetterSetter.java index 8d99043..7150336 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/JourneyPlanGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/JourneyPlanGetterSetter.java @@ -24,6 +24,19 @@ public class JourneyPlanGetterSetter { ArrayList CLASS_ID = new ArrayList(); ArrayList CAMERA_ALLOW = new ArrayList(); + public ArrayList getCHANNEL_ID() { + return CHANNEL_ID; + } + + public void setCHANNEL_ID(String CHANNEL_ID) { + this.CHANNEL_ID.add(CHANNEL_ID); + } + + ArrayList CHANNEL_ID = new ArrayList(); + + + + public ArrayList getCHECKOUT_STATUS() { return CHECKOUT_STATUS; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java index ba39c9c..c194729 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java @@ -173,6 +173,11 @@ public class XMLHandlers { jcpGetterSetter.setGEO_TAG(xpp.nextText()); } + if (xpp.getName().equals("CHANNEL_ID")) { + jcpGetterSetter.setCHANNEL_ID(xpp.nextText()); + } + + } xpp.next(); } diff --git a/GSKMTOrange/src/main/res/layout/additionallistlayout.xml b/GSKMTOrange/src/main/res/layout/additionallistlayout.xml index dee8b28..cd17dec 100644 --- a/GSKMTOrange/src/main/res/layout/additionallistlayout.xml +++ b/GSKMTOrange/src/main/res/layout/additionallistlayout.xml @@ -19,9 +19,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="2dp" + android:layout_marginTop="10dp" android:layout_weight="10" android:orientation="horizontal" - android:layout_marginTop="10dp" android:weightSum="25"> diff --git a/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml b/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml index af8a9a3..7855508 100644 --- a/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml +++ b/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml @@ -10,16 +10,6 @@ - diff --git a/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml b/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml index e463a12..216b5cb 100644 --- a/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml +++ b/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml @@ -21,6 +21,8 @@ + + + + Date: Tue, 10 Jan 2017 17:59:55 +0530 Subject: [PATCH 2/6] Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest # Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml --- .../com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java | 4 ++-- .../main/java/cpm/com/gskmtorange/upload/UploadActivity.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java index ec5b0d0..3d28cac 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java @@ -321,7 +321,7 @@ public class Stock_FacingActivity extends AppCompatActivity { //String date = new Date().toLocaleString().toString(); //String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-'); - _pathforcheck = "Stock_Cam1_" + store_id + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; + _pathforcheck = "Stock_Cam1_" + store_id + "_" + headerTitle.getBrand_id() + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; child_position = groupPosition; path = str + _pathforcheck; @@ -349,7 +349,7 @@ public class Stock_FacingActivity extends AppCompatActivity { //String date = new Date().toLocaleString().toString(); //String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-'); - _pathforcheck = "Stock_Cam2_" + store_id + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; + _pathforcheck = "Stock_Cam2_" + store_id + "_" + headerTitle.getBrand_id() + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; child_position = groupPosition; path = str + _pathforcheck; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java index 6c789a6..8030b22 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -628,7 +628,7 @@ public class UploadActivity extends AppCompatActivity { return CommonString.KEY_FAILURE; } } else { - //new File(Path + path).delete(); + new File(Path + path).delete(); } return result.toString(); From a18d04ca5fb636de691e0a5dc9e6e3e337ed3128 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Tue, 10 Jan 2017 18:15:48 +0530 Subject: [PATCH 3/6] Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest # Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml --- .../src/main/res/layout/item_msl_availability_child.xml | 3 ++- GSKMTOrange/src/main/res/layout/item_stock_facing_child.xml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml b/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml index 3970b89..48ccb95 100644 --- a/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml +++ b/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml @@ -23,7 +23,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:padding="5dp" + android:paddingLeft="5dp" + android:paddingRight="5dp" android:weightSum="5"> Date: Wed, 11 Jan 2017 11:32:59 +0530 Subject: [PATCH 4/6] Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest # Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml --- .../gsk_dailyentry/CategoryListActivity.java | 29 +++++++++++++++++-- .../drawable/toggle_selector_background.xml | 5 ++++ .../res/layout/content_promo_compliance.xml | 9 ++++-- .../layout/item_msl_availability_child.xml | 3 +- .../main/res/layout/item_promo_sku_list.xml | 9 ++++-- GSKMTOrange/src/main/res/values/colors.xml | 2 +- 6 files changed, 46 insertions(+), 11 deletions(-) create mode 100644 GSKMTOrange/src/main/res/drawable/toggle_selector_background.xml diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java index f6e0362..0b6a11d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java @@ -119,11 +119,34 @@ public class CategoryListActivity extends AppCompatActivity { //holder.categoryIcon.setImageResource(R.drawable.category); if (categoryData.getCategory().equalsIgnoreCase("Oral Health")) { - holder.categoryIcon.setImageResource(R.drawable.ohc); + if (db.checkMsl_AvailabilityData(store_id, categoryData.getCategory_id()) + && db.checkStockAndFacingData(store_id, categoryData.getCategory_id()) + && db.checkPromoComplianceData(store_id, categoryData.getCategory_id())) { + + holder.categoryIcon.setImageResource(R.drawable.ohc_done); + } else { + holder.categoryIcon.setImageResource(R.drawable.ohc); + } } else if (categoryData.getCategory().equalsIgnoreCase("Wellness")) { - holder.categoryIcon.setImageResource(R.drawable.pdr); + if (db.checkMsl_AvailabilityData(store_id, categoryData.getCategory_id()) + && db.checkStockAndFacingData(store_id, categoryData.getCategory_id()) + && db.checkPromoComplianceData(store_id, categoryData.getCategory_id())) { + + holder.categoryIcon.setImageResource(R.drawable.pdr_done); + } else { + + holder.categoryIcon.setImageResource(R.drawable.pdr); + } } else if (categoryData.getCategory().equalsIgnoreCase("Nutritionals")) { - holder.categoryIcon.setImageResource(R.drawable.hfd); + + if (db.checkMsl_AvailabilityData(store_id, categoryData.getCategory_id()) + && db.checkStockAndFacingData(store_id, categoryData.getCategory_id()) + && db.checkPromoComplianceData(store_id, categoryData.getCategory_id())) { + + holder.categoryIcon.setImageResource(R.drawable.hfd_done); + } else { + holder.categoryIcon.setImageResource(R.drawable.hfd); + } } diff --git a/GSKMTOrange/src/main/res/drawable/toggle_selector_background.xml b/GSKMTOrange/src/main/res/drawable/toggle_selector_background.xml new file mode 100644 index 0000000..3044f98 --- /dev/null +++ b/GSKMTOrange/src/main/res/drawable/toggle_selector_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml b/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml index 2e7dcf1..f6d49c0 100644 --- a/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml +++ b/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml @@ -158,7 +158,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textOff="@string/no" - android:textOn="@string/yes" /> + android:textOn="@string/yes" + android:background="@drawable/toggle_selector_background"/> @@ -196,7 +197,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textOff="@string/no" - android:textOn="@string/yes" /> + android:textOn="@string/yes" + android:background="@drawable/toggle_selector_background" /> @@ -234,7 +236,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textOff="@string/no" - android:textOn="@string/yes" /> + android:textOn="@string/yes" + android:background="@drawable/toggle_selector_background" /> diff --git a/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml b/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml index 48ccb95..9979c83 100644 --- a/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml +++ b/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml @@ -92,7 +92,8 @@ android:id="@+id/toggle_available" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" /> + android:layout_gravity="center" + android:background="@drawable/toggle_selector_background" /> diff --git a/GSKMTOrange/src/main/res/layout/item_promo_sku_list.xml b/GSKMTOrange/src/main/res/layout/item_promo_sku_list.xml index 0c4046f..48ecdbd 100644 --- a/GSKMTOrange/src/main/res/layout/item_promo_sku_list.xml +++ b/GSKMTOrange/src/main/res/layout/item_promo_sku_list.xml @@ -89,7 +89,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textOff="@string/no" - android:textOn="@string/yes" /> + android:textOn="@string/yes" + android:background="@drawable/toggle_selector_background" /> @@ -127,7 +128,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textOff="@string/no" - android:textOn="@string/yes"/> + android:textOn="@string/yes" + android:background="@drawable/toggle_selector_background"/> @@ -165,7 +167,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textOff="@string/no" - android:textOn="@string/yes"/> + android:textOn="@string/yes" + android:background="@drawable/toggle_selector_background"/> diff --git a/GSKMTOrange/src/main/res/values/colors.xml b/GSKMTOrange/src/main/res/values/colors.xml index 43a8311..e262f33 100644 --- a/GSKMTOrange/src/main/res/values/colors.xml +++ b/GSKMTOrange/src/main/res/values/colors.xml @@ -7,7 +7,7 @@ #FFFFFF #000000 #EEEEEE - + #FF27A404 #2196F3 #FFE0B2 From 35878c7d517c27f99bbeac2519bd8d4a622e65f6 Mon Sep 17 00:00:00 2001 From: ashishandroid Date: Wed, 11 Jan 2017 12:13:08 +0530 Subject: [PATCH 5/6] Merge remote-tracking branch 'origin/GeoT' into GeoT # Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml # GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java --- .idea/misc.xml | 2 +- .../com/gskmtorange/Database/GSKOrangeDB.java | 25 ++------------ .../dailyentry/AdditionalVisibility.java | 33 +++++++++++-------- .../layout/contentadditionalvisibility.xml | 31 +++++++++-------- 4 files changed, 38 insertions(+), 53 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index b8dc4d6..b15ecee 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -41,7 +41,7 @@ - + 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 4279a76..08f705b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -1453,22 +1453,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - public ArrayList getDialogStock(String store_id) { + public ArrayList getDialogStock(String keyid) { Cursor cursordata = null; ArrayList productData = new ArrayList(); try { - cursordata = db.rawQuery("SELECT * FROM STOCK_DIALOG WHERE STORE_ID = '"+store_id + "'", null); - - /* cursordata = db.rawQuery("SELECT * from " - + CommonString.TABLE_INSERT_STOCK_TOT + " WHERE " - + CommonString.KEY_STORE_ID + "='" + store_id + "' AND " - + CommonString.KEY_CATEGORY_ID + "='" + cate_id + "' AND " - + CommonString.KEY_PROCESS_ID + " ='" + process_id + "' AND " - + CommonString.KEY_DISPLAY_ID + "= '" + display_id + "' AND " - + CommonString.UNIQUE_KEY_ID + "= '" + unique_id + "'", - null);*/ + cursordata = db.rawQuery("SELECT * FROM STOCK_DIALOG WHERE COMMON_ID = '"+keyid + "'", null); if (cursordata != null) { cursordata.moveToFirst(); @@ -1484,12 +1475,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setBrand(cursordata.getString(cursordata .getColumnIndexOrThrow(CommonString.KEY_BRAND))); - /*sb.setCategory_id(cursordata.getString(cursordata - .getColumnIndexOrThrow(CommonString.KEY_CATEGORY_ID))); - - - sb.setDisplay_id(cursordata.getString(cursordata - .getColumnIndexOrThrow(CommonString.KEY_DISPLAY_ID)));*/ sb.setQuantity(cursordata.getString(cursordata .getColumnIndexOrThrow(CommonString.KEY_QUANTITY))); @@ -1500,12 +1485,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setSku_name(cursordata.getString(cursordata .getColumnIndexOrThrow(CommonString.KEY_SKUNAME))); - /* sb.setProcess_id(cursordata.getString(cursordata - .getColumnIndexOrThrow(CommonString.KEY_PROCESS_ID))); - - sb.setUnique_id(cursordata.getString(cursordata - .getColumnIndexOrThrow(CommonString.UNIQUE_KEY_ID)));*/ - productData.add(sb); cursordata.moveToNext(); 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 3d697c5..d98904f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java @@ -64,7 +64,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl ArrayList list = new ArrayList(); ArrayList listdata = new ArrayList(); - + ArrayList uploadlist = new ArrayList(); ArrayList defdata = new ArrayList(); Spinner spinner_brand, spinner_sku; Spinner spinner_brand_list, spinner_sku_list; @@ -97,7 +97,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl MyAdaptorAdditionalStock adapteradditional; AddittionalGetterSetter adGt; LinearLayout brandlayout, diaplylayout, cameralayout; - RelativeLayout skulayout; + //RelativeLayout skulayout; ////String brand_id,SKU_ID; protected void onCreate(Bundle savedInstanceState) { @@ -114,7 +114,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl store_id = preferences.getString(CommonString.KEY_STORE_ID, null); - // store_id = "1"; + store_id = "1"; date = preferences.getString(CommonString.KEY_DATE, null); intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, ""); @@ -133,7 +133,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl diaplylayout = (LinearLayout) findViewById(R.id.tv_displaylayout); cameralayout = (LinearLayout) findViewById(R.id.tv_cameralayout); - skulayout = (RelativeLayout) findViewById(R.id.tv_skulayout); + //skulayout = (RelativeLayout) findViewById(R.id.tv_skulayout); btntoggle.setChecked(true); @@ -197,6 +197,15 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl listdata = db.getAdditionalStock(store_id); + for(int k=0;k 0) { adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata); listviewlay.setAdapter(adapteradditional); @@ -245,14 +254,13 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl defdata.clear(); - btntoggle.setChecked(true); togglevalue = "1"; brandlayout.setVisibility(View.VISIBLE); diaplylayout.setVisibility(View.VISIBLE); cameralayout.setVisibility(View.VISIBLE); - skulayout.setVisibility(View.VISIBLE); + btnsku.setVisibility(View.VISIBLE); listdata = db.getAdditionalStock(store_id); @@ -287,7 +295,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } }); - btntoggle.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -298,15 +305,15 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl brandlayout.setVisibility(View.VISIBLE); diaplylayout.setVisibility(View.VISIBLE); cameralayout.setVisibility(View.VISIBLE); - skulayout.setVisibility(View.VISIBLE); + btnsku.setVisibility(View.VISIBLE); } else { togglevalue = "0"; - brandlayout.setVisibility(View.GONE); - diaplylayout.setVisibility(View.GONE); - cameralayout.setVisibility(View.GONE); - skulayout.setVisibility(View.GONE); + brandlayout.setVisibility(View.INVISIBLE); + diaplylayout.setVisibility(View.INVISIBLE); + cameralayout.setVisibility(View.INVISIBLE); + btnsku.setVisibility(View.INVISIBLE); } } }); @@ -904,7 +911,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl list.get(position1).getDisplay_id(),list.get(position1).getUnique_id());*/ - // list = db.getDialogStock(store_id); + //list = db.getDialogStock(store_id); listview.setAdapter(new MyAdaptorStock(AdditionalVisibility.this, defdata)); listview.invalidateViews(); diff --git a/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml b/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml index 216b5cb..be17555 100644 --- a/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml +++ b/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml @@ -71,7 +71,7 @@ android:id="@+id/tv_brandlayout" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_weight="30" + android:layout_weight="40" android:background="@color/grey_background" android:orientation="horizontal" android:padding="5dp" @@ -90,7 +90,7 @@ @@ -99,7 +99,7 @@ android:id="@+id/tv_displaylayout" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_weight="30" + android:layout_weight="40" android:background="@color/grey_background" android:orientation="horizontal" android:padding="5dp" @@ -117,11 +117,10 @@ - - -