diff --git a/.idea/caches/deviceStreaming.xml b/.idea/caches/deviceStreaming.xml
deleted file mode 100644
index 8178718..0000000
--- a/.idea/caches/deviceStreaming.xml
+++ /dev/null
@@ -1,787 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/GSKMTOrange/release/HALEON-EGYPT-T.apk b/GSKMTOrange/release/HaleonEgypt-PD-T.apk
similarity index 98%
rename from GSKMTOrange/release/HALEON-EGYPT-T.apk
rename to GSKMTOrange/release/HaleonEgypt-PD-T.apk
index 74fb63a..9718dcc 100644
Binary files a/GSKMTOrange/release/HALEON-EGYPT-T.apk and b/GSKMTOrange/release/HaleonEgypt-PD-T.apk differ
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 debaadd..4656516 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
@@ -115,7 +115,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
try {
db = this.getWritableDatabase();
} catch (Exception e) {
- e.printStackTrace();
+ e.fillInStackTrace();
}
}
@@ -225,9 +225,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.execSQL(TableBean.getTable_ORDER_RECEIVED_STATUS());//--Added 08.12.2022
db.execSQL(TableBean.getAdhocJourneyplanAdditional());//--Added 7.10.2019
db.execSQL(CommonString.CREATE_TABLE_IRPD);
-
+ db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_DATA);
} catch (SQLException e) {
- e.printStackTrace();
+ e.fillInStackTrace();
Toast.makeText(context, "Error -" + e.toString(), Toast.LENGTH_SHORT).show();
}
@@ -7649,7 +7649,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list;
}
} catch (Exception e) {
- e.printStackTrace();
+ e.fillInStackTrace();
return list;
}
@@ -7685,7 +7685,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list;
}
} catch (Exception e) {
- e.printStackTrace();
+ e.fillInStackTrace();
return list;
}
@@ -7893,7 +7893,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list;
}
} catch (Exception e) {
- e.printStackTrace();
+ e.fillInStackTrace();
return list;
}
@@ -7925,7 +7925,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list;
}
} catch (Exception e) {
- e.printStackTrace();
+ e.fillInStackTrace();
return list;
}
@@ -7958,7 +7958,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list;
}
} catch (Exception e) {
- e.printStackTrace();
+ e.fillInStackTrace();
return list;
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
index 52df9f3..1d26a9e 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
@@ -1244,6 +1244,15 @@ public class CommonString {
public static final String TABLE_INSERT_STOCK = "Stock_Data";
+ public static final String CREATE_TABLE_INSERT_STOCK_DATA = "CREATE TABLE IF NOT EXISTS " + TABLE_INSERT_STOCK
+ + " ("
+ + KEY_ID + " INTEGER PRIMARY KEY AUTOINCREMENT ,"
+ + "Store_Id INTEGER, " + KEY_VISIT_DATE + " VARCHAR,"
+ + "Category_Id INTEGER," + "Brand_Id INTEGER,"
+ + "SKU_ID INTEGER," + "SKU VARCHAR," + "SKU_SEQUENCE INTEGER,"
+ + "MBQ INTEGER," + "STOCK INTEGER," + "COMPANY_ID INTEGER," + "TOGGLE_VALUE VARCHAR,"
+ + "MUST_HAVE VARCHAR)";
+
public static final String CREATE_TABLE_INSERT_STOCK_ENTRY = "CREATE TABLE IF NOT EXISTS "
+ TABLE_INSERT_STOCK_ENTRY
+ "("
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 a5009ab..e5f66bd 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
@@ -1,5 +1,6 @@
package cpm.com.gskmtorange.dailyentry;
+import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
@@ -41,6 +42,7 @@ import android.widget.Spinner;
import android.widget.TextView;
import android.widget.ToggleButton;
+import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.cardview.widget.CardView;
@@ -82,7 +84,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
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;
@@ -90,7 +91,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 = "", display_planogram_url="";
+ String brand_name = "", brand_id = "", SKU_name = "", SKU_ID = "", brand_list_name = "", brand_list_id = "", sku_list_name = "", sku_list_id = "", display_planogram_url = "";
public ListView listview;
LinearLayout linearlay;
CardView cardlay;
@@ -104,13 +105,13 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
ArrayList empty_list = new ArrayList<>();
String _pathforcheck1, _pathforcheck2, _pathforcheck3, _path, str, msg;
private SharedPreferences preferences;
- String store_id, date, intime, img_str1="", img_str2="", img_str3="", togglevalue = "1", CATEGORY_ID, camera_allow, store_type_id, class_id, key_account_id;
+ String store_id, date, intime, img_str1 = "", img_str2 = "", img_str3 = "", togglevalue = "1", CATEGORY_ID, camera_allow, store_type_id, class_id, key_account_id;
ImageView img_cam, img_clicked, img_planogram;
Button btn_add, btn_close;
EditText Edt_txt;
MyAdaptorStock adapterData;
ListView listviewlay;
- String errormsg, categoryName, categoryId,country_id, store_flag_str;
+ String errormsg, categoryName, categoryId, country_id, store_flag_str;
MyAdaptorAdditionalStock adapteradditional;
AddittionalGetterSetter adGt, newadd;
LinearLayout brandlayout, diaplylayout, cameralayout;
@@ -139,9 +140,9 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
store_type_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
key_account_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
-
country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, "");
store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null);
+ Log.e("camera_allow", camera_allow + " CountryId - " + country_id);
CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
@@ -188,7 +189,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
///band List
//brand_list = db.getBrandMasterData(store_type_id, class_id,key_account_id,categoryId,store_id);
- brand_list = db.getBrandMasterDataNew(key_account_id,categoryId,store_type_id,class_id);
+ brand_list = db.getBrandMasterDataNew(key_account_id, categoryId, store_type_id, class_id);
BrandMasterGetterSetter brand = new BrandMasterGetterSetter();
String str = getResources().getString(R.string.select);
brand.setBRAND(str);
@@ -223,16 +224,13 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
spinner_sku_list.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView parent, View view, int position, long id) {
-
if (position != 0) {
-
img_planogram.setEnabled(true);
sku_list_name = DisplayMaster_list.get(position).getDISPLAY().get(0);
sku_list_id = DisplayMaster_list.get(position).getDISPLAY_ID().get(0);
display_planogram_url = DisplayMaster_list.get(position).getIMAGE_PATH().get(0) + DisplayMaster_list.get(position).getIMAGE_URL().get(0);
- }
- else {
+ } else {
img_planogram.setEnabled(false);
}
}
@@ -246,7 +244,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
/// maintable
listdata = db.getAdditionalMainStock(store_id, categoryId);
-
for (int k = 0; k < listdata.size(); k++) {
listdata.get(k).setSkuDialogList(db.getDialogStock(listdata.get(k).getKey_id()));
@@ -523,7 +520,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
listdata.add(adGt);
editFlag = true;
- clearViews();
+ clearViews();
//listdata = db.getAdditionalStock(store_id, categoryId);
@@ -769,7 +766,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
alertDialog.show();
- }else {
+ } else {
togglevalue = "0";
btntoggle.setChecked(false);
defdata.clear();
@@ -788,67 +785,55 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
if (camera_allow.equals("1")) {
-
- btnimage.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- _pathforcheck1 = store_id + categoryId + "AdditionalImage1" + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
-
- _path = CommonString.getImagesFolder(context)+ _pathforcheck1;
- intime = CommonFunctions.getCurrentTimeWithLanguage(context);
- startCameraActivity();
-
- }
+ btnimage.setOnClickListener(view -> {
+ _pathforcheck1 = store_id + categoryId + "AdditionalImage1" + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
+ _path = CommonString.getImagesFolder(context) + _pathforcheck1;
+ intime = CommonFunctions.getCurrentTimeWithLanguage(context);
+ startCameraActivity();
});
- btnimage1.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- _pathforcheck2 = store_id + categoryId + "AdditionalImage2" + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
-
- _path = CommonString.getImagesFolder(context)+ _pathforcheck2;
- intime = CommonFunctions.getCurrentTimeWithLanguage(context);
- startCameraActivity();
-
- }
+ btnimage1.setOnClickListener(view -> {
+ _pathforcheck2 = store_id + categoryId + "AdditionalImage2" + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
+ _path = CommonString.getImagesFolder(context) + _pathforcheck2;
+ intime = CommonFunctions.getCurrentTimeWithLanguage(context);
+ startCameraActivity();
});
- btnimage2.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- _pathforcheck3 = store_id + categoryId + "AdditionalImage3" + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
-
- _path = CommonString.getImagesFolder(context)+ _pathforcheck3;
- intime = CommonFunctions.getCurrentTimeWithLanguage(context);
- startCameraActivity();
-
- }
+ btnimage2.setOnClickListener(view -> {
+ _pathforcheck3 = store_id + categoryId + "AdditionalImage3" + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
+ _path = CommonString.getImagesFolder(context) + _pathforcheck3;
+ intime = CommonFunctions.getCurrentTimeWithLanguage(context);
+ startCameraActivity();
});
-
} else {
btnimage.setBackgroundResource(R.mipmap.camera_grey);
btnimage1.setBackgroundResource(R.mipmap.camera_grey);
btnimage2.setBackgroundResource(R.mipmap.camera_grey);
}
+ /// new changes by jp
+ if (camera_allow.equals("1")) {
+ btnimage.setBackgroundResource(country_id.equals("6") ? R.mipmap.camera_orange : R.drawable.camera_orange_star_green);
+ btnimage1.setBackgroundResource(R.mipmap.camera_orange);
+ btnimage2.setBackgroundResource(R.mipmap.camera_orange);
+ } else {
+ btnimage.setBackgroundResource(R.mipmap.camera_grey);
+ btnimage1.setBackgroundResource(R.mipmap.camera_grey);
+ btnimage2.setBackgroundResource(R.mipmap.camera_grey);
+ }
- btnsku.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- showSkuDialog();
- }
- });
-
+ btnsku.setOnClickListener(view -> showSkuDialog());
}
+ @SuppressLint("MissingSuperCall")
@Override
public void onBackPressed() {
//super.onBackPressed();
showDataLostAlert();
}
- void showDataLostAlert(){
- if(editFlag){
+ void showDataLostAlert() {
+ if (editFlag) {
android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(AdditionalVisibility.this);
builder.setTitle("Parinaam");
builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
@@ -867,14 +852,13 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
});
android.app.AlertDialog alert = builder.create();
alert.show();
- }
- else {
+ } else {
finish();
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
}
}
- void clearViews(){
+ void clearViews() {
spinner_brand_list.setSelection(0);
spinner_sku_list.setSelection(0);
img_str1 = "";
@@ -885,29 +869,21 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
sku_list_name = "";
sku_list_id = "";
defdata.clear();
-
btnsku.setBackgroundResource(R.color.colorPrimary);
-
if (camera_allow.equals("1")) {
- btnimage.setBackgroundResource(R.drawable.camera_orange_star_green);
-
+ btnimage.setBackgroundResource(country_id.equals("6") ? R.mipmap.camera_orange : R.drawable.camera_orange_star_green);
btnimage1.setBackgroundResource(R.mipmap.camera_orange);
btnimage2.setBackgroundResource(R.mipmap.camera_orange);
-
} else {
btnimage.setBackgroundResource(R.mipmap.camera_grey);
-
btnimage1.setBackgroundResource(R.mipmap.camera_grey);
btnimage2.setBackgroundResource(R.mipmap.camera_grey);
}
-
}
public void showPlanogram(String planogram_image) {
-
final Dialog dialog = new Dialog(AdditionalVisibility.this);
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
- //dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
dialog.setContentView(R.layout.planogram_dialog_layout);
dialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
dialog.setCancelable(false);
@@ -922,21 +898,12 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
webView.getSettings().setAllowFileAccess(true);
webView.getSettings().setJavaScriptEnabled(true);
webView.getSettings().setBuiltInZoomControls(true);
-
String html = "![](\"")
";
webView.loadDataWithBaseURL("", html, "text/html", "utf-8", "");
-
dialog.show();
-
ImageView cancel = (ImageView) dialog.findViewById(R.id.img_cancel);
- cancel.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- //setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
- dialog.dismiss();
- }
- });
+ cancel.setOnClickListener(v -> dialog.dismiss());
}
@Override
@@ -990,7 +957,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
cdate = arabicToenglish(cdate);
- }else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
+ } else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
cdate = arabicToenglish(cdate);
}
@@ -1035,12 +1002,13 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
}
@Override
- public View getDropDownView(int position, View convertView, ViewGroup parent) {
+ public View getDropDownView(int position, View convertView, @NonNull ViewGroup parent) {
return getCustomView(position, convertView, parent);
}
+ @NonNull
@Override
- public View getView(int position, View convertView, ViewGroup parent) {
+ public View getView(int position, View convertView, @NonNull ViewGroup parent) {
return getCustomView(position, convertView, parent);
}
@@ -1199,7 +1167,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
Log.i("MakeMachine", "startCameraActivity()");
File file = new File(_path);
- outputFileUri = FileProvider.getUriForFile(context, "cpm.com.gskmtorange.fileprovider", file);
+ outputFileUri = FileProvider.getUriForFile(context, "cpm.com.gskmtorange.fileprovider", file);
String defaultCameraPackage = "";
final PackageManager packageManager = getPackageManager();
@@ -1307,7 +1275,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
brandList = db.getBrandT2PData(store_type_id, class_id, key_account_id, categoryId, store_id);
}*/
- if (country_id.equals("7")||country_id.equals("8") ||country_id.equals("11") || country_id.equals("17")) {
+ if (country_id.equals("7") || country_id.equals("8") || country_id.equals("11") || country_id.equals("17")) {
brandList = db.getBrandT2PData(null, null, null, categoryId, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE);
} else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
brandList = db.getBrandT2PData(store_type_id, class_id, key_account_id, categoryId, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC);
@@ -1446,13 +1414,11 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
brand_id = brandList.get(position).getBRAND_ID().get(0);
brand_name = brandList.get(position).getBRAND().get(0);
- if(country_id.equals("7")||country_id.equals("8")||country_id.equals("11") ||country_id.equals("17")){
+ if (country_id.equals("7") || country_id.equals("8") || country_id.equals("11") || country_id.equals("17")) {
sku_list = db.getSkuT2PData(null, null, null, brand_id, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE);
- }
- else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)){
+ } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
sku_list = db.getSkuT2PData(store_type_id, class_id, key_account_id, brand_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC);
- }
- else {
+ } else {
sku_list = db.getSkuT2PData(store_type_id, class_id, key_account_id, brand_id, store_id, CommonString.TABLE_MAPPING_STOCK);
}
@@ -1639,10 +1605,8 @@ 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());
-
holder.qty_bought.setText(list.get(position1).getQuantity());
-
holder.brand.setId(position1);
holder.display.setId(position1);
holder.qty_bought.setId(position1);
@@ -1692,11 +1656,9 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
@Override
public View getView(final int position1, View convertView, ViewGroup parent) {
final ViewHolder holder;
-
if (convertView == null) {
convertView = mInflater.inflate(R.layout.additionallistlayout, null);
holder = new ViewHolder();
-
holder.brand = (TextView) convertView.findViewById(R.id.brand_name);
holder.display = (TextView) convertView.findViewById(R.id.display_name);
holder.qty_bought = (TextView) convertView.findViewById(R.id.qty_bought);
@@ -1708,7 +1670,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
}
holder.delete.setOnClickListener(new View.OnClickListener() {
-
@Override
public void onClick(View v) {
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(AdditionalVisibility.this);
@@ -1802,9 +1763,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
} else if (camera_allow.equals("1")) {
if (!country_id.equals("6") && (imageu == null || imageu.equalsIgnoreCase(""))) {
flag = false;
-
errormsg = getResources().getString(R.string.title_activity_take_image);
-
} else if (skuList.size() == 0) {
errormsg = getResources().getString(R.string.title_activity_fill_sku);
flag = false;
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 925aa51..8f5b43c 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
@@ -1151,34 +1151,32 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
dialog.cancel();
AlertDialog.Builder builder = new AlertDialog.Builder(StoreListActivity.this);
builder.setTitle(getResources().getString(R.string.dialog_title));
- builder.setMessage(R.string.first_geotag_the_store).setCancelable(false).setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog1, int id) {
- editor = preferences.edit();
- editor.putString(CommonString.KEY_STORE_FLAG_FACING_HIDE, current.getFACING_HIDE());
- editor.putString(CommonString.KEY_STORE_ID, current.getSTORE_ID());
- editor.putString(CommonString.KEY_STORE_NAME, current.getSTORE_NAME());
- editor.putString(CommonString.KEY_VISIT_DATE, current.getVISIT_DATE());
- editor.putString(CommonString.KEY_CAMERA_ALLOW, current.getCAMERA_ALLOW());
- editor.putString(CommonString.KEY_CHECKOUT_STATUS, current.getCHECKOUT_STATUS());
- editor.putString(CommonString.KEY_CLASS_ID, current.getCLASS_ID());
- editor.putString(CommonString.KEY_EMP_ID, current.getEMP_ID());
- editor.putString(CommonString.KEY_GEO_TAG, current.getGEO_TAG());
- editor.putString(CommonString.KEY_KEYACCOUNT_ID, current.getKEYACCOUNT_ID());
- editor.putString(CommonString.KEY_STORETYPE_ID, current.getSTORETYPE_ID());
- editor.putString(CommonString.KEY_POG_TYPE_ID, current.getPOG_TYPE_ID());
- editor.putString(CommonString.KEY_UPLOAD_STATUS, current.getUPLOAD_STATUS());
- editor.putString(CommonString.KEY_STORE_FLAG, store_flag_str);
+ builder.setMessage(R.string.first_geotag_the_store).setCancelable(false).setPositiveButton(getResources().getString(R.string.ok), (dialog1, id) -> {
+ editor = preferences.edit();
+ editor.putString(CommonString.KEY_STORE_FLAG_FACING_HIDE, current.getFACING_HIDE());
+ editor.putString(CommonString.KEY_STORE_ID, current.getSTORE_ID());
+ editor.putString(CommonString.KEY_STORE_NAME, current.getSTORE_NAME());
+ editor.putString(CommonString.KEY_VISIT_DATE, current.getVISIT_DATE());
+ editor.putString(CommonString.KEY_CAMERA_ALLOW, current.getCAMERA_ALLOW());
+ editor.putString(CommonString.KEY_CHECKOUT_STATUS, current.getCHECKOUT_STATUS());
+ editor.putString(CommonString.KEY_CLASS_ID, current.getCLASS_ID());
+ editor.putString(CommonString.KEY_EMP_ID, current.getEMP_ID());
+ editor.putString(CommonString.KEY_GEO_TAG, current.getGEO_TAG());
+ editor.putString(CommonString.KEY_KEYACCOUNT_ID, current.getKEYACCOUNT_ID());
+ editor.putString(CommonString.KEY_STORETYPE_ID, current.getSTORETYPE_ID());
+ editor.putString(CommonString.KEY_POG_TYPE_ID, current.getPOG_TYPE_ID());
+ editor.putString(CommonString.KEY_UPLOAD_STATUS, current.getUPLOAD_STATUS());
+ editor.putString(CommonString.KEY_STORE_FLAG, store_flag_str);
- editor.commit();
+ editor.commit();
- Intent in = new Intent(StoreListActivity.this, GeoTagActivity.class);
- in.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
- in.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID());
- in.putExtra(CommonString.KEY_STORE_FLAG_FACING_HIDE, store_facing_hide);
- startActivity(in);
- overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
- dialog1.cancel();
- }
+ Intent in = new Intent(StoreListActivity.this, GeoTagActivity.class);
+ in.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
+ in.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID());
+ in.putExtra(CommonString.KEY_STORE_FLAG_FACING_HIDE, store_facing_hide);
+ startActivity(in);
+ overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+ dialog1.cancel();
});
AlertDialog alert = builder.create();
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 b06ea2f..71dbfe1 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java
@@ -584,22 +584,8 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
protected void startCameraActivity() {
try {
- /*Log.i("MakeMachine", "startCameraActivity()");
- File file = new File(_path);
- Uri outputFileUri = FileProvider.getUriForFile(getApplicationContext(), "cpm.com.gskmtorange.fileprovider", 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);
-
- //android.os.FileUriExposedException: file:///storage/emulated/0/.GSK_MT_ORANGE_IMAGES/15024SI_01022019_120426.jpg exposed beyond app through ClipData.Item.getUri()
- //outputFileUri = FileProvider.getUriForFile(getApplicationContext(), "cpm.com.gskmtorange.fileprovider", file);
-
outputFileUri = FileProvider.getUriForFile(context, "cpm.com.gskmtorange.fileprovider", file);
String defaultCameraPackage = "";
@@ -741,17 +727,6 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
- /*protected void onStart() {
- mGoogleApiClient.connect();
- super.onStart();
- }
-
- protected void onStop() {
- mGoogleApiClient.disconnect();
- super.onStop();
- }*/
-
-
@Override
public void onLocationChanged(Location location) {
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 bf2856b..95c605b 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
@@ -28,6 +28,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import java.util.Objects;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GetterSetter.AddittionalGetterSetter;
@@ -72,12 +73,11 @@ public class CategoryListActivity extends AppCompatActivity {
country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, null);
store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null);
pog_type_id = preferences.getString(CommonString.KEY_POG_TYPE_ID, "");
- if (preferences.getString(CommonString.KEY_VISIT_ID, "") != null) {
- visit_type_id = preferences.getString(CommonString.KEY_VISIT_ID, "");
- }
+ preferences.getString(CommonString.KEY_VISIT_ID, "");
+ visit_type_id = preferences.getString(CommonString.KEY_VISIT_ID, "");
toolbar.setTitle(getResources().getString(R.string.title_activity_category_list));
setSupportActionBar(toolbar);
- getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+ Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab_category);
fab.setOnClickListener(view -> Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG).setAction("Action", null).show());
}
@@ -91,7 +91,6 @@ public class CategoryListActivity extends AppCompatActivity {
Log.e("country_data", country_id + "," + keyAccount_id);
if (country_id.equals("7") || country_id.equals("8") || country_id.equals("17")) {
categoryList = db.getCategoryListData(null, null, null, store_id, "MAPPING_STOCK_STOREWISE");
- Log.d("catlistsize", String.valueOf(categoryList.size()));
} else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
categoryList = db.getCategoryListData(keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC);
} else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_ADDITIONAL)) {
@@ -99,266 +98,52 @@ public class CategoryListActivity extends AppCompatActivity {
} else {
categoryList = db.getCategoryListData(keyAccount_id, storeType_id, class_id, store_id, "MAPPING_STOCK");
}
+
if (categoryList != null && !categoryList.isEmpty()) {
for (int i = 0; i < categoryList.size(); i++) {
- boolean flag_filled = false;
String category_id = categoryList.get(i).getCategory_id();
- if (store_flag_str.equalsIgnoreCase(CommonString.FROM_ADDITIONAL)) {
- db.open();
- boolean flag_mapping_stock = db.isMappingStockDataStockFacing(category_id, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADDITIONAL);
- if (flag_mapping_stock) {
- if (db.checkStockData(store_id, category_id, visit_date)) {
- flag_filled = true;
- } else {
- flag_filled = false;
- }
- }
- } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION) && country_id.equals("2") && visit_type_id.equals("3")) {
- db.open();
- if (db.additionalVisibilitydata(store_id, category_id)) {
- flag_filled = true;
- } else {
- flag_filled = false;
- }
- } else {
- //Additional_Visibility
- if (db.additionalVisibilitydata(store_id, category_id)) {
- boolean flag = true;
- //MSL_Availability
- boolean flag_mapping_stock;
- //New MSL_Availability_StockFacing
- if (country_id.equals("7")) {
- flag_mapping_stock = db.isMappingStockDataStockFacing(category_id, null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE);
- } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
- flag_mapping_stock = db.isMappingStockDataStockFacing(category_id, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC);
- } else {
- flag_mapping_stock = db.isMappingStockDataStockFacing(category_id, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK);
- }
- if (flag_mapping_stock) {
- if (!db.checkMsl_Availability_StockFacingDataNew(store_id, category_id, visit_date)) {
- flag = false;
- }
- }
-
- //Stock_Entry
- boolean flag_stock_mapping_stock;
- if (country_id.equals("10")) {
- flag_stock_mapping_stock = db.isMappingStockDataStockFacing(category_id, null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE);
- } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
- flag_stock_mapping_stock = db.isMappingStockDataStockFacing(category_id, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC);
- } else {
- flag_stock_mapping_stock = db.isMappingStockDataStockFacing(category_id, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK);
- }
- if (flag_stock_mapping_stock) {
- if (!db.checkStock_Entry_FacingDataNew(store_id, category_id, visit_date)) {
- flag = false;
- }
- }
-
- //Promo Compliance
- if (flag) {
- if (country_id.equals("7")) {
- if (db.getPromoComplianceSkuwiseExistsAfterData(store_id, category_id).size() == 0) {
- flag = false;
- }
- } else {
- boolean isMappingPromotion_Flag;
- if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
- isMappingPromotion_Flag = db.isMappingPromotionData(store_id, category_id, CommonString.TABLE_MAPPING_PROMOTION_ADHOC);
- } else {
- isMappingPromotion_Flag = db.isMappingPromotionData(store_id, category_id, CommonString.TABLE_MAPPING_PROMOTION);
- }
- if (isMappingPromotion_Flag) {
- if (!db.checkPromoComplianceData(store_id, category_id)) {
- flag = false;
- }
- }
- }
-
- }
-
- //T2P
- if (flag) {
- boolean flag_t2p_mapping;
- if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
- flag_t2p_mapping = db.isMappingT2PData(store_id, category_id, CommonString.TABLE_MAPPING_T2P_ADHOC);
- } else {
- flag_t2p_mapping = db.isMappingT2PData(store_id, category_id, CommonString.TABLE_MAPPING_T2P);
- }
- if (flag_t2p_mapping) {
- if (!db.isFilledT2P(store_id, category_id)) {
- flag = false;
- }
- }
- }
-
- //Category image
- if (camera_allow.equals("1")) {
- if (!db.isCategoryPictureData(store_id, category_id)) {
- flag = false;
- }
- } else {
- final ArrayList sub_category_list = db.getSubCategoryMaster(category_id, store_id, country_id);
- //if Sub Group Data exists for any Sub Category of the Category
- boolean isSubGroupDataExists = false;
- for (int j = 0; j < sub_category_list.size(); j++) {
- if (db.getSkuGroupMasterData(category_id, sub_category_list.get(j).getSub_category_id()).size() > 0) {
- isSubGroupDataExists = true;
- break;
- }
- }
-
- if (isSubGroupDataExists) {
- if (db.getNoCameraCategoryDataInserted(store_id, category_id, null).size() == 0) {
- flag = false;
- }
- }
- }
-
- //Order Taking Data
- if (country_id.equals("15") || ((country_id.equals("17") && category_id.equals("2")))) {
- if (!db.checkOrder_taking_Data(store_id, category_id)) {
- flag = false;
- }
- }
-
- if (flag) {
- //changed on 23.10.2018
- //ArrayList question_list = getAuditAfterDeletion(category_id);
- //changed on 03.12.2018
- ArrayList question_list = getAuditQnsRemoved(category_id);
- if (question_list.size() > 0) {
- /*if (!country_id.equals("6") && db.getAfterSaveAuditQuestionAnswerData(store_id, category_id).size() == 0) {
- flag = false;
- }*/
- if (db.getAfterSaveAuditQuestionAnswerData(store_id, category_id).size() == 0) {
- flag = false;
- }
- }
- }
-
- //new add UAE pharma
- if (flag) {
- if (db.getSubCategoryMasterForPOG(category_id, storeType_id, pog_type_id, null).size() > 0) {
- if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, category_id).size() == 0) {
- flag = false;
- }
- }
- if (country_id.equals("2")) {
- if (camera_allow.equals("1")) {
- if (db.getSubCategoryMasterForPOG(category_id, storeType_id, pog_type_id, null).size() > 0) {
- if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, category_id).size() == 0) {
- flag = false;
- }
- }
- } else {
- flag = true;
- }
- } else {
- if (db.getSubCategoryMasterForPOG(category_id, storeType_id, pog_type_id, null).size() > 0) {
- if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, category_id).size() == 0) {
- flag = false;
- }
- }
- }
- }
-
- if (flag) {
- //Counterfeit Product Option - Egypt
- if (country_id.equals("6")) {
- if (db.getCounterfeitProductExistsAfterData(store_id, category_id).size() == 0) {
- flag = false;
- }
-
- }
- //usk
- if (country_id.equals("6") && category_id.equals("2")) {
- if (db.getCompetitionPromoExistsAfterData(store_id, category_id).size() == 0) {
- flag = false;
- }
- }
- }
-
- //// IR PD images handling by jp
- ArrayList irList = isPdIRMapping(category_id);
- if (irList != null && !irList.isEmpty() && camera_allow.equals("1")) {
- //flag = db.isFilledIRPDdata(store_id, visit_date, category_id);
- // flag = db.isSOS(store_id, date, CommonString.KEY_COMPELETE);
- flag = db.isSOSCategory(store_id, visit_date, CommonString.KEY_COMPELETE, category_id);
- } else {
- flag = true;
- }
- flag_filled = flag;
- }
- }
-
- if (flag_filled) {
- switch (category_id) {
- case "1":
- categoryList.get(i).setCategory_img(R.mipmap.health_food_drink_tick);
- break;
- case "2":
- categoryList.get(i).setCategory_img(R.mipmap.oralcare_tick);
- break;
- case "3":
- categoryList.get(i).setCategory_img(R.mipmap.wellness_tick);
- break;
- case "4":
- categoryList.get(i).setCategory_img(R.mipmap.nutritionals_tick);
- break;
- case "5":
- categoryList.get(i).setCategory_img(R.mipmap.gastro_n_indigestion_tick);
- break;
- case "6":
- case "10":
- categoryList.get(i).setCategory_img(R.mipmap.cough_n_cold_tick);
- break;
- case "7":
- case "9":
- categoryList.get(i).setCategory_img(R.mipmap.analgesics_tick);
- break;
- case "8":
- categoryList.get(i).setCategory_img(R.mipmap.first_aid_tick);
- break;
- }
- } else {
- switch (category_id) {
- case "1":
- categoryList.get(i).setCategory_img(R.mipmap.health_food_drink);
- break;
- case "2":
- categoryList.get(i).setCategory_img(R.mipmap.oral_care);
- break;
- case "3":
- categoryList.get(i).setCategory_img(R.mipmap.wellness);
- break;
- case "4":
- categoryList.get(i).setCategory_img(R.mipmap.nutritionals);
- break;
- case "5":
- categoryList.get(i).setCategory_img(R.mipmap.gastro_n_indigestion);
- break;
- case "6":
- case "10":
- categoryList.get(i).setCategory_img(R.mipmap.cough_n_cold);
- break;
- case "7":
- case "9":
- categoryList.get(i).setCategory_img(R.mipmap.analgesics);
- break;
- case "8":
- categoryList.get(i).setCategory_img(R.mipmap.first_aid);
- break;
- }
- }
+ boolean flag_filled = isCategoryComplete(category_id);
+ int imageRes = getImageRes(flag_filled, category_id);
+ categoryList.get(i).setCategory_img(imageRes);
}
- adapter = new CategoryListAdapter(CategoryListActivity.this, categoryList);
+ adapter = new CategoryListAdapter(this, categoryList);
recyclerView.setAdapter(adapter);
recyclerView.setLayoutManager(new GridLayoutManager(context, 2));
updateStatus();
}
+
+ }
+
+ private int getImageRes(boolean flag_filled, String category_id) {
+ int imageRes = 0;
+ if (flag_filled) {
+ imageRes = switch (category_id) {
+ case "1" -> R.mipmap.health_food_drink_tick;
+ case "2" -> R.mipmap.oralcare_tick;
+ case "3" -> R.mipmap.wellness_tick;
+ case "4" -> R.mipmap.nutritionals_tick;
+ case "5" -> R.mipmap.gastro_n_indigestion_tick;
+ case "6", "10" -> R.mipmap.cough_n_cold_tick;
+ case "7", "9" -> R.mipmap.analgesics_tick;
+ case "8" -> R.mipmap.first_aid_tick;
+ default -> imageRes;
+ };
+ } else {
+ imageRes = switch (category_id) {
+ case "1" -> R.mipmap.health_food_drink;
+ case "2" -> R.mipmap.oral_care;
+ case "3" -> R.mipmap.wellness;
+ case "4" -> R.mipmap.nutritionals;
+ case "5" -> R.mipmap.gastro_n_indigestion;
+ case "6", "10" -> R.mipmap.cough_n_cold;
+ case "7", "9" -> R.mipmap.analgesics;
+ case "8" -> R.mipmap.first_aid;
+ default -> imageRes;
+ };
+ }
+ return imageRes;
}
ArrayList getAuditAfterDeletion(String category_id) {
@@ -494,6 +279,7 @@ public class CategoryListActivity extends AppCompatActivity {
public void onBindViewHolder(MyViewHolder holder, int position) {
final CategoryGetterSetter categoryData = list.get(position);
holder.categoryName.setText(categoryData.getCategory());
+ Log.e("CatImg--", "" + categoryData.getCategory_img());
holder.categoryIcon.setImageResource(categoryData.getCategory_img());
holder.lay_menu.setOnClickListener(view -> {
Intent intent = new Intent(CategoryListActivity.this, CategoryWisePerformanceActivity.class);
@@ -713,9 +499,8 @@ public class CategoryListActivity extends AppCompatActivity {
}
}
}
- if (flag_filled) {
- db.updateCheckoutStatus(store_id, CommonString.KEY_VALID, CommonString.KEY_JOURNEY_PLAN);
- }
+ db.open();
+ db.updateCheckoutStatus(store_id, flag_filled ? CommonString.KEY_VALID : CommonString.KEY_INVALID, CommonString.KEY_JOURNEY_PLAN);
}
@@ -731,4 +516,128 @@ public class CategoryListActivity extends AppCompatActivity {
return ir_list;
}
+
+ private boolean isCategoryComplete(String category_id) {
+ boolean flag_filled = true;
+
+ if (store_flag_str.equalsIgnoreCase(CommonString.FROM_ADDITIONAL)) {
+ flag_filled = db.isMappingStockDataStockFacing(category_id, keyAccount_id, storeType_id, class_id, store_id,
+ CommonString.TABLE_MAPPING_STOCK_ADDITIONAL)
+ && db.checkStockData(store_id, category_id, visit_date);
+ } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)
+ && country_id.equals("2") && visit_type_id.equals("3")) {
+ db.open();
+ flag_filled = db.additionalVisibilitydata(store_id, category_id);
+
+ } else {
+ db.open();
+ if (!db.additionalVisibilitydata(store_id, category_id)) {
+ return false;
+ }
+ // MSL & Stock Entry
+ if (!validateStk(category_id)) {
+ return false;
+ }
+
+ // T2P
+ if (db.isMappingT2PData(store_id, category_id,
+ store_flag_str.equals(CommonString.FROM_DEVIATION)
+ ? CommonString.TABLE_MAPPING_T2P_ADHOC
+ : CommonString.TABLE_MAPPING_T2P)) {
+ if (!db.isFilledT2P(store_id, category_id)) {
+ return false;
+ }
+ }
+
+ // Camera
+ if (camera_allow.equals("1")) {
+ if (!db.isCategoryPictureData(store_id, category_id)) {
+ return false;
+ }
+ } else {
+ ArrayList sub_category_list =
+ db.getSubCategoryMaster(category_id, store_id, country_id);
+
+ boolean isSubGroupMissing = false;
+ for (MSL_AvailabilityStockFacingGetterSetter subCat : sub_category_list) {
+ if (db.getSkuGroupMasterData(category_id, subCat.getSub_category_id()).isEmpty()) {
+ isSubGroupMissing = true;
+ break;
+ }
+ }
+
+ if (isSubGroupMissing && db.getNoCameraCategoryDataInserted(store_id, category_id, null).isEmpty()) {
+ return false;
+ }
+ }
+
+ // Audit Questions
+ if (!getAuditQnsRemoved(category_id).isEmpty()
+ && db.getAfterSaveAuditQuestionAnswerData(store_id, category_id).isEmpty()) {
+ return false;
+ }
+
+ // POG Upload
+ if (!db.getSubCategoryMasterForPOG(category_id, storeType_id, pog_type_id, null).isEmpty()
+ && db.getAfterSavePOGUploadQuestionAnswerData(store_id, category_id).isEmpty()) {
+ return false;
+ }
+
+ // Egypt - Counterfeit & Promo
+ if (country_id.equals("6")) {
+ if (db.getCounterfeitProductExistsAfterData(store_id, category_id).isEmpty()) {
+ return false;
+ }
+ if (category_id.equals("2") && db.getCompetitionPromoExistsAfterData(store_id, category_id).isEmpty()) {
+ return false;
+ }
+ }
+
+ // Order Taking for country 15
+ if (country_id.equals("15") && !db.checkOrder_taking_Data(store_id, category_id)) {
+ return false;
+ }
+
+ // IR-PD Image Check
+ ArrayList irList = isPdIRMapping(category_id);
+ if (irList != null && !irList.isEmpty() && camera_allow.equals("1")) {
+ if (!db.isFilledIRPDdata(store_id, visit_date, category_id)) {
+ return false;
+ }
+ }
+ }
+
+ return flag_filled;
+ }
+
+
+ private boolean validateStk(String category_id) {
+ boolean flag_filled = true;
+ if (isMappingStockData(category_id)) {
+ if (country_id.equals("10")) {
+ db.open();
+ if (!db.checkStock_Entry_FacingDataNew(store_id, category_id, visit_date)) {
+ flag_filled = false;
+ }
+ } else {
+ if (!db.checkMsl_Availability_StockFacingDataNew(store_id, category_id, visit_date)) {
+ flag_filled = false;
+ }
+ }
+ }
+
+ return flag_filled;
+ }
+
+ boolean isMappingStockData(String categoryId) {
+ boolean flag;
+ if (country_id.equals("7") || country_id.equals("8") || country_id.equals("17")) {
+ flag = db.isMappingStockDataStockFacing(categoryId, null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE);
+ } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
+ flag = db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC);
+ } else {
+ flag = db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK);
+ }
+ return flag;
+ }
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java
index 1fa4257..5c03463 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java
@@ -550,11 +550,9 @@ public class DailyDataMenuActivity extends AppCompatActivity {
} else {
flag_t2p_mapping = db.isMappingT2PData(store_id, categoryId, CommonString.TABLE_MAPPING_T2P);
}
-
if (flag_t2p_mapping) {
if (db.isFilledT2P(store_id, categoryId)) {
ArrayList t2PList = db.getT2pComplianceData(store_id, categoryId);
-
for (int i = 0; i < t2PList.size(); i++) {
if (t2PList.get(i).getPresent() == 1) {
t2p_flag = true;
diff --git a/GSKMTOrange/src/main/res/layout/additionallistlayout.xml b/GSKMTOrange/src/main/res/layout/additionallistlayout.xml
index 2b9eb7b..1fcaedd 100644
--- a/GSKMTOrange/src/main/res/layout/additionallistlayout.xml
+++ b/GSKMTOrange/src/main/res/layout/additionallistlayout.xml
@@ -109,6 +109,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
+ android:visibility="invisible"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="15dp">
diff --git a/library/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties b/library/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties
index 457051c..3575c61 100644
--- a/library/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties
+++ b/library/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Fri Jun 06 19:00:06 IST 2025
+#Tue Jun 24 16:39:12 IST 2025
com.androidbuts.multispinnerfilter.library-main-5\:/layout/textview_for_spinner.xml=D\:\\jeevanp_cpm_projects\\FromRavi\\Haleon_Kenya_pd\\HALEON_KENYA_PD\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\textview_for_spinner.xml
com.androidbuts.multispinnerfilter.library-main-5\:/layout/activity_main.xml=D\:\\jeevanp_cpm_projects\\FromRavi\\Haleon_Kenya_pd\\HALEON_KENYA_PD\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\activity_main.xml
com.androidbuts.multispinnerfilter.library-main-5\:/layout/alert_dialog_listview_search.xml=D\:\\jeevanp_cpm_projects\\FromRavi\\Haleon_Kenya_pd\\HALEON_KENYA_PD\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\alert_dialog_listview_search.xml