diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index bf90e3c..cee619d 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index 982dc07..10fc8c5 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -36,9 +36,11 @@ android { /* versionCode 25 versionName "3.6"*/ - /* //For KSA - versionCode 28 + //For KSA + /* versionCode 28 versionName "4.0"*/ + versionCode 27 + versionName "3.8" //For SA /* versionCode 28 @@ -49,8 +51,8 @@ android { versionName "3.4"*/ //Kenya - versionCode 1 - versionName "1.0" + /* versionCode 2 + versionName "1.1"*/ multiDexEnabled true testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" 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 7d0fc75..37dcbe0 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -95,7 +95,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean; */ public class GSKOrangeDB extends SQLiteOpenHelper { - public static final String DATABASE_NAME = "GSK_ORANGE_DB65"; + public static final String DATABASE_NAME = "GSK_ORANGE_DB66"; public static final int DATABASE_VERSION = 15; TableBean tableBean; private SQLiteDatabase db; @@ -5493,7 +5493,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { //get Sub Category Master public ArrayList getSubCategoryMaster( - String category_id,String store_id) { + String category_id,String store_id,String countery_id) { ArrayList list = new ArrayList<>(); Cursor dbcursor = null; @@ -5502,13 +5502,18 @@ public class GSKOrangeDB extends SQLiteOpenHelper { // dbcursor = db.rawQuery("SELECT * FROM SUB_CATEGORY_MASTER WHERE CATEGORY_ID = '" + category_id + "'", null); //kenya - dbcursor = db.rawQuery("SELECT DISTINCT BR.sub_category_id, SUB_Category FROM SKU_MASTER SK INNER JOIN BRAND_MASTER BR ON SK.BRAND_ID = BR.BRAND_ID " + - "INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID " + - "INNER JOIN CATEGORY_MASTER CA ON SB.CATEGORY_ID = CA.CATEGORY_ID " + - "INNER JOIN " + - "(SELECT DISTINCT SKU_ID FROM MAPPING_STOCK_STOREWISE WHERE STORE_ID = '" + store_id + "') A " + - "ON SK.SKU_ID = A.SKU_ID " + - "WHERE BR.COMPANY_ID =1 AND CA.CATEGORY_ID ='" + category_id + "'", null); + if (countery_id.equalsIgnoreCase("7")||countery_id.equalsIgnoreCase("8")){ + dbcursor = db.rawQuery("SELECT DISTINCT BR.sub_category_id, SUB_Category FROM SKU_MASTER SK INNER JOIN BRAND_MASTER BR ON SK.BRAND_ID = BR.BRAND_ID " + + "INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID " + + "INNER JOIN CATEGORY_MASTER CA ON SB.CATEGORY_ID = CA.CATEGORY_ID " + + "INNER JOIN " + + "(SELECT DISTINCT SKU_ID FROM MAPPING_STOCK_STOREWISE WHERE STORE_ID = '" + store_id + "') A " + + "ON SK.SKU_ID = A.SKU_ID " + + "WHERE BR.COMPANY_ID =1 AND CA.CATEGORY_ID ='" + category_id + "'", null); + }else { + dbcursor = db.rawQuery("SELECT * FROM SUB_CATEGORY_MASTER WHERE CATEGORY_ID = '" + category_id + "'", null); + } + if (dbcursor != null) { dbcursor.moveToFirst(); while (!dbcursor.isAfterLast()) { @@ -5559,7 +5564,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } catch (Exception ex) { - + Log.d("Exception ", " in Insert NO CAMERA " + ex.toString()); } return Data; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java index b508ac5..eaf502a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java @@ -206,8 +206,8 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. mPasswordView.setText("cpm123");*/ //KSA - /* museridView.setText("mohamed.o"); - mPasswordView.setText("cpm@123");*/ + museridView.setText("Esmail.d"); + mPasswordView.setText("cpm@123"); /* museridView.setText("testksa"); mPasswordView.setText("cpm123");*/ @@ -223,8 +223,8 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. //Kenya // museridView.setText("test.Kenya"); - museridView.setText("testkenya"); - mPasswordView.setText("cpm123"); + /* museridView.setText("testkenya"); + mPasswordView.setText("cpm123");*/ mPasswordView.setOnEditorActionListener(new TextView.OnEditorActionListener() { @Override public boolean onEditorAction(TextView textView, int id, KeyEvent keyEvent) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CreateSelfActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CreateSelfActivity.java index 2927c98..08e6805 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CreateSelfActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CreateSelfActivity.java @@ -46,7 +46,7 @@ public class CreateSelfActivity extends AppCompatActivity { GSKOrangeDB db; String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow, store_flag_str; - String categoryName, categoryId; + String categoryName, categoryId,country_id; private SharedPreferences preferences; MSL_AvailabilityStockFacingGetterSetter brand_selected; int number_of_rows=0; @@ -73,6 +73,7 @@ public class CreateSelfActivity extends AppCompatActivity { visit_date = preferences.getString(CommonString.KEY_DATE, null); username = preferences.getString(CommonString.KEY_USERNAME, null); store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null); + country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, ""); //Intent data categoryName = getIntent().getStringExtra("categoryName"); @@ -106,7 +107,7 @@ public class CreateSelfActivity extends AppCompatActivity { added_sub_category_list = new ArrayList<>(); //kenya use - ArrayList sub_category_list = db.getSubCategoryMaster(categoryId,store_id); + ArrayList sub_category_list = db.getSubCategoryMaster(categoryId,store_id,country_id); for(int i=0; i sub_category_list = db.getSubCategoryMaster(categoryId,store_id); + final ArrayList sub_category_list = db.getSubCategoryMaster(categoryId,store_id,country_id); MSL_AvailabilityStockFacingGetterSetter brand = new MSL_AvailabilityStockFacingGetterSetter(); brand.setSub_category("select"); sub_category_list.add(0, brand); 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 ebbafa2..da69587 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 @@ -221,7 +221,7 @@ public class CategoryListActivity extends AppCompatActivity { } else { - final ArrayList sub_category_list = db.getSubCategoryMaster(category_id,store_id); + 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; @@ -626,7 +626,7 @@ public class CategoryListActivity extends AppCompatActivity { } }else { - final ArrayList sub_category_list = db.getSubCategoryMaster(category_id,store_id); + 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;