From 3a127934cc473bf03c68663e8606ab6e27ef0382 Mon Sep 17 00:00:00 2001 From: ashishandroid Date: Fri, 13 Jan 2017 17:03:18 +0530 Subject: [PATCH 1/3] newcode --- .../com/gskmtorange/Database/GSKOrangeDB.java | 118 ++++++- .../gskmtorange/GeoTag/GeoTagActivity.java | 120 ++++--- .../gskmtorange/GeoTag/GeoTagStoreList.java | 27 +- .../cpm/com/gskmtorange/MainActivity.java | 3 +- .../gskmtorange/constant/CommonString.java | 49 +++ .../dailyentry/AdditionalVisibility.java | 331 +++++++++++++----- .../dailyentry/StoreListActivity.java | 11 +- .../dailyentry/StoreimageActivity.java | 12 +- .../gskmtorange/upload/UploadActivity.java | 12 +- .../res/layout/additionaldialoglayout.xml | 8 +- .../res/layout/additionalvisibilitylayout.xml | 9 + .../layout/contentadditionalvisibility.xml | 4 +- .../src/main/res/layout/contentstoreimage.xml | 4 +- GSKMTOrange/src/main/res/layout/dialogbox.xml | 8 +- .../src/main/res/layout/storeviewlist.xml | 4 +- .../src/main/res/mipmap-hdpi/checkout.png | Bin 0 -> 4085 bytes .../src/main/res/mipmap-tr/checkout.png | Bin 0 -> 4286 bytes GSKMTOrange/src/main/res/values/strings.xml | 35 ++ 18 files changed, 555 insertions(+), 200 deletions(-) create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/checkout.png create mode 100644 GSKMTOrange/src/main/res/mipmap-tr/checkout.png 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 0dc7fb6..e05877c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -89,6 +89,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.execSQL(CommonString.CREATE_TABLE_STOCK_ADDITIONAL_STOCK_DATA); db.execSQL(CommonString.CREATE_TABLE_INSERT_ADDITIONAL_PROMO_COMPLIANCE); db.execSQL(CommonString.CREATE_TABLE_INSERT_PROMO_SKU); + db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_ADDITIONAL_VISIBILITY_MAIN); + db.execSQL(CommonString.CREATE_TABLE_STOCK_DIALOG_MAIN); //Gagan End } @@ -2037,13 +2039,17 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setCOMMON_ID(cursordata.getString(cursordata .getColumnIndexOrThrow(CommonString.KEY_Common_ID))); + sb.setStore_id(cursordata.getString(cursordata + .getColumnIndexOrThrow(CommonString.KEY_STORE_ID))); + sb.setCategoryId(cursordata.getString(cursordata + .getColumnIndexOrThrow("categoryId"))); + sb.setBrand_id(cursordata.getString(cursordata .getColumnIndexOrThrow(CommonString.KEY_BRAND_ID))); sb.setBrand(cursordata.getString(cursordata .getColumnIndexOrThrow(CommonString.KEY_BRAND))); - sb.setQuantity(cursordata.getString(cursordata .getColumnIndexOrThrow(CommonString.KEY_QUANTITY))); @@ -2053,7 +2059,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setSku_name(cursordata.getString(cursordata .getColumnIndexOrThrow(CommonString.KEY_SKUNAME))); - productData.add(sb); cursordata.moveToNext(); } @@ -2081,6 +2086,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper { public void deleteStockEntry(String id) { try { db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL, "KEY_ID" + "='" + id + "'", null); + db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_MAIN, "KEY_ID" + "='" + id + "'", null); + + } catch (Exception e) { System.out.println("" + e); } @@ -2089,8 +2097,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper { public void deleteStockEntryall(String storeid,String categoryid) { try { - db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL, "Store_Id" + "='" + storeid +"categoryId" + "='" + categoryid + "'", null); - db.delete(CommonString.TABLE_INSERT_STOCK_DIALOG, "Store_Id" + "='" + storeid +"categoryId" + "='" + categoryid + "'", null); + db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL, "Store_Id" + "='" + storeid +"'AND categoryId" + "='" + categoryid + "'", null); + db.delete(CommonString.TABLE_INSERT_STOCK_DIALOG, "Store_Id" + "='" + storeid +"'AND categoryId" + "='" + categoryid + "'", null); + + db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_MAIN, "Store_Id" + "='" + storeid +"'AND categoryId" + "='" + categoryid + "'", null); + + db.delete(CommonString.TABLE_INSERT_STOCK_DIALOG_MAIN, "Store_Id" + "='" + storeid +"'AND categoryId" + "='" + categoryid + "'", null); } catch (Exception e) { System.out.println("" + e); @@ -2293,7 +2305,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { Cursor dbcursor = null; try { - dbcursor = db.rawQuery("Select * from Stock_Additional_visibility " + "where categoryId='" + category_id + "' and Store_Id='" + store_id + "'", null); + dbcursor = db.rawQuery("Select * from Stock_Additional_visibility_Main " + "where categoryId='" + category_id + "' and Store_Id='" + store_id + "'", null); if (dbcursor != null) { if (dbcursor.moveToFirst()) { @@ -2326,7 +2338,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - cursordata = db.rawQuery("SELECT * FROM Stock_Additional_visibility WHERE Store_Id = '"+store_id +"'", null); + cursordata = db.rawQuery("SELECT * FROM Stock_Additional_visibility_Main WHERE Store_Id = '"+store_id +"'", null); if (cursordata != null) { cursordata.moveToFirst(); @@ -2375,4 +2387,98 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return productData; } + + public void InsertMainListAdditionalData(AddittionalGetterSetter Mainlist,ArrayList skulist,String categoryId) { + ContentValues values = new ContentValues(); + ContentValues values1 = new ContentValues(); + try { + + values.put("Store_Id", Mainlist.getStore_id()); + values.put("categoryId", categoryId); + values.put("brand_name", Mainlist.getBrand()); + values.put("brand_id", Mainlist.getBrand_id()); + values.put("image_url", Mainlist.getImage()); + values.put("sku_id", Mainlist.getSku_id()); + values.put("sku_name", Mainlist.getSku()); + values.put("toggle_value", Mainlist.getBtn_toogle()); + + long key_id = db.insert(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_MAIN, null, values); + + for(int j=0;j getDialogStockUpload(String keyid) { + Cursor cursordata = null; + ArrayList productData = new ArrayList(); + + try { + + cursordata = db.rawQuery("SELECT * FROM STOCK_DIALOG_MAIN WHERE COMMON_ID = '"+keyid + "'", null); + + if (cursordata != null) { + cursordata.moveToFirst(); + while (!cursordata.isAfterLast()) { + AdditionalDialogGetterSetter sb = new AdditionalDialogGetterSetter(); + + sb.setKEY_ID(cursordata.getString(cursordata + .getColumnIndexOrThrow(CommonString.KEY_ID))); + + sb.setCOMMON_ID(cursordata.getString(cursordata + .getColumnIndexOrThrow(CommonString.KEY_Common_ID))); + + sb.setStore_id(cursordata.getString(cursordata + .getColumnIndexOrThrow(CommonString.KEY_STORE_ID))); + sb.setCategoryId(cursordata.getString(cursordata + .getColumnIndexOrThrow("categoryId"))); + + sb.setBrand_id(cursordata.getString(cursordata + .getColumnIndexOrThrow(CommonString.KEY_BRAND_ID))); + + sb.setBrand(cursordata.getString(cursordata + .getColumnIndexOrThrow(CommonString.KEY_BRAND))); + + sb.setQuantity(cursordata.getString(cursordata + .getColumnIndexOrThrow(CommonString.KEY_QUANTITY))); + + sb.setSku_id(cursordata.getString(cursordata + .getColumnIndexOrThrow(CommonString.KEY_SKU_ID))); + + sb.setSku_name(cursordata.getString(cursordata + .getColumnIndexOrThrow(CommonString.KEY_SKUNAME))); + + productData.add(sb); + cursordata.moveToNext(); + } + cursordata.close(); + + } + + + } catch (Exception ex) { + + } + return productData; + + } + } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java index 8daca52..453da15 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java @@ -3,6 +3,7 @@ package cpm.com.gskmtorange.GeoTag; import android.Manifest; import android.app.AlertDialog; import android.app.Dialog; +import android.content.ActivityNotFoundException; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -114,6 +115,8 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb private static final String TAG = GeoTagActivity.class.getSimpleName(); String defaultCameraPackage = ""; File file; + String gallery_package = ""; + Uri outputFileUri; private int factor, k; ArrayList geotaglist = new ArrayList(); private TextView percentage, message; @@ -182,13 +185,13 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb GeoTagActivity.this); // Setting Dialog Title - alertDialog.setTitle("GPS IS DISABLED..."); + alertDialog.setTitle(getResources().getString(R.string.gps)); // Setting Dialog Message - alertDialog.setMessage("Click ok to enable GPS."); + alertDialog.setMessage(getResources().getString(R.string.gpsebale)); // Setting Positive "Yes" Button - alertDialog.setPositiveButton("YES", + alertDialog.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { @@ -199,7 +202,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb }); // Setting Negative "NO" Button - alertDialog.setNegativeButton("NO", + alertDialog.setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { // Write your code here to invoke NO event @@ -228,7 +231,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb } else { - Snackbar.make(view, "Please Take Image Before Save", Snackbar.LENGTH_LONG).setAction("Action", null).show(); + Snackbar.make(view, getResources().getString(R.string.takeimage), Snackbar.LENGTH_LONG).setAction("Action", null).show(); } @@ -251,7 +254,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb } } - _pathforcheck = storeid + "Store" + "Image" + getCurrentTime().replace(":", "") + ".jpg"; + _pathforcheck = storeid + getResources().getString(R.string.store) + getResources().getString(R.string.image) + getCurrentTime().replace(":", "") + ".jpg"; _path = CommonString.FILE_PATH + _pathforcheck; @@ -273,8 +276,8 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb GooglePlayServicesUtil.getErrorDialog(resultCode, this, PLAY_SERVICES_RESOLUTION_REQUEST).show(); } else { - Toast.makeText(getApplicationContext(), - "This device is not supported.", Toast.LENGTH_LONG) + Toast.makeText(getApplicationContext(),getResources().getString(R.string.notsuppoted) + , Toast.LENGTH_LONG) .show(); finish(); } @@ -426,59 +429,70 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb } protected void startCameraActivity() { - /* Log.i("MakeMachine", "startCameraActivity()"); - file = new File(_path); - Uri outputFileUri = Uri.fromFile(file); + try { + /*Log.i("MakeMachine", "startCameraActivity()"); + File file = new File(_path); + Uri outputFileUri = Uri.fromFile(file); + Intent intent = new Intent( + MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); - Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + startActivityForResult(intent, 0);*/ + Log.i("MakeMachine", "startCameraActivity()"); + File file = new File(_path); + outputFileUri = Uri.fromFile(file); - takePictureIntent.setPackage(defaultCameraPackage); + String defaultCameraPackage = ""; + final PackageManager packageManager = getPackageManager(); + List list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES); + for (int n = 0; n < list.size(); n++) { + if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) { + Log.e("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString()); + Log.e("TAG", "package name : " + list.get(n).packageName); - takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); - - startActivityForResult(takePictureIntent, 1);*/ - - Log.i("MakeMachine", "startCameraActivity()"); - File file = new File(_path); - Uri outputFileUri = Uri.fromFile(file); - - String defaultCameraPackage=""; - final PackageManager packageManager = getPackageManager(); - List list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES); - for (int n=0;n= Build.VERSION_CODES.KITKAT) { - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) { - defaultCameraPackage = list.get(n).packageName; - break; - } - } else { + //temp value in case camera is gallery app above jellybean if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) { - defaultCameraPackage = list.get(n).packageName; - break; + gallery_package = list.get(n).packageName; + } + + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) { + defaultCameraPackage = list.get(n).packageName; + break; + } + } else { + if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) { + defaultCameraPackage = list.get(n).packageName; + break; + } } } } + //com.android.gallery3d + + Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); + intent.setPackage(defaultCameraPackage); + startActivityForResult(intent, 0); } + catch (ActivityNotFoundException e) { + e.printStackTrace(); - Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); - - - takePictureIntent.setPackage(defaultCameraPackage); - - takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); - - startActivityForResult(takePictureIntent, 1); - + Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); + intent.setPackage(gallery_package); + startActivityForResult(intent, 0); + } + catch (Exception e) { + e.printStackTrace(); + } } + protected void onActivityResult(int requestCode, int resultCode, Intent data) { Log.i("MakeMachine", "resultCode: " + resultCode); @@ -541,7 +555,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb dialog = new Dialog(context); dialog.setContentView(R.layout.custom); - dialog.setTitle("Uploading Data"); + dialog.setTitle(getResources().getString(R.string.uploaddata)); dialog.setCancelable(false); dialog.show(); pb = (ProgressBar) dialog.findViewById(R.id.progressBar1); @@ -577,7 +591,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb k = k + factor; pb.setProgress(k); percentage.setText(k + "%"); - message.setText("Uploading Geotag Data..."); + message.setText(getResources().getString(R.string.geotagdata)); } }); @@ -709,7 +723,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb AlertMessage message = new AlertMessage( GeoTagActivity.this, AlertMessage.MESSAGE_DATA_NOT - + result, "failure", null); + + result, getResources().getString(R.string.failure), null); message.showMessage(); @@ -739,7 +753,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb dialog = new Dialog(context); dialog.setContentView(R.layout.custom); - dialog.setTitle("Uploading Geotag Images"); + dialog.setTitle(getResources().getString(R.string.uploadimge)); dialog.setCancelable(false); dialog.show(); pb = (ProgressBar) dialog.findViewById(R.id.progressBar1); @@ -776,7 +790,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb k = k + factor; pb.setProgress(k); percentage.setText(k + "%"); - message.setText("Uploading Geotag Images..."); + message.setText(getResources().getString(R.string.uploadimge)); } }); @@ -879,7 +893,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb AlertMessage message = new AlertMessage( GeoTagActivity.this, AlertMessage.MESSAGE_ERROR - + result, "success", null); + + result, getResources().getString(R.string.success), null); message.showMessage(); @@ -889,7 +903,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb AlertMessage message = new AlertMessage( GeoTagActivity.this, AlertMessage.MESSAGE_DATA_NOT - + result, "failure", null); + + result, getResources().getString(R.string.failure), null); message.showMessage(); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java index ea12923..46727d1 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java @@ -74,11 +74,6 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi db = new GSKOrangeDB(GeoTagStoreList.this); db.open(); - - - - - fab.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -88,7 +83,6 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi finish(); - } }); @@ -109,10 +103,8 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi fab.setVisibility(View.VISIBLE); } - } - @Override public boolean onOptionsItemSelected(MenuItem item) { // Handle action bar item clicks here. The action bar will @@ -255,11 +247,9 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi imageview=(ImageView) itemView.findViewById(R.id.imageView1); } - } - + } } - public List getdata() { List data = new ArrayList<>(); @@ -267,24 +257,17 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi StoreBean storelistdata=new StoreBean(); - for(int i=0;i list = new ArrayList(); ArrayList listdata = new ArrayList(); - + ArrayList additionalVisibilitySkuList; + ArrayList additionalVisibilityinsertSkuList; ArrayList uploadlist = new ArrayList(); ArrayList defdata = new ArrayList(); Spinner spinner_brand, spinner_sku; Spinner spinner_brand_list, spinner_sku_list; + AdditionalDialogGetterSetter additionalgeetersetter; public static ArrayList data = new ArrayList(); ToggleButton btntoggle; ImageView btnimage, btnedit; @@ -96,10 +102,14 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl ListView listviewlay; String errormsg,categoryName,categoryId; MyAdaptorAdditionalStock adapteradditional; - AddittionalGetterSetter adGt; + AddittionalGetterSetter adGt,newadd; LinearLayout brandlayout, diaplylayout, cameralayout; + FloatingActionButton fab; //RelativeLayout skulayout; CardView cardvew; + String gallery_package = ""; + Uri outputFileUri; + ////String brand_id,SKU_ID; protected void onCreate(Bundle savedInstanceState) { // TODO Auto-generated method stub @@ -138,7 +148,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl brandlayout = (LinearLayout) findViewById(R.id.tv_brandlayout); diaplylayout = (LinearLayout) findViewById(R.id.tv_displaylayout); cameralayout = (LinearLayout) findViewById(R.id.tv_cameralayout); - + fab = (FloatingActionButton) findViewById(R.id.fab); //skulayout = (RelativeLayout) findViewById(R.id.tv_skulayout); btntoggle.setChecked(true); @@ -149,7 +159,8 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl ///band List brand_list = db.getBrandMasterData(store_id); BrandMasterGetterSetter brand = new BrandMasterGetterSetter(); - brand.setBRAND("select"); + String str= getResources().getString(R.string.select); + brand.setBRAND(str); brand_list.add(0, brand); CustomAdapter adapter = new CustomAdapter(AdditionalVisibility.this, R.layout.custom_spinner_item, brand_list); @@ -160,7 +171,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl skuMaster_list = db.getSKUMasterData(store_id); SkuMasterGetterSetter select = new SkuMasterGetterSetter(); - select.setSKU("Select"); + select.setSKU(str); skuMaster_list.add(0, select); CustomSkuMasterAdpter skuadapter = new CustomSkuMasterAdpter(AdditionalVisibility.this, R.layout.custom_spinner_item, skuMaster_list); spinner_sku_list.setAdapter(skuadapter); @@ -210,7 +221,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl if(tooglevalue.equalsIgnoreCase("0")) { - btnaddlayout.setVisibility(View.INVISIBLE); cardvew.setVisibility(View.INVISIBLE); listviewlay.setVisibility(View.INVISIBLE); @@ -221,8 +231,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl btnsku.setVisibility(View.INVISIBLE); } - - /* String KeyID = listdata.get(k).getKey_id(); uploadlist = db.getDialogStock(KeyID);*/ @@ -230,9 +238,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } - if (listdata.size() > 0) { - for (int i = 0; i < listdata.size(); i++) { if (listdata.get(i).getBtn_toogle().equalsIgnoreCase("0")) { listviewlay.setVisibility(View.INVISIBLE); @@ -250,13 +256,71 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } + fab.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + listdata = db.getAdditionalStock(store_id,categoryId); + + if(listdata.size()>0) + { + AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( + AdditionalVisibility.this); + // set title + alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_save)); + // set dialog message + alertDialogBuilder + .setMessage("") + .setCancelable(false) + .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + for (int J = 0; J < listdata.size(); J++) { + newadd = new AddittionalGetterSetter(); + newadd.setBrand(listdata.get(J).getBrand_id()); + newadd.setBrand_id(listdata.get(J).getBrand_id()); + newadd.setImage(listdata.get(J).getImage()); + newadd.setSku(listdata.get(J).getSku()); + newadd.setSku_id(listdata.get(J).getSku_id()); + newadd.setStore_id(listdata.get(J).getStore_id()); + newadd.setBtn_toogle(listdata.get(J).getBtn_toogle()); + newadd.setCategoryId(listdata.get(J).getCategoryId()); + + String KeyID = listdata.get(J).getKey_id(); + additionalVisibilitySkuList = db.getDialogStock(KeyID); + + db.InsertMainListAdditionalData(newadd, additionalVisibilitySkuList,categoryId); + + /*Intent in =new Intent(AdditionalVisibility.this, DailyDataMenuActivity.class); + + startActivity(in);*/ + + KeyID=""; + additionalVisibilitySkuList.clear(); + } + finish(); + } + }) + .setNegativeButton(getResources().getString(R.string.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, getResources().getString(R.string.title_activity_Want_add), Snackbar.LENGTH_LONG).setAction("Action", null).show(); + } + + }}); - /* if (listdata.size() > 0) { - adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata); - listviewlay.setAdapter(adapteradditional); - listviewlay.invalidateViews(); - }*/ btnaddlayout.setOnClickListener(new View.OnClickListener() { @Override @@ -272,46 +336,32 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl adGt.setBtn_toogle(togglevalue); adGt.setCategoryId(categoryId); - if (validateData(adGt, defdata)) { - AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AdditionalVisibility.this); - // set title - alertDialogBuilder.setTitle("Do You Want To Save"); - + alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_add)); // set dialog message alertDialogBuilder .setMessage("") .setCancelable(false) - .setPositiveButton("Yes", new DialogInterface.OnClickListener() { + .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { db.InsertAdditionalData(adGt, defdata,categoryId); - 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); - btnimage.setBackgroundResource(R.mipmap.camera); - // togglevalue = "1"; - listdata = db.getAdditionalStock(store_id,categoryId); - if (listdata.size() > 0) { - for(int i=0;i0) + { + AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( + AdditionalVisibility.this); + // set title + alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_delete)); + // set dialog message + alertDialogBuilder + .setMessage("") + .setCancelable(false) + .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + togglevalue = "1"; + db.deleteStockEntryall(store_id,categoryId); + brandlayout.setVisibility(View.VISIBLE); + diaplylayout.setVisibility(View.VISIBLE); + cameralayout.setVisibility(View.VISIBLE); + btnsku.setVisibility(View.VISIBLE); + btnaddlayout.setVisibility(View.VISIBLE); + cardvew.setVisibility(View.VISIBLE); + listviewlay.setVisibility(View.VISIBLE); - btnaddlayout.setVisibility(View.VISIBLE); - cardvew.setVisibility(View.VISIBLE); - listviewlay.setVisibility(View.VISIBLE); + listdata = db.getAdditionalStock(store_id,categoryId); + adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata); + listviewlay.setAdapter(adapteradditional); + listviewlay.invalidateViews(); + } + }) + .setNegativeButton(getResources().getString(R.string.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 + { + togglevalue = "1"; + brandlayout.setVisibility(View.VISIBLE); + diaplylayout.setVisibility(View.VISIBLE); + cameralayout.setVisibility(View.VISIBLE); + btnsku.setVisibility(View.VISIBLE); + btnaddlayout.setVisibility(View.VISIBLE); + cardvew.setVisibility(View.VISIBLE); + listviewlay.setVisibility(View.VISIBLE); + + } } else { - db.deleteStockEntryall(store_id,categoryId); + listdata = db.getAdditionalStock(store_id,categoryId); + + if(listdata.size()>0) + { + AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( + AdditionalVisibility.this); + // set title + alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_delete)); + + // set dialog message + alertDialogBuilder + .setMessage("") + .setCancelable(false) + .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + db.deleteStockEntryall(store_id,categoryId); + togglevalue = "0"; + defdata.clear(); + brandlayout.setVisibility(View.INVISIBLE); + diaplylayout.setVisibility(View.INVISIBLE); + cameralayout.setVisibility(View.INVISIBLE); + btnsku.setVisibility(View.INVISIBLE); + + listdata = db.getAdditionalStock(store_id,categoryId); + adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata); + listviewlay.setAdapter(adapteradditional); + listviewlay.invalidateViews(); + + + + } + }) + .setNegativeButton(getResources().getString(R.string.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 + { + togglevalue = "0"; + defdata.clear(); + brandlayout.setVisibility(View.INVISIBLE); + diaplylayout.setVisibility(View.INVISIBLE); + cameralayout.setVisibility(View.INVISIBLE); + btnsku.setVisibility(View.INVISIBLE); + } - togglevalue = "0"; - defdata.clear(); - brandlayout.setVisibility(View.INVISIBLE); - diaplylayout.setVisibility(View.INVISIBLE); - cameralayout.setVisibility(View.INVISIBLE); - btnsku.setVisibility(View.INVISIBLE); } } }); @@ -399,8 +534,8 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl btnimage.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - _pathforcheck = store_id + "Store" - + "Image" + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg"; + _pathforcheck = store_id + getResources().getString(R.string.store) + +getResources().getString(R.string.image) + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg"; _path = CommonString.FILE_PATH + _pathforcheck; intime = getCurrentTime(); @@ -497,7 +632,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl if (position == 0) { // Default selected Spinner item - label.setText("Select"); + label.setText(getResources().getString(R.string.select)); //sub.setText(""); } else { // Set values for spinner each row @@ -559,7 +694,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl if (position == 0) { // Default selected Spinner item - label.setText("Select"); + label.setText(getResources().getString(R.string.select)); //sub.setText(""); } else { // Set values for spinner each row @@ -622,7 +757,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl if (position == 0) { // Default selected Spinner item - label.setText("Select"); + label.setText(getResources().getString(R.string.select)); //sub.setText(""); } else { // Set values for spinner each row @@ -635,12 +770,20 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl protected void startCameraActivity() { - try { + /*Log.i("MakeMachine", "startCameraActivity()"); + File file = new File(_path); + Uri outputFileUri = Uri.fromFile(file); + + Intent intent = new Intent( + MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); + + startActivityForResult(intent, 0);*/ Log.i("MakeMachine", "startCameraActivity()"); File file = new File(_path); - Uri outputFileUri = Uri.fromFile(file); + outputFileUri = Uri.fromFile(file); String defaultCameraPackage = ""; final PackageManager packageManager = getPackageManager(); @@ -650,6 +793,11 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl Log.e("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString()); Log.e("TAG", "package name : " + list.get(n).packageName); + //temp value in case camera is gallery app above jellybean + if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) { + gallery_package = list.get(n).packageName; + } + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) { defaultCameraPackage = list.get(n).packageName; @@ -662,21 +810,28 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } } } - } + //com.android.gallery3d + Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); intent.setPackage(defaultCameraPackage); startActivityForResult(intent, 0); + } + 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, 0); - } catch (Exception e) { - + } + catch (Exception e) { e.printStackTrace(); } } - @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { @@ -708,7 +863,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl public void showSkuDialog() { final ArrayList brandList = db.getBrandT2PData("1", "1", "1"); BrandMasterGetterSetter brand = new BrandMasterGetterSetter(); - brand.setBRAND("select"); + brand.setBRAND(getResources().getString(R.string.select)); brandList.add(0, brand); // ArrayList skuMasterGetterSetterArrayList = db.getSkuT2PData("1", "1", "1",) final Dialog dialog = new Dialog(AdditionalVisibility.this); @@ -820,7 +975,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl ArrayList empty_list = new ArrayList<>(); SkuGetterSetter select = new SkuGetterSetter(); - select.setSKU("Select"); + select.setSKU(getResources().getString(R.string.select)); empty_list.add(select); CustomSkuAdapter skuadapter = new CustomSkuAdapter(AdditionalVisibility.this, R.layout.custom_spinner_item, empty_list); spinner_sku.setAdapter(skuadapter); @@ -836,7 +991,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl sku_list = db.getSkuT2PData("1", "1", "1", brand_id); SkuGetterSetter select = new SkuGetterSetter(); - select.setSKU("Select"); + select.setSKU(getResources().getString(R.string.select)); sku_list.add(0, select); // Create custom adapter object ( see below CustomSkuAdapter.java ) CustomSkuAdapter skuadapter = new CustomSkuAdapter(AdditionalVisibility.this, R.layout.custom_spinner_item, sku_list); @@ -976,13 +1131,13 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl AdditionalVisibility.this); // set title - alertDialogBuilder.setTitle("Do You Want To Delete?"); + alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_delete1)); // set dialog message alertDialogBuilder - .setMessage("Click Yes To Delete!") + .setMessage(getResources().getString(R.string.title_activity_click_delete)) .setCancelable(false) - .setPositiveButton("Yes", new DialogInterface.OnClickListener() { + .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { // db.deletedialogStockEntry(list.get(position1).getKEY_ID()); @@ -1002,7 +1157,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } }) - .setNegativeButton("No", new DialogInterface.OnClickListener() { + .setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { // if this button is clicked, just close // the dialog box and do nothing @@ -1106,24 +1261,29 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl AdditionalVisibility.this); // set title - alertDialogBuilder.setTitle("Do You Want To Delete?"); + alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_delete1)); // set dialog message alertDialogBuilder - .setMessage("Click Yes To Delete!") + .setMessage(getResources().getString(R.string.title_activity_click_delete)) .setCancelable(false) - .setPositiveButton("Yes", new DialogInterface.OnClickListener() { + .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { db.deleteStockEntry(listdata.get(position1).getKey_id()); + + adapteradditional.notifyDataSetChanged(); listdata = db.getAdditionalStock(store_id,categoryId); - /* adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata); + + + adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata); listviewlay.setAdapter(adapteradditional); - listviewlay.invalidateViews();*/ + + listviewlay.invalidateViews(); if (listdata.size() > 0) { @@ -1144,12 +1304,9 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } - - - } }) - .setNegativeButton("No", new DialogInterface.OnClickListener() { + .setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { // if this button is clicked, just close // the dialog box and do nothing @@ -1197,16 +1354,16 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl if (brandid.equalsIgnoreCase("") || skuid.equalsIgnoreCase("")) { flag = false; - errormsg = "Please Select dropdown"; + errormsg = getResources().getString(R.string.title_activity_select_dropdown); } else if (imageu == null || imageu.equalsIgnoreCase("")) { flag = false; - errormsg = "Please Take a image"; + errormsg = getResources().getString(R.string.title_activity_take_image); } else if (dialog.size() == 0) { - errormsg = "Please fill sku data"; + errormsg = getResources().getString(R.string.title_activity_fill_sku); flag = false; @@ -1232,13 +1389,13 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl if (brandid.equalsIgnoreCase("") || brandid == null) { flag = false; - msg = "Please Select Dropdown"; + msg = getResources().getString(R.string.title_activity_select_dropdown); } else if (displayid == null || displayid.equalsIgnoreCase("")) { flag = false; - msg = "Please Select Dropdown"; + msg = getResources().getString(R.string.title_activity_select_dropdown); } else if (QTy.equalsIgnoreCase("") || QTy == null) { flag = false; - msg = "Please enter Quantity"; + msg = getResources().getString(R.string.title_activity_enter_quantity); } else { flag = true; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java index 540cffa..6ff18bb 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -105,6 +105,10 @@ public class StoreListActivity extends AppCompatActivity { storelist = db.getStoreData(date); coverage=db.getCoverageData(date); + + + + if (storelist.size() > 0) { //list.setAdapter(new MyAdaptor()); adapter = new StoreListActivity.ValueAdapter(getApplicationContext(), storelist); @@ -394,7 +398,7 @@ public class StoreListActivity extends AppCompatActivity { AlertDialog.Builder builder = new AlertDialog.Builder(StoreListActivity.this); builder.setMessage(CommonString.DATA_DELETE_ALERT_MESSAGE) .setCancelable(false) - .setPositiveButton("Yes", + .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { @@ -409,7 +413,7 @@ public class StoreListActivity extends AppCompatActivity { } }) - .setNegativeButton("No", + .setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { @@ -466,3 +470,6 @@ public class StoreListActivity extends AppCompatActivity { } } + + + diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java index 147164f..67e04fb 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java @@ -150,8 +150,8 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic case R.id.img_cam_selfie: - _pathforcheck = store_id + "Store" - + "Image" + visit_date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg"; + _pathforcheck = store_id + getResources().getString(R.string.store) + + getResources().getString(R.string.image) + visit_date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg"; _path = CommonString.FILE_PATH + _pathforcheck; @@ -166,9 +166,9 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic if (img_str != null) { AlertDialog.Builder builder = new AlertDialog.Builder(StoreimageActivity.this); - builder.setMessage("Do you want to save the data ") + builder.setMessage(getResources().getString(R.string.title_activity_save_data)) .setCancelable(false) - .setPositiveButton("OK", new DialogInterface.OnClickListener() { + .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { alert.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false); @@ -203,7 +203,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic finish(); } }) - .setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.cancel(); } @@ -213,7 +213,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic alert.show(); } else { - Toast.makeText(getApplicationContext(), "Please click the image", Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(), getResources().getString(R.string.clickimage), Toast.LENGTH_SHORT).show(); } break; } 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 9f76527..a8ea3b7 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -454,7 +454,7 @@ public class UploadActivity extends AppCompatActivity { String KeyID = additionalVisibilityList.get(J).getKey_id(); - additionalVisibilitySkuList = db.getDialogStock(KeyID); + additionalVisibilitySkuList = db.getDialogStockUpload(KeyID); if(additionalVisibilitySkuList.size()>0) { @@ -469,9 +469,9 @@ public class UploadActivity extends AppCompatActivity { + "[KEY_ID]" + additionalVisibilitySkuList.get(k).getCOMMON_ID() + "[/KEY_ID]" - /* + "[DIALOG_BRAND_ID]" - + additionalVisibilitySkuList.get(k).getBrand_id() - + "[/DIALOG_BRAND_ID]"*/ + + "[CATEGORY_ID]" + + additionalVisibilitySkuList.get(k).getCategoryId() + + "[/CATEGORY_ID]" + "[SKU_ID]" + additionalVisibilitySkuList.get(k).getSku_id() + "[/SKU_ID]" @@ -513,6 +513,10 @@ public class UploadActivity extends AppCompatActivity { + "[/ADDITIONAL_VISIBILITY_DATA]"; additional_visibility_data_xml = additional_visibility_data_xml + onXML; + KeyID=""; + additionalVisibilitySkuList.clear(); + + additional_visibility_dialog_xml=""; } diff --git a/GSKMTOrange/src/main/res/layout/additionaldialoglayout.xml b/GSKMTOrange/src/main/res/layout/additionaldialoglayout.xml index d3cad5b..8e8b2ef 100644 --- a/GSKMTOrange/src/main/res/layout/additionaldialoglayout.xml +++ b/GSKMTOrange/src/main/res/layout/additionaldialoglayout.xml @@ -30,7 +30,7 @@ android:layout_height="match_parent" android:layout_weight="10" - android:text="Brand Name" + android:text="@string/brandname" android:textStyle="bold" /> + android:text="@string/delete" /> diff --git a/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml b/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml index 7855508..cd601f1 100644 --- a/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml +++ b/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml @@ -9,6 +9,15 @@ + diff --git a/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml b/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml index 68f45c8..1494793 100644 --- a/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml +++ b/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml @@ -62,8 +62,8 @@ android:id="@+id/btntoggle" android:layout_width="0dp" android:layout_height="wrap_content" - android:textOn="Yes" - android:textOff="No" + android:textOn="@string/yes" + android:textOff="@string/no" android:layout_weight=".5" /> diff --git a/GSKMTOrange/src/main/res/layout/contentstoreimage.xml b/GSKMTOrange/src/main/res/layout/contentstoreimage.xml index 4abae3d..1b8fb1a 100644 --- a/GSKMTOrange/src/main/res/layout/contentstoreimage.xml +++ b/GSKMTOrange/src/main/res/layout/contentstoreimage.xml @@ -24,7 +24,7 @@ + android:textSize="18sp" /> @@ -42,7 +42,7 @@ android:id="@+id/no" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="No" + android:text="@string/no" android:textColor="#000000" android:background="@color/colorPrimary"/> diff --git a/GSKMTOrange/src/main/res/layout/storeviewlist.xml b/GSKMTOrange/src/main/res/layout/storeviewlist.xml index 810d74a..8f3af54 100644 --- a/GSKMTOrange/src/main/res/layout/storeviewlist.xml +++ b/GSKMTOrange/src/main/res/layout/storeviewlist.xml @@ -44,7 +44,7 @@ android:layout_height="wrap_content" android:layout_alignTop="@+id/storelistviewxml_storeico" android:layout_toRightOf="@+id/storelistviewxml_storeico" - android:text="GSK MT ORANGE STORE" + android:text="@string/GSKMT" android:textColor="#1F3A6C" android:textSize="16sp" android:textStyle="bold" /> @@ -55,7 +55,7 @@ android:layout_height="wrap_content" android:layout_alignLeft="@+id/storelistviewxml_storename" android:layout_below="@+id/storelistviewxml_storename" - android:text="C 126, Okhla II, " + android:text="@string/address" android:textColor="#666666" android:textSize="10sp" android:textStyle="normal" /> diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/checkout.png b/GSKMTOrange/src/main/res/mipmap-hdpi/checkout.png new file mode 100644 index 0000000000000000000000000000000000000000..cdf97c68ff37d7d50fb814b2894e1974e4368acd GIT binary patch literal 4085 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 b$oK%JzxTK*R6H@?{1LaYa=?^Z_{9GQ&UOk; literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/mipmap-tr/checkout.png b/GSKMTOrange/src/main/res/mipmap-tr/checkout.png new file mode 100644 index 0000000000000000000000000000000000000000..6aa707a9697a32270e1340538de7b97df9f0b387 GIT binary patch literal 4286 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 literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index 4c6b7b6..64266c5 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -36,6 +36,16 @@ Cancel Yes No + Brand Name + SKU Name + Quantity + Delete + Store Visited + GSK MT ORANGE STORE + C 126, Okhla II, + Click Store Front Image + + Please select language @@ -126,5 +136,30 @@ Photo Additional Visibility Non-Work Reason + Do You Want To Save + Please Add Data + Do You Want To Add + Do You Want To Delete Data + store + Do You Want To Delete + Click Yes To Delete! + Please Select dropdown + Please Take a image + + Please fill sku data + Please enter Quantity + Do you want to save the data + + OK + Please click the image + GPS IS DISABLED... + Click ok to enable GPS. + Please Take Image Before Save + This device is not supported. + Uploading Data + Uploading Geotag Data... + failure + Uploading Geotag Images + success From fa9d3a11366f985c39a05160de0e367675c294ae Mon Sep 17 00:00:00 2001 From: ashishandroid Date: Fri, 13 Jan 2017 18:01:17 +0530 Subject: [PATCH 2/3] newcode --- .../dailyentry/StoreListActivity.java | 78 +++++++++--------- .../src/main/res/layout/storeviewlist.xml | 3 +- .../src/main/res/mipmap-tr/checkout.png | Bin 4286 -> 0 bytes .../main/res/mipmap-xxhdpi/exclamation.png | Bin 0 -> 3121 bytes .../src/main/res/mipmap-xxhdpi/tick.png | Bin 0 -> 4111 bytes 5 files changed, 42 insertions(+), 39 deletions(-) delete mode 100644 GSKMTOrange/src/main/res/mipmap-tr/checkout.png create mode 100644 GSKMTOrange/src/main/res/mipmap-xxhdpi/exclamation.png create mode 100644 GSKMTOrange/src/main/res/mipmap-xxhdpi/tick.png diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java index 6ff18bb..fda1a28 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -11,6 +11,7 @@ import android.preference.PreferenceManager; import android.support.design.widget.FloatingActionButton; import android.support.design.widget.Snackbar; import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.CardView; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.Toolbar; @@ -63,6 +64,7 @@ public class StoreListActivity extends AppCompatActivity { private Dialog dialog; boolean result_flag = false, leaveflag = false; FloatingActionButton fab; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -103,10 +105,7 @@ public class StoreListActivity extends AppCompatActivity { super.onResume(); storelist = db.getStoreData(date); - coverage=db.getCoverageData(date); - - - + coverage = db.getCoverageData(date); if (storelist.size() > 0) { @@ -132,8 +131,6 @@ public class StoreListActivity extends AppCompatActivity { int id = item.getItemId(); - - if (id == android.R.id.home) { // NavUtils.navigateUpFromSameTask(this); @@ -188,35 +185,29 @@ public class StoreListActivity extends AppCompatActivity { viewHolder.imageview.setVisibility(View.INVISIBLE); } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_U)) { viewHolder.imageview.setVisibility(View.VISIBLE); - viewHolder.imageview.setBackgroundResource(R.mipmap.tick_u); + viewHolder.imageview.setBackgroundResource(R.mipmap.tick); viewHolder.chkbtn.setVisibility(View.INVISIBLE); } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_D)) { viewHolder.imageview.setVisibility(View.VISIBLE); - viewHolder.imageview.setBackgroundResource(R.mipmap.tick_d); + viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation); viewHolder.chkbtn.setVisibility(View.INVISIBLE); } else if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_C)) { viewHolder.imageview.setVisibility(View.VISIBLE); - viewHolder.imageview.setBackgroundResource(R.mipmap.tick_c); + viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation); viewHolder.chkbtn.setVisibility(View.INVISIBLE); } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_P)) { viewHolder.imageview.setVisibility(View.VISIBLE); - viewHolder.imageview.setBackgroundResource(R.mipmap.tick_p); + viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation); viewHolder.chkbtn.setVisibility(View.INVISIBLE); } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_L)) { viewHolder.imageview.setVisibility(View.VISIBLE); - viewHolder.imageview.setBackgroundResource(R.mipmap.tickl); + viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation); viewHolder.chkbtn.setVisibility(View.INVISIBLE); - } - else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE)) { + } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE)) { viewHolder.imageview.setVisibility(View.VISIBLE); - viewHolder.imageview.setBackgroundResource(R.mipmap.leave_tick); + viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation); viewHolder.chkbtn.setVisibility(View.INVISIBLE); - } - - - - - else if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_INVALID)) { + } else if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_INVALID)) { if (coverage.size() > 0) { @@ -232,8 +223,10 @@ public class StoreListActivity extends AppCompatActivity { if (storeid.equals(coverage.get(i).getStoreId())) { viewHolder.imageview.setVisibility(View.VISIBLE); - viewHolder.imageview.setBackgroundResource(R.mipmap.checkin); + // viewHolder.imageview.setBackgroundResource(R.mipmap.checkin); viewHolder.chkbtn.setVisibility(View.INVISIBLE); + viewHolder.Cardbtn.setBackgroundColor(getResources().getColor(R.color.green)); + } break; @@ -244,6 +237,8 @@ public class StoreListActivity extends AppCompatActivity { } } } else { + + viewHolder.Cardbtn.setBackgroundColor(getResources().getColor(R.color.colorOrange)); viewHolder.imageview.setVisibility(View.INVISIBLE); viewHolder.chkbtn.setVisibility(View.INVISIBLE); } @@ -269,12 +264,9 @@ public class StoreListActivity extends AppCompatActivity { Snackbar.make(v, R.string.title_store_list_activity_store_again_uploaded, Snackbar.LENGTH_LONG).setAction("Action", null).show(); } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_L)) { Snackbar.make(v, R.string.title_store_list_activity_store_closed, Snackbar.LENGTH_LONG).setAction("Action", null).show(); - } - else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE)) { + } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE)) { Snackbar.make(v, R.string.title_store_list_activity_already_store_closed, Snackbar.LENGTH_LONG).setAction("Action", null).show(); - } - - else { + } else { // PUT IN PREFERENCES editor = preferences.edit(); @@ -322,6 +314,17 @@ public class StoreListActivity extends AppCompatActivity { } } }); + + + viewHolder.chkbtn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + + } + }); + + } @Override @@ -336,6 +339,7 @@ public class StoreListActivity extends AppCompatActivity { RelativeLayout relativelayout; ImageView imageview; Button chkbtn; + CardView Cardbtn; public MyViewHolder(View itemView) { super(itemView); @@ -346,6 +350,8 @@ public class StoreListActivity extends AppCompatActivity { imageview = (ImageView) itemView.findViewById(R.id.imageView2); chkbtn = (Button) itemView.findViewById(R.id.chkout); + Cardbtn = (CardView) itemView.findViewById(R.id.card_view); + } } @@ -366,25 +372,22 @@ public class StoreListActivity extends AppCompatActivity { public void onCheckedChanged(RadioGroup group, int checkedId) { // find which radio button is selected if (checkedId == R.id.yes) { - boolean flag=true; - if(coverage.size()>0) { + boolean flag = true; + if (coverage.size() > 0) { for (int i = 0; i < coverage.size(); i++) { if (store_id.equals(coverage.get(i).getStoreId())) { - flag=false; + flag = false; break; } } } - if(flag==true) - { + if (flag == true) { Intent in = new Intent(StoreListActivity.this, StoreimageActivity.class); startActivity(in); overridePendingTransition(R.anim.activity_in, R.anim.activity_out); dialog.cancel(); - } - else - { - Intent in=new Intent(StoreListActivity.this,CategoryListActivity.class); + } else { + Intent in = new Intent(StoreListActivity.this, CategoryListActivity.class); startActivity(in); overridePendingTransition(R.anim.activity_in, R.anim.activity_out); dialog.cancel(); @@ -407,8 +410,7 @@ public class StoreListActivity extends AppCompatActivity { UpdateStore(store_id); - - Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class); + Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class); startActivity(in); } @@ -428,7 +430,7 @@ public class StoreListActivity extends AppCompatActivity { } else { - Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class); + Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class); startActivity(in); } diff --git a/GSKMTOrange/src/main/res/layout/storeviewlist.xml b/GSKMTOrange/src/main/res/layout/storeviewlist.xml index 8f3af54..7faa727 100644 --- a/GSKMTOrange/src/main/res/layout/storeviewlist.xml +++ b/GSKMTOrange/src/main/res/layout/storeviewlist.xml @@ -63,10 +63,11 @@