diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
deleted file mode 100644
index 207d53a..0000000
Binary files a/.idea/caches/build_file_checksums.ser and /dev/null differ
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
deleted file mode 100644
index 60063de..0000000
Binary files a/.idea/caches/gradle_models.ser and /dev/null differ
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 681f41a..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- xmlns:android
-
- ^$
-
-
-
-
-
-
-
-
- xmlns:.*
-
- ^$
-
-
- BY_NAME
-
-
-
-
-
-
- .*:id
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- .*:name
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- name
-
- ^$
-
-
-
-
-
-
-
-
- style
-
- ^$
-
-
-
-
-
-
-
-
- .*
-
- ^$
-
-
- BY_NAME
-
-
-
-
-
-
- .*
-
- http://schemas.android.com/apk/res/android
-
-
- ANDROID_ATTRIBUTE_ORDER
-
-
-
-
-
-
- .*
-
- .*
-
-
- BY_NAME
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..57263ac
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
new file mode 100644
index 0000000..fc84d4c
--- /dev/null
+++ b/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 15a15b2..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 9a38d6c..27ef209 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,10 +4,8 @@
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 66e6313..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 2caceda..eb2873e 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -11,25 +11,20 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
deleted file mode 100644
index 8b7f4af..0000000
--- a/.idea/kotlinc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
new file mode 100644
index 0000000..f8051a6
--- /dev/null
+++ b/.idea/migrations.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9442416..8fe5d23 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,52 +1,48 @@
-
-
-
\ No newline at end of file
diff --git a/.idea/other.xml b/.idea/other.xml
new file mode 100644
index 0000000..104e542
--- /dev/null
+++ b/.idea/other.xml
@@ -0,0 +1,329 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index e497da9..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle
index 0508ec9..c28f433 100644
--- a/GSKMTOrange/build.gradle
+++ b/GSKMTOrange/build.gradle
@@ -3,12 +3,14 @@ apply plugin: 'com.android.application'
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.firebase.crashlytics'
android {
- compileSdkVersion 30
- buildToolsVersion '29.0.3'
+ compileSdk 34
+ // buildToolsVersion '29.0.3'
useLibrary 'org.apache.http.legacy'
lintOptions {
+ checkReleaseBuilds false
disable 'MissingTranslation'
+ abortOnError false
}
configurations {
@@ -19,52 +21,92 @@ android {
defaultConfig {
applicationId "cpm.com.gskmtorange"
- minSdkVersion 20
+ minSdkVersion 23
targetSdkVersion 29
+ // For Lebanon
+ /*versionCode 1
+ versionName "1.0"*/
+
//For Egypt
- versionCode 30
- versionName "4.1"
+ /*versionCode 35
+ versionName "4.6"*/
//For UAE
- /* versionCode 29
+ /* versionCode 29
versionName "4.1"*/
//For Turkey
- /* versionCode 28
- versionName "4.0"
-*/
+ /* versionCode 34
+ versionName "4.6"*/
+
+ //For Turkey
+ /*versionCode 32
+ versionName "4.4"*/
+
//For KSA
- /* versionCode 27
- versionName "3.9"*/
+ /*versionCode 28
+ versionName "4.0"*/
// aading price facing
/* versionCode 27
versionName "3.8"*/
//sa
- /* versionCode 29
- versionName "4.1"*/
+ /* versionCode 28
+ versionName "3.9"*/
+
//Kenya
- /* versionCode 2
+ /* versionCode 2
versionName "1.1"*/
+
+ //kenya-lite
+ /* versionCode 2
+ versionName "1.1"*/
+
//nigeria
- /* versionCode 1
+ /*versionCode 1
versionName "1.0"*/
//For jordan
- /* versionCode 1
- versionName "1.0"*/
+ versionCode 6
+ versionName "1.5"
//For Kuwait
- /* versionCode 1
+ /*versionCode 1
versionName "1.0"*/
- multiDexEnabled true
+ //For Bahrain
+ /*versionCode 1
+ versionName "1.0"*/
+ //For QATAR
+ /*versionCode 1
+ versionName "1.0"*/
+
+ //For Libya
+ /*versionCode 3
+ versionName "1.2"*/
+
+ //For Oman
+ /*versionCode 1
+ versionName "1.0"*/
+
+ multiDexEnabled true
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
+ /* release {
+ debuggable true
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ debug {
+ minifyEnabled true
+ shrinkResources false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }*/
+
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -88,6 +130,7 @@ dependencies {
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.google.firebase:firebase-auth:20.0.3'
+ implementation 'androidx.activity:activity:1.9.3'
testImplementation 'junit:junit:4.13.1'
implementation 'android.arch.navigation:navigation-fragment:1.0.0'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
@@ -114,6 +157,7 @@ dependencies {
implementation 'com.google.firebase:firebase-crashlytics:17.3.0'
// Recommended: Add the Google Analytics SDK.
implementation 'com.google.firebase:firebase-analytics:18.0.0'
+ implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
}
apply plugin: 'com.google.gms.google-services'
diff --git a/GSKMTOrange/release/GSKMTOrange-egypt-.apk b/GSKMTOrange/release/GSKMTOrange-egypt-.apk
deleted file mode 100644
index 8c281e7..0000000
Binary files a/GSKMTOrange/release/GSKMTOrange-egypt-.apk and /dev/null differ
diff --git a/GSKMTOrange/release/GSKMTOrange-egypt-V-4.0.apk b/GSKMTOrange/release/GSKMTOrange-egypt-V-4.0.apk
deleted file mode 100644
index 892281f..0000000
Binary files a/GSKMTOrange/release/GSKMTOrange-egypt-V-4.0.apk and /dev/null differ
diff --git a/GSKMTOrange/release/GSKMTOrange-egypt_test1.apk b/GSKMTOrange/release/GSKMTOrange-egypt_test1.apk
deleted file mode 100644
index d94a515..0000000
Binary files a/GSKMTOrange/release/GSKMTOrange-egypt_test1.apk and /dev/null differ
diff --git a/GSKMTOrange/release/GSKMTOrange-egypt_test2.apk b/GSKMTOrange/release/GSKMTOrange-egypt_test2.apk
deleted file mode 100644
index ae1e18a..0000000
Binary files a/GSKMTOrange/release/GSKMTOrange-egypt_test2.apk and /dev/null differ
diff --git a/GSKMTOrange/release/GSKMTOrange-egypt_test3.apk b/GSKMTOrange/release/GSKMTOrange-egypt_test3.apk
deleted file mode 100644
index 826fa7c..0000000
Binary files a/GSKMTOrange/release/GSKMTOrange-egypt_test3.apk and /dev/null differ
diff --git a/GSKMTOrange/release/GSKMTOrange-egypt_test4.apk b/GSKMTOrange/release/GSKMTOrange-egypt_test4.apk
deleted file mode 100644
index 716bd61..0000000
Binary files a/GSKMTOrange/release/GSKMTOrange-egypt_test4.apk and /dev/null differ
diff --git a/GSKMTOrange/release/GSKMTOrange-ksa-V-3.8.apk b/GSKMTOrange/release/GSKMTOrange-ksa-V-3.8.apk
deleted file mode 100644
index 1c39410..0000000
Binary files a/GSKMTOrange/release/GSKMTOrange-ksa-V-3.8.apk and /dev/null differ
diff --git a/GSKMTOrange/release/GSKMTOrange-ksa-test.apk b/GSKMTOrange/release/GSKMTOrange-ksa-test.apk
deleted file mode 100644
index fefa741..0000000
Binary files a/GSKMTOrange/release/GSKMTOrange-ksa-test.apk and /dev/null differ
diff --git a/GSKMTOrange/release/Haleon-Jordan-V-1.5-Stock_Entry-release.apk b/GSKMTOrange/release/Haleon-Jordan-V-1.5-Stock_Entry-release.apk
new file mode 100644
index 0000000..1508e80
Binary files /dev/null and b/GSKMTOrange/release/Haleon-Jordan-V-1.5-Stock_Entry-release.apk differ
diff --git a/GSKMTOrange/release/output-metadata.json b/GSKMTOrange/release/output-metadata.json
new file mode 100644
index 0000000..eddde83
--- /dev/null
+++ b/GSKMTOrange/release/output-metadata.json
@@ -0,0 +1,20 @@
+{
+ "version": 3,
+ "artifactType": {
+ "type": "APK",
+ "kind": "Directory"
+ },
+ "applicationId": "cpm.com.gskmtorange",
+ "variantName": "release",
+ "elements": [
+ {
+ "type": "SINGLE",
+ "filters": [],
+ "attributes": [],
+ "versionCode": 6,
+ "versionName": "1.5",
+ "outputFile": "GSKMTOrange-release.apk"
+ }
+ ],
+ "elementType": "File"
+}
\ No newline at end of file
diff --git a/GSKMTOrange/release/output.json b/GSKMTOrange/release/output.json
deleted file mode 100644
index ef14b93..0000000
--- a/GSKMTOrange/release/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":26,"versionName":"3.8","enabled":true,"outputFile":"GSKMTOrange-release.apk","fullName":"release","baseName":"release"},"path":"GSKMTOrange-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/GSKMTOrange/src/debug/res/values/google_maps_api.xml b/GSKMTOrange/src/debug/res/values/google_maps_api.xml
index 27397a5..c24c671 100644
--- a/GSKMTOrange/src/debug/res/values/google_maps_api.xml
+++ b/GSKMTOrange/src/debug/res/values/google_maps_api.xml
@@ -21,4 +21,5 @@
string in this file.
-->
AIzaSyDdgvyAY0_pb-k7PLPJoG6wR-KN0xnhkRE
+
diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml
index 7f0b8a0..6e5ed2e 100644
--- a/GSKMTOrange/src/main/AndroidManifest.xml
+++ b/GSKMTOrange/src/main/AndroidManifest.xml
@@ -1,7 +1,12 @@
+
+
@@ -15,23 +20,55 @@
-
+
+ android:value="true" />
+ tools:replace="android:supportsRtl">
+
+
+
+
+
@@ -87,11 +127,13 @@
@@ -100,6 +142,7 @@
android:screenOrientation="portrait" />
@@ -109,11 +152,13 @@
android:theme="@style/AppTheme.NoActionBar" />
@@ -125,6 +170,7 @@
android:theme="@style/AppTheme.NoActionBar" />
@@ -139,9 +185,9 @@
+ android:theme="@style/AppTheme.NoActionBar"
+ android:windowSoftInputMode="adjustPan" />
@@ -224,7 +271,9 @@
android:screenOrientation="portrait" />
+ android:theme="@style/AppTheme.NoActionBar"
+ android:windowSoftInputMode="adjustPan" />
+
+ t2PGetterSetters;
public GSKOrangeDB(Context context) {
-
super(context, DATABASE_NAME, null, DATABASE_VERSION);
this.context = context;
}
@@ -138,6 +136,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.execSQL(TableBean.getMappingDisplayChecklist());
db.execSQL(TableBean.getMappingAdditionalPromotion());
db.execSQL(TableBean.getMappingPromotion());
+ db.execSQL(TableBean.getTable_VISIT_TYPE_STATUS());
db.execSQL(CommonString.CREATE_TABLE_INSERT_MSL_AVAILABILITY);
db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_ADDITIONAL_VISIBILITY);
@@ -208,6 +207,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
//15-03-2017
db.execSQL(CommonString.CREATE_TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING);
+ db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_ENTRY);
db.execSQL(CommonString.CREATE_TABLE_INSERT_NO_CAMERA_FACING_DATA);
db.execSQL(CommonString.CREATE_TABLE_AUDIT_DATA_SAVE);
db.execSQL(CommonString.CREATE_TABLE_POG_DATA_SAVE);
@@ -238,6 +238,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.execSQL(CommonString.CREATE_TABLE_INSERT_COMPETIOTIONN_PROMO_EXISTS);//--Added 17.12.2019
db.execSQL(CommonString.CREATE_TABLE_COACHING_VISIT_STORE);//--Added 28.06.2021
+
+ db.execSQL(CommonString.CREATE_TABLE_INSERT_ORDER_TAKING_DATA);//--Added 07.12.2022
+ db.execSQL(CommonString.CREATE_TABLE_INSERT_ORDER_RECEIVED_DATA);//--Added 07.12.2022
+ db.execSQL(CommonString.CREATE_TABLE_VISIT_TYPE);//--Added 03.01.2023
+
+ db.execSQL(TableBean.getTable_ORDER_RECEIVED_STATUS());//--Added 08.12.2022
+
db.execSQL(TableBean.getAdhocJourneyplanAdditional());//--Added 7.10.2019
} catch (SQLException e) {
@@ -257,13 +264,14 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
public void deleteTableWithStoreID(String storeid) {
-
db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
db.delete(CommonString.TABLE_INSERT_STOCK_DIALOG_MAIN, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_MAIN, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
db.delete(CommonString.TABLE_INSERT_STOCK_DIALOG, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
-
+ db.delete(CommonString.TABLE_INSERT_ORDER_TAKING_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
+ db.delete(CommonString.TABLE_INSERT_ORDER_RECEIVED_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
+ db.delete(CommonString.TABLE_VISIT_TYPE, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
//Gagan start code
db.delete(CommonString.TABLE_INSERT_MSL_AVAILABILITY, "Store_Id='" + storeid + "'", null);
db.delete(CommonString.TABLE_INSERT_STOCK_FACING_HEADER, "Store_Id='" + storeid + "'", null);
@@ -291,6 +299,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.delete(CommonString.TABLE_INSERT_CATEGORY_PICTURE_LIST, "Store_Id='" + storeid + "'", null);
db.delete(CommonString.TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING, "Store_Id='" + storeid + "'", null);
+ db.delete(CommonString.TABLE_INSERT_STOCK_ENTRY, "Store_Id='" + storeid + "'", null);
db.delete(CommonString.TABLE_INSERT_NO_CAMERA_FACING_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
db.delete(CommonString.TABLE_AUDIT_DATA_SAVE, "STORE_CD" + "='" + storeid + "'", null);
@@ -312,46 +321,53 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
public void deleteAllTables() {
+ try {
+ db.delete(CommonString.TABLE_COVERAGE_DATA, null, null);
+ db.delete(CommonString.TABLE_INSERT_STOCK_DIALOG_MAIN, null, null);
+ db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_MAIN, null, null);
+ db.delete(CommonString.TABLE_INSERT_STOCK_DIALOG, null, null);
+ db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_DATA, null, null);
+ db.delete(CommonString.TABLE_INSERT_ORDER_RECEIVED_DATA, null, null);
+ db.delete(CommonString.TABLE_VISIT_TYPE, null, null);
- db.delete(CommonString.TABLE_COVERAGE_DATA, null, null);
+ //Gagan start code
+ db.delete(CommonString.TABLE_INSERT_MSL_AVAILABILITY, null, null);
+ db.delete(CommonString.TABLE_INSERT_STOCK_FACING_HEADER, null, null);
+ db.delete(CommonString.TABLE_INSERT_STOCK_FACING_CHILD, null, null);
+ db.delete(CommonString.TABLE_INSERT_ADDITIONAL_PROMO_COMPLIANCE, null, null);
+ db.delete(CommonString.TABLE_INSERT_PROMO_SKU, null, null);
+ db.delete(CommonString.TABLE_INSERT_PROMO_SKUWISE, null, null);
+ db.delete(CommonString.TABLE_INSERT_PROMO_SKUWISE_EXISTS, null, null);
+ //Gagan end code
- db.delete(CommonString.TABLE_INSERT_STOCK_DIALOG_MAIN, null, null);
- db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_MAIN, null, null);
- db.delete(CommonString.TABLE_INSERT_STOCK_DIALOG, null, null);
- db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_DATA, null, null);
+ db.delete(CommonString.TABLE_INSERT_T2P_COMPLIANCE, null, null);
- //Gagan start code
- db.delete(CommonString.TABLE_INSERT_MSL_AVAILABILITY, null, null);
- db.delete(CommonString.TABLE_INSERT_STOCK_FACING_HEADER, null, null);
- db.delete(CommonString.TABLE_INSERT_STOCK_FACING_CHILD, null, null);
- db.delete(CommonString.TABLE_INSERT_ADDITIONAL_PROMO_COMPLIANCE, null, null);
- db.delete(CommonString.TABLE_INSERT_PROMO_SKU, null, null);
- db.delete(CommonString.TABLE_INSERT_PROMO_SKUWISE, null, null);
- db.delete(CommonString.TABLE_INSERT_PROMO_SKUWISE_EXISTS, null, null);
- //Gagan end code
+ db.delete(CommonString.TABLE_INSERT_T2P_GAPS, null, null);
+ db.delete(CommonString.TABLE_INSERT_T2P_SKU, null, null);
+ db.delete(CommonString.TABLE_INSERT_BRAND_AVAIBILITY_DATA, null, null);
- db.delete(CommonString.TABLE_INSERT_T2P_COMPLIANCE, null, null);
+ db.delete(CommonString.TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_HEADER, null, null);
+ db.delete(CommonString.TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_CHILD, null, null);
- db.delete(CommonString.TABLE_INSERT_T2P_GAPS, null, null);
- db.delete(CommonString.TABLE_INSERT_T2P_SKU, null, null);
- db.delete(CommonString.TABLE_INSERT_BRAND_AVAIBILITY_DATA, null, null);
+ db.delete(CommonString.TABLE_INSERT_CATEGORY_PICTURE, null, null);
+ db.delete(CommonString.TABLE_INSERT_CATEGORY_PICTURE_LIST, null, null);
+ db.delete(CommonString.TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING, null, null);
+ db.delete(CommonString.TABLE_INSERT_STOCK_ENTRY, null, null);
+ db.delete(CommonString.TABLE_INSERT_NO_CAMERA_FACING_DATA, null, null);
+ db.delete(CommonString.TABLE_AUDIT_DATA_SAVE, null, null);
+ db.delete(CommonString.TABLE_POG_DATA_SAVE, null, null);
+ db.delete(CommonString.TABLE_COACHING_VISIT, null, null);
+ db.delete(CommonString.TABLE_INSERT_COUNTERFEIT_PRODUCT_EXISTS, null, null);
+ db.delete(CommonString.TABLE_INSERT_COUNTERFEIT_PRODUCT, null, null);
+ db.delete(CommonString.TABLE_INSERT_COMPETIOTIONN_PROMO, null, null);
+ db.delete(CommonString.TABLE_INSERT_COMPETIOTIONN_PROMO_EXISTS, null, null);
- db.delete(CommonString.TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_HEADER, null, null);
- db.delete(CommonString.TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_CHILD, null, null);
-
- db.delete(CommonString.TABLE_INSERT_CATEGORY_PICTURE, null, null);
- db.delete(CommonString.TABLE_INSERT_CATEGORY_PICTURE_LIST, null, null);
- db.delete(CommonString.TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING, null, null);
- db.delete(CommonString.TABLE_INSERT_NO_CAMERA_FACING_DATA, null, null);
- db.delete(CommonString.TABLE_AUDIT_DATA_SAVE, null, null);
- db.delete(CommonString.TABLE_POG_DATA_SAVE, null, null);
- db.delete(CommonString.TABLE_COACHING_VISIT, null, null);
- db.delete(CommonString.TABLE_INSERT_COUNTERFEIT_PRODUCT_EXISTS, null, null);
- db.delete(CommonString.TABLE_INSERT_COUNTERFEIT_PRODUCT, null, null);
- db.delete(CommonString.TABLE_INSERT_COMPETIOTIONN_PROMO, null, null);
- db.delete(CommonString.TABLE_INSERT_COMPETIOTIONN_PROMO_EXISTS, null, null);
-
- db.delete(CommonString.TABLE_COACHING_VISIT_STORE, null, null);
+ db.delete(CommonString.TABLE_COACHING_VISIT_STORE, null, null);
+ db.delete(CommonString.TABLE_INSERT_ORDER_TAKING_DATA, null, null);
+ db.delete(CommonString.TABLE_INSERT_STOCK, null, null);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
@@ -408,13 +424,33 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
}
+ public void InsertOrderReceivingStatus(Order_Received_Status_GetterSetter data) {
+ db.delete("ORDER_RECEIVED_STATUS", null, null);
+ ContentValues values = new ContentValues();
+ try {
+ // Log.e("open_storesize", String.valueOf(data.getSTORE_ID().size()));
+ for (int i = 0; i < data.getSTORE_ID().size(); i++) {
+ values.put("STORE_ID", data.getSTORE_ID().get(i));
+ values.put("APP_PONUMBER", data.getAPP_PONUMBER().get(i));
+ values.put("STORE_PONUMBER", data.getSTORE_PONUMBER().get(i));
+ values.put("PO_DATE", data.getPO_DATE().get(i));
+ values.put("CATEGORY_ID", data.getCATEGORY_ID().get(i));
+ values.put("SKU_ID", data.getSKU_ID().get(i));
+ values.put("ORDERQTY", data.getORDERQTY().get(i));
+ values.put("STATUS", data.getSTATUS().get(i));
+ values.put("POID", data.getPOID().get(i));
+ db.insert("ORDER_RECEIVED_STATUS", null, values);
+ }
+ } catch (Exception ex) {
+ Log.d("Exception in JCP", ex.toString());
+ }
+ }
+
public ArrayList getT2PDefaultData(String store_id, String category_id, String tableName) {
ArrayList t2PList = new ArrayList<>();
Cursor dbcursor = null;
-
try {
-
dbcursor = db.rawQuery("Select DISTINCT BM.BRAND As BRAND, BM.BRAND_ID As BRAND_ID, DM.DISPLAY As DISPLAY, " +
"DM.DISPLAY_ID As DISPLAY_ID, DM.IMAGE_URL As IMAGE_URL, DM.IMAGE_PATH As IMAGE_PATH, " +
"T.CATEGORY_FIXTURE As CATEGORY_FIXTURE,T.ALLOW_QTY As ALLOW_QTY from BRAND_MASTER BM INNER JOIN " + tableName + " T " +
@@ -627,10 +663,11 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
public ArrayList getStoreData(String date, String table_name) {
ArrayList list = new ArrayList();
Cursor dbcursor = null;
-
try {
+ /* dbcursor = db.rawQuery("SELECT * from " + table_name +
+ " where VISIT_DATE ='" + date + "' ORDER BY VISIT_ORDER", null);*/
dbcursor = db.rawQuery("SELECT * from " + table_name +
- " where VISIT_DATE ='" + date + "' ORDER BY VISIT_ORDER", null);
+ " where VISIT_DATE ='" + date + "' ORDER BY STORE_NAME COLLATE NOCASE ASC ", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
@@ -710,6 +747,104 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list;
}
+ public ArrayList getVisitType(String date, String table_name) {
+ ArrayList list = new ArrayList();
+ Cursor dbcursor = null;
+ try {
+ dbcursor = db.rawQuery("SELECT * from " + table_name, null);
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ Visit_Type_Master_GetterSetter sb = new Visit_Type_Master_GetterSetter();
+
+ sb.setVISIT_TYPE_ID(dbcursor.getString(dbcursor
+ .getColumnIndexOrThrow("VISIT_TYPE_ID")));
+
+ sb.setVISIT_TYPE((dbcursor.getString(dbcursor
+ .getColumnIndexOrThrow("VISIT_TYPE"))));
+
+ list.add(sb);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+
+ } catch (Exception e) {
+ Log.d("Exception get JCP!", e.toString());
+ return list;
+ }
+
+
+ return list;
+ }
+
+
+ public ArrayList getInsertedVisitType(String storeid, String visitdate, String visittype) {
+ ArrayList list = new ArrayList();
+ Cursor dbcursor = null;
+ try {
+ dbcursor = db.rawQuery("SELECT * from " + CommonString.TABLE_VISIT_TYPE + " WHERE STORE_ID = '" + storeid + "' AND VISIT_DATE = '" + visitdate + "' AND VISIT_TYPE_ID = '" + visittype + "'", null);
+
+ // dbcursor = db.rawQuery("SELECT * from " + CommonString.TABLE_VISIT_TYPE + " WHERE STORE_ID = + storeid + " , null);
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ Visit_Type_Master_GetterSetter sb = new Visit_Type_Master_GetterSetter();
+
+ sb.setVISIT_TYPE_ID(dbcursor.getString(dbcursor
+ .getColumnIndexOrThrow("VISIT_TYPE_ID")));
+
+ /* sb.setVISIT_TYPE((dbcursor.getString(dbcursor
+ .getColumnIndexOrThrow("VISIT_TYPE"))));*/
+
+ list.add(sb);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+
+ } catch (Exception e) {
+ Log.d("Exception get JCP!", e.toString());
+ return list;
+ }
+
+
+ return list;
+ }
+
+ public ArrayList getUploadedVisitType(String storeid) {
+ ArrayList list = new ArrayList();
+ Cursor dbcursor = null;
+ try {
+ dbcursor = db.rawQuery("SELECT * from " + CommonString.TABLE_VISIT_TYPE + " WHERE STORE_ID = '" + storeid + "'", null);
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ Visit_Type_Master_GetterSetter sb = new Visit_Type_Master_GetterSetter();
+
+ sb.setVISIT_TYPE_ID(dbcursor.getString(dbcursor
+ .getColumnIndexOrThrow("VISIT_TYPE_ID")));
+
+ list.add(sb);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+
+ } catch (Exception e) {
+ Log.d("Exception get JCP!", e.toString());
+ return list;
+ }
+
+//
+ return list;
+ }
//insert MAPPING_DISPLAY_CHECKLIST
public void InsertMappingDisplayChecklist(MappingDisplayChecklistGetterSetter data) {
@@ -970,8 +1105,11 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
sb.setCheckOut_Image(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CHECKOUT_IMAGE)));
sb.setFlag_from(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_STORE_FLAG)));
sb.setSub_reasonId(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_SUB_REASON_ID)));
-
-
+ String keyAccountId = dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_KEYACCOUNT_ID));
+ sb.setStoreTypeId((keyAccountId != null && !keyAccountId.equals("0")) ? dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_STORETYPE_ID)) : null);
+ sb.setClassId((keyAccountId != null && !keyAccountId.equals("0")) ? dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CLASS_ID)) : null);
+ sb.setKeyAccountId((keyAccountId != null && !keyAccountId.equals("0")) ? keyAccountId : null);
+ sb.setMappingStk(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_STOCK_MAPPING)));
list.add(sb);
dbcursor.moveToNext();
}
@@ -1070,11 +1208,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
public void InsertMappingStock(MappingStockGetterSetter data, String tableName) {
db.delete(tableName, null, null);
-
ContentValues values = new ContentValues();
try {
for (int i = 0; i < data.getKEYACCOUNT_ID().size(); i++) {
-
values.put("KEYACCOUNT_ID", data.getKEYACCOUNT_ID().get(i));
values.put("STORETYPE_ID", data.getSTORETYPE_ID().get(i));
values.put("CLASS_ID", data.getCLASS_ID().get(i));
@@ -1082,7 +1218,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
values.put("MUST_HAVE", data.getMUST_HAVE().get(i));
values.put("MBQ", data.getMBQ().get(i));
values.put("SHOW_ADDITIONAL_VISIBILITY", data.getSHOW_ADDITIONAL_VISIBILITY().get(i));
-
db.insert(tableName, null, values);
}
} catch (Exception ex) {
@@ -1117,7 +1252,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
Cursor dbcursor = null;
try {
-
if (keyAccountId != null) {
dbcursor = db.rawQuery("Select DISTINCT CA.CATEGORY_ID,CA.CATEGORY " +
"from " + tableName + " M " +
@@ -1276,7 +1410,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
values.put("SKU_SEQUENCE", data.getSku_sequence());
values.put("MBQ", data.getMbq());
values.put("TOGGLE_VALUE", data.getToggleValue());
-
db.insert(CommonString.TABLE_INSERT_MSL_AVAILABILITY, null, values);
}
}
@@ -1640,6 +1773,11 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
values.put(CommonString.KEY_CHECKOUT_IMAGE, data.getCheckOut_Image());
values.put(CommonString.KEY_STORE_FLAG, data.getFlag_from());
+ values.put(CommonString.KEY_KEYACCOUNT_ID, data.getKeyAccountId());
+ values.put(CommonString.KEY_CLASS_ID, data.getClassId());
+ values.put(CommonString.KEY_STORETYPE_ID, data.getStoreTypeId());
+ values.put(CommonString.KEY_STOCK_MAPPING, "");
+
return db.insert(CommonString.TABLE_COVERAGE_DATA, null, values);
} catch (Exception ex) {
@@ -1977,11 +2115,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
public void insertNonWorkingData(NonWorkingReasonGetterSetter data) {
db.delete("NON_WORKING_REASON_NEW", null, null);
ContentValues values = new ContentValues();
-
try {
-
for (int i = 0; i < data.getREASON_ID().size(); i++) {
-
values.put("REASON_ID", Integer.parseInt(data.getREASON_ID().get(i)));
values.put("REASON", data.getREASON().get(i));
values.put("ENTRY_ALLOW", data.getENTRY_ALLOW().get(i));
@@ -3441,7 +3576,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
ArrayList list = new ArrayList<>();
Cursor dbcursor = null;
try {
-
if (store_type_id != null) {
dbcursor = db.rawQuery("SELECT * FROM MAPPING_PLANOGRAM where CATEGORY_ID='" + category_id + "' AND STORETYPE_ID ='" + store_type_id
+ "' AND CLASS_ID ='" + class_id + "'", null);
@@ -3449,7 +3583,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
dbcursor = db.rawQuery("SELECT * FROM MAPPING_PLANOGRAM_STORE_WISE where CATEGORY_ID='" + category_id + "' AND STORE_ID ='" + store_id + "'", null);
}
-
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
@@ -3528,8 +3661,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
- // CoverageBean sb = new CoverageBean();
-
sb.setStoreId(dbcursor.getString(dbcursor
.getColumnIndexOrThrow(CommonString.KEY_STORE_ID)));
sb.setUserId((dbcursor.getString(dbcursor
@@ -3562,7 +3693,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
.getColumnIndexOrThrow(CommonString.KEY_COVERAGE_REMARK))))));
}
- //list.add(sb);
+ String keyAccountId = dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_KEYACCOUNT_ID));
+ sb.setStoreTypeId((keyAccountId != null && !keyAccountId.equals("0")) ? dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_STORETYPE_ID)) : null);
+ sb.setClassId((keyAccountId != null && !keyAccountId.equals("0")) ? dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CLASS_ID)) : null);
+ sb.setKeyAccountId((keyAccountId != null && !keyAccountId.equals("0")) ? keyAccountId : null);
+ sb.setMappingStk(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_STOCK_MAPPING)));
+
dbcursor.moveToNext();
}
dbcursor.close();
@@ -3590,16 +3726,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
}
-
public ArrayList getAdditionalMainStock(String store_id, String categoryId) {
Cursor cursordata = null;
ArrayList productData = new ArrayList();
try {
-
// cursordata = db.rawQuery("SELECT * FROM Stock_Additional_visibility WHERE Store_Id = '"+store_id + "'categoryId = '"+categoryId + "'", null);
cursordata = db.rawQuery("Select * from Stock_Additional_visibility_Main " + "where categoryId='" + categoryId + "' and Store_Id='" + store_id + "'", null);
-
if (cursordata != null) {
cursordata.moveToFirst();
while (!cursordata.isAfterLast()) {
@@ -3658,7 +3791,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
ContentValues values = new ContentValues();
try {
for (int i = 0; i < data.getDISPLAY_ID().size(); i++) {
-
values.put("DISPLAY_ID", data.getDISPLAY_ID().get(i));
values.put("DISPLAY", data.getDISPLAY().get(i));
values.put("IMAGE_PATH", data.getIMAGE_PATH().get(i));
@@ -3676,7 +3808,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
ArrayList Data = new ArrayList();
try {
-
cursordata = db.rawQuery("SELECT * FROM ADDITIONAL_DISPLAY_MASTER WHERE CATEGORY_ID='" + category_id + "'", null);
if (cursordata != null) {
@@ -3749,6 +3880,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
sb.setFlag_from(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_STORE_FLAG)));
sb.setSub_reasonId(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_SUB_REASON_ID)));
+ String keyAccountId = dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_KEYACCOUNT_ID));
+ sb.setStoreTypeId((keyAccountId != null && !keyAccountId.equals("0")) ? dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_STORETYPE_ID)) : null);
+ sb.setClassId((keyAccountId != null && !keyAccountId.equals("0")) ? dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CLASS_ID)) : null);
+ sb.setKeyAccountId((keyAccountId != null && !keyAccountId.equals("0")) ? keyAccountId : null);
+ sb.setMappingStk(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_STOCK_MAPPING)));
+
list.add(sb);
dbcursor.moveToNext();
}
@@ -3865,9 +4002,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
public boolean isMappingStockDataStockFacing(String category_id, String keyAccount_id, String storeType_id, String class_id, String store_id, String tableName) {
boolean filled = false;
Cursor dbcursor = null;
-
try {
-
if (keyAccount_id != null) {
dbcursor = db.rawQuery("Select M.* from " + tableName + " M " +
"inner join SKU_MASTER SK " +
@@ -3895,9 +4030,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
"order by SB.SUB_CATEGORY,BR.BRAND ", null);
}
- //dbcursor = db.rawQuery("SELECT * FROM MAPPING_STOCK ", null);
-
-
if (dbcursor != null) {
dbcursor.moveToFirst();
int icount = dbcursor.getInt(0);
@@ -4013,15 +4145,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
public void InsertMAPPING_SOS_TARGET(MAPPING_SOS_TARGET_MasterGetterSetter data, String tableName) {
db.delete(tableName, null, null);
-
ContentValues values = new ContentValues();
try {
for (int i = 0; i < data.getSTORE_ID().size(); i++) {
-
values.put("STORE_ID", data.getSTORE_ID().get(i));
values.put("BRAND_ID", data.getBRAND_ID().get(i));
values.put("SOS_TARGET", data.getSOS_TARGET().get(i));
-
db.insert(tableName, null, values);
}
} catch (Exception ex) {
@@ -4033,26 +4162,26 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
public ArrayList getBrandAvailbilitydata(String store_id, String category_id, String keyAccount_id, String class_id, String storeType_id, String tableName) {
Cursor cursordata = null;
ArrayList Data = new ArrayList();
-
try {
-
if (keyAccount_id != null) {
- cursordata = db.rawQuery("SELECT DISTINCT BR.BRAND_ID, BR.BRAND FROM SKU_MASTER SK INNER JOIN BRAND_MASTER BR ON SK.BRAND_ID = BR.BRAND_ID " +
+ cursordata = db.rawQuery("SELECT DISTINCT BR.BRAND_ID, BR.BRAND||'('||SB.SUB_CATEGORY||')' as BRAND 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 " + tableName + " WHERE KEYACCOUNT_ID = '" + keyAccount_id + "' AND STORETYPE_ID = '" + storeType_id + "' AND CLASS_ID = '" + class_id + "') A " +
+ "(SELECT DISTINCT SKU_ID FROM " + tableName + " WHERE KEYACCOUNT_ID = '" + keyAccount_id +
+ "' AND STORETYPE_ID = '" + storeType_id + "' AND CLASS_ID = '" + class_id + "') A " +
"ON SK.SKU_ID = A.SKU_ID " +
- "WHERE CA.CATEGORY_ID = '" + category_id + "'", null);
+ "WHERE CA.CATEGORY_ID = '" + category_id + "' AND BR.COMPANY_ID =1", null);
} else {
- cursordata = db.rawQuery("SELECT DISTINCT BR.BRAND_ID, BR.BRAND||'('||SB.SUB_CATEGORY||')' as BRAND FROM SKU_MASTER SK INNER JOIN BRAND_MASTER BR ON SK.BRAND_ID = BR.BRAND_ID " +
+ cursordata = db.rawQuery("SELECT DISTINCT BR.BRAND_ID, BR.BRAND||'('||SB.SUB_CATEGORY||')' as BRAND " +
+ "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);
- // "WHERE CA.CATEGORY_ID = '" + category_id + "'", null);
}
@@ -5123,6 +5252,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
sb.setFlag_from(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_STORE_FLAG)));
+ String keyAccountId = dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_KEYACCOUNT_ID));
+ sb.setStoreTypeId((keyAccountId != null && !keyAccountId.equals("0")) ? dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_STORETYPE_ID)) : null);
+ sb.setClassId((keyAccountId != null && !keyAccountId.equals("0")) ? dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CLASS_ID)) : null);
+ sb.setKeyAccountId((keyAccountId != null && !keyAccountId.equals("0")) ? keyAccountId : null);
+ sb.setMappingStk(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_STOCK_MAPPING)));
+
list.add(sb);
dbcursor.moveToNext();
}
@@ -5210,9 +5345,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
ArrayList list = new ArrayList<>();
Cursor dbcursor = null;
-
try {
-
if (keyAccount_id != null) {
if (store_flag_facing_hide.equals("1")) {
dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID ," +
@@ -5245,7 +5378,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
"where CA.CATEGORY_ID='" + category_id + "' AND M.KEYACCOUNT_ID = '" + keyAccount_id +
"' AND M.STORETYPE_ID = '" + storeType_id + "' AND M.CLASS_ID = '" + class_id + "'" +
"order by SB.SUB_CATEGORY,BR.COMPANY_ID,BR.BRAND", null);
-
}
} else {
dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID ," +
@@ -5261,14 +5393,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
"on SB.CATEGORY_ID=CA.CATEGORY_ID " +
"where CA.CATEGORY_ID='" + category_id + "' AND M.STORE_ID = '" + store_id + "'" +
" order by SB.SUB_CATEGORY_SEQUENCE_SA, BR.BRAND_SEQUENCE_SA", null);
-
}
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
MSL_AvailabilityStockFacingGetterSetter cd = new MSL_AvailabilityStockFacingGetterSetter();
-
cd.setSub_category_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY_ID")));
cd.setSub_category(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY")));
cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_ID")));
@@ -5288,17 +5418,16 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list;
}
- public ArrayList getMSL_Availability_StockFacingSKUData(
- String subCategoryId, String category_id, String brand_id, String keyAccount_id, String storeType_id, String class_id, String store_id, String tableName, String store_flag_facing_hide) {
+ public ArrayList getStockEntryHeaderData(
+ String country_Id,String category_id, String keyAccount_id, String storeType_id, String class_id, String store_id, String tableName, String tableMappingSOS, String store_flag_facing_hide) {
ArrayList list = new ArrayList<>();
Cursor dbcursor = null;
-
try {
-
if (keyAccount_id != null) {
if (store_flag_facing_hide.equals("1")) {
- dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE,ifnull(PE.SUB_CATEGORY_ID,0) as PRICING " +
+ dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID ," +
+ " (SELECT SUM(SOS_TARGET) FROM " + tableMappingSOS + " WHERE STORE_ID = 1 AND BRAND_ID = BR.BRAND_ID)AS SOS_TARGET " +
"from " + tableName + " M " +
"inner join SKU_MASTER SK " +
"on M.SKU_ID=SK.SKU_ID " +
@@ -5306,16 +5435,15 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
"on SK.BRAND_ID=BR.BRAND_ID " +
"inner join SUB_CATEGORY_MASTER SB " +
"on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
- "left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id + "' AND SUB_CATEGORY_ID ='" + subCategoryId + "')AS PE on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
"inner join CATEGORY_MASTER CA " +
"on SB.CATEGORY_ID=CA.CATEGORY_ID " +
- "where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
- "' AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' AND M.STORETYPE_ID = '" + storeType_id + "' AND MUST_HAVE = '" + 1 +
- "' AND M.CLASS_ID = '" + class_id + "' order by M.MUST_HAVE DESC", null);
-
+ "where CA.CATEGORY_ID='" + category_id + "' AND M.KEYACCOUNT_ID = '" + keyAccount_id +
+ "' AND M.STORETYPE_ID = '" + storeType_id + "' AND M.CLASS_ID = '" + class_id + "' AND BR.COMPANY_ID ='"+ 1 + "'" +
+ "order by SB.SUB_CATEGORY,BR.COMPANY_ID,BR.BRAND", null);
} else {
- dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE,ifnull(PE.SUB_CATEGORY_ID,0) as PRICING " +
+ /*dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID ," +
+ " (SELECT SUM(SOS_TARGET) FROM " + tableMappingSOS + " WHERE STORE_ID = 1 AND BRAND_ID = BR.BRAND_ID)AS SOS_TARGET " +
"from " + tableName + " M " +
"inner join SKU_MASTER SK " +
"on M.SKU_ID=SK.SKU_ID " +
@@ -5323,17 +5451,32 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
"on SK.BRAND_ID=BR.BRAND_ID " +
"inner join SUB_CATEGORY_MASTER SB " +
"on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
- "left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id + "' AND SUB_CATEGORY_ID ='" + subCategoryId + "')AS PE on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
"inner join CATEGORY_MASTER CA " +
"on SB.CATEGORY_ID=CA.CATEGORY_ID " +
- "where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
- "' AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' AND M.STORETYPE_ID = '" + storeType_id +
- "' AND M.CLASS_ID = '" + class_id + "' order by M.MUST_HAVE DESC", null);
+ "where CA.CATEGORY_ID='" + category_id + "' AND M.KEYACCOUNT_ID = '" + keyAccount_id +
+ "' AND M.STORETYPE_ID = '" + storeType_id + "' AND M.CLASS_ID = '" + class_id + "'" +
+ "order by SB.SUB_CATEGORY,BR.COMPANY_ID,BR.BRAND", null);*/
+ dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID ," +
+ " (SELECT SUM(SOS_TARGET) FROM " + tableMappingSOS + " WHERE STORE_ID = 1 AND BRAND_ID = BR.BRAND_ID)AS SOS_TARGET " +
+ "from " + tableName + " M " +
+ "inner join SKU_MASTER SK " +
+ "on M.SKU_ID=SK.SKU_ID " +
+ "inner join BRAND_MASTER BR " +
+ "on SK.BRAND_ID=BR.BRAND_ID " +
+ "inner join SUB_CATEGORY_MASTER SB " +
+ "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "inner join CATEGORY_MASTER CA " +
+ "on SB.CATEGORY_ID=CA.CATEGORY_ID " +
+ "where CA.CATEGORY_ID='" + category_id + "' AND M.KEYACCOUNT_ID = '" + keyAccount_id +
+ "' AND M.STORETYPE_ID = '" + storeType_id + "' AND M.CLASS_ID = '" + class_id + "' AND BR.COMPANY_ID ='"+ 1 + "'" +
+ "order by SB.SUB_CATEGORY,BR.COMPANY_ID,BR.BRAND", null);
}
+ }
- } else {
- dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE,ifnull(PE.SUB_CATEGORY_ID,0) as PRICING " +
+ else {
+ dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID ," +
+ " (SELECT SUM(SOS_TARGET) FROM " + tableMappingSOS + " WHERE STORE_ID = 1 AND BRAND_ID = BR.BRAND_ID)AS SOS_TARGET " +
"from MAPPING_STOCK_STOREWISE M " +
"inner join SKU_MASTER SK " +
"on M.SKU_ID=SK.SKU_ID " +
@@ -5341,20 +5484,553 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
"on SK.BRAND_ID=BR.BRAND_ID " +
"inner join SUB_CATEGORY_MASTER SB " +
"on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
- "left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id + "' AND SUB_CATEGORY_ID ='" + subCategoryId + "')AS PE on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
"inner join CATEGORY_MASTER CA " +
"on SB.CATEGORY_ID=CA.CATEGORY_ID " +
- "where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
- "' AND M.STORE_ID = '" + store_id + "' order by SK.SKU_SEQUENCE_SA", null);
-
+ "where CA.CATEGORY_ID='" + category_id + "' AND M.STORE_ID = '" + store_id + "'" +
+ " order by SB.SUB_CATEGORY_SEQUENCE_SA, BR.BRAND_SEQUENCE_SA", null);
}
-
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
MSL_AvailabilityStockFacingGetterSetter cd = new MSL_AvailabilityStockFacingGetterSetter();
+ cd.setSub_category_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY_ID")));
+ cd.setSub_category(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY")));
+ cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_ID")));
+ cd.setBrand(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND")));
+ cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID")));
+ list.add(cd);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+ } catch (Exception e) {
+ Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString());
+ return list;
+ }
+ return list;
+ }
+
+
+
+ public ArrayList getOrderTaking_StockFacingHeaderData(
+ String country_id, String category_id, String keyAccount_id, String storeType_id, String class_id, String store_id, String tableName, String tableMappingSOS, String store_flag_facing_hide) {
+
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+ try {
+ if (keyAccount_id != null) {
+ if (store_flag_facing_hide.equals("1")) {
+ dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID ," +
+ " (SELECT SUM(SOS_TARGET) FROM " + tableMappingSOS + " WHERE STORE_ID = 1 AND BRAND_ID = BR.BRAND_ID)AS SOS_TARGET " +
+ "from " + tableName + " M " +
+ "inner join SKU_MASTER SK " +
+ "on M.SKU_ID=SK.SKU_ID " +
+ "inner join BRAND_MASTER BR " +
+ "on SK.BRAND_ID=BR.BRAND_ID " +
+ "inner join SUB_CATEGORY_MASTER SB " +
+ "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "inner join CATEGORY_MASTER CA " +
+ "on SB.CATEGORY_ID=CA.CATEGORY_ID " +
+ "where CA.CATEGORY_ID='" + category_id + "' AND M.KEYACCOUNT_ID = '" + keyAccount_id +
+ "' AND M.STORETYPE_ID = '" + storeType_id + "' AND M.CLASS_ID = '" + class_id + "' AND MUST_HAVE = '" + 1 + "'" +
+ "order by SB.SUB_CATEGORY,BR.COMPANY_ID,BR.BRAND", null);
+
+ } else {
+ dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID ," +
+ " (SELECT SUM(SOS_TARGET) FROM " + tableMappingSOS + " WHERE STORE_ID = 1 AND BRAND_ID = BR.BRAND_ID)AS SOS_TARGET " +
+ "from " + tableName + " M " +
+ "inner join SKU_MASTER SK " +
+ "on M.SKU_ID=SK.SKU_ID " +
+ "inner join BRAND_MASTER BR " +
+ "on SK.BRAND_ID=BR.BRAND_ID " +
+ "inner join SUB_CATEGORY_MASTER SB " +
+ "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "inner join CATEGORY_MASTER CA " +
+ "on SB.CATEGORY_ID=CA.CATEGORY_ID " +
+ "where CA.CATEGORY_ID='" + category_id + "' AND M.KEYACCOUNT_ID = '" + keyAccount_id +
+ "' AND M.STORETYPE_ID = '" + storeType_id + "' AND M.CLASS_ID = '" + class_id + "'" +
+ "order by SB.SUB_CATEGORY,BR.COMPANY_ID,BR.BRAND", null);
+ }
+ } else {
+ if(country_id.equals("17")){
+ dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID ," +
+ " (SELECT SUM(SOS_TARGET) FROM " + tableMappingSOS + " WHERE STORE_ID = 1 AND BRAND_ID = BR.BRAND_ID)AS SOS_TARGET " +
+ "from MAPPING_STOCK_STOREWISE M " +
+ "inner join SKU_MASTER SK " +
+ "on M.SKU_ID=SK.SKU_ID " +
+ "inner join BRAND_MASTER BR " +
+ "on SK.BRAND_ID=BR.BRAND_ID " +
+ "inner join SUB_CATEGORY_MASTER SB " +
+ "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "inner join CATEGORY_MASTER CA " +
+ "on SB.CATEGORY_ID=CA.CATEGORY_ID " +
+ "where CA.CATEGORY_ID='" + category_id + "' AND M.STORE_ID = '" + store_id + "' AND BR.COMPANY_ID = '" + 1 + "' AND SB.SUB_CATEGORY_ID = '1'" +
+ " order by SB.SUB_CATEGORY_SEQUENCE_SA, BR.BRAND_SEQUENCE_SA", null);
+ }
+ else{
+ dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID ," +
+ " (SELECT SUM(SOS_TARGET) FROM " + tableMappingSOS + " WHERE STORE_ID = 1 AND BRAND_ID = BR.BRAND_ID)AS SOS_TARGET " +
+ "from MAPPING_STOCK_STOREWISE M " +
+ "inner join SKU_MASTER SK " +
+ "on M.SKU_ID=SK.SKU_ID " +
+ "inner join BRAND_MASTER BR " +
+ "on SK.BRAND_ID=BR.BRAND_ID " +
+ "inner join SUB_CATEGORY_MASTER SB " +
+ "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "inner join CATEGORY_MASTER CA " +
+ "on SB.CATEGORY_ID=CA.CATEGORY_ID " +
+ "where CA.CATEGORY_ID='" + category_id + "' AND M.STORE_ID = '" + store_id + "' AND BR.COMPANY_ID = '" + 1 + "'" +
+ " order by SB.SUB_CATEGORY_SEQUENCE_SA, BR.BRAND_SEQUENCE_SA", null);
+ }
+
+
+ }
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ MSL_AvailabilityStockFacingGetterSetter cd = new MSL_AvailabilityStockFacingGetterSetter();
+ cd.setSub_category_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY_ID")));
+ cd.setSub_category(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY")));
+ cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_ID")));
+ cd.setBrand(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND")));
+ cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID")));
+ list.add(cd);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+ } catch (Exception e) {
+ Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString());
+ return list;
+ }
+ return list;
+ }
+
+ public ArrayList getMSL_Availability_StockFacingSKUData(
+ String subCategoryId, String category_id, String brand_id, String keyAccount_id, String storeType_id, String class_id, String store_id,
+ String tableName, String store_flag_facing_hide) {
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+ try {
+ if (keyAccount_id != null) {
+ if (store_flag_facing_hide.equals("1")) {
+ dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE," +
+ "ifnull(PE.SUB_CATEGORY_ID,0) as PRICING " +
+ "from " + tableName + " M " +
+ "inner join SKU_MASTER SK " +
+ "on M.SKU_ID=SK.SKU_ID " +
+ "inner join BRAND_MASTER BR " +
+ "on SK.BRAND_ID=BR.BRAND_ID " +
+ "inner join SUB_CATEGORY_MASTER SB " +
+ "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id +
+ "' AND SUB_CATEGORY_ID ='" + subCategoryId + "')AS PE on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "inner join CATEGORY_MASTER CA " +
+ "on SB.CATEGORY_ID=CA.CATEGORY_ID " +
+ "where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
+ "' AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' AND M.STORETYPE_ID = '" + storeType_id + "' AND MUST_HAVE = '" + 1 +
+ "' AND M.CLASS_ID = '" + class_id + "' order by M.MUST_HAVE DESC", null);
+
+ } else {
+ dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE," +
+ "ifnull(PE.SUB_CATEGORY_ID,0) as PRICING " +
+ "from " + tableName + " M " +
+ "inner join SKU_MASTER SK " +
+ "on M.SKU_ID=SK.SKU_ID " +
+ "inner join BRAND_MASTER BR " +
+ "on SK.BRAND_ID=BR.BRAND_ID " +
+ "inner join SUB_CATEGORY_MASTER SB " +
+ "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id +
+ "' AND SUB_CATEGORY_ID ='" + subCategoryId + "')AS PE on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "inner join CATEGORY_MASTER CA " +
+ "on SB.CATEGORY_ID=CA.CATEGORY_ID " +
+ "where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
+ "' AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' AND M.STORETYPE_ID = '" + storeType_id +
+ "' AND M.CLASS_ID = '" + class_id + "' order by M.MUST_HAVE DESC", null);
+ }
+
+ } else {
+ dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID," +
+ "M.MUST_HAVE,ifnull(PE.SUB_CATEGORY_ID,0) as PRICING " +
+ "from MAPPING_STOCK_STOREWISE M " +
+ "inner join SKU_MASTER SK " +
+ "on M.SKU_ID=SK.SKU_ID " +
+ "inner join BRAND_MASTER BR " +
+ "on SK.BRAND_ID=BR.BRAND_ID " +
+ "inner join SUB_CATEGORY_MASTER SB " +
+ "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id + "' AND SUB_CATEGORY_ID ='"
+ + subCategoryId + "')AS PE on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "inner join CATEGORY_MASTER CA " +
+ "on SB.CATEGORY_ID=CA.CATEGORY_ID " +
+ "where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
+ "' AND M.STORE_ID = '" + store_id + "' order by SK.SKU_SEQUENCE_SA", null);
+ }
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ MSL_AvailabilityStockFacingGetterSetter cd = new MSL_AvailabilityStockFacingGetterSetter();
+ cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
+ cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
+ cd.setMrp(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MRP")));
+ cd.setSku_sequence(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_SEQUENCE")));
+ cd.setMbq(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MBQ")));
+ cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID")));
+ cd.setMust_have(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MUST_HAVE")));
+ cd.setPricing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PRICING")));
+ cd.setToggleValue("1");
+ cd.setFacing("");
+ cd.setStock("");
+ list.add(cd);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+ } catch (Exception e) {
+ Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString());
+ return list;
+ }
+ return list;
+ }
+
+ public ArrayList getMSL_Availability_StockFacingSKUDataNewUpdate(
+ String subCategoryId, String category_id, String brand_id, String keyAccount_id, String storeType_id, String class_id, String store_id,
+ String tableName, String store_flag_facing_hide, String visit_date, boolean stk) {
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+ try {
+ String table = CommonString.TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING;
+ String quary = "SELECT T.*,ifnull(W.FACING,'')as FACING,Ifnull(W.STOCK,'')as STOCK," +
+ "Ifnull(W.PRICING,'')as PRICING," + "Ifnull(W.TOGGLE_VALUE,1)as TOGGLE_VALUE";
+ if (stk) {
+ table = CommonString.TABLE_INSERT_STOCK;
+ quary = "SELECT T.*,Ifnull(W.STOCK,'')as STOCK,Ifnull(W.TOGGLE_VALUE,1)as TOGGLE_VALUE";
+ }
+ if (keyAccount_id != null) {
+ if (store_flag_facing_hide.equals("1")) {
+ ////new query update
+ dbcursor = db.rawQuery(quary +
+ " FROM (" +
+ ////old query
+ "Select DISTINCT BR.BRAND_ID,SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE," +
+ "ifnull(PE.SUB_CATEGORY_ID,0) as PRICING_DEFAULT " +
+ "from " + tableName + " M " +
+ "inner join SKU_MASTER SK " +
+ "on M.SKU_ID=SK.SKU_ID " +
+ "inner join BRAND_MASTER BR " +
+ "on SK.BRAND_ID=BR.BRAND_ID " +
+ "inner join SUB_CATEGORY_MASTER SB " +
+ "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id +
+ "' AND SUB_CATEGORY_ID ='" + subCategoryId + "')AS PE on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "inner join CATEGORY_MASTER CA " +
+ "on SB.CATEGORY_ID=CA.CATEGORY_ID " +
+ "where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
+ "' AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' AND M.STORETYPE_ID = '" + storeType_id + "' AND MUST_HAVE = '" + 1 +
+ "' AND M.CLASS_ID = '" + class_id + "' order by M.MUST_HAVE DESC" +
+ ////new query update
+ ")as T OUTER left join (Select * from " + table + " where category_id='" + category_id +
+ "' and Brand_Id='" + brand_id + "' AND Store_Id='" + store_id + "' AND "
+ + CommonString.KEY_VISIT_DATE + "='" + visit_date + "')W" +
+ " on T.SKU_ID=W.SKU_ID and T.BRAND_ID=W.BRAND_ID", null);
+
+ } else {
+ dbcursor = db.rawQuery(quary +
+ " FROM (" +
+ ////old query
+ "Select DISTINCT BR.BRAND_ID,SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE," +
+ "ifnull(PE.SUB_CATEGORY_ID,0) as PRICING_DEFAULT " +
+ "from " + tableName + " M " +
+ "inner join SKU_MASTER SK " +
+ "on M.SKU_ID=SK.SKU_ID " +
+ "inner join BRAND_MASTER BR " +
+ "on SK.BRAND_ID=BR.BRAND_ID " +
+ "inner join SUB_CATEGORY_MASTER SB " +
+ "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id +
+ "' AND SUB_CATEGORY_ID ='" + subCategoryId + "')AS PE on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "inner join CATEGORY_MASTER CA " +
+ "on SB.CATEGORY_ID=CA.CATEGORY_ID " +
+ "where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
+ "' AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' AND M.STORETYPE_ID = '" + storeType_id +
+ "' AND M.CLASS_ID = '" + class_id + "' order by M.MUST_HAVE DESC" +
+ ////new query update
+ ")as T OUTER left join (Select * from " + table + " where category_id='" + category_id +
+ "' and Brand_Id='" + brand_id + "' AND Store_Id='" + store_id + "'AND " + CommonString.KEY_VISIT_DATE + "='" + visit_date + "')W" +
+ " on T.SKU_ID=W.SKU_ID and T.BRAND_ID=W.BRAND_ID", null);
+ }
+ } else {
+ dbcursor = db.rawQuery(quary +
+ " FROM (" +
+ ////old query
+ "Select DISTINCT BR.BRAND_ID,SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID," +
+ "M.MUST_HAVE,ifnull(PE.SUB_CATEGORY_ID,0) as PRICING_DEFAULT " +
+ "from MAPPING_STOCK_STOREWISE M " +
+ "inner join SKU_MASTER SK " +
+ "on M.SKU_ID=SK.SKU_ID " +
+ "inner join BRAND_MASTER BR " +
+ "on SK.BRAND_ID=BR.BRAND_ID " +
+ "inner join SUB_CATEGORY_MASTER SB " +
+ "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id + "' AND SUB_CATEGORY_ID ='"
+ + subCategoryId + "')AS PE on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "inner join CATEGORY_MASTER CA " +
+ "on SB.CATEGORY_ID=CA.CATEGORY_ID " +
+ "where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
+ "' AND M.STORE_ID = '" + store_id + "' order by SK.SKU_SEQUENCE_SA" +
+ ////new query update
+ ")as T OUTER left join (Select * from " + table + " where category_id='" + category_id +
+ "' and Brand_Id='" + brand_id + "' AND Store_Id='" + store_id + "'AND " + CommonString.KEY_VISIT_DATE + "='" + visit_date + "')W" +
+ " on T.SKU_ID=W.SKU_ID and T.BRAND_ID=W.BRAND_ID", null);
+ }
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ MSL_AvailabilityStockFacingGetterSetter cd = new MSL_AvailabilityStockFacingGetterSetter();
+ cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
+ cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
+ cd.setMrp(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MRP")));
+ cd.setSku_sequence(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_SEQUENCE")));
+ cd.setMbq(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MBQ")));
+ cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID")));
+ cd.setMust_have(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MUST_HAVE")));
+ cd.setPricing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PRICING_DEFAULT")));
+ cd.setToggleValue(dbcursor.getString(dbcursor.getColumnIndexOrThrow("TOGGLE_VALUE")));
+ if (!stk) {
+ cd.setPricingStock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PRICING")));
+ cd.setFacing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("FACING")));
+ }
+ cd.setStock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STOCK")));
+
+ list.add(cd);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+ } catch (Exception e) {
+ Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString());
+ return list;
+ }
+ return list;
+ }
+ public ArrayList getStock_Entry_SKUDataNewUpdate(
+ String subCategoryId, String category_id, String brand_id, String keyAccount_id, String storeType_id, String class_id, String store_id,
+ String tableName, String store_flag_facing_hide, String visit_date, boolean stk) {
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+ try {
+ String table = CommonString.TABLE_INSERT_STOCK_ENTRY;
+ // String table = CommonString.TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING;
+ String quary = "SELECT T.*,ifnull(W.FACING,'')as FACING,Ifnull(W.STOCK,'')as STOCK,Ifnull(W.POSM_STOCK,'')as POSM_STOCK,Ifnull(W.WAREHOUSE_STOCK,'')as WAREHOUSE_STOCK," +
+ "Ifnull(W.PRICING,'')as PRICING," + "Ifnull(W.TOGGLE_VALUE,1)as TOGGLE_VALUE";
+ if (stk) {
+ table = CommonString.TABLE_INSERT_STOCK;
+ quary = "SELECT T.*,Ifnull(W.STOCK,'')as STOCK,Ifnull(W.TOGGLE_VALUE,1)as TOGGLE_VALUE";
+ }
+ if (keyAccount_id != null) {
+ if (store_flag_facing_hide.equals("1")) {
+ ////new query update
+ dbcursor = db.rawQuery(quary +
+ " FROM (" +
+ ////old query
+ "Select DISTINCT BR.BRAND_ID,SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE," +
+ "ifnull(PE.SUB_CATEGORY_ID,0) as PRICING_DEFAULT " +
+ "from " + tableName + " M " +
+ "inner join SKU_MASTER SK " +
+ "on M.SKU_ID=SK.SKU_ID " +
+ "inner join BRAND_MASTER BR " +
+ "on SK.BRAND_ID=BR.BRAND_ID " +
+ "inner join SUB_CATEGORY_MASTER SB " +
+ "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id +
+ "' AND SUB_CATEGORY_ID ='" + subCategoryId + "')AS PE on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "inner join CATEGORY_MASTER CA " +
+ "on SB.CATEGORY_ID=CA.CATEGORY_ID " +
+ "where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
+ "' AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' AND M.STORETYPE_ID = '" + storeType_id + "' AND MUST_HAVE = '" + 1 +
+ "' AND M.CLASS_ID = '" + class_id + "' order by M.MUST_HAVE DESC" +
+ ////new query update
+ ")as T OUTER left join (Select * from " + table + " where category_id='" + category_id +
+ "' and Brand_Id='" + brand_id + "' AND Store_Id='" + store_id + "' AND "
+ + CommonString.KEY_VISIT_DATE + "='" + visit_date + "')W" +
+ " on T.SKU_ID=W.SKU_ID and T.BRAND_ID=W.BRAND_ID", null);
+
+ } else {
+ dbcursor = db.rawQuery(quary +
+ " FROM (" +
+ ////old query
+ "Select DISTINCT BR.BRAND_ID,SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE," +
+ "ifnull(PE.SUB_CATEGORY_ID,0) as PRICING_DEFAULT " +
+ "from " + tableName + " M " +
+ "inner join SKU_MASTER SK " +
+ "on M.SKU_ID=SK.SKU_ID " +
+ "inner join BRAND_MASTER BR " +
+ "on SK.BRAND_ID=BR.BRAND_ID " +
+ "inner join SUB_CATEGORY_MASTER SB " +
+ "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id +
+ "' AND SUB_CATEGORY_ID ='" + subCategoryId + "')AS PE on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "inner join CATEGORY_MASTER CA " +
+ "on SB.CATEGORY_ID=CA.CATEGORY_ID " +
+ "where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
+ "' AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' AND M.STORETYPE_ID = '" + storeType_id +
+ "' AND M.CLASS_ID = '" + class_id + "' order by M.MUST_HAVE DESC" +
+ ////new query update
+ ")as T OUTER left join (Select * from " + table + " where category_id='" + category_id +
+ "' and Brand_Id='" + brand_id + "' AND Store_Id='" + store_id + "'AND " + CommonString.KEY_VISIT_DATE + "='" + visit_date + "')W" +
+ " on T.SKU_ID=W.SKU_ID and T.BRAND_ID=W.BRAND_ID", null);
+ }
+ } else {
+ dbcursor = db.rawQuery(quary +
+ " FROM (" +
+ ////old query
+ "Select DISTINCT BR.BRAND_ID,SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID," +
+ "M.MUST_HAVE,ifnull(PE.SUB_CATEGORY_ID,0) as PRICING_DEFAULT " +
+ "from MAPPING_STOCK_STOREWISE M " +
+ "inner join SKU_MASTER SK " +
+ "on M.SKU_ID=SK.SKU_ID " +
+ "inner join BRAND_MASTER BR " +
+ "on SK.BRAND_ID=BR.BRAND_ID " +
+ "inner join SUB_CATEGORY_MASTER SB " +
+ "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id + "' AND SUB_CATEGORY_ID ='"
+ + subCategoryId + "')AS PE on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "inner join CATEGORY_MASTER CA " +
+ "on SB.CATEGORY_ID=CA.CATEGORY_ID " +
+ "where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
+ "' AND M.STORE_ID = '" + store_id + "' order by SK.SKU_SEQUENCE_SA" +
+ ////new query update
+ ")as T OUTER left join (Select * from " + table + " where category_id='" + category_id +
+ "' and Brand_Id='" + brand_id + "' AND Store_Id='" + store_id + "'AND " + CommonString.KEY_VISIT_DATE + "='" + visit_date + "')W" +
+ " on T.SKU_ID=W.SKU_ID and T.BRAND_ID=W.BRAND_ID", null);
+ }
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ MSL_AvailabilityStockFacingGetterSetter cd = new MSL_AvailabilityStockFacingGetterSetter();
+ cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
+ cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
+ cd.setMrp(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MRP")));
+ cd.setSku_sequence(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_SEQUENCE")));
+ cd.setMbq(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MBQ")));
+ cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID")));
+ cd.setMust_have(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MUST_HAVE")));
+ cd.setPricing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PRICING_DEFAULT")));
+ cd.setToggleValue(dbcursor.getString(dbcursor.getColumnIndexOrThrow("TOGGLE_VALUE")));
+ if (!stk) {
+ cd.setPricingStock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PRICING")));
+ cd.setFacing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("FACING")));
+ }
+ cd.setStock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STOCK")));
+ cd.setPosmStock(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.POSM_STOCK)));
+ cd.setWarehouseStock(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.WAREHOUSE_STOCK)));
+
+ list.add(cd);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+ } catch (Exception e) {
+ Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString());
+ return list;
+ }
+ return list;
+ }
+
+
+ public ArrayList getORDERTAKING_StockFacingSKUData(
+ String subCategoryId, String category_id, String brand_id, String keyAccount_id, String storeType_id, String class_id, String store_id,
+ String tableName, String store_flag_facing_hide) {
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+ try {
+ if (keyAccount_id != null) {
+ if (store_flag_facing_hide.equals("1")) {
+ dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE," +
+ "ifnull(PE.SUB_CATEGORY_ID,0) as PRICING " +
+ "from " + tableName + " M " +
+ "inner join SKU_MASTER SK " +
+ "on M.SKU_ID=SK.SKU_ID " +
+ "inner join BRAND_MASTER BR " +
+ "on SK.BRAND_ID=BR.BRAND_ID " +
+ "inner join SUB_CATEGORY_MASTER SB " +
+ "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id +
+ "' AND SUB_CATEGORY_ID ='" + subCategoryId + "')AS PE on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "inner join CATEGORY_MASTER CA " +
+ "on SB.CATEGORY_ID=CA.CATEGORY_ID " +
+ "where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
+ "' AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' AND M.STORETYPE_ID = '" + storeType_id + "' AND MUST_HAVE = '" + 1 +
+ "' AND M.CLASS_ID = '" + class_id + "' AND BR.COMPANY_ID = '" + 1 + "' order by M.MUST_HAVE DESC", null);
+
+ } else {
+ dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE," +
+ "ifnull(PE.SUB_CATEGORY_ID,0) as PRICING " +
+ "from " + tableName + " M " +
+ "inner join SKU_MASTER SK " +
+ "on M.SKU_ID=SK.SKU_ID " +
+ "inner join BRAND_MASTER BR " +
+ "on SK.BRAND_ID=BR.BRAND_ID " +
+ "inner join SUB_CATEGORY_MASTER SB " +
+ "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id +
+ "' AND SUB_CATEGORY_ID ='" + subCategoryId + "')AS PE on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "inner join CATEGORY_MASTER CA " +
+ "on SB.CATEGORY_ID=CA.CATEGORY_ID " +
+ "where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
+ "' AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' AND M.STORETYPE_ID = '" + storeType_id +
+ "' AND M.CLASS_ID = '" + class_id + "' AND BR.COMPANY_ID = '" + 1 + "' order by M.MUST_HAVE DESC", null);
+ }
+ } else {
+ /*dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID," +
+ "M.MUST_HAVE,ifnull(PE.SUB_CATEGORY_ID,0) as PRICING " +
+ "from MAPPING_STOCK_STOREWISE M " +
+ "inner join SKU_MASTER SK " +
+ "on M.SKU_ID=SK.SKU_ID " +
+ "inner join BRAND_MASTER BR " +
+ "on SK.BRAND_ID=BR.BRAND_ID " +
+ "inner join SUB_CATEGORY_MASTER SB " +
+ "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id + "' AND SUB_CATEGORY_ID ='"
+ + subCategoryId + "')AS PE on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "inner join CATEGORY_MASTER CA " +
+ "on SB.CATEGORY_ID=CA.CATEGORY_ID " +
+ "where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
+ "' AND M.STORE_ID = '" + store_id + "' + order by SK.SKU_SEQUENCE_SA", null);*/
+
+ dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE," +
+ "ifnull(PE.SUB_CATEGORY_ID,0) as PRICING " +
+ "from " + tableName + " M " +
+ "inner join SKU_MASTER SK " +
+ "on M.SKU_ID=SK.SKU_ID " +
+ "inner join BRAND_MASTER BR " +
+ "on SK.BRAND_ID=BR.BRAND_ID " +
+ "inner join SUB_CATEGORY_MASTER SB " +
+ "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id +
+ "' AND SUB_CATEGORY_ID ='" + subCategoryId + "')AS PE on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "inner join CATEGORY_MASTER CA " +
+ "on SB.CATEGORY_ID=CA.CATEGORY_ID " +
+ "where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
+ "' AND M.STORE_ID = '" + store_id + "' AND BR.COMPANY_ID = '" + 1 + "' order by M.MUST_HAVE DESC", null);
+ }
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ MSL_AvailabilityStockFacingGetterSetter cd = new MSL_AvailabilityStockFacingGetterSetter();
cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
cd.setMrp(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MRP")));
@@ -5380,6 +6056,63 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list;
}
+
+ public ArrayList getOrderReceivedSKUData(
+ String subCategoryId, String category_id, String brand_id, String keyAccount_id, String storeType_id, String class_id, String store_id,
+ String tableName, String store_flag_facing_hide) {
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+ try {
+ dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE,OS.ORDERQTY," +
+ "ifnull(PE.SUB_CATEGORY_ID,0) as PRICING " +
+ "from " + tableName + " M " +
+ "inner join SKU_MASTER SK " +
+ "on M.SKU_ID=SK.SKU_ID " +
+ "inner join BRAND_MASTER BR " +
+ "on SK.BRAND_ID=BR.BRAND_ID " +
+ "inner join ORDER_RECEIVED_STATUS OS " +
+ "on SK.SKU_ID=OS.SKU_ID " +
+ "inner join SUB_CATEGORY_MASTER SB " +
+ "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id +
+ "' AND SUB_CATEGORY_ID ='" + subCategoryId + "')AS PE on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+ "inner join CATEGORY_MASTER CA " +
+ "on SB.CATEGORY_ID=CA.CATEGORY_ID " +
+ "where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
+ "' AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' AND M.STORETYPE_ID = '" + storeType_id +
+ "' AND M.CLASS_ID = '" + class_id + "' order by M.MUST_HAVE DESC", null);
+
+ Log.e("cursordata", String.valueOf(dbcursor));
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ MSL_AvailabilityStockFacingGetterSetter cd = new MSL_AvailabilityStockFacingGetterSetter();
+ cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
+ cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
+ cd.setOrderqty(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ORDERQTY")));
+ cd.setFacing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ORDERQTY")));
+ cd.setMrp(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MRP")));
+ cd.setSku_sequence(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_SEQUENCE")));
+ cd.setMbq(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MBQ")));
+ cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID")));
+ cd.setMust_have(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MUST_HAVE")));
+ cd.setPricing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PRICING")));
+ cd.setToggleValue("1");
+ cd.setStock("");
+ list.add(cd);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+ } catch (Exception e) {
+ Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString());
+ return list;
+ }
+ return list;
+ }
+
public ArrayList getMSL_Availability_StockFacingSKU_AfterSaveData(
String category_id, String brand_id, String store_id) {
@@ -5394,7 +6127,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
MSL_AvailabilityStockFacingGetterSetter cd = new MSL_AvailabilityStockFacingGetterSetter();
-
cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
cd.setSku_sequence(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_SEQUENCE")));
@@ -5406,7 +6138,82 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
cd.setMust_have(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MUST_HAVE")));
cd.setPricingStock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PRICING")));
cd.setPricing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PRICING_DEFAULT")));
+ list.add(cd);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+ } catch (Exception e) {
+ Log.d("Exception ", "get MSL_Availability Sku After Save Data!" + e.toString());
+ return list;
+ }
+ return list;
+ }
+ public ArrayList getOrder_TAKING_SKU_AfterSaveData(
+ String category_id, String brand_id, String store_id) {
+
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+
+ try {
+ dbcursor = db.rawQuery("Select * from ORDER_TAKING_DATA " +
+ "where Category_Id='" + category_id + "' and BRAND_ID='" + brand_id + "' AND Store_Id='" + store_id + "'", null);
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ MSL_AvailabilityStockFacingGetterSetter cd = new MSL_AvailabilityStockFacingGetterSetter();
+ cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
+ cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
+ cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_ID")));
+ cd.setSku_sequence(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_SEQUENCE")));
+ cd.setIsExist(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("IsExist")));
+ cd.setSys_PO_No(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Sys_PO_No")));
+ cd.setStore_PO_No(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Store_PO_No")));
+ cd.setPO_Img(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PO_IMAGE")));
+ cd.setPO_Date(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PO_Date")));
+ cd.setFacing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Order_Qty")));
+ cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID")));
+ list.add(cd);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+ } catch (Exception e) {
+ Log.d("Exception ", "get MSL_Availability Sku After Save Data!" + e.toString());
+ return list;
+ }
+ return list;
+ }
+
+ public ArrayList getOrder_RECEIVED_SKU_AfterSaveData(
+ String category_id, String brand_id, String store_id) {
+
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+
+ try {
+ dbcursor = db.rawQuery("Select * from ORDER_RECEIVED_STATUS_DATA " +
+ "where Category_Id='" + category_id + "' and BRAND_ID='" + brand_id + "' AND Store_Id='" + store_id + "'", null);
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ MSL_AvailabilityStockFacingGetterSetter cd = new MSL_AvailabilityStockFacingGetterSetter();
+ cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
+ cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
+ cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_ID")));
+ cd.setSku_sequence(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_SEQUENCE")));
+ cd.setSys_PO_No(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Sys_PO_No")));
+ cd.setStore_PO_No(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Store_PO_No")));
+ cd.setPO_Date(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PO_Date")));
+ cd.setFacing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ACTUAL_Qty")));
+ cd.setOrderqty(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PO_Qty")));
+ cd.setPOID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("POID")));
+ cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID")));
list.add(cd);
dbcursor.moveToNext();
}
@@ -5424,14 +6231,11 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
String storeId, String categoryId, List hashMapListHeaderData,
HashMap> hashMapListChildData) {
ContentValues values = new ContentValues();
-
try {
db.beginTransaction();
for (int i = 0; i < hashMapListHeaderData.size(); i++) {
-
for (int j = 0; j < hashMapListChildData.get(hashMapListHeaderData.get(i)).size(); j++) {
MSL_AvailabilityStockFacingGetterSetter data = hashMapListChildData.get(hashMapListHeaderData.get(i)).get(j);
-
values.put("Store_Id", storeId);
values.put("Category_Id", categoryId);
values.put("Brand_Id", hashMapListHeaderData.get(i).getBrand_id());
@@ -5454,7 +6258,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
} else {
values.put("PRICING", data.getPricingStock());
}
-
db.insert(CommonString.TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING, null, values);
}
}
@@ -5465,6 +6268,242 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
}
+
+ public void InsertMSL_Availability_StockFacingNew(String visit_date,
+ String storeId, String categoryId, List hashMapListHeaderData,
+ HashMap> hashMapListChildData) {
+ db.delete(CommonString.TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING, CommonString.KEY_VISIT_DATE + "<>'" + visit_date + "'", null);
+ ContentValues values = new ContentValues();
+ try {
+ db.beginTransaction();
+ for (int i = 0; i < hashMapListHeaderData.size(); i++) {
+ for (int j = 0; j < hashMapListChildData.get(hashMapListHeaderData.get(i)).size(); j++) {
+ MSL_AvailabilityStockFacingGetterSetter data = hashMapListChildData.get(hashMapListHeaderData.get(i)).get(j);
+ values.put("Store_Id", storeId);
+ values.put("Category_Id", categoryId);
+ values.put(CommonString.KEY_VISIT_DATE, visit_date);
+ values.put("Brand_Id", hashMapListHeaderData.get(i).getBrand_id());
+ values.put("SKU_ID", data.getSku_id());
+ values.put("SKU", data.getSku());
+ values.put("SKU_SEQUENCE", data.getSku_sequence());
+ values.put("MBQ", data.getMbq());
+ values.put("TOGGLE_VALUE", data.getToggleValue());
+ if (data.getFacing().equals("")) {
+ values.put("FACING", "0");
+ } else {
+ values.put("FACING", data.getFacing());
+ }
+ values.put("STOCK", data.getStock());
+ values.put("COMPANY_ID", data.getCompany_id());
+ values.put("MUST_HAVE", data.getMust_have());
+ values.put("PRICING_DEFAULT", data.getPricing());
+ if (data.getPricingStock().equals("")) {
+ values.put("PRICING", "0");
+ } else {
+ values.put("PRICING", data.getPricingStock());
+ }
+ db.insert(CommonString.TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING, null, values);
+ }
+ }
+ db.setTransactionSuccessful();
+ db.endTransaction();
+ } catch (Exception ex) {
+ Log.d("Exception ", " in Insert MSL_Availability_StockFacing " + ex.toString());
+ }
+ }
+
+ public void InsertStock_EntryNew(String visit_date,
+ String storeId, String categoryId, List hashMapListHeaderData,
+ HashMap> hashMapListChildData) {
+ db.delete(CommonString.TABLE_INSERT_STOCK_ENTRY, CommonString.KEY_VISIT_DATE + "<>'" + visit_date + "'", null);
+ ContentValues values = new ContentValues();
+ try {
+ db.beginTransaction();
+ for (int i = 0; i < hashMapListHeaderData.size(); i++) {
+ for (int j = 0; j < hashMapListChildData.get(hashMapListHeaderData.get(i)).size(); j++) {
+ MSL_AvailabilityStockFacingGetterSetter data = hashMapListChildData.get(hashMapListHeaderData.get(i)).get(j);
+ values.put("Store_Id", storeId);
+ values.put("Category_Id", categoryId);
+ values.put(CommonString.KEY_VISIT_DATE, visit_date);
+ values.put("Brand_Id", hashMapListHeaderData.get(i).getBrand_id());
+ values.put("SKU_ID", data.getSku_id());
+ values.put("SKU", data.getSku());
+ values.put("SKU_SEQUENCE", data.getSku_sequence());
+ values.put("MBQ", data.getMbq());
+ values.put("TOGGLE_VALUE", data.getToggleValue());
+ if (data.getFacing().equals("")) {
+ values.put("FACING", "0");
+ } else {
+ values.put("FACING", data.getFacing());
+ }
+ values.put("STOCK", data.getStock());
+ values.put("COMPANY_ID", data.getCompany_id());
+ values.put("MUST_HAVE", data.getMust_have());
+ values.put("PRICING_DEFAULT", data.getPricing());
+ if (data.getPosmStock().equals("")) {
+ values.put(CommonString.POSM_STOCK, "0");
+ } else {
+ values.put(CommonString.POSM_STOCK, data.getPosmStock());
+ }
+ if (data.getWarehouseStock().equals("")) {
+ values.put(CommonString.WAREHOUSE_STOCK, "0");
+ } else {
+ values.put(CommonString.WAREHOUSE_STOCK, data.getWarehouseStock());
+ }
+ if (data.getPricingStock().equals("")) {
+ values.put("PRICING", "0");
+ } else {
+ values.put("PRICING", data.getPricingStock());
+ }
+ db.insert(CommonString.TABLE_INSERT_STOCK_ENTRY, null, values);
+ }
+ }
+ db.setTransactionSuccessful();
+ db.endTransaction();
+ } catch (Exception ex) {
+ Log.d("Exception ", " in Insert MSL_Availability_StockFacing " + ex.toString());
+ }
+ }
+
+ public void InsertOrderTakingData(
+ String img_str, String isExist, String storepo, String sys_po_number, String date, String storeId, String categoryId, List hashMapListHeaderData,
+ HashMap> hashMapListChildData) {
+ ContentValues values = new ContentValues();
+ try {
+ db.beginTransaction();
+ for (int i = 0; i < hashMapListHeaderData.size(); i++) {
+ for (int j = 0; j < hashMapListChildData.get(hashMapListHeaderData.get(i)).size(); j++) {
+ MSL_AvailabilityStockFacingGetterSetter data = hashMapListChildData.get(hashMapListHeaderData.get(i)).get(j);
+ if (isExist.equalsIgnoreCase("yes")) {
+ values.put("IsExist", 1);
+ values.put("Sys_PO_No", sys_po_number);
+ values.put("Store_PO_No", storepo);
+ values.put("PO_IMAGE", img_str);
+ values.put("PO_Date", date);
+ values.put("Store_Id", storeId);
+ values.put("Category_Id", categoryId);
+ values.put("SKU_ID", data.getSku_id());
+ values.put("SKU", data.getSku());
+ values.put("SKU_SEQUENCE", data.getSku_sequence());
+ values.put("BRAND_ID", hashMapListHeaderData.get(i).getBrand_id());
+ values.put("Order_Qty", data.getFacing());
+ values.put("COMPANY_ID", data.getCompany_id());
+ } else {
+ values.put("IsExist", 0);
+ values.put("Sys_PO_No", sys_po_number);
+ values.put("Store_PO_No", "");
+ values.put("PO_Date", "");
+ values.put("PO_IMAGE", "");
+ values.put("Store_Id", storeId);
+ values.put("Category_Id", categoryId);
+ values.put("SKU_ID", data.getSku_id());
+ values.put("SKU", data.getSku());
+ values.put("SKU_SEQUENCE", data.getSku_sequence());
+ values.put("BRAND_ID", hashMapListHeaderData.get(i).getBrand_id());
+ values.put("Order_Qty", "");
+ values.put("COMPANY_ID", data.getCompany_id());
+ }
+ db.insert(CommonString.TABLE_INSERT_ORDER_TAKING_DATA, null, values);
+ }
+ }
+ db.setTransactionSuccessful();
+ db.endTransaction();
+ } catch (Exception ex) {
+ Log.d("Exception ", " in Insert TABLE_INSERT_ORDER_TAKING_DATA " + ex.toString());
+ }
+ }
+
+ public void InsertOrderReceivedStatusData(
+ String POID, String storepo, String sys_po_number, String date, String storeId, String categoryId, List hashMapListHeaderData,
+ HashMap> hashMapListChildData) {
+ ContentValues values = new ContentValues();
+ try {
+ db.beginTransaction();
+ for (int i = 0; i < hashMapListHeaderData.size(); i++) {
+ for (int j = 0; j < hashMapListChildData.get(hashMapListHeaderData.get(i)).size(); j++) {
+ MSL_AvailabilityStockFacingGetterSetter data = hashMapListChildData.get(hashMapListHeaderData.get(i)).get(j);
+ values.put("Sys_PO_No", sys_po_number);
+ values.put("Store_PO_No", storepo);
+ values.put("PO_Date", date);
+ values.put("Store_Id", storeId);
+ values.put("Category_Id", categoryId);
+ values.put("SKU_ID", data.getSku_id());
+ values.put("SKU", data.getSku());
+ values.put("SKU_SEQUENCE", data.getSku_sequence());
+ values.put("BRAND_ID", hashMapListHeaderData.get(i).getBrand_id());
+ values.put("PO_Qty", data.getOrderqty());
+ values.put("ACTUAL_Qty", data.getFacing());
+ values.put("COMPANY_ID", data.getCompany_id());
+ values.put("POID", POID);
+ db.insert(CommonString.TABLE_INSERT_ORDER_RECEIVED_DATA, null, values);
+ }
+ }
+ db.setTransactionSuccessful();
+ db.endTransaction();
+ } catch (Exception ex) {
+ Log.d("Exception ", " in Insert TABLE_INSERT_ORDER_TAKING_DATA " + ex.toString());
+ }
+ }
+
+
+ public void updateOrder_taking_data(
+ String img_str, String isExist, String storepo, String sys_po_number, String date, String storeId, String categoryId, List hashMapListHeaderData,
+ HashMap> hashMapListChildData) {
+
+ ContentValues values = new ContentValues();
+
+ try {
+ db.beginTransaction();
+ for (int i = 0; i < hashMapListHeaderData.size(); i++) {
+ for (int j = 0; j < hashMapListChildData.get(hashMapListHeaderData.get(i)).size(); j++) {
+ MSL_AvailabilityStockFacingGetterSetter data = hashMapListChildData.get(hashMapListHeaderData.get(i)).get(j);
+ if (isExist.equalsIgnoreCase("yes")) {
+ values.put("IsExist", 1);
+ values.put("Order_Qty", data.getFacing());
+ values.put("Store_PO_No", storepo);
+ values.put("PO_IMAGE", img_str);
+ } else {
+ values.put("IsExist", 0);
+ values.put("Order_Qty", "");
+ values.put("Store_PO_No", "");
+ values.put("PO_IMAGE", "");
+ }
+ db.update(CommonString.TABLE_INSERT_ORDER_TAKING_DATA, values,
+ "BRAND_ID ='" + hashMapListHeaderData.get(i).getBrand_id() + "' AND SKU_ID ='" + data.getSku_id() +
+ "' AND Category_Id='" + categoryId + "' AND Store_Id='" + storeId + "'", null);
+ }
+ }
+ db.setTransactionSuccessful();
+ db.endTransaction();
+ } catch (Exception ex) {
+ Log.d("Exception ", " in Insert MSL_Availability_StockFacing " + ex.toString());
+ }
+ }
+
+ public void updateOrder_Received_data(
+ String storepo, String sys_po_number, String date, String storeId, String categoryId, List hashMapListHeaderData,
+ HashMap> hashMapListChildData) {
+ ContentValues values = new ContentValues();
+ try {
+ db.beginTransaction();
+ for (int i = 0; i < hashMapListHeaderData.size(); i++) {
+ for (int j = 0; j < hashMapListChildData.get(hashMapListHeaderData.get(i)).size(); j++) {
+ MSL_AvailabilityStockFacingGetterSetter data = hashMapListChildData.get(hashMapListHeaderData.get(i)).get(j);
+ values.put("ACTUAL_Qty", data.getFacing());
+ values.put("Store_PO_No", storepo);
+
+ db.update(CommonString.TABLE_INSERT_ORDER_RECEIVED_DATA, values,
+ "BRAND_ID ='" + hashMapListHeaderData.get(i).getBrand_id() + "' AND SKU_ID ='" + data.getSku_id() +
+ "' AND Category_Id='" + categoryId + "' AND Store_Id='" + storeId + "'", null);
+ }
+ }
+ db.setTransactionSuccessful();
+ db.endTransaction();
+ } catch (Exception ex) {
+ Log.d("Exception ", " in Insert MSL_Availability_StockFacing " + ex.toString());
+ }
+ }
+
public void updateMSL_Availability_StockFacing(
String storeId, String categoryId, List hashMapListHeaderData,
HashMap> hashMapListChildData) {
@@ -5505,6 +6544,92 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
}
+ public void updateMSL_Availability_StockFacingNew(String visit_date,
+ String storeId, String categoryId, List hashMapListHeaderData,
+ HashMap> hashMapListChildData) {
+
+ ContentValues values = new ContentValues();
+
+ try {
+ db.beginTransaction();
+ for (int i = 0; i < hashMapListHeaderData.size(); i++) {
+
+ for (int j = 0; j < hashMapListChildData.get(hashMapListHeaderData.get(i)).size(); j++) {
+ MSL_AvailabilityStockFacingGetterSetter data = hashMapListChildData.get(hashMapListHeaderData.get(i)).get(j);
+
+ values.put("TOGGLE_VALUE", data.getToggleValue());
+ values.put("STOCK", data.getStock());
+ values.put("PRICING_DEFAULT", data.getPricing());
+
+ if (data.getFacing().equals("")) {
+ values.put("FACING", "0");
+ } else {
+ values.put("FACING", data.getFacing());
+ }
+ if (data.getPricingStock().equals("")) {
+ values.put("PRICING", "0");
+ } else {
+ values.put("PRICING", data.getPricingStock());
+ }
+
+ db.update(CommonString.TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING, values,
+ "Brand_Id ='" + hashMapListHeaderData.get(i).getBrand_id() + "' AND SKU_ID ='" + data.getSku_id() +
+ "' AND Category_Id='" + categoryId + "' AND Store_Id='" + storeId +
+ "'AND " + CommonString.KEY_VISIT_DATE + "='" + visit_date + "'", null);
+ }
+ }
+ db.setTransactionSuccessful();
+ db.endTransaction();
+ } catch (Exception ex) {
+ Log.d("Exception ", " in Insert MSL_Availability_StockFacing " + ex.toString());
+ }
+ }
+
+ public void updateStock_Entry_FacingNew(String visit_date,
+ String storeId, String categoryId, List hashMapListHeaderData,
+ HashMap> hashMapListChildData) {
+
+ ContentValues values = new ContentValues();
+
+ try {
+ db.beginTransaction();
+ for (int i = 0; i < hashMapListHeaderData.size(); i++) {
+
+ for (int j = 0; j < hashMapListChildData.get(hashMapListHeaderData.get(i)).size(); j++) {
+ MSL_AvailabilityStockFacingGetterSetter data = hashMapListChildData.get(hashMapListHeaderData.get(i)).get(j);
+
+ values.put("TOGGLE_VALUE", data.getToggleValue());
+ values.put("STOCK", data.getStock());
+ values.put("PRICING_DEFAULT", data.getPricing());
+ values.put(CommonString.POSM_STOCK, data.getPosmStock());
+ values.put(CommonString.WAREHOUSE_STOCK, data.getWarehouseStock());
+
+ if (data.getFacing().equals("")) {
+ values.put("FACING", "0");
+ } else {
+ values.put("FACING", data.getFacing());
+ }
+ if (data.getPricingStock().equals("")) {
+ values.put("PRICING", "0");
+ } else {
+ values.put("PRICING", data.getPricingStock());
+ }
+
+ db.update(CommonString.TABLE_INSERT_STOCK_ENTRY, values,
+ "Brand_Id ='" + hashMapListHeaderData.get(i).getBrand_id() + "' AND SKU_ID ='" + data.getSku_id() +
+ "' AND Category_Id='" + categoryId + "' AND Store_Id='" + storeId +
+ "'AND " + CommonString.KEY_VISIT_DATE + "='" + visit_date + "'", null);
+ }
+ }
+ db.setTransactionSuccessful();
+ db.endTransaction();
+ } catch (Exception ex) {
+ Log.d("Exception ", " in Insert STOCK_ENTRY " + ex.toString());
+ }
+ }
+
+
+
@SuppressLint("LongLogTag")
public boolean checkMsl_Availability_StockFacingData(String store_id, String category_id) {
Log.d("MSL_Availability ", "Stock data--------------->Start<------------");
@@ -5537,6 +6662,135 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return false;
}
+ @SuppressLint("LongLogTag")
+ public boolean checkMsl_Availability_StockFacingDataNew(String store_id, String category_id, String visit_date) {
+ Log.d("MSL_Availability ", "Stock data--------------->Start<------------");
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+
+ try {
+ dbcursor = db.rawQuery("Select * from Msl_Availability_Stock_Facing_Data " +
+ "where category_id='" + category_id + "' and Store_Id='" + store_id + "'AND "
+ + CommonString.KEY_VISIT_DATE + "='" + visit_date + "'", null);
+
+ if (dbcursor != null) {
+ if (dbcursor.moveToFirst()) {
+ do {
+ MSL_AvailabilityStockFacingGetterSetter sb = new MSL_AvailabilityStockFacingGetterSetter();
+ sb.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
+ list.add(sb);
+ } while (dbcursor.moveToNext());
+ }
+ dbcursor.close();
+
+ return list.size() > 0;
+ }
+ } catch (Exception e) {
+ Log.d("Exception ", "when fetching Records!!!!!!!!!!!!!!!!!!!!!" + e.toString());
+ return false;
+ }
+
+ Log.d("MSL_Availability_StockFacing ", "midday---------------------->Stop<-----------");
+ return false;
+ }
+
+ @SuppressLint("LongLogTag")
+ public boolean checkStock_Entry_FacingDataNew(String store_id, String category_id, String visit_date) {
+ Log.d("MSL_Availability ", "Stock data--------------->Start<------------");
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+
+ try {
+ dbcursor = db.rawQuery("Select * from STOCK_ENTRY " +
+ "where category_id='" + category_id + "' and Store_Id='" + store_id + "'AND "
+ + CommonString.KEY_VISIT_DATE + "='" + visit_date + "'", null);
+
+ if (dbcursor != null) {
+ if (dbcursor.moveToFirst()) {
+ do {
+ MSL_AvailabilityStockFacingGetterSetter sb = new MSL_AvailabilityStockFacingGetterSetter();
+ sb.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
+ list.add(sb);
+ } while (dbcursor.moveToNext());
+ }
+ dbcursor.close();
+
+ return list.size() > 0;
+ }
+ } catch (Exception e) {
+ Log.d("Exception ", "when fetching Records!!!!!!!!!!!!!!!!!!!!!" + e.toString());
+ return false;
+ }
+
+ Log.d("STOCK_ENTRY ", "midday---------------------->Stop<-----------");
+ return false;
+ }
+
+
+ @SuppressLint("LongLogTag")
+ public boolean checkOrder_taking_Data(String store_id, String category_id) {
+ Log.d("ORDER_TAKING_DATA ", "Stock data--------------->Start<------------");
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+
+ try {
+ dbcursor = db.rawQuery("Select * from ORDER_TAKING_DATA " +
+ "where category_id='" + category_id + "' and Store_Id='" + store_id + "'", null);
+
+ if (dbcursor != null) {
+ if (dbcursor.moveToFirst()) {
+ do {
+ MSL_AvailabilityStockFacingGetterSetter sb = new MSL_AvailabilityStockFacingGetterSetter();
+
+ sb.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
+ list.add(sb);
+ } while (dbcursor.moveToNext());
+ }
+ dbcursor.close();
+
+ return list.size() > 0;
+ }
+ } catch (Exception e) {
+ Log.d("Exception ", "when fetching Records!!!!!!!!!!!!!!!!!!!!!" + e.toString());
+ return false;
+ }
+
+ Log.d("ORDER_TAKING_DATA ", "midday---------------------->Stop<-----------");
+ return false;
+ }
+
+ @SuppressLint("LongLogTag")
+ public boolean checkOrder_Received_Data(String store_id, String category_id) {
+ Log.d("ORDER_TAKING_DATA ", "Stock data--------------->Start<------------");
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+
+ try {
+ dbcursor = db.rawQuery("Select * from ORDER_RECEIVED_STATUS_DATA " +
+ "where category_id='" + category_id + "' and Store_Id='" + store_id + "'", null);
+
+ if (dbcursor != null) {
+ if (dbcursor.moveToFirst()) {
+ do {
+ MSL_AvailabilityStockFacingGetterSetter sb = new MSL_AvailabilityStockFacingGetterSetter();
+ sb.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
+ list.add(sb);
+ } while (dbcursor.moveToNext());
+ }
+ dbcursor.close();
+
+ return list.size() > 0;
+ }
+ } catch (Exception e) {
+ Log.d("Exception ", "when fetching Records!!!!!!!!!!!!!!!!!!!!!" + e.toString());
+ return false;
+ }
+
+ Log.d("ORDER_TAKING_DATA ", "midday---------------------->Stop<-----------");
+ return false;
+ }
+
+
//MSL_Availability_StockFacing Server Upload Data
public ArrayList getMSL_Availability_StockFacing_UploadServerData(String store_id) {
ArrayList list = new ArrayList<>();
@@ -5550,7 +6804,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
MSL_AvailabilityStockFacingGetterSetter cd = new MSL_AvailabilityStockFacingGetterSetter();
-
cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Category_Id")));
cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Brand_Id")));
cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
@@ -5577,6 +6830,241 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list;
}
+ public ArrayList
+ getMSL_Availability_StockFacing_UploadServerDataNew(String store_id,
+ String visit_date, String keyAccountId,
+ String storeTypeId, String clasId,String mappingStkTable) {
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+
+ try {
+ if (keyAccountId != null) {
+ dbcursor = db.rawQuery(" SELECT T.*,ifnull(W.FACING,0)as FACING,ifnull(W.STOCK,0)as STOCK,ifnull(W.PRICING,0)as PRICING," +
+ " W.TOGGLE_VALUE,W.category_id FROM" +
+ " (Select DISTINCT BR.BRAND_ID,SK.SKU_ID,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE,ifnull(PE.SUB_CATEGORY_ID,0) as PRICING_DEFAULT" +
+ " from "+mappingStkTable+" M" +
+ " inner join SKU_MASTER SK on M.SKU_ID=SK.SKU_ID inner join BRAND_MASTER BR on SK.BRAND_ID=BR.BRAND_ID inner join SUB_CATEGORY_MASTER SB" +
+ " on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id + "')AS PE" +
+ " on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID inner join CATEGORY_MASTER CA on SB.CATEGORY_ID=CA.CATEGORY_ID " +
+
+ " where M.KEYACCOUNT_ID =" + keyAccountId + " AND M.STORETYPE_ID =" + storeTypeId + " AND M.CLASS_ID =" + clasId +
+
+ " order by M.MUST_HAVE DESC) AS T" +
+ " inner join" +
+ " (Select * from Msl_Availability_Stock_Facing_Data where Store_Id='" + store_id + "'AND "
+ + CommonString.KEY_VISIT_DATE + "='" + visit_date +
+ "')W on T.SKU_ID=W.SKU_ID and T.BRAND_ID=W.BRAND_ID", null);
+
+ } else {
+ dbcursor = db.rawQuery(" SELECT T.*,ifnull(W.FACING,0)as FACING,ifnull(W.STOCK,0)as STOCK,ifnull(W.PRICING,0)as PRICING," +
+ " W.TOGGLE_VALUE,W.category_id FROM" +
+ " (Select DISTINCT BR.BRAND_ID,SK.SKU_ID,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE,ifnull(PE.SUB_CATEGORY_ID,0) as PRICING_DEFAULT" +
+ " from "+mappingStkTable+" M" +
+ " inner join SKU_MASTER SK on M.SKU_ID=SK.SKU_ID inner join BRAND_MASTER BR on SK.BRAND_ID=BR.BRAND_ID inner join SUB_CATEGORY_MASTER SB" +
+ " on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id + "')AS PE" +
+ " on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID inner join CATEGORY_MASTER CA on SB.CATEGORY_ID=CA.CATEGORY_ID " +
+ " order by M.MUST_HAVE DESC) AS T" +
+ " inner join" +
+ " (Select * from Msl_Availability_Stock_Facing_Data where Store_Id='" + store_id + "'AND "
+ + CommonString.KEY_VISIT_DATE + "='" + visit_date +
+ "')W on T.SKU_ID=W.SKU_ID and T.BRAND_ID=W.BRAND_ID", null);
+
+ }
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ MSL_AvailabilityStockFacingGetterSetter cd = new MSL_AvailabilityStockFacingGetterSetter();
+ cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Category_Id")));
+ cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_ID")));
+ cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
+ cd.setSku_sequence(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_SEQUENCE")));
+ cd.setMbq(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MBQ")));
+ cd.setToggleValue(dbcursor.getString(dbcursor.getColumnIndexOrThrow("TOGGLE_VALUE")));
+ cd.setFacing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("FACING")));
+ cd.setStock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STOCK")));
+ cd.setMust_have(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MUST_HAVE")));
+ cd.setPricingStock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PRICING")));
+ cd.setPricing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PRICING_DEFAULT")));
+ list.add(cd);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+ } catch (Exception e) {
+ Log.d("Exception ", "get MSL_Availability server upload Data!" + e.toString());
+ return list;
+ }
+ return list;
+ }
+ public ArrayList
+ getStock_Entry_UploadServerDataNew(String store_id,
+ String visit_date, String keyAccountId,
+ String storeTypeId, String clasId,String mappingStkTable) {
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+
+ try {
+ if (keyAccountId != null) {
+ dbcursor = db.rawQuery(" SELECT T.*,ifnull(W.FACING,0)as FACING,ifnull(W.STOCK,0)as STOCK,Ifnull(W.POSM_STOCK,0)as POSM_STOCK,Ifnull(W.WAREHOUSE_STOCK,0)as WAREHOUSE_STOCK,ifnull(W.PRICING,0)as PRICING," +
+ " W.TOGGLE_VALUE,W.category_id FROM" +
+ " (Select DISTINCT BR.BRAND_ID,SK.SKU_ID,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE,ifnull(PE.SUB_CATEGORY_ID,0) as PRICING_DEFAULT" +
+ " from "+mappingStkTable+" M" +
+ " inner join SKU_MASTER SK on M.SKU_ID=SK.SKU_ID inner join BRAND_MASTER BR on SK.BRAND_ID=BR.BRAND_ID inner join SUB_CATEGORY_MASTER SB" +
+ " on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id + "')AS PE" +
+ " on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID inner join CATEGORY_MASTER CA on SB.CATEGORY_ID=CA.CATEGORY_ID " +
+
+ " where M.KEYACCOUNT_ID =" + keyAccountId + " AND M.STORETYPE_ID =" + storeTypeId + " AND M.CLASS_ID =" + clasId +
+
+ " order by M.MUST_HAVE DESC) AS T" +
+ " inner join" +
+ " (Select * from STOCK_ENTRY where Store_Id='" + store_id + "'AND "
+ + CommonString.KEY_VISIT_DATE + "='" + visit_date +
+ "')W on T.SKU_ID=W.SKU_ID and T.BRAND_ID=W.BRAND_ID", null);
+
+ } else {
+ dbcursor = db.rawQuery(" SELECT T.*,ifnull(W.FACING,0)as FACING,ifnull(W.STOCK,0)as STOCK,Ifnull(W.POSM_STOCK,0)as POSM_STOCK,Ifnull(W.WAREHOUSE_STOCK,0)as WAREHOUSE_STOCK,ifnull(W.PRICING,0)as PRICING," +
+ " W.TOGGLE_VALUE,W.category_id FROM" +
+ " (Select DISTINCT BR.BRAND_ID,SK.SKU_ID,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE,ifnull(PE.SUB_CATEGORY_ID,0) as PRICING_DEFAULT" +
+ " from "+mappingStkTable+" M" +
+ " inner join SKU_MASTER SK on M.SKU_ID=SK.SKU_ID inner join BRAND_MASTER BR on SK.BRAND_ID=BR.BRAND_ID inner join SUB_CATEGORY_MASTER SB" +
+ " on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id + "')AS PE" +
+ " on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID inner join CATEGORY_MASTER CA on SB.CATEGORY_ID=CA.CATEGORY_ID " +
+ " order by M.MUST_HAVE DESC) AS T" +
+ " inner join" +
+ " (Select * from STOCK_ENTRY where Store_Id='" + store_id + "'AND "
+ + CommonString.KEY_VISIT_DATE + "='" + visit_date +
+ "')W on T.SKU_ID=W.SKU_ID and T.BRAND_ID=W.BRAND_ID", null);
+
+ }
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ MSL_AvailabilityStockFacingGetterSetter cd = new MSL_AvailabilityStockFacingGetterSetter();
+ cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Category_Id")));
+ cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_ID")));
+ cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
+ cd.setSku_sequence(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_SEQUENCE")));
+ cd.setMbq(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MBQ")));
+ cd.setToggleValue(dbcursor.getString(dbcursor.getColumnIndexOrThrow("TOGGLE_VALUE")));
+ cd.setFacing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("FACING")));
+ cd.setStock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STOCK")));
+ cd.setMust_have(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MUST_HAVE")));
+ cd.setPricingStock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PRICING")));
+ cd.setPricing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PRICING_DEFAULT")));
+ cd.setPosmStock(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.POSM_STOCK)));
+ cd.setWarehouseStock(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.WAREHOUSE_STOCK)));
+ list.add(cd);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+ } catch (Exception e) {
+ Log.d("Exception ", "get MSL_Availability server upload Data!" + e.toString());
+ return list;
+ }
+ return list;
+ }
+
+
+ public ArrayList getOrder_TAKING_UploadServerData(String store_id) {
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+ try {
+ dbcursor = db.rawQuery("Select * from ORDER_TAKING_DATA " +
+ "where Store_Id='" + store_id + "'", null);
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ MSL_AvailabilityStockFacingGetterSetter cd = new MSL_AvailabilityStockFacingGetterSetter();
+ cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Category_Id")));
+ cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_ID")));
+ cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
+ cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
+ cd.setSku_sequence(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_SEQUENCE")));
+ cd.setIsExist(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("IsExist")));
+ cd.setSys_PO_No(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Sys_PO_No")));
+ cd.setStore_PO_No(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Store_PO_No")));
+ cd.setPO_Date(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PO_Date")));
+ cd.setFacing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Order_Qty")));
+ cd.setPO_Img(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PO_IMAGE")));
+ list.add(cd);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+ } catch (Exception e) {
+ Log.d("Exception ", "get MSL_Availability server upload Data!" + e.toString());
+ return list;
+ }
+ return list;
+ }
+
+ public ArrayList getOrder_TAKING_CategoryData(String store_id) {
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+ try {
+ dbcursor = db.rawQuery("Select distinct c.CATEGORY_ID,c.IsExist from ORDER_TAKING_DATA c " +
+ "where Store_Id='" + store_id + "'", null);
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ MSL_AvailabilityStockFacingGetterSetter cd = new MSL_AvailabilityStockFacingGetterSetter();
+ cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Category_Id")));
+ cd.setIsExist(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("IsExist")));
+ list.add(cd);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+ } catch (Exception e) {
+ Log.d("Exception ", "get MSL_Availability server upload Data!" + e.toString());
+ return list;
+ }
+ return list;
+ }
+
+ public ArrayList getOrder_RECEIVED_UploadServerData(String store_id) {
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+ try {
+ dbcursor = db.rawQuery("Select * from ORDER_RECEIVED_STATUS_DATA " +
+ "where Store_Id='" + store_id + "'", null);
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ MSL_AvailabilityStockFacingGetterSetter cd = new MSL_AvailabilityStockFacingGetterSetter();
+ cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Category_Id")));
+ cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_ID")));
+ cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
+ cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
+ cd.setSku_sequence(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_SEQUENCE")));
+ cd.setSys_PO_No(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Sys_PO_No")));
+ cd.setStore_PO_No(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Store_PO_No")));
+ cd.setPO_Date(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PO_Date")));
+ cd.setFacing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ACTUAL_Qty")));
+ cd.setOrderqty(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PO_Qty")));
+ cd.setPOID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("POID")));
+ list.add(cd);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+ } catch (Exception e) {
+ Log.d("Exception ", "get MSL_Availability server upload Data!" + e.toString());
+ return list;
+ }
+ return list;
+ }
+
//get Sub Category Master
public ArrayList getSubCategoryMaster(
String category_id, String store_id, String countery_id) {
@@ -5585,8 +7073,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
Cursor dbcursor = null;
try {
-
- // dbcursor = db.rawQuery("SELECT * FROM SUB_CATEGORY_MASTER WHERE CATEGORY_ID = '" + category_id + "'", null);
//kenya
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 " +
@@ -5628,7 +7114,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
ArrayList Data = new ArrayList<>();
try {
-
cursordata = db.rawQuery("SELECT * FROM SKUGROUP_MASTER " +
"WHERE CATEGORY_ID ='" + category_id + "' AND SUB_CATEGORY_ID ='" + sub_category_id + "' ORDER BY SKUGROUP_SEQUENCE", null);
@@ -5991,18 +7476,15 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
public void deletePreviousCoverageData(String date) {
-
db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_VISIT_DATE + "<>'" + date + "'", null);
}
//ADDITIONAL_QUESTION
public void InsertADDITIONALQUESTION(AdditionalQuestiongetterSetter data) {
db.delete("ADDITIONAL_QUESTION", null, null);
-
ContentValues values = new ContentValues();
try {
for (int i = 0; i < data.getCATEGORY_ID().size(); i++) {
-
values.put("QUESTION_ID", data.getQUESTION_ID().get(i));
values.put("CULTURE_ID", data.getCULTURE_ID().get(i));
values.put("CATEGORY_ID", data.getCATEGORY_ID().get(i));
@@ -6017,7 +7499,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
values.put("QTYPE", data.getTYPE().get(i));
values.put("REMARK_ALLOW", data.getREMARK_ALLOW().get(i));
values.put("REMARK_LEVEL", data.getREMARK_LEVEL().get(i));
-
+ values.put("MAX_LENGTH", data.getMAX_LENGTH().get(i));
+ values.put("CAMERA_MANDATORY", data.getCAMERA_MANDATORY().get(i));
db.insert("ADDITIONAL_QUESTION", null, values);
}
} catch (Exception ex) {
@@ -6029,16 +7512,16 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
public ArrayList getAuditCategoryWise(String categoryId, String store_type_id) {
Cursor cursordata = null;
ArrayList auditData = new ArrayList<>();
-
try {
+ // dbcursor = db.rawQuery("SELECT DISTINCT CHAT_ID, MESSAGE, MESSAGEDATE, STOREID FROM CHAT_MESSAGE WHERE STOREID='" + store_id + "' ORDER BY ORDERID", null);
- cursordata = db.rawQuery("Select DISTINCT QUESTION ,QUESTION_ID, ANSWER_TYPE, KEYACCOUNT_ID, QTYPE from ADDITIONAL_QUESTION " + "where CATEGORY_ID ='" + categoryId + "' AND STORETYPE_ID='" + store_type_id + "'", null);
+ cursordata = db.rawQuery("Select DISTINCT QUESTION ,QUESTION_ID, ANSWER_TYPE, KEYACCOUNT_ID, QTYPE,MAX_LENGTH " +
+ "from ADDITIONAL_QUESTION " + "where CATEGORY_ID ='" + categoryId + "' AND STORETYPE_ID='" + store_type_id + "'", null);
if (cursordata != null) {
cursordata.moveToFirst();
while (!cursordata.isAfterLast()) {
AuditDataGetterSetter sb = new AuditDataGetterSetter();
-
sb.setQUESTION(cursordata.getString(cursordata
.getColumnIndexOrThrow("QUESTION")));
sb.setQUESTION_ID(cursordata.getString(cursordata
@@ -6049,6 +7532,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
.getColumnIndexOrThrow("KEYACCOUNT_ID")));
sb.setCHECK_TYPE(cursordata.getString(cursordata
.getColumnIndexOrThrow("QTYPE")));
+ sb.setMaxlength(cursordata.getString(cursordata
+ .getColumnIndexOrThrow("MAX_LENGTH")));
/*sb.setREMARK_ALLOW(cursordata.getString(cursordata
.getColumnIndexOrThrow("REMARK_ALLOW")));
sb.setREMARK_LEVEL(cursordata.getString(cursordata
@@ -6086,13 +7571,15 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
AuditDataGetterSetter sb = new AuditDataGetterSetter();
-
sb.setANSWER_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ANSWER_ID")));
sb.setANSWER(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ANSWER")));
sb.setCAMERA_ALLOW(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CAMERA_ALLOW")));
sb.setNO_OF_CAMERA(dbcursor.getString(dbcursor.getColumnIndexOrThrow("NO_OF_CAMERA")));
sb.setREMARK_ALLOW(dbcursor.getString(dbcursor.getColumnIndexOrThrow("REMARK_ALLOW")));
sb.setREMARK_LEVEL(dbcursor.getString(dbcursor.getColumnIndexOrThrow("REMARK_LEVEL")));
+ sb.setMaxlength(dbcursor.getString(dbcursor
+ .getColumnIndexOrThrow("MAX_LENGTH")));
+ sb.setCAMERA_MANDATORY(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CAMERA_MANDATORY")));
list.add(sb);
dbcursor.moveToNext();
@@ -6133,6 +7620,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
values.put("REMARK_ALLOW", data.getREMARK_ALLOW());
values.put("REMARK_LEVEL", data.getREMARK_LEVEL());
values.put("REMARK", data.getTXT_REMARK());
+ values.put("MAX_LENGHT", data.getMaxlength());
db.insert(CommonString.TABLE_AUDIT_DATA_SAVE, null, values);
}
@@ -6166,6 +7654,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
sb.setREMARK_ALLOW(dbcursor.getString(dbcursor.getColumnIndexOrThrow("REMARK_ALLOW")));
sb.setREMARK_LEVEL(dbcursor.getString(dbcursor.getColumnIndexOrThrow("REMARK_LEVEL")));
sb.setTXT_REMARK(dbcursor.getString(dbcursor.getColumnIndexOrThrow("REMARK")));
+ sb.setMaxlength(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MAX_LENGHT")));
list.add(sb);
dbcursor.moveToNext();
@@ -6193,7 +7682,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
AuditDataGetterSetter sb = new AuditDataGetterSetter();
-
sb.setQUESTION_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("QUESTION_ID")));
sb.setQUESTION(dbcursor.getString(dbcursor.getColumnIndexOrThrow("QUESTION")));
sb.setANSWER_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ANSWER_ID")));
@@ -6203,8 +7691,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
sb.setCAM_IMAGE2(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ANS_CAM_IMAGE2")));
sb.setANSWER(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ANSWER")));
sb.setTXT_REMARK(dbcursor.getString(dbcursor.getColumnIndexOrThrow("REMARK")));
-
-
+ sb.setMaxlength(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MAX_LENGHT")));
list.add(sb);
dbcursor.moveToNext();
}
@@ -6592,6 +8079,26 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
}
+ public void InsertVisit_Type_Status(Visit_Type_Master_GetterSetter data) {
+ db.delete("VISIT_TYPE_MASTER", null, null);
+
+ ContentValues values = new ContentValues();
+ try {
+
+ for (int i = 0; i < data.getVISIT_TYPE_ID().size(); i++) {
+
+ values.put("VISIT_TYPE_ID", data.getVISIT_TYPE_ID().get(i));
+ values.put("VISIT_TYPE", data.getVISIT_TYPE().get(i));
+
+ db.insert("VISIT_TYPE_MASTER", null, values);
+
+ }
+
+ } catch (Exception ex) {
+ Log.d("Exception in VISIT_TYPE_MASTER", ex.toString());
+ }
+ }
+
public void InserChatMessage(ChatMessageDownloadGetterSetter data) {
db.delete("CHAT_MESSAGE", null, null);
@@ -6971,7 +8478,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
ArrayList list = new ArrayList<>();
Cursor dbcursor = null;
try {
- // dbcursor = db.rawQuery("SELECT * FROM SUPERVISOR_LIST ", null);
+ // dbcursor = db.rawQuery("SELECT * FROM SUPERVISOR_LIST ", null);
dbcursor = db.rawQuery("SELECT * FROM SUPERVISOR_LIST where COACHING_VISIT = 1", null);
if (dbcursor != null) {
@@ -6998,6 +8505,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list;
}
+
public ArrayList getSupervisorcheckListData() {
ArrayList list = new ArrayList<>();
@@ -7027,10 +8535,21 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list;
}
-
return list;
}
+ public void insertVisitTypeData(String visitdate, String store_id, String visit_type_id) {
+ db.delete(CommonString.TABLE_VISIT_TYPE, "STORE_ID" + "='" + store_id + "' AND VISIT_DATE ='" + visitdate + "'", null);
+ ContentValues values = new ContentValues();
+ try {
+ values.put(CommonString.KEY_VISIT_DATE, visitdate);
+ values.put(CommonString.KEY_STORE_ID, store_id);
+ values.put(CommonString.KEY_VISIT_ID, visit_type_id);
+ db.insert(CommonString.TABLE_VISIT_TYPE, null, values);
+ } catch (Exception ex) {
+ Log.d("Database Exception", ex.toString());
+ }
+ }
public void insertCoachingVisitData(CoachingVisitGetterSetter data, String store_id) {
db.delete("COACHING_VISIT", "STORE_ID" + "='" + store_id + "' AND EMP_ID ='" + data.getEmp_id() + "'", null);
@@ -7057,6 +8576,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
+
public void insertCoachingVisitStoreData(CoachingVisitGetterSetter data, String store_id) {
db.delete("COACHING_VISIT_STORE", "STORE_ID" + "='" + store_id + "' AND EMP_ID ='" + data.getEmp_id() + "'", null);
ContentValues values = new ContentValues();
@@ -7830,20 +9350,20 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
@SuppressLint("LongLogTag")
- public boolean checkStockData(String store_id, String category_id) {
+ public boolean checkStockData(String store_id, String category_id, String visit_date) {
Log.d("MSL_Availability ", "Stock data--------------->Start<------------");
ArrayList list = new ArrayList<>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select * from " + CommonString.TABLE_INSERT_STOCK +
- " where category_id='" + category_id + "' and Store_Id='" + store_id + "'", null);
+ " where category_id='" + category_id + "' and Store_Id='" + store_id +
+ "'AND " + CommonString.KEY_VISIT_DATE + "='" + visit_date + "'", null);
if (dbcursor != null) {
if (dbcursor.moveToFirst()) {
do {
MSL_AvailabilityStockFacingGetterSetter sb = new MSL_AvailabilityStockFacingGetterSetter();
-
sb.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
list.add(sb);
} while (dbcursor.moveToNext());
@@ -7864,7 +9384,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
//--------------------------------------------------------------------------------------------------------------
public void updateStockData(
- String storeId, String categoryId, List hashMapListHeaderData,
+ String storeId, String categoryId, String visit_date, List hashMapListHeaderData,
HashMap> hashMapListChildData) {
ContentValues values = new ContentValues();
@@ -7880,8 +9400,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
values.put("STOCK", data.getStock());
db.update(CommonString.TABLE_INSERT_STOCK, values,
- "Brand_Id ='" + hashMapListHeaderData.get(i).getBrand_id() + "' AND SKU_ID ='" + data.getSku_id() +
- "' AND Category_Id='" + categoryId + "' AND Store_Id='" + storeId + "'", null);
+ "Brand_Id ='" + hashMapListHeaderData.get(i).getBrand_id() +
+ "' AND SKU_ID ='" + data.getSku_id() +
+ "' AND Category_Id='" + categoryId +
+ "' AND Store_Id='" + storeId + "'AND " + CommonString.KEY_VISIT_DATE + "='" + visit_date + "'", null);
}
}
db.setTransactionSuccessful();
@@ -7895,8 +9417,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
//-------------------------------------------------------------------------------------------------------------------------------
public void InsertStockData(
- String storeId, String categoryId, List hashMapListHeaderData,
+ String storeId, String categoryId, String visit_date, List hashMapListHeaderData,
HashMap> hashMapListChildData) {
+ db.delete(CommonString.TABLE_INSERT_STOCK, CommonString.KEY_VISIT_DATE + "<>'" + visit_date + "'", null);
+
ContentValues values = new ContentValues();
try {
@@ -7907,6 +9431,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
MSL_AvailabilityStockFacingGetterSetter data = hashMapListChildData.get(hashMapListHeaderData.get(i)).get(j);
values.put("Store_Id", storeId);
+ values.put(CommonString.KEY_VISIT_DATE, visit_date);
values.put("Category_Id", categoryId);
values.put("Brand_Id", hashMapListHeaderData.get(i).getBrand_id());
values.put("SKU_ID", data.getSku_id());
@@ -8034,7 +9559,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
MSL_AvailabilityStockFacingGetterSetter cd = new MSL_AvailabilityStockFacingGetterSetter();
-
cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Category_Id")));
cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Brand_Id")));
cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
@@ -8989,13 +10513,55 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
values.put("STORE_ID", data.getSTORE_ID().get(i));
values.put("SUB_CATEGORY_ID", data.getSUB_CATEGORY_ID().get(i));
db.insert("MAPPING_SKU_PRICING_ENABLE", null, values);
-
}
-
} catch (Exception ex) {
Log.d("Exception ", "MAPPING_SKU_PRICING_ENABLE!" + ex.toString());
}
}
+ public ArrayList getOrderstatusData(String storeid, String categoryid) {
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+ try {
+ dbcursor = db.rawQuery("select APP_PONUMBER, PO_DATE, STORE_PONUMBER,CATEGORY_ID,SKU_ID,STORE_ID,ORDERQTY, STATUS,POID,count(SKU_ID) as Lines from Order_Received_Status where STORE_ID = '" + storeid + "'AND CATEGORY_ID" + "='" + categoryid + "'group by APP_PONUMBER, PO_DATE, STORE_PONUMBER", null);
+ // dbcursor = db.rawQuery("select APP_PONUMBER, PO_DATE, STORE_PONUMBER,CATEGORY_ID,SKU_ID,STORE_ID,ORDERQTY, STATUS, count(SKU_ID) as Lines from Order_Received_Status where STORE_ID = '" + storeid + "'group by APP_PONUMBER, PO_DATE, STORE_PONUMBER", null);
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ OrderReceivedStatus sb = new OrderReceivedStatus();
+ sb.setORDERQTY(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("Lines")));
+ sb.setPodate(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PO_DATE")));
+ sb.setStorepo(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STORE_PONUMBER")));
+ sb.setSys_gen_po(dbcursor.getString(dbcursor.getColumnIndexOrThrow("APP_PONUMBER")));
+ sb.setSKU_ID(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("SKU_ID")));
+ sb.setStatus(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STATUS")));
+ sb.setStoreid(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("STORE_ID")));
+ sb.setCATEGORY_ID(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("CATEGORY_ID")));
+ sb.setPOID(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("POID")));
+ list.add(sb);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+ } catch (Exception e) {
+
+ return list;
+ }
+ return list;
+ }
+
+ public long updateStockMapping(String id, String visit_date, String table_mapping) {
+ ContentValues values = new ContentValues();
+ long l = 0;
+ try {
+ values.put(CommonString.KEY_STOCK_MAPPING, table_mapping);
+ l = db.update(CommonString.TABLE_COVERAGE_DATA, values, CommonString.KEY_STORE_ID + "='" + id + "' AND " + CommonString.KEY_VISIT_DATE + "='" + visit_date + "'", null);
+ } catch (Exception e) {
+ Log.d("Excep update checkout", e.toString());
+ }
+
+ return l;
+ }
}
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 6f4a619..f47e1e0 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
@@ -82,6 +82,7 @@ import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.dailyentry.StoreimageActivity;
+import cpm.com.gskmtorange.dailyentry.VisitTypeStatusActivity;
import cpm.com.gskmtorange.messgae.AlertMessage;
import cpm.com.gskmtorange.upload.Base64;
import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter;
@@ -91,7 +92,6 @@ import cpm.com.gskmtorange.xmlHandlers.FailureXMLHandler;
* Created by ashishc on 27-12-2016.
*/
-
public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallback, GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener, LocationListener {
private Context context;
String result, errormsg = "";
@@ -99,6 +99,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
private GoogleMap mMap;
double latitude = 0.0;
double longitude = 0.0;
+ String country_id;
protected String diskpath = "", _path, _pathforcheck, img_str = "", status;
private Location mLastLocation;
private LocationManager locmanager = null;
@@ -154,6 +155,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
visitData = preferences.getString(CommonString.KEY_DATE, null);
store_flag_str = getIntent().getStringExtra(CommonString.KEY_STORE_FLAG);
storeid = getIntent().getStringExtra(CommonString.KEY_STORE_ID);
+ country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, "");
final PackageManager packageManager = getPackageManager();
@@ -224,7 +226,6 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
// Write your code here to invoke NO event
-
dialog.cancel();
finish();
}
@@ -485,8 +486,21 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
cdate = arabicToenglish(cdate);
}else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_JORDAN)) {
cdate = arabicToenglish(cdate);
+ }else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KUWAIT)) {
+ cdate = arabicToenglish(cdate);
+ }else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_BAHRAIN)) {
+ cdate = arabicToenglish(cdate);
+ }else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_OMAN)) {
+ cdate = arabicToenglish(cdate);
+ }else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_QATAR)) {
+ cdate = arabicToenglish(cdate);
+ }
+ else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_LEBANON)) {
+ cdate = arabicToenglish(cdate);
+ }
+ else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_LIBIYA)) {
+ cdate = arabicToenglish(cdate);
}
-
return cdate;
}
@@ -750,29 +764,51 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
} catch (SocketException ex) {
ex.printStackTrace();
- Intent intent = new Intent(
- GeoTagActivity.this,
- StoreimageActivity.class);
- intent.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
- intent.putExtra(CommonString.KEY_STORE_ID, storeid);
-
- startActivity(intent);
-
+ if(store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION) && country_id.equals("2")){
+ Intent intent = new Intent(
+ GeoTagActivity.this,
+ VisitTypeStatusActivity.class);
+ intent.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
+ intent.putExtra(CommonString.KEY_STORE_ID, storeid);
+ startActivity(intent);
+ }
+ else{
+ Intent intent = new Intent(
+ GeoTagActivity.this,
+ StoreimageActivity.class);
+ intent.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
+ intent.putExtra(CommonString.KEY_STORE_ID, storeid);
+ startActivity(intent);
+ }
GeoTagActivity.this.finish();
-
} catch (Exception e) {
-
// Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString());
// Crashlytics.logException(e.getCause());
// Crashlytics.logException(new Exception(e.getCause()));
e.printStackTrace();
- Intent intent = new Intent(
+ if(store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION) && country_id.equals("2")){
+ Intent intent = new Intent(
+ GeoTagActivity.this,
+ VisitTypeStatusActivity.class);
+ intent.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
+ intent.putExtra(CommonString.KEY_STORE_ID, storeid);
+ startActivity(intent);
+ }
+ else{
+ Intent intent = new Intent(
+ GeoTagActivity.this,
+ StoreimageActivity.class);
+ intent.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
+ intent.putExtra(CommonString.KEY_STORE_ID, storeid);
+ startActivity(intent);
+ }
+ /* Intent intent = new Intent(
GeoTagActivity.this,
StoreimageActivity.class);
intent.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
- intent.putExtra(CommonString.KEY_STORE_ID, storeid);
+ intent.putExtra(CommonString.KEY_STORE_ID, storeid);*/
- startActivity(intent);
+ // startActivity(intent);
GeoTagActivity.this.finish();
}
@@ -889,11 +925,8 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
-
return "GeotagImages";
}
-
-
if (result.toString().equalsIgnoreCase(CommonString.KEY_FALSE)) {
return CommonString.METHOD_Get_DR_STORE_IMAGES_GEO;
@@ -902,7 +935,6 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
return CommonString.METHOD_Get_DR_STORE_IMAGES_GEO + "," + errormsg;
}
-
}
}
@@ -935,13 +967,29 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
// Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString());
// Crashlytics.logException(e.getCause());
//Crashlytics.logException(new Exception(e.getCause()));
- Intent intent = new Intent(
+ if(store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION) && country_id.equals("2")){
+ Intent intent = new Intent(
+ GeoTagActivity.this,
+ VisitTypeStatusActivity.class);
+ intent.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
+ intent.putExtra(CommonString.KEY_STORE_ID, storeid);
+ startActivity(intent);
+ }
+ else{
+ Intent intent = new Intent(
+ GeoTagActivity.this,
+ StoreimageActivity.class);
+ intent.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
+ intent.putExtra(CommonString.KEY_STORE_ID, storeid);
+ startActivity(intent);
+ }
+ /* Intent intent = new Intent(
GeoTagActivity.this,
StoreimageActivity.class);
intent.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
intent.putExtra(CommonString.KEY_STORE_ID, storeid);
- startActivity(intent);
+ startActivity(intent);*/
GeoTagActivity.this.finish();
@@ -994,13 +1042,29 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
+ result, getResources().getString(R.string.success), null);
message.showMessage();*/
- Intent intent = new Intent(
+ if(store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION) && country_id.equals("2")){
+ Intent intent = new Intent(
+ GeoTagActivity.this,
+ VisitTypeStatusActivity.class);
+ intent.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
+ intent.putExtra(CommonString.KEY_STORE_ID, storeid);
+ startActivity(intent);
+ }
+ else{
+ Intent intent = new Intent(
+ GeoTagActivity.this,
+ StoreimageActivity.class);
+ intent.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
+ intent.putExtra(CommonString.KEY_STORE_ID, storeid);
+ startActivity(intent);
+ }
+ /* Intent intent = new Intent(
GeoTagActivity.this,
StoreimageActivity.class);
intent.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
intent.putExtra(CommonString.KEY_STORE_ID, storeid);
- startActivity(intent);
+ startActivity(intent);*/
GeoTagActivity.this.finish();
@@ -1015,13 +1079,30 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
+ result, getResources().getString(R.string.failure), null);
message.showMessage();*/
Toast.makeText(context,getResources().getString(R.string.failure),Toast.LENGTH_LONG).show();
- Intent intent = new Intent(
+
+ if(store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION) && country_id.equals("2")){
+ Intent intent = new Intent(
+ GeoTagActivity.this,
+ VisitTypeStatusActivity.class);
+ intent.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
+ intent.putExtra(CommonString.KEY_STORE_ID, storeid);
+ startActivity(intent);
+ }
+ else{
+ Intent intent = new Intent(
+ GeoTagActivity.this,
+ StoreimageActivity.class);
+ intent.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
+ intent.putExtra(CommonString.KEY_STORE_ID, storeid);
+ startActivity(intent);
+ }
+ /* Intent intent = new Intent(
GeoTagActivity.this,
StoreimageActivity.class);
intent.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
intent.putExtra(CommonString.KEY_STORE_ID, storeid);
- startActivity(intent);
+ startActivity(intent);*/
GeoTagActivity.this.finish();
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/OrderReceivedStatus.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/OrderReceivedStatus.java
new file mode 100644
index 0000000..14542ea
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/OrderReceivedStatus.java
@@ -0,0 +1,102 @@
+package cpm.com.gskmtorange.GetterSetter;
+
+import android.widget.TextView;
+
+import java.io.Serializable;
+
+public class OrderReceivedStatus implements Serializable {
+ //TextView sys_gen_poTV,storepoTV,podateTV,lineItemTV,statusTV;
+ String sys_gen_po="";
+ String storepo="";
+ String podate="";
+ String lineItem="";
+ String status="";
+ int SKU_ID;
+ int ORDERQTY;
+ int CATEGORY_ID;
+ int POID;
+
+ public int getPOID() {
+ return POID;
+ }
+
+ public void setPOID(int POID) {
+ this.POID = POID;
+ }
+
+
+ public int getStoreid() {
+ return Storeid;
+ }
+
+ public void setStoreid(int storeid) {
+ Storeid = storeid;
+ }
+
+ int Storeid;
+
+ public int getSKU_ID() {
+ return SKU_ID;
+ }
+
+ public void setSKU_ID(int SKU_ID) {
+ this.SKU_ID = SKU_ID;
+ }
+
+ public int getORDERQTY() {
+ return ORDERQTY;
+ }
+
+ public void setORDERQTY(int ORDERQTY) {
+ this.ORDERQTY = ORDERQTY;
+ }
+
+ public int getCATEGORY_ID() {
+ return CATEGORY_ID;
+ }
+
+ public void setCATEGORY_ID(int CATEGORY_ID) {
+ this.CATEGORY_ID = CATEGORY_ID;
+ }
+
+
+ public String getSys_gen_po() {
+ return sys_gen_po;
+ }
+
+ public void setSys_gen_po(String sys_gen_po) {
+ this.sys_gen_po = sys_gen_po;
+ }
+
+ public String getStorepo() {
+ return storepo;
+ }
+
+ public void setStorepo(String storepo) {
+ this.storepo = storepo;
+ }
+
+ public String getPodate() {
+ return podate;
+ }
+
+ public void setPodate(String podate) {
+ this.podate = podate;
+ }
+
+ public String getLineItem() {
+ return lineItem;
+ }
+
+ public void setLineItem(String lineItem) {
+ this.lineItem = lineItem;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
index 0394d59..9fe0f5f 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
@@ -21,6 +21,7 @@ import android.os.Bundle;
import android.os.Environment;
import android.preference.PreferenceManager;
import android.text.TextUtils;
+import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
import android.view.View.OnClickListener;
@@ -36,6 +37,7 @@ import android.widget.Toast;
//import com.crashlytics.android.Crashlytics;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
+import androidx.cardview.widget.CardView;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
@@ -96,25 +98,18 @@ import static android.Manifest.permission.READ_CONTACTS;
/**
* A login screen that offers login via userid/password.
*/
-public class LoginActivity extends AppCompatActivity implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener, LocationListener {
-
+public class LoginActivity extends AppCompatActivity implements GoogleApiClient.ConnectionCallbacks,
+ GoogleApiClient.OnConnectionFailedListener, LocationListener {
private static final int MY_PERMISSIONS_REQUEST_CAMERA = 10;
private static final int MY_PERMISSIONS_REQUEST_LOCATION = 11;
private static final int MY_PERMISSIONS_REQUEST_STORAGE_READ = 12;
private static final int MY_PERMISSIONS_REQUEST_STORAGE_WRITE = 14;
-
private FirebaseAnalytics mFirebaseAnalytics;
-
- TextView tv_version;
String app_ver;
-
LoginGetterSetter lgs = null;
-
static int counter = 1;
-
private SharedPreferences preferences = null;
private SharedPreferences.Editor editor = null;
-
/**
* Id to identity READ_CONTACTS permission request.
*/
@@ -124,28 +119,17 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
* A dummy authentication store containing known user names and passwords.
* TODO: remove after connecting to a real authentication system.
*/
- private static final String[] DUMMY_CREDENTIALS = new String[]{
- "foo@example.com:hello", "bar@example.com:world"
- };
-
double lat = 0.0;
double lon = 0.0;
-
// UI references.
private AutoCompleteTextView museridView;
private EditText mPasswordView;
private View mProgressView;
private View mLoginFormView;
-
- private String userid, password, p_username, p_password;
-
+ private String userid, password;
private int versionCode;
-
int eventType;
-
- Button museridSignInButton;
-
- // Trace myTrace;
+ CardView museridSignInButton;
GoogleApiClient mGoogleApiClient;
private static int UPDATE_INTERVAL = 200; // 5 sec
@@ -160,9 +144,9 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
setContentView(R.layout.activity_login);
context = this;
+
TextView tv_version = (TextView) findViewById(R.id.tv_version_code);
try {
app_ver = String.valueOf(getPackageManager().getPackageInfo(getPackageName(), 0).versionName);
@@ -173,19 +157,22 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
}
tv_version.setText("Version/Versiyon - " + app_ver);
-
- preferences = PreferenceManager.getDefaultSharedPreferences(this);
+ preferences = PreferenceManager.getDefaultSharedPreferences(context);
editor = preferences.edit();
-
// Set up the login form.
museridView = (AutoCompleteTextView) findViewById(R.id.userid);
//populateAutoComplete();
mPasswordView = (EditText) findViewById(R.id.password);
- /*museridView.setText("test.egypt");
- mPasswordView.setText("cpm123");*/
- /* museridView.setText("egypt.1");
+ //for lebanon
+ // museridView.setText("test.lebanon1");
+ // mPasswordView.setText("cpm@123");
+ // for EGYPT
+ // museridView.setText("test.egypt");
+ // mPasswordView.setText("cpm123");
+ /*museridView.setText("egypt.1");
mPasswordView.setText("cpm123");*/
+
/* museridView.setText("DSR_Alex_61");
mPasswordView.setText("cpm123");*/
@@ -211,18 +198,22 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
/* museridView.setText("testksa");
mPasswordView.setText("cpm123");*/
-
- //turkey
- // museridView.setText("testmer");
- //mPasswordView.setText("cpm123");
+ /* //turkey
+ museridView.setText("testmer");
+ mPasswordView.setText("cpm123");
+*/
//sa
/* museridView.setText("testsa");
mPasswordView.setText("cpm123");*/
+ //Qatar
+ /* museridView.setText("test.qatar1");
+ mPasswordView.setText("cpm123");*/
+
//Kenya
- // museridView.setText("test.Kenya");
- // museridView.setText("testkenya");
- // mPasswordView.setText("cpm123");
+ // museridView.setText("test.Kenya");
+ // museridView.setText("testkenya");
+ // mPasswordView.setText("cpm123");
/*museridView.setText("rajesh.r");
mPasswordView.setText("cpm123");*/
@@ -236,9 +227,15 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
/* museridView.setText("test.jordan");
mPasswordView.setText("cpm@123");*/
- museridView.setText("test.kuwait");
- // museridView.setText("test.oman");
+
+ // museridView.setText("test.kuwait");
+ // mPasswordView.setText("cpm@123");
+
+ // museridView.setText("test.oman");
+
+ /* museridView.setText("test.bahrain");
mPasswordView.setText("cpm@123");
+*/
mPasswordView.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override
@@ -253,7 +250,6 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
try {
app_ver = String.valueOf(getPackageManager().getPackageInfo(getPackageName(), 0).versionName);
-
// tv_version.setText("Version " + app_ver);
} catch (PackageManager.NameNotFoundException e) {
// TODO Auto-generated catch block
@@ -263,7 +259,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
mFirebaseAnalytics = FirebaseAnalytics.getInstance(this);
FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(true);
- museridSignInButton = (Button) findViewById(R.id.user_login_button);
+ museridSignInButton = (CardView) findViewById(R.id.user_login_button);
museridSignInButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
@@ -512,9 +508,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
@Override
protected void onPreExecute() {
-
super.onPreExecute();
-
dialog = new ProgressDialog(LoginActivity.this);
dialog.setTitle("Login");
dialog.setMessage("Authenticating....");
@@ -524,11 +518,9 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
@Override
protected String doInBackground(Void... params) {
-
try {
-
+ Log.e("latitudedata",lat + ","+ lon);
versionCode = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
-
String userauth_xml = "[DATA]" + "[USER_DATA][USER_ID]"
+ userid + "[/USER_ID]" + "[PASSWORD]" + password
+ "[/PASSWORD]" + "[IN_TIME]" + CommonFunctions.getCurrentTimeWithLanguage(context)
@@ -542,17 +534,24 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
SoapObject request = new SoapObject(CommonString.NAMESPACE,
CommonString.METHOD_LOGIN);
request.addProperty("onXML", userauth_xml);
+ Log.d("loginrequest", String.valueOf(request));
SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(
SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
-
- HttpTransportSE androidHttpTransport = new HttpTransportSE(
+ try {
+ HttpTransportSE androidHttpTransport = new HttpTransportSE(
+ CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION_LOGIN,
+ envelope);
+ } catch (Exception e){
+ Log.e("httpexception",e.getMessage());
+ }
+ /*HttpTransportSE androidHttpTransport = new HttpTransportSE(
CommonString.URL);
-
androidHttpTransport.call(CommonString.SOAP_ACTION_LOGIN,
- envelope);
+ envelope);*/
Object result = (Object) envelope.getResponse();
@@ -570,24 +569,18 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
} else if (result.toString().equalsIgnoreCase(
CommonString.KEY_FALSE)) {
-
runOnUiThread(new Runnable() {
-
@Override
public void run() {
-
showAlert(CommonString.MESSAGE_FALSE);
}
});
} else if (result.toString().equalsIgnoreCase(
CommonString.KEY_CHANGED)) {
-
runOnUiThread(new Runnable() {
-
@Override
public void run() {
-
showAlert(CommonString.MESSAGE_CHANGED);
}
});
@@ -635,15 +628,16 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
} catch (IOException e) {
e.printStackTrace();
}
-
// PUT IN PREFERENCES
editor.putString(CommonString.KEY_USERNAME, userid);
editor.putString(CommonString.KEY_PASSWORD, password);
editor.putString(CommonString.KEY_VERSION, lgs.getAPP_VERSION());
editor.putString(CommonString.KEY_PATH, lgs.getAPP_PATH());
+ //editor.putString(CommonString.KEY_DATE, "12/05/2022");
editor.putString(CommonString.KEY_DATE, lgs.getCURRENTDATE());
//editor.putString(CommonString.KEY_DATE, "01/25/2019");
editor.putString(CommonString.KEY_COUNTRY_ID, lgs.getCOUNTRY_ID());
+ Log.e("countryid",lgs.getCOUNTRY_ID());
editor.commit();
setDataFromSharedPreferences(lgs);
@@ -707,7 +701,6 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
});
}
return "";
-
}
@Override
@@ -719,7 +712,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
if (result.equals(CommonString.KEY_SUCCESS)) {
// manually set true for South Africa
boolean forSA = false;
-// database.open();
+ // database.open();
if (forSA) {
//For SA Only
if (preferences.getString(CommonString.KEY_LANGUAGE, "").equals("")) {
@@ -752,20 +745,16 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
finish();
//uploadPreviousImages();
}
-
} else {
Intent intent = new Intent(getBaseContext(), AutoUpdateActivity.class);
intent.putExtra(CommonString.KEY_PATH, preferences.getString(CommonString.KEY_PATH, ""));
startActivity(intent);
finish();
-
}
}
-
}
dialog.dismiss();
}
-
}
public void showAlert(String str) {
@@ -810,10 +799,23 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
cdate = arabicToenglish(cdate);
} else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
cdate = arabicToenglish(cdate);
- }else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_JORDAN)) {
+ } else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_JORDAN)) {
+ cdate = arabicToenglish(cdate);
+ }else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KUWAIT)) {
+ cdate = arabicToenglish(cdate);
+ }else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_BAHRAIN)) {
+ cdate = arabicToenglish(cdate);
+ }else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_OMAN)) {
+ cdate = arabicToenglish(cdate);
+ }else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_QATAR)) {
+ cdate = arabicToenglish(cdate);
+ }
+ else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_LEBANON)) {
+ cdate = arabicToenglish(cdate);
+ }
+ else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_LIBIYA)) {
cdate = arabicToenglish(cdate);
}
-
return cdate;
}
@@ -873,8 +875,6 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
e.printStackTrace();
sendToMain();
}
-
-
}
public void sendToMain() {
@@ -962,7 +962,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
.addApi(LocationServices.API)
.build();
}
- //attemptLogin();
+ attemptLogin();
}
}
@@ -1124,6 +1124,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
@Override
public void onConnected(Bundle bundle) {
+ Log.e("onConnectdata","true" + ","+mGoogleApiClient);
if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
// TODO: Consider calling
// ActivityCompat#requestPermissions
@@ -1135,6 +1136,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
return;
}
mLastLocation = LocationServices.FusedLocationApi.getLastLocation(mGoogleApiClient);
+// Log.e("mlastlocationdata",mLastLocation.getLatitude() + ","+mLastLocation.getLongitude() + ","+mLastLocation);
if (ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
|| ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
if (mLastLocation != null) {
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
index 28a0bf4..1db9663 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
@@ -106,9 +106,7 @@ public class MainActivity extends AppCompatActivity
webView.getSettings().setJavaScriptEnabled(true);
if (!url.equals("")) {
-
webView.loadUrl(url);
-
}
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
@@ -315,7 +313,6 @@ public class MainActivity extends AppCompatActivity
int id = item.getItemId();
if (id == R.id.nav_route_plan) {
-
Intent in_jcp = new Intent(this, StoreListActivity.class);
in_jcp.putExtra(CommonString.KEY_STORE_FLAG, CommonString.FROM_JCP);
startActivity(in_jcp);
@@ -345,13 +342,10 @@ public class MainActivity extends AppCompatActivity
Snackbar.make(webView, R.string.title_store_list_download_data, Snackbar.LENGTH_SHORT)
.setAction("Action", null).show();
-
// Toast.makeText(getBaseContext(), "Please Download Data First", Toast.LENGTH_LONG).show();
} else {
-
if (coverageList.size() == 0) {
Snackbar.make(webView, R.string.no_data_for_upload, Snackbar.LENGTH_SHORT).setAction("Action", null).show();
-
} else {
if (isStoreCheckedIn() && isValid()) {
@@ -446,7 +440,6 @@ public class MainActivity extends AppCompatActivity
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
} else if (id == R.id.nav_planogram) {
-
if (checkNetIsAvailable()) {
Intent planogram_pdf = new Intent(this, PlanogramPDFActivity.class);
startActivity(planogram_pdf);
@@ -469,10 +462,8 @@ public class MainActivity extends AppCompatActivity
// Toast.makeText(getBaseContext(), "Please Download Data First", Toast.LENGTH_LONG).show();
} else {
-
Intent in = new Intent(this, StoreListActivity.class);
in.putExtra(CommonString.KEY_STORE_FLAG, CommonString.FROM_DEVIATION);
-
startActivity(in);
// overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MovableFloatingActionButton.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MovableFloatingActionButton.java
new file mode 100644
index 0000000..f0969a8
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MovableFloatingActionButton.java
@@ -0,0 +1,98 @@
+package cpm.com.gskmtorange;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+public class MovableFloatingActionButton extends FloatingActionButton implements View.OnTouchListener {
+
+ private final static float CLICK_DRAG_TOLERANCE = 10; // Often, there will be a slight, unintentional, drag when the user taps the FAB, so we need to account for this.
+
+ private float downRawX, downRawY;
+ private float dX, dY;
+
+ public MovableFloatingActionButton(Context context) {
+ super(context);
+ init();
+ }
+
+ public MovableFloatingActionButton(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ init();
+ }
+
+ public MovableFloatingActionButton(Context context, AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ init();
+ }
+
+ private void init() {
+ setOnTouchListener(this);
+ }
+
+ @Override
+ public boolean onTouch(View view, MotionEvent motionEvent){
+
+ int action = motionEvent.getAction();
+ if (action == MotionEvent.ACTION_DOWN) {
+
+ downRawX = motionEvent.getRawX();
+ downRawY = motionEvent.getRawY();
+ dX = view.getX() - downRawX;
+ dY = view.getY() - downRawY;
+
+ return true; // Consumed
+
+ }
+ else if (action == MotionEvent.ACTION_MOVE) {
+
+ int viewWidth = view.getWidth();
+ int viewHeight = view.getHeight();
+
+ View viewParent = (View)view.getParent();
+ int parentWidth = viewParent.getWidth();
+ int parentHeight = viewParent.getHeight();
+
+ float newX = motionEvent.getRawX() + dX;
+ newX = Math.max(0, newX); // Don't allow the FAB past the left hand side of the parent
+ newX = Math.min(parentWidth - viewWidth, newX); // Don't allow the FAB past the right hand side of the parent
+
+ float newY = motionEvent.getRawY() + dY;
+ newY = Math.max(0, newY); // Don't allow the FAB past the top of the parent
+ newY = Math.min(parentHeight - viewHeight, newY); // Don't allow the FAB past the bottom of the parent
+
+ view.animate()
+ .x(newX)
+ .y(newY)
+ .setDuration(0)
+ .start();
+
+ return true; // Consumed
+
+ }
+ else if (action == MotionEvent.ACTION_UP) {
+
+ float upRawX = motionEvent.getRawX();
+ float upRawY = motionEvent.getRawY();
+
+ float upDX = upRawX - downRawX;
+ float upDY = upRawY - downRawY;
+
+ if (Math.abs(upDX) < CLICK_DRAG_TOLERANCE && Math.abs(upDY) < CLICK_DRAG_TOLERANCE) { // A click
+ return performClick();
+ }
+ else { // A drag
+ return true; // Consumed
+ }
+
+ }
+ else {
+ return super.onTouchEvent(motionEvent);
+ }
+
+ }
+
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java
index 631f66c..981130c 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java
@@ -27,15 +27,12 @@ import cpm.com.gskmtorange.password.MPinActivity;
import cpm.com.gskmtorange.xmlGetterSetter.LoginGetterSetter;
public class SelectLanguageActivity extends AppCompatActivity implements View.OnClickListener {
-
Button btn_lang_1, btn_lang_2;
private Context context;
private SharedPreferences preferences = null;
private SharedPreferences.Editor editor = null;
-
LoginGetterSetter login_data;
ArrayList language, culture_id;
-
boolean selected_flag = false;
@Override
@@ -47,36 +44,26 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On
context = this;
preferences = PreferenceManager.getDefaultSharedPreferences(this);
editor = preferences.edit();
-
btn_lang_1 = (Button) findViewById(R.id.btn_language_one);
btn_lang_2 = (Button) findViewById(R.id.btn_language_two);
-
-
login_data = (LoginGetterSetter) getIntent().getSerializableExtra(CommonString.KEY_LOGIN_DATA);
language = login_data.getCULTURE_NAME();
culture_id = login_data.getCULTURE_ID();
-
setDataFromSharedPreferences(login_data);
-
if (language.size() > 1) {
-
btn_lang_1.setText(language.get(0));
btn_lang_2.setText(language.get(1));
-
btn_lang_1.setOnClickListener(this);
btn_lang_2.setOnClickListener(this);
}
-
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
-
if (selected_flag) {
/* Intent intent = new Intent(getBaseContext(),
MainActivity.class);
-
intent.putExtra(CommonString.KEY_LOGIN_DATA, login_data);
startActivity(intent);
finish();*/
@@ -103,38 +90,34 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On
selected_flag = true;
CommonFunctions.updateLangResources(context, language.get(0));
btn_lang_1.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
+ btn_lang_1.setTextColor(getResources().getColor(R.color.white));
+ btn_lang_2.setTextColor(getResources().getColor(R.color.black));
btn_lang_2.setBackgroundColor(getResources().getColor(R.color.grey_background));
editor.putString(CommonString.KEY_LANGUAGE, language.get(0));
editor.putString(CommonString.KEY_CULTURE_ID, culture_id.get(0));
editor.putString(CommonString.KEY_NOTICE_BOARD_LINK, login_data.getNOTICE_URL().get(0));
editor.commit();
-
break;
case R.id.btn_language_two:
-
selected_flag = true;
-
CommonFunctions.updateLangResources(context, language.get(1));
-
btn_lang_1.setBackgroundColor(getResources().getColor(R.color.grey_background));
+ btn_lang_1.setTextColor(getResources().getColor(R.color.black));
+ btn_lang_2.setTextColor(getResources().getColor(R.color.white));
btn_lang_2.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
-
editor.putString(CommonString.KEY_LANGUAGE, language.get(1));
editor.putString(CommonString.KEY_CULTURE_ID, culture_id.get(1));
editor.putString(CommonString.KEY_NOTICE_BOARD_LINK, login_data.getNOTICE_URL().get(1));
editor.commit();
-
break;
}
}
-
-
+
private void setDataFromSharedPreferences(LoginGetterSetter lgs) {
Gson gson = new Gson();
String jsonCurProduct = gson.toJson(lgs);
SharedPreferences.Editor editor = preferences.edit();
-
editor.putString(CommonString.KEY_LOOGIN_PREF, jsonCurProduct);
editor.commit();
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SplashScreenActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SplashScreenActivity.java
index 84a31f0..216d101 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SplashScreenActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SplashScreenActivity.java
@@ -4,11 +4,14 @@ import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.PixelFormat;
+import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.preference.PreferenceManager;
import android.util.Log;
+import android.view.View;
import android.view.Window;
+import android.view.WindowManager;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.ImageView;
@@ -40,13 +43,14 @@ public class SplashScreenActivity extends AppCompatActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
setContentView(R.layout.activity_splash_main_layout);
linearLayout = findViewById(R.id.lin_lay);
preferences = PreferenceManager.getDefaultSharedPreferences(this);
context = this;
- StartAnimations();
+ //StartAnimations();
sendToLogin();
@@ -83,7 +87,7 @@ public class SplashScreenActivity extends AppCompatActivity {
*/
}
- private void StartAnimations() {
+ /* private void StartAnimations() {
Animation anim = AnimationUtils.loadAnimation(this, R.anim.alpha);
anim.reset();
LinearLayout l=(LinearLayout) findViewById(R.id.lin_lay);
@@ -96,7 +100,7 @@ public class SplashScreenActivity extends AppCompatActivity {
iv.clearAnimation();
iv.startAnimation(anim);
- }
+ }*/
public void sendToLogin(){
new Handler().postDelayed(new Runnable() {
@@ -108,40 +112,12 @@ public class SplashScreenActivity extends AppCompatActivity {
@Override
public void run() {
- // This method will be executed once the timer is over
- // Start your app main activity
-
- /* SharedPreferences sharedpreferences = getSharedPreferences("MyPref", Context.MODE_PRIVATE);
-
- boolean isLoggedIn = sharedpreferences.getBoolean("isLoggedIn", false);
-
- if (isLoggedIn) {
-
- Intent i = new Intent(SplashScreenActivity.this, LoginActivity.class);
- startActivity(i);
- } else {
-
- Intent i = new Intent(SplashScreenActivity.this, LoginActivity.class);
- startActivity(i);
-
- }*/
-
- // close this activity
- //before MPin
- /* Intent i = new Intent(SplashScreenActivity.this, LoginActivity.class);
- startActivity(i);
-
- overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
-
- finish();*/
-
//after Mpin
String mpin = preferences.getString(CommonString.MPIN, null);
if(mpin!=null){
Intent in = new Intent(context, MPinActivity.class);
in.putExtra(CommonString.IS_PASSWORD_CHECK, true);
startActivity(in);
-
finish();
}
else {
@@ -167,14 +143,4 @@ public class SplashScreenActivity extends AppCompatActivity {
return null;
}
- /* public boolean isValidDateForUpload(String dateImg){
- boolean flag=false;
- SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
- Date strDate = sdf.parse(valid_until);
- if (System.currentTimeMillis() > strDate.getTime()) {
- flag = true;
- }
-
- return flag;
- }*/
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java
index a1a3106..f025193 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java
@@ -15,6 +15,7 @@ import android.os.Build;
import android.os.Environment;
import android.preference.PreferenceManager;
import android.os.Bundle;
+import android.util.Log;
import android.widget.ProgressBar;
import android.widget.TextView;
@@ -141,6 +142,7 @@ public class AutoUpdateActivity extends AppCompatActivity {
String size = new DecimalFormat("##.##")
.format((double) ((double) length / 1024) / 1024)
+ " MB";
+ Log.e("appsize",size);
String PATH = Environment.getExternalStorageDirectory()
+ "/download/";
@@ -294,12 +296,9 @@ public class AutoUpdateActivity extends AppCompatActivity {
activity.startActivity(i);
activity.finish();*/
finish();
-
}
});
AlertDialog alert = builder.create();
alert.show();
}
-
-
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonFunctions.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonFunctions.java
index 0b158bd..f4c5329 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonFunctions.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonFunctions.java
@@ -12,9 +12,11 @@ import android.preference.PreferenceManager;
import android.view.ViewTreeObserver;
import android.widget.ImageView;
+import java.io.UnsupportedEncodingException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Locale;
+
import android.app.AlertDialog;
import cpm.com.gskmtorange.R;
@@ -25,9 +27,7 @@ import cpm.com.gskmtorange.interfaces.DialogCallbackListener;
*/
public class CommonFunctions {
-
public static boolean updateLangResources(Context context, String language) {
-
String lang;
if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
@@ -37,43 +37,60 @@ public class CommonFunctions {
lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
} else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
+ } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_EGYPT)) {
+ } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_EGYPT)) {
lang = CommonString.KEY_RETURN_LANGUAGE_EGYPT;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_JORDAN)) {
+ } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_JORDAN)) {
lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
- }else{
+ } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KUWAIT)) {
+ lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
+ } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_BAHRAIN)) {
+ lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
+ } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_OMAN)) {
+ lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
+ }
+ else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_QATAR)) {
+ lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
+ }
+ else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_LIBIYA)) {
+ lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
+ }
+ else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_LEBANON)) {
+ lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
+ }
+ else {
lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
}
Locale locale = new Locale(lang);
Locale.setDefault(locale);
-
Resources resources = context.getResources();
-
Configuration configuration = resources.getConfiguration();
configuration.locale = locale;
-
resources.updateConfiguration(configuration, resources.getDisplayMetrics());
-
return true;
}
public static String getCurrentTimeWithLanguage(Context context) {
-
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
Calendar m_cal = Calendar.getInstance();
-
String cdate = formatter.format(m_cal.getTime());
- SharedPreferences preferences = preferences = PreferenceManager.getDefaultSharedPreferences(context);;
+ //SharedPreferences preferences = preferences = PreferenceManager.getDefaultSharedPreferences(context);
+ SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)
+ ////aDDED NEW COUNTRY FOR TIME BY JP
+ || preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KUWAIT)
+ || preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_BAHRAIN)
+ || preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_OMAN)
+ || preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_QATAR)
+ || preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_LEBANON)
+ || preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_LIBIYA)
|| preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)
|| preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_JORDAN)
|| preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_EGYPT)) {
cdate = arabicToenglish(cdate);
}
-
return cdate;
}
@@ -90,6 +107,25 @@ public class CommonFunctions {
return new String(chars);
}
+ /* private static String arabicToenglish(String number) {
+ String abc ="";
+ try {
+ abc = new String(number.getBytes("UTF-8"), "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ char[] chars = new char[abc.length()];
+ for (int i = 0; i < abc.length(); i++) {
+ char ch = abc.charAt(i);
+ if (ch >= 0x0660 && ch <= 0x0669)
+ ch -= 0x0660 - '0';
+ else if (ch >= 0x06f0 && ch <= 0x06F9)
+ ch -= 0x06f0 - '0';
+ chars[i] = ch;
+ }
+ return new String(chars);
+ }*/
+
public static void setScaledImage(ImageView imageView, final String path) {
final ImageView iv = imageView;
ViewTreeObserver viewTreeObserver = iv.getViewTreeObserver();
@@ -104,8 +140,7 @@ public class CommonFunctions {
});
}
- private static Bitmap decodeSampledBitmapFromPath(String path,
- int reqWidth, int reqHeight) {
+ private static Bitmap decodeSampledBitmapFromPath(String path, int reqWidth, int reqHeight) {
// First decode with inJustDecodeBounds = true to check dimensions
final BitmapFactory.Options options = new BitmapFactory.Options();
options.inJustDecodeBounds = true;
@@ -139,7 +174,7 @@ public class CommonFunctions {
return inSampleSize;
}
- public static void showAlertDialog(final Context context, String msg){
+ public static void showAlertDialog(final Context context, String msg) {
final DialogCallbackListener[] mListener = new DialogCallbackListener[1];
@@ -174,12 +209,9 @@ public class CommonFunctions {
dialog.cancel();
}
});
-
// create alert dialog
AlertDialog alertDialog = alertDialogBuilder.create();
-
// show it
alertDialog.show();
-
}
}
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 2ed4d2e..ee02f80 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
@@ -5,14 +5,9 @@ import android.os.Environment;
/**
* Created by yadavendras on 19-12-2016.
*/
-
public class CommonString {
-
- public static final String BACKUP_PATH = Environment.getExternalStorageDirectory().getPath()+ "/gsk_orange_backup";
- // String path = Environment.getExternalStorageDirectory().getPath()+ "/gsk_orange_backup";
-
+ public static final String BACKUP_PATH = Environment.getExternalStorageDirectory().getPath() + "/gsk_orange_backup";
// webservice constants
-
// preferenec keys
public static final String KEY_USERNAME = "username";
public static final String KEY_PASSWORD = "password";
@@ -69,6 +64,7 @@ public class CommonString {
public static final String KEY_LOGIN_DONE = "IS_LOGGED_IN";
public static final String KEY_DOWNLOAD_DONE = "IS_DOWNLOAD_DONE";
+ public static final String KEY_STOCK_MAPPING = "STOCK_MAPPING";
//KEYS RELATED TO T2P COMPLIANCE
@@ -136,8 +132,8 @@ public class CommonString {
public static final String KEY_SUB_CATEGORY = "SUB_CATEGORY";
public static final String KEY_SUB_CATEGORY_ID = "SUB_CATEGORY_ID";
public static final String KEY_FROM = "FROM";
- public static final String KEY_CHAT_ID= "CHAT_ID";
- public static final String KEY_MESSAGE= "MESSAGE";
+ public static final String KEY_CHAT_ID = "CHAT_ID";
+ public static final String KEY_MESSAGE = "MESSAGE";
public static final String KEY_NO_DATA = "NODATA";
@@ -146,11 +142,15 @@ public class CommonString {
public static final int UNIT_VERTICAL = 50;
public static final int UNIT_HORIZONTAL = 200;
- public static String URL = "http://gskme.parinaam.in/Gskwebservice.asmx";
-
- //temp remove
- //public static String URL = "http://gskmetest.parinaam.in/Gskwebservice.asmx";
+// public static String URL = "http://gskme.parinaam.in/Gskwebservice.asmx";
+ public static String URL = "http://gskmeIR.parinaam.in/Gskwebservice.asmx";
+ // public static String URL = "https://gskme1.parinaam.in/Gskwebservice.asmx";
+ //Added new Test url for Turkey
+ // public static String URL = "http://gskmetest.parinaam.in/Gskwebservice.asmx";
+ // public static String URL = "https://haleonme.parinaam.in/Gskwebservice.asmx";
+ //public static String URL = " https://gskme1.parinaam.in/Gskwebservice.asmx";
+ //public static String URL = "https://gskme-test.parinaam.in/Gskwebservice.asmx";
public static final String NAMESPACE = "http://tempuri.org/";
public static final String METHOD_LOGIN = "UserLoginDetail";
@@ -246,7 +246,11 @@ public class CommonString {
+ KEY_COVERAGE_REMARK + " VARCHAR,"
+ KEY_CHECKOUT_IMAGE + " VARCHAR,"
+ KEY_STORE_FLAG + " VARCHAR,"
- + KEY_REASON + " VARCHAR)";
+ + KEY_KEYACCOUNT_ID + " INTEGER,"
+ + KEY_STORETYPE_ID + " INTEGER,"
+ + KEY_CLASS_ID + " INTEGER,"
+ + KEY_REASON + " VARCHAR,"
+ + KEY_STOCK_MAPPING + " VARCHAR)";
public static final String TABLE_COACHING_VISIT = "COACHING_VISIT";
@@ -266,10 +270,10 @@ public class CommonString {
public static final String KEY_ADDRESS = "ADDRESS";
- public static final String CREATE_TABLE_DELIVERY_CALLS= "CREATE TABLE IF NOT EXISTS " + TABLE_DELIVERY_CALLS
+ public static final String CREATE_TABLE_DELIVERY_CALLS = "CREATE TABLE IF NOT EXISTS " + TABLE_DELIVERY_CALLS
+ " ("
+ KEY_ID + " INTEGER PRIMARY KEY AUTOINCREMENT ,"
- + KEY_STORE_NAME+ " NVARCHAR,"
+ + KEY_STORE_NAME + " NVARCHAR,"
+ KEY_ADDRESS + " VARCHAR,"
+ KEY_IMAGE + " VARCHAR,"
+ KEY_IMAGE1 + " VARCHAR,"
@@ -933,9 +937,15 @@ public class CommonString {
public static final String KEY_LANGUAGE_TURKISH = "TURKISH";
public static final String KEY_RETURE_LANGUAGE_TURKISH = "TR";
-
+ public static final String KEY_LANGUAGE_ARABIC_KUWAIT = "ARABIC-KUWAIT";
+ public static final String KEY_LANGUAGE_ARABIC_BAHRAIN = "ARABIC-BAHRAIN";
+ public static final String KEY_LANGUAGE_ARABIC_OMAN = "ARABIC-OMAN";
+ public static final String KEY_LANGUAGE_ARABIC_QATAR = "ARABIC-QATAR";
+ public static final String KEY_LANGUAGE_ARABIC_LEBANON = "ARABIC-LEBANON";
+ public static final String KEY_LANGUAGE_ARABIC_LIBIYA = "ARABIC-LIBYA";
public static final String KEY_LANGUAGE_OMAN = "English";
public static final String KEY_RETURE_LANGUAGE_OMAN = "EN";
+
public static final String KEY_RETURN_LANGUAGE_EGYPT = "AR";
public static final String KEY_LANGUAGE_ARABIC_UAE = "ARABIC-UAE";
public static final String KEY_LANGUAGE_ARABIC_EGYPT = "ARABIC-EGYPT";
@@ -943,6 +953,11 @@ public class CommonString {
public static final String KEY_RETURE_LANGUAGE_UAE_ARABIC = "AR";
public static final String TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING = "Msl_Availability_Stock_Facing_Data";
+ public static final String TABLE_INSERT_STOCK_ENTRY = "STOCK_ENTRY";
+ public static final String TABLE_INSERT_ORDER_TAKING_DATA = "ORDER_TAKING_DATA";
+ public static final String TABLE_INSERT_ORDER_RECEIVED_DATA = "ORDER_RECEIVED_STATUS_DATA";
+ public static final String POSM_STOCK = "POSM_STOCK";
+ public static final String WAREHOUSE_STOCK = "WAREHOUSE_STOCK";
public static final String TABLE_INSERT_NO_CAMERA_FACING_DATA = "NO_CAMERA_FACING_DATA";
@@ -952,48 +967,78 @@ public class CommonString {
+ "KEY_ID"
+ " INTEGER PRIMARY KEY AUTOINCREMENT ,"
+ + KEY_VISIT_DATE
+ + " VARCHAR,"
+
+ "Store_Id"
+ " INTEGER,"
+ "Category_Id"
+ " INTEGER,"
-
+ "Brand_Id"
+ " VARCHAR,"
-
+ "SKU_ID"
+ " INTEGER,"
-
+ "SKU"
+ " VARCHAR,"
-
+ "SKU_SEQUENCE"
+ " VARCHAR,"
-
+ "MBQ"
+ " VARCHAR,"
-
+ "COMPANY_ID"
+ " INTEGER,"
-
+ "FACING"
+ " REAL,"
-
+ "STOCK"
+ " INTEGER,"
-
+ "PRICING"
+ " INTEGER,"
-
+ "PRICING_DEFAULT"
+ " VARCHAR,"
-
+ "TOGGLE_VALUE"
+ " VARCHAR,"
-
+ "MUST_HAVE"
+ " VARCHAR"
+ + ")";
+ public static final String CREATE_TABLE_INSERT_STOCK = "CREATE TABLE IF NOT EXISTS "
+ + TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING
+ + "("
+ + "KEY_ID"
+ + " INTEGER PRIMARY KEY AUTOINCREMENT ,"
+
+ + KEY_VISIT_DATE
+ + " VARCHAR,"
+
+ + "Store_Id"
+ + " INTEGER,"
+
+ + "Category_Id"
+ + " INTEGER,"
+ + "Brand_Id"
+ + " VARCHAR,"
+ + "SKU_ID"
+ + " INTEGER,"
+ + "SKU"
+ + " VARCHAR,"
+ + "SKU_SEQUENCE"
+ + " VARCHAR,"
+ + "MBQ"
+ + " VARCHAR,"
+ + "COMPANY_ID"
+ + " INTEGER,"
+ + "FACING"
+ + " REAL,"
+ + "STOCK"
+ + " INTEGER,"
+ + "PRICING"
+ + " INTEGER,"
+ + "PRICING_DEFAULT"
+ + " VARCHAR,"
+ + "TOGGLE_VALUE"
+ + " VARCHAR,"
+ + "MUST_HAVE"
+ + " VARCHAR"
+ ")";
public static final String KEY_ROW_NO = "ROW_NO";
@@ -1057,7 +1102,10 @@ public class CommonString {
+ " VARCHAR,"
+ "REMARK"
- + " VARCHAR"
+ + " VARCHAR,"
+
+ + "MAX_LENGHT"
+ + " INTEGER"
+ ")";
@@ -1188,12 +1236,15 @@ public class CommonString {
public static final String TABLE_INSERT_STOCK = "Stock_Data";
- public static final String CREATE_TABLE_INSERT_STOCK = "CREATE TABLE IF NOT EXISTS "
- + TABLE_INSERT_STOCK
+ public static final String CREATE_TABLE_INSERT_STOCK_ENTRY = "CREATE TABLE IF NOT EXISTS "
+ + TABLE_INSERT_STOCK_ENTRY
+ "("
+ "KEY_ID"
+ " INTEGER PRIMARY KEY AUTOINCREMENT ,"
+ + KEY_VISIT_DATE
+ + " VARCHAR,"
+
+ "Store_Id"
+ " INTEGER,"
@@ -1218,15 +1269,29 @@ public class CommonString {
+ "COMPANY_ID"
+ " INTEGER,"
+ + "FACING"
+ + " REAL,"
+
+ "STOCK"
+ " INTEGER,"
+ + "PRICING"
+ + " INTEGER,"
+
+ + "PRICING_DEFAULT"
+ + " VARCHAR,"
+
+ + POSM_STOCK
+ + " INTEGER,"
+
+ + WAREHOUSE_STOCK
+ + " INTEGER,"
+
+ "TOGGLE_VALUE"
+ " VARCHAR,"
+ "MUST_HAVE"
+ " VARCHAR"
-
+ ")";
public static final String TABLE_INSERT_STORE_PROFILE_DATA = "Store_Profile_Data";
@@ -1258,7 +1323,7 @@ public class CommonString {
+ KEY_IMAGE4 + " INTEGER)";
public static final String TABLE_INSERT_SOS_PHARMA_DATA = "SOS_PHARMA_DATA";
- public static final String KEY_GSK_FACING= "GSK_FACING";
+ public static final String KEY_GSK_FACING = "GSK_FACING";
public static final String KEY_COMPETITION_FACING = "COMPETITION_FACING";
public static final String CREATE_TABLE_INSERT_SOS_PHARMA_DATA = "CREATE TABLE IF NOT EXISTS " + TABLE_INSERT_SOS_PHARMA_DATA
@@ -1362,4 +1427,107 @@ public class CommonString {
+ KEY_IMAGE + " VARCHAR,"
+ KEY_EXIST + " INTEGER)";
+ public static final String CREATE_TABLE_INSERT_ORDER_TAKING_DATA = "CREATE TABLE IF NOT EXISTS "
+ + TABLE_INSERT_ORDER_TAKING_DATA
+ + " ("
+
+ + "KEY_ID"
+ + " INTEGER PRIMARY KEY AUTOINCREMENT ,"
+
+ + "IsExist"
+ + " INTEGER,"
+
+ + "Sys_PO_No"
+ + " VARCHAR,"
+
+ + "Store_PO_No"
+ + " VARCHAR,"
+
+ + "PO_Date"
+ + " VARCHAR,"
+
+ + "PO_IMAGE"
+ + " VARCHAR,"
+
+ + "Store_Id"
+ + " INTEGER,"
+
+ + "Category_Id"
+ + " INTEGER,"
+
+ + "BRAND_ID"
+ + " INTEGER,"
+
+ + "SKU_ID"
+ + " INTEGER,"
+
+ + "SKU"
+ + " VARCHAR,"
+
+ + "SKU_SEQUENCE"
+ + " VARCHAR,"
+
+ + "Order_Qty"
+ + " INTEGER,"
+
+ + "COMPANY_ID"
+ + " INTEGER)";
+
+ public static final String CREATE_TABLE_INSERT_ORDER_RECEIVED_DATA = "CREATE TABLE IF NOT EXISTS "
+ + TABLE_INSERT_ORDER_RECEIVED_DATA
+ + " ("
+
+ + "KEY_ID"
+ + " INTEGER PRIMARY KEY AUTOINCREMENT ,"
+
+ + "Sys_PO_No"
+ + " VARCHAR,"
+
+ + "Store_PO_No"
+ + " VARCHAR,"
+
+ + "PO_Date"
+ + " VARCHAR,"
+
+ + "Store_Id"
+ + " INTEGER,"
+
+ + "Category_Id"
+ + " INTEGER,"
+
+ + "BRAND_ID"
+ + " INTEGER,"
+
+ + "SKU_ID"
+ + " INTEGER,"
+
+ + "SKU"
+ + " VARCHAR,"
+
+ + "SKU_SEQUENCE"
+ + " VARCHAR,"
+
+ + "PO_Qty"
+ + " INTEGER,"
+
+ + "ACTUAL_Qty"
+ + " INTEGER,"
+
+ + "COMPANY_ID"
+ + " INTEGER,"
+
+ + "POID"
+ + " INTEGER)";
+
+ public static final String TABLE_VISIT_TYPE = "VISIT_TYPE";
+ public static final String KEY_VISIT_ID = "VISIT_TYPE_ID";
+
+ public static final String CREATE_TABLE_VISIT_TYPE = "CREATE TABLE IF NOT EXISTS " + TABLE_VISIT_TYPE
+ + " ("
+ + KEY_ID + " INTEGER PRIMARY KEY AUTOINCREMENT ,"
+ + KEY_STORE_ID + " INTEGER,"
+ + KEY_VISIT_DATE + " VARCHAR,"
+ + KEY_VISIT_ID + " INTEGER)";
+
+
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalPromoSKUwiseActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalPromoSKUwiseActivity.java
index ce7cb96..0819268 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalPromoSKUwiseActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalPromoSKUwiseActivity.java
@@ -14,6 +14,7 @@ import android.os.Build;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.provider.MediaStore;
+import android.text.method.DigitsKeyListener;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -41,6 +42,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.google.android.material.snackbar.Snackbar;
import java.io.File;
+import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;
@@ -56,18 +58,18 @@ import cpm.com.gskmtorange.xmlGetterSetter.SelectGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter;
-public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements AdapterView.OnItemSelectedListener, View.OnClickListener{
+public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements AdapterView.OnItemSelectedListener, View.OnClickListener {
private Context context;
GSKOrangeDB db;
String store_id, visit_date, username, intime, date;
String categoryName, categoryId;
- String sub_category="", sub_category_id="0", brand="", brand_id="0", sku="", sku_id="0", discount="", price="", _pathforcheck = "", _path = "", img_str="", country_id;
+ String sub_category = "", sub_category_id = "0", brand = "", brand_id = "0", sku = "", sku_id = "0", discount = "", price = "", _pathforcheck = "", _path = "", img_str = "", country_id;
private SharedPreferences preferences;
Spinner spinner_sub_category_list, spinner_brand_list, spinner_sku_list, sp_flasher;
ArrayList sub_category_list;
ArrayList brand_list = new ArrayList<>();
- ArrayList sku_list= new ArrayList<>();
+ ArrayList sku_list = new ArrayList<>();
Toolbar toolbar;
FloatingActionButton fab_save, fab_add;
@@ -108,6 +110,7 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
img_cam = (ImageView) findViewById(R.id.img_promotion_add);
lin_parent = (LinearLayout) findViewById(R.id.lin_parent_promo);
btntoggle = (ToggleButton) findViewById(R.id.btntoggle);
+
context = this;
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
@@ -115,6 +118,7 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
visit_date = preferences.getString(CommonString.KEY_DATE, null);
username = preferences.getString(CommonString.KEY_USERNAME, null);
country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, null);
+ et_price.setKeyListener(DigitsKeyListener.getInstance(false, true));
CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
@@ -127,32 +131,30 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
//Enable camera compulsory According to Configuration
ArrayList configurationData = db.getConfigurationMasterData(country_id);
- if(configurationData.size()>0){
- for(int i=0; i 0) {
+ for (int i = 0; i < configurationData.size(); i++) {
- if(configurationData.get(i).getCONFIGURE().get(0).equalsIgnoreCase("ADDITIONAL_PROMO_SKUWISE_IMAGE_MANDATORY") &&
- configurationData.get(i).getACTIVE().get(0).equalsIgnoreCase("1")){
+ if (configurationData.get(i).getCONFIGURE().get(0).equalsIgnoreCase("ADDITIONAL_PROMO_SKUWISE_IMAGE_MANDATORY") && configurationData.get(i).getACTIVE().get(0).equalsIgnoreCase("1")) {
is_camera_compulsory = true;
}
}
}
- if(is_camera_compulsory){
+ if (is_camera_compulsory) {
img_cam.setBackgroundResource(R.drawable.camera_orange_star_green);
}
//Promo SKU List
exists_data = db.getPromoComplianceSkuwiseExistsAfterData(store_id, categoryId);
- if(exists_data.size()>0){
+ if (exists_data.size() > 0) {
isExists = exists_data.get(0).isExists();
- if(exists_data.get(0).isExists()){
+ if (exists_data.get(0).isExists()) {
added_promo_list = db.getPromoComplianceSkuwiseAfterData(store_id, categoryId);
- }
- else {
+ } else {
fab_add.hide();//.setVisibility(View.GONE);
added_promo_list.clear();
- if(promoAdapter!=null){
+ if (promoAdapter != null) {
promoAdapter.list.clear();
promoAdapter.notifyDataSetChanged();
}
@@ -163,7 +165,7 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
btntoggle.setChecked(isExists);
- if(added_promo_list.size()>0){
+ if (added_promo_list.size() > 0) {
rec_added_promo.setLayoutManager(new LinearLayoutManager(context));
promoAdapter = new PromoAdapter(added_promo_list);
rec_added_promo.setAdapter(promoAdapter);
@@ -211,7 +213,6 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
@Override
protected void onResume() {
super.onResume();
-
toolbar.setTitle(getResources().getString(R.string.title_activity_promo_compliance));
}
@@ -221,7 +222,7 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
switch (parent.getId()) {
case R.id.sp_sub_category:
- if(position!=0){
+ if (position != 0) {
sub_category = sub_category_list.get(position).getSub_category();
sub_category_id = sub_category_list.get(position).getSub_category_id();
@@ -236,8 +237,7 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
spinner_brand_list.setAdapter(adapter);
spinner_brand_list.setOnItemSelectedListener(this);
- }
- else {
+ } else {
clearBrandSpinner();
}
@@ -246,7 +246,7 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
case R.id.sp_brand:
- if(position!=0){
+ if (position != 0) {
brand = brand_list.get(position).getBRAND().get(0);
brand_id = brand_list.get(position).getBRAND_ID().get(0);
@@ -261,8 +261,7 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
spinner_sku_list.setAdapter(adapter);
spinner_sku_list.setOnItemSelectedListener(this);
- }
- else {
+ } else {
clearSkuSpinner();
}
@@ -271,7 +270,7 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
case R.id.sp_sku:
- if(position!=0) {
+ if (position != 0) {
sku = sku_list.get(position).getSKU().get(0);
sku_id = sku_list.get(position).getSKU_ID().get(0);
}
@@ -280,7 +279,7 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
case R.id.sp_flasher:
- switch (position){
+ switch (position) {
case 0:
@@ -305,7 +304,7 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
}
- void clearBrandSpinner(){
+ void clearBrandSpinner() {
brand_list.clear();
BrandMasterGetterSetter brand_select = new BrandMasterGetterSetter();
@@ -319,7 +318,7 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
spinner_brand_list.setOnItemSelectedListener(this);
}
- void clearSkuSpinner(){
+ void clearSkuSpinner() {
sku_list.clear();
SkuMasterGetterSetter sku_select = new SkuMasterGetterSetter();
@@ -337,82 +336,108 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
public void onClick(View v) {
int id = v.getId();
- switch (id){
+ switch (id) {
case R.id.fab:
boolean valid_flag = true;
- if(isExists){
- if(added_promo_list.size()==0){
+ if (isExists) {
+ if (added_promo_list.size() == 0) {
valid_flag = false;
}
}
- if(!valid_flag){
- Snackbar.make(rec_added_promo, R.string.title_activity_Want_add,Snackbar.LENGTH_SHORT).show();
- }
- else if(isdata_added){
+ if (!valid_flag) {
+ Snackbar.make(rec_added_promo, R.string.title_activity_Want_add, Snackbar.LENGTH_SHORT).show();
+ } else if (isdata_added) {
db.InsertPromoSKUwiseData(added_promo_list, categoryId, store_id, isExists);
finish();
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
- /*AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(
- AdditionalPromoSKUwiseActivity.this);
- // set title
- alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title));
- // set dialog message
- alertDialogBuilder
- .setMessage(getResources().getString(R.string.title_activity_Want_save))
- .setCancelable(false)
- .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
+ /*String promotion_sku_wise_data_xml = "", add_promotion_data_xml = "", exists_xml = "", add_xml = "";
+ db.open();
+ ArrayList promoComplianceSkuwiseGetterSetters, promoComplianceSkuwiseExistsGetterSetters;
+ promoComplianceSkuwiseExistsGetterSetters = db.getPromoComplianceSkuwiseExistsAfterData(store_id, null);
+ if (promoComplianceSkuwiseExistsGetterSetters.size() > 0) {
+ for (int l = 0; l < promoComplianceSkuwiseExistsGetterSetters.size(); l++) {
+
+ promoComplianceSkuwiseGetterSetters = db.getPromoComplianceSkuwiseAfterData(promoComplianceSkuwiseExistsGetterSetters.get(l).get_id(), null);
+
+ for (int i1 = 0; i1 < promoComplianceSkuwiseGetterSetters.size(); i1++) {
+ if (!promoComplianceSkuwiseGetterSetters.get(i1).getCategory_id().equals("0")) {
+
+ String discount_val = promoComplianceSkuwiseGetterSetters.get(i1).getDiscount_value();
+ if (discount_val.equals("")) {
+ discount_val = "0";
+ }
+
+ add_xml = "[PROMOTION_DATA]"
+ + "[MID]" + "0" + "[/MID]"
+ + "[USER_ID]" + username + "[/USER_ID]"
+ + "[CATEGORY_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
+ + "[SUB_CATEGORY_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getSub_category_id()) + "[/SUB_CATEGORY_ID]"
+ + "[SKU_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getSku_id()) + "[/SKU_ID]"
+ + "[BRAND_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getBrand_id()) + "[/BRAND_ID]"
+ + "[DISCOUNT_VALUE]" + discount_val + "[/DISCOUNT_VALUE]"
+ + "[PRICE]" + promoComplianceSkuwiseGetterSetters.get(i1).getPrice() + "[/PRICE]"
+ + "[PROMO_IMAGE]" + promoComplianceSkuwiseGetterSetters.get(i1).getImg() + "[/PROMO_IMAGE]"
+ + "[PRICE_FLASHER_AVAILABLE]" + promoComplianceSkuwiseGetterSetters.get(i1).getPrice_flasher() + "[/PRICE_FLASHER_AVAILABLE]"
+ + "[/PROMOTION_DATA]";
+ add_promotion_data_xml = add_promotion_data_xml + add_xml;
}
- })
- .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();
+ int exists = 0;
+ if (promoComplianceSkuwiseExistsGetterSetters.get(l).isExists()) {
+ exists = 1;
+ }
- // show it
- alertDialog.show();*/
+ exists_xml = "[ADDITIONAL_PROMOTION_SKUWISE_DATA]"
+ + "[MID]" + "0" + "[/MID]"
+ + "[USER_ID]" + username + "[/USER_ID]"
+ + "[CATEGORY_ID]" + Integer.parseInt(promoComplianceSkuwiseExistsGetterSetters.get(l).getCategory_id()) + "[/CATEGORY_ID]"
+ + "[IS_EXISTS]" + exists + "[/IS_EXISTS]"
+ + "[ADDITIONAL_PROMOTION_DATA]" + add_promotion_data_xml + "[/ADDITIONAL_PROMOTION_DATA]"
+ + "[/ADDITIONAL_PROMOTION_SKUWISE_DATA]";
- }else {
+ promotion_sku_wise_data_xml = promotion_sku_wise_data_xml + exists_xml;
+
+ }
+
+ final String sos_xml = "[DATA]" + promotion_sku_wise_data_xml + "[/DATA]";
+ Log.d("sosdata", sos_xml);
+ }*/
+
+ } else {
finish();
}
break;
case R.id.fab_add:
-
discount = et_discount.getText().toString();
price = et_price.getText().toString();
-
- if(sub_category.equals("")){
- Snackbar.make(rec_added_promo, R.string.pls_select_sub_category,Snackbar.LENGTH_SHORT).show();
- }
- else if(brand.equals("")){
- Snackbar.make(rec_added_promo, R.string.pls_select_brand,Snackbar.LENGTH_SHORT).show();
- }else if(sku.equals("")){
- Snackbar.make(rec_added_promo, R.string.pls_select_sku,Snackbar.LENGTH_SHORT).show();
+ if (sub_category.equals("")) {
+ Snackbar.make(rec_added_promo, R.string.pls_select_sub_category, Snackbar.LENGTH_SHORT).show();
+ } else if (brand.equals("")) {
+ Snackbar.make(rec_added_promo, R.string.pls_select_brand, Snackbar.LENGTH_SHORT).show();
+ } else if (sku.equals("")) {
+ Snackbar.make(rec_added_promo, R.string.pls_select_sku, Snackbar.LENGTH_SHORT).show();
}/*else if(discount.equals("")){
Snackbar.make(rec_added_promo, R.string.pls_enter_discount,Snackbar.LENGTH_SHORT).show();
- }*/else if(price.equals("")){
- Snackbar.make(rec_added_promo, R.string.pls_enter_price,Snackbar.LENGTH_SHORT).show();
- }else if(is_camera_compulsory && img_str.equals("")){
- Snackbar.make(rec_added_promo, R.string.click_image,Snackbar.LENGTH_SHORT).show();
- }else if(price_flasher_available==-1){
- Snackbar.make(rec_added_promo, R.string.pls_select_price,Snackbar.LENGTH_SHORT).show();
- }else {
+ }*/ else if (price.equals("")) {
+ Snackbar.make(rec_added_promo, R.string.pls_enter_price, Snackbar.LENGTH_SHORT).show();
+ } else if (!price.equals("") && price.substring(0, 1).equals(".")) {
+ Snackbar.make(rec_added_promo, R.string.incorrect_price, Snackbar.LENGTH_SHORT).show();
+ } else if (is_camera_compulsory && img_str.equals("")) {
+ Snackbar.make(rec_added_promo, R.string.click_image, Snackbar.LENGTH_SHORT).show();
+ } else if (price_flasher_available == -1) {
+ Snackbar.make(rec_added_promo, R.string.pls_select_price, Snackbar.LENGTH_SHORT).show();
+ } else {
PromoComplianceSkuwiseGetterSetter promo = new PromoComplianceSkuwiseGetterSetter();
promo.setBrand(brand);
promo.setBrand_id(brand_id);
@@ -424,7 +449,6 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
promo.setDiscount_value(discount);
promo.setPrice(price);
promo.setPrice_flasher(price_flasher_available);
-
added_promo_list.add(promo);
rec_added_promo.setLayoutManager(new LinearLayoutManager(context));
@@ -433,7 +457,7 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
sub_category = "";
sub_category_id = "0";
- brand= "";
+ brand = "";
brand_id = "0";
sku = "";
sku_id = "0";
@@ -449,10 +473,9 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
clearSkuSpinner();
sp_flasher.setSelection(0);
- if(is_camera_compulsory){
+ if (is_camera_compulsory) {
img_cam.setBackgroundResource(R.drawable.camera_orange_star_green);
- }
- else {
+ } else {
img_cam.setBackgroundResource(R.mipmap.camera_orange);
}
isdata_added = true;
@@ -462,8 +485,7 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
case R.id.img_promotion_add:
- _pathforcheck = "Additional_Promo_Skuwise_Image" + store_id + categoryId + visit_date.replace("/", "") + "_" +
- CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
+ _pathforcheck = "Additional_Promo_Skuwise_Image" + store_id + categoryId + visit_date.replace("/", "") + "_" + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
_path = CommonString.FILE_PATH + _pathforcheck;
@@ -473,63 +495,59 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
case R.id.btntoggle:
isExists = btntoggle.isChecked();
- if(isExists){
+ if (isExists) {
lin_parent.setVisibility(View.VISIBLE);
fab_add.show();//.setVisibility(View.VISIBLE);
- }
- else {
+ } else {
android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(AdditionalPromoSKUwiseActivity.this);
builder.setTitle("Parinaam");
- builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
- .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
+ builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false).setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
- fab_add.hide();//.setVisibility(View.GONE);
- added_promo_list.clear();
+ fab_add.hide();//.setVisibility(View.GONE);
+ added_promo_list.clear();
- rec_added_promo.setLayoutManager(new LinearLayoutManager(context));
- promoAdapter = new PromoAdapter(added_promo_list);
- rec_added_promo.setAdapter(promoAdapter);
+ rec_added_promo.setLayoutManager(new LinearLayoutManager(context));
+ promoAdapter = new PromoAdapter(added_promo_list);
+ rec_added_promo.setAdapter(promoAdapter);
/* if(promoAdapter!=null){
promoAdapter.list.clear();
promoAdapter.notifyDataSetChanged();
}*/
- lin_parent.setVisibility(View.GONE);
+ lin_parent.setVisibility(View.GONE);
- sub_category = "";
- sub_category_id = "0";
- brand= "";
- brand_id = "0";
- sku = "";
- sku_id = "0";
- discount = "";
- price = "";
- img_str = "";
+ sub_category = "";
+ sub_category_id = "0";
+ brand = "";
+ brand_id = "0";
+ sku = "";
+ sku_id = "0";
+ discount = "";
+ price = "";
+ img_str = "";
- et_discount.setText("");
- et_price.setText("");
- spinner_sub_category_list.setSelection(0);
- clearBrandSpinner();
- clearSkuSpinner();
- if(is_camera_compulsory){
- img_cam.setBackgroundResource(R.drawable.camera_orange_star_green);
- }
- else {
- img_cam.setBackgroundResource(R.mipmap.camera_orange);
- }
- isdata_added = true;
+ et_discount.setText("");
+ et_price.setText("");
+ spinner_sub_category_list.setSelection(0);
+ clearBrandSpinner();
+ clearSkuSpinner();
+ if (is_camera_compulsory) {
+ img_cam.setBackgroundResource(R.drawable.camera_orange_star_green);
+ } else {
+ img_cam.setBackgroundResource(R.mipmap.camera_orange);
+ }
+ isdata_added = true;
- }
- })
- .setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- //checkBox.setChecked(true);
- btntoggle.setChecked(true);
- }
- });
+ }
+ }).setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ //checkBox.setChecked(true);
+ btntoggle.setChecked(true);
+ }
+ });
android.app.AlertDialog alert = builder.create();
alert.show();
}
@@ -542,7 +560,7 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
Log.i("Stock & Facing ", "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();
@@ -632,10 +650,7 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
/*************
* CustomBrandAdapter Constructor
*****************/
- public CustomBrandAdapter(
- AdditionalPromoSKUwiseActivity activitySpinner,
- int textViewResourceId,
- ArrayList objects
+ public CustomBrandAdapter(AdditionalPromoSKUwiseActivity activitySpinner, int textViewResourceId, ArrayList objects
) {
super(activitySpinner, textViewResourceId, objects);
@@ -694,10 +709,7 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
/*************
* CustomSkuAdapter Constructor
*****************/
- public CustomSkuAdapter(
- AdditionalPromoSKUwiseActivity activitySpinner,
- int textViewResourceId,
- ArrayList objects
+ public CustomSkuAdapter(AdditionalPromoSKUwiseActivity activitySpinner, int textViewResourceId, ArrayList objects
) {
super(activitySpinner, textViewResourceId, objects);
@@ -756,10 +768,7 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
/*************
* CustomSubCategoryAdapter Constructor
*****************/
- public CustomSubCategoryAdapter(
- AdditionalPromoSKUwiseActivity activitySpinner,
- int textViewResourceId,
- ArrayList objects
+ public CustomSubCategoryAdapter(AdditionalPromoSKUwiseActivity activitySpinner, int textViewResourceId, ArrayList objects
) {
super(activitySpinner, textViewResourceId, objects);
@@ -818,8 +827,7 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
@Override
public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
- View view = LayoutInflater.from(parent.getContext())
- .inflate(R.layout.item_added_promo, parent, false);
+ View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_added_promo, parent, false);
return new ViewHolder(view);
}
@@ -833,10 +841,9 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
holder.tv_discount_val.setText(getString(R.string.discount_value) + " - " + mItem.getDiscount_value());
holder.tv_price.setText(getString(R.string.price) + " - " + mItem.getPrice());
String exists = "";
- if(mItem.getPrice_flasher()==1){
+ if (mItem.getPrice_flasher() == 1) {
exists = getString(R.string.yes);
- }
- else {
+ } else {
exists = getString(R.string.no);
}
holder.tv_promo_flasher_exists.setText(" - " + exists);
@@ -973,28 +980,25 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
return super.onOptionsItemSelected(item);
}
- void ischanged(){
- if(isdata_added){
+ void ischanged() {
+ if (isdata_added) {
android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(AdditionalPromoSKUwiseActivity.this);
builder.setTitle("Parinaam");
- builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
- .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
+ builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false).setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
- finish();
- overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
- }
- })
- .setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
+ finish();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+ }
+ }).setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
- }
- });
+ }
+ });
android.app.AlertDialog alert = builder.create();
alert.show();
- }
- else {
+ } else {
super.onBackPressed();
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
}
@@ -1010,10 +1014,7 @@ public class AdditionalPromoSKUwiseActivity extends AppCompatActivity implements
/*************
* CustomAdapter Constructor
*****************/
- public CustomSpinnerAdapter(
- AdditionalPromoSKUwiseActivity activitySpinner,
- int textViewResourceId,
- ArrayList objects
+ public CustomSpinnerAdapter(AdditionalPromoSKUwiseActivity activitySpinner, int textViewResourceId, ArrayList objects
) {
super(activitySpinner, textViewResourceId, objects);
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 d7d2d78..a3a8661 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
@@ -194,13 +194,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
brand.setBRAND(str);
brand_list.add(0, brand);
CustomAdapter adapter = new CustomAdapter(AdditionalVisibility.this, R.layout.custom_spinner_item, brand_list);
-
spinner_brand_list.setAdapter(adapter);
///Display List
-
DisplayMaster_list = db.getADDITIONAL_DISPLAYData(categoryId);
-
ADDITIONAL_DISPLAY_MASTERGetterSetter select = new ADDITIONAL_DISPLAY_MASTERGetterSetter();
select.setDISPLAY_ID(str);
DisplayMaster_list.add(0, select);
@@ -210,9 +207,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
spinner_brand_list.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView parent, View view, int position, long id) {
-
if (position != 0) {
-
brand_list_name = brand_list.get(position).getBRAND().get(0);
brand_list_id = brand_list.get(position).getBRAND_ID().get(0);
@@ -830,7 +825,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
}
});
-
} else {
btnimage.setBackgroundResource(R.mipmap.camera_grey);
btnimage1.setBackgroundResource(R.mipmap.camera_grey);
@@ -1313,14 +1307,14 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
public void showSkuDialog() {
final ArrayList brandList;
- /* if(country_id.equals("7")){
+ /* if(country_id.equals("]")){
brandList = db.getBrandT2PData(null, null, null, categoryId, store_id);
}
else {
brandList = db.getBrandT2PData(store_type_id, class_id, key_account_id, categoryId, store_id);
}*/
- if (country_id.equals("7")||country_id.equals("8")) {
+ 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);
@@ -1438,7 +1432,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
}
});
-
// Create custom adapter object ( see below CustomAdapter.java )
CustomAdapter adapter = new CustomAdapter(AdditionalVisibility.this, R.layout.custom_spinner_item, brandList);
// Set adapter to spinner
@@ -1460,7 +1453,7 @@ 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")){
+ 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)){
@@ -1872,9 +1865,8 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
protected void onResume() {
super.onResume();
CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
- toolbar.setTitle(getResources().getString(R.string.title_activity_Additional_visibility));
+ toolbar.setTitle(categoryName);
}
-
}
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AuditActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AuditActivity.java
index a8e2182..759dce0 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AuditActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AuditActivity.java
@@ -1,7 +1,7 @@
package cpm.com.gskmtorange.dailyentry;
+import android.annotation.SuppressLint;
import android.app.Activity;
-import android.app.AlertDialog;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.DialogInterface;
@@ -14,6 +14,9 @@ import android.os.Build;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.provider.MediaStore;
+import android.text.InputFilter;
+import android.text.InputType;
+import android.text.Spanned;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.MenuItem;
@@ -35,7 +38,6 @@ import androidx.cardview.widget.CardView;
import androidx.core.content.FileProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.google.android.material.snackbar.Snackbar;
@@ -44,6 +46,8 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GetterSetter.AddittionalGetterSetter;
@@ -61,7 +65,7 @@ public class AuditActivity extends AppCompatActivity {
boolean checkflag = true;
private SharedPreferences preferences;
String categoryName, categoryId, Error_Message = "", pathforcheck = "", _path = "", str, img_str = "", img_str2 = "";
- String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, store_flag_str, country_id="";
+ String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, store_flag_str, country_id = "";
GSKOrangeDB db;
ArrayList question_list = new ArrayList<>(), childListData;
HashMap> hashMapAnsListChildData;
@@ -96,11 +100,8 @@ public class AuditActivity extends AppCompatActivity {
storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null);
country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, "");
-
toolbar.setTitle(getResources().getString(R.string.audit));
-
str = CommonString.FILE_PATH;
-
recyclerView = (RecyclerView) findViewById(R.id.list);
db = new GSKOrangeDB(this);
@@ -113,9 +114,7 @@ public class AuditActivity extends AppCompatActivity {
//Header
question_list = db.getAfterSaveAuditQuestionAnswerData(store_id, categoryId);
if (question_list.size() == 0) {
-
question_list = getAuditQnsRemoved();
-
}
hashMapAnsListChildData = new HashMap<>();
@@ -143,15 +142,39 @@ public class AuditActivity extends AppCompatActivity {
recyclerView.setVisibility(View.GONE);
}
+ recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener()
+ {
+ @Override
+ public void onScrolled(RecyclerView recyclerView, int dx, int dy)
+ {
+ if (dy > 0 && fab.isShown())
+ {
+ fab.hide();
+ }
+
+ if (dy < 0 && !fab.isShown())
+ {
+ fab.show();
+ }
+ }
+
+ /* @Override
+ public void onScrollStateChanged(RecyclerView recyclerView, int newState)
+ {
+ if (newState == RecyclerView.SCROLL_STATE_IDLE)
+ {
+ fab.show();
+ }
+
+ super.onScrollStateChanged(recyclerView, newState);
+ }*/
+ });
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
-
if (question_list.size() > 0) {
-
recyclerView.clearFocus();
-
if (validateData(question_list)) {
db.saveAuditQuestionAnswerData(question_list, store_id, categoryId);
finish();
@@ -163,7 +186,6 @@ public class AuditActivity extends AppCompatActivity {
} else {
Snackbar.make(recyclerView, getString(R.string.NodataAvailable), Snackbar.LENGTH_SHORT).show();
}
-
}
});
}
@@ -173,11 +195,10 @@ public class AuditActivity extends AppCompatActivity {
boolean t2p_flag = false;
boolean flag_t2p_mapping;
- if(store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)){
- flag_t2p_mapping = db.isMappingT2PData(store_id, categoryId,CommonString.TABLE_MAPPING_T2P_ADHOC);
- }
- else {
- flag_t2p_mapping = db.isMappingT2PData(store_id, categoryId,CommonString.TABLE_MAPPING_T2P);
+ if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
+ flag_t2p_mapping = db.isMappingT2PData(store_id, categoryId, CommonString.TABLE_MAPPING_T2P_ADHOC);
+ } else {
+ flag_t2p_mapping = db.isMappingT2PData(store_id, categoryId, CommonString.TABLE_MAPPING_T2P);
}
if (flag_t2p_mapping) {
@@ -196,7 +217,6 @@ public class AuditActivity extends AppCompatActivity {
if (!t2p_flag) {
if (db.additionalVisibilitydata(store_id, categoryId)) {
ArrayList additionalList = db.getAdditionalMainStock(store_id, categoryId);
-
for (int i = 0; i < additionalList.size(); i++) {
if (additionalList.get(i).getBtn_toogle().equals("1")) {
t2p_flag = true;
@@ -207,7 +227,6 @@ public class AuditActivity extends AppCompatActivity {
}
ArrayList question_list = db.getAuditCategoryWise(categoryId, storeType_id);
-
Iterator iterator = question_list.iterator();
while (iterator.hasNext()) {
AuditDataGetterSetter item = iterator.next(); // must be called before you can call iterator.remove()
@@ -219,7 +238,6 @@ public class AuditActivity extends AppCompatActivity {
if (!t2p_flag) {
iterator.remove();
}
-
}
}
@@ -239,9 +257,7 @@ public class AuditActivity extends AppCompatActivity {
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
int id = item.getItemId();
-
if (id == android.R.id.home) {
-
if (question_list.size() > 0) {
android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(AuditActivity.this);
builder.setTitle("Parinaam");
@@ -250,15 +266,13 @@ public class AuditActivity extends AppCompatActivity {
public void onClick(DialogInterface dialog, int id) {
finish();
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
-
}
- })
- .setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
+ }).setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
- }
- });
+ }
+ });
android.app.AlertDialog alert = builder.create();
alert.show();
} else {
@@ -272,15 +286,12 @@ public class AuditActivity extends AppCompatActivity {
@Override
public void onBackPressed() {
- //super.onBackPressed();
-
if (question_list.size() > 0) {
android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(AuditActivity.this);
builder.setTitle("Parinaam");
builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
-
finish();
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
}
@@ -299,6 +310,26 @@ public class AuditActivity extends AppCompatActivity {
}
}
+
+ public class DecimalDigitsInputFilter implements InputFilter {
+
+ Pattern mPattern;
+
+ public DecimalDigitsInputFilter(int digitsBeforeZero, int digitsAfterZero) {
+ mPattern = Pattern.compile("[0-9]{0," + (digitsBeforeZero - 1) + "}+((\\.[0-9]{0," + (digitsAfterZero - 1) + "})?)||(\\.)?");
+ }
+
+ @Override
+ public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
+
+ Matcher matcher = mPattern.matcher(dest);
+ if (!matcher.matches())
+ return "";
+ return null;
+ }
+
+ }
+
class AnswerAdapter extends RecyclerView.Adapter {
ArrayList questionList;
HashMap> answerHashMap;
@@ -314,44 +345,92 @@ public class AuditActivity extends AppCompatActivity {
return new ViewHolder(view);
}
- public void onBindViewHolder(final AnswerAdapter.ViewHolder holder, final int position) {
+ public void onBindViewHolder(final AnswerAdapter.ViewHolder holder, @SuppressLint("RecyclerView") final int position) {
holder.data = questionList.get(position);
-
holder.txt_question.setText(holder.data.getQUESTION());
+ holder.txt_question.setId(position);
+
+ // Log.e("mandate_data",holder.data.getCAMERA_ALLOW()+","+holder.data.getCAMERA_MANDATORY() + "," + holder.data.getQUESTION_ID());
ArrayList ans_list = answerHashMap.get(holder.data);
if (holder.data.getANSWER_TYPE().equalsIgnoreCase("Dropdown")) {
holder.sp_auditAnswer.setVisibility(View.VISIBLE);
+ holder.sp_auditAnswer.setId(position);
holder.edt_answer.setVisibility(View.GONE);
- } else if(holder.data.getANSWER_TYPE().equalsIgnoreCase("TEXTBOX")){
+ holder.edt_answer.setId(position);
+ }
+ else if (holder.data.getANSWER_TYPE().equalsIgnoreCase("TEXTBOX")) {
+ int maxLength = Integer.parseInt(holder.data.getMaxlength());
+ InputFilter[] fArray = new InputFilter[1];
+ fArray[0] = new InputFilter.LengthFilter(maxLength);
+ holder.edt_answer.setFilters(fArray);
+ holder.edt_answer.setInputType(InputType.TYPE_CLASS_TEXT);
holder.edt_answer.setVisibility(View.VISIBLE);
- if(country_id.equals("4")){
+ holder.edt_answer.setId(position);
+ if (country_id.equals("4")) {
+ holder.edt_answer.setHint(R.string.pls_fill_stock_count);
+ holder.edt_answer.setId(position);
+ }
+
+ holder.sp_auditAnswer.setVisibility(View.GONE);
+ holder.sp_auditAnswer.setId(position);
+
+ } else if (holder.data.getANSWER_TYPE().equalsIgnoreCase("DECIMAL")) {
+ int maxLength = Integer.parseInt(holder.data.getMaxlength());
+ holder.edt_answer.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL | InputType.TYPE_NUMBER_FLAG_SIGNED);
+ holder.edt_answer.setFilters(new InputFilter[]{new DecimalDigitsInputFilter(maxLength, 2)});
+
+ holder.edt_answer.setVisibility(View.VISIBLE);
+ holder.edt_answer.setId(position);
+
+ if (country_id.equals("4")) {
holder.edt_answer.setHint(R.string.pls_fill_stock_count);
}
+
holder.sp_auditAnswer.setVisibility(View.GONE);
+ holder.sp_auditAnswer.setId(position);
+
+ } else if (holder.data.getANSWER_TYPE().equalsIgnoreCase("NUMBER")) {
+ int maxLength = Integer.parseInt(holder.data.getMaxlength());
+ InputFilter[] fArray = new InputFilter[1];
+ fArray[0] = new InputFilter.LengthFilter(maxLength);
+ holder.edt_answer.setFilters(fArray);
+ holder.edt_answer.setInputType(InputType.TYPE_CLASS_NUMBER);
+
+ holder.edt_answer.setVisibility(View.VISIBLE);
+ holder.edt_answer.setId(position);
+
+ if (country_id.equals("4")) {
+ holder.edt_answer.setHint(R.string.pls_fill_stock_count);
+ }
+
+ holder.sp_auditAnswer.setVisibility(View.GONE);
+ holder.sp_auditAnswer.setId(position);
}
if (holder.data.getCAMERA_ALLOW().equals("1")) {
holder.parent_cam_layout.setVisibility(View.VISIBLE);
- }
- else {
+ holder.parent_cam_layout.setId(position);
+ } else {
holder.parent_cam_layout.setVisibility(View.GONE);
+ holder.parent_cam_layout.setId(position);
}
//text
if (holder.data.getREMARK_ALLOW().equals("1")) {
holder.edt_text.setVisibility(View.VISIBLE);
+ holder.edt_text.setId(position);
+
holder.txt_leval.setVisibility(View.VISIBLE);
holder.txt_leval.setText(holder.data.getREMARK_LEVEL());
-
- }
- else {
+ holder.txt_leval.setId(position);
+ } else {
holder.edt_text.setVisibility(View.GONE);
+ holder.edt_text.setId(position);
holder.txt_leval.setVisibility(View.GONE);
+ holder.txt_leval.setId(position);
}
-
-
holder.sp_auditAnswer.setAdapter(new AnswerSpinnerAdapter(AuditActivity.this, R.layout.custom_spinner_item, ans_list));
final ArrayList finalAns_list = ans_list;
@@ -364,13 +443,16 @@ public class AuditActivity extends AppCompatActivity {
holder.data.setCAMERA_ALLOW(ans.getCAMERA_ALLOW());
holder.data.setREMARK_ALLOW(ans.getREMARK_ALLOW());
holder.data.setREMARK_LEVEL(ans.getREMARK_LEVEL());
+ holder.data.setCAMERA_MANDATORY(ans.getCAMERA_MANDATORY());
+
+ Log.e("mandate_data",holder.data.getCAMERA_ALLOW() + ","+ holder.data.getCAMERA_MANDATORY());
//text
if (holder.data.getREMARK_ALLOW().equals("1")) {
holder.edt_text.setVisibility(View.VISIBLE);
holder.txt_leval.setVisibility(View.VISIBLE);
holder.txt_leval.setText(holder.data.getREMARK_LEVEL());
- }else {
+ } else {
holder.edt_text.setVisibility(View.GONE);
holder.txt_leval.setVisibility(View.GONE);
holder.data.setTXT_REMARK("");
@@ -401,7 +483,6 @@ public class AuditActivity extends AppCompatActivity {
holder.img_cam2.setBackgroundResource(R.mipmap.camera_orange);
}
}
-
@Override
public void onNothingSelected(AdapterView parent) {
@@ -411,8 +492,7 @@ public class AuditActivity extends AppCompatActivity {
holder.img_cam.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- pathforcheck = store_id + "AuditAnsPic" + categoryId + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
-
+ pathforcheck = store_id + "AuditAnsPic" + categoryId + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
_path = CommonString.FILE_PATH + pathforcheck;
intime = CommonFunctions.getCurrentTimeWithLanguage(context);
child_position = position;
@@ -436,8 +516,14 @@ public class AuditActivity extends AppCompatActivity {
@Override
public void onFocusChange(View v, boolean hasFocus) {
if (!hasFocus) {
- holder.data.setANSWER_ID("0");
- holder.data.setANSWER(((EditText) v).getText().toString().replaceAll("[&^<>{}'$]", ""));
+ if (holder.data.getANSWER_TYPE().equalsIgnoreCase("NUMBER")) {
+ holder.data.setANSWER_ID("0");
+ holder.data.setANSWER(((EditText) v).getText().toString().replaceFirst("^0+.(?!$)", ""));
+ } else {
+ holder.data.setANSWER_ID("0");
+ holder.data.setANSWER(((EditText) v).getText().toString().replaceAll("[&^<>{}'$]", ""));
+ }
+
}
}
});
@@ -447,26 +533,30 @@ public class AuditActivity extends AppCompatActivity {
@Override
public void onFocusChange(View v, boolean hasFocus) {
if (!hasFocus) {
- // holder.data.setANSWER_ID("0");
holder.data.setTXT_REMARK(((EditText) v).getText().toString().replaceAll("[&^<>{}'$]", ""));
}
}
});
for (int i = 0; i < ans_list.size(); i++) {
- if (holder.data.getANSWER_TYPE().equalsIgnoreCase("Dropdown") && ans_list.get(i).getANSWER_ID().equals(holder.data.getANSWER_ID())) {
+ if (holder.data.getANSWER_TYPE().equalsIgnoreCase("Dropdown")
+ && ans_list.get(i).getANSWER_ID().equals(holder.data.getANSWER_ID())) {
holder.sp_auditAnswer.setSelection(i);
break;
}
}
- if(holder.data.getANSWER_TYPE().equalsIgnoreCase("TEXTBOX")){
+ if (holder.data.getANSWER_TYPE().equalsIgnoreCase("TEXTBOX")
+ || holder.data.getANSWER_TYPE().equalsIgnoreCase("DECIMAL")
+ || holder.data.getANSWER_TYPE().equalsIgnoreCase("NUMBER")) {
holder.edt_answer.setText(holder.data.getANSWER());
+ holder.edt_answer.setId(position);
}
- //set text
- if(holder.data.getREMARK_ALLOW().equalsIgnoreCase("1")){
+ //set text
+ if (holder.data.getREMARK_ALLOW().equalsIgnoreCase("1")) {
holder.edt_text.setText(holder.data.getTXT_REMARK());
+ holder.edt_text.setId(position);
}
if (!img_str.equals("")) {
@@ -487,22 +577,29 @@ public class AuditActivity extends AppCompatActivity {
if (holder.data.getCAM_IMAGE().equals("")) {
holder.img_cam.setBackgroundResource(R.mipmap.camera_orange);
+ holder.img_cam.setId(position);
+
} else {
holder.img_cam.setBackgroundResource(R.mipmap.camera_green);
+ holder.img_cam.setId(position);
}
if (holder.data.getCAM_IMAGE2().equals("")) {
holder.img_cam2.setBackgroundResource(R.mipmap.camera_orange);
+ holder.img_cam2.setId(position);
} else {
holder.img_cam2.setBackgroundResource(R.mipmap.camera_green);
+ holder.img_cam2.setId(position);
}
if (!checkflag) {
if (checkHeaderArray.contains(position)) {
holder.card_view.setBackgroundColor(getResources().getColor(R.color.red));
+ holder.card_view.setId(position);
} else {
holder.card_view.setBackgroundColor(getResources().getColor(R.color.white));
+ holder.card_view.setId(position);
}
}
}
@@ -514,9 +611,9 @@ public class AuditActivity extends AppCompatActivity {
public class ViewHolder extends RecyclerView.ViewHolder {
public final View mView;
- public final TextView txt_question,txt_leval;
+ public final TextView txt_question, txt_leval;
public final Spinner sp_auditAnswer;
- public final EditText edt_answer,edt_text;
+ public final EditText edt_answer, edt_text;
public final ImageView img_cam, img_cam2;
public final RelativeLayout parent_cam_layout;
CardView card_view;
@@ -585,23 +682,26 @@ public class AuditActivity extends AppCompatActivity {
checkHeaderArray.clear();
for (int i = 0; i < data.size(); i++) {
- if(data.get(i).getANSWER_TYPE().equalsIgnoreCase("TEXTBOX") && data.get(i).getANSWER().equalsIgnoreCase("")){
+ if (data.get(i).getANSWER_TYPE().equalsIgnoreCase("TEXTBOX") && data.get(i).getANSWER().equalsIgnoreCase("")
+ || data.get(i).getANSWER_TYPE().equalsIgnoreCase("DECIMAL") && data.get(i).getANSWER().equalsIgnoreCase("")
+ || data.get(i).getANSWER_TYPE().equalsIgnoreCase("NUMBER") && data.get(i).getANSWER().equalsIgnoreCase("")) {
error_msg = getString(R.string.pls_answer_all_qns);
checkflag = false;
- }else if (data.get(i).getANSWER_TYPE().equalsIgnoreCase("DROPDOWN") && data.get(i).getANSWER_ID().equalsIgnoreCase("0")) {
+ } else if (data.get(i).getANSWER_TYPE().equalsIgnoreCase("DROPDOWN") && data.get(i).getANSWER_ID().equalsIgnoreCase("0")) {
error_msg = getString(R.string.pls_answer_all_qns);
checkflag = false;
- } else if (data.get(i).getCAMERA_ALLOW().equals("1") && data.get(i).getCAM_IMAGE().equals("")) {
+ } else if (data.get(i).getCAMERA_ALLOW().equals("1") && data.get(i).getCAMERA_MANDATORY().equals("1") && data.get(i).getCAM_IMAGE().equals("")) {
error_msg = getString(R.string.click_image);
checkflag = false;
- } else if (data.get(i).getCAMERA_ALLOW().equals("1") && data.get(i).getNO_OF_CAMERA().equals("2") && data.get(i).getCAM_IMAGE2().equals("")) {
+ } else if (data.get(i).getCAMERA_ALLOW().equals("1") && data.get(i).getCAMERA_MANDATORY().equals("1")
+ && data.get(i).getNO_OF_CAMERA().equals("2") && data.get(i).getCAM_IMAGE2().equals("")) {
error_msg = getString(R.string.click_image);
checkflag = false;
//text
- } else if (data.get(i).getREMARK_ALLOW().equals("1") && data.get(i).getTXT_REMARK().equals("")) {
+ } else if (data.get(i).getREMARK_ALLOW().equals("1") && data.get(i).getTXT_REMARK().equals("")) {
error_msg = getString(R.string.pleaseenterRemarks);
checkflag = false;
- }else {
+ } else {
checkflag = true;
}
@@ -620,7 +720,7 @@ public class AuditActivity extends AppCompatActivity {
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();
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java
index f4f44f7..9ff29bf 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java
@@ -37,6 +37,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
+import java.util.Random;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GetterSetter.CategoryPictureGetterSetter;
@@ -86,25 +87,20 @@ public class CategoryPicture extends AppCompatActivity {
categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId");
- //store_id = "2";
date = preferences.getString(CommonString.KEY_DATE, null);
intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, "");
str = CommonString.FILE_PATH;
db = new GSKOrangeDB(CategoryPicture.this);
db.open();
-
im1 = (ImageView) findViewById(R.id.image1);
im2 = (ImageView) findViewById(R.id.image2);
im3 = (ImageView) findViewById(R.id.image3);
im4 = (ImageView) findViewById(R.id.image4);
listview = (ListView) findViewById(R.id.listview);
-
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
-
adddata = db.getCategoryPictureData(store_id, categoryId);
categoryImagesAllowed = db.getCategoryPictureAllowedData(categoryId);
-
if (categoryImagesAllowed.size() > 0) {
setCamAllowImage(categoryImagesAllowed.get(0).isImg_cam1(), im1);
setCamAllowImage(categoryImagesAllowed.get(0).isImg_cam2(), im2);
@@ -124,36 +120,34 @@ public class CategoryPicture extends AppCompatActivity {
String image4 = adddata.get(0).getCategoryImage4();
if (image1 != null && !image1.equals("")) {
- im1.setBackgroundResource(R.mipmap.camera_green);
+ im1.setImageResource(R.mipmap.camera_green);
img_str1 = image1;
}
if (image2 != null && !image2.equals("")) {
- im2.setBackgroundResource(R.mipmap.camera_green);
+ im2.setImageResource(R.mipmap.camera_green);
img_str2 = image2;
}
if (image3 != null && !image3.equals("")) {
- im3.setBackgroundResource(R.mipmap.camera_green);
+ im3.setImageResource(R.mipmap.camera_green);
img_str3 = image3;
}
if (image4 != null && !image4.equals("")) {
- im4.setBackgroundResource(R.mipmap.camera_green);
+ im4.setImageResource(R.mipmap.camera_green);
img_str4 = image4;
}
} else {
- if (country_id.equals("7")||country_id.equals("8")) {
+ if (country_id.equals("7")||country_id.equals("8") ||country_id.equals("11")|| country_id.equals("17")) {
listdat = db.getCategoryPicturedata(categoryId, null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE);
} else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
listdat = db.getCategoryPicturedata(categoryId, key_account_id, store_type_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC);
} else {
listdat = db.getCategoryPicturedata(categoryId, key_account_id, store_type_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK);
}
-
}
-
adapteradditional = new CategoryPicture.CategoryAdapter(CategoryPicture.this, listdat);
listview.setAdapter(adapteradditional);
@@ -161,9 +155,7 @@ public class CategoryPicture extends AppCompatActivity {
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(final View view) {
-
final CategoryPictureGetterSetter CP = new CategoryPictureGetterSetter();
-
CP.setCategoryImage1(img_str1);
CP.setCategoryImage2(img_str2);
CP.setCategoryImage3(img_str3);
@@ -172,9 +164,7 @@ public class CategoryPicture extends AppCompatActivity {
CP.setCamera_allow(camera_allow);
if (validateData(CP, listdat)) {
-
db.open();
-
db.InsertCategoryPictureData(CP, listdat, categoryId);
finish();
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
@@ -233,8 +223,6 @@ public class CategoryPicture extends AppCompatActivity {
_path = CommonString.FILE_PATH + _pathforcheck2;
intime = CommonFunctions.getCurrentTimeWithLanguage(context);
startCameraActivity();
-
-
}
});
im3.setOnClickListener(new View.OnClickListener() {
@@ -291,8 +279,6 @@ public class CategoryPicture extends AppCompatActivity {
}else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_JORDAN)) {
cdate = arabicToenglish(cdate);
}
-
-
return cdate;
}
@@ -370,7 +356,7 @@ public class CategoryPicture extends AppCompatActivity {
if (_pathforcheck1 != null && !_pathforcheck1.equals("")) {
if (new File(str + _pathforcheck1).exists()) {
- im1.setBackgroundResource(R.mipmap.camera_green);
+ im1.setImageResource(R.mipmap.camera_green);
img_str1 = _pathforcheck1;
_pathforcheck1 = "";
@@ -379,7 +365,7 @@ public class CategoryPicture extends AppCompatActivity {
if (_pathforcheck2 != null && !_pathforcheck2.equals("")) {
if (new File(str + _pathforcheck2).exists()) {
- im2.setBackgroundResource(R.mipmap.camera_green);
+ im2.setImageResource(R.mipmap.camera_green);
img_str2 = _pathforcheck2;
_pathforcheck2 = "";
@@ -389,7 +375,7 @@ public class CategoryPicture extends AppCompatActivity {
if (_pathforcheck3 != null && !_pathforcheck3.equals("")) {
if (new File(str + _pathforcheck3).exists()) {
- im3.setBackgroundResource(R.mipmap.camera_green);
+ im3.setImageResource(R.mipmap.camera_green);
img_str3 = _pathforcheck3;
_pathforcheck3 = "";
@@ -399,7 +385,7 @@ public class CategoryPicture extends AppCompatActivity {
if (_pathforcheck4 != null && !_pathforcheck4.equals("")) {
if (new File(str + _pathforcheck4).exists()) {
- im4.setBackgroundResource(R.mipmap.camera_green);
+ im4.setImageResource(R.mipmap.camera_green);
img_str4 = _pathforcheck4;
_pathforcheck4 = "";
@@ -481,9 +467,7 @@ public class CategoryPicture extends AppCompatActivity {
convertView = mInflater
.inflate(R.layout.contentcatgoryadpterlayout, null);
holder = new CategoryPicture.CategoryAdapter.ViewHolder();
-
holder.brand = (TextView) convertView.findViewById(R.id.textviewname);
-
holder.camera1 = (Button) convertView.findViewById(R.id.button3);
holder.camera2 = (Button) convertView.findViewById(R.id.cameranew);
convertView.setTag(holder);
@@ -492,26 +476,29 @@ public class CategoryPicture extends AppCompatActivity {
}
holder.camera1.setOnClickListener(new View.OnClickListener() {
-
@Override
public void onClick(View v) {
- Camerapath1 = store_id + "CategoryPicture" + list.get(position1).getSUB_CATEGORY_ID().toString() + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
+ //Camerapath1 = store_id + "CategoryPicture" + list.get(position1).getSUB_CATEGORY_ID()+ date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
+ /* if(CommonFunctions.getCurrentTimeWithLanguage(mcontext).replace(":", "").contains("????")){
+ Camerapath1 = store_id + "CategoryPicture" + list.get(position1).getSUB_CATEGORY_ID()+ date.replace("/", "") + new Random().nextInt(999999) + ".jpg";
+ }
+ else{
+ Camerapath1 = store_id + "CategoryPicture" + list.get(position1).getSUB_CATEGORY_ID()+ date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(mcontext).replace(":", "") + ".jpg";
+ }*/
+
+ Camerapath1 = store_id + "CategoryPicture" + list.get(position1).getSUB_CATEGORY_ID()+ date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(mcontext).replace(":", "") + ".jpg";
Adapterposition = position1;
-
+ // Log.e("Camimage",Camerapath1);
_path = CommonString.FILE_PATH + Camerapath1;
- intime = CommonFunctions.getCurrentTimeWithLanguage(context);
+ // intime = CommonFunctions.getCurrentTimeWithLanguage(context);
+ intime = CommonFunctions.getCurrentTimeWithLanguage(mcontext);
startCameraActivity();
-
listview.invalidateViews();
-
-
}
-
});
holder.camera2.setOnClickListener(new View.OnClickListener() {
-
@Override
public void onClick(View v) {
@@ -519,15 +506,16 @@ public class CategoryPicture extends AppCompatActivity {
Snackbar.make(listview,R.string.first_click_compulsory_image,Snackbar.LENGTH_LONG).show();
}
else {
- Camerapath2 = store_id + "CategoryPicture" + list.get(position1).getSUB_CATEGORY_ID().toString() + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
+ // Camerapath2 = store_id + "CategoryPicture" + list.get(position1).getSUB_CATEGORY_ID().toString() + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
+ Camerapath2 = store_id + "CategoryPicture" + list.get(position1).getSUB_CATEGORY_ID().toString() + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(mcontext).replace(":", "") + ".jpg";
Adapterposition = position1;
_path = CommonString.FILE_PATH + Camerapath2;
- intime = CommonFunctions.getCurrentTimeWithLanguage(context);
+ intime = CommonFunctions.getCurrentTimeWithLanguage(mcontext);
+ // intime = CommonFunctions.getCurrentTimeWithLanguage(context);
startCameraActivity();
listview.invalidateViews();
}
}
-
});
holder.brand.setText(list.get(position1).getSUB_CATEGORY().toString());
@@ -553,9 +541,7 @@ public class CategoryPicture extends AppCompatActivity {
holder.camera2.setBackgroundResource(R.mipmap.camera_orange);
}
-
holder.brand.setId(position1);
-
return convertView;
}
}
@@ -680,9 +666,9 @@ public class CategoryPicture extends AppCompatActivity {
public void setCamAllowImage(boolean isAllowed, ImageView img_cam) {
if (isAllowed) {
- img_cam.setBackgroundResource(R.drawable.camera_orange_star_green);
+ img_cam.setImageResource(R.drawable.camera_orange_star_green);
} else {
- img_cam.setBackgroundResource(R.mipmap.camera_orange);
+ img_cam.setImageResource(R.mipmap.camera_orange);
}
}
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java
index 688fd4e..06a98bf 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java
@@ -359,7 +359,6 @@ else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(C
}
public void showAlert(String str) {
-
AlertDialog.Builder builder = new AlertDialog.Builder(CheckoutActivity.this);
builder.setTitle("Parinaam");
builder.setMessage(str).setCancelable(false)
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ConversationActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ConversationActivity.java
index 0efc0a2..37b5f07 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ConversationActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ConversationActivity.java
@@ -58,17 +58,13 @@ import cpm.com.gskmtorange.gsk_dailyentry.StoreWisePerformanceActivity;
import cpm.com.gskmtorange.xmlHandlers.FailureXMLHandler;
public class ConversationActivity extends AppCompatActivity {
-
String userId, culture_id, store_id, chat_id, message_main, visit_date;
private SharedPreferences preferences = null;
-
GSKOrangeDB db;
private Context context;
ArrayList conversation_list = new ArrayList<>();
-
MyRecyclerAdapter adapter;
RecyclerView rec;
-
EditText et_reply;
private Dialog dialog;
private ProgressBar pb;
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 855d1b6..a445c5c 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CreateSelfActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CreateSelfActivity.java
@@ -46,10 +46,10 @@ 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,country_id;
+ String categoryName, categoryId, country_id;
private SharedPreferences preferences;
MSL_AvailabilityStockFacingGetterSetter brand_selected;
- int number_of_rows=0;
+ int number_of_rows = 0;
RecyclerView rec_sub_category;
static int FROM_DIALOG = 0;
static int FROM_CLICK = 1;
@@ -98,35 +98,28 @@ public class CreateSelfActivity extends AppCompatActivity {
@Override
protected void onResume() {
super.onResume();
-
- number_of_rows=0;
+ number_of_rows = 0;
brand_selected = null;
-
db.open();
-
added_sub_category_list = new ArrayList<>();
-
//kenya use
- ArrayList sub_category_list = db.getSubCategoryMaster(categoryId,store_id,country_id);
-
- for(int i=0; i sub_category_list = db.getSubCategoryMaster(categoryId, store_id, country_id);
+ for (int i = 0; i < sub_category_list.size(); i++) {
ArrayList noCameraLastVisitData;
-
- if(store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)){
- noCameraLastVisitData = db.getNoCameraLastVisitCategoryData(store_id, categoryId, sub_category_list.get(i).getSub_category_id(), CommonString.TABLE_NO_CAMERA_LAST_VISIT_DATA_ADHOC);
+ if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
+ noCameraLastVisitData = db.getNoCameraLastVisitCategoryData(store_id, categoryId,
+ sub_category_list.get(i).getSub_category_id(), CommonString.TABLE_NO_CAMERA_LAST_VISIT_DATA_ADHOC);
+ } else {
+ noCameraLastVisitData = db.getNoCameraLastVisitCategoryData(store_id, categoryId, sub_category_list.get(i).getSub_category_id(),
+ "NO_CAMERA_LAST_VISIT_DATA");
}
- else {
- noCameraLastVisitData = db.getNoCameraLastVisitCategoryData(store_id, categoryId, sub_category_list.get(i).getSub_category_id(), "NO_CAMERA_LAST_VISIT_DATA");
- }
- if(db.getNoCameraCategoryDataInserted(store_id, categoryId, sub_category_list.get(i).getSub_category_id()).size()>0){
-
+ if (db.getNoCameraCategoryDataInserted(store_id, categoryId, sub_category_list.get(i).getSub_category_id()).size() > 0) {
MSL_AvailabilityStockFacingGetterSetter subCategory = new MSL_AvailabilityStockFacingGetterSetter();
subCategory.setSub_category(sub_category_list.get(i).getSub_category());
subCategory.setSub_category_id(sub_category_list.get(i).getSub_category_id());
added_sub_category_list.add(subCategory);
- }
- else if(noCameraLastVisitData.size()>0){
+ } else if (noCameraLastVisitData.size() > 0) {
MSL_AvailabilityStockFacingGetterSetter subCategory = new MSL_AvailabilityStockFacingGetterSetter();
subCategory.setSub_category(sub_category_list.get(i).getSub_category());
subCategory.setSub_category_id(sub_category_list.get(i).getSub_category_id());
@@ -134,7 +127,7 @@ public class CreateSelfActivity extends AppCompatActivity {
}
}
- if(added_sub_category_list.size()>0){
+ if (added_sub_category_list.size() > 0) {
rec_sub_category.setLayoutManager(new GridLayoutManager(this, 3));
SubcategoryAdapter skuAdapter = new SubcategoryAdapter(added_sub_category_list);
rec_sub_category.setAdapter(skuAdapter);
@@ -151,13 +144,11 @@ public class CreateSelfActivity extends AppCompatActivity {
}
public void showSkuDialog() {
-
- final ArrayList sub_category_list = db.getSubCategoryMaster(categoryId,store_id,country_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);
// ArrayList skuMasterGetterSetterArrayList = db.getSkuT2PData("1", "1", "1",)
-
final Dialog dialog = new Dialog(CreateSelfActivity.this);
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
@@ -173,28 +164,25 @@ public class CreateSelfActivity extends AppCompatActivity {
@Override
public void onClick(View v) {
- if(brand_selected==null){
- Snackbar.make(btn_create,"Please select Sub Category",Snackbar.LENGTH_SHORT).show();
- }
- else if(number_of_rows==0){
- Snackbar.make(btn_create,"Please select number of rows",Snackbar.LENGTH_SHORT).show();
- }
- else {
+ if (brand_selected == null) {
+ Snackbar.make(btn_create, "Please select Sub Category", Snackbar.LENGTH_SHORT).show();
+ } else if (number_of_rows == 0) {
+ Snackbar.make(btn_create, "Please select number of rows", Snackbar.LENGTH_SHORT).show();
+ } else {
boolean sub_category_already_filled = false;
- if(added_sub_category_list.size()>0){
- for(int k=0;k 0) {
+ for (int k = 0; k < added_sub_category_list.size(); k++) {
+ if (added_sub_category_list.get(k).getSub_category_id().equals(brand_selected.getSub_category_id())) {
sub_category_already_filled = true;
break;
}
}
}
- if(sub_category_already_filled){
- Snackbar.make(btn_create,"Sub Category already added",Snackbar.LENGTH_SHORT).show();
- }
- else {
+ if (sub_category_already_filled) {
+ Snackbar.make(btn_create, "Sub Category already added", Snackbar.LENGTH_SHORT).show();
+ } else {
Intent in = new Intent(context, NoCameraActivity.class);
in.putExtra("categoryName", categoryName);
in.putExtra("categoryId", categoryId);
@@ -228,7 +216,7 @@ public class CreateSelfActivity extends AppCompatActivity {
final ArrayList no_of_rows = new ArrayList<>();
no_of_rows.add(getString(R.string.select));
- for(int i=1; i<9; i++){
+ for (int i = 1; i < 9; i++) {
no_of_rows.add(i + "");
}
CustomSpinnerAdapter skuadapter = new CustomSpinnerAdapter(CreateSelfActivity.this, R.layout.custom_spinner_item, no_of_rows);
@@ -241,8 +229,7 @@ public class CreateSelfActivity extends AppCompatActivity {
if (position != 0) {
brand_selected = sub_category_list.get(position);
- }
- else{
+ } else {
brand_selected = null;
}
@@ -260,8 +247,7 @@ public class CreateSelfActivity extends AppCompatActivity {
if (position != 0) {
number_of_rows = Integer.parseInt(no_of_rows.get(position));
- }
- else {
+ } else {
number_of_rows = 0;
}
@@ -493,7 +479,6 @@ public class CreateSelfActivity extends AppCompatActivity {
super(view);
mView = view;
-
tv_sub_category = (TextView) mView.findViewById(R.id.tv_sub_category);
parentLayout = (LinearLayout) mView.findViewById(R.id.linear_parent);
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FutureJCPActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FutureJCPActivity.java
index 2b07904..559dff7 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FutureJCPActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FutureJCPActivity.java
@@ -9,6 +9,7 @@ import android.content.res.Resources;
import android.os.AsyncTask;
import android.os.Bundle;
import android.preference.PreferenceManager;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@@ -91,13 +92,11 @@ public class FutureJCPActivity extends AppCompatActivity implements View.OnClick
Snackbar.make(v, "Replace with your own action", Snackbar.LENGTH_LONG)
.setAction("Action", null).show();
break;
-
}
}
protected void showDatePickerDialog(int year, int month, int day) {
-
DatePickerDialog datePickerDialog = new DatePickerDialog(this, pickerListener, year, month, day);
// ((ViewGroup) datePickerDialog.getDatePicker()).findViewById(Resources.getSystem().getIdentifier("year", "id", "android")).setVisibility(View.GONE);
//datePickerDialog.findViewById(Resources.getSystem().getIdentifier("year", "id", "android")).setVisibility(View.GONE);
@@ -195,19 +194,17 @@ public class FutureJCPActivity extends AppCompatActivity implements View.OnClick
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ Log.d("requestdata",request.toString());
androidHttpTransport.call(
CommonString.SOAP_ACTION_UNIVERSAL, envelope);
Object resultFuturedata = (Object) envelope.getResponse();
if (resultFuturedata.toString() != null) {
-
xpp.setInput(new StringReader(resultFuturedata.toString()));
xpp.next();
eventType = xpp.getEventType();
-
journeyPlanPreviousGetterSetter = XMLHandlers.JCPXMLHandler(xpp, eventType);
-
}
return "Success";
} catch (XmlPullParserException e) {
@@ -236,7 +233,6 @@ public class FutureJCPActivity extends AppCompatActivity implements View.OnClick
MyListAdapter adapter = new MyListAdapter(context, journeyPlanPreviousGetterSetter);
futureJcpList.setLayoutManager(new LinearLayoutManager(context));
futureJcpList.setAdapter(adapter);
-
} else {
Snackbar.make(futureJcpList,R.string.no_route_plan_for_day,Snackbar.LENGTH_SHORT).show();
@@ -275,11 +271,8 @@ public class FutureJCPActivity extends AppCompatActivity implements View.OnClick
// NavUtils.navigateUpFromSameTask(this);
finish();
-
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
-
}
-
return super.onOptionsItemSelected(item);
}
@@ -302,7 +295,6 @@ public class FutureJCPActivity extends AppCompatActivity implements View.OnClick
@Override
public void onBindViewHolder(ViewHolder holder, int position) {
-
if (holder != null) {
holder.txt_store_cd.setText(journeyPlanPreviousGetterSetter.getSTORE_ID().get(position));
holder.txt_keyacct.setText(journeyPlanPreviousGetterSetter.getKEYACCOUNT().get(position));
@@ -313,10 +305,8 @@ public class FutureJCPActivity extends AppCompatActivity implements View.OnClick
}
}
-
@Override
public int getItemCount() {
-
return journeyPlanPreviousGetterSetter.getSTORE_ID().size();
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/MessageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/MessageActivity.java
index 0631f50..f144630 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/MessageActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/MessageActivity.java
@@ -54,7 +54,6 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
import cpm.com.gskmtorange.xmlHandlers.XMLHandlers;
public class MessageActivity extends AppCompatActivity {
-
//ArrayList messages;
private Context context;
String categoryName = "", categoryId;
@@ -121,10 +120,8 @@ public class MessageActivity extends AppCompatActivity {
@Override
protected void onResume() {
super.onResume();
-
CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
toolbar.setTitle(getString(R.string.title_activity_message));
-
new DowloadAsync(MessageActivity.this).execute();
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NewStockDataActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NewStockDataActivity.java
index 6b0a921..3b7caef 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NewStockDataActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NewStockDataActivity.java
@@ -1,5 +1,4 @@
package cpm.com.gskmtorange.dailyentry;
-
import android.annotation.SuppressLint;
import android.app.AlertDialog;
import android.app.Dialog;
@@ -67,9 +66,7 @@ import cpm.com.gskmtorange.interfaces.DialogCallbackListener;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.StockFacing_PlanogramTrackerDataGetterSetter;
-
-public class NewStockDataActivity extends AppCompatActivity implements DialogCallbackListener{
-
+public class NewStockDataActivity extends AppCompatActivity implements DialogCallbackListener {
private Context context;
ExpandableListView expandableListView;
TextView txt_mslAvailabilityName;
@@ -84,7 +81,7 @@ public class NewStockDataActivity extends AppCompatActivity implements DialogCa
LinearLayout lin_camera1, lin_camera2, lin_camera3, lin_camera4;
GSKOrangeDB db;
String categoryName, categoryId, storeId, Error_Message = "";
- String store_id,store_flag_hide, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow, country_id, store_flag_str;
+ String store_id, store_flag_hide, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow, country_id, store_flag_str;
boolean isDialogOpen = true;
private SharedPreferences preferences;
int scrollPosition = 0;
@@ -171,12 +168,19 @@ public class NewStockDataActivity extends AppCompatActivity implements DialogCa
db.open();
- if (db.checkMsl_Availability_StockFacingData(store_id, categoryId)) {
+ /*if (db.checkMsl_Availability_StockFacingData(store_id, categoryId)) {
db.updateMSL_Availability_StockFacing(store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
Snackbar.make(view, getResources().getString(R.string.update_message), Snackbar.LENGTH_LONG).setAction("Action", null).show();
} else {
db.InsertMSL_Availability_StockFacing(store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
Snackbar.make(view, getResources().getString(R.string.save_message), Snackbar.LENGTH_LONG).setAction("Action", null).show();
+ }*/
+ if (db.checkMsl_Availability_StockFacingDataNew(store_id, categoryId, visit_date)) {
+ db.updateMSL_Availability_StockFacingNew(visit_date, store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
+ Snackbar.make(view, getResources().getString(R.string.update_message), Snackbar.LENGTH_LONG).setAction("Action", null).show();
+ } else {
+ db.InsertMSL_Availability_StockFacingNew(visit_date, store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
+ Snackbar.make(view, getResources().getString(R.string.save_message), Snackbar.LENGTH_LONG).setAction("Action", null).show();
}
finish();
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
@@ -303,50 +307,6 @@ public class NewStockDataActivity extends AppCompatActivity implements DialogCa
e.printStackTrace();
}
-
- /* view = (RelativeLayout)findViewById(R.id.content_msl__availability);
- //bmImage = (ImageView)findViewById(R.id.image);
-
- view.setDrawingCacheEnabled(true);
- // this is the important code :)
- // Without it the view will have a dimension of 0,0 and the bitmap will be null
-
- view.measure(View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED),
- View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));
-
- view.layout(0, 0, view.getMeasuredWidth(), view.getMeasuredHeight());
-
- view.buildDrawingCache(true);
- final Bitmap b = Bitmap.createBitmap(view.getDrawingCache());
- view.setDrawingCacheEnabled(false); // clear drawing cache
-
- //bmImage.setImageBitmap(b);
-
- try{
-
-
- File yourFile = new File(FILE_PATH+"imgForTxt.png");
- yourFile.createNewFile(); // if file already exists will do nothing
- final FileOutputStream stream = new FileOutputStream(yourFile, false); //create your FileOutputStream here
-
- new Thread(new Runnable() {
- public void run(){
- b.compress(Bitmap.CompressFormat.PNG, 85, stream);
- b.recycle();
- try {
- stream.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }).start();
-
- }
- catch (FileNotFoundException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }*/
}
@Override
@@ -670,28 +630,37 @@ public class NewStockDataActivity extends AppCompatActivity implements DialogCa
//Header
if (country_id.equals("7")) {
- headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE, CommonString.TABLE_MAPPING_SOS_TARGET,store_flag_hide);
+ headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE, CommonString.TABLE_MAPPING_SOS_TARGET, store_flag_hide);
} else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
- headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC, CommonString.TABLE_MAPPING_SOS_TARGET_ADHOC,store_flag_hide);
+ headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC, CommonString.TABLE_MAPPING_SOS_TARGET_ADHOC, store_flag_hide);
} else {
- headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK, CommonString.TABLE_MAPPING_SOS_TARGET,store_flag_hide);
+ headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK, CommonString.TABLE_MAPPING_SOS_TARGET, store_flag_hide);
}
if (headerDataList.size() > 0) {
for (int i = 0; i < headerDataList.size(); i++) {
hashMapListHeaderData.add(headerDataList.get(i));
-
//childDataList = new ArrayList<>();
- childDataList = db.getMSL_Availability_StockFacingSKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
- if (!(childDataList.size() > 0)) {
- if (country_id.equals("7")) {
- childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE,store_flag_hide);
- } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
- childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC,store_flag_hide);
- } else {
- childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK,store_flag_hide);
- }
+ //childDataList = db.getMSL_Availability_StockFacingSKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
+ if (country_id.equals("7")) {
+ childDataList = db.getMSL_Availability_StockFacingSKUDataNewUpdate(headerDataList.get(i).getSub_category_id(),
+ categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id,
+ CommonString.TABLE_MAPPING_STOCK_STOREWISE, store_flag_hide, visit_date, false);
+ updateCoverage(CommonString.TABLE_MAPPING_STOCK_STOREWISE);
+ // childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE,store_flag_hide);
+ } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
+ // childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC,store_flag_hide);
+ childDataList = db.getMSL_Availability_StockFacingSKUDataNewUpdate(headerDataList.get(i).getSub_category_id(),
+ categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id,
+ CommonString.TABLE_MAPPING_STOCK_ADHOC, store_flag_hide, visit_date, false);
+ updateCoverage(CommonString.TABLE_MAPPING_STOCK_ADHOC);
+ } else {
+ // childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK,store_flag_hide);
+ childDataList = db.getMSL_Availability_StockFacingSKUDataNewUpdate(headerDataList.get(i).getSub_category_id(), categoryId,
+ headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id,
+ CommonString.TABLE_MAPPING_STOCK, store_flag_hide, visit_date, false);
+ updateCoverage(CommonString.TABLE_MAPPING_STOCK);
}
hashMapListChildData.put(hashMapListHeaderData.get(i), childDataList);
@@ -938,7 +907,7 @@ public class NewStockDataActivity extends AppCompatActivity implements DialogCa
txt_categoryHeader.setTypeface(null, Typeface.BOLD);
if (headerTitle.getCompany_id().equals("1")) {
- txt_categoryHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.header_text_color));
} else {
txt_categoryHeader.setTextColor(getResources().getColor(R.color.black));
}
@@ -948,6 +917,7 @@ public class NewStockDataActivity extends AppCompatActivity implements DialogCa
if (!checkflag) {
if (checkHeaderArray.contains(groupPosition)) {
card_view.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.white));
} else {
card_view.setCardBackgroundColor(getResources().getColor(R.color.grey_background));
}
@@ -1014,7 +984,6 @@ public class NewStockDataActivity extends AppCompatActivity implements DialogCa
holder.facing = (EditText) convertView.findViewById(R.id.ed_facing);
holder.facing.setFilters(new InputFilter[]{new NewStockDataActivity.DecimalDigitsInputFilter(3, 1)});
holder.stock = (EditText) convertView.findViewById(R.id.ed_stock);
-
holder.stock_view = convertView.findViewById(R.id.stock_view);
convertView.setTag(holder);
} else {
@@ -1025,12 +994,13 @@ public class NewStockDataActivity extends AppCompatActivity implements DialogCa
holder.txt_mbq.setText(childData.getMbq());
if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
- holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.light_green_background));
holder.txt_mbq.setVisibility(View.VISIBLE);
holder.toggle_available.setVisibility(View.VISIBLE);
holder.facing.setVisibility(View.VISIBLE);
+
if (country_id.equals("6")) {
holder.stock.setVisibility(View.VISIBLE);
holder.stock_view.setVisibility(View.VISIBLE);
@@ -1115,18 +1085,7 @@ public class NewStockDataActivity extends AppCompatActivity implements DialogCa
childData.setFacing("");
}
}
-
- /* else {
- if (finalHolder.facing.getText().toString() != null && !finalHolder.facing.getText().toString().equals("")) {
- if (Integer.parseInt(finalHolder.facing.getText().toString()) >= 0
- && Integer.parseInt(finalHolder.facing.getText().toString()) >= Integer.parseInt(childData.getMbq())) {
- childData.setFacing("");
- finalHolder.facing.setText("");
- }
- }
- }*/
}
-
expandableListView.clearFocus();
expandableListView.invalidateViews();
}
@@ -1523,11 +1482,13 @@ public class NewStockDataActivity extends AppCompatActivity implements DialogCa
if (tempflag) {
//holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
- holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ // holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ // holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.lin_category.setBackgroundResource(R.drawable.cardview_error_border);
} else {
//holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
- holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.light_green_background));
} else {
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
}
@@ -1543,11 +1504,12 @@ public class NewStockDataActivity extends AppCompatActivity implements DialogCa
if (tempflag) {
//holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
- holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ //holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.lin_category.setBackgroundResource(R.drawable.cardview_error_border);
} else {
//holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
- holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.light_green_background));
} else {
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
}
@@ -1575,6 +1537,7 @@ public class NewStockDataActivity extends AppCompatActivity implements DialogCa
ToggleButton toggle_available;
LinearLayout lin_category;
EditText facing, stock;
+
View stock_view;
}
@@ -1641,6 +1604,9 @@ public class NewStockDataActivity extends AppCompatActivity implements DialogCa
return "";
return null;
}
-
+ }
+ private void updateCoverage(String table) {
+ long l = db.updateStockMapping(store_id, visit_date, table);
+ if (l > 0) Log.e("CoverageUpdate", "" + l);
}
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NoCameraActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NoCameraActivity.java
index 238a3d5..71c828c 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NoCameraActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NoCameraActivity.java
@@ -321,7 +321,6 @@ public class NoCameraActivity extends AppCompatActivity implements Listener {
@Override
public boolean onLongClick(View tvView) {
showDeleteDialog(tvView);
-
return false;
}
});
@@ -1063,7 +1062,7 @@ public class NoCameraActivity extends AppCompatActivity implements Listener {
ArrayList mappingPlanogramList;
- if (country_id.equals("7")) {
+ if (country_id.equals("7")||country_id.equals("8")||country_id.equals("11")) {
mappingPlanogramList= db.getMappingPlanogramData(categoryId, null, null, store_id, CommonString.TABLE_MAPPING_PLANOGRAM_STORE_WISE);
} else if(store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
mappingPlanogramList= db.getMappingPlanogramData(categoryId, storeType_id, class_id, null, CommonString.TABLE_MAPPING_PLANOGRAM_ADHOC);
@@ -1202,12 +1201,10 @@ public class NoCameraActivity extends AppCompatActivity implements Listener {
void addRow(){
DynamycIdsGetterSetter dynamic_ids = new DynamycIdsGetterSetter();
-
// first Button
RelativeLayout rLayout = new RelativeLayout(context);
RelativeLayout.LayoutParams lprams = new RelativeLayout.LayoutParams(
- RelativeLayout.LayoutParams.MATCH_PARENT,
- RelativeLayout.LayoutParams.WRAP_CONTENT);
+ RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
TextView tv = new TextView(context);
//tv.setHeight(60);
tv.setTextSize(20);
@@ -1217,21 +1214,15 @@ public class NoCameraActivity extends AppCompatActivity implements Listener {
tv.setLayoutParams(lprams);
int tv_id = View.generateViewId();
tv.setId(tv_id);
-
//set dynamic textview id to object
dynamic_ids.setTextview_id(tv_id);
-
RecyclerView rec_bottom = new RecyclerView(context);
int rec_id = View.generateViewId();
-
//set dynamic recycler id to object
dynamic_ids.setRecycler_id(rec_id);
-
rec_bottom.setLayoutParams(lprams);
rec_bottom.setPadding(0, 0, 0, 0);
-
rec_bottom.setVisibility(View.GONE);
-
rec_bottom.setId(rec_id);
rec_bottom.setBackgroundColor(getResources().getColor(R.color.grey_background));
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
index 03c0fe7..39fda5d 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
@@ -108,7 +108,7 @@ public class NonWorkingReason extends AppCompatActivity implements
private ProgressBar pb;
private FailureGetterSetter failureGetterSetter = null;
boolean nonflag=true;
- String store_flag_str;
+ String store_flag_str,country_id, keyAccount_id, class_id, storeType_id;
TextView tv_remark;
@@ -117,7 +117,6 @@ public class NonWorkingReason extends AppCompatActivity implements
// TODO Auto-generated method stub
super.onCreate(savedInstanceState);
setContentView(R.layout.nonworkingmainlayout);
-
reasonspinner = (Spinner) findViewById(R.id.spinner_reason);
camera = (ImageButton) findViewById(R.id.imgcam);
save = (Button) findViewById(R.id.save);
@@ -126,24 +125,21 @@ public class NonWorkingReason extends AppCompatActivity implements
reason_lay = (RelativeLayout) findViewById(R.id.layout_reason);
rel_cam = (RelativeLayout) findViewById(R.id.relimgcam);
subreason_spinner = (Spinner) findViewById(R.id.spinner_sub_reason);
-
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
-
context = this;
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
preferences = PreferenceManager.getDefaultSharedPreferences(this);
-
CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
-
store_flag_str = getIntent().getStringExtra(CommonString.KEY_STORE_FLAG);
-
_UserId = preferences.getString(CommonString.KEY_USERNAME, "");
visit_date = preferences.getString(CommonString.KEY_DATE, null);
username = preferences.getString(CommonString.KEY_USERNAME, null);
+ country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, "");
+ keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
+ class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
+ storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
store_id = getIntent().getStringExtra(CommonString.KEY_STORE_ID);
- //store_id = preferences.getString(CommonString.KEY_STORE_ID, "");
database = new GSKOrangeDB(this);
database.open();
@@ -496,13 +492,22 @@ public class NonWorkingReason extends AppCompatActivity implements
cdata.setLongitude("0.0");
cdata.setImage(image1);
cdata.setSub_reasonId(sub_reason_id);
-
cdata.setRemark(text.getText().toString().replaceAll("[&^<>{}'$]", " "));
cdata.setStatus(CommonString.STORE_STATUS_LEAVE);
cdata.setFlag_from(store_flag_str);
- database.InsertCoverageData(cdata);
+ if (country_id.equals("7") || country_id.equals("8")) {
+ cdata.setKeyAccountId("0");
+ cdata.setStoreTypeId("0");
+ cdata.setClassId("0");
+ } else {
+ cdata.setKeyAccountId(keyAccount_id);
+ cdata.setStoreTypeId(storeType_id);
+ cdata.setClassId(class_id);
+ }
+ database.open();
+ database.InsertCoverageData(cdata);
database.updateStoreStatusOnLeave(store_id, visit_date, CommonString.STORE_STATUS_LEAVE, store_flag_str);
@@ -541,34 +546,27 @@ public class NonWorkingReason extends AppCompatActivity implements
cdata.setStatus(CommonString.STORE_STATUS_LEAVE);
cdata.setFlag_from(store_flag_str);
+ if (country_id.equals("7") || country_id.equals("8")) {
+ cdata.setKeyAccountId("0");
+ cdata.setStoreTypeId("0");
+ cdata.setClassId("0");
+ } else {
+ cdata.setKeyAccountId(keyAccount_id);
+ cdata.setStoreTypeId(storeType_id);
+ cdata.setClassId(class_id);
+ }
+ database.open();
database.InsertCoverageData(cdata);
-
- //database.updateStoreStatusOnLeave(store_id, visit_date, CommonString.STORE_STATUS_LEAVE, CommonString.FROM_JCP);
database.updateStoreStatusOnLeave(store_id, visit_date, CommonString.STORE_STATUS_LEAVE, store_flag_str);
-
- SharedPreferences.Editor editor = preferences
- .edit();
-
+ SharedPreferences.Editor editor = preferences.edit();
editor.putString(CommonString.KEY_STOREVISITED_STATUS + store_id, "No");
- editor.putString(
- CommonString.KEY_STOREVISITED_STATUS,
- "");
- editor.putString(
- CommonString.KEY_STORE_IN_TIME,
- "");
- editor.putString(
- CommonString.KEY_LATITUDE,
- "");
- editor.putString(
- CommonString.KEY_LONGITUDE,
- "");
+ editor.putString(CommonString.KEY_STOREVISITED_STATUS, "");
+ editor.putString(CommonString.KEY_STORE_IN_TIME, "");
+ editor.putString(CommonString.KEY_LATITUDE, "");
+ editor.putString(CommonString.KEY_LONGITUDE, "");
editor.commit();
-
}
-
new NonWorkingReason.GeoTagUpload(NonWorkingReason.this).execute();
-
- // finish();
}
})
.setNegativeButton(R.string.closed,
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/OrderTakingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/OrderTakingActivity.java
new file mode 100644
index 0000000..73a984b
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/OrderTakingActivity.java
@@ -0,0 +1,1166 @@
+package cpm.com.gskmtorange.dailyentry;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.cardview.widget.CardView;
+import androidx.core.content.FileProvider;
+
+import android.annotation.SuppressLint;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Typeface;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.preference.PreferenceManager;
+import android.provider.MediaStore;
+import android.text.InputFilter;
+import android.text.Spanned;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
+import android.webkit.WebView;
+import android.widget.AbsListView;
+import android.widget.BaseExpandableListAdapter;
+import android.widget.CompoundButton;
+import android.widget.EditText;
+import android.widget.ExpandableListAdapter;
+import android.widget.ExpandableListView;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+import android.widget.ToggleButton;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.Snackbar;
+
+import java.io.File;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import cpm.com.gskmtorange.Database.GSKOrangeDB;
+import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
+import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.gsk_dailyentry.MSL_Availability_StockFacingActivity;
+import cpm.com.gskmtorange.interfaces.DialogCallbackListener;
+import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.PharmaMSLInsertedGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.StockFacing_PlanogramTrackerDataGetterSetter;
+
+public class OrderTakingActivity extends AppCompatActivity implements DialogCallbackListener {
+ ExpandableListView expandableListView;
+ private Context context;
+ TextView txt_mslAvailabilityName;
+ ArrayList headerDataList;
+ ArrayList childDataList;
+ List hashMapListHeaderData;
+
+ String _pathforcheck1, _pathforcheck2, _pathforcheck3, _path, str, msg;
+
+ HashMap> hashMapListChildData;
+ List checkHeaderArray = new ArrayList<>();
+ boolean checkflag = true;
+ ExpandableListAdapter adapter;
+ ImageView camera1, camera2, camera3, camera4;
+ LinearLayout lin_camera1, lin_camera2, lin_camera3, lin_camera4;
+ GSKOrangeDB db;
+ String categoryName, categoryId, storeId, Error_Message = "";
+ String store_id, store_flag_hide, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow, country_id, store_flag_str;
+ boolean isDialogOpen = true;
+ private SharedPreferences preferences;
+ int scrollPosition = 0;
+
+ String gallery_package = "";
+ Uri outputFileUri;
+
+ String str_planogram = "", _pathforcheck = "";
+ EditText storepoET,podateET;
+
+ ArrayList planogramShelfHeaderDataList = new ArrayList<>();
+ ArrayList planogramSkuChildDataList;
+ HashMap> planogramHashMapListChildData = new HashMap<>();
+ boolean editFlag = false;
+ //temp
+ public static final String FILE_PATH = Environment.getExternalStorageDirectory() + "/";
+ //ImageView bmImage;
+ RelativeLayout view;
+ RadioButton radio_yes,radio_no;
+ RadioGroup radio_group;
+ String isExist="";
+ String sys_po_number="";
+ TextView sys_gen_poTV;
+ LinearLayout poLL,pocamLL;
+ String storepo ="";
+ ImageView poIV;
+ String img_str="";
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ try {
+ //setContentView(R.layout.activity_msl__availability_stock_facing);
+ setContentView(R.layout.activity_order_taking);
+ Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ expandableListView = (ExpandableListView) findViewById(R.id.expandableListView);
+ txt_mslAvailabilityName = (TextView) findViewById(R.id.txt_mslAvailabilityName);
+ camera1 = (ImageView) findViewById(R.id.img_camera1);
+ camera2 = (ImageView) findViewById(R.id.img_camera2);
+ camera3 = (ImageView) findViewById(R.id.img_camera3);
+ camera4 = (ImageView) findViewById(R.id.img_camera4);
+ poIV = (ImageView) findViewById(R.id.poIV);
+ pocamLL = findViewById(R.id.pocamLL);
+ poLL = findViewById(R.id.poLL);
+
+ radio_group =findViewById(R.id.radio_group);
+ radio_yes = findViewById(R.id.radio_yes);
+ radio_no = findViewById(R.id.radio_no);
+ sys_gen_poTV = findViewById(R.id.sys_gen_poTV);
+
+ storepoET = findViewById(R.id.storepoET);
+ podateET = findViewById(R.id.podateET);
+
+ lin_camera1 = (LinearLayout) findViewById(R.id.lin_camera1);
+ lin_camera2 = (LinearLayout) findViewById(R.id.lin_camera2);
+ lin_camera3 = (LinearLayout) findViewById(R.id.lin_camera3);
+ lin_camera4 = (LinearLayout) findViewById(R.id.lin_camera4);
+ context = this;
+ db = new GSKOrangeDB(this);
+ db.open();
+
+ //preference data
+ preferences = PreferenceManager.getDefaultSharedPreferences(this);
+ CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
+ store_flag_hide = preferences.getString(CommonString.KEY_STORE_FLAG_FACING_HIDE, null);
+
+ visit_date = preferences.getString(CommonString.KEY_DATE, null);
+ date = preferences.getString(CommonString.KEY_DATE, null);
+ username = preferences.getString(CommonString.KEY_USERNAME, null);
+ intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, "");
+ keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
+ class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
+ storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
+ camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, "");
+ country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, "");
+ store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null);
+
+ str = CommonString.FILE_PATH;
+
+
+ //Intent data
+ categoryName = getIntent().getStringExtra("categoryName");
+ categoryId = getIntent().getStringExtra("categoryId");
+
+
+ //txt_mslAvailabilityName.setText(getResources().getString(R.string.title_activity_msl__availability));
+ toolbar.setTitle(getResources().getString(R.string.order_taking));
+ setSupportActionBar(toolbar);
+
+ String [] str = date.split("/");
+ String str1 = str[0];
+ String str2 = str[1];
+ String str3 = str[2];
+ sys_po_number = store_id + "-" +str3+str1+str2;
+ sys_gen_poTV.setText(sys_po_number);
+
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+ str_planogram = CommonString.FILE_PATH_PLANOGRAM;
+ podateET.setText(visit_date);
+ prepareList();
+
+
+ //Camera
+ // prepareDefaultList();
+ // cameraMethod();
+
+ final FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+
+ poIV.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ _pathforcheck = store_id + categoryId + "POImage_" + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
+
+ _path = CommonString.FILE_PATH + _pathforcheck;
+ intime = CommonFunctions.getCurrentTimeWithLanguage(context);
+ startCameraActivity();
+ }
+ });
+
+ radio_group.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(RadioGroup radioGroup, int i) {
+ if (radio_yes.isChecked()) {
+ radio_yes.setBackground(getResources().getDrawable(R.mipmap.yes_green));
+ radio_no.setBackground(getResources().getDrawable(R.mipmap.no_white));
+ poLL.setVisibility(View.VISIBLE);
+ if(country_id.equals("17")){
+ pocamLL.setVisibility(View.VISIBLE);
+ }
+ else{
+ pocamLL.setVisibility(View.GONE);
+ }
+ isExist="yes";
+ /*expListView.setVisibility(View.VISIBLE);
+ categoryobject.setIsChecked(1);
+ skuData.get(0).setIsChecked(1);*/
+ }
+ if (radio_no.isChecked()) {
+ radio_no.setBackground(getResources().getDrawable(R.mipmap.no_red));
+ radio_yes.setBackground(getResources().getDrawable(R.mipmap.yes_white));
+ poLL.setVisibility(View.GONE);
+ pocamLL.setVisibility(View.GONE);
+ isExist="no";
+ img_str = "";
+ /*expListView.setVisibility(View.GONE);
+ categoryobject.setIsChecked(0);
+ skuData.get(0).setIsChecked(0);*/
+ }
+ }
+ });
+ fab.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(final View view) {
+ expandableListView.clearFocus();
+ adapter.notifyDataSetChanged();
+ storepo = storepoET.getText().toString();
+ //Log.e("storepo",storepo);
+ if(isExist.equalsIgnoreCase("no")){
+ if (db.checkOrder_taking_Data(store_id, categoryId)) {
+ db.updateOrder_taking_data(img_str,isExist,storepo,sys_po_number,date,store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
+ Toast.makeText(context,getResources().getString(R.string.update_message),Toast.LENGTH_SHORT).show();
+ } else {
+ db.InsertOrderTakingData(img_str,isExist,storepo,sys_po_number,date,store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
+ Toast.makeText(context,getResources().getString(R.string.save_message),Toast.LENGTH_SHORT).show();
+ }
+
+ /*String pharma_msl_xml = "";
+ String onXML = "";
+ String _onxml = "";
+ String categoryxml = "";
+
+ db.open();
+ ArrayList ordertakinglist = db.getOrder_TAKING_UploadServerData(store_id);
+ db.open();
+ ArrayList getOrder_TAKING_CategoryData = db.getOrder_TAKING_CategoryData(store_id);
+
+ if (ordertakinglist.size() > 0) {
+ for(int k = 0; k < getOrder_TAKING_CategoryData.size(); k++){
+ _onxml = "[CATEGORY_DATA]"
+ + "[MID]" + 0 + "[/MID]"
+ + "[USERID]" + username + "[/USERID]"
+ + "[PRESENT]" + getOrder_TAKING_CategoryData.get(k).getIsExist() + "[/PRESENT]"
+ + "[CATEGORY_ID]" + getOrder_TAKING_CategoryData.get(k).getCategory_id() + "[/CATEGORY_ID]"
+ + "[/CATEGORY_DATA]";
+ categoryxml = categoryxml + _onxml;
+ }
+ String cat_xml = categoryxml;
+
+ for (int j = 0; j < ordertakinglist.size(); j++) {
+ if(ordertakinglist.get(j).getIsExist()==1){
+ onXML = "[ORDERDATA]"
+ + "[MID]" + 0 + "[/MID]"
+ + "[USERID]" + username + "[/USERID]"
+ + "[PRESENT]" + ordertakinglist.get(j).getIsExist() + "[/PRESENT]"
+ + "[SYSTEM_PO_NUM]" + ordertakinglist.get(j).getSys_PO_No() + "[/SYSTEM_PO_NUM]"
+ + "[STORE_PO_NUM]" + ordertakinglist.get(j).getStore_PO_No() + "[/STORE_PO_NUM]"
+ + "[PO_DATE]" + ordertakinglist.get(j).getPO_Date() + "[/PO_DATE]"
+ + "[SKU_ID]" + ordertakinglist.get(j).getSku_id() + "[/SKU_ID]"
+ + "[ORDER_QTY]" + ordertakinglist.get(j).getFacing() + "[/ORDER_QTY]"+
+ "[/ORDERDATA]";
+ pharma_msl_xml = pharma_msl_xml + onXML;
+ }
+ }
+ String data_xml = cat_xml + pharma_msl_xml;
+
+ final String sos_xml = "[DATA]" + data_xml + "[/DATA]";
+ Log.e("order_xml",sos_xml);
+ }*/
+
+ finish();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+ }
+ else{
+ if(validation()){
+ if (validateData(hashMapListHeaderData, hashMapListChildData)) {
+ db.open();
+ if (db.checkOrder_taking_Data(store_id, categoryId)) {
+ db.updateOrder_taking_data(img_str,isExist,storepo,sys_po_number,date,store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
+ Toast.makeText(context,getResources().getString(R.string.update_message),Toast.LENGTH_SHORT).show();
+
+ } else {
+ db.InsertOrderTakingData(img_str,isExist,storepo,sys_po_number,date,store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
+ Toast.makeText(context,getResources().getString(R.string.save_message),Toast.LENGTH_SHORT).show();
+ }
+ finish();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+
+ String pharma_msl_xml = "";
+ String onXML = "";
+
+ // db.open();
+ ArrayList ordertakinglist = db.getOrder_TAKING_UploadServerData(store_id);
+ ArrayList getOrder_TAKING_CategoryData = db.getOrder_TAKING_CategoryData(store_id);
+ String _onxml = "";
+ String categoryxml = "";
+ if (ordertakinglist.size() > 0) {
+ for(int k = 0; k < getOrder_TAKING_CategoryData.size(); k++){
+ _onxml = "[CATEGORY_DATA]"
+ + "[MID]" + 0 + "[/MID]"
+ + "[USERID]" + username + "[/USERID]"
+ + "[PRESENT]" + getOrder_TAKING_CategoryData.get(k).getIsExist() + "[/PRESENT]"
+ + "[CATEGORY_ID]" + getOrder_TAKING_CategoryData.get(k).getCategory_id() + "[/CATEGORY_ID]"
+ + "[/CATEGORY_DATA]";
+ categoryxml = categoryxml + _onxml;
+ }
+ String cat_xml = categoryxml;
+
+ for (int j = 0; j < ordertakinglist.size(); j++) {
+ if(ordertakinglist.get(j).getIsExist()==1){
+ if(!ordertakinglist.get(j).getFacing().equals("0") &&
+ !ordertakinglist.get(j).getFacing().equals("")) {
+ onXML = "[ORDERDATA]"
+ + "[MID]" + 0 + "[/MID]"
+ + "[USERID]" + username + "[/USERID]"
+ + "[PRESENT]" + ordertakinglist.get(j).getIsExist() + "[/PRESENT]"
+ + "[SYSTEM_PO_NUM]" + ordertakinglist.get(j).getSys_PO_No() + "[/SYSTEM_PO_NUM]"
+ + "[STORE_PO_NUM]" + ordertakinglist.get(j).getStore_PO_No() + "[/STORE_PO_NUM]"
+ + "[PO_IMAGE]" + ordertakinglist.get(j).getPO_Img() + "[/PO_IMAGE]"
+ + "[PO_DATE]" + ordertakinglist.get(j).getPO_Date() + "[/PO_DATE]"
+ + "[SKU_ID]" + ordertakinglist.get(j).getSku_id() + "[/SKU_ID]"
+ + "[ORDER_QTY]" + ordertakinglist.get(j).getFacing() + "[/ORDER_QTY]" +
+ "[/ORDERDATA]";
+ pharma_msl_xml = pharma_msl_xml + onXML;
+ }
+ }
+ }
+ String data_xml = cat_xml + pharma_msl_xml;
+
+ final String sos_xml = "[DATA]" + data_xml + "[/DATA]";
+ Log.e("order_xml",sos_xml);
+ }
+
+ } else {
+ for (int i = 0; i < adapter.getGroupCount(); i++)
+ expandableListView.expandGroup(i);
+ }
+ }
+
+ }
+
+ }
+ });
+
+ expandableListView.setOnScrollListener(new AbsListView.OnScrollListener() {
+ @Override
+ public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
+
+ expandableListView.invalidate();
+
+ int lastItem = firstVisibleItem + visibleItemCount;
+
+ if (firstVisibleItem == 0) {
+ fab.show();//.setVisibility(View.VISIBLE);
+ } else if (lastItem == totalItemCount) {
+ fab.hide();//setVisibility(View.INVISIBLE);
+ } else {
+ fab.show();//setVisibility(View.VISIBLE);
+ }
+ }
+
+ @Override
+ public void onScrollStateChanged(AbsListView arg0, int arg1) {
+ InputMethodManager inputManager = (InputMethodManager) context
+ .getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (getCurrentFocus() != null) {
+ inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+ getCurrentFocus().clearFocus();
+ }
+ expandableListView.invalidateViews();
+ }
+ });
+
+ // Listview Group click listener
+ expandableListView.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() {
+ @Override
+ public boolean onGroupClick(ExpandableListView parent, View v, int groupPosition, long id) {
+ return false;
+ }
+ });
+
+ // Listview Group expanded listener
+ expandableListView.setOnGroupExpandListener(new ExpandableListView.OnGroupExpandListener() {
+ @Override
+ public void onGroupExpand(int groupPosition) {
+ InputMethodManager inputManager = (InputMethodManager) context
+ .getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (getWindow().getCurrentFocus() != null) {
+ inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+ getCurrentFocus().clearFocus();
+ }
+ }
+ });
+
+ // Listview Group collasped listener
+ expandableListView.setOnGroupCollapseListener(new ExpandableListView.OnGroupCollapseListener() {
+ @Override
+ public void onGroupCollapse(int groupPosition) {
+ InputMethodManager inputManager = (InputMethodManager) context
+ .getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (getWindow().getCurrentFocus() != null) {
+ inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+ getCurrentFocus().clearFocus();
+ }
+ }
+ });
+
+ // Listview on child click listener
+ expandableListView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() {
+ @Override
+ public boolean onChildClick(ExpandableListView parent, View v, int groupPosition,
+ int childPosition, long id) {
+ return false;
+ }
+ });
+ } catch (Resources.NotFoundException e) {
+ e.printStackTrace();
+ }
+ }
+
+ private boolean validation() {
+ boolean flag = true;
+ if(img_str.equals("") && country_id.equals("17")){
+ flag = false;
+ Toast.makeText(context, context.getString(R.string.pls_capture_img), Toast.LENGTH_SHORT).show();
+ }
+ else{
+ flag = true;
+ }
+ return flag;
+ }
+
+ boolean validateData(List listDataHeader,
+ HashMap> listDataChild) {
+ boolean flag = true, child_flag = true, all_flag = true;
+ checkHeaderArray.clear();
+ int childCount = 0;
+ int qtysum = 0;
+ //temp list data for empty only
+ List listDataHeaderTemp = new ArrayList<>();
+ HashMap> listDataChildTemp = new HashMap<>();
+ for (int i = 0; i < listDataHeader.size(); i++) {
+ flag = true;
+
+ List listTemp = new ArrayList<>();
+ for (int j = 0; j < listDataChild.get(listDataHeader.get(i)).size(); j++) {
+ child_flag = true;
+ MSL_AvailabilityStockFacingGetterSetter data = listDataChild.get(listDataHeader.get(i)).get(j);
+
+ String faceup = data.getFacing();
+ if(faceup!=null && !faceup.equals("")){
+ qtysum =qtysum+Integer.parseInt(faceup);
+ }
+
+ //Company_id
+ if (listDataChild.get(listDataHeader.get(i)).get(j).getCompany_id().equals("1") && !country_id.equals("17")) {
+ if (store_flag_hide.equals("0")) {
+ if (faceup.equals("")) {
+ if (!checkHeaderArray.contains(i)) {
+ checkHeaderArray.add(i);
+ }
+ scrollPosition = i + j + childCount;
+ all_flag = false;
+ flag = false;
+ child_flag = false;
+ Error_Message = getResources().getString(R.string.faceup_value);
+ Toast.makeText(context, context.getString(R.string.pls_fill_order_qty), Toast.LENGTH_SHORT).show();
+ }
+ }
+ }
+
+ if (!child_flag)
+ listTemp.add(data);
+
+ }
+
+ if (flag == false) {
+ listDataHeaderTemp.add(listDataHeader.get(i));
+ // listDataChildTemp.put(listDataHeader.get(i), listTemp);
+ } else {
+ childCount = childCount + listDataChild.get(listDataHeader.get(i)).size();
+ }
+ }
+
+ if(qtysum==0){
+ all_flag = false;
+ //flag = false;
+ Toast.makeText(context, "At least one order qty should be greater than zero", Toast.LENGTH_SHORT).show();
+ adapter.notifyDataSetChanged();
+ /*adapter = new ExpandableListAdapter(this, listDataHeaderTemp, listDataChildTemp);
+ expandableListView.setAdapter(adapter);
+ checkflag = false;*/
+ }
+
+ if (!all_flag) {
+ /*adapter = new ExpandableListAdapter(this, listDataHeaderTemp, listDataChildTemp);
+ expandableListView.setAdapter(adapter);*/
+ adapter.notifyDataSetChanged();
+ checkflag = false;
+ } else {
+ checkflag = true;
+ }
+
+ return all_flag;
+ }
+
+
+ private void cameraMethod() {
+ if (!camera_allow.equals("1")) {
+ findViewById(R.id.lin_camera).setVisibility(View.GONE);
+ } else {
+ findViewById(R.id.lin_camera).setVisibility(View.GONE);
+ }
+ }
+
+ //Planogram List for check and delete on backPress
+ private void prepareDefaultList() {
+ // Planogram After save shelf header data
+ planogramShelfHeaderDataList = db.getPlanogramAddShelfHeaderAfterSaveData(store_id, categoryId);
+
+ if (planogramShelfHeaderDataList.size() > 0) {
+ for (int i = 0; i < planogramShelfHeaderDataList.size(); i++) {
+ planogramSkuChildDataList = db.getStockAndFacingPlanogramAfterSKUData(planogramShelfHeaderDataList.get(i).getKey_id());
+
+ //After save sku child data
+ if (planogramSkuChildDataList.size() > 0) {
+ planogramHashMapListChildData.put(planogramShelfHeaderDataList.get(i), planogramSkuChildDataList);
+ }
+ }
+ }
+ }
+
+ private void prepareList() {
+ try {
+ hashMapListHeaderData = new ArrayList<>();
+ hashMapListChildData = new HashMap<>();
+ //Header
+ if (country_id.equals("7") || country_id.equals("8") || country_id.equals("17")) {
+ headerDataList = db.getOrderTaking_StockFacingHeaderData(country_id,categoryId, null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE, CommonString.TABLE_MAPPING_SOS_TARGET, store_flag_hide);
+ } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
+ headerDataList = db.getOrderTaking_StockFacingHeaderData(country_id,categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC, CommonString.TABLE_MAPPING_SOS_TARGET_ADHOC, store_flag_hide);
+ } else {
+ headerDataList = db.getOrderTaking_StockFacingHeaderData(country_id,categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK, CommonString.TABLE_MAPPING_SOS_TARGET, store_flag_hide);
+ }
+
+ if (headerDataList.size() > 0) {
+ for (int i = 0; i < headerDataList.size(); i++) {
+ hashMapListHeaderData.add(headerDataList.get(i));
+ //childDataList = new ArrayList<>();
+ childDataList = db.getOrder_TAKING_SKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
+ //Log.e("childlistsize", String.valueOf(childDataList.size()));
+ // childDataList = db.getMSL_Availability_StockFacingSKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
+ if (!(childDataList.size() > 0)) {
+ if (country_id.equals("7") || country_id.equals("8") || country_id.equals("17")) {
+ childDataList = db.getORDERTAKING_StockFacingSKUData(headerDataList.get(i).getSub_category_id(), categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE, store_flag_hide);
+ } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
+ childDataList = db.getORDERTAKING_StockFacingSKUData(headerDataList.get(i).getSub_category_id(), categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC, store_flag_hide);
+ } else {
+ childDataList = db.getORDERTAKING_StockFacingSKUData(headerDataList.get(i).getSub_category_id(), categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK, store_flag_hide);
+ }
+ }
+ else{
+ //if(childDataList.get(0).getPO_Date())
+ // podateET.setText(childDataList.get(0).getPO_Date());
+ sys_gen_poTV.setText(childDataList.get(0).getSys_PO_No());
+ storepoET.setText(childDataList.get(0).getStore_PO_No());
+ Log.d("childlistdata",childDataList.get(0).getPO_Img());
+ if(childDataList.get(0).getPO_Img()!=null && !childDataList.get(0).getPO_Img().equals("")){
+ img_str = childDataList.get(0).getPO_Img();
+ poIV.setImageResource(R.mipmap.camera_green);
+ }
+ if(childDataList.get(0).getIsExist()==1){
+ radio_yes.setChecked(true);
+ radio_yes.setBackground(getResources().getDrawable(R.mipmap.yes_green));
+ radio_no.setBackground(getResources().getDrawable(R.mipmap.no_white));
+ poLL.setVisibility(View.VISIBLE);
+ isExist="yes";
+ podateET.setText(visit_date);
+ }
+ else if(childDataList.get(0).getIsExist()==0){
+ radio_no.setChecked(true);
+ radio_no.setBackground(getResources().getDrawable(R.mipmap.no_red));
+ radio_yes.setBackground(getResources().getDrawable(R.mipmap.yes_white));
+ poLL.setVisibility(View.GONE);
+ isExist="no";
+ }
+ else{
+ radio_yes.setBackground(getResources().getDrawable(R.mipmap.yes_white));
+ radio_no.setBackground(getResources().getDrawable(R.mipmap.no_white));
+ poLL.setVisibility(View.VISIBLE);
+ isExist="";
+ }
+ }
+ hashMapListChildData.put(hashMapListHeaderData.get(i), childDataList);
+ }
+ }
+
+ adapter = new ExpandableListAdapter(this, hashMapListHeaderData, hashMapListChildData);
+ expandableListView.setAdapter(adapter);
+
+ //expand all
+ for (int i = 0; i < adapter.getGroupCount(); i++)
+ expandableListView.expandGroup(i);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onSelect(boolean flag) {
+ if (flag) {
+ //adapter.notifyDataSetChanged();
+ if (!validateData(hashMapListHeaderData, hashMapListChildData)) {
+ if (!camera_allow.equals("1")) {
+ db.deletePlanogramListStoreAndCategorywise(store_id, categoryId,
+ planogramShelfHeaderDataList, planogramHashMapListChildData);
+ }
+ }
+ finish();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+ }
+ }
+
+ @Override
+ public void onSave(boolean flag) {
+
+ }
+
+ public class ExpandableListAdapter extends BaseExpandableListAdapter {
+ private Context _context;
+ private List _listDataHeader;
+ private HashMap> _listDataChild;
+
+ public ExpandableListAdapter(Context context, List listDataHeader,
+ HashMap> listChildData) {
+ this._context = context;
+ this._listDataHeader = listDataHeader;
+ this._listDataChild = listChildData;
+ }
+
+ @Override
+ public Object getGroup(int groupPosition) {
+ return this._listDataHeader.get(groupPosition);
+ }
+
+ @Override
+ public int getGroupCount() {
+ return this._listDataHeader.size();
+ }
+
+ @Override
+ public long getGroupId(int groupPosition) {
+ return groupPosition;
+ }
+
+ @Override
+ public View getGroupView(final int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) {
+ MSL_AvailabilityStockFacingGetterSetter headerTitle = (MSL_AvailabilityStockFacingGetterSetter) getGroup(groupPosition);
+
+ if (convertView == null) {
+ LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ convertView = infalInflater.inflate(R.layout.item_order_taking, null, false);
+ }
+
+ TextView txt_categoryHeader = (TextView) convertView.findViewById(R.id.txt_categoryHeader);
+ RelativeLayout rel_header = (RelativeLayout) convertView.findViewById(R.id.rel_categoryHeader);
+ ImageView img_camera = (ImageView) convertView.findViewById(R.id.img_camera);
+ CardView card_view = (CardView) convertView.findViewById(R.id.card_view);
+
+ txt_categoryHeader.setTypeface(null, Typeface.BOLD);
+
+ if (headerTitle.getCompany_id().equals("1")) {
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.header_text_color));
+ } else {
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.black));
+ }
+
+ txt_categoryHeader.setText(headerTitle.getSub_category() + "-" + headerTitle.getBrand());
+
+
+ if (!checkflag) {
+ if (checkHeaderArray.contains(groupPosition)) {
+ card_view.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.white));
+ } else {
+ card_view.setCardBackgroundColor(getResources().getColor(R.color.grey_background));
+ }
+ }
+
+ //empty check color change
+ /*if (headerTitle.getCompany_id().equals("1")) {
+ if (!checkflag) {
+ if (checkHeaderArray.contains(groupPosition)) {
+ //card_view.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ txt_categoryHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark));
+ } else {
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+ }
+ }
+ } else {
+ if (!checkflag) {
+ if (checkHeaderArray.contains(groupPosition)) {
+ txt_categoryHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark));
+ } else {
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.black));
+ }
+ }
+ }*/
+
+ return convertView;
+ }
+
+ @Override
+ public Object getChild(int groupPosition, int childPosititon) {
+ return this._listDataChild.get(this._listDataHeader.get(groupPosition)).get(childPosititon);
+ }
+
+ @Override
+ public int getChildrenCount(int groupPosition) {
+ return this._listDataChild.get(this._listDataHeader.get(groupPosition)).size();
+ }
+
+ @Override
+ public long getChildId(int groupPosition, int childPosition) {
+ return childPosition;
+ }
+
+ @Override
+ public View getChildView(final int groupPosition, final int childPosition, boolean isLastChild,
+ View convertView, ViewGroup parent) {
+
+ final MSL_AvailabilityStockFacingGetterSetter childData =
+ (MSL_AvailabilityStockFacingGetterSetter) getChild(groupPosition, childPosition);
+ ViewHolder holder = null;
+
+ if (convertView == null) {
+ LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ convertView = infalInflater.inflate(R.layout.item_order_taking_child, null, false);
+ holder = new ViewHolder();
+ holder.cardView = (CardView) convertView.findViewById(R.id.card_view);
+ holder.lin_category = (LinearLayout) convertView.findViewById(R.id.lin_category);
+ holder.txt_skuName = (TextView) convertView.findViewById(R.id.txt_skuName);
+ holder.txt_mbq = (TextView) convertView.findViewById(R.id.txt_mbq);
+ holder.toggle_available = (ToggleButton) convertView.findViewById(R.id.toggle_available);
+ holder.facing = (EditText) convertView.findViewById(R.id.ed_facing);
+ holder.facing.setFilters(new InputFilter[]{new DecimalDigitsInputFilter(3, 1)});
+ holder.stock = (EditText) convertView.findViewById(R.id.ed_stock);
+ holder.ed_pricing = (EditText) convertView.findViewById(R.id.ed_pricing);
+
+ holder.facing_view = convertView.findViewById(R.id.facing_view);
+ holder.stock_view = convertView.findViewById(R.id.stock_view);
+ holder.pricing_view = convertView.findViewById(R.id.pricing_view);
+ convertView.setTag(holder);
+ } else {
+ holder = (ViewHolder) convertView.getTag();
+ }
+
+ // uae facing hide
+ if (store_flag_hide.equals("1")) {
+ holder.facing.setVisibility(View.GONE);
+ holder.facing_view.setVisibility(View.GONE);
+ } else {
+ holder.facing.setVisibility(View.VISIBLE);
+ holder.facing_view.setVisibility(View.VISIBLE);
+ }
+ //usk
+ /* if (childData.getPricing().equals("0")) {
+ holder.ed_pricing.setVisibility(View.GONE);
+ holder.pricing_view.setVisibility(View.GONE);
+ holder.ed_pricing.setId(childPosition);
+ holder.pricing_view.setId(childPosition);
+ } else {
+ holder.ed_pricing.setVisibility(View.VISIBLE);
+ holder.pricing_view.setVisibility(View.VISIBLE);
+ holder.ed_pricing.setId(childPosition);
+ holder.pricing_view.setId(childPosition);
+ }*/
+
+ holder.txt_skuName.setText(childData.getSku());
+
+ if (childData.getCompany_id().equals("1")) {
+ holder.txt_skuName.setTextColor(getResources().getColor(R.color.colorPrimary));
+ } else {
+ holder.txt_skuName.setTextColor(getResources().getColor(R.color.black));
+ }
+
+ final ViewHolder finalHolder = holder;
+ holder.toggle_available.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+ if (buttonView.isPressed()) {
+
+ editFlag = true;
+
+ if (isChecked) {
+ childData.setToggleValue("1");
+ //for Egypt
+ if (country_id.equals("6")) {
+ finalHolder.stock.setVisibility(View.VISIBLE);
+ } else {
+ finalHolder.stock.setVisibility(View.GONE);
+ }
+
+ /*childData.setStock("");
+ childData.setFacing("");*/
+ } else {
+ /* childData.setStock("");
+ childData.setFacing("");*/
+ childData.setToggleValue("0");
+ finalHolder.stock.setVisibility(View.VISIBLE);
+
+ //If MBQ Value is 0
+ if (Integer.parseInt(childData.getMbq()) == 0) {
+ childData.setStock("0");
+ childData.setFacing("0");
+ } else {
+ //for Egypt
+ if (country_id.equals("6")) {
+ childData.setStock("");
+ childData.setFacing("");
+ }
+ }
+
+ }
+
+ expandableListView.clearFocus();
+ expandableListView.invalidateViews();
+ }
+ }
+ });
+
+
+
+ // holder.ed_pricing.setText(childData.getPricingStock());
+
+
+ final ViewHolder finalHolder1 = holder;
+ final ViewHolder finalHolder2 = holder;
+ holder.facing.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+ @Override
+ public void onFocusChange(View v, boolean hasFocus) {
+ final EditText caption = (EditText) v;
+ String edFaceup = caption.getText().toString().replaceFirst("^0+(?!$)", "");
+
+ editFlag = true;
+
+ if (edFaceup != null && !edFaceup.equals("") && !edFaceup.equals(".")) {
+ //int num = Integer.parseInt(edFaceup);
+ double faceup = Double.parseDouble(edFaceup);
+ int num = (int) faceup;
+ //int faceint = (int)(faceup - Math.floor( faceup ));
+ int faceint = (int) ((faceup % 1.0) * 10);
+ if (faceint != 0) {
+ if ((faceup % 1.0) * 10 != 5) {
+ faceint = 5;
+ edFaceup = String.valueOf(num + faceint / 10.0);
+ finalHolder2.facing.setText(edFaceup);
+ }
+ }
+ }
+
+ boolean isFill = false;
+
+ //Toggle is no selected
+
+ if (country_id.equals("6")) {
+ if (!childData.getStock().equals("")) {
+
+ String faceup = edFaceup.replaceFirst("^0+(?!$)", "");
+
+ if (edFaceup != null && !edFaceup.equals("") && !edFaceup.equals(".")) {
+ if (Double.parseDouble(faceup) <= Integer.parseInt(childData.getStock())) {
+
+ isFill = true;
+
+ } else {
+ AlertDialog.Builder builder = new AlertDialog.Builder(OrderTakingActivity.this);
+ builder.setMessage(getString(R.string.check_faceup))
+ .setCancelable(false)
+ .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ finalHolder1.facing.setText("");
+ dialog.dismiss();
+ finalHolder2.facing.setText("");
+ }
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
+ }
+ } else {
+ isFill = true;
+ }
+ // }
+ } else {
+ isFill = true;
+ }
+ } else {
+ isFill = true;
+ }
+
+ if (isFill) {
+ if (!edFaceup.equals("") && !edFaceup.equals(".")) {
+ String faceup = "";
+ if (edFaceup.equals("0") || edFaceup.equals(".0")) {
+ faceup = "0";
+ } else {
+ faceup = edFaceup.replaceFirst("^0+(?!$)", "");
+ //faceup = new DecimalFormat("##.#").format(Double.parseDouble(faceup));
+ }
+
+ // String str2 = PerfectDecimal(faceup, 3, 1);
+ childData.setFacing(faceup);
+ } else {
+ childData.setFacing("");
+ }
+ }
+ }
+ });
+
+ holder.facing.setText(childData.getFacing());
+
+ //empty check color change
+ if (!checkflag) {
+ boolean tempflag = false;
+
+ if (holder.facing.getText().toString().equals("")) {
+ holder.facing.setBackgroundColor(getResources().getColor(R.color.white));
+ holder.facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.facing.setHint(getString(R.string.empty));
+ tempflag = true;
+ }
+
+ if (childData.getCompany_id().equals("1")) {
+ holder.facing.setHint("");
+
+ if (tempflag) {
+ holder.lin_category.setBackgroundResource(R.drawable.cardview_error_border);
+ } else {
+ //holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
+ if (childData.getCompany_id().equals("1")) {
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.light_green_background));
+ } else {
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
+ }
+ }
+ } else {
+ if (holder.facing.getText().toString().equals("")) {
+ holder.facing.setBackgroundColor(getResources().getColor(R.color.white));
+ holder.facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.facing.setHint(getString(R.string.empty));
+ tempflag = true;
+ }
+
+ if (tempflag) {
+ holder.lin_category.setBackgroundResource(R.drawable.cardview_error_border);
+ } else {
+ //holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
+ if (childData.getCompany_id().equals("1")) {
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.light_green_background));
+ } else {
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
+ }
+ }
+ }
+ }
+
+ return convertView;
+ }
+
+ @Override
+ public boolean hasStableIds() {
+ return false;
+ }
+
+ @Override
+ public boolean isChildSelectable(int groupPosition, int childPosition) {
+ return true;
+ }
+ }
+ public class ViewHolder {
+ CardView cardView;
+ TextView txt_skuName, txt_mbq;
+ ToggleButton toggle_available;
+ LinearLayout lin_category;
+ EditText facing, stock, ed_pricing;
+ View stock_view, pricing_view, facing_view;
+ }
+
+ public class DecimalDigitsInputFilter implements InputFilter {
+ Pattern mPattern;
+
+ public DecimalDigitsInputFilter(int digitsBeforeZero, int digitsAfterZero) {
+ mPattern = Pattern.compile("[0-9]{0," + (digitsBeforeZero - 1) + "}+((\\.[0-9]{0," + (digitsAfterZero - 1) + "})?)||(\\.)?");
+ }
+
+ @Override
+ public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
+ Matcher matcher = mPattern.matcher(dest);
+ if (!matcher.matches())
+ return "";
+ return null;
+ }
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
+ }
+
+
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+ Log.e("StockFacing", "resultCode: " + resultCode + ","+requestCode);
+
+ switch (requestCode) {
+ case 100:
+ //Planogram List for check and delete on backPress
+ prepareDefaultList();
+ if (db.isPlanogramAddShelfSaveData(store_id, categoryId)) {
+ camera1.setBackgroundResource(R.mipmap.new_no_camera_done_edit);
+ } else {
+ camera1.setBackgroundResource(R.mipmap.new_no_camera);
+ }
+
+ break;
+
+ case 0:
+
+ if (_pathforcheck != null && !_pathforcheck.equals("")) {
+ if (new File(str + _pathforcheck).exists()) {
+ Log.d("imagepath", str + _pathforcheck);
+ poIV.setImageResource(R.mipmap.camera_green);
+ img_str = _pathforcheck;
+ _pathforcheck = "";
+ }
+ }
+ break;
+ }
+ super.onActivityResult(requestCode, resultCode, data);
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ int id = item.getItemId();
+ if (id == android.R.id.home) {
+ if (editFlag) {
+ CommonFunctions.showAlertDialog(OrderTakingActivity.this, getResources().getString(R.string.data_will_be_lost));
+ } else {
+ finish();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+ }
+ //finish();
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+
+ @Override
+ public void onBackPressed() {
+ //super.onBackPressed();
+ if (editFlag) {
+ CommonFunctions.showAlertDialog(OrderTakingActivity.this, getResources().getString(R.string.data_will_be_lost));
+ } else {
+ finish();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+ }
+ }
+
+ protected void startCameraActivity() {
+ try {
+ Log.i("MakeMachine", "startCameraActivity()");
+ File file = new File(_path);
+ outputFileUri = FileProvider.getUriForFile(context, "cpm.com.gskmtorange.fileprovider", file);
+
+ 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);
+
+ //temp value in case camera is gallery app above jellybean
+ String packag = list.get(n).loadLabel(packageManager).toString();
+ if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri") || packag.equalsIgnoreCase("الاستوديو")) {
+ gallery_package = list.get(n).packageName;
+ }
+
+ if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+ if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera") || packag.equalsIgnoreCase("الكاميرا")) {
+ defaultCameraPackage = list.get(n).packageName;
+ break;
+ }
+ } else {
+
+ if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera") || packag.equalsIgnoreCase("الكاميرا")) {
+
+ 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 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();
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java
index 5f11e6b..61378fc 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java
@@ -28,16 +28,14 @@ import cpm.com.gskmtorange.fragment.SelectLanguageFragment;
import cpm.com.gskmtorange.fragment.SettingsActivityFragment;
public class SettingsActivity extends AppCompatActivity implements SelectLanguageFragment.OnFragmentInteractionListener {
-
String selected_lang = "", culture_id, notice_url;
private Context context;
FloatingActionButton fab;
-
private SharedPreferences preferences;
-
private SharedPreferences.Editor editor = null;
-
Toolbar toolbar;
+ private static final String SELECTED_ITEM_POSITION = "ItemPosition";
+ private int mPosition;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -47,11 +45,9 @@ public class SettingsActivity extends AppCompatActivity implements SelectLanguag
setSupportActionBar(toolbar);
context = this;
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
editor = preferences.edit();
-
CommonFunctions.updateLangResources(context,preferences.getString(CommonString.KEY_LANGUAGE, ""));
/* SettingsActivityFragment fragment = new SettingsActivityFragment();
@@ -61,37 +57,27 @@ public class SettingsActivity extends AppCompatActivity implements SelectLanguag
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
-
if (selected_lang.equals("")) {
-
- Snackbar.make(view, getString(R.string.select_language), Snackbar.LENGTH_LONG)
- .setAction("Action", null).show();
+ Snackbar.make(view, getString(R.string.select_language), Snackbar.LENGTH_LONG).setAction("Action", null).show();
} else {
-
CommonFunctions.updateLangResources(context,selected_lang);
-
editor.putString(CommonString.KEY_LANGUAGE, selected_lang);
editor.putString(CommonString.KEY_CULTURE_ID, culture_id);
editor.putString(CommonString.KEY_NOTICE_BOARD_LINK, notice_url);
editor.commit();
-
Intent startDownload = new Intent(context, MainActivity.class);
startActivity(startDownload);
finish();
}
-
-
}
});
}
@Override
public void onFragmentInteraction(String selected_lang, String culture_id, String notice_url) {
-
this.selected_lang = selected_lang;
this.culture_id = culture_id;
this.notice_url = notice_url;
-
if (!selected_lang.equals("")) {
fab.show();
}
@@ -139,5 +125,18 @@ public class SettingsActivity extends AppCompatActivity implements SelectLanguag
toolbar.setTitle(R.string.title_activity_settings);
}
+ @Override
+ protected void onSaveInstanceState(final Bundle outState) {
+ super.onSaveInstanceState(outState);
+ // Save the state of item position
+ outState.putInt(SELECTED_ITEM_POSITION, mPosition);
+ }
+
+ @Override
+ protected void onRestoreInstanceState(final Bundle savedInstanceState) {
+ super.onRestoreInstanceState(savedInstanceState);
+ // Read the state of item position
+ mPosition = savedInstanceState.getInt(SELECTED_ITEM_POSITION);
+ }
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockActivity.java
index c075335..6fdb5f1 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockActivity.java
@@ -121,12 +121,11 @@ public class StockActivity extends AppCompatActivity implements DialogCallbackLi
alert.show();*/
db.open();
-
- if (db.checkStockData(store_id, categoryId)) {
- db.updateStockData(store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
+ if (db.checkStockData(store_id, categoryId, visit_date)) {
+ db.updateStockData(store_id, categoryId, visit_date, hashMapListHeaderData, hashMapListChildData);
Snackbar.make(expandableListView, getResources().getString(R.string.update_message), Snackbar.LENGTH_LONG).setAction("Action", null).show();
} else {
- db.InsertStockData(store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
+ db.InsertStockData(store_id, categoryId, visit_date, hashMapListHeaderData, hashMapListChildData);
Snackbar.make(expandableListView, getResources().getString(R.string.save_message), Snackbar.LENGTH_LONG).setAction("Action", null).show();
}
finish();
@@ -234,45 +233,45 @@ public class StockActivity extends AppCompatActivity implements DialogCallbackLi
@Override
protected void onResume() {
super.onResume();
-
+ db.open();
}
private void prepareList() {
try {
hashMapListHeaderData = new ArrayList<>();
hashMapListChildData = new HashMap<>();
-
//Header
- if(country_id.equals("7")){
+ if (country_id.equals("7")) {
headerDataList = db.getStockFacingHeaderData(categoryId, null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE, CommonString.TABLE_MAPPING_SOS_TARGET);
+ } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
+ headerDataList = db.getStockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC, CommonString.TABLE_MAPPING_SOS_TARGET_ADHOC);
+ } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_ADDITIONAL)) {
+ headerDataList = db.getStockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADDITIONAL, CommonString.TABLE_MAPPING_SOS_TARGET);
+ } else {
+ headerDataList = db.getStockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK, CommonString.TABLE_MAPPING_SOS_TARGET);
}
- else if(store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
- headerDataList = db.getStockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id,CommonString.TABLE_MAPPING_STOCK_ADHOC, CommonString.TABLE_MAPPING_SOS_TARGET_ADHOC);
- }
- else if(store_flag_str.equalsIgnoreCase(CommonString.FROM_ADDITIONAL)) {
- headerDataList = db.getStockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id,CommonString.TABLE_MAPPING_STOCK_ADDITIONAL, CommonString.TABLE_MAPPING_SOS_TARGET);
- }
- else{
- headerDataList = db.getStockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id,CommonString.TABLE_MAPPING_STOCK, CommonString.TABLE_MAPPING_SOS_TARGET);
- }
-
-
if (headerDataList.size() > 0) {
for (int i = 0; i < headerDataList.size(); i++) {
hashMapListHeaderData.add(headerDataList.get(i));
-
//childDataList = new ArrayList<>();
- childDataList = db.getStockAfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
- if (!(childDataList.size() > 0)) {
- if (country_id.equals("7")) {
- childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE,"0");
- } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
- childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC,"0");
- } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_ADDITIONAL)) {
- childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADDITIONAL,"0");
- } else {
- childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK,"0");
- }
+ //childDataList = db.getStockAfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
+ if (country_id.equals("7")) {
+ // childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE,"0");
+ childDataList = db.getMSL_Availability_StockFacingSKUDataNewUpdate(headerDataList.get(i).getSub_category_id(),
+ categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id,
+ CommonString.TABLE_MAPPING_STOCK_STOREWISE, "0", visit_date, true);
+ } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
+ childDataList = db.getMSL_Availability_StockFacingSKUDataNewUpdate(headerDataList.get(i).getSub_category_id(),
+ categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id,
+ CommonString.TABLE_MAPPING_STOCK_ADHOC, "0", visit_date, true);
+ } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_ADDITIONAL)) {
+ childDataList = db.getMSL_Availability_StockFacingSKUDataNewUpdate(headerDataList.get(i).getSub_category_id(), categoryId,
+ headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id,
+ CommonString.TABLE_MAPPING_STOCK_ADDITIONAL, "0", visit_date, true);
+ } else {
+ childDataList = db.getMSL_Availability_StockFacingSKUDataNewUpdate(headerDataList.get(i).getSub_category_id(),
+ categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id,
+ CommonString.TABLE_MAPPING_STOCK, "0", visit_date, true);
}
hashMapListChildData.put(hashMapListHeaderData.get(i), childDataList);
@@ -330,7 +329,7 @@ public class StockActivity extends AppCompatActivity implements DialogCallbackLi
txt_categoryHeader.setTypeface(null, Typeface.BOLD);
if (headerTitle.getCompany_id().equals("1")) {
- txt_categoryHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.header_text_color));
} else {
txt_categoryHeader.setTextColor(getResources().getColor(R.color.black));
}
@@ -339,7 +338,10 @@ public class StockActivity extends AppCompatActivity implements DialogCallbackLi
if (!checkflag) {
if (checkHeaderArray.contains(groupPosition)) {
+ // card_view.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
card_view.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.white));
+
} else {
card_view.setCardBackgroundColor(getResources().getColor(R.color.grey_background));
}
@@ -412,7 +414,7 @@ public class StockActivity extends AppCompatActivity implements DialogCallbackLi
holder.txt_skuName.setText(childData.getSku());
if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
- holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.light_green_background));
} else {
@@ -465,11 +467,12 @@ public class StockActivity extends AppCompatActivity implements DialogCallbackLi
if (tempflag) {
//holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
- holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ // holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.lin_category.setBackgroundResource(R.drawable.cardview_error_border);
} else {
//holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
- holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.light_green_background));
} else {
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
}
@@ -491,11 +494,13 @@ public class StockActivity extends AppCompatActivity implements DialogCallbackLi
if (tempflag) {
//holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
- holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ // holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.lin_category.setBackgroundResource(R.drawable.cardview_error_border);
+
} else {
//holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
- holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.light_green_background));
} else {
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
}
@@ -593,6 +598,7 @@ public class StockActivity extends AppCompatActivity implements DialogCallbackLi
return all_flag;
}
+
@Override
public void onBackPressed() {
if (editFlag) {
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockDataActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockDataActivity.java
index 4736cf2..03f2945 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockDataActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockDataActivity.java
@@ -135,12 +135,19 @@ public class StockDataActivity extends AppCompatActivity implements DialogCallba
db.open();
- if (db.checkMsl_Availability_StockFacingData(store_id, categoryId)) {
+ /*if (db.checkMsl_Availability_StockFacingData(store_id, categoryId)) {
db.updateMSL_Availability_StockFacing(store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
Snackbar.make(expandableListView, getResources().getString(R.string.update_message), Snackbar.LENGTH_LONG).setAction("Action", null).show();
} else {
db.InsertMSL_Availability_StockFacing(store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
Snackbar.make(expandableListView, getResources().getString(R.string.save_message), Snackbar.LENGTH_LONG).setAction("Action", null).show();
+ }*/
+ if (db.checkMsl_Availability_StockFacingDataNew(store_id, categoryId,visit_date)) {
+ db.updateMSL_Availability_StockFacingNew(visit_date,store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
+ Snackbar.make(expandableListView, getResources().getString(R.string.update_message), Snackbar.LENGTH_LONG).setAction("Action", null).show();
+ } else {
+ db.InsertMSL_Availability_StockFacingNew(visit_date,store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
+ Snackbar.make(expandableListView, getResources().getString(R.string.save_message), Snackbar.LENGTH_LONG).setAction("Action", null).show();
}
finish();
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
@@ -276,6 +283,7 @@ public class StockDataActivity extends AppCompatActivity implements DialogCallba
}
else {
childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, null, CommonString.TABLE_MAPPING_STOCK,"0");
+
}
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockPricingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockPricingActivity.java
index 373daf9..9131949 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockPricingActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockPricingActivity.java
@@ -46,11 +46,11 @@ public class StockPricingActivity extends AppCompatActivity {
private SharedPreferences preferences;
String categoryName, categoryId, Error_Message = "";
- String store_id,store_flag_hide, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow, country_id, store_flag_str;
+ String store_id, store_flag_hide, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow, country_id, store_flag_str;
GSKOrangeDB db;
ArrayList headerDataList;
- ArrayList childDataList= new ArrayList<>();
+ ArrayList childDataList = new ArrayList<>();
List hashMapListHeaderData;
HashMap> hashMapListChildData;
ExpandableListAdapter adapter;
@@ -59,7 +59,7 @@ public class StockPricingActivity extends AppCompatActivity {
boolean checkflag = true;
FloatingActionButton fab;
-
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -116,17 +116,18 @@ public class StockPricingActivity extends AppCompatActivity {
hashMapListChildData = new HashMap<>();
//Header
- headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK, CommonString.TABLE_MAPPING_SOS_TARGET,store_flag_hide);
-
+ headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK, CommonString.TABLE_MAPPING_SOS_TARGET, store_flag_hide);
+
if (headerDataList.size() > 0) {
for (int i = 0; i < headerDataList.size(); i++) {
hashMapListHeaderData.add(headerDataList.get(i));
childDataList = new ArrayList<>();
//childDataList = db.getMSL_Availability_StockFacingSKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
- if (childDataList.size() == 0) {
- childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK,"0");
- }
+ // childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK,"0");
+ childDataList = db.getMSL_Availability_StockFacingSKUDataNewUpdate(headerDataList.get(i).getSub_category_id(),
+ categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id,
+ CommonString.TABLE_MAPPING_STOCK, "0", visit_date, false);
hashMapListChildData.put(hashMapListHeaderData.get(i), childDataList);
}
@@ -263,7 +264,7 @@ public class StockPricingActivity extends AppCompatActivity {
txt_categoryHeader.setTypeface(null, Typeface.BOLD);
if (headerTitle.getCompany_id().equals("1")) {
- txt_categoryHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.header_text_color));
} else {
txt_categoryHeader.setTextColor(getResources().getColor(R.color.black));
}
@@ -273,6 +274,7 @@ public class StockPricingActivity extends AppCompatActivity {
if (!checkflag) {
if (checkHeaderArray.contains(groupPosition)) {
card_view.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.white));
} else {
card_view.setCardBackgroundColor(getResources().getColor(R.color.grey_background));
}
@@ -359,7 +361,7 @@ public class StockPricingActivity extends AppCompatActivity {
holder.et_price.setOnFocusChangeListener(new View.OnFocusChangeListener() {
@Override
public void onFocusChange(View v, boolean hasFocus) {
- if(!hasFocus){
+ if (!hasFocus) {
final EditText caption = (EditText) v;
String edStock = caption.getText().toString().replaceFirst("^0+(?!$)", "");
@@ -383,11 +385,12 @@ public class StockPricingActivity extends AppCompatActivity {
if (tempflag) {
//holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
- holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ //holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.lin_category.setBackgroundResource(R.drawable.cardview_error_border);
} else {
//holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
- holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.light_green_background));
} else {
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
}
@@ -403,11 +406,12 @@ public class StockPricingActivity extends AppCompatActivity {
if (tempflag) {
//holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
- holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ //holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.lin_category.setBackgroundResource(R.drawable.cardview_error_border);
} else {
//holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
- holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.light_green_background));
} else {
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreCheckoutImageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreCheckoutImageActivity.java
index fb0ffd0..796794b 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreCheckoutImageActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreCheckoutImageActivity.java
@@ -196,7 +196,6 @@ public class StoreCheckoutImageActivity extends AppCompatActivity implements Vie
break;
case R.id.btn_save_selfie:
-
if (img_str != null) {
AlertDialog.Builder builder = new AlertDialog.Builder(StoreCheckoutImageActivity.this);
builder.setMessage(getResources().getString(R.string.title_activity_save_data))
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 6c52142..cca5b31 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
@@ -22,6 +22,7 @@ import android.os.Build;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.provider.Settings;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@@ -132,16 +133,11 @@ import cpm.com.gskmtorange.xmlGetterSetter.POGQuestionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuGroupMasterGetterSetter;
-import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter;
-import cpm.com.gskmtorange.xmlGetterSetter.SubCategoryMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SupervisorListGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
+import cpm.com.gskmtorange.xmlGetterSetter.Visit_Type_Master_GetterSetter;
import cpm.com.gskmtorange.xmlHandlers.XMLHandlers;
-/**
- * Created by ashishc on 29-12-2016.
- */
-
public class StoreListActivity extends AppCompatActivity implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener, LocationListener {
ArrayList coverage = new ArrayList();
ArrayList storelist = new ArrayList();
@@ -153,7 +149,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
RecyclerView recyclerView;
private SharedPreferences.Editor editor = null;
LinearLayout linearlay;
- String store_id, userId, culture_id, visit_date,store_facing_hide;
+ String store_id, userId, culture_id, visit_date, store_facing_hide;
private Dialog dialog;
boolean result_flag = false, leaveflag = false;
FloatingActionButton fab;
@@ -205,10 +201,8 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
NonWorkingSubReasonGetterSetter nonWorkingSubReasonGetterSetter;
SupervisorListGetterSetter supervisorListGetterSetter;
ConfigurationMasterGetterSetter configurationMasterGetterSetter;
-
MappingPlanogramStorewiseGetterSetter mappingPlanogramStorewiseGetterSetter;
private ProgressBar pb;
-
private TextView percentage, message;
Data data;
@@ -254,10 +248,8 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
-
Intent in = new Intent(context, DownloadActivity.class);
startActivity(in);
-
finish();
}
});
@@ -284,7 +276,6 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
.addApi(LocationServices.API)
.build();
}
-
}
private boolean checkPlayServices() {
@@ -296,7 +287,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
PLAY_SERVICES_RESOLUTION_REQUEST).show();
} else {
Toast.makeText(context, getResources().getString(R.string.notsuppoted)
- , Toast.LENGTH_LONG)
+ , Toast.LENGTH_LONG)
.show();
finish();
}
@@ -337,18 +328,15 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
if (mGoogleApiClient != null) {
LocationServices.FusedLocationApi.removeLocationUpdates(mGoogleApiClient, this);
}
-
}
protected void startLocationUpdates() {
-
if (ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
|| ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
if (mGoogleApiClient != null) {
LocationServices.FusedLocationApi.requestLocationUpdates(mGoogleApiClient, mLocationRequest, this);
}
}
-
}
public static int distFrom(double lat1, double lng1, double lat2, double lng2) {
@@ -405,7 +393,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
private boolean checkgpsEnableDevice() {
boolean flag = true;
if (!hasGPSDevice(context)) {
- Toast.makeText(context, "Gps not Supported",Toast.LENGTH_SHORT).show();
+ Toast.makeText(context, "Gps not Supported", Toast.LENGTH_SHORT).show();
}
final LocationManager manager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
if (!manager.isProviderEnabled(LocationManager.GPS_PROVIDER) && hasGPSDevice(context)) {
@@ -456,7 +444,6 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
}
}
-
public void GPSAlert() {
AlertDialog.Builder alertDialog = new AlertDialog.Builder(context);
alertDialog.setTitle("GPS IS DISABLED...");
@@ -480,33 +467,31 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
if (mGoogleApiClient != null) {
mGoogleApiClient.connect();
-
}
checkgpsEnableDevice();
CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
//toolbar.setTitle(getString(R.string.title_activity_store_list));
+ // Log.e("storeflag",store_flag_str);
db.open();
- if(store_flag_str.equals(CommonString.FROM_JCP)){
+ if (store_flag_str.equals(CommonString.FROM_JCP)) {
toolbar.setTitle(getString(R.string.title_activity_store_list));
- storelist = db.getStoreData(date,CommonString.KEY_JOURNEY_PLAN );
- }
- else if(store_flag_str.equals(CommonString.FROM_ADDITIONAL)){
+ storelist = db.getStoreData(date, CommonString.KEY_JOURNEY_PLAN);
+ } else if (store_flag_str.equals(CommonString.FROM_ADDITIONAL)) {
//Additional Journey Plan - Egypt
toolbar.setTitle(getString(R.string.title_activity_store_list));
- storelist = db.getStoreData(date,CommonString.KEY_JOURNEY_PLAN_ADDITIONAL);
- }
- else if(store_flag_str.equals(CommonString.FROM_PHARMA)){
+ storelist = db.getStoreData(date, CommonString.KEY_JOURNEY_PLAN_ADDITIONAL);
+ } else if (store_flag_str.equals(CommonString.FROM_PHARMA)) {
//Pharma stores - Turkey
toolbar.setTitle(getString(R.string.title_activity_store_list));
- storelist = db.getStoreData(date,CommonString.KEY_JOURNEY_PLAN_PHARMA);
- }else if(store_flag_str.equals(CommonString.FROM_ADDITIONAL_ADHOC)){
+ storelist = db.getStoreData(date, CommonString.KEY_JOURNEY_PLAN_PHARMA);
+ } else if (store_flag_str.equals(CommonString.FROM_ADDITIONAL_ADHOC)) {
//Additional Journey Plan - Egypt
toolbar.setTitle(getString(R.string.title_activity_store_list));
- storelist = db.getStoreData(date,CommonString.KEY_ADHOC_JOURNEYPLAN_ADDITIONAL);
- }else{
+ storelist = db.getStoreData(date, CommonString.KEY_ADHOC_JOURNEYPLAN_ADDITIONAL);
+ } else {
toolbar.setTitle(getString(R.string.adhoc_store_list));
- storelist = db.getStoreData(date,CommonString.KEY_ADHOC_JOURNEY_PLAN );
+ storelist = db.getStoreData(date, CommonString.KEY_ADHOC_JOURNEY_PLAN);
//fab.setVisibility(View.GONE);
}
@@ -528,7 +513,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
recyclerView.setVisibility(View.INVISIBLE);
linearlay.setVisibility(View.VISIBLE);
- if(store_flag_str.equals(CommonString.FROM_JCP)){
+ if (store_flag_str.equals(CommonString.FROM_JCP)) {
fab.show();//setVisibility(View.VISIBLE);
}
@@ -552,7 +537,6 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
return true;
}*/
-
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// Handle action bar item clicks here. The action bar will
@@ -569,7 +553,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
- }else if (id == R.id.iconMap) {
+ } else if (id == R.id.iconMap) {
Intent in = new Intent(context, StoreListRouteActivity.class);
in.putExtra(CommonString.KEY_STORE_LIST, storelist);
@@ -595,11 +579,8 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
@Override
public StoreListActivity.ValueAdapter.MyViewHolder onCreateViewHolder(ViewGroup parent, int i) {
-
View view = inflator.inflate(R.layout.storelist_child, parent, false);
-
StoreListActivity.ValueAdapter.MyViewHolder holder = new StoreListActivity.ValueAdapter.MyViewHolder(view);
-
return holder;
}
@@ -615,12 +596,11 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
}
final String storeid = current.getSTORE_ID();
- final CoverageBean coverageObj = db.getCoverageSpecificData(date,storeid);
+ final CoverageBean coverageObj = db.getCoverageSpecificData(date, storeid);
//viewHolder.txt.setText(current.txt);
viewHolder.txt.setText(current.getSTORE_NAME());
viewHolder.address.setText(current.getADDRESS());
-
/* if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_VALID)) {
viewHolder.chkbtn.setVisibility(View.VISIBLE);
viewHolder.imageview.setVisibility(View.INVISIBLE);
@@ -631,13 +611,13 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
viewHolder.chkbtn.setVisibility(View.INVISIBLE);
viewHolder.cancel_btn.setVisibility(View.GONE);
viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange));
- }else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_UN)) {
+ } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_UN)) {
viewHolder.imageview.setVisibility(View.VISIBLE);
viewHolder.imageview.setBackgroundResource(R.mipmap.tick_close);
viewHolder.chkbtn.setVisibility(View.INVISIBLE);
viewHolder.cancel_btn.setVisibility(View.GONE);
viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange));
- }else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_D)) {
+ } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_D)) {
viewHolder.imageview.setVisibility(View.VISIBLE);
viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation);
viewHolder.chkbtn.setVisibility(View.INVISIBLE);
@@ -668,103 +648,35 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
viewHolder.chkbtn.setVisibility(View.INVISIBLE);
viewHolder.cancel_btn.setVisibility(View.GONE);
viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange));
- }else if(coverageObj.getStatus()!=null && coverageObj.getStatus().equalsIgnoreCase(CommonString.KEY_VALID)){
+ } else if (coverageObj.getStatus() != null && coverageObj.getStatus().equalsIgnoreCase(CommonString.KEY_VALID)) {
viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange));
viewHolder.chkbtn.setVisibility(View.VISIBLE);
viewHolder.cancel_btn.setVisibility(View.GONE);
viewHolder.imageview.setVisibility(View.INVISIBLE);
-
- }else if(coverageObj.getStatus()!=null && coverageObj.getStatus().equalsIgnoreCase(CommonString.KEY_INVALID)){
+ } else if (coverageObj.getStatus() != null && coverageObj.getStatus().equalsIgnoreCase(CommonString.KEY_INVALID)) {
viewHolder.imageview.setVisibility(View.INVISIBLE);
viewHolder.chkbtn.setVisibility(View.GONE);
viewHolder.cancel_btn.setVisibility(View.VISIBLE);
viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.green));
- }else if(coverageObj.getStatus()!=null && coverageObj.getStatus().equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE)) {
+ } else if (coverageObj.getStatus() != null && coverageObj.getStatus().equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE)) {
viewHolder.imageview.setVisibility(View.VISIBLE);
viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation_close);
viewHolder.chkbtn.setVisibility(View.INVISIBLE);
viewHolder.cancel_btn.setVisibility(View.GONE);
viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange));
-
- }/* else if (checkleavestatus(storeid)) {
- viewHolder.imageview.setVisibility(View.VISIBLE);
- viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation);
- viewHolder.chkbtn.setVisibility(View.INVISIBLE);
- }*/
- /*else if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_INVALID)) {
-
- }*/
- /* else if (coverage.size() > 0) {
- String statusleave = "";
-
- for (int i = 0; i < coverage.size(); i++) {
-
- if (storeid.equals(coverage.get(i).getStoreId())) {
- statusleave = coverage.get(i).getStatus();
-
-
- if (statusleave.equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE)) {
-
- viewHolder.imageview.setVisibility(View.VISIBLE);
- viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation);
- viewHolder.chkbtn.setVisibility(View.INVISIBLE);
-
-
- } else if (coverage.get(i).getStatus().equalsIgnoreCase(CommonString.KEY_VALID)) {
- viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange));
- viewHolder.chkbtn.setVisibility(View.VISIBLE);
- viewHolder.imageview.setVisibility(View.INVISIBLE);
-
- } else if (coverage.get(i).getStatus().equalsIgnoreCase(CommonString.KEY_INVALID)) {
-
- viewHolder.imageview.setVisibility(View.INVISIBLE);
- viewHolder.chkbtn.setVisibility(View.INVISIBLE);
- viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.green));
- } else {
-
- viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange));
- viewHolder.imageview.setVisibility(View.INVISIBLE);
- viewHolder.chkbtn.setVisibility(View.INVISIBLE);
- }
-
- break;
-
-
- }
-
- *//* if (coverage.get(i).getInTime() != null) {
-
- if (coverage.get(i).getOutTime() == null) {
-
- if (storeid.equals(coverage.get(i).getStoreId())) {
- viewHolder.imageview.setVisibility(View.VISIBLE);
- // viewHolder.imageview.setBackgroundResource(R.mipmap.checkin);
- viewHolder.chkbtn.setVisibility(View.INVISIBLE);
- viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.green));
-
-
- }
- break;
- }
-
- }*//*
-
- }
-
- }*/ else {
-
+ }
+ else {
viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange));
viewHolder.imageview.setVisibility(View.INVISIBLE);
viewHolder.chkbtn.setVisibility(View.INVISIBLE);
viewHolder.cancel_btn.setVisibility(View.GONE);
}
- if(current.getGEO_TAG().equalsIgnoreCase("N")){
+ if (current.getGEO_TAG().equalsIgnoreCase("N")) {
viewHolder.imgview_navigation.setVisibility(View.INVISIBLE);
- }
- else {
+ } else {
viewHolder.imgview_navigation.setVisibility(View.VISIBLE);
}
@@ -797,7 +709,6 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
Snackbar.make(v, R.string.title_store_list_activity_already_store_closed, Snackbar.LENGTH_LONG).setAction("Action", null).show();
-
} else {
// PUT IN PREFERENCES
@@ -805,7 +716,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
// showMyDialog(store_id, current.getSTORE_NAME(), "Yes", current.getVISIT_DATE(), current.getCHECKOUT_STATUS());
- if(checkotherCheckedIn(store_flag_str)){
+ if (checkotherCheckedIn(store_flag_str)) {
/*String from;
if (store_flag_str.equals(CommonString.FROM_JCP)) {
from = getString(R.string.adhoc);
@@ -813,8 +724,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
from = getString(R.string.jcp);
}*/
Snackbar.make(v, getString(R.string.title_store_list_checkout_current) + " - " + from_checkedIn, Snackbar.LENGTH_SHORT).setAction("Action", null).show();
- }
- else {
+ } else {
if (!setCheckedMethod(store_id)) {
boolean enteryflag = true;
if (coverage.size() > 0) {
@@ -835,18 +745,18 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
}
if (enteryflag) {
- if(store_flag_str.equals(CommonString.FROM_PHARMA) && coverageObj.getStatus()!=null && coverageObj.getStatus().equalsIgnoreCase(CommonString.KEY_VALID)){
+ if (store_flag_str.equals(CommonString.FROM_PHARMA) && coverageObj.getStatus() != null
+ && coverageObj.getStatus().equalsIgnoreCase(CommonString.KEY_VALID)) {
Snackbar.make(v, R.string.title_store_list_checkout_Already_filled, Snackbar.LENGTH_SHORT).setAction("Action", null).show();
} /*if((store_flag_str.equals(CommonString.FROM_ADDITIONAL_ADHOC) || store_flag_str.equals(CommonString.FROM_ADDITIONAL)) && coverageObj.getStatus()!=null && coverageObj.getStatus().equalsIgnoreCase(CommonString.KEY_VALID)){
Snackbar.make(v, R.string.title_store_list_checkout_Already_filled, Snackbar.LENGTH_SHORT).setAction("Action", null).show();
- }*/else if(store_flag_str.equals(CommonString.FROM_JCP) || store_flag_str.equals(CommonString.FROM_PHARMA) || store_flag_str.equals(CommonString.FROM_ADDITIONAL_ADHOC) || store_flag_str.equals(CommonString.FROM_ADDITIONAL)){
- showMyDialog(store_id, current.getSTORE_NAME(), "Yes", current.getVISIT_DATE(), current.getCHECKOUT_STATUS(), current.getGEO_TAG(), current);
- }
- else {
- if(country_id.equalsIgnoreCase("5") || country_id.equalsIgnoreCase(CommonString.COUNTRY_ID_EGYPT +"")){
-
+ }*/ else if (store_flag_str.equals(CommonString.FROM_JCP) || store_flag_str.equals(CommonString.FROM_PHARMA)
+ || store_flag_str.equals(CommonString.FROM_ADDITIONAL_ADHOC) || store_flag_str.equals(CommonString.FROM_ADDITIONAL)) {
+ showMyDialog(store_id, current.getSTORE_NAME(), "Yes", current.getVISIT_DATE(),
+ current.getCHECKOUT_STATUS(), current.getGEO_TAG(), current);
+ } else {
+ if (country_id.equalsIgnoreCase("5") || country_id.equalsIgnoreCase("15") || country_id.equalsIgnoreCase("2") || country_id.equalsIgnoreCase(CommonString.COUNTRY_ID_EGYPT + "")) {
if (!current.getGEO_TAG().equalsIgnoreCase("N")) {
-
boolean flag = true;
if (coverage.size() > 0) {
for (int i = 0; i < coverage.size(); i++) {
@@ -856,33 +766,29 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
}
}
}
-
boolean flag_entry = true;
-
int distance = 0;
//geo fencing enabled only if GEO_FENCING equals 1 for COUNTRY_ID
- if(flag && geoFencingGetterSetters.size()>0 && geoFencingGetterSetters.get(0).getGEO_FENCING().get(0).equals("1")){
+ if (flag && geoFencingGetterSetters.size() > 0 && geoFencingGetterSetters.get(0).getGEO_FENCING().get(0).equals("1")) {
distanceGeoPhence = Integer.parseInt(geoFencingGetterSetters.get(0).getDISTANCE_MTR().get(0));
double store_lat = Double.parseDouble(current.getLATITUDE());
double store_lon = Double.parseDouble(current.getLONGITUDE());
- if(store_lat!=0.0 && store_lon!=0.0){
+ if (store_lat != 0.0 && store_lon != 0.0) {
distance = distFrom(store_lat, store_lon, lat, lon);
- if (/*true*/distance > distanceGeoPhence) {
+ if (distance > distanceGeoPhence) {
flag_entry = false;
- }
- else {
+ } else {
String msg = getString(R.string.distance_from_the_store) + " " + distance + " meters";
-
Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();
}
}
}
- if(flag_entry){
-
+ if (flag_entry) {
+ // Log.e("flag_entrydata","flagdata");
editor = preferences.edit();
editor.putString(CommonString.KEY_STORE_FLAG, store_flag_str);
editor.putString(CommonString.KEY_STORE_FLAG_FACING_HIDE, current.getFACING_HIDE());
@@ -891,28 +797,27 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
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_CLASS_ID, current.getCLASS_ID());
+
editor.putString(CommonString.KEY_POG_TYPE_ID, current.getPOG_TYPE_ID());
editor.putString(CommonString.KEY_UPLOAD_STATUS, current.getUPLOAD_STATUS());
editor.commit();
- if(!coverageObj.getStatus().equals("N")){
+ if (!coverageObj.getStatus().equalsIgnoreCase("N")) {
//if(db.isFilledAdhoc(store_id, visit_date)){
Intent in = new Intent(StoreListActivity.this, StoreWisePerformanceActivity.class);
startActivity(in);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
- }
- else {
+ } else {
new UploadTask(StoreListActivity.this, store_id).execute();
}
-
- }else{
-
- String msg = getString(R.string.you_need_to_be_in_the_store) + "\n " + getString(R.string.distance_from_the_store)+ " - " + distance + " "+getString(R.string.meters);
+ } else {
+ String msg = getString(R.string.you_need_to_be_in_the_store) + "\n " + getString(R.string.distance_from_the_store) + " - " + distance + " " + getString(R.string.meters);
//dialog.cancel();
AlertDialog.Builder builder = new AlertDialog.Builder(StoreListActivity.this);
builder.setTitle(getResources().getString(R.string.dialog_title));
@@ -931,7 +836,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
alert.show();
}
- }else {
+ } else {
editor = preferences.edit();
editor.putString(CommonString.KEY_STORE_FLAG, store_flag_str);
@@ -955,19 +860,37 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
//dialog.cancel();
}
- }
- else {
- if(coverageObj.getStatus().equals("N")){
-
+ } else {
+ if (coverageObj.getStatus().equals("N")) {
Intent in = new Intent(StoreListActivity.this, StoreimageActivity.class);
in.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
in.putExtra(CommonString.KEY_STORE_ID, store_id);
in.putExtra(CommonString.KEY_STORE_FLAG_FACING_HIDE, store_facing_hide);
-
startActivity(in);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
- }
- else {
+
+ /*if(store_flag_str.equals(CommonString.FROM_DEVIATION)){
+ editor = preferences.edit();
+ editor.putString(CommonString.KEY_STORE_FLAG, store_flag_str);
+ editor.commit();
+
+ Intent in = new Intent(StoreListActivity.this, VisitTypeStatusActivity.class);
+ in.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
+ in.putExtra(CommonString.KEY_STORE_ID, store_id);
+ in.putExtra(CommonString.KEY_STORE_FLAG_FACING_HIDE, store_facing_hide);
+ startActivity(in);
+ overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+ }
+ else{
+ Intent in = new Intent(StoreListActivity.this, StoreimageActivity.class);
+ in.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
+ in.putExtra(CommonString.KEY_STORE_ID, store_id);
+ in.putExtra(CommonString.KEY_STORE_FLAG_FACING_HIDE, store_facing_hide);
+ startActivity(in);
+ overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+ }*/
+
+ } else {
Snackbar.make(v, R.string.title_store_list_checkout_Already_filled, Snackbar.LENGTH_SHORT).setAction("Action", null).show();
}
}
@@ -985,7 +908,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
@Override
public void onClick(View v) {
Intent in = new Intent(context, StoreRouteActivity.class);
- in.putExtra(CommonString.KEY_STORE_LIST,current);
+ in.putExtra(CommonString.KEY_STORE_LIST, current);
startActivity(in);
}
});
@@ -1001,39 +924,76 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
@Override
public void onClick(View v) {
+ /* String visit_xml = "";
+ String onXML = "";
+ ArrayList visittypelist = db.getUploadedVisitType(store_id);
+
+ if (visittypelist.size() > 0) {
+ for (int j = 0; j < visittypelist.size(); j++) {
+ // Log.e("visit_type_id", String.valueOf(visittypelist.get(j).getVISIT_TYPE_ID()));
+ if(String.valueOf(visittypelist.get(j).getVISIT_TYPE_ID()).equalsIgnoreCase("[3]")){
+ onXML = "[VISIT_TYPE_STATUS]"
+ + "[MID]" + 0 + "[/MID]"
+ + "[USERID]" + userId + "[/USERID]"
+ + "[STORE_ID]" + store_id + "[/STORE_ID]"
+ + "[VISIT_TYPE_ID]" + "3" + "[/VISIT_TYPE_ID]"
+ + "[/VISIT_TYPE_STATUS]";
+ }
+ else if(String.valueOf(visittypelist.get(j).getVISIT_TYPE_ID()).equalsIgnoreCase("[2]")){
+ onXML = "[VISIT_TYPE_STATUS]"
+ + "[MID]" + 0 + "[/MID]"
+ + "[USERID]" + userId + "[/USERID]"
+ + "[STORE_ID]" + store_id + "[/STORE_ID]"
+ + "[VISIT_TYPE_ID]" + "2" + "[/VISIT_TYPE_ID]"
+ + "[/VISIT_TYPE_STATUS]";
+ }
+ else{
+ onXML = "[VISIT_TYPE_STATUS]"
+ + "[MID]" + 0 + "[/MID]"
+ + "[USERID]" + userId + "[/USERID]"
+ + "[STORE_ID]" + store_id + "[/STORE_ID]"
+ + "[VISIT_TYPE_ID]" +"1"+ "[/VISIT_TYPE_ID]"
+ + "[/VISIT_TYPE_STATUS]";
+ }
+
+ visit_xml = visit_xml + onXML;
+ }
+ final String sos_xml = "[DATA]" + visit_xml + "[/DATA]";
+ Log.e("visit_xml_data", sos_xml);
+ }*/
+
AlertDialog.Builder builder = new AlertDialog.Builder(StoreListActivity.this);
builder.setMessage(R.string.wantcheckout)
.setCancelable(false)
.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
- boolean coaching_visit_flag=false;
- //Enable disable According to Configuration
- ArrayList configurationData = db.getConfigurationMasterData(country_id);
- if(configurationData.size()>0){
+ boolean coaching_visit_flag = false;
+ //Enable disable According to Configuration
+ ArrayList configurationData = db.getConfigurationMasterData(country_id);
+ if (configurationData.size() > 0) {
- for(int i=0; i 0) {
- for (int i = 0; i < coverage.size(); i++) {
- if (store_id.equals(coverage.get(i).getStoreId())) {
- flag = false;
- break;
- }
+ radioGroup.setOnCheckedChangeListener((group, checkedId) -> {
+ // find which radio button is selected
+ if (checkedId == R.id.yes) {
+ if (GeotagStatus.equalsIgnoreCase("Y")) {
+ boolean flag = true;
+ //for test
+ // boolean flag = false;
+ if (coverage.size() > 0) {
+ for (int i = 0; i < coverage.size(); i++) {
+ if (store_id.equals(coverage.get(i).getStoreId())) {
+ flag = false;
+ break;
}
}
-
- boolean flag_entry = true;
-
- int distance = 0;
- //geo fencing enabled only if GEO_FENCING equals 1 for COUNTRY_ID
- if(flag && geoFencingGetterSetters.size()>0 && geoFencingGetterSetters.get(0).getGEO_FENCING().get(0).equals("1")){
- distanceGeoPhence = Integer.parseInt(geoFencingGetterSetters.get(0).getDISTANCE_MTR().get(0));
-
- double store_lat = Double.parseDouble(current.getLATITUDE());
- double store_lon = Double.parseDouble(current.getLONGITUDE());
-
- if(store_lat!=0.0 && store_lon!=0.0){
- distance = distFrom(store_lat, store_lon, lat, lon);
-
- if (/*true*/distance > distanceGeoPhence) {
- flag_entry = false;
- }
- else {
- String msg = getString(R.string.distance_from_the_store) + " " + distance + " meters";
-
- Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();
- }
+ }
+ boolean flag_entry = true;
+ int distance = 0;
+ //geo fencing enabled only if GEO_FENCING equals 1 for COUNTRY_ID
+ if (flag && geoFencingGetterSetters.size() > 0 && geoFencingGetterSetters.get(0).getGEO_FENCING().get(0).equals("1")) {
+ distanceGeoPhence = Integer.parseInt(geoFencingGetterSetters.get(0).getDISTANCE_MTR().get(0));
+ double store_lat = Double.parseDouble(current.getLATITUDE());
+ double store_lon = Double.parseDouble(current.getLONGITUDE());
+ if (store_lat != 0.0 && store_lon != 0.0) {
+ distance = distFrom(store_lat, store_lon, lat, lon);
+ if (distance > distanceGeoPhence) {
+ flag_entry = false;
+ } else {
+ String msg = getString(R.string.distance_from_the_store) + " " + distance + " meters";
+ Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();
}
}
+ }
+ if (flag_entry) {
+ editor = preferences.edit();
+ editor.putString(CommonString.KEY_STORE_ID, current.getSTORE_ID());
+ editor.putString(CommonString.KEY_STORE_FLAG_FACING_HIDE, current.getFACING_HIDE());
+ 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();
- if(flag_entry){
-
- editor = preferences.edit();
- editor.putString(CommonString.KEY_STORE_ID, current.getSTORE_ID());
- editor.putString(CommonString.KEY_STORE_FLAG_FACING_HIDE, current.getFACING_HIDE());
- 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();
-
-
- if (flag == true) {
-
- Intent in = new Intent(StoreListActivity.this, StoreimageActivity.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);
+ if (flag == true) {
+ Intent in = new Intent(StoreListActivity.this, StoreimageActivity.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);
+ dialog.cancel();
+ } else {
+ if (store_flag_str.equals(CommonString.FROM_ADDITIONAL) || store_flag_str.equals(CommonString.FROM_ADDITIONAL_ADHOC)) {
+ dialog.cancel();
+ Snackbar.make(recyclerView, R.string.title_store_list_checkout_Already_filled, Snackbar.LENGTH_SHORT).setAction("Action", null).show();
+ } else if (store_flag_str.equals(CommonString.FROM_PHARMA)) {
+ Intent in = new Intent(StoreListActivity.this, PharmaActivity.class);
startActivity(in);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
dialog.cancel();
} else {
- if(store_flag_str.equals(CommonString.FROM_ADDITIONAL) || store_flag_str.equals(CommonString.FROM_ADDITIONAL_ADHOC)){
- dialog.cancel();
- Snackbar.make(recyclerView, R.string.title_store_list_checkout_Already_filled, Snackbar.LENGTH_SHORT).setAction("Action", null).show();
-
- }else if(store_flag_str.equals(CommonString.FROM_PHARMA)){
- Intent in = new Intent(StoreListActivity.this, PharmaActivity.class);
- startActivity(in);
- overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
- dialog.cancel();
- }
- else {
- Intent in = new Intent(StoreListActivity.this, StoreWisePerformanceActivity.class);
- startActivity(in);
- overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
- dialog.cancel();
- }
+ Intent in = new Intent(StoreListActivity.this, StoreWisePerformanceActivity.class);
+ startActivity(in);
+ overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+ dialog.cancel();
}
-
- }else{
-
- String msg = getString(R.string.you_need_to_be_in_the_store) + "\n " + getString(R.string.distance_from_the_store)+ " - " + distance + " "+getString(R.string.meters);
- dialog.cancel();
- AlertDialog.Builder builder = new AlertDialog.Builder(StoreListActivity.this);
- builder.setTitle(getResources().getString(R.string.dialog_title));
- builder.setMessage(msg).setCancelable(false)
- .setPositiveButton(getResources().getString(R.string.ok),
- new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog1,
- int id) {
-
- dialog1.cancel();
- }
- });
-
- AlertDialog alert = builder.create();
-
- alert.show();
}
-
} else {
+ String msg = getString(R.string.you_need_to_be_in_the_store) + "\n " + getString(R.string.distance_from_the_store) + " - " + distance + " " + getString(R.string.meters);
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)
+ builder.setMessage(msg).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);
-
- 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();
}
});
@@ -1272,72 +1168,103 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
AlertDialog alert = builder.create();
alert.show();
-
}
-
- } else if (checkedId == R.id.no) {
-
+ } else {
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);
- GSKOrangeDB db = new GSKOrangeDB(StoreListActivity.this);
- db.open();
+ editor.commit();
- coverage = db.getCoverageWithStoreID_Data(current.getSTORE_ID(), visitDate);
+ 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();
+ }
+ });
- if (coverage.size() > 0) {
+ AlertDialog alert = builder.create();
- if (coverage.get(0).getStatus().equals(CommonString.KEY_INVALID) || coverage.get(0).getStatus().equals(CommonString.KEY_VALID)) {
- AlertDialog.Builder builder = new AlertDialog.Builder(StoreListActivity.this);
- builder.setMessage(R.string.DELETE_ALERT_MESSAGE)
- .setCancelable(false)
- .setPositiveButton(getResources().getString(R.string.yes),
- new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog,
- int id) {
+ alert.show();
- UpdateStore(current.getSTORE_ID());
-
- Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class);
- in.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID());
- in.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
- startActivity(in);
-
- }
- })
- .setNegativeButton(getResources().getString(R.string.no),
- new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog,
- int id) {
+ }
- dialog.cancel();
- }
- });
- AlertDialog alert = builder.create();
-
- alert.show();
- } else {
- Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class);
- in.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID());
- in.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
- startActivity(in);
- }
-
+ } else if (checkedId == R.id.no) {
+ dialog.cancel();
+ editor = preferences.edit();
+ editor.putString(CommonString.KEY_STORE_ID, current.getSTORE_ID());
+ editor.putString(CommonString.KEY_STORE_FLAG_FACING_HIDE, current.getFACING_HIDE());
+ 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();
+ db.open();
+ coverage = db.getCoverageWithStoreID_Data(current.getSTORE_ID(), visitDate);
+ if (coverage.size() > 0) {
+ if (coverage.get(0).getStatus().equals(CommonString.KEY_INVALID) || coverage.get(0).getStatus().equals(CommonString.KEY_VALID)) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(StoreListActivity.this);
+ builder.setMessage(R.string.DELETE_ALERT_MESSAGE)
+ .setCancelable(false)
+ .setPositiveButton(getResources().getString(R.string.yes),
+ (dialog, id) -> {
+ UpdateStore(current.getSTORE_ID());
+ Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class);
+ in.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID());
+ in.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
+ startActivity(in);
+ }).setNegativeButton(getResources().getString(R.string.no),
+ (dialog, id) -> dialog.cancel());
+ AlertDialog alert = builder.create();
+ alert.show();
} else {
-
Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class);
in.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID());
in.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
startActivity(in);
}
-
+ } else {
+ Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class);
+ in.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID());
+ in.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
+ startActivity(in);
}
}
-
});
-
dialog.show();
}
@@ -1403,11 +1330,10 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
UpdateStore(current.getSTORE_ID());
- if(store_flag_str.equals(CommonString.FROM_JCP)){
- storelist = db.getStoreData(date,CommonString.KEY_JOURNEY_PLAN );
- }
- else {
- storelist = db.getStoreData(date,CommonString.KEY_ADHOC_JOURNEY_PLAN );
+ if (store_flag_str.equals(CommonString.FROM_JCP)) {
+ storelist = db.getStoreData(date, CommonString.KEY_JOURNEY_PLAN);
+ } else {
+ storelist = db.getStoreData(date, CommonString.KEY_ADHOC_JOURNEY_PLAN);
}
coverage = db.getCoverageData(date, store_flag_str);
@@ -1430,57 +1356,52 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
}
}
- boolean checkotherCheckedIn(String store_flag_str){
+ boolean checkotherCheckedIn(String store_flag_str) {
boolean flag_checked_in = false;
ArrayList other_coverage_list;
- if(store_flag_str.equals(CommonString.FROM_JCP)){
+ if (store_flag_str.equals(CommonString.FROM_JCP)) {
- if(isCheckedInFromStoreFlag(CommonString.FROM_DEVIATION)){
+ if (isCheckedInFromStoreFlag(CommonString.FROM_DEVIATION)) {
from_checkedIn = getString(R.string.adhoc);
return true;
- }
- else if(isCheckedInFromStoreFlag(CommonString.FROM_ADDITIONAL)){
+ } else if (isCheckedInFromStoreFlag(CommonString.FROM_ADDITIONAL)) {
from_checkedIn = getString(R.string.additional_stores);
return true;
- }else if(isCheckedInFromStoreFlag(CommonString.FROM_PHARMA)){
+ } else if (isCheckedInFromStoreFlag(CommonString.FROM_PHARMA)) {
from_checkedIn = getString(R.string.pharma_stores);
return true;
}
- }
- else if(store_flag_str.equals(CommonString.FROM_ADDITIONAL)){
+ } else if (store_flag_str.equals(CommonString.FROM_ADDITIONAL)) {
- if(isCheckedInFromStoreFlag(CommonString.FROM_JCP)){
+ if (isCheckedInFromStoreFlag(CommonString.FROM_JCP)) {
from_checkedIn = getString(R.string.jcp);
return true;
- }
- else if(isCheckedInFromStoreFlag(CommonString.FROM_DEVIATION)){
- from_checkedIn = getString(R.string.adhoc);
+ } else if (isCheckedInFromStoreFlag(CommonString.FROM_DEVIATION)) {
+ from_checkedIn = getString(R.string.adhoc);
return true;
- }else if(isCheckedInFromStoreFlag(CommonString.FROM_PHARMA)){
+ } else if (isCheckedInFromStoreFlag(CommonString.FROM_PHARMA)) {
from_checkedIn = getString(R.string.pharma_stores);
return true;
}
- }else if(store_flag_str.equals(CommonString.FROM_PHARMA)){
+ } else if (store_flag_str.equals(CommonString.FROM_PHARMA)) {
- if(isCheckedInFromStoreFlag(CommonString.FROM_JCP)){
+ if (isCheckedInFromStoreFlag(CommonString.FROM_JCP)) {
from_checkedIn = getString(R.string.jcp);
return true;
- }
- else if(isCheckedInFromStoreFlag(CommonString.FROM_DEVIATION)){
- from_checkedIn = getString(R.string.adhoc);
+ } else if (isCheckedInFromStoreFlag(CommonString.FROM_DEVIATION)) {
+ from_checkedIn = getString(R.string.adhoc);
return true;
- }else if(isCheckedInFromStoreFlag(CommonString.FROM_ADDITIONAL)){
+ } else if (isCheckedInFromStoreFlag(CommonString.FROM_ADDITIONAL)) {
from_checkedIn = getString(R.string.additional_stores);
return true;
}
- }else {
- if(isCheckedInFromStoreFlag(CommonString.FROM_JCP)){
+ } else {
+ if (isCheckedInFromStoreFlag(CommonString.FROM_JCP)) {
from_checkedIn = getString(R.string.jcp);
return true;
- }
- else if(isCheckedInFromStoreFlag(CommonString.FROM_ADDITIONAL)){
+ } else if (isCheckedInFromStoreFlag(CommonString.FROM_ADDITIONAL)) {
from_checkedIn = getString(R.string.additional_stores);
return true;
}
@@ -1489,16 +1410,16 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
return flag_checked_in;
}
- boolean isCheckedInFromStoreFlag(String flagFromStore){
+ boolean isCheckedInFromStoreFlag(String flagFromStore) {
boolean flag = false;
ArrayList other_coverage_list;
other_coverage_list = db.getCoverageData(date, flagFromStore);
- for(int i=0; i coverage = new ArrayList();
-
+ String VISIT_TYPE_ID = "";
LocationManager locationManager;
boolean enabled;
private final static int PLAY_SERVICES_RESOLUTION_REQUEST = 1000;
-
private LocationRequest mLocationRequest;
private static int UPDATE_INTERVAL = 500; // 5 sec
private static int FATEST_INTERVAL = 100; // 1 sec
@@ -131,29 +130,25 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
-
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
img_cam = (ImageView) findViewById(R.id.img_selfie);
img_clicked = (ImageView) findViewById(R.id.img_cam_selfie);
-
btn_save = (Button) findViewById(R.id.btn_save_selfie);
-
- //store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
-
visit_date = preferences.getString(CommonString.KEY_DATE, null);
date = preferences.getString(CommonString.KEY_DATE, null);
username = preferences.getString(CommonString.KEY_USERNAME, null);
_UserId = preferences.getString(CommonString.KEY_USERNAME, "");
intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, "");
country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, "");
- // store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null);
-
+ keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
+ class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
+ storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
store_flag_str = getIntent().getStringExtra(CommonString.KEY_STORE_FLAG);
store_id = getIntent().getStringExtra(CommonString.KEY_STORE_ID);
+ VISIT_TYPE_ID = getIntent().getStringExtra("VISIT_TYPE_ID");
+ // Log.e("visittypeid",VISIT_TYPE_ID);
str = CommonString.FILE_PATH;
-
database = new GSKOrangeDB(this);
database.open();
@@ -167,7 +162,6 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
// Building the GoogleApi client
buildGoogleApiClient();
-
createLocationRequest();
}
@@ -489,27 +483,31 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
break;
case R.id.btn_save_selfie:
-
if (img_str != null) {
-
AlertDialog.Builder builder = new AlertDialog.Builder(StoreimageActivity.this);
builder.setMessage(getResources().getString(R.string.title_activity_save_data))
.setCancelable(false)
.setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
-
alert.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
-
String status;
//if (store_flag_str.equals(CommonString.FROM_JCP) || country_id.equalsIgnoreCase("5") || country_id.equalsIgnoreCase(CommonString.COUNTRY_ID_EGYPT +"")
// || store_flag_str.equals(CommonString.FROM_ADDITIONAL) || store_flag_str.equals(CommonString.FROM_PHARMA)) {
- if (store_flag_str.equals(CommonString.FROM_JCP) || country_id.equalsIgnoreCase("5")
+ if (store_flag_str.equals(CommonString.FROM_JCP) || country_id.equalsIgnoreCase("5") || country_id.equalsIgnoreCase("15")
|| store_flag_str.equals(CommonString.FROM_PHARMA)) {
status = CommonString.KEY_INVALID;
} else {
- status = CommonString.KEY_VALID;
- }
+ if (VISIT_TYPE_ID != null) {
+ if (country_id.equals("2") && (VISIT_TYPE_ID.equals("1") || VISIT_TYPE_ID.equals("3"))) {
+ status = CommonString.KEY_INVALID;
+ } else {
+ status = CommonString.KEY_VALID;
+ }
+ } else {
+ status = CommonString.KEY_VALID;
+ }
+ }
CoverageBean cdata = new CoverageBean();
cdata.setStoreId(store_id);
cdata.setVisitDate(visit_date);
@@ -522,24 +520,32 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
cdata.setImage(img_str);
cdata.setSub_reasonId("0");
cdata.setRemark("");
-
cdata.setStatus(status);
-
cdata.setCheckOut_Image("");
cdata.setFlag_from(store_flag_str);
- database.InsertCoverageData(cdata);
+ if (country_id.equals("7") || country_id.equals("8") || country_id.equals("17")) {
+ cdata.setKeyAccountId("0");
+ cdata.setStoreTypeId("0");
+ cdata.setClassId("0");
+ } else {
+ cdata.setKeyAccountId(keyAccount_id);
+ cdata.setStoreTypeId(storeType_id);
+ cdata.setClassId(class_id);
+ }
+ database.open();
+ database.InsertCoverageData(cdata);
String table;
if (store_flag_str.equals(CommonString.FROM_JCP)) {
table = CommonString.KEY_JOURNEY_PLAN;
- } else if (store_flag_str.equals(CommonString.FROM_ADDITIONAL)) {
+ } else if (store_flag_str.equals(CommonString.FROM_ADDITIONAL)) {
table = CommonString.KEY_JOURNEY_PLAN_ADDITIONAL;
} else if (store_flag_str.equals(CommonString.FROM_PHARMA)) {
table = CommonString.KEY_JOURNEY_PLAN_PHARMA;
- }else if (store_flag_str.equals(CommonString.FROM_ADDITIONAL_ADHOC)) {
+ } else if (store_flag_str.equals(CommonString.FROM_ADDITIONAL_ADHOC)) {
table = CommonString.KEY_ADHOC_JOURNEYPLAN_ADDITIONAL;
- } else{
+ } else {
table = CommonString.KEY_ADHOC_JOURNEY_PLAN;
}
@@ -592,7 +598,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
//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);
+ outputFileUri = FileProvider.getUriForFile(context, "cpm.com.gskmtorange.fileprovider", file);
String defaultCameraPackage = "";
final PackageManager packageManager = getPackageManager();
@@ -640,9 +646,6 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
} catch (Exception e) {
e.printStackTrace();
- //Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString());
- //Crashlytics.logException(e.getCause());
- //Crashlytics.logException(new Exception(e.getCause()));
}
}
@@ -659,12 +662,6 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
if (_pathforcheck != null && !_pathforcheck.equals("")) {
if (new File(str + _pathforcheck).exists()) {
- //temp check--------
- /*File file = new File(str + _pathforcheck);
- saveBitmapToFileSmaller(file);*/
- //saveBitmapToFile(file);
- //-------------------
-
try {
Bitmap bmp = BitmapFactory.decodeFile(str + _pathforcheck);
@@ -711,7 +708,6 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
if (mGoogleApiClient.isConnected()) {
startLocationUpdates();
}
-
}
/*protected void onStart() {
@@ -730,7 +726,6 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
}
-
public class GeoTagUpload extends AsyncTask {
private Context context;
@@ -770,56 +765,50 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
String service;
- if(coverage.get(0).getFlag_from().equals(CommonString.FROM_ADDITIONAL)){
+ if (coverage.get(0).getFlag_from().equals(CommonString.FROM_ADDITIONAL)) {
service = CommonString.METHOD_UPLOAD_CURRENT_DATA_ADDITIONAL;
- }
- else if(coverage.get(0).getFlag_from().equals(CommonString.FROM_PHARMA)){
+ } else if (coverage.get(0).getFlag_from().equals(CommonString.FROM_PHARMA)) {
service = CommonString.METHOD_UPLOAD_CURRENT_DATA_PHARMA;
- }
- else{
+ } else {
service = CommonString.METHOD_UPLOAD_CURRENT_DATA;
-
}
-
String current_xml = "";
if (coverage.size() > 0) {
//for (int i = 0; i < coverage.size(); i++) {
+ String onXML = "[Coverage_Intime][USER_ID]"
+ + _UserId
+ + "[/USER_ID]"
+ + "[STORE_ID]"
+ + coverage.get(0).getStoreId()
+ + "[/STORE_ID]"
+ + "[VISIT_DATE]"
+ + coverage.get(0).getVisitDate()
+ + "[/VISIT_DATE]"
+ + "[IN_TIME]"
+ + coverage.get(0).getInTime()
+ + "[/IN_TIME]"
+ + "[LATITUDE]"
+ + coverage.get(0).getLatitude()
+ + "[/LATITUDE]"
+ + "[LONGITUDE ]"
+ + coverage.get(0).getLongitude()
+ + "[/LONGITUDE ]"
+ + "[REASON_ID]"
+ + coverage.get(0).getReasonid()
+ + "[/REASON_ID]"
+ + "[REMARK]"
+ + coverage.get(0).getReason()
+ + "[/REMARK][/Coverage_Intime]";
- String onXML = "[Coverage_Intime][USER_ID]"
- + _UserId
- + "[/USER_ID]"
- + "[STORE_ID]"
- + coverage.get(0).getStoreId()
- + "[/STORE_ID]"
- + "[VISIT_DATE]"
- + coverage.get(0).getVisitDate()
- + "[/VISIT_DATE]"
- + "[IN_TIME]"
- + coverage.get(0).getInTime()
- + "[/IN_TIME]"
- + "[LATITUDE]"
- + coverage.get(0).getLatitude()
- + "[/LATITUDE]"
- + "[LONGITUDE ]"
- + coverage.get(0).getLongitude()
- + "[/LONGITUDE ]"
- + "[REASON_ID]"
- + coverage.get(0).getReasonid()
- + "[/REASON_ID]"
- + "[REMARK]"
- + coverage.get(0).getReason()
- + "[/REMARK][/Coverage_Intime]";
-
- //current_xml = current_xml + onXML;
-
-
+ //current_xml = current_xml + onXML;
//}
current_xml = "[DATA]" + onXML
+ "[/DATA]";
+ Log.d("currentdata",current_xml);
SoapObject request = new SoapObject(CommonString.NAMESPACE,
service);
@@ -896,18 +885,18 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
} catch (XmlPullParserException e) {
- // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString());
+ // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString());
//Crashlytics.logException(e.getCause());
- // Crashlytics.logException(new Exception(e.getCause()));
+ // Crashlytics.logException(new Exception(e.getCause()));
ResultFlag = false;
strflag = CommonString.MESSAGE_XmlPull;
} catch (Exception e) {
- // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString());
- // Crashlytics.logException(e.getCause());
- // Crashlytics.logException(new Exception(e.getCause()));
+ // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString());
+ // Crashlytics.logException(e.getCause());
+ // Crashlytics.logException(new Exception(e.getCause()));
ResultFlag = false;
strflag = CommonString.MESSAGE_EXCEPTION;
@@ -916,15 +905,11 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
if (ResultFlag) {
return CommonString.KEY_SUCCESS;
-
} else {
-
return strflag;
}
-
}
-
@Override
protected void onPostExecute(String result) {
super.onPostExecute(result);
@@ -939,8 +924,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
/* if (store_flag_str.equals(CommonString.FROM_JCP)|| country_id.equalsIgnoreCase("5")
||store_flag_str.equals(CommonString.FROM_DEVIATION)) {*/
- if (store_flag_str.equals(CommonString.FROM_JCP)|| country_id.equalsIgnoreCase("5")) {
-
+ if (store_flag_str.equals(CommonString.FROM_JCP) || country_id.equalsIgnoreCase("5") || country_id.equalsIgnoreCase("15")) {
Intent in = new Intent(StoreimageActivity.this, StoreWisePerformanceActivity.class);
startActivity(in);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
@@ -950,12 +934,27 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
startActivity(in);
finish();
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
- } else{
+ } else if (VISIT_TYPE_ID != null) {
+ if (store_flag_str.equals(CommonString.FROM_DEVIATION) &&
+ VISIT_TYPE_ID.equals("1") || VISIT_TYPE_ID.equals("3")) {
+
+ SharedPreferences.Editor editor = preferences.edit();
+ editor.putString(CommonString.KEY_VISIT_ID, VISIT_TYPE_ID);
+ editor.commit();
+
+ Intent in = new Intent(StoreimageActivity.this, StoreWisePerformanceActivity.class);
+ in.putExtra("VISIT_TYPE_ID", VISIT_TYPE_ID);
+ startActivity(in);
+ finish();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+ } else {
+ finish();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+ }
+ } else {
finish();
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
}
-
-
//showAlert(getString(R.string.data_downloaded_successfully));
} else {
@@ -978,10 +977,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
builder.setMessage(str).setCancelable(false)
.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
-
-
finish();
-
}
});
AlertDialog alert = builder.create();
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
index 13e10cf..eebf7c7 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
@@ -133,14 +133,14 @@ public class T2PComplianceActivity extends AppCompatActivity {
rec_t2p = (RecyclerView) findViewById(R.id.rec_t2p);
- if (country_id.equals("8")){
+ if (country_id.equals("8") || country_id.equals("17")) {
toolbar.setTitle(getResources().getString(R.string.title_posm));
- }else {
+ } else {
toolbar.setTitle(getResources().getString(R.string.title_activity_t2_pcompliance));
}
setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
- // toolbar.setTitle(R.string.title_activity_t2_pcompliance + " - " + categoryName);
+ // toolbar.setTitle(R.string.title_activity_t2_pcompliance + " - " + categoryName);
final FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() {
@Override
@@ -200,10 +200,8 @@ public class T2PComplianceActivity extends AppCompatActivity {
t2PGetterSetters = db.getT2PDefaultData(store_id, categoryId, "MAPPING_T2P");
}
-
} else {
for (int i = 0; i < t2PGetterSetters.size(); i++) {
-
ArrayList gapsList = db.getGapsData(t2PGetterSetters.get(i).getKey_id());
ArrayList skuList = db.getT2PSKUData(t2PGetterSetters.get(i).getKey_id());
ArrayList brandList = db.getT2BrandData(t2PGetterSetters.get(i).getKey_id());
@@ -212,9 +210,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
//
t2PGetterSetters.get(i).setSkulist(skuList);
t2PGetterSetters.get(i).setBrandlist(brandList);
-
}
-
}
for (int i = 0; i < t2PGetterSetters.size(); i++) {
@@ -856,13 +852,12 @@ public class T2PComplianceActivity extends AppCompatActivity {
}
public void showSkuDialog(final ArrayList skuAddedList) {
-
final SkuGetterSetter[] sku_selected = new SkuGetterSetter[1];
final BrandMasterGetterSetter[] brand_selected = new BrandMasterGetterSetter[1];
final ArrayList brandList;
//usk just
- if (country_id.equals("7")) {
+ if (country_id.equals("7") || country_id.equals("8")) {
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(storeType_id, class_id, keyAccount_id, categoryId, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC);
@@ -875,7 +870,6 @@ public class T2PComplianceActivity extends AppCompatActivity {
brand.setBRAND("select");
brandList.add(0, brand);
// ArrayList skuMasterGetterSetterArrayList = db.getSkuT2PData("1", "1", "1",)
-
final Dialog dialog = new Dialog(T2PComplianceActivity.this);
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
@@ -967,17 +961,12 @@ public class T2PComplianceActivity extends AppCompatActivity {
spinner_brand.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView parent, View view, int position, long id) {
-
if (position != 0) {
-
sku_list.clear();
-
brand_selected[0] = brandList.get(position);
-
String brand_id = brandList.get(position).getBRAND_ID().get(0);
-
ArrayList temp_list;
- if (country_id.equals("7")) {
+ if (country_id.equals("7") || country_id.equals("8")) {
temp_list = db.getSkuT2PData(null, null, null, brand_id, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE);
} else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
temp_list = db.getSkuT2PData(storeType_id, class_id, keyAccount_id, brand_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC);
@@ -1081,23 +1070,6 @@ public class T2PComplianceActivity extends AppCompatActivity {
return new String(chars);
}
- public String getCurrentTimeNotUsed() {
- Calendar m_cal = Calendar.getInstance();
-
- SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
- String cdate = formatter.format(m_cal.getTime());
-
- 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)) {
- cdate = arabicToenglish(cdate);
- }else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_JORDAN)) {
- cdate = arabicToenglish(cdate);
- }
-
- return cdate;
- }
-
private void startCameraActivity(int pos) {
try {
@@ -1662,15 +1634,16 @@ public class T2PComplianceActivity extends AppCompatActivity {
public void showBrandAvabilitydialog(final ArrayList brandGetdata) {
-
final ArrayList brandList;
-
if (country_id.equals("7") || country_id.equals("8")) {
- brandList = db.getBrandAvailbilitydata(store_id, categoryId, null, null, null, CommonString.TABLE_MAPPING_STOCK_STOREWISE);
+ brandList = db.getBrandAvailbilitydata(store_id, categoryId, null, null, null,
+ CommonString.TABLE_MAPPING_STOCK_STOREWISE);
} else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
- brandList = db.getBrandAvailbilitydata(store_id, categoryId, keyAccount_id, class_id, storeType_id, CommonString.TABLE_MAPPING_STOCK_ADHOC);
+ brandList = db.getBrandAvailbilitydata(store_id, categoryId, keyAccount_id, class_id, storeType_id,
+ CommonString.TABLE_MAPPING_STOCK_ADHOC);
} else {
- brandList = db.getBrandAvailbilitydata(store_id, categoryId, keyAccount_id, class_id, storeType_id, CommonString.TABLE_MAPPING_STOCK);
+ brandList = db.getBrandAvailbilitydata(store_id, categoryId, keyAccount_id, class_id, storeType_id,
+ CommonString.TABLE_MAPPING_STOCK);
}
BrandAvabilityGetterSetter brand = new BrandAvabilityGetterSetter();
@@ -1694,7 +1667,8 @@ public class T2PComplianceActivity extends AppCompatActivity {
// cardlay = (CardView) dialog.findViewById(R.id.cardId);
// Create custom adapter object ( see below CustomAdapter.java )
- T2PComplianceActivity.CustomBRANDAdapter adapter = new T2PComplianceActivity.CustomBRANDAdapter(T2PComplianceActivity.this, R.layout.custom_spinner_item, brandList);
+ T2PComplianceActivity.CustomBRANDAdapter adapter = new T2PComplianceActivity.CustomBRANDAdapter(T2PComplianceActivity.this,
+ R.layout.custom_spinner_item, brandList);
spinner_brand.setAdapter(adapter);
@@ -1763,8 +1737,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
brand_id = "";
} else {
- Snackbar.make(v, "Please select dropdown", Snackbar.LENGTH_LONG)
- .setAction("Action", null).show();
+ Snackbar.make(v, "Please select dropdown", Snackbar.LENGTH_LONG).setAction("Action", null).show();
}
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/VisitTypeStatusActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/VisitTypeStatusActivity.java
new file mode 100644
index 0000000..e7fd62d
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/VisitTypeStatusActivity.java
@@ -0,0 +1,232 @@
+package cpm.com.gskmtorange.dailyentry;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.location.Location;
+import android.location.LocationManager;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.google.android.gms.common.api.GoogleApiClient;
+import com.google.android.gms.location.LocationRequest;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.Snackbar;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import cpm.com.gskmtorange.Database.GSKOrangeDB;
+import cpm.com.gskmtorange.GetterSetter.CoverageBean;
+import cpm.com.gskmtorange.GetterSetter.GeotaggingBeans;
+import cpm.com.gskmtorange.GetterSetter.StoreBean;
+import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
+import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.gsk_dailyentry.StoreWisePerformanceActivity;
+import cpm.com.gskmtorange.storeinmap.StoreListRouteActivity;
+import cpm.com.gskmtorange.storeinmap.StoreRouteActivity;
+import cpm.com.gskmtorange.xmlGetterSetter.ADDITIONAL_DISPLAY_MASTERGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.AdditionalQuestiongetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationContrywiseGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationMasterGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.DisplayChecklistMasterGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.DisplayMasterGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.GeoFencingGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MAPPINGT2PGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_ADDITIONAL_PROMOTION_MasterGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SOS_TARGET_MasterGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingCategoryImageAllowGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingPlanogramStorewiseGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingStockStorewiseGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.NoCameraLastVisitGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.NonT2pReasonGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingSubReasonGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.POGQuestionGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.SkuGroupMasterGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.SupervisorListGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.Visit_Type_Master_GetterSetter;
+
+public class VisitTypeStatusActivity extends AppCompatActivity {
+ ArrayList coverage = new ArrayList();
+ ArrayList storelist = new ArrayList();
+ //ListView list;
+ private SharedPreferences preferences;
+ String date, visit_status;
+ GSKOrangeDB db;
+ ValueAdapter adapter;
+ RecyclerView recyclerView;
+ private SharedPreferences.Editor editor = null;
+ LinearLayout linearlay;
+ String store_id, userId, culture_id, visit_date, store_facing_hide;
+ private Dialog dialog;
+ boolean result_flag = false, leaveflag = false;
+ FloatingActionButton fab;
+ //String storeid;
+ Toolbar toolbar;
+ String language, country_id;
+ String store_flag_str;
+ String str_facing="";
+
+ Context context;
+ boolean enabled = true;
+
+ private ProgressBar pb;
+
+ private TextView percentage, message;
+ int eventType;
+ boolean ResultFlag = true;
+ String str;
+ StoreBean storeCurrentObj;
+
+ String from_checkedIn = "";
+ Visit_Type_Master_GetterSetter visit_type_master_getterSetter;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_visit_type_status);
+ toolbar = (Toolbar) findViewById(R.id.toolbar);
+ setSupportActionBar(toolbar);
+
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+ preferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+ context = this;
+ CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
+ store_flag_str = getIntent().getStringExtra(CommonString.KEY_STORE_FLAG);
+ date = preferences.getString(CommonString.KEY_DATE, null);
+ visit_status = preferences.getString(CommonString.KEY_STOREVISITED_STATUS, "");
+ language = preferences.getString(CommonString.KEY_LANGUAGE, "");
+ country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, "");
+ userId = preferences.getString(CommonString.KEY_USERNAME, null);
+ culture_id = preferences.getString(CommonString.KEY_CULTURE_ID, "");
+ visit_date = preferences.getString(CommonString.KEY_DATE, null);
+ db = new GSKOrangeDB(context);
+ db.open();
+
+ linearlay = (LinearLayout) findViewById(R.id.no_data_lay);
+ recyclerView = (RecyclerView) findViewById(R.id.drawer_layout_recycle);
+
+ toolbar.setTitle("Ad-Hoc Visit Type" + "-"+ date);
+ storelist = db.getVisitType(date, "VISIT_TYPE_MASTER");
+ adapter = new ValueAdapter(context, storelist);
+ recyclerView.setAdapter(adapter);
+ recyclerView.setLayoutManager(new LinearLayoutManager(this));
+
+ store_id = getIntent().getStringExtra(CommonString.KEY_STORE_ID);
+ str_facing = getIntent().getStringExtra(CommonString.KEY_STORE_FLAG_FACING_HIDE);
+
+ }
+ public class ValueAdapter extends RecyclerView.Adapter {
+
+ private LayoutInflater inflator;
+
+ List data = Collections.emptyList();
+
+ public ValueAdapter(Context context, List data) {
+ inflator = LayoutInflater.from(context);
+ this.data = data;
+ }
+
+ @Override
+ public ValueAdapter.MyViewHolder onCreateViewHolder(ViewGroup parent, int i) {
+
+ View view = inflator.inflate(R.layout.visittypelist_child, parent, false);
+
+ ValueAdapter.MyViewHolder holder = new ValueAdapter.MyViewHolder(view);
+ return holder;
+ }
+
+ @Override
+ public void onBindViewHolder(final ValueAdapter.MyViewHolder viewHolder, final int position) {
+ final Visit_Type_Master_GetterSetter current = data.get(position);
+ viewHolder.visitTypeTV.setText(current.getVISIT_TYPE().get(0));
+ viewHolder.Cardbtn.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ db.open();
+ db.insertVisitTypeData(visit_date,store_id,current.getVISIT_TYPE_ID().get(0));
+
+ Intent in = new Intent(VisitTypeStatusActivity.this, StoreimageActivity.class);
+ in.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
+ in.putExtra(CommonString.KEY_STORE_ID, store_id);
+ in.putExtra("VISIT_TYPE_ID", current.getVISIT_TYPE_ID().get(0));
+ in.putExtra(CommonString.KEY_STORE_FLAG_FACING_HIDE, str_facing);
+ startActivity(in);
+ overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+ }
+ });
+ }
+
+ @Override
+ public int getItemCount() {
+ return data.size();
+ }
+
+ class MyViewHolder extends RecyclerView.ViewHolder {
+
+ TextView visitTypeTV;
+ CardView Cardbtn;
+
+ public MyViewHolder(View itemView) {
+ super(itemView);
+ visitTypeTV = itemView.findViewById(R.id.visitTypeTV);
+ Cardbtn = itemView.findViewById(R.id.card_view);
+
+ }
+ }
+
+ }
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ // as you specify a parent activity in AndroidManifest.xml.
+ int id = item.getItemId();
+
+ if (id == android.R.id.home) {
+ // NavUtils.navigateUpFromSameTask(this);
+ finish();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+ }
+ return super.onOptionsItemSelected(item);
+ }
+
+ @Override
+ public void onBackPressed() {
+ super.onBackPressed();
+ finish();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+ }
+}
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
index eea7406..ad86deb 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
@@ -5,10 +5,12 @@ import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.SharedPreferences;
+import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.AsyncTask;
import android.os.Bundle;
import android.preference.PreferenceManager;
+import android.util.Log;
import android.view.Window;
import android.widget.ProgressBar;
import android.widget.TextView;
@@ -71,6 +73,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.NoCameraLastVisitGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NonT2pReasonGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingSubReasonGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.Order_Received_Status_GetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.POGQuestionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.PROMOTION_TYPE_MASTERGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.STORE_CATEGORY_WISEGetterSetter;
@@ -81,6 +84,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SubCategoryMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SupervisorListGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
+import cpm.com.gskmtorange.xmlGetterSetter.Visit_Type_Master_GetterSetter;
import cpm.com.gskmtorange.xmlHandlers.XMLHandlers;
public class DownloadActivity extends AppCompatActivity {
@@ -132,6 +136,9 @@ public class DownloadActivity extends AppCompatActivity {
PROMOTION_TYPE_MASTERGetterSetter promotion_type_masterGetterSetter;
STORE_CATEGORY_WISEGetterSetter store_category_wiseGetterSetter;
MAPPING_SKU_PRICING_ENABLEGetterSetter mapping_sku_pricing_enableGetterSetter;
+ Order_Received_Status_GetterSetter order_received_status_getterSetter;
+ Visit_Type_Master_GetterSetter visit_type_master_getterSetter;
+
private Dialog dialog;
private ProgressBar pb;
@@ -183,16 +190,16 @@ public class DownloadActivity extends AppCompatActivity {
dialog.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT));
dialog.setContentView(R.layout.custom_dialog_progress);
pb = (ProgressBar) dialog.findViewById(R.id.progressBar1);
+ pb.getProgressDrawable().setColorFilter(
+ getResources().getColor(R.color.colorPrimaryDark), android.graphics.PorterDuff.Mode.SRC_IN);
percentage = (TextView) dialog.findViewById(R.id.percentage);
message = (TextView) dialog.findViewById(R.id.message);
dialog.setCancelable(false);
dialog.show();
}
-
@Override
protected String doInBackground(Void... voids) {
try {
-
boolean no_jcp_flag = false, no_adhoc_flag = false, no_addtional_jcp_flag = false;
String resultHttp = "";
@@ -211,6 +218,7 @@ public class DownloadActivity extends AppCompatActivity {
request.addProperty("Type", "JOURNEY_PLAN");
request.addProperty("cultureid", culture_id);
+
SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
@@ -218,10 +226,12 @@ public class DownloadActivity extends AppCompatActivity {
HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- Object result = envelope.getResponse();
+ Log.d("requestdata",request.toString());
+
+ Object result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
- //InputStream stream = new ByteArrayInputStream(result.toString().getBytes("UTF-8"));
xpp.setInput(new StringReader(result.toString()));
// xpp.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
@@ -260,8 +270,9 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
-
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
// xpp.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
@@ -303,8 +314,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
-
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
xpp.next();
@@ -336,7 +347,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -371,7 +383,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -405,7 +418,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -441,7 +455,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -477,7 +492,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -513,7 +529,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -548,7 +565,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -583,7 +601,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -617,7 +636,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -643,7 +663,7 @@ public class DownloadActivity extends AppCompatActivity {
//Added on 04/12/2018
// MAPPING_STOCK_STOREWISE
- if (country_id.equals("7")||country_id.equals("8")) {
+ if (country_id.equals("7")||country_id.equals("8") || country_id.equals("17")) {
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
request.addProperty("UserName", userId);
request.addProperty("Type", "MAPPING_STOCK_STOREWISE");
@@ -656,7 +676,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -672,7 +693,7 @@ public class DownloadActivity extends AppCompatActivity {
if (mappingStockStorewiseGetterSetter.getSKU_ID().size() > 0) {
data.value = 45;
- data.name = "_MAPPING_STOCK_STOREWISE " + getResources().getString(R.string.download_data);
+ data.name = "MAPPING_STOCK_STOREWISE " + getResources().getString(R.string.download_data);
} else {
// return "MAPPING_STOCK";
}
@@ -695,7 +716,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -733,7 +755,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -760,6 +783,7 @@ public class DownloadActivity extends AppCompatActivity {
request.addProperty("Type", "MAPPING_DISPLAY_CHECKLIST");
request.addProperty("cultureid", culture_id);
+ Log.d("requestdata",request.toString());
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
@@ -767,7 +791,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -787,11 +812,9 @@ public class DownloadActivity extends AppCompatActivity {
} else {
//return "MAPPING_DISPLAY_CHECKLIST";
}
-
}
publishProgress(data);
-
// NON_WORKING_REASON
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
request.addProperty("UserName", userId);
@@ -806,7 +829,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -840,7 +864,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -860,7 +885,6 @@ public class DownloadActivity extends AppCompatActivity {
} else {
//return "NON_WORKING_SUB_REASON";
}
-
}
publishProgress(data);
@@ -878,7 +902,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -897,13 +922,10 @@ public class DownloadActivity extends AppCompatActivity {
data.name = "MAPPING_PROMOTION " + getResources().getString(R.string.download_data);
}
-
}
publishProgress(data);
-
//Gagan start code
-
// MAPPING_ADDITIONAL_PROMOTION
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
request.addProperty("UserName", userId);
@@ -917,7 +939,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -953,7 +976,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -991,7 +1015,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -1027,7 +1052,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -1062,7 +1088,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -1098,7 +1125,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -1133,7 +1161,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -1171,7 +1200,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -1206,7 +1236,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -1241,7 +1272,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -1262,7 +1294,6 @@ public class DownloadActivity extends AppCompatActivity {
}
publishProgress(data);
-
//MAPPING_CATEGORY_IMAGE_ALLOW
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
request.addProperty("UserName", userId);
@@ -1276,7 +1307,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -1310,7 +1342,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -1329,6 +1362,7 @@ public class DownloadActivity extends AppCompatActivity {
data.name = "ADDITIONAL_QUESTION " + getResources().getString(R.string.download_data);
}
}
+
publishProgress(data);
//ADDITIONAL_QUESTION
@@ -1345,7 +1379,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -1379,7 +1414,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -1413,7 +1449,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -1447,7 +1484,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -1481,7 +1519,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -1516,7 +1555,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -1540,7 +1580,6 @@ public class DownloadActivity extends AppCompatActivity {
}
publishProgress(data);
-
//JOURNEY_PLAN_PHARMA
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
request.addProperty("UserName", userId);
@@ -1554,7 +1593,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -1583,7 +1623,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -1612,7 +1653,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -1634,7 +1676,7 @@ public class DownloadActivity extends AppCompatActivity {
}
}
-
+ publishProgress(data);
//usk
// MAPPING_PHARMA_MSL
@@ -1650,7 +1692,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -1674,6 +1717,8 @@ public class DownloadActivity extends AppCompatActivity {
}
publishProgress(data);
+
+
//
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
request.addProperty("UserName", userId);
@@ -1687,7 +1732,8 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -1709,14 +1755,11 @@ public class DownloadActivity extends AppCompatActivity {
// return "MAPPING_PHARMA_MSL";
}
}
-
-
publishProgress(data);
- /* //MAPPING_COUNTRYWISE_PLANOGRAM
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
request.addProperty("UserName", userId);
- request.addProperty("Type", "MAPPING_COUNTRYWISE_PLANOGRAM");
+ request.addProperty("Type", "ORDER_RECEIVED_STATUS");
request.addProperty("cultureid", culture_id);
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
@@ -1726,27 +1769,70 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
xpp.next();
eventType = xpp.getEventType();
- mappingPlanogramCountrywiseGetterSetter = XMLHandlers.MAPPING_COUNTRYWISE_PLANOGRAM_XMLHandler(xpp, eventType);
- String table_mapping_planogram = mappingPlanogramCountrywiseGetterSetter.getTable_MAPPING_COUNTRYWISE_PLANOGRAM();
- if (table_mapping_planogram != null) {
+ order_received_status_getterSetter = XMLHandlers.order_Received_Status_XMLHandler(xpp, eventType);
+ String stocktable = order_received_status_getterSetter.getTable_Order_Received_Status();
+ if (stocktable != null) {
resultHttp = CommonString.KEY_SUCCESS;
- TableBean.setMappingCountrywisePlanogram(table_mapping_planogram);
+ TableBean.setTable_ORDER_RECEIVED_STATUS(stocktable);
}
- if (mappingPlanogramCountrywiseGetterSetter.getCOUNTRY_ID().size() > 0) {
- data.value = 92;
- data.name = "MAPPING_COUNTRYWISE_PLANOGRAM Data Download";
+
+ if (order_received_status_getterSetter.getSTORE_ID().size() > 0) {
+ data.value = 99;
+ data.name = "ORDER_RECEIVED_STATUS" + getResources().getString(R.string.download_data);
} else {
- //return "MAPPING_COUNTRYWISE_PLANOGRAM";
+ // return "MAPPING_PHARMA_MSL";
}
}
- publishProgress(data);*/
+ publishProgress(data);
+
+
+ //VISIT_TYPE_MASTER
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
+ request.addProperty("UserName", userId);
+ request.addProperty("Type", "VISIT_TYPE_MASTER");
+ request.addProperty("cultureid", culture_id);
+
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
+
+ result = envelope.getResponse();
+ Log.d("resultdata",result.toString());
+
+ if (result.toString() != null) {
+ xpp.setInput(new StringReader(result.toString()));
+ xpp.next();
+ eventType = xpp.getEventType();
+
+ visit_type_master_getterSetter = XMLHandlers.Visit_Type_Status_XMLHandler(xpp, eventType);
+ String stocktable = visit_type_master_getterSetter.getTable_Visit_Type_Status();
+ if (stocktable != null) {
+ resultHttp = CommonString.KEY_SUCCESS;
+ TableBean.setTable_VISIT_TYPE_STATUS(stocktable);
+ }
+
+ if (order_received_status_getterSetter.getSTORE_ID().size() > 0) {
+ data.value = 99;
+ data.name = "VISIT_TYPE_MASTER" + getResources().getString(R.string.download_data);
+ } else {
+ // return "MAPPING_PHARMA_MSL";
+ }
+ }
+ publishProgress(data);
+
+
+
//Images DownLoads
@@ -1763,14 +1849,13 @@ public class DownloadActivity extends AppCompatActivity {
String image_name = mapping_planogram_masterGetterSetter.getPLANOGRAM_IMAGE().get(i);
String path = mapping_planogram_masterGetterSetter.getIMAGE_PATH().get(i);
-
String PATH = CommonString.FILE_PATH_PLANOGRAM;
File file = new File(PATH);
if (!file.isDirectory()) {
file.mkdir();
}
- if (!new File(PATH + image_name).exists()) {
+ if (!new File(PATH + image_name).exists()) {
if (!image_name.equalsIgnoreCase("NA") && !image_name.equalsIgnoreCase("")) {
URL url = new URL(path + "/" + image_name);
HttpURLConnection c = (HttpURLConnection) url.openConnection();
@@ -1935,10 +2020,11 @@ public class DownloadActivity extends AppCompatActivity {
}
}
}
-
db.open();
db.InsertJCP(jcpgettersetter);
+ db.InsertOrderReceivingStatus(order_received_status_getterSetter);
db.InsertAdhoc_JCP(adhoc_jcpgettersetter);
+ db.InsertVisit_Type_Status(visit_type_master_getterSetter);
db.InsertCategory(categoryMasterGetterSetter);
db.InsertSubCategoryMaster(subCategoryMasterGetterSetter);
db.InsertBrandMaster(brandMasterGetterSetter);
@@ -1983,10 +2069,8 @@ public class DownloadActivity extends AppCompatActivity {
db.InsertPROMOTION_TYPE_MASTER(promotion_type_masterGetterSetter);
db.InsertCATEGORYWISE_SOS_TARGET(store_category_wiseGetterSetter);
db.InsertMAPPING_SKU_PRICING_ENABLE(mapping_sku_pricing_enableGetterSetter);
-
-
- } catch (MalformedURLException e) {
-
+ }
+ catch (MalformedURLException e) {
ResultFlag = false;
str = CommonString.MESSAGE_EXCEPTION;
return CommonString.MESSAGE_EXCEPTION;
@@ -1995,18 +2079,16 @@ public class DownloadActivity extends AppCompatActivity {
str = CommonString.MESSAGE_SOCKETEXCEPTION;
return CommonString.MESSAGE_SOCKETEXCEPTION;
} catch (InterruptedIOException e) {
-
ResultFlag = false;
str = CommonString.MESSAGE_EXCEPTION;
return CommonString.MESSAGE_EXCEPTION;
-
} catch (IOException e) {
-
ResultFlag = false;
str = CommonString.MESSAGE_SOCKETEXCEPTION;
return CommonString.MESSAGE_SOCKETEXCEPTION;
} catch (XmlPullParserException e) {
ResultFlag = false;
+ Log.d("exceptiondata",e.getMessage() + ","+data.name );
str = CommonString.MESSAGE_XmlPull;
return CommonString.MESSAGE_XmlPull;
} catch (Exception e) {
@@ -2015,7 +2097,6 @@ public class DownloadActivity extends AppCompatActivity {
// Crashlytics.logException(new Exception(e.getCause()));
ResultFlag = false;
str = CommonString.MESSAGE_EXCEPTION;
-
return CommonString.MESSAGE_EXCEPTION;
}
@@ -2029,7 +2110,6 @@ public class DownloadActivity extends AppCompatActivity {
@Override
protected void onProgressUpdate(Data... values) {
// TODO Auto-generated method stub
-
pb.setProgress(values[0].value);
percentage.setText(values[0].value + "%");
message.setText(values[0].name);
@@ -2041,7 +2121,6 @@ public class DownloadActivity extends AppCompatActivity {
if (s.equalsIgnoreCase("")) {
dialog.dismiss();
-
showAlert(getString(R.string.data_downloaded_successfully));
} else {
dialog.dismiss();
@@ -2052,7 +2131,6 @@ public class DownloadActivity extends AppCompatActivity {
}
public void showAlert(String str) {
-
AlertDialog.Builder builder = new AlertDialog.Builder(DownloadActivity.this);
builder.setTitle("Parinaam");
builder.setMessage(str).setCancelable(false)
@@ -2074,10 +2152,8 @@ public class DownloadActivity extends AppCompatActivity {
@Override
protected void onResume() {
super.onResume();
-
toolbar.setTitle(getString(R.string.main_menu_activity_name));
CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
}
-
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java
index 87552d8..4f0b0d1 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java
@@ -116,10 +116,12 @@ public class SelectLanguageFragment extends Fragment implements View.OnClickList
if(lang.equals(language.get(0))){
btn_lang_1.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
btn_lang_2.setBackgroundColor(getResources().getColor(R.color.grey_background));
+ btn_lang_1.setTextColor(getResources().getColor(R.color.white));
}
else if(lang.equals(language.get(1))){
btn_lang_1.setBackgroundColor(getResources().getColor(R.color.grey_background));
btn_lang_2.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
+ btn_lang_2.setTextColor(getResources().getColor(R.color.white));
}
btn_lang_1.setOnClickListener(this);
@@ -131,7 +133,6 @@ public class SelectLanguageFragment extends Fragment implements View.OnClickList
// TODO: Rename method, update argument and hook method into UI event
public void onButtonPressed(String selected_lang, String culture_id, String notice_url) {
if (mListener != null) {
-
mListener.onFragmentInteraction(selected_lang,culture_id,notice_url);
}
}
@@ -167,6 +168,8 @@ public class SelectLanguageFragment extends Fragment implements View.OnClickList
btn_lang_1.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
btn_lang_2.setBackgroundColor(getResources().getColor(R.color.grey_background));
+ btn_lang_1.setTextColor(getResources().getColor(R.color.white));
+ btn_lang_2.setTextColor(getResources().getColor(R.color.black));
editor.putString(CommonString.KEY_LANGUAGE, language.get(0));
editor.putString(CommonString.KEY_CULTURE_ID, culture_id.get(0));
@@ -178,13 +181,14 @@ public class SelectLanguageFragment extends Fragment implements View.OnClickList
case R.id.btn_language_two:
//selected_flag = true;
-
onButtonPressed(language.get(1),culture_id.get(1),login_data.getNOTICE_URL().get(1));
CommonFunctions.updateLangResources(getActivity(), language.get(1));
btn_lang_1.setBackgroundColor(getResources().getColor(R.color.grey_background));
btn_lang_2.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
+ btn_lang_2.setTextColor(getResources().getColor(R.color.white));
+ btn_lang_1.setTextColor(getResources().getColor(R.color.black));
editor.putString(CommonString.KEY_LANGUAGE, language.get(1));
editor.putString(CommonString.KEY_CULTURE_ID, culture_id.get(1));
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java
index eb679d3..87c626b 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java
@@ -119,7 +119,7 @@ public class ServiceActivityFragment extends Fragment {
if(position==0){
showExportDialog();
- //restoreBackup();
+ // restoreBackup();
}
/* else if(position==1){
@@ -201,7 +201,7 @@ public class ServiceActivityFragment extends Fragment {
if (sd.canWrite()) {
String currentDBPath = "//data//cpm.com.gskmtorange//databases//" + GSKOrangeDB.DATABASE_NAME;
- String backupDBPath = "GSKMT_ORANGE_Database_backup_testksa_02272019_155842";
+ String backupDBPath = "GSKMT_ORANGE_Database_backup_abdullah.bakr_06122024_144633.db";
File currentDB = new File(data, currentDBPath);
File backupDB = new File(sd, backupDBPath);
@@ -270,7 +270,6 @@ public class ServiceActivityFragment extends Fragment {
//usk
// File dir = new File(CommonString.BACKUP_PATH);
File dir = new File(CommonString.BACKUP_PATH);
-
ArrayList list = new ArrayList();
list = getFileNames(dir.listFiles());
if (list.size() > 0) {
@@ -278,9 +277,9 @@ public class ServiceActivityFragment extends Fragment {
if (list.get(i1).contains("GSKMT_ORANGE_Database_backup")) {
// File originalFile = new File(CommonString.BACKUP_PATH + list.get(i1));
Object result = uploadBackup(getActivity(), list.get(i1), "DBBackup");
- /* if (result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
+ if (result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
Toast.makeText(getActivity(), getString(R.string.databasexported), Toast.LENGTH_SHORT).show();
- }*/
+ }
}
}
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gettersetter/CoverageBean.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gettersetter/CoverageBean.java
index e2f1dac..9ef30b4 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gettersetter/CoverageBean.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gettersetter/CoverageBean.java
@@ -238,4 +238,43 @@ public class CoverageBean {
public void setFlag_from(String flag_from) {
this.flag_from = flag_from;
}
+
+ String keyAccountId;
+ String classId;
+
+ public String getKeyAccountId() {
+ return keyAccountId;
+ }
+
+ public void setKeyAccountId(String keyAccountId) {
+ this.keyAccountId = keyAccountId;
+ }
+
+ public String getClassId() {
+ return classId;
+ }
+
+ public void setClassId(String classId) {
+ this.classId = classId;
+ }
+
+ public String getStoreTypeId() {
+ return storeTypeId;
+ }
+
+ public void setStoreTypeId(String storeTypeId) {
+ this.storeTypeId = storeTypeId;
+ }
+
+ String storeTypeId;
+
+ public String getMappingStk() {
+ return mappingStk;
+ }
+
+ public void setMappingStk(String mappingStk) {
+ this.mappingStk = mappingStk;
+ }
+
+ String mappingStk="";
}
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 24ad57f..6961f84 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
@@ -5,6 +5,7 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
@@ -44,8 +45,9 @@ public class CategoryListActivity extends AppCompatActivity {
ArrayList categoryList;
CategoryListAdapter adapter;
GSKOrangeDB db;
- String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id,camera_allow, country_id, store_flag_str, pog_type_id;
+ String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow, country_id, store_flag_str, pog_type_id;
private SharedPreferences preferences;
+ String visit_type_id = "";
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -69,14 +71,15 @@ 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, "");
+ }
/*txt_categoryName = (TextView) findViewById(R.id.txt_categoryName);
txt_categoryName.setText(getResources().getString(R.string.title_activity_category_list));*/
toolbar.setTitle(getResources().getString(R.string.title_activity_category_list));
setSupportActionBar(toolbar);
-
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab_category);
fab.setOnClickListener(new View.OnClickListener() {
@Override
@@ -90,219 +93,214 @@ public class CategoryListActivity extends AppCompatActivity {
@Override
protected void onResume() {
super.onResume();
-
CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
-
recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
categoryList = new ArrayList<>();
-
- if(country_id.equals("7")||country_id.equals("8")){
+ 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");
- }
- else if(store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)){
+ 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)){
+ } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_ADDITIONAL)) {
categoryList = db.getCategoryListData(keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADDITIONAL);
- }
- else{
+ } else {
categoryList = db.getCategoryListData(keyAccount_id, storeType_id, class_id, store_id, "MAPPING_STOCK");
}
-
if (categoryList.size() > 0) {
-
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)){
- 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)) {
- flag_filled = true;
- }
- else {
- flag_filled = false;
- }
- }
- }
- else {
- //Additional_Visibility
- if (db.additionalVisibilitydata(store_id, category_id)) {
- boolean flag = true;
-
- //MSL_Availability
- /*if (db.isMappingStockDataMSL_Availability(category_id, keyAccount_id, storeType_id, class_id)) {
- if (!db.checkMsl_AvailabilityData(store_id, category_id)) {
- flag = false;
+ 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
- //Stock_Facing
- if (flag) {
- if (db.isMappingStockDataStockFacing(category_id, keyAccount_id, storeType_id, class_id)) {
- if (!db.checkStockAndFacingData(store_id, category_id)) {
+ 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;
}
}
- }*/
- 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_StockFacingData(store_id, category_id)) {
- 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;
- }
- }
- }
+ //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;
- }
- }
- }
+ //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.equalsIgnoreCase("1")) {
- //if (category_camera_list.size()>0) {
- if (!db.isCategoryPictureData(store_id, category_id)) {
- flag = false;
+ //Category image
+ if (camera_allow.equals("1")) {
+ //if (category_camera_list.size()>0) {
+ 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;
+ }
+ }
- }
- }
- else {
+ if (isSubGroupDataExists) {
+ if (db.getNoCameraCategoryDataInserted(store_id, category_id, null).size() == 0) {
+ flag = false;
+ }
+ }
+ }
- final ArrayList sub_category_list = db.getSubCategoryMaster(category_id,store_id,country_id);
+ //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 Sub Group Data exists for any Sub Category of the Category
- boolean isSubGroupDataExists = false;
- for(int j=0;j0){
- isSubGroupDataExists = true;
- break;
- }
- }
+ 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;
+ }
+ }
+ }
- if(isSubGroupDataExists){
- if (db.getNoCameraCategoryDataInserted(store_id, category_id, null).size() == 0) {
- 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(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) {
+ //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 (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;
+ }
- 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;
- }
-
- }
-
-
- }
-
- flag_filled = flag;
- }
- }
+ }
+ //usk
+ if (country_id.equals("6") && category_id.equals("2")) {
+ if (db.getCompetitionPromoExistsAfterData(store_id, category_id).size() == 0) {
+ flag = false;
+ }
+ }
+ }
+ flag_filled = flag;
+ }
+ }
if (flag_filled) {
if (category_id.equals("1")) {
@@ -311,17 +309,17 @@ public class CategoryListActivity extends AppCompatActivity {
categoryList.get(i).setCategory_img(R.mipmap.oralcare_tick);
} else if (category_id.equals("3")) {
categoryList.get(i).setCategory_img(R.mipmap.wellness_tick);
- }else if (category_id.equals("4")) {
+ } else if (category_id.equals("4")) {
categoryList.get(i).setCategory_img(R.mipmap.nutritionals_tick);
- }else if (category_id.equals("5")) {
+ } else if (category_id.equals("5")) {
categoryList.get(i).setCategory_img(R.mipmap.gastro_n_indigestion_tick);
- }else if (category_id.equals("6")) {
+ } else if (category_id.equals("6")) {
categoryList.get(i).setCategory_img(R.mipmap.cough_n_cold_tick);
- }else if (category_id.equals("7")) {
+ } else if (category_id.equals("7")) {
categoryList.get(i).setCategory_img(R.mipmap.analgesics_tick);
- }else if (category_id.equals("8")) {
+ } else if (category_id.equals("8")) {
categoryList.get(i).setCategory_img(R.mipmap.first_aid_tick);
- }else if (category_id.equals("9")) {
+ } else if (category_id.equals("9")) {
categoryList.get(i).setCategory_img(R.mipmap.analgesics_tick);
} else if (category_id.equals("10")) {
categoryList.get(i).setCategory_img(R.mipmap.cough_n_cold_tick);
@@ -333,17 +331,17 @@ public class CategoryListActivity extends AppCompatActivity {
categoryList.get(i).setCategory_img(R.mipmap.oral_care);
} else if (category_id.equals("3")) {
categoryList.get(i).setCategory_img(R.mipmap.wellness);
- }else if (category_id.equals("4")) {
+ } else if (category_id.equals("4")) {
categoryList.get(i).setCategory_img(R.mipmap.nutritionals);
- }else if (category_id.equals("5")) {
+ } else if (category_id.equals("5")) {
categoryList.get(i).setCategory_img(R.mipmap.gastro_n_indigestion);
- }else if (category_id.equals("6")) {
+ } else if (category_id.equals("6")) {
categoryList.get(i).setCategory_img(R.mipmap.cough_n_cold);
- }else if (category_id.equals("7")) {
+ } else if (category_id.equals("7")) {
categoryList.get(i).setCategory_img(R.mipmap.analgesics);
- }else if (category_id.equals("8")) {
+ } else if (category_id.equals("8")) {
categoryList.get(i).setCategory_img(R.mipmap.first_aid);
- }else if (category_id.equals("9")) {
+ } else if (category_id.equals("9")) {
categoryList.get(i).setCategory_img(R.mipmap.analgesics);
} else if (category_id.equals("10")) {
categoryList.get(i).setCategory_img(R.mipmap.cough_n_cold);
@@ -354,14 +352,13 @@ public class CategoryListActivity extends AppCompatActivity {
adapter = new CategoryListAdapter(CategoryListActivity.this, categoryList);
recyclerView.setAdapter(adapter);
recyclerView.setLayoutManager(new GridLayoutManager(context, 2));
-
updateStatus();
}
}
- ArrayList getAuditAfterDeletion(String category_id){
- ArrayList question_list = db.getAuditCategoryWise(category_id,storeType_id);
+ ArrayList getAuditAfterDeletion(String category_id) {
+ ArrayList question_list = db.getAuditCategoryWise(category_id, storeType_id);
Iterator iterator = question_list.iterator();
while (iterator.hasNext()) {
@@ -371,11 +368,10 @@ public class CategoryListActivity extends AppCompatActivity {
iterator.remove();
} else if (!item.getCHECK_TYPE().equals("NA") && item.getCHECK_TYPE().equals("T2P")) {
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 (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) {
iterator.remove();
@@ -387,14 +383,12 @@ public class CategoryListActivity extends AppCompatActivity {
}
ArrayList getAuditQnsRemoved(String categoryId) {
-
boolean t2p_flag = false;
boolean flag_t2p_mapping;
- if(store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)){
- flag_t2p_mapping = db.isMappingT2PData(store_id, categoryId,CommonString.TABLE_MAPPING_T2P_ADHOC);
- }
- else {
- flag_t2p_mapping = db.isMappingT2PData(store_id, categoryId,CommonString.TABLE_MAPPING_T2P);
+ if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
+ flag_t2p_mapping = db.isMappingT2PData(store_id, categoryId, CommonString.TABLE_MAPPING_T2P_ADHOC);
+ } else {
+ flag_t2p_mapping = db.isMappingT2PData(store_id, categoryId, CommonString.TABLE_MAPPING_T2P);
}
if (flag_t2p_mapping) {
@@ -423,8 +417,9 @@ public class CategoryListActivity extends AppCompatActivity {
}
}
- ArrayList question_list = db.getAuditCategoryWise(categoryId, storeType_id);
+ ArrayList question_list = db.getAuditCategoryWise(categoryId, storeType_id);
+ Log.e("questionlistsize", String.valueOf(question_list.size()));
Iterator iterator = question_list.iterator();
while (iterator.hasNext()) {
AuditDataGetterSetter item = iterator.next(); // must be called before you can call iterator.remove()
@@ -432,11 +427,9 @@ public class CategoryListActivity extends AppCompatActivity {
if (!item.getKEYACCOUNT_ID().equals("0") && !item.getKEYACCOUNT_ID().equals(keyAccount_id)) {
iterator.remove();
} else if (!item.getCHECK_TYPE().equals("NA") && item.getCHECK_TYPE().equals("T2P")) {
-
if (!t2p_flag) {
iterator.remove();
}
-
}
}
@@ -456,7 +449,6 @@ public class CategoryListActivity extends AppCompatActivity {
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
int id = item.getItemId();
-
if (id == android.R.id.home) {
finish();
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
@@ -537,85 +529,99 @@ public class CategoryListActivity extends AppCompatActivity {
public void updateStatus() {
//Update Checkout Status
boolean flag_filled = false;
-
for (int i = 0; i < categoryList.size(); i++) {
String category_id = categoryList.get(i).getCategory_id();
- /* if (db.checkMsl_AvailabilityData(store_id, category_id)
- && db.checkStockAndFacingData(store_id, category_id)
- && db.checkPromoComplianceData(store_id, category_id)
- && db.isFilledT2P(store_id, category_id)
- && db.additionalVisibilitydata(store_id, category_id)) {
-
- flag_filled = true;
- } else {
- flag_filled = false;
- break;
- }*/
-
- if(store_flag_str.equalsIgnoreCase(CommonString.FROM_ADDITIONAL)){
- boolean flag_mapping_stock = db.isMappingStockDataStockFacing(category_id, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADDITIONAL);
+ if (store_flag_str.equalsIgnoreCase(CommonString.FROM_ADDITIONAL)) {
+ 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)) {
+ if (db.checkStockData(store_id, category_id,visit_date)) {
flag_filled = true;
- }
- else {
+ } else {
flag_filled = false;
break;
}
}
-
}
+ 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 {
if (db.additionalVisibilitydata(store_id, category_id)) {
- //boolean flag = true;
-
- /*if (db.isMappingStockDataMSL_Availability(category_id, keyAccount_id, storeType_id, class_id)) {
- if (!db.checkMsl_AvailabilityData(store_id, category_id)) {
- flag_filled = false;
- break;
- }
- }
-
- //Stock_Facing
- if (db.isMappingStockDataStockFacing(category_id, keyAccount_id, storeType_id, class_id)) {
- if (!db.checkStockAndFacingData(store_id, category_id)) {
- flag_filled = false;
- break;
- }
- }*/
-
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 (country_id.equals("7")||country_id.equals("8")) {
+ 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_StockFacingData(store_id, category_id)) {
+ if (!db.checkMsl_Availability_StockFacingDataNew(store_id, category_id,visit_date)) {
flag_filled = false;
break;
}
}
- if(country_id.equals("7")){
- if(db.getPromoComplianceSkuwiseExistsAfterData(store_id, category_id).size()==0){
+
+ //New MSL_Availability_StockFacing
+ if (country_id.equals("10")||country_id.equals("8")) {
+ 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_filled = false;
break;
}
}
- 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);
+
+ //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_filled = false;
}
- else {
+ }
+
+ if (country_id.equals("7")) {
+ if (db.getPromoComplianceSkuwiseExistsAfterData(store_id, category_id).size() == 0) {
+ flag_filled = false;
+ break;
+ }
+ } 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) {
@@ -627,40 +633,38 @@ public class CategoryListActivity extends AppCompatActivity {
}
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 (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_filled = false;
break;
}
-
}
- if (camera_allow.equalsIgnoreCase("1")) {
+ if (camera_allow.equals("1")) {
//if (category_camera_list.size()>0) {
if (!db.isCategoryPictureData(store_id, category_id)) {
flag_filled = false;
break;
}
- }else {
+ } else {
- final ArrayList sub_category_list = db.getSubCategoryMaster(category_id,store_id,country_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;
- for(int j=0;j0){
+ 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 (isSubGroupDataExists) {
if (db.getNoCameraCategoryDataInserted(store_id, category_id, null).size() == 0) {
flag_filled = false;
break;
@@ -668,14 +672,20 @@ public class CategoryListActivity extends AppCompatActivity {
}
}
- if(getAuditQnsRemoved(category_id).size()>0){
-
- if(db.getAfterSaveAuditQuestionAnswerData(store_id, category_id).size() == 0){
+ if (getAuditQnsRemoved(category_id).size() > 0) {
+ ///Make non Mandate Audit KPI for EGIPT
+ /*if (!country_id.equals("6") && db.getAfterSaveAuditQuestionAnswerData(store_id, category_id).size() == 0) {
+ flag_filled = false;
+ break;
+ }*/
+ //Make Mandate Audit KPI FOR EGYPT 17-01-2023 BY VIKAS
+ if (db.getAfterSaveAuditQuestionAnswerData(store_id, category_id).size() == 0) {
flag_filled = false;
break;
}
}
+
//add UAE pharma No camera pog disable
/* if (db.getSubCategoryMasterForPOG(category_id, storeType_id, pog_type_id, null).size() > 0) {
@@ -684,8 +694,8 @@ public class CategoryListActivity extends AppCompatActivity {
break;
}
}*/
- if (country_id.equals("2")){
- if (camera_allow.equals("1")){
+ 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_filled = false;
@@ -700,7 +710,7 @@ public class CategoryListActivity extends AppCompatActivity {
}
}
}*/
- }else {
+ } else {
if (db.getSubCategoryMasterForPOG(category_id, storeType_id, pog_type_id, null).size() > 0) {
if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, category_id).size() == 0) {
flag_filled = false;
@@ -710,8 +720,7 @@ public class CategoryListActivity extends AppCompatActivity {
}
//Counterfeit Product Option - Egypt
- if(country_id.equals("6")){
-
+ if (country_id.equals("6")) {
if (db.getCounterfeitProductExistsAfterData(store_id, category_id).size() == 0) {
flag_filled = false;
break;
@@ -719,23 +728,27 @@ public class CategoryListActivity extends AppCompatActivity {
}
//usk
- if(country_id.equals("6")&& category_id.equals("2")){
-
+ if (country_id.equals("6") && category_id.equals("2")) {
if (db.getCompetitionPromoExistsAfterData(store_id, category_id).size() == 0) {
flag_filled = false;
break;
}
-
}
+ if(country_id.equals("15")){
+ if (!db.checkOrder_taking_Data(store_id, category_id)) {
+ flag_filled = false;
+ break;
+ }
+ }
flag_filled = true;
- } else {
+ }
+ else{
flag_filled = false;
break;
}
}
}
-
if (flag_filled) {
db.updateCheckoutStatus(store_id, CommonString.KEY_VALID, CommonString.KEY_JOURNEY_PLAN);
}
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 55fddf9..4ca88b3 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
@@ -7,6 +7,7 @@ import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.Bundle;
import android.preference.PreferenceManager;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
@@ -41,6 +42,7 @@ import cpm.com.gskmtorange.dailyentry.CompetitionPromoActivity;
import cpm.com.gskmtorange.dailyentry.CounterfeitProductsActivity;
import cpm.com.gskmtorange.dailyentry.CreateSelfActivity;
import cpm.com.gskmtorange.dailyentry.NewStockDataActivity;
+import cpm.com.gskmtorange.dailyentry.OrderTakingActivity;
import cpm.com.gskmtorange.dailyentry.POGQuestionsActivity;
import cpm.com.gskmtorange.dailyentry.StockActivity;
import cpm.com.gskmtorange.dailyentry.StockDataActivity;
@@ -49,6 +51,7 @@ import cpm.com.gskmtorange.dailyentry.T2PComplianceActivity;
import cpm.com.gskmtorange.xmlGetterSetter.AuditDataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.DailyDataMenuGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.T2PGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.Visit_Type_Master_GetterSetter;
public class DailyDataMenuActivity extends AppCompatActivity {
RecyclerView recyclerView;
@@ -56,33 +59,28 @@ public class DailyDataMenuActivity extends AppCompatActivity {
DailyDataMenuAdapter adapter;
TextView txt_categoryName;
private Context context;
-
GSKOrangeDB db;
String categoryName = "", categoryId;
String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow, country_id, pog_type_id, store_flag_str;
private SharedPreferences preferences;
-
ArrayList category_camera_list;
+ ArrayList visittypelist = new ArrayList();
+ String visit_type_id = "";
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
try {
setContentView(R.layout.activity_daily_data_menu);
-
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-
recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
//txt_categoryName = (TextView) findViewById(R.id.txt_categoryName);
-
db = new GSKOrangeDB(this);
db.open();
context = this;
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
-
CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
-
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null);
date = preferences.getString(CommonString.KEY_DATE, null);
@@ -95,24 +93,22 @@ public class DailyDataMenuActivity extends AppCompatActivity {
country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, "");
pog_type_id = preferences.getString(CommonString.KEY_POG_TYPE_ID, "");
store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null);
+ if (preferences.getString(CommonString.KEY_VISIT_ID, "") != null) {
+ visit_type_id = preferences.getString(CommonString.KEY_VISIT_ID, "");
+ }
//Intent data
categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId");
-
- //txt_categoryName.setText(getResources().getString(R.string.title_activity_daily_main_menu) + " - " + categoryName);
toolbar.setTitle(getResources().getString(R.string.title_activity_daily_main_menu) + " - " + categoryName);
setSupportActionBar(toolbar);
-
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+ db.open();
+ visittypelist = db.getInsertedVisitType(store_id, visit_date, "3");
+ if (visittypelist.size() > 0) {
+ if (visittypelist.get(0).getVISIT_TYPE_ID().equals("3")) {
- /*FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
- fab.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
- .setAction("Action", null).show();
+ }
}
- });*/
} catch (Resources.NotFoundException e) {
e.printStackTrace();
}
@@ -121,20 +117,16 @@ public class DailyDataMenuActivity extends AppCompatActivity {
@Override
protected void onResume() {
super.onResume();
-
CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
-
try {
categoryList = new ArrayList<>();
-
DailyDataMenuGetterSetter data = new DailyDataMenuGetterSetter();
-
//For Additional Stores in Egypt(6) Only Stock Data will be captured
- if(store_flag_str.equalsIgnoreCase(CommonString.FROM_ADDITIONAL)){
+ if (store_flag_str.equalsIgnoreCase(CommonString.FROM_ADDITIONAL)) {
data = new DailyDataMenuGetterSetter();
data.setCategory_name(getResources().getString(R.string.stock));
if (isMappingStockData()) {
- if (db.checkStockData(store_id, categoryId)) {
+ if (db.checkStockData(store_id, categoryId, visit_date)) {
data.setCategory_img(R.mipmap.msl_availability_done);
} else {
data.setCategory_img(R.mipmap.msl_availability);
@@ -143,13 +135,21 @@ public class DailyDataMenuActivity extends AppCompatActivity {
data.setCategory_img(R.mipmap.msl_availability_grey);
}
categoryList.add(data);
- }
- else {
- if (country_id.equals(CommonString.COUNTRY_ID_EGYPT+"") && categoryId.equals("3")) {
+ } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION) && country_id.equals("2") && visit_type_id.equals("3")) {
+ data = new DailyDataMenuGetterSetter();
+ data.setCategory_name(getResources().getString(R.string.daily_data_menu_additional_visibility));
+ if (db.additionalVisibilitydata(store_id, categoryId)) {
+ data.setCategory_img(R.mipmap.additional_visibility_done);
+ } else {
+ data.setCategory_img(R.mipmap.additional_visibility);
+ }
+ categoryList.add(data);
+ } else {
+ if (country_id.equals(CommonString.COUNTRY_ID_EGYPT + "") && categoryId.equals("3")) {
data = new DailyDataMenuGetterSetter();
data.setCategory_name(getResources().getString(R.string.daily_data_menu_stock_facing));
if (isMappingStockData()) {
- if (db.checkMsl_Availability_StockFacingData(store_id, categoryId)) {
+ if (db.checkMsl_Availability_StockFacingDataNew(store_id, categoryId, visit_date)) {
data.setCategory_img(R.mipmap.msl_availability_done);
} else {
data.setCategory_img(R.mipmap.msl_availability);
@@ -162,7 +162,7 @@ public class DailyDataMenuActivity extends AppCompatActivity {
data = new DailyDataMenuGetterSetter();
data.setCategory_name(getResources().getString(R.string.daily_data_menu_msl_availability));
if (isMappingStockData()) {
- if (db.checkMsl_Availability_StockFacingData(store_id, categoryId)) {
+ if (db.checkMsl_Availability_StockFacingDataNew(store_id, categoryId, visit_date)) {
data.setCategory_img(R.mipmap.msl_availability_done);
} else {
data.setCategory_img(R.mipmap.msl_availability);
@@ -174,38 +174,11 @@ public class DailyDataMenuActivity extends AppCompatActivity {
}
- /*data.setCategory_name(getResources().getString(R.string.daily_data_menu_msl_availability));
- if (db.isMappingStockDataMSL_Availability(categoryId, keyAccount_id, storeType_id, class_id)) {
- if (db.checkMsl_AvailabilityData(store_id, categoryId)) {
- data.setCategory_img(R.mipmap.msl_availability_done);
- } else {
- data.setCategory_img(R.mipmap.msl_availability);
- }
- } else {
- data.setCategory_img(R.mipmap.msl_availability_grey);
- }
- categoryList.add(data);
-
-
- data = new DailyDataMenuGetterSetter();
- //data.setCategory_name("Stock & Facing");
- data.setCategory_name(getResources().getString(R.string.daily_data_menu_stock_facing));
- if (db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id)) {
- if (db.checkStockAndFacingData(store_id, categoryId)) {
- data.setCategory_img(R.mipmap.stock_facing_done);
- } else {
- data.setCategory_img(R.mipmap.stock_facing);
- }
- } else {
- data.setCategory_img(R.mipmap.stockandfacing_grey);
- }
- categoryList.add(data);*/
-
//T2p and kenya POSm
data = new DailyDataMenuGetterSetter();
- if (country_id.equals("8")){
+ if (country_id.equals("8") || country_id.equals("17")) {
data.setCategory_name(getResources().getString(R.string.title_posm));
- }else {
+ } else {
data.setCategory_name(getResources().getString(R.string.daily_data_menu_t2p));
}
@@ -230,7 +203,13 @@ public class DailyDataMenuActivity extends AppCompatActivity {
//T2p added
data = new DailyDataMenuGetterSetter();
- data.setCategory_name(getResources().getString(R.string.daily_data_menu_additional_visibility));
+ if(country_id.equals("17")){
+ data.setCategory_name(getResources().getString(R.string.title_posm) +"/"+getResources().getString(R.string.daily_data_menu_additional_visibility));
+ }
+ else{
+ data.setCategory_name(getResources().getString(R.string.daily_data_menu_additional_visibility));
+ }
+ // data.setCategory_name(getResources().getString(R.string.daily_data_menu_additional_visibility));
if (db.additionalVisibilitydata(store_id, categoryId)) {
data.setCategory_img(R.mipmap.additional_visibility_done);
} else {
@@ -238,7 +217,6 @@ public class DailyDataMenuActivity extends AppCompatActivity {
}
categoryList.add(data);
-
data = new DailyDataMenuGetterSetter();
data.setCategory_name(getResources().getString(R.string.daily_data_menu_promo_compliance));
if (country_id.equals("7")) {
@@ -263,8 +241,7 @@ public class DailyDataMenuActivity extends AppCompatActivity {
}
if (isMappingPromotion_Flag || isMappingAdditionalPromotion_Flag) {
- if (db.checkPromoComplianceData(store_id, categoryId) ||
- db.checkAdditionalPromoComplianceData(store_id, categoryId)) {
+ if (db.checkPromoComplianceData(store_id, categoryId) || db.checkAdditionalPromoComplianceData(store_id, categoryId)) {
data.setCategory_img(R.mipmap.promo_compliance_done);
} else {
data.setCategory_img(R.mipmap.promo_compliance);
@@ -273,7 +250,6 @@ public class DailyDataMenuActivity extends AppCompatActivity {
data.setCategory_img(R.mipmap.promocompliance_grey);
}
}
-
categoryList.add(data);
//Category Pictures
@@ -290,17 +266,51 @@ public class DailyDataMenuActivity extends AppCompatActivity {
} /*else {
data.setCategory_img(R.mipmap.picturecatogory_grey);
}*/
-
- } else {
+ }
+ else if(country_id!=null && country_id.equals("17") && camera_allow.equalsIgnoreCase("0")){
+ data.setCategory_img(R.mipmap.picturecatogory_grey);
+ }
+ else {
if (db.getNoCameraCategoryDataInserted(store_id, categoryId, null).size() > 0) {
data.setCategory_img(R.mipmap.picturecatogory_done);
} else {
data.setCategory_img(R.mipmap.picturecatogory);
- // }
+ // }
}
}
categoryList.add(data);
+ //Order Taking
+ data = new DailyDataMenuGetterSetter();
+ // ArrayList question_list;
+ data.setCategory_img(R.mipmap.msl_availability);
+ if (country_id.equals("15") || (country_id.equals("17") && categoryId.equals("2"))) {
+ if (isMappingStockData()) {
+ if (db.checkOrder_taking_Data(store_id, categoryId)) {
+ data.setCategory_img(R.mipmap.msl_availability_done);
+ } else {
+ data.setCategory_img(R.mipmap.msl_availability);
+ }
+ } else {
+ data.setCategory_img(R.mipmap.msl_availability_grey);
+ }
+ data.setCategory_name(getString(R.string.order_taking));
+ categoryList.add(data);
+ }
+
+ //Order Confirm
+ data = new DailyDataMenuGetterSetter();
+ // ArrayList question_list;
+ if (country_id.equals("15") ) {
+ if (db.checkOrder_Received_Data(store_id, categoryId)) {
+ data.setCategory_img(R.mipmap.msl_availability_done);
+ } else {
+ data.setCategory_img(R.mipmap.msl_availability);
+ }
+ data.setCategory_name(getString(R.string.order_confirm));
+ categoryList.add(data);
+ }
+
//Audit
data = new DailyDataMenuGetterSetter();
@@ -335,8 +345,8 @@ public class DailyDataMenuActivity extends AppCompatActivity {
}*/
//new add UAE Pharma
data = new DailyDataMenuGetterSetter();
- if (country_id.equals("2")){
- if (camera_allow.equals("1")){
+ if (country_id.equals("2")) {
+ if (camera_allow.equals("1")) {
if (db.getSubCategoryMasterForPOG(categoryId, storeType_id, pog_type_id, null).size() > 0) {
if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, categoryId).size() > 0) {
data.setCategory_img(R.mipmap.msl_availability_done);
@@ -347,10 +357,10 @@ public class DailyDataMenuActivity extends AppCompatActivity {
} else {
data.setCategory_img(R.mipmap.msl_availability_grey);
}
- }else {
+ } else {
data.setCategory_img(R.mipmap.msl_availability_grey);
}
- }else {
+ } else {
if (db.getSubCategoryMasterForPOG(categoryId, storeType_id, pog_type_id, null).size() > 0) {
if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, categoryId).size() > 0) {
data.setCategory_img(R.mipmap.msl_availability_done);
@@ -365,8 +375,24 @@ public class DailyDataMenuActivity extends AppCompatActivity {
data.setCategory_name(getString(R.string.pog));
categoryList.add(data);
+ //Warehouse Stock - Jordan
+ if (country_id.equals("10")) {
+ data = new DailyDataMenuGetterSetter();
+ data.setCategory_name(getResources().getString(R.string.stock_entry));
+ if (isMappingStockData()) {
+ if (db.checkStock_Entry_FacingDataNew(store_id, categoryId, visit_date)) {
+ data.setCategory_img(R.mipmap.msl_availability_done);
+ } else {
+ data.setCategory_img(R.mipmap.msl_availability);
+ }
+ } else {
+ data.setCategory_img(R.mipmap.msl_availability_grey);
+ }
+ categoryList.add(data);
+ }
+
//Counterfeit Product Option - Egypt
- if(country_id.equals("6")){
+ if (country_id.equals("6")) {
data = new DailyDataMenuGetterSetter();
if (db.getCounterfeitProductExistsAfterData(store_id, categoryId).size() > 0) {
@@ -381,8 +407,8 @@ public class DailyDataMenuActivity extends AppCompatActivity {
//usk
//Cometition promo Option - Egypt
- if (categoryId.equals("2")){
- if(country_id.equals("6")){
+ if (categoryId.equals("2")) {
+ if (country_id.equals("6")) {
data = new DailyDataMenuGetterSetter();
if (db.getCompetitionPromoExistsAfterData(store_id, categoryId).size() > 0) {
@@ -463,7 +489,6 @@ public class DailyDataMenuActivity extends AppCompatActivity {
}
ArrayList getAuditQnsRemoved() {
-
boolean t2p_flag = false;
boolean flag_t2p_mapping;
if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
@@ -499,6 +524,7 @@ public class DailyDataMenuActivity extends AppCompatActivity {
}
ArrayList question_list = db.getAuditCategoryWise(categoryId, storeType_id);
+ Log.e("catid", categoryId + "," + storeType_id + "," + question_list.size());
Iterator iterator = question_list.iterator();
while (iterator.hasNext()) {
@@ -507,14 +533,12 @@ public class DailyDataMenuActivity extends AppCompatActivity {
if (!item.getKEYACCOUNT_ID().equals("0") && !item.getKEYACCOUNT_ID().equals(keyAccount_id)) {
iterator.remove();
} else if (!item.getCHECK_TYPE().equals("NA") && item.getCHECK_TYPE().equals("T2P")) {
-
if (!t2p_flag) {
iterator.remove();
}
-
}
}
-
+ Log.e("questionlistsize", String.valueOf(question_list));
return question_list;
}
@@ -543,23 +567,13 @@ public class DailyDataMenuActivity extends AppCompatActivity {
holder.categoryName.setText(dailyData.getCategory_name());
holder.categoryIcon.setImageResource(dailyData.getCategory_img());
- /*if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_msl_availability))) {
- if (db.isMappingStockDataMSL_Availability(categoryId, keyAccount_id, storeType_id, class_id)) {
- holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
- } else {
- holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
- }
- } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_stock_facing))) {
- if (db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id)) {
- holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
- } else {
- holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
- }
- } else*/
- if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_promo_compliance))) {
+ db.open();
+ visittypelist = db.getInsertedVisitType(store_id, visit_date, "3");
+ // if(visittypelist.get(0).getVISIT_TYPE_ID().equals())
+ if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_promo_compliance))) {
if (country_id.equals("7")) {
- holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+ holder.categoryName.setTextColor(getResources().getColor(R.color.black));
} else {
boolean isMappingPromotion_Flag;
if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
@@ -576,12 +590,12 @@ public class DailyDataMenuActivity extends AppCompatActivity {
}
if (isMappingPromotion_Flag || isMappingAdditionalPromotion_Flag) {
- holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+ holder.categoryName.setTextColor(getResources().getColor(R.color.black));
} else {
holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
}
}
- } else if (dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.daily_data_menu_t2p)))||dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.title_posm)))) {
+ } else if (dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.daily_data_menu_t2p))) || dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.title_posm)))) {
boolean t2p_flag = false;
boolean flag_t2p_mapping;
@@ -592,85 +606,79 @@ public class DailyDataMenuActivity extends AppCompatActivity {
}
if (flag_t2p_mapping) {
- holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+ holder.categoryName.setTextColor(getResources().getColor(R.color.black));
} else {
holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
}
} else if (dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.daily_data_menu_category_picture)))) {
if (camera_allow.equalsIgnoreCase("1")) {
- holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
- } /*else {
+ holder.categoryName.setTextColor(getResources().getColor(R.color.black));
+ }
+ else if(country_id.equals("17") && !camera_allow.equalsIgnoreCase("1")){
+ holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
+ }
+ /*else {
holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
}*/
} else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_msl_availability))) {
if (isMappingStockData()) {
- holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+ holder.categoryName.setTextColor(getResources().getColor(R.color.black));
} else {
holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
}
- } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_stock_facing))
- || dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.stock))) {
+ }
+ else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.stock_entry))) {
if (isMappingStockData()) {
- holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+ holder.categoryName.setTextColor(getResources().getColor(R.color.black));
+ } else {
+ holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
+ }
+ }
+ else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_stock_facing)) || dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.stock))) {
+ if (isMappingStockData()) {
+ holder.categoryName.setTextColor(getResources().getColor(R.color.black));
} else {
holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
}
} else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.audit))) {
if (getAuditQnsRemoved().size() > 0) {
- holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+ holder.categoryName.setTextColor(getResources().getColor(R.color.black));
} else {
holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
}
-
} else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.pog))) {
//new add UAE pharma
-
/*if (db.getSubCategoryMasterForPOG(categoryId, storeType_id, pog_type_id, null).size() > 0) {
holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
} else {
holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
}*/
- if (country_id.equals("2")){
- if (camera_allow.equals("1")){
+
+
+ if (country_id.equals("2")) {
+ if (camera_allow.equals("1")) {
if (db.getSubCategoryMasterForPOG(categoryId, storeType_id, pog_type_id, null).size() > 0) {
- holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+ holder.categoryName.setTextColor(getResources().getColor(R.color.black));
} else {
holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
}
- }else {
+ } else {
holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
}
- }else{
+ } else {
if (db.getSubCategoryMasterForPOG(categoryId, storeType_id, pog_type_id, null).size() > 0) {
- holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+ holder.categoryName.setTextColor(getResources().getColor(R.color.black));
} else {
holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
}
}
-
-
}
+
holder.lay_menu.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- /*if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_msl_availability))) {
- if (db.isMappingStockDataMSL_Availability(categoryId, keyAccount_id, storeType_id, class_id)) {
- Intent intent = new Intent(DailyDataMenuActivity.this, MSL_AvailabilityActivity.class);
- intent.putExtra("categoryName", dailyData.getCategory_name());
- intent.putExtra("categoryId", categoryId);
- startActivity(intent);
- }
- } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_stock_facing))) {
- if (db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id)) {
- Intent intent = new Intent(DailyDataMenuActivity.this, Stock_FacingActivity.class);
- intent.putExtra("categoryName", dailyData.getCategory_name());
- intent.putExtra("categoryId", categoryId);
- startActivity(intent);
- }
-
- } else */
if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_promo_compliance))) {
if (country_id.equals("7")) {
Intent intent = new Intent(DailyDataMenuActivity.this, AdditionalPromoSKUwiseActivity.class);
@@ -700,8 +708,7 @@ public class DailyDataMenuActivity extends AppCompatActivity {
}
}
-
- } else if (dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.daily_data_menu_t2p)))||dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.title_posm)))) {
+ } else if (dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.daily_data_menu_t2p))) || dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.title_posm)))) {
boolean t2p_flag = false;
boolean flag_t2p_mapping;
if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
@@ -716,14 +723,13 @@ public class DailyDataMenuActivity extends AppCompatActivity {
startActivity(intent);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
}
-
- } else if (dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.title_activity_Additional_visibility)))) {
+ } else if (dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.title_activity_Additional_visibility))) ||
+ dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.title_posm) +"/"+getResources().getString(R.string.daily_data_menu_additional_visibility)))) {
Intent intent = new Intent(DailyDataMenuActivity.this, AdditionalVisibility.class);
intent.putExtra("categoryName", dailyData.getCategory_name());
intent.putExtra("categoryId", categoryId);
startActivity(intent);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
-
} else if (dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.daily_data_menu_category_picture)))) {
if (camera_allow.equalsIgnoreCase("1")) {
Intent intent = new Intent(DailyDataMenuActivity.this, CategoryPicture.class);
@@ -731,15 +737,31 @@ public class DailyDataMenuActivity extends AppCompatActivity {
intent.putExtra("categoryId", categoryId);
startActivity(intent);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
- } else {
+ } else if(country_id!=null && !country_id.equals("17")) {
Intent intent = new Intent(DailyDataMenuActivity.this, CreateSelfActivity.class);
intent.putExtra("categoryName", dailyData.getCategory_name());
intent.putExtra("categoryId", categoryId);
startActivity(intent);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
}
-
- } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_msl_availability))) {
+ } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.order_taking))) {
+ if (isMappingStockData()) {
+ Intent intent = new Intent(DailyDataMenuActivity.this, OrderTakingActivity.class);
+ intent.putExtra("categoryName", dailyData.getCategory_name());
+ intent.putExtra("categoryId", categoryId);
+ startActivity(intent);
+ overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+ }
+ } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.order_confirm))) {
+ if (isMappingStockData()) {
+ Intent intent = new Intent(DailyDataMenuActivity.this, OrderConfirmActivity.class);
+ intent.putExtra("categoryName", dailyData.getCategory_name());
+ intent.putExtra("categoryId", categoryId);
+ startActivity(intent);
+ overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+ }
+ }
+ else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_msl_availability))) {
if (isMappingStockData()) {
Intent intent = new Intent(DailyDataMenuActivity.this, MSL_Availability_StockFacingActivity.class);
intent.putExtra("categoryName", dailyData.getCategory_name());
@@ -747,10 +769,20 @@ public class DailyDataMenuActivity extends AppCompatActivity {
startActivity(intent);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
}
-
- } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_stock_facing))) {
+ }
+ else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.stock_entry))) {
if (isMappingStockData()) {
- // Intent intent = new Intent(DailyDataMenuActivity.this, StockDataActivity.class);
+ Intent intent = new Intent(DailyDataMenuActivity.this, StockEntryActivity.class);
+ intent.putExtra("categoryName", dailyData.getCategory_name());
+ intent.putExtra("categoryId", categoryId);
+ startActivity(intent);
+ overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+ }
+ }
+
+ else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_stock_facing))) {
+ if (isMappingStockData()) {
+ // Intent intent = new Intent(DailyDataMenuActivity.this, StockDataActivity.class);
Intent intent = new Intent(DailyDataMenuActivity.this, NewStockDataActivity.class);
intent.putExtra("categoryName", dailyData.getCategory_name());
intent.putExtra("categoryId", categoryId);
@@ -760,7 +792,6 @@ public class DailyDataMenuActivity extends AppCompatActivity {
} else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.audit))) {
//if (db.getAuditCategoryWise(categoryId, storeType_id).size()>0) {
-
if (getAuditQnsRemoved().size() > 0) {
Intent intent = new Intent(DailyDataMenuActivity.this, AuditActivity.class);
intent.putExtra("categoryName", dailyData.getCategory_name());
@@ -772,8 +803,8 @@ public class DailyDataMenuActivity extends AppCompatActivity {
} else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.pog))) {
//add uae pharma
- if (country_id.equals("2")){
- if (camera_allow.equals("1")){
+ if (country_id.equals("2")) {
+ if (camera_allow.equals("1")) {
if (db.getSubCategoryMasterForPOG(categoryId, storeType_id, pog_type_id, null).size() > 0) {
Intent intent = new Intent(DailyDataMenuActivity.this, POGQuestionsActivity.class);
intent.putExtra("categoryName", dailyData.getCategory_name());
@@ -783,7 +814,7 @@ public class DailyDataMenuActivity extends AppCompatActivity {
}
}
- }else {
+ } else {
if (db.getSubCategoryMasterForPOG(categoryId, storeType_id, pog_type_id, null).size() > 0) {
Intent intent = new Intent(DailyDataMenuActivity.this, POGQuestionsActivity.class);
intent.putExtra("categoryName", dailyData.getCategory_name());
@@ -800,7 +831,7 @@ public class DailyDataMenuActivity extends AppCompatActivity {
intent.putExtra("categoryId", categoryId);
startActivity(intent);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
- }else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.stock))) {
+ } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.stock))) {
if (isMappingStockData()) {
Intent intent = new Intent(DailyDataMenuActivity.this, StockActivity.class);
intent.putExtra("categoryName", dailyData.getCategory_name());
@@ -809,10 +840,7 @@ public class DailyDataMenuActivity extends AppCompatActivity {
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
}
- }else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.title_activity_stock_pricing))) {
- /*if (isMappingStockData()) {
-
- }*/
+ } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.title_activity_stock_pricing))) {
Intent intent = new Intent(DailyDataMenuActivity.this, StockPricingActivity.class);
intent.putExtra("categoryName", dailyData.getCategory_name());
intent.putExtra("categoryId", categoryId);
@@ -825,11 +853,9 @@ public class DailyDataMenuActivity extends AppCompatActivity {
startActivity(intent);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
}
-
-
-
}
});
+
}
@Override
@@ -853,19 +879,16 @@ public class DailyDataMenuActivity extends AppCompatActivity {
boolean isMappingStockData() {
boolean flag;
- if (country_id.equals("7")||country_id.equals("8")) {
+ 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 if(store_flag_str.equalsIgnoreCase(CommonString.FROM_ADDITIONAL)){
+ } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_ADDITIONAL)) {
flag = db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADDITIONAL);
- }
- else{
+ } 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/MSL_AvailabilityActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java
index 59cba25..d813b77 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java
@@ -300,7 +300,8 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
public void onBackPressed() {
//super.onBackPressed();
- android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(MSL_AvailabilityActivity.this);
+ super.onBackPressed();
+ AlertDialog.Builder builder = new AlertDialog.Builder(MSL_AvailabilityActivity.this);
builder.setTitle(getResources().getString(R.string.dialog_title));
builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
.setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
@@ -314,7 +315,7 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
}
});
- android.app.AlertDialog alert = builder.create();
+ AlertDialog alert = builder.create();
alert.show();
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java
index c5e8799..b6f24f8 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java
@@ -94,43 +94,34 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
ArrayList planogramSkuChildDataList;
HashMap> planogramHashMapListChildData = new HashMap<>();
boolean editFlag = false;
-
- //temp
public static final String FILE_PATH = Environment.getExternalStorageDirectory() + "/";
- //ImageView bmImage;
- RelativeLayout view;
+ LinearLayout pricingLL;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
try {
setContentView(R.layout.activity_msl__availability_stock_facing);
-
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-
expandableListView = (ExpandableListView) findViewById(R.id.expandableListView);
txt_mslAvailabilityName = (TextView) findViewById(R.id.txt_mslAvailabilityName);
-
camera1 = (ImageView) findViewById(R.id.img_camera1);
camera2 = (ImageView) findViewById(R.id.img_camera2);
camera3 = (ImageView) findViewById(R.id.img_camera3);
camera4 = (ImageView) findViewById(R.id.img_camera4);
-
lin_camera1 = (LinearLayout) findViewById(R.id.lin_camera1);
lin_camera2 = (LinearLayout) findViewById(R.id.lin_camera2);
lin_camera3 = (LinearLayout) findViewById(R.id.lin_camera3);
lin_camera4 = (LinearLayout) findViewById(R.id.lin_camera4);
-
+ pricingLL = findViewById(R.id.pricingLL);
+ context = this;
db = new GSKOrangeDB(this);
db.open();
- context = this;
-
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
store_flag_hide = preferences.getString(CommonString.KEY_STORE_FLAG_FACING_HIDE, null);
-
visit_date = preferences.getString(CommonString.KEY_DATE, null);
date = preferences.getString(CommonString.KEY_DATE, null);
username = preferences.getString(CommonString.KEY_USERNAME, null);
@@ -141,55 +132,84 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, "");
country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, "");
store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null);
-
//Intent data
categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId");
-
- //txt_mslAvailabilityName.setText(getResources().getString(R.string.title_activity_msl__availability));
+ if (country_id != null && country_id.equals("5")) {
+ pricingLL.setVisibility(View.GONE);
+ } else {
+ pricingLL.setVisibility(View.VISIBLE);
+ }
toolbar.setTitle(getResources().getString(R.string.title_activity_msl__availability));
setSupportActionBar(toolbar);
-
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
str_planogram = CommonString.FILE_PATH_PLANOGRAM;
-
prepareList();
-
- //Camera
prepareDefaultList();
-
cameraMethod();
-
final FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
- fab.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(final View view) {
-
- expandableListView.clearFocus();
- adapter.notifyDataSetChanged();
-
- if (validateData(hashMapListHeaderData, hashMapListChildData)) {
-
+ fab.setOnClickListener(view -> {
+ expandableListView.clearFocus();
+ adapter.notifyDataSetChanged();
+ if (validateData(hashMapListHeaderData, hashMapListChildData)) {
+ db.open();
+ if (db.checkMsl_Availability_StockFacingDataNew(store_id, categoryId, visit_date)) {
+ db.updateMSL_Availability_StockFacingNew(visit_date, store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
+ Snackbar.make(expandableListView, getResources().getString(R.string.update_message), Snackbar.LENGTH_SHORT).setAction("Action", null).show();
+ /*ArrayList msl_availabilityStockFacingList;
+ String mslAvailability_stockFacing_xml = "";
+ String onXML = "";
db.open();
+ Log.d("listdata", store_id + "," + visit_date);
+ msl_availabilityStockFacingList = db.getMSL_Availability_StockFacing_UploadServerDataNew(store_id, visit_date,
+ null, null, null,CommonString.TABLE_MAPPING_STOCK_STOREWISE);
+ Log.d("msllistsize", String.valueOf(msl_availabilityStockFacingList.size()));
- if (db.checkMsl_Availability_StockFacingData(store_id, categoryId)) {
- db.updateMSL_Availability_StockFacing(store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
- Snackbar.make(view, getResources().getString(R.string.update_message), Snackbar.LENGTH_LONG).setAction("Action", null).show();
- } else {
- db.InsertMSL_Availability_StockFacing(store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
- Snackbar.make(view, getResources().getString(R.string.save_message), Snackbar.LENGTH_LONG).setAction("Action", null).show();
- }
- finish();
- overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+ if (msl_availabilityStockFacingList.size() > 0) {
+ for (int j = 0; j < msl_availabilityStockFacingList.size(); j++) {
+ if (!msl_availabilityStockFacingList.get(j).getSku_id().equals("0")) {
+ String stock, pricing;
+ if (!msl_availabilityStockFacingList.get(j).getStock().equals("")) {
+ stock = msl_availabilityStockFacingList.get(j).getStock();
+ } else {
+ stock = "0";
+ }
+ if (!msl_availabilityStockFacingList.get(j).getPricingStock().equals("")) {
+ pricing = msl_availabilityStockFacingList.get(j).getPricingStock();
+ } else {
+ pricing = "-1";
+ }
+ onXML = "[ST]"
+ + "[MID]" + "0" + "[/MID]"
+ //+ "[USERID]" + userId + "[/USERID]"
+ + "[SID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SID]"
+ + "[MBQ]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMbq()) + "[/MBQ]"
+ + "[AVL]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getToggleValue()) + "[/AVL]"
+ + "[FC]" + Double.parseDouble(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FC]"
+ + "[SK]" + Integer.parseInt(stock) + "[/SK]"
+ + "[PRICING]" + Double.parseDouble(pricing) + "[/PRICING]"
+ + "[ML]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMust_have()) + "[/ML]" +
+ "[/ST]";
+
+ mslAvailability_stockFacing_xml = mslAvailability_stockFacing_xml + onXML;
+ }
+ }
+ final String sos_xml = "[DATA]" + mslAvailability_stockFacing_xml + "[/DATA]";
+ Log.d("MSL_DATA", sos_xml);
+ }*/
} else {
- for (int i = 0; i < adapter.getGroupCount(); i++)
- expandableListView.expandGroup(i);
-
+ db.InsertMSL_Availability_StockFacingNew(visit_date, store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
+ Snackbar.make(expandableListView, getResources().getString(R.string.save_message), Snackbar.LENGTH_SHORT).setAction("Action", null).show();
}
-
+ finish();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+ } else {
+ Snackbar.make(expandableListView, Error_Message, Snackbar.LENGTH_SHORT).setAction("Action", null).show();
+ for (int i = 0; i < adapter.getGroupCount(); i++)
+ expandableListView.expandGroup(i);
}
+
});
expandableListView.setOnScrollListener(new AbsListView.OnScrollListener() {
@@ -217,58 +237,39 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
getCurrentFocus().clearFocus();
}
-
expandableListView.invalidateViews();
}
});
// Listview Group click listener
- expandableListView.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() {
- @Override
- public boolean onGroupClick(ExpandableListView parent, View v, int groupPosition, long id) {
- return false;
- }
- });
+ expandableListView.setOnGroupClickListener((parent, v, groupPosition, id) -> false);
// Listview Group expanded listener
- expandableListView.setOnGroupExpandListener(new ExpandableListView.OnGroupExpandListener() {
- @Override
- public void onGroupExpand(int groupPosition) {
- InputMethodManager inputManager = (InputMethodManager) context
- .getSystemService(Context.INPUT_METHOD_SERVICE);
- if (getWindow().getCurrentFocus() != null) {
- inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
- getCurrentFocus().clearFocus();
- }
+ expandableListView.setOnGroupExpandListener(groupPosition -> {
+ InputMethodManager inputManager = (InputMethodManager) context
+ .getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (getWindow().getCurrentFocus() != null) {
+ inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+ getCurrentFocus().clearFocus();
}
});
// Listview Group collasped listener
- expandableListView.setOnGroupCollapseListener(new ExpandableListView.OnGroupCollapseListener() {
- @Override
- public void onGroupCollapse(int groupPosition) {
- InputMethodManager inputManager = (InputMethodManager) context
- .getSystemService(Context.INPUT_METHOD_SERVICE);
- if (getWindow().getCurrentFocus() != null) {
- inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
- getCurrentFocus().clearFocus();
- }
+ expandableListView.setOnGroupCollapseListener(groupPosition -> {
+ InputMethodManager inputManager = (InputMethodManager) context
+ .getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (getWindow().getCurrentFocus() != null) {
+ inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+ getCurrentFocus().clearFocus();
}
});
// Listview on child click listener
- expandableListView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() {
- @Override
- public boolean onChildClick(ExpandableListView parent, View v, int groupPosition,
- int childPosition, long id) {
- return false;
- }
- });
+ expandableListView.setOnChildClickListener((parent, v, groupPosition, childPosition, id) -> false);
} catch (Resources.NotFoundException e) {
e.printStackTrace();
}
-
}
@Override
@@ -280,33 +281,23 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
@Override
public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId();
-
if (id == android.R.id.home) {
-
if (editFlag) {
- CommonFunctions.showAlertDialog(MSL_Availability_StockFacingActivity.this, getResources().getString(R.string.data_will_be_lost));
+ CommonFunctions.showAlertDialog(context, getResources().getString(R.string.data_will_be_lost));
} else {
finish();
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
}
-
-
- //finish();
} else if (id == R.id.action_planogram) {//Planogram Dialog
expandableListView.clearFocus();
-
- //final Dialog dialog = new Dialog(Stock_FacingActivity.this, android.R.style.Theme_Black_NoTitleBar_Fullscreen);
final Dialog dialog = new Dialog(MSL_Availability_StockFacingActivity.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);
-
ArrayList mappingPlanogramList;
-
//Header
- if (country_id.equals("7") || country_id.equals("5")) {
+ if (country_id.equals("7") || country_id.equals("5") || country_id.equals("8")) {
mappingPlanogramList = db.getMappingPlanogramData(categoryId, null, null, store_id, CommonString.TABLE_MAPPING_PLANOGRAM_STORE_WISE);
} else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
mappingPlanogramList = db.getMappingPlanogramData(categoryId, storeType_id, class_id, null, CommonString.TABLE_MAPPING_PLANOGRAM_ADHOC);
@@ -314,15 +305,12 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
mappingPlanogramList = db.getMappingPlanogramData(categoryId, storeType_id, class_id, null, CommonString.TABLE_MAPPING_PLANOGRAM);
}
-
//ImageView img_planogram = (ImageView) dialog.findViewById(R.id.img_planogram);
WebView webView = (WebView) dialog.findViewById(R.id.webview);
webView.setWebViewClient(new MyWebViewClient());
-
webView.getSettings().setAllowFileAccess(true);
webView.getSettings().setJavaScriptEnabled(true);
webView.getSettings().setBuiltInZoomControls(true);
-
String planogram_image = "";
if (mappingPlanogramList.size() > 0) {
planogram_image = mappingPlanogramList.get(0).getPLANOGRAM_IMAGE();
@@ -330,28 +318,20 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
if (!planogram_image.equals("")) {
if (new File(str_planogram + planogram_image).exists()) {
Bitmap bmp = BitmapFactory.decodeFile(str_planogram + planogram_image);
-
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-
String imagePath = "file://" + CommonString.FILE_PATH_PLANOGRAM + "/" + planogram_image;
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 -> {
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+ dialog.dismiss();
});
-
- //dialog.show();
return true;
}
@@ -361,9 +341,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
@Override
public void onSelect(boolean flag) {
if (flag) {
- //adapter.notifyDataSetChanged();
if (!validateData(hashMapListHeaderData, hashMapListChildData)) {
-
if (!camera_allow.equals("1")) {
db.deletePlanogramListStoreAndCategorywise(store_id, categoryId,
planogramShelfHeaderDataList, planogramHashMapListChildData);
@@ -380,7 +358,6 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
}
private class MyWebViewClient extends WebViewClient {
-
@Override
public boolean shouldOverrideUrlLoading(WebView view, String url) {
view.loadUrl(url);
@@ -400,7 +377,6 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
}
private void cameraMethod() {
-
if (!camera_allow.equals("1")) {
findViewById(R.id.lin_camera).setVisibility(View.GONE);
} else {
@@ -412,12 +388,9 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
private void prepareDefaultList() {
// Planogram After save shelf header data
planogramShelfHeaderDataList = db.getPlanogramAddShelfHeaderAfterSaveData(store_id, categoryId);
-
if (planogramShelfHeaderDataList.size() > 0) {
-
for (int i = 0; i < planogramShelfHeaderDataList.size(); i++) {
planogramSkuChildDataList = db.getStockAndFacingPlanogramAfterSKUData(planogramShelfHeaderDataList.get(i).getKey_id());
-
//After save sku child data
if (planogramSkuChildDataList.size() > 0) {
planogramHashMapListChildData.put(planogramShelfHeaderDataList.get(i), planogramSkuChildDataList);
@@ -436,40 +409,43 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
try {
hashMapListHeaderData = new ArrayList<>();
hashMapListChildData = new HashMap<>();
-
//Header
- if (country_id.equals("7") || country_id.equals("8")) {
- headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE, CommonString.TABLE_MAPPING_SOS_TARGET, store_flag_hide);
+ if (country_id.equals("7") || country_id.equals("8") || country_id.equals("17")) {
+ headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, null, null, null,
+ store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE, CommonString.TABLE_MAPPING_SOS_TARGET, store_flag_hide);
} else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
- headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC, CommonString.TABLE_MAPPING_SOS_TARGET_ADHOC, store_flag_hide);
+ headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id,
+ CommonString.TABLE_MAPPING_STOCK_ADHOC, CommonString.TABLE_MAPPING_SOS_TARGET_ADHOC, store_flag_hide);
} else {
- headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK, CommonString.TABLE_MAPPING_SOS_TARGET, store_flag_hide);
+ headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id,
+ store_id, CommonString.TABLE_MAPPING_STOCK, CommonString.TABLE_MAPPING_SOS_TARGET, store_flag_hide);
}
-
-
if (headerDataList.size() > 0) {
for (int i = 0; i < headerDataList.size(); i++) {
hashMapListHeaderData.add(headerDataList.get(i));
-
- //childDataList = new ArrayList<>();
- childDataList = db.getMSL_Availability_StockFacingSKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
- if (!(childDataList.size() > 0)) {
- if (country_id.equals("7") || country_id.equals("8")) {
- childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(), categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE, store_flag_hide);
- } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
- childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(), categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC, store_flag_hide);
- } else {
- childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(), categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK, store_flag_hide);
- }
+ if (country_id.equals("7") || country_id.equals("8") || country_id.equals("17")) {
+ db.open();
+ childDataList = db.getMSL_Availability_StockFacingSKUDataNewUpdate(headerDataList.get(i).getSub_category_id(),
+ categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id,
+ CommonString.TABLE_MAPPING_STOCK_STOREWISE, store_flag_hide, visit_date, false);
+ updateCoverage(CommonString.TABLE_MAPPING_STOCK_STOREWISE);
+ } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
+ childDataList = db.getMSL_Availability_StockFacingSKUDataNewUpdate(headerDataList.get(i).getSub_category_id(),
+ categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id,
+ CommonString.TABLE_MAPPING_STOCK_ADHOC, store_flag_hide, visit_date, false);
+ updateCoverage(CommonString.TABLE_MAPPING_STOCK_ADHOC);
+ } else {
+ childDataList = db.getMSL_Availability_StockFacingSKUDataNewUpdate(headerDataList.get(i).getSub_category_id(), categoryId,
+ headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id,
+ CommonString.TABLE_MAPPING_STOCK, store_flag_hide, visit_date, false);
+ updateCoverage(CommonString.TABLE_MAPPING_STOCK);
}
-
hashMapListChildData.put(hashMapListHeaderData.get(i), childDataList);
}
}
adapter = new ExpandableListAdapter(this, hashMapListHeaderData, hashMapListChildData);
expandableListView.setAdapter(adapter);
-
//expand all
for (int i = 0; i < adapter.getGroupCount(); i++)
expandableListView.expandGroup(i);
@@ -489,23 +465,22 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
HashMap> listDataChildTemp = new HashMap<>();
for (int i = 0; i < listDataHeader.size(); i++) {
flag = true;
-
List listTemp = new ArrayList<>();
for (int j = 0; j < listDataChild.get(listDataHeader.get(i)).size(); j++) {
child_flag = true;
MSL_AvailabilityStockFacingGetterSetter data = listDataChild.get(listDataHeader.get(i)).get(j);
-
String stock = data.getStock();
String faceup = data.getFacing();
String defaultpricing = data.getPricing();
String pricing = data.getPricingStock();
-
+ String companyId = data.getCompany_id();
+ String must_have = data.getMust_have();
//Company_id
- if (listDataChild.get(listDataHeader.get(i)).get(j).getCompany_id().equals("1")) {
- if (data.getMust_have().equals("1")) {
+ if (companyId.equals("1")) {
+ if (must_have.equals("1")) {
//usk ksa pricing
if (!defaultpricing.equals("0")) {
- if (pricing.equals("")) {
+ if (!country_id.equals("17") && pricing.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
@@ -514,12 +489,11 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
flag = false;
child_flag = false;
Error_Message = getResources().getString(R.string.title_activity_stock_pricing);
-
}
}
- if (store_flag_hide.equals("0")) {
- if (faceup.equals("")) {
+ if (store_flag_hide.equals("0") && !country_id.equals("15")) {
+ if (!country_id.equals("17") && faceup.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
@@ -529,7 +503,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
child_flag = false;
Error_Message = getResources().getString(R.string.faceup_value);
} else {
- if (data.getToggleValue().equals("0")) {
+ if (data.getToggleValue().equals("0") && !country_id.equals("10")) {
if (stock.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
@@ -557,7 +531,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
}
}
} else {
- if (data.getToggleValue().equals("0")) {
+ if (data.getToggleValue().equals("0") && !country_id.equals("10")) {
if (stock.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
@@ -575,7 +549,6 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
- scrollPosition = i + j + childCount;
all_flag = false;
flag = false;
child_flag = false;
@@ -588,7 +561,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
}
} else {
if (store_flag_hide.equals("0")) {
- if (faceup.equals("")) {
+ if (country_id != null && !country_id.equals("17") && faceup.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
@@ -599,31 +572,12 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
Error_Message = getResources().getString(R.string.faceup_value);
}
}
- //usk
-/*
- if (!defaultpricing.equals("0")) {
- if (pricing.equals("")) {
- if (!checkHeaderArray.contains(i)) {
- checkHeaderArray.add(i);
- }
- scrollPosition = i + j + childCount;
- all_flag = false;
- flag = false;
- child_flag = false;
- Error_Message = getResources().getString(R.string.title_activity_stock_pricing);
- }
-
- }
-*/
-
}
-
if (!child_flag)
listTemp.add(data);
-
}
- if (flag == false) {
+ if (!flag) {
listDataHeaderTemp.add(listDataHeader.get(i));
listDataChildTemp.put(listDataHeader.get(i), listTemp);
} else {
@@ -632,7 +586,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
}
if (!all_flag) {
- adapter = new ExpandableListAdapter(this, listDataHeaderTemp, listDataChildTemp);
+ adapter = new ExpandableListAdapter(context, listDataHeaderTemp, listDataChildTemp);
expandableListView.setAdapter(adapter);
checkflag = false;
} else {
@@ -645,16 +599,12 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
@Override
public void onBackPressed() {
- //super.onBackPressed();
-
if (editFlag) {
- CommonFunctions.showAlertDialog(MSL_Availability_StockFacingActivity.this, getResources().getString(R.string.data_will_be_lost));
+ CommonFunctions.showAlertDialog(context, getResources().getString(R.string.data_will_be_lost));
} else {
finish();
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
}
-
-
}
public class ExpandableListAdapter extends BaseExpandableListAdapter {
@@ -697,45 +647,24 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
RelativeLayout rel_header = (RelativeLayout) convertView.findViewById(R.id.rel_categoryHeader);
ImageView img_camera = (ImageView) convertView.findViewById(R.id.img_camera);
CardView card_view = (CardView) convertView.findViewById(R.id.card_view);
-
txt_categoryHeader.setTypeface(null, Typeface.BOLD);
if (headerTitle.getCompany_id().equals("1")) {
- txt_categoryHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.header_text_color));
} else {
txt_categoryHeader.setTextColor(getResources().getColor(R.color.black));
}
txt_categoryHeader.setText(headerTitle.getSub_category() + "-" + headerTitle.getBrand());
-
if (!checkflag) {
if (checkHeaderArray.contains(groupPosition)) {
card_view.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.white));
} else {
card_view.setCardBackgroundColor(getResources().getColor(R.color.grey_background));
}
}
- //empty check color change
- /*if (headerTitle.getCompany_id().equals("1")) {
- if (!checkflag) {
- if (checkHeaderArray.contains(groupPosition)) {
- //card_view.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
- txt_categoryHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark));
- } else {
- txt_categoryHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
- }
- }
- } else {
- if (!checkflag) {
- if (checkHeaderArray.contains(groupPosition)) {
- txt_categoryHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark));
- } else {
- txt_categoryHeader.setTextColor(getResources().getColor(R.color.black));
- }
- }
- }*/
-
return convertView;
}
@@ -776,7 +705,6 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
holder.facing.setFilters(new InputFilter[]{new DecimalDigitsInputFilter(3, 1)});
holder.stock = (EditText) convertView.findViewById(R.id.ed_stock);
holder.ed_pricing = (EditText) convertView.findViewById(R.id.ed_pricing);
-
holder.facing_view = convertView.findViewById(R.id.facing_view);
holder.stock_view = convertView.findViewById(R.id.stock_view);
holder.pricing_view = convertView.findViewById(R.id.pricing_view);
@@ -784,42 +712,27 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
} else {
holder = (ViewHolder) convertView.getTag();
}
-
// uae facing hide
- if (store_flag_hide.equals("1")) {
+ if (store_flag_hide.equals("1") || country_id.equals("15") || country_id.equals("17")) {
holder.facing.setVisibility(View.GONE);
holder.facing_view.setVisibility(View.GONE);
} else {
holder.facing.setVisibility(View.VISIBLE);
holder.facing_view.setVisibility(View.VISIBLE);
}
- //usk
- if (childData.getPricing().equals("0")) {
- holder.ed_pricing.setVisibility(View.GONE);
- holder.pricing_view.setVisibility(View.GONE);
- holder.ed_pricing.setId(childPosition);
- holder.pricing_view.setId(childPosition);
- } else {
- holder.ed_pricing.setVisibility(View.VISIBLE);
- holder.pricing_view.setVisibility(View.VISIBLE);
- holder.ed_pricing.setId(childPosition);
- holder.pricing_view.setId(childPosition);
- }
-
holder.txt_skuName.setText(childData.getSku());
holder.txt_mbq.setText(childData.getMbq());
if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
- holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
-
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.light_green_background));
holder.txt_mbq.setVisibility(View.VISIBLE);
holder.toggle_available.setVisibility(View.VISIBLE);
- // holder.facing.setVisibility(View.VISIBLE);
-
- if (country_id.equals("6")) {
+ holder.toggle_available.setId(childPosition);
+ if (country_id.equals("6") || country_id.equals("10")) {
holder.stock.setVisibility(View.VISIBLE);
holder.stock_view.setVisibility(View.VISIBLE);
- } else {
+ }
+ else {
if (childData.getToggleValue().equals("1")) {
holder.stock.setVisibility(View.GONE);
holder.stock_view.setVisibility(View.GONE);
@@ -828,384 +741,245 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
holder.stock_view.setVisibility(View.VISIBLE);
}
}
-
-
} else {
-
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
holder.txt_mbq.setVisibility(View.GONE);
holder.toggle_available.setVisibility(View.GONE);
- // holder.facing.setVisibility(View.VISIBLE);
+ holder.toggle_available.setId(childPosition);
holder.stock.setVisibility(View.GONE);
holder.stock_view.setVisibility(View.GONE);
}
- if (childData.getCompany_id().equals("1")) {
+ if (country_id != null && !country_id.equals("17")) {
+ if (childData.getPricing().equals("0")) {
+ holder.ed_pricing.setVisibility(View.GONE);
+ holder.pricing_view.setVisibility(View.GONE);
+ holder.ed_pricing.setId(childPosition);
+ holder.pricing_view.setId(childPosition);
+ } else {
+ holder.ed_pricing.setVisibility(View.VISIBLE);
+ holder.pricing_view.setVisibility(View.VISIBLE);
+ holder.ed_pricing.setId(childPosition);
+ holder.pricing_view.setId(childPosition);
+ }
+ }
+ if (childData.getCompany_id().equals("1")) {
+ if (country_id != null && country_id.equals("17") && !childData.getPricing().equals("0")) {
+ holder.ed_pricing.setVisibility(View.VISIBLE);
+ holder.pricing_view.setVisibility(View.VISIBLE);
+ holder.ed_pricing.setId(childPosition);
+ holder.pricing_view.setId(childPosition);
+ } else {
+ holder.ed_pricing.setVisibility(View.GONE);
+ holder.pricing_view.setVisibility(View.GONE);
+ holder.ed_pricing.setId(childPosition);
+ holder.pricing_view.setId(childPosition);
+ }
if (childData.getMust_have().equals("1")) {
holder.txt_skuName.setTextColor(getResources().getColor(R.color.colorPrimary));
} else {
+ if (country_id != null && country_id.equals("17")) {
+ holder.toggle_available.setVisibility(View.VISIBLE);
+ holder.toggle_available.setId(childPosition);
+ }
holder.txt_skuName.setTextColor(getResources().getColor(R.color.blue));
}
-
} else {
+ if (country_id != null && country_id.equals("17")) {
+ holder.ed_pricing.setVisibility(View.GONE);
+ holder.pricing_view.setVisibility(View.GONE);
+ holder.ed_pricing.setId(childPosition);
+ holder.pricing_view.setId(childPosition);
+ holder.toggle_available.setVisibility(View.VISIBLE);
+ holder.toggle_available.setId(childPosition);
+ }
+
holder.txt_skuName.setTextColor(getResources().getColor(R.color.black));
}
-
final ViewHolder finalHolder = holder;
- holder.toggle_available.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
- @Override
- public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
- if (buttonView.isPressed()) {
-
- editFlag = true;
-
- if (isChecked) {
- childData.setToggleValue("1");
- //for Egypt
- if (country_id.equals("6")) {
- finalHolder.stock.setVisibility(View.VISIBLE);
- } else {
- finalHolder.stock.setVisibility(View.GONE);
- }
-
- /*childData.setStock("");
- childData.setFacing("");*/
+ holder.toggle_available.setOnCheckedChangeListener((buttonView, isChecked) -> {
+ if (buttonView.isPressed()) {
+ editFlag = true;
+ if (isChecked) {
+ childData.setToggleValue("1");
+ //for Egypt
+ finalHolder.stock.setVisibility(country_id != null && (country_id.equals("6")||country_id.equals("10")) ? View.VISIBLE : View.GONE);
+ } else {
+ childData.setToggleValue("0");
+ finalHolder.stock.setVisibility(country_id != null && country_id.equals("17") ? View.GONE : View.VISIBLE);
+ //If MBQ Value is 0
+ if (Integer.parseInt(childData.getMbq()) == 0) {
+ childData.setStock("0");
+ childData.setFacing("0");
} else {
- /* childData.setStock("");
- childData.setFacing("");*/
- childData.setToggleValue("0");
- finalHolder.stock.setVisibility(View.VISIBLE);
-
- //If MBQ Value is 0
- if (Integer.parseInt(childData.getMbq()) == 0) {
- childData.setStock("0");
- childData.setFacing("0");
- } else {
- //for Egypt
- if (country_id.equals("6")) {
- childData.setStock("");
- childData.setFacing("");
- }
+ //for Egypt
+ if (country_id.equals("6")|| country_id.equals("10")) {
+ childData.setStock("");
+ childData.setFacing("");
}
-
- /* else {
- if (finalHolder.facing.getText().toString() != null && !finalHolder.facing.getText().toString().equals("")) {
- if (Integer.parseInt(finalHolder.facing.getText().toString()) >= 0
- && Integer.parseInt(finalHolder.facing.getText().toString()) >= Integer.parseInt(childData.getMbq())) {
- childData.setFacing("");
- finalHolder.facing.setText("");
- }
- }
- }*/
}
-
- expandableListView.clearFocus();
- expandableListView.invalidateViews();
}
+ expandableListView.clearFocus();
+ expandableListView.invalidateViews();
}
});
if (childData.getToggleValue().equals("1")) {
holder.toggle_available.setChecked(true);
- if (country_id.equals("6") && childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
+ if ((country_id.equals("6")|| (country_id.equals("10"))) && childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
finalHolder.stock.setVisibility(View.VISIBLE);
} else {
finalHolder.stock.setVisibility(View.GONE);
childData.setStock("");
}
-
-
} else {
holder.toggle_available.setChecked(false);
- finalHolder.stock.setVisibility(View.VISIBLE);
+ finalHolder.stock.setVisibility((country_id != null && country_id.equals("17") && (!childData.getCompany_id().equals("1") || childData.getCompany_id().equals("1") && childData.getMust_have().equals("0"))) ? View.GONE : View.VISIBLE);
}
-
- holder.stock.setOnFocusChangeListener(new View.OnFocusChangeListener() {
- @Override
- public void onFocusChange(View v, boolean hasFocus) {
- final EditText caption = (EditText) v;
- String edStock = caption.getText().toString().replaceFirst("^0+(?!$)", "");
-
- /*if (!childData.getFacing().equals("") && Integer.parseInt(stock) >= 0 && Integer.parseInt(childData.getFacing()) < Integer.parseInt(stock)) {
-
- }*/
- editFlag = true;
- if (!edStock.equals("")) {
- String stock = edStock;
-
- //for Egypt
- if (country_id.equals("6") && childData.getToggleValue().equals("1")) {
- if (!childData.getFacing().equals("")) {
- if (Integer.parseInt(stock) >= 0 && Double.parseDouble(childData.getFacing()) <= Integer.parseInt(stock)) {
-
- childData.setStock(stock);
- } else {
- AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
- builder.setMessage(getString(R.string.check_faceup))
- .setCancelable(false)
- .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
+ holder.stock.setOnFocusChangeListener((v, hasFocus) -> {
+ final EditText caption = (EditText) v;
+ String edStock = caption.getText().toString().replaceFirst("^0+(?!$)", "");
+ editFlag = true;
+ if (!edStock.equals("")) {
+ String stock = edStock;
+ //for Egypt
+ if ((country_id.equals("6")||country_id.equals("10")) && childData.getToggleValue().equals("1")) {
+ if (!childData.getFacing().equals("")) {
+ if (Integer.parseInt(stock) >= 0 && Double.parseDouble(childData.getFacing()) <= Integer.parseInt(stock)) {
+ childData.setStock(stock);
+ } else {
+ AlertDialog.Builder builder = new AlertDialog.Builder(_context);
+ builder.setMessage(getString(R.string.check_faceup))
+ .setCancelable(false)
+ .setPositiveButton(getString(R.string.ok), (dialog, id) -> {
+ finalHolder.stock.setText("");
+ dialog.dismiss();
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
+ }
+ } else {
+ childData.setStock(stock);
+ }
+ } else {
+ int mbq = Integer.parseInt(childData.getMbq());
+ if (mbq != 0) {
+ if (Integer.parseInt(stock) >= 0 && Integer.parseInt(stock) < mbq) {
+ if (!childData.getFacing().equals("")) {
+ if (Integer.parseInt(stock) >= 0 && Double.parseDouble(childData.getFacing()) <= Integer.parseInt(stock)) {
+ childData.setStock(stock);
+ } else {
+ AlertDialog.Builder builder = new AlertDialog.Builder(_context);
+ builder.setMessage(getString(R.string.check_faceup))
+ .setCancelable(false)
+ .setPositiveButton(getString(R.string.ok), (dialog, id) -> {
finalHolder.stock.setText("");
dialog.dismiss();
-
- }
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
+ }
+ } else {
+ childData.setStock(stock);
+ }
+ } else {
+ if (isDialogOpen) {
+ isDialogOpen = !isDialogOpen;
+ AlertDialog.Builder builder = new AlertDialog.Builder(_context);
+ builder.setMessage(getString(R.string.check_stock))
+ .setCancelable(false)
+ .setPositiveButton(getString(R.string.ok), (dialog, id) -> {
+ finalHolder.stock.setText("");
+ dialog.dismiss();
+ isDialogOpen = !isDialogOpen;
});
AlertDialog alert = builder.create();
alert.show();
}
- } else {
- childData.setStock(stock);
}
} else {
- int mbq = Integer.parseInt(childData.getMbq());
- if (mbq != 0) {
- if (Integer.parseInt(stock) >= 0 && Integer.parseInt(stock) < mbq) {
-
- if (!childData.getFacing().equals("")) {
- if (Integer.parseInt(stock) >= 0 && Double.parseDouble(childData.getFacing()) <= Integer.parseInt(stock)) {
-
- childData.setStock(stock);
- } else {
- AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
- builder.setMessage(getString(R.string.check_faceup))
- .setCancelable(false)
- .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
- finalHolder.stock.setText("");
- dialog.dismiss();
-
- }
- });
- AlertDialog alert = builder.create();
- alert.show();
- }
- } else {
- childData.setStock(stock);
- }
- } else {
- if (isDialogOpen) {
- isDialogOpen = !isDialogOpen;
- AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
- builder.setMessage(getString(R.string.check_stock))
- .setCancelable(false)
- .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
- finalHolder.stock.setText("");
- dialog.dismiss();
- isDialogOpen = !isDialogOpen;
- }
- });
- AlertDialog alert = builder.create();
- alert.show();
- }
- }
- } else {
- if (Integer.parseInt(stock) > 0) {
- if (isDialogOpen) {
- isDialogOpen = !isDialogOpen;
- AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
- builder.setMessage(getString(R.string.check_stock))
- .setCancelable(false)
- .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
- finalHolder.stock.setText("");
- dialog.dismiss();
- isDialogOpen = !isDialogOpen;
- }
- });
- AlertDialog alert = builder.create();
- alert.show();
- }
+ if (Integer.parseInt(stock) > 0) {
+ if (isDialogOpen) {
+ isDialogOpen = !isDialogOpen;
+ AlertDialog.Builder builder = new AlertDialog.Builder(_context);
+ builder.setMessage(getString(R.string.check_stock))
+ .setCancelable(false)
+ .setPositiveButton(getString(R.string.ok), (dialog, id) -> {
+ finalHolder.stock.setText("");
+ dialog.dismiss();
+ isDialogOpen = !isDialogOpen;
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
}
}
}
- } else {
- childData.setStock("");
}
+ } else {
+ childData.setStock("");
}
});
holder.stock.setText(childData.getStock());
- holder.ed_pricing.setOnFocusChangeListener(new View.OnFocusChangeListener() {
- @Override
- public void onFocusChange(View v, boolean hasFocus) {
-
- if (!hasFocus) {
- final EditText Caption = (EditText) v;
- String value1 = Caption.getText().toString().replaceFirst("^0+(?!$)", "");
- if (value1.equals("")) {
- childData.setPricingStock("");
- finalHolder.ed_pricing.setText("");
- finalHolder.ed_pricing.setId(childPosition);
- } else {
- childData.setPricingStock(value1);
- finalHolder.ed_pricing.setText(value1);
- finalHolder.ed_pricing.setId(childPosition);
- }
+ holder.ed_pricing.setOnFocusChangeListener((v, hasFocus) -> {
+ if (!hasFocus) {
+ final EditText Caption = (EditText) v;
+ String value1 = Caption.getText().toString().replaceFirst("^0+(?!$)", "");
+ if (value1.equals("")) {
+ childData.setPricingStock("");
+ finalHolder.ed_pricing.setText("");
+ finalHolder.ed_pricing.setId(childPosition);
+ } else {
+ childData.setPricingStock(value1);
+ finalHolder.ed_pricing.setText(value1);
+ finalHolder.ed_pricing.setId(childPosition);
}
}
});
- holder.ed_pricing.setText(childData.getPricingStock());
+ holder.ed_pricing.setText(childData.getPricingStock());
final ViewHolder finalHolder1 = holder;
final ViewHolder finalHolder2 = holder;
- holder.facing.setOnFocusChangeListener(new View.OnFocusChangeListener() {
- @Override
- public void onFocusChange(View v, boolean hasFocus) {
- final EditText caption = (EditText) v;
- String edFaceup = caption.getText().toString().replaceFirst("^0+(?!$)", "");
-
- editFlag = true;
-
- if (edFaceup != null && !edFaceup.equals("") && !edFaceup.equals(".")) {
- //int num = Integer.parseInt(edFaceup);
- double faceup = Double.parseDouble(edFaceup);
- int num = (int) faceup;
- //int faceint = (int)(faceup - Math.floor( faceup ));
- int faceint = (int) ((faceup % 1.0) * 10);
- if (faceint != 0) {
- if ((faceup % 1.0) * 10 != 5) {
- faceint = 5;
- edFaceup = String.valueOf(num + faceint / 10.0);
- finalHolder2.facing.setText(edFaceup);
-
- }
+ holder.facing.setOnFocusChangeListener((v, hasFocus) -> {
+ final EditText caption = (EditText) v;
+ String edFaceup = caption.getText().toString().replaceFirst("^0+(?!$)", "");
+ editFlag = true;
+ if (edFaceup != null && !edFaceup.equals("") && !edFaceup.equals(".")) {
+ double faceup = Double.parseDouble(edFaceup);
+ int num = (int) faceup;
+ int faceint = (int) ((faceup % 1.0) * 10);
+ if (faceint != 0) {
+ if ((faceup % 1.0) * 10 != 5) {
+ faceint = 5;
+ edFaceup = String.valueOf(num + faceint / 10.0);
+ finalHolder2.facing.setText(edFaceup);
}
-
-
- /*Double faceup = Double.parseDouble(edFaceup);
- DecimalFormat twoDForm = new DecimalFormat(".#");
- faceup= Double.valueOf(twoDForm.format(faceup));*/
}
+ }
-
- boolean isFill = false;
-
- //Toggle is no selected
- if (childData.getToggleValue().equals("0")) {
-
- //if stock is emplty
- /*if (childData.getStock().equals("")) {
- AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
- builder.setMessage(getString(R.string.msl_availability_new_stock_value))
- .setCancelable(false)
- .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
- dialog.dismiss();
- }
- });
- AlertDialog alert = builder.create();
- alert.show();
- } else {*/
- if (edFaceup != null && !edFaceup.equals("") && !edFaceup.equals(".")) {
- int mbq = Integer.parseInt(childData.getMbq());
- if (mbq != 0) {
- if (Double.parseDouble(edFaceup) >= 0 && Double.parseDouble(edFaceup) < mbq) {
- if (!childData.getStock().equals("")) {
-
- //if (edFaceup != null && !edFaceup.equals("")) {
-
- String faceup = edFaceup.replaceFirst("^0+(?!$)", "");
-
- if (Double.parseDouble(faceup) <= Integer.parseInt(childData.getStock())) {
-
- isFill = true;
-
- /* if (!edFaceup.equals("")) {
- childData.setFacing(faceup);
- } else {
- childData.setFacing("");
- }*/
- } else {
- AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
- builder.setMessage(getString(R.string.check_faceup))
- .setCancelable(false)
- .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
- finalHolder1.facing.setText("");
- dialog.dismiss();
- finalHolder2.facing.setText("");
- }
- });
- AlertDialog alert = builder.create();
- alert.show();
- }
- // }
- } else {
- isFill = true;
- }
- } else {
- if (isDialogOpen) {
- isDialogOpen = !isDialogOpen;
- AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
- builder.setMessage(getString(R.string.check_faceing))
- .setCancelable(false)
- .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
- finalHolder.facing.setText("");
- dialog.dismiss();
- isDialogOpen = !isDialogOpen;
- }
- });
- AlertDialog alert = builder.create();
- alert.show();
- }
- }
- } else {
- if (Double.parseDouble(edFaceup) > 0) {
- if (isDialogOpen) {
- isDialogOpen = !isDialogOpen;
- AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
- builder.setMessage(getString(R.string.check_faceing))
- .setCancelable(false)
- .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
- finalHolder.facing.setText("");
- dialog.dismiss();
- isDialogOpen = !isDialogOpen;
- }
- });
- AlertDialog alert = builder.create();
- alert.show();
- }
- }
- }
-
- }
- //}
- } else {
-
- if (country_id.equals("6")) {
- if (!childData.getStock().equals("")) {
-
- //if (edFaceup != null && !edFaceup.equals("")) {
-
- String faceup = edFaceup.replaceFirst("^0+(?!$)", "");
-
- if (edFaceup != null && !edFaceup.equals("") && !edFaceup.equals(".")) {
+ boolean isFill = false;
+ //Toggle is no selected
+ if (childData.getToggleValue().equals("0")) {
+ if (edFaceup != null && !edFaceup.equals("") && !edFaceup.equals(".")) {
+ int mbq = Integer.parseInt(childData.getMbq());
+ if (mbq != 0) {
+ if (Double.parseDouble(edFaceup) >= 0 && Double.parseDouble(edFaceup) < mbq) {
+ if (!childData.getStock().equals("")) {
+ String faceup = edFaceup.replaceFirst("^0+(?!$)", "");
if (Double.parseDouble(faceup) <= Integer.parseInt(childData.getStock())) {
-
isFill = true;
-
- /* if (!edFaceup.equals("")) {
- childData.setFacing(faceup);
} else {
- childData.setFacing("");
- }*/
- } else {
- AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
+ AlertDialog.Builder builder = new AlertDialog.Builder(_context);
builder.setMessage(getString(R.string.check_faceup))
.setCancelable(false)
- .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
- finalHolder1.facing.setText("");
- dialog.dismiss();
- finalHolder2.facing.setText("");
- }
+ .setPositiveButton(getString(R.string.ok), (dialog, id) -> {
+ finalHolder1.facing.setText("");
+ dialog.dismiss();
+ finalHolder2.facing.setText("");
});
AlertDialog alert = builder.create();
alert.show();
@@ -1213,63 +987,89 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
} else {
isFill = true;
}
- // }
+ } else {
+ if (isDialogOpen) {
+ isDialogOpen = !isDialogOpen;
+ AlertDialog.Builder builder = new AlertDialog.Builder(_context);
+ builder.setMessage(getString(R.string.check_faceing))
+ .setCancelable(false)
+ .setPositiveButton(getString(R.string.ok), (dialog, id) -> {
+ finalHolder.facing.setText("");
+ dialog.dismiss();
+ isDialogOpen = !isDialogOpen;
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
+ }
+ }
+ } else {
+ if (Double.parseDouble(edFaceup) > 0) {
+ if (isDialogOpen) {
+ isDialogOpen = !isDialogOpen;
+ AlertDialog.Builder builder = new AlertDialog.Builder(_context);
+ builder.setMessage(getString(R.string.check_faceing))
+ .setCancelable(false)
+ .setPositiveButton(getString(R.string.ok), (dialog, id) -> {
+ finalHolder.facing.setText("");
+ dialog.dismiss();
+ isDialogOpen = !isDialogOpen;
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
+ }
+ }
+ }
+
+ }
+ } else {
+ if (country_id.equals("6")|| country_id.equals("10")) {
+ if (!childData.getStock().equals("")) {
+ String faceup = edFaceup.replaceFirst("^0+(?!$)", "");
+ if (edFaceup != null && !edFaceup.equals("") && !edFaceup.equals(".")) {
+ if (Double.parseDouble(faceup) <= Integer.parseInt(childData.getStock())) {
+ isFill = true;
+ } else {
+ AlertDialog.Builder builder = new AlertDialog.Builder(_context);
+ builder.setMessage(getString(R.string.check_faceup))
+ .setCancelable(false)
+ .setPositiveButton(getString(R.string.ok), (dialog, id) -> {
+ finalHolder1.facing.setText("");
+ dialog.dismiss();
+ finalHolder2.facing.setText("");
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
+ }
} else {
isFill = true;
}
} else {
isFill = true;
}
-
+ } else {
+ isFill = true;
}
- /* //If toggle is yes then facing cannot be 0
- if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")
- && !edFaceup.equals("") && edFaceup.equals("0")) {
+ }
- AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
- builder.setMessage(getString(R.string.check_faceup_not_zero))
- .setCancelable(false)
- .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
- finalHolder1.facing.setText("");
- dialog.dismiss();
-
- }
- });
- AlertDialog alert = builder.create();
- alert.show();
+ if (isFill) {
+ if (!edFaceup.equals("") && !edFaceup.equals(".")) {
+ String faceup = "";
+ if (edFaceup.equals("0") || edFaceup.equals(".0")) {
+ faceup = "0";
} else {
- isFill = true;
-
- }*/
-
-
- if (isFill) {
- if (!edFaceup.equals("") && !edFaceup.equals(".")) {
- String faceup = "";
- if (edFaceup.equals("0") || edFaceup.equals(".0")) {
- faceup = "0";
- } else {
- faceup = edFaceup.replaceFirst("^0+(?!$)", "");
- //faceup = new DecimalFormat("##.#").format(Double.parseDouble(faceup));
- }
-
- // String str2 = PerfectDecimal(faceup, 3, 1);
- childData.setFacing(faceup);
- } else {
- childData.setFacing("");
+ faceup = edFaceup.replaceFirst("^0+(?!$)", "");
}
+ childData.setFacing(faceup);
+ } else {
+ childData.setFacing("");
}
-
}
});
holder.facing.setText(childData.getFacing());
-
//empty check color change
if (!checkflag) {
boolean tempflag = false;
-
//usk pricing
if (!childData.getPricing().equals("0")) {
if (holder.ed_pricing.getText().toString().equals("")) {
@@ -1280,9 +1080,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
}
}
-
if (childData.getCompany_id().equals("1")) {
-
if (childData.getToggleValue().equals("0")) {
if (holder.stock.getText().toString().equals("")) {
holder.stock.setBackgroundColor(getResources().getColor(R.color.white));
@@ -1303,14 +1101,8 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
holder.facing.setBackgroundColor(getResources().getColor(R.color.white));
holder.facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
holder.facing.setHint(getString(R.string.empty));
-
-/* if (childData.getCompany_id().equals("1") && !childData.getMust_have().equals("0")) {
- }else{
- holder.facing.setHint("");
- }*/
tempflag = true;
}
-
//for Egypt
if (country_id.equals("6")) {
if (holder.stock.getText().toString().equals("")) {
@@ -1320,7 +1112,6 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
tempflag = true;
}
}
-
} else {
holder.facing.setHint("");
}
@@ -1328,12 +1119,10 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
if (tempflag) {
- //holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
- holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.lin_category.setBackgroundResource(R.drawable.cardview_error_border);
} else {
- //holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
- holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.light_green_background));
} else {
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
}
@@ -1346,14 +1135,11 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
tempflag = true;
}
-
if (tempflag) {
- //holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
- holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.lin_category.setBackgroundResource(R.drawable.cardview_error_border);
} else {
- //holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
- holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.light_green_background));
} else {
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
}
@@ -1432,7 +1218,6 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
}
public class DecimalDigitsInputFilter implements InputFilter {
-
Pattern mPattern;
public DecimalDigitsInputFilter(int digitsBeforeZero, int digitsAfterZero) {
@@ -1441,12 +1226,15 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
@Override
public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
-
Matcher matcher = mPattern.matcher(dest);
if (!matcher.matches())
return "";
return null;
}
+ }
+ private void updateCoverage(String table) {
+ long l = db.updateStockMapping(store_id, visit_date, table);
+ if (l > 0) Log.e("CoverageUpdate", "" + l);
}
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/OrderConfirmActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/OrderConfirmActivity.java
new file mode 100644
index 0000000..52b90fd
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/OrderConfirmActivity.java
@@ -0,0 +1,197 @@
+package cpm.com.gskmtorange.gsk_dailyentry;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.google.firebase.crashlytics.internal.common.CrashlyticsCore;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Locale;
+
+import cpm.com.gskmtorange.Database.GSKOrangeDB;
+import cpm.com.gskmtorange.GetterSetter.OrderReceivedStatus;
+import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
+import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.dailyentry.OrderTakingActivity;
+import cpm.com.gskmtorange.xmlGetterSetter.JourneyPlanGetterSetter;
+
+public class OrderConfirmActivity extends AppCompatActivity {
+ RecyclerView recyclerview;
+ GSKOrangeDB db;
+ String visit_date, username, intime;
+ private SharedPreferences preferences;
+ JourneyPlanGetterSetter jcpGetset;
+ Recycler_view_adapter adapter;
+ ArrayList inserteslistData;
+ private Dialog dialog;
+ private boolean ResultFlag;
+ Context context;
+ LinearLayout poLL;
+ TextView sys_gen_poTV;
+ String storeid;
+ String categoryName="",categoryId="";
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_order_confirm);
+ context = this;
+ Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ preferences = PreferenceManager.getDefaultSharedPreferences(this);
+ //toolbar.setTitle("Order Status" + "-"+"PO List");
+ toolbar.setTitle(context.getString(R.string.order_status_polist));
+ setSupportActionBar(toolbar);
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+ declaration();
+ }
+
+ private void declaration() {
+ recyclerview = (RecyclerView) findViewById(R.id.recyclerview);
+ db = new GSKOrangeDB(this);
+ db.open();
+
+ //Intent data
+ categoryName = getIntent().getStringExtra("categoryName");
+ categoryId = getIntent().getStringExtra("categoryId");
+
+ storeid = preferences.getString(CommonString.KEY_STORE_ID, null);
+ setDataToListView();
+ }
+
+ private void setDataToListView() {
+ try {
+ db.open();
+ inserteslistData=db.getOrderstatusData(storeid,categoryId);
+ if(inserteslistData.size()>0){
+ adapter = new Recycler_view_adapter(context, inserteslistData);
+ recyclerview.setAdapter(adapter);
+ recyclerview.setLayoutManager(new LinearLayoutManager(context));
+ adapter.notifyDataSetChanged();
+ }
+ } catch (Exception e) {
+ }
+ }
+
+ public class Recycler_view_adapter extends RecyclerView.Adapter{
+ ArrayList orderReceivedStatuses;
+ Context context;
+ public Recycler_view_adapter(Context context, ArrayList list) {
+ this.context = context;
+ this.orderReceivedStatuses = list;
+ }
+
+ @NonNull
+ @Override
+ public Recycler_view_adapter.Viewholder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
+ View view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.order_status_item_layout,viewGroup,false);
+ return new Viewholder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull final Recycler_view_adapter.Viewholder viewholder, final int pos) {
+ final OrderReceivedStatus current = orderReceivedStatuses.get(pos);
+ viewholder.sys_gen_poTV.setText(current.getSys_gen_po());
+ viewholder.podateTV.setText(current.getPodate());
+ viewholder.storepoTV.setText(current.getStorepo());
+
+ viewholder.lineItemTV.setText( ""+current.getORDERQTY());
+ if(current.getStatus().equalsIgnoreCase("CONFIRMED")){
+ viewholder.statusTV.setText(context.getString(R.string.confirmed));
+ }
+ else if(current.getStatus().equalsIgnoreCase("CONFIRM")){
+ viewholder.statusTV.setText(context.getString(R.string.confirmed));
+ }
+ else if(current.getStatus().equalsIgnoreCase("NOT CONFIRMED")){
+ viewholder.statusTV.setText(context.getString(R.string.not_confirmed));
+ }
+ else if(current.getStatus().equalsIgnoreCase("PENDING")){
+ viewholder.statusTV.setText(context.getString(R.string.pending));
+ }
+ else{
+ viewholder.statusTV.setText(current.getStatus());
+ }
+
+ viewholder.cardview.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ startActivity(new Intent(OrderConfirmActivity.this,OrderStatusDetailActivity.class).putExtra("categoryId",String.valueOf(current.getCATEGORY_ID()))
+ .putExtra("SYS_PO_NUM",current.getSys_gen_po())
+ .putExtra("PO_NUM",current.getStorepo())
+ .putExtra("PO_DATE",current.getPodate())
+ .putExtra("POID",String.valueOf(current.getPOID()))
+ .putExtra("LINE",String.valueOf(current.getORDERQTY())));
+ overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+ }
+ });
+ }
+
+ @Override
+ public int getItemCount() {
+ return orderReceivedStatuses.size();
+ }
+
+ public class Viewholder extends RecyclerView.ViewHolder {
+ TextView sys_gen_poTV,storepoTV,podateTV,lineItemTV,statusTV;
+ CardView cardview;
+ LinearLayout storepoLL;
+ public Viewholder(@NonNull View itemView) {
+ super(itemView);
+ cardview= (CardView) itemView.findViewById(R.id.cardview);
+ storepoLL= itemView.findViewById(R.id.storepoLL);
+ sys_gen_poTV= itemView.findViewById(R.id.sys_gen_poTV);
+ storepoTV= itemView.findViewById(R.id.storepoTV);
+ podateTV= itemView.findViewById(R.id.podateTV);
+ lineItemTV= itemView.findViewById(R.id.lineItemTV);
+ statusTV= itemView.findViewById(R.id.statusTV);
+ }
+ }
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+ //return super.onOptionsItemSelected(item);
+ int id = item.getItemId();
+ if (id == android.R.id.home) {
+ finish();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+ }
+ return super.onOptionsItemSelected(item);
+ }
+
+ @Override
+ public void onBackPressed() {
+ // super.onBackPressed();
+ finish();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ }
+}
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/OrderStatusDetailActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/OrderStatusDetailActivity.java
new file mode 100644
index 0000000..e23ecaf
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/OrderStatusDetailActivity.java
@@ -0,0 +1,1040 @@
+package cpm.com.gskmtorange.gsk_dailyentry;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.cardview.widget.CardView;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.os.Environment;
+import android.preference.PreferenceManager;
+import android.text.InputFilter;
+import android.text.Spanned;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.AbsListView;
+import android.widget.BaseExpandableListAdapter;
+import android.widget.CompoundButton;
+import android.widget.EditText;
+import android.widget.ExpandableListView;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+import android.widget.ToggleButton;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import cpm.com.gskmtorange.Database.GSKOrangeDB;
+import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
+import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.dailyentry.OrderTakingActivity;
+import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.StockFacing_PlanogramTrackerDataGetterSetter;
+
+public class OrderStatusDetailActivity extends AppCompatActivity{
+ ExpandableListView expandableListView;
+ private Context context;
+ TextView txt_mslAvailabilityName;
+ ArrayList headerDataList;
+ ArrayList childDataList;
+ List hashMapListHeaderData;
+ HashMap> hashMapListChildData;
+ List checkHeaderArray = new ArrayList<>();
+ boolean checkflag = true; ExpandableListAdapter adapter;
+ ImageView camera1, camera2, camera3, camera4;
+ LinearLayout lin_camera1, lin_camera2, lin_camera3, lin_camera4;
+ GSKOrangeDB db;
+ String categoryName, categoryId, storeId, Error_Message = "";
+ String store_id, store_flag_hide, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow, country_id, store_flag_str;
+ boolean isDialogOpen = true;
+ private SharedPreferences preferences;
+ int scrollPosition = 0;
+
+ String str_planogram = "", _pathforcheck = "";
+ EditText storepoET,podateET;
+
+ ArrayList planogramShelfHeaderDataList = new ArrayList<>();
+ ArrayList planogramSkuChildDataList;
+ HashMap> planogramHashMapListChildData = new HashMap<>();
+ boolean editFlag = false;
+ //temp
+ public static final String FILE_PATH = Environment.getExternalStorageDirectory() + "/";
+ //ImageView bmImage;
+ RelativeLayout view;
+ RadioButton radio_yes,radio_no;
+ RadioGroup radio_group;
+ String isExist="";
+ String sys_po_number="";
+ TextView sys_gen_poTV,lineitemTV;
+ LinearLayout poLL;
+ String storepo ="";
+ TextView storepoTV,podateTV;
+ String SYS_PO_NUM,PO_NUM,PO_DATE,LINE,POID;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ context = this;
+ try {
+ setContentView(R.layout.activity_order_status_detail);
+ Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ expandableListView = (ExpandableListView) findViewById(R.id.expandableListView);
+ txt_mslAvailabilityName = (TextView) findViewById(R.id.txt_mslAvailabilityName);
+ camera1 = (ImageView) findViewById(R.id.img_camera1);
+ camera2 = (ImageView) findViewById(R.id.img_camera2);
+ camera3 = (ImageView) findViewById(R.id.img_camera3);
+ camera4 = (ImageView) findViewById(R.id.img_camera4);
+ storepoTV = findViewById(R.id.storepoTV);
+ lineitemTV = findViewById(R.id.lineitemTV);
+ podateTV = findViewById(R.id.podateTV);
+ poLL = findViewById(R.id.poLL);
+
+ sys_gen_poTV = findViewById(R.id.sys_gen_poTV);
+ podateTV = findViewById(R.id.podateTV);
+
+ lin_camera1 = (LinearLayout) findViewById(R.id.lin_camera1);
+ lin_camera2 = (LinearLayout) findViewById(R.id.lin_camera2);
+ lin_camera3 = (LinearLayout) findViewById(R.id.lin_camera3);
+ lin_camera4 = (LinearLayout) findViewById(R.id.lin_camera4);
+ context = this;
+ db = new GSKOrangeDB(this);
+ db.open();
+
+ //preference data
+ preferences = PreferenceManager.getDefaultSharedPreferences(this);
+ CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
+ store_flag_hide = preferences.getString(CommonString.KEY_STORE_FLAG_FACING_HIDE, null);
+
+ visit_date = preferences.getString(CommonString.KEY_DATE, null);
+ date = preferences.getString(CommonString.KEY_DATE, null);
+ username = preferences.getString(CommonString.KEY_USERNAME, null);
+ intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, "");
+ keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
+ class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
+ storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
+ camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, "");
+ country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, "");
+ store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null);
+
+
+ //Intent data
+ categoryName = getIntent().getStringExtra("categoryName");
+ categoryId = getIntent().getStringExtra("categoryId");
+ SYS_PO_NUM = getIntent().getStringExtra("SYS_PO_NUM");
+ PO_NUM = getIntent().getStringExtra("PO_NUM");
+ PO_DATE = getIntent().getStringExtra("PO_DATE");
+ LINE = getIntent().getStringExtra("LINE");
+ POID = getIntent().getStringExtra("POID");
+ // Log.e("poid",POID);
+ // Log.e("podetai",SYS_PO_NUM + ","+PO_NUM + ","+PO_DATE + ","+LINE);
+
+ // toolbar.setTitle("Order Status" + "-"+"Entry");
+ toolbar.setTitle(context.getString(R.string.order_status_entry));
+ setSupportActionBar(toolbar);
+
+ sys_gen_poTV.setText(SYS_PO_NUM);
+ storepoTV.setText(PO_NUM);
+ podateTV.setText(PO_DATE);
+ lineitemTV.setText(LINE);
+
+ // Log.e("sys_po_num",sys_po_number +","+timeMilli);
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+ str_planogram = CommonString.FILE_PATH_PLANOGRAM;
+
+ prepareList();
+
+ //Camera
+ // prepareDefaultList();
+
+ // cameraMethod();
+
+ final FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+
+ fab.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(final View view) {
+ expandableListView.clearFocus();
+ adapter.notifyDataSetChanged();
+
+ if (validateData(hashMapListHeaderData, hashMapListChildData)) {
+ db.open();
+ if (db.checkOrder_Received_Data(store_id, categoryId)) {
+ db.updateOrder_Received_data(storepoTV.getText().toString(), sys_gen_poTV.getText().toString(), podateTV.getText().toString(), store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
+ Toast.makeText(context, getResources().getString(R.string.update_message), Toast.LENGTH_SHORT).show();
+ } else {
+ db.InsertOrderReceivedStatusData(POID, storepoTV.getText().toString(), sys_gen_poTV.getText().toString(), podateTV.getText().toString(), store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
+ Toast.makeText(context, getResources().getString(R.string.save_message), Toast.LENGTH_SHORT).show();
+ }
+ finish();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+
+ /* String order_received_xml = "";
+ String onXML = "";
+
+ ArrayList orderreceiveddata = db.getOrder_RECEIVED_UploadServerData(store_id);
+
+ if (orderreceiveddata.size() > 0) {
+ for (int j = 0; j < orderreceiveddata.size(); j++) {
+ onXML = "[ORDER_CONFIRM]"
+ + "[MID]" + 0 + "[/MID]"
+ + "[USERID]" + username + "[/USERID]"
+ + "[CATEGORY_ID]" + orderreceiveddata.get(j).getCategory_id() + "[/CATEGORY_ID]"
+ + "[PO_DATE]" + orderreceiveddata.get(j).getPO_Date() + "[/PO_DATE]"
+ + "[POID]" + orderreceiveddata.get(j).getPOID() + "[/POID]"
+ + "[SKU_ID]" + orderreceiveddata.get(j).getSku_id() + "[/SKU_ID]"
+ + "[PO_QTY]" + orderreceiveddata.get(j).getOrderqty() + "[/PO_QTY]"
+ + "[ACTUAL_QTY]" + orderreceiveddata.get(j).getFacing() + "[/ACTUAL_QTY]" +
+ "[/ORDER_CONFIRM]";
+
+ order_received_xml = order_received_xml + onXML;
+ }
+
+ final String sos_xml = "[DATA]" + order_received_xml + "[/DATA]";
+ Log.e("order_xml", sos_xml);
+
+ } */
+
+ }
+ else{
+ for (int i = 0; i < adapter.getGroupCount(); i++)
+ expandableListView.expandGroup(i);
+ }
+
+ }
+ });
+
+ expandableListView.setOnScrollListener(new AbsListView.OnScrollListener() {
+ @Override
+ public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
+
+ expandableListView.invalidate();
+
+ int lastItem = firstVisibleItem + visibleItemCount;
+
+ if (firstVisibleItem == 0) {
+ fab.show();//.setVisibility(View.VISIBLE);
+ } else if (lastItem == totalItemCount) {
+ fab.hide();//setVisibility(View.INVISIBLE);
+ } else {
+ fab.show();//setVisibility(View.VISIBLE);
+ }
+ }
+
+ @Override
+ public void onScrollStateChanged(AbsListView arg0, int arg1) {
+ InputMethodManager inputManager = (InputMethodManager) context
+ .getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (getCurrentFocus() != null) {
+ inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+ getCurrentFocus().clearFocus();
+ }
+ expandableListView.invalidateViews();
+ }
+ });
+
+ // Listview Group click listener
+ expandableListView.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() {
+ @Override
+ public boolean onGroupClick(ExpandableListView parent, View v, int groupPosition, long id) {
+ return false;
+ }
+ });
+
+ // Listview Group expanded listener
+ expandableListView.setOnGroupExpandListener(new ExpandableListView.OnGroupExpandListener() {
+ @Override
+ public void onGroupExpand(int groupPosition) {
+ InputMethodManager inputManager = (InputMethodManager) context
+ .getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (getWindow().getCurrentFocus() != null) {
+ inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+ getCurrentFocus().clearFocus();
+ }
+ }
+ });
+
+ // Listview Group collasped listener
+ expandableListView.setOnGroupCollapseListener(new ExpandableListView.OnGroupCollapseListener() {
+ @Override
+ public void onGroupCollapse(int groupPosition) {
+ InputMethodManager inputManager = (InputMethodManager) context
+ .getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (getWindow().getCurrentFocus() != null) {
+ inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+ getCurrentFocus().clearFocus();
+ }
+ }
+ });
+
+ // Listview on child click listener
+ expandableListView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() {
+ @Override
+ public boolean onChildClick(ExpandableListView parent, View v, int groupPosition,
+ int childPosition, long id) {
+ return false;
+ }
+ });
+ } catch (Resources.NotFoundException e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ boolean validateData(List listDataHeader,
+ HashMap> listDataChild) {
+ boolean flag = true, child_flag = true, all_flag = true;
+ checkHeaderArray.clear();
+ int childCount = 0;
+ //temp list data for empty only
+ List listDataHeaderTemp = new ArrayList<>();
+ HashMap> listDataChildTemp = new HashMap<>();
+ for (int i = 0; i < listDataHeader.size(); i++) {
+ flag = true;
+
+ List listTemp = new ArrayList<>();
+ for (int j = 0; j < listDataChild.get(listDataHeader.get(i)).size(); j++) {
+ child_flag = true;
+ MSL_AvailabilityStockFacingGetterSetter data = listDataChild.get(listDataHeader.get(i)).get(j);
+
+ String faceup = data.getFacing();
+ // Log.e("facevalue",faceup);
+
+ //Company_id
+ if (listDataChild.get(listDataHeader.get(i)).get(j).getCompany_id().equals("1")) {
+ if (store_flag_hide.equals("0")) {
+ if (faceup.equals("")) {
+ if (!checkHeaderArray.contains(i)) {
+ checkHeaderArray.add(i);
+ }
+ // scrollPosition = i + j + childCount;
+ all_flag = false;
+ flag = false;
+ child_flag = false;
+ Error_Message = getResources().getString(R.string.faceup_value);
+ // Toast.makeText(context, getResources().getString(R.string.faceup_value), Toast.LENGTH_SHORT).show();
+ Toast.makeText(context, getResources().getString(R.string.pls_fill_order_qty), Toast.LENGTH_SHORT).show();
+ }
+ }
+ }
+
+ if (!child_flag)
+ listTemp.add(data);
+ }
+
+ if (flag == false) {
+ listDataHeaderTemp.add(listDataHeader.get(i));
+ // listDataChildTemp.put(listDataHeader.get(i), listTemp);
+ } else {
+ childCount = childCount + listDataChild.get(listDataHeader.get(i)).size();
+ }
+ }
+
+ if (!all_flag) {
+ adapter.notifyDataSetChanged();
+ /*adapter = new ExpandableListAdapter(this, listDataHeaderTemp, listDataChildTemp);
+ expandableListView.setAdapter(adapter);*/
+ checkflag = false;
+ } else {
+ checkflag = true;
+ }
+ return all_flag;
+ }
+
+ private void prepareList() {
+ // Log.e("store_flag_hide",store_flag_hide);
+ try {
+ hashMapListHeaderData = new ArrayList<>();
+ hashMapListChildData = new HashMap<>();
+
+ //Header
+ if (country_id.equals("7") || country_id.equals("8")) {
+ // Log.e("childlistsize2", String.valueOf(headerDataList.size()));
+ headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE, CommonString.TABLE_MAPPING_SOS_TARGET, store_flag_hide);
+ } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
+ // Log.e("childlistsize1", String.valueOf(headerDataList.size()));
+ headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC, CommonString.TABLE_MAPPING_SOS_TARGET_ADHOC, store_flag_hide);
+ } else {
+ //Log.e("categorydata",categoryId + ","+keyAccount_id + ","+storeType_id+","+class_id+","+store_id);
+ headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK, CommonString.TABLE_MAPPING_SOS_TARGET, store_flag_hide);
+ // Log.e("childlistsize", String.valueOf(headerDataList.size()));
+ }
+
+ if (headerDataList.size() > 0) {
+ for (int i = 0; i < headerDataList.size(); i++) {
+ hashMapListHeaderData.add(headerDataList.get(i));
+ //childDataList = new ArrayList<>();
+ childDataList = db.getOrder_RECEIVED_SKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
+ if (!(childDataList.size() > 0)) {
+ if (country_id.equals("7") || country_id.equals("8")) {
+ childDataList = db.getOrderReceivedSKUData(headerDataList.get(i).getSub_category_id(), categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE, store_flag_hide);
+ } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
+ childDataList = db.getOrderReceivedSKUData(headerDataList.get(i).getSub_category_id(), categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC, store_flag_hide);
+ } else {
+ //childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(), categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK, store_flag_hide);
+ childDataList = db.getOrderReceivedSKUData(headerDataList.get(i).getSub_category_id(), categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK, store_flag_hide);
+ }
+ }
+ else{
+
+ }
+ hashMapListChildData.put(hashMapListHeaderData.get(i), childDataList);
+ }
+ }
+
+ adapter = new ExpandableListAdapter(this, hashMapListHeaderData, hashMapListChildData);
+ expandableListView.setAdapter(adapter);
+
+ //expand all
+ for (int i = 0; i < adapter.getGroupCount(); i++)
+ expandableListView.expandGroup(i);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ public class ExpandableListAdapter extends BaseExpandableListAdapter {
+ private Context _context;
+ private List _listDataHeader;
+ private HashMap> _listDataChild;
+
+ public ExpandableListAdapter(Context context, List listDataHeader,
+ HashMap> listChildData) {
+ this._context = context;
+ this._listDataHeader = listDataHeader;
+ this._listDataChild = listChildData;
+ }
+
+ @Override
+ public Object getGroup(int groupPosition) {
+ return this._listDataHeader.get(groupPosition);
+ }
+
+ @Override
+ public int getGroupCount() {
+ return this._listDataHeader.size();
+ }
+
+ @Override
+ public long getGroupId(int groupPosition) {
+ return groupPosition;
+ }
+
+ @Override
+ public View getGroupView(final int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) {
+ MSL_AvailabilityStockFacingGetterSetter headerTitle = (MSL_AvailabilityStockFacingGetterSetter) getGroup(groupPosition);
+
+ if (convertView == null) {
+ LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ convertView = infalInflater.inflate(R.layout.item_order_taking, null, false);
+ }
+
+ TextView txt_categoryHeader = (TextView) convertView.findViewById(R.id.txt_categoryHeader);
+ RelativeLayout rel_header = (RelativeLayout) convertView.findViewById(R.id.rel_categoryHeader);
+ ImageView img_camera = (ImageView) convertView.findViewById(R.id.img_camera);
+ CardView card_view = (CardView) convertView.findViewById(R.id.card_view);
+
+ txt_categoryHeader.setTypeface(null, Typeface.BOLD);
+
+ if (headerTitle.getCompany_id().equals("1")) {
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+ } else {
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.black));
+ }
+ txt_categoryHeader.setText(headerTitle.getSub_category() + "-" + headerTitle.getBrand());
+
+
+ if (!checkflag) {
+ if (checkHeaderArray.contains(groupPosition)) {
+ card_view.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ } else {
+ card_view.setCardBackgroundColor(getResources().getColor(R.color.grey_background));
+ }
+ }
+
+ //empty check color change
+ /*if (headerTitle.getCompany_id().equals("1")) {
+ if (!checkflag) {
+ if (checkHeaderArray.contains(groupPosition)) {
+ //card_view.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ txt_categoryHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark));
+ } else {
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+ }
+ }
+ } else {
+ if (!checkflag) {
+ if (checkHeaderArray.contains(groupPosition)) {
+ txt_categoryHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark));
+ } else {
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.black));
+ }
+ }
+ }*/
+
+ return convertView;
+ }
+
+ @Override
+ public Object getChild(int groupPosition, int childPosititon) {
+ return this._listDataChild.get(this._listDataHeader.get(groupPosition)).get(childPosititon);
+ }
+
+ @Override
+ public int getChildrenCount(int groupPosition) {
+ return this._listDataChild.get(this._listDataHeader.get(groupPosition)).size();
+ }
+
+ @Override
+ public long getChildId(int groupPosition, int childPosition) {
+ return childPosition;
+ }
+
+ @Override
+ public View getChildView(final int groupPosition, final int childPosition, boolean isLastChild,
+ View convertView, ViewGroup parent) {
+
+ final MSL_AvailabilityStockFacingGetterSetter childData =
+ (MSL_AvailabilityStockFacingGetterSetter) getChild(groupPosition, childPosition);
+ OrderStatusDetailActivity.ViewHolder holder = null;
+
+ if (convertView == null) {
+ LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ convertView = infalInflater.inflate(R.layout.item_order_received_status_child, null, false);
+ holder = new OrderStatusDetailActivity.ViewHolder();
+ holder.cardView = (CardView) convertView.findViewById(R.id.card_view);
+ holder.lin_category = (LinearLayout) convertView.findViewById(R.id.lin_category);
+ holder.txt_skuName = (TextView) convertView.findViewById(R.id.txt_skuName);
+ holder.poqtyTV = (TextView) convertView.findViewById(R.id.poqtyTV);
+ holder.txt_mbq = (TextView) convertView.findViewById(R.id.txt_mbq);
+ holder.toggle_available = (ToggleButton) convertView.findViewById(R.id.toggle_available);
+ holder.facing = (EditText) convertView.findViewById(R.id.ed_facing);
+ holder.facing.setFilters(new InputFilter[]{new OrderStatusDetailActivity.DecimalDigitsInputFilter(3, 1)});
+ holder.stock = (EditText) convertView.findViewById(R.id.ed_stock);
+ holder.ed_pricing = (EditText) convertView.findViewById(R.id.ed_pricing);
+
+ holder.facing_view = convertView.findViewById(R.id.facing_view);
+ holder.stock_view = convertView.findViewById(R.id.stock_view);
+ holder.pricing_view = convertView.findViewById(R.id.pricing_view);
+ convertView.setTag(holder);
+ } else {
+ holder = (OrderStatusDetailActivity.ViewHolder) convertView.getTag();
+ }
+
+ holder.poqtyTV.setText(context.getString(R.string.po_qty) + ":"+childData.getOrderqty());
+ // holder.poqtyTV.setText("PO QTY" + ":"+childData.getOrderqty());
+ // uae facing hide
+ /*if (store_flag_hide.equals("1")) {
+ holder.facing.setVisibility(View.GONE);
+ holder.facing_view.setVisibility(View.GONE);
+ } else {
+ holder.facing.setVisibility(View.VISIBLE);
+ holder.facing_view.setVisibility(View.VISIBLE);
+ }*/
+ //usk
+ /* if (childData.getPricing().equals("0")) {
+ holder.ed_pricing.setVisibility(View.GONE);
+ holder.pricing_view.setVisibility(View.GONE);
+ holder.ed_pricing.setId(childPosition);
+ holder.pricing_view.setId(childPosition);
+ } else {
+ holder.ed_pricing.setVisibility(View.VISIBLE);
+ holder.pricing_view.setVisibility(View.VISIBLE);
+ holder.ed_pricing.setId(childPosition);
+ holder.pricing_view.setId(childPosition);
+ }*/
+
+ holder.txt_skuName.setText(childData.getSku());
+ // holder.txt_mbq.setText(childData.getMbq());
+
+ /* if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
+
+ //holder.txt_mbq.setVisibility(View.VISIBLE);
+ holder.toggle_available.setVisibility(View.VISIBLE);
+ // holder.facing.setVisibility(View.VISIBLE);
+ if (country_id.equals("6")) {
+ holder.stock.setVisibility(View.VISIBLE);
+ holder.stock_view.setVisibility(View.VISIBLE);
+ } else {
+ if (childData.getToggleValue().equals("1")) {
+ holder.stock.setVisibility(View.GONE);
+ holder.stock_view.setVisibility(View.GONE);
+ } else {
+ holder.stock.setVisibility(View.VISIBLE);
+ holder.stock_view.setVisibility(View.VISIBLE);
+ }
+ }
+
+
+ } else {
+
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
+ // holder.txt_mbq.setVisibility(View.GONE);
+ holder.toggle_available.setVisibility(View.GONE);
+ // holder.facing.setVisibility(View.VISIBLE);
+ holder.stock.setVisibility(View.GONE);
+ holder.stock_view.setVisibility(View.GONE);
+ }*/
+
+ if (childData.getCompany_id().equals("1")) {
+ holder.txt_skuName.setTextColor(getResources().getColor(R.color.colorPrimary));
+ } else {
+ holder.txt_skuName.setTextColor(getResources().getColor(R.color.black));
+ }
+
+
+ final OrderStatusDetailActivity.ViewHolder finalHolder = holder;
+ holder.toggle_available.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+ if (buttonView.isPressed()) {
+
+ editFlag = true;
+
+ if (isChecked) {
+ childData.setToggleValue("1");
+ //for Egypt
+ if (country_id.equals("6")) {
+ finalHolder.stock.setVisibility(View.VISIBLE);
+ } else {
+ finalHolder.stock.setVisibility(View.GONE);
+ }
+
+ /*childData.setStock("");
+ childData.setFacing("");*/
+ } else {
+ /* childData.setStock("");
+ childData.setFacing("");*/
+ childData.setToggleValue("0");
+ finalHolder.stock.setVisibility(View.VISIBLE);
+
+ //If MBQ Value is 0
+ if (Integer.parseInt(childData.getMbq()) == 0) {
+ childData.setStock("0");
+ childData.setFacing("0");
+ } else {
+ //for Egypt
+ if (country_id.equals("6")) {
+ childData.setStock("");
+ childData.setFacing("");
+ }
+ }
+
+ /* else {
+ if (finalHolder.facing.getText().toString() != null && !finalHolder.facing.getText().toString().equals("")) {
+ if (Integer.parseInt(finalHolder.facing.getText().toString()) >= 0
+ && Integer.parseInt(finalHolder.facing.getText().toString()) >= Integer.parseInt(childData.getMbq())) {
+ childData.setFacing("");
+ finalHolder.facing.setText("");
+ }
+ }
+ }*/
+ }
+
+ expandableListView.clearFocus();
+ expandableListView.invalidateViews();
+ }
+ }
+ });
+
+ /*if (childData.getToggleValue().equals("1")) {
+ holder.toggle_available.setChecked(true);
+ if (country_id.equals("6") && childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
+ finalHolder.stock.setVisibility(View.VISIBLE);
+ } else {
+ finalHolder.stock.setVisibility(View.GONE);
+ childData.setStock("");
+ }
+
+
+ } else {
+ holder.toggle_available.setChecked(false);
+ finalHolder.stock.setVisibility(View.VISIBLE);
+ }*/
+
+
+ /*holder.stock.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+ @Override
+ public void onFocusChange(View v, boolean hasFocus) {
+ final EditText caption = (EditText) v;
+ String edStock = caption.getText().toString().replaceFirst("^0+(?!$)", "");
+
+ *//*if (!childData.getFacing().equals("") && Integer.parseInt(stock) >= 0 && Integer.parseInt(childData.getFacing()) < Integer.parseInt(stock)) {
+
+ }*//*
+ editFlag = true;
+ if (!edStock.equals("")) {
+ String stock = edStock;
+
+ //for Egypt
+ if (country_id.equals("6") && childData.getToggleValue().equals("1")) {
+ if (!childData.getFacing().equals("")) {
+ if (Integer.parseInt(stock) >= 0 && Double.parseDouble(childData.getFacing()) <= Integer.parseInt(stock)) {
+
+ childData.setStock(stock);
+ } else {
+ AlertDialog.Builder builder = new AlertDialog.Builder(OrderStatusDetailActivity.this);
+ builder.setMessage(getString(R.string.check_faceup))
+ .setCancelable(false)
+ .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ finalHolder.stock.setText("");
+ dialog.dismiss();
+
+ }
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
+ }
+ } else {
+ childData.setStock(stock);
+ }
+ } else {
+ int mbq = Integer.parseInt(childData.getMbq());
+ if (mbq != 0) {
+ if (Integer.parseInt(stock) >= 0 && Integer.parseInt(stock) < mbq) {
+
+ if (!childData.getFacing().equals("")) {
+ if (Integer.parseInt(stock) >= 0 && Double.parseDouble(childData.getFacing()) <= Integer.parseInt(stock)) {
+
+ childData.setStock(stock);
+ } else {
+ AlertDialog.Builder builder = new AlertDialog.Builder(OrderStatusDetailActivity.this);
+ builder.setMessage(getString(R.string.check_faceup))
+ .setCancelable(false)
+ .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ finalHolder.stock.setText("");
+ dialog.dismiss();
+
+ }
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
+ }
+ } else {
+ childData.setStock(stock);
+ }
+ } else {
+ if (isDialogOpen) {
+ isDialogOpen = !isDialogOpen;
+ AlertDialog.Builder builder = new AlertDialog.Builder(OrderStatusDetailActivity.this);
+ builder.setMessage(getString(R.string.check_stock))
+ .setCancelable(false)
+ .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ finalHolder.stock.setText("");
+ dialog.dismiss();
+ isDialogOpen = !isDialogOpen;
+ }
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
+ }
+ }
+ } else {
+ if (Integer.parseInt(stock) > 0) {
+ if (isDialogOpen) {
+ isDialogOpen = !isDialogOpen;
+ AlertDialog.Builder builder = new AlertDialog.Builder(OrderStatusDetailActivity.this);
+ builder.setMessage(getString(R.string.check_stock))
+ .setCancelable(false)
+ .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ finalHolder.stock.setText("");
+ dialog.dismiss();
+ isDialogOpen = !isDialogOpen;
+ }
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
+ }
+ }
+ }
+ }
+ } else {
+ childData.setStock("");
+ }
+ }
+ });*/
+ /* holder.stock.setText(childData.getStock());*/
+
+ /*holder.ed_pricing.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+ @Override
+ public void onFocusChange(View v, boolean hasFocus) {
+ if (!hasFocus) {
+ final EditText Caption = (EditText) v;
+ String value1 = Caption.getText().toString().replaceFirst("^0+(?!$)", "");
+ if (value1.equals("")) {
+ childData.setPricingStock("");
+ finalHolder.ed_pricing.setText("");
+ finalHolder.ed_pricing.setId(childPosition);
+ } else {
+ childData.setPricingStock(value1);
+ finalHolder.ed_pricing.setText(value1);
+ finalHolder.ed_pricing.setId(childPosition);
+ }
+ }
+ }
+ });*/
+
+ // holder.ed_pricing.setText(childData.getPricingStock());
+
+
+ final OrderStatusDetailActivity.ViewHolder finalHolder1 = holder;
+ final OrderStatusDetailActivity.ViewHolder finalHolder2 = holder;
+ holder.facing.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+ @Override
+ public void onFocusChange(View v, boolean hasFocus) {
+ final EditText caption = (EditText) v;
+ String edFaceup = caption.getText().toString().replaceFirst("^0+(?!$)", "");
+
+ editFlag = true;
+
+ if (edFaceup != null && !edFaceup.equals("") && !edFaceup.equals(".")) {
+ //int num = Integer.parseInt(edFaceup);
+ double faceup = Double.parseDouble(edFaceup);
+ int num = (int) faceup;
+ //int faceint = (int)(faceup - Math.floor( faceup ));
+ int faceint = (int) ((faceup % 1.0) * 10);
+ if (faceint != 0) {
+ if ((faceup % 1.0) * 10 != 5) {
+ faceint = 5;
+ edFaceup = String.valueOf(num + faceint / 10.0);
+ finalHolder2.facing.setText(edFaceup);
+ }
+ }
+
+
+ /*Double faceup = Double.parseDouble(edFaceup);
+ DecimalFormat twoDForm = new DecimalFormat(".#");
+ faceup= Double.valueOf(twoDForm.format(faceup));*/
+ }
+
+
+ boolean isFill = false;
+
+ //Toggle is no selected
+
+ if (country_id.equals("6")) {
+ if (!childData.getStock().equals("")) {
+
+ String faceup = edFaceup.replaceFirst("^0+(?!$)", "");
+
+ if (edFaceup != null && !edFaceup.equals("") && !edFaceup.equals(".")) {
+ if (Double.parseDouble(faceup) <= Integer.parseInt(childData.getStock())) {
+
+ isFill = true;
+
+ /* if (!edFaceup.equals("")) {
+ childData.setFacing(faceup);
+ } else {
+ childData.setFacing("");
+ }*/
+ } else {
+ AlertDialog.Builder builder = new AlertDialog.Builder(OrderStatusDetailActivity.this);
+ builder.setMessage(getString(R.string.check_faceup))
+ .setCancelable(false)
+ .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ finalHolder1.facing.setText("");
+ dialog.dismiss();
+ finalHolder2.facing.setText("");
+ }
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
+ }
+ } else {
+ isFill = true;
+ }
+ // }
+ } else {
+ isFill = true;
+ }
+ } else {
+ isFill = true;
+ }
+
+ if (isFill) {
+ if (!edFaceup.equals("") && !edFaceup.equals(".")) {
+ String faceup = "";
+ if (edFaceup.equals("0") || edFaceup.equals(".0")) {
+ faceup = "0";
+ } else {
+ faceup = edFaceup.replaceFirst("^0+(?!$)", "");
+ //faceup = new DecimalFormat("##.#").format(Double.parseDouble(faceup));
+ }
+
+ // String str2 = PerfectDecimal(faceup, 3, 1);
+ childData.setFacing(faceup);
+ } else {
+ childData.setFacing("");
+ }
+ }
+ }
+ });
+
+ holder.facing.setText(childData.getFacing());
+
+ //empty check color change
+ if (!checkflag) {
+ boolean tempflag = false;
+ //usk pricing
+ /*if (!childData.getPricing().equals("0")) {
+ if (holder.ed_pricing.getText().toString().equals("")) {
+ holder.ed_pricing.setBackgroundColor(getResources().getColor(R.color.white));
+ holder.ed_pricing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.ed_pricing.setHint(getString(R.string.empty));
+ tempflag = true;
+ }
+ }*/
+
+ if (holder.facing.getText().toString().equals("")) {
+ holder.facing.setBackgroundColor(getResources().getColor(R.color.white));
+ holder.facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.facing.setHint(getString(R.string.empty));
+ tempflag = true;
+ }
+
+ if (childData.getCompany_id().equals("1")) {
+ holder.facing.setHint("");
+ /* if (childData.getToggleValue().equals("0")) {
+ if (holder.stock.getText().toString().equals("")) {
+ holder.stock.setBackgroundColor(getResources().getColor(R.color.white));
+ holder.stock.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.stock.setHint(getString(R.string.empty));
+ tempflag = true;
+ }
+
+ if (holder.facing.getText().toString().equals("")) {
+ holder.facing.setBackgroundColor(getResources().getColor(R.color.white));
+ holder.facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.facing.setHint(getString(R.string.empty));
+ tempflag = true;
+ }
+ } else {
+
+ }*/
+ if (tempflag) {
+ //holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ } else {
+ //holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
+ if (childData.getCompany_id().equals("1")) {
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
+ } else {
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
+ }
+ }
+ } else {
+ if (holder.facing.getText().toString().equals("")) {
+ holder.facing.setBackgroundColor(getResources().getColor(R.color.white));
+ holder.facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.facing.setHint(getString(R.string.empty));
+ tempflag = true;
+ }
+
+ if (tempflag) {
+ //holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ } else {
+ //holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
+ if (childData.getCompany_id().equals("1")) {
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
+ } else {
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
+ }
+ }
+ }
+ }
+
+ return convertView;
+ }
+
+ @Override
+ public boolean hasStableIds() {
+ return false;
+ }
+
+ @Override
+ public boolean isChildSelectable(int groupPosition, int childPosition) {
+ return true;
+ }
+ }
+ public class ViewHolder {
+ CardView cardView;
+ TextView txt_skuName, txt_mbq,poqtyTV;
+ ToggleButton toggle_available;
+ LinearLayout lin_category;
+ EditText facing, stock, ed_pricing;
+ View stock_view, pricing_view, facing_view;
+ }
+
+ public class DecimalDigitsInputFilter implements InputFilter {
+ Pattern mPattern;
+
+ public DecimalDigitsInputFilter(int digitsBeforeZero, int digitsAfterZero) {
+ mPattern = Pattern.compile("[0-9]{0," + (digitsBeforeZero - 1) + "}+((\\.[0-9]{0," + (digitsAfterZero - 1) + "})?)||(\\.)?");
+ }
+
+ @Override
+ public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
+ Matcher matcher = mPattern.matcher(dest);
+ if (!matcher.matches())
+ return "";
+ return null;
+ }
+ }
+ @Override
+ protected void onResume() {
+ super.onResume();
+ CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+ //return super.onOptionsItemSelected(item);
+ int id = item.getItemId();
+ if (id == android.R.id.home) {
+ finish();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+ }
+ return super.onOptionsItemSelected(item);
+ }
+
+ @Override
+ public void onBackPressed() {
+ // super.onBackPressed();
+ finish();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+ }
+}
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java
index 748980e..44641f0 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java
@@ -196,8 +196,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
img_addPromotion.setClickable(false);
img_addPromotion.setBackgroundResource(R.mipmap.camera_grey);
- if(!cd.getImage_promotion().equalsIgnoreCase(""))
- {
+ if (!cd.getImage_promotion().equalsIgnoreCase("")) {
if (new File(str + cd.getImage_promotion()).exists()) {
//img = _pathforcheck;
new File(str + cd.getImage_promotion()).delete();
@@ -210,8 +209,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
cd.setIn_stock("-1");
img_addPromotion.setClickable(false);
img_addPromotion.setBackgroundResource(R.mipmap.camera_grey);
- if(!cd.getImage_promotion().equalsIgnoreCase(""))
- {
+ if (!cd.getImage_promotion().equalsIgnoreCase("")) {
if (new File(str + cd.getImage_promotion()).exists()) {
//img = _pathforcheck;
new File(str + cd.getImage_promotion()).delete();
@@ -456,20 +454,17 @@ public class PromoComplianceActivity extends AppCompatActivity {
promoSkuListData = db.getPromoComplianceSkuAfterData(store_id, categoryId);
if (!(promoSkuListData.size() > 0)) {
- if(store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)){
+ if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
promoSkuListData = db.getPromoComplianceSkuData(store_id, categoryId, CommonString.TABLE_MAPPING_PROMOTION_ADHOC);
- }
- else {
+ } else {
promoSkuListData = db.getPromoComplianceSkuData(store_id, categoryId, CommonString.TABLE_MAPPING_PROMOTION);
}
-
}
//Promo Spinner List
- if(store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)){
+ if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
promoSpinnerListData = db.getPromoSpinnerData(store_id, categoryId, CommonString.TABLE_MAPPING_ADDITIONAL_PROMOTION_ADHOC);
- }
- else {
+ } else {
promoSpinnerListData = db.getPromoSpinnerData(store_id, categoryId, CommonString.TABLE_MAPPING_ADDITIONAL_PROMOTION);
}
@@ -986,7 +981,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
Log.i("Stock & Facing ", "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();
@@ -1095,7 +1090,21 @@ public class PromoComplianceActivity extends AppCompatActivity {
cdate = arabicToenglish(cdate);
} else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
cdate = arabicToenglish(cdate);
- }else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_JORDAN)) {
+ } else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_JORDAN)) {
+ cdate = arabicToenglish(cdate);
+ }else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KUWAIT)) {
+ cdate = arabicToenglish(cdate);
+ }else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_BAHRAIN)) {
+ cdate = arabicToenglish(cdate);
+ }else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_OMAN)) {
+ cdate = arabicToenglish(cdate);
+ }else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_QATAR)) {
+ cdate = arabicToenglish(cdate);
+ }
+ else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_LEBANON)) {
+ cdate = arabicToenglish(cdate);
+ }
+ else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_LIBIYA)) {
cdate = arabicToenglish(cdate);
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockEntryActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockEntryActivity.java
new file mode 100644
index 0000000..5d56c0f
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockEntryActivity.java
@@ -0,0 +1,855 @@
+package cpm.com.gskmtorange.gsk_dailyentry;
+
+import android.annotation.SuppressLint;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.ActivityInfo;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.os.Environment;
+import android.preference.PreferenceManager;
+import android.text.InputFilter;
+import android.text.Spanned;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.AbsListView;
+import android.widget.BaseExpandableListAdapter;
+import android.widget.EditText;
+import android.widget.ExpandableListView;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.ToggleButton;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.cardview.widget.CardView;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.Snackbar;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import cpm.com.gskmtorange.Database.GSKOrangeDB;
+import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
+import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.dailyentry.OrderTakingActivity;
+import cpm.com.gskmtorange.interfaces.DialogCallbackListener;
+import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.StockFacing_PlanogramTrackerDataGetterSetter;
+
+public class StockEntryActivity extends AppCompatActivity implements DialogCallbackListener {
+ ExpandableListView expandableListView;
+ private Context context;
+ TextView txt_mslAvailabilityName;
+ ArrayList headerDataList;
+ ArrayList childDataList;
+ List hashMapListHeaderData;
+ HashMap> hashMapListChildData;
+ List checkHeaderArray = new ArrayList<>();
+ boolean checkflag = true;
+ ExpandableListAdapter adapter;
+ ImageView camera1, camera2, camera3, camera4;
+ LinearLayout lin_camera1, lin_camera2, lin_camera3, lin_camera4;
+ GSKOrangeDB db;
+ String categoryName, categoryId, storeId, Error_Message = "";
+ String store_id, store_flag_hide, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow, country_id, store_flag_str;
+ boolean isDialogOpen = true;
+ private SharedPreferences preferences;
+ int scrollPosition = 0;
+
+ String str_planogram = "", _pathforcheck = "";
+
+ ArrayList planogramShelfHeaderDataList = new ArrayList<>();
+ ArrayList planogramSkuChildDataList;
+ HashMap> planogramHashMapListChildData = new HashMap<>();
+ boolean editFlag = false;
+ public static final String FILE_PATH = Environment.getExternalStorageDirectory() + "/";
+ LinearLayout pricingLL;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ try {
+ setContentView(R.layout.activity_msl_availability_stock_entry);
+ Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ expandableListView = (ExpandableListView) findViewById(R.id.expandableListView);
+ txt_mslAvailabilityName = (TextView) findViewById(R.id.txt_mslAvailabilityName);
+ camera1 = (ImageView) findViewById(R.id.img_camera1);
+ camera2 = (ImageView) findViewById(R.id.img_camera2);
+ camera3 = (ImageView) findViewById(R.id.img_camera3);
+ camera4 = (ImageView) findViewById(R.id.img_camera4);
+ lin_camera1 = (LinearLayout) findViewById(R.id.lin_camera1);
+ lin_camera2 = (LinearLayout) findViewById(R.id.lin_camera2);
+ lin_camera3 = (LinearLayout) findViewById(R.id.lin_camera3);
+ lin_camera4 = (LinearLayout) findViewById(R.id.lin_camera4);
+ pricingLL = findViewById(R.id.pricingLL);
+ context = this;
+ db = new GSKOrangeDB(this);
+ db.open();
+ //preference data
+ preferences = PreferenceManager.getDefaultSharedPreferences(this);
+ CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
+ store_flag_hide = preferences.getString(CommonString.KEY_STORE_FLAG_FACING_HIDE, null);
+ visit_date = preferences.getString(CommonString.KEY_DATE, null);
+ date = preferences.getString(CommonString.KEY_DATE, null);
+ username = preferences.getString(CommonString.KEY_USERNAME, null);
+ intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, "");
+ keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
+ class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
+ storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
+ camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, "");
+ country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, "");
+ store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null);
+ //Intent data
+ categoryName = getIntent().getStringExtra("categoryName");
+ categoryId = getIntent().getStringExtra("categoryId");
+ /*if (country_id != null && country_id.equals("5")) {
+ pricingLL.setVisibility(View.GONE);
+ } else {
+ pricingLL.setVisibility(View.VISIBLE);
+ }*/
+ toolbar.setTitle(getResources().getString(R.string.stock_entry));
+ setSupportActionBar(toolbar);
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+ str_planogram = CommonString.FILE_PATH_PLANOGRAM;
+ prepareList();
+ prepareDefaultList();
+ cameraMethod();
+ final FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+ fab.setOnClickListener(view -> {
+ expandableListView.clearFocus();
+ adapter.notifyDataSetChanged();
+ //if (validateData(hashMapListHeaderData, hashMapListChildData)) {
+ // if (!validateData(hashMapListHeaderData, hashMapListChildData)) {
+ db.open();
+ if (db.checkStock_Entry_FacingDataNew(store_id, categoryId, visit_date)) {
+ db.updateStock_Entry_FacingNew(visit_date, store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
+ Snackbar.make(expandableListView, getResources().getString(R.string.update_message), Snackbar.LENGTH_SHORT).setAction("Action", null).show();
+ ArrayList msl_availabilityStockFacingList;
+ String mslAvailability_stockFacing_xml = "";
+ String onXML = "";
+ db.open();
+ Log.d("listdata", store_id + "," + visit_date);
+ msl_availabilityStockFacingList = db.getStock_Entry_UploadServerDataNew(store_id, visit_date,
+ keyAccount_id, storeType_id, class_id,CommonString.TABLE_MAPPING_STOCK);
+ Log.d("msllistsize", String.valueOf(msl_availabilityStockFacingList.size()));
+
+ if (msl_availabilityStockFacingList.size() > 0) {
+ for (int j = 0; j < msl_availabilityStockFacingList.size(); j++) {
+ if (!msl_availabilityStockFacingList.get(j).getSku_id().equals("0")) {
+
+ String stock, pricing;
+ if (!msl_availabilityStockFacingList.get(j).getStock().equals("")) {
+ stock = msl_availabilityStockFacingList.get(j).getStock();
+ } else {
+ stock = "0";
+ }
+ if (!msl_availabilityStockFacingList.get(j).getPricingStock().equals("")) {
+ pricing = msl_availabilityStockFacingList.get(j).getPricingStock();
+ } else {
+ pricing = "-1";
+ }
+ onXML = "[ST]"
+ + "[MID]" + "0" + "[/MID]"
+ + "[USERID]" + username + "[/USERID]"
+ + "[SID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SID]"
+ + "[POSM_STOCK]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getPosmStock()) + "[/POSM_STOCK]"
+ + "[WAREHOUSE_STOCK]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getWarehouseStock()) + "[/WAREHOUSE_STOCK]"
+ + "[MBQ]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMbq()) + "[/MBQ]"
+ + "[ML]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMust_have()) + "[/ML]" +
+ "[/ST]";
+
+ mslAvailability_stockFacing_xml = mslAvailability_stockFacing_xml + onXML;
+ }
+ }
+ final String sos_xml = "[DATA]" + mslAvailability_stockFacing_xml + "[/DATA]";
+ Log.d("MSL_DATA", sos_xml);
+ }
+ } else {
+ db.InsertStock_EntryNew(visit_date, store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
+ Snackbar.make(expandableListView, getResources().getString(R.string.save_message), Snackbar.LENGTH_SHORT).setAction("Action", null).show();
+ }
+ finish();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+ /*} else {
+ Snackbar.make(expandableListView, Error_Message, Snackbar.LENGTH_SHORT).setAction("Action", null).show();
+ for (int i = 0; i < adapter.getGroupCount(); i++)
+ expandableListView.expandGroup(i);
+ }*/
+
+ });
+
+ expandableListView.setOnScrollListener(new AbsListView.OnScrollListener() {
+ @Override
+ public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
+
+ expandableListView.invalidate();
+
+ int lastItem = firstVisibleItem + visibleItemCount;
+
+ if (firstVisibleItem == 0) {
+ fab.show();//.setVisibility(View.VISIBLE);
+ } else if (lastItem == totalItemCount) {
+ fab.hide();//setVisibility(View.INVISIBLE);
+ } else {
+ fab.show();//setVisibility(View.VISIBLE);
+ }
+ }
+
+ @Override
+ public void onScrollStateChanged(AbsListView arg0, int arg1) {
+ InputMethodManager inputManager = (InputMethodManager) context
+ .getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (getCurrentFocus() != null) {
+ inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+ getCurrentFocus().clearFocus();
+ }
+ expandableListView.invalidateViews();
+ }
+ });
+
+ // Listview Group click listener
+ expandableListView.setOnGroupClickListener((parent, v, groupPosition, id) -> false);
+
+ // Listview Group expanded listener
+ expandableListView.setOnGroupExpandListener(groupPosition -> {
+ InputMethodManager inputManager = (InputMethodManager) context
+ .getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (getWindow().getCurrentFocus() != null) {
+ inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+ getCurrentFocus().clearFocus();
+ }
+ });
+
+ // Listview Group collasped listener
+ expandableListView.setOnGroupCollapseListener(groupPosition -> {
+ InputMethodManager inputManager = (InputMethodManager) context
+ .getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (getWindow().getCurrentFocus() != null) {
+ inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+ getCurrentFocus().clearFocus();
+ }
+ });
+
+ // Listview on child click listener
+ expandableListView.setOnChildClickListener((parent, v, groupPosition, childPosition, id) -> false);
+ } catch (Resources.NotFoundException e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ // getMenuInflater().inflate(R.menu.planogram, menu);
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ int id = item.getItemId();
+ if (id == android.R.id.home) {
+ if (editFlag) {
+ CommonFunctions.showAlertDialog(context, getResources().getString(R.string.data_will_be_lost));
+ } else {
+ finish();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+ }
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+
+ @Override
+ public void onSelect(boolean flag) {
+ if (flag) {
+ if (!validateData(hashMapListHeaderData, hashMapListChildData)) {
+ if (!camera_allow.equals("1")) {
+ db.deletePlanogramListStoreAndCategorywise(store_id, categoryId,
+ planogramShelfHeaderDataList, planogramHashMapListChildData);
+ }
+ }
+ finish();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+ }
+ }
+
+ @Override
+ public void onSave(boolean flag) {
+
+ }
+
+ private class MyWebViewClient extends WebViewClient {
+ @Override
+ public boolean shouldOverrideUrlLoading(WebView view, String url) {
+ view.loadUrl(url);
+ return true;
+ }
+
+ @Override
+ public void onPageFinished(WebView view, String url) {
+ super.onPageFinished(view, url);
+ view.clearCache(true);
+ }
+
+ @Override
+ public void onPageStarted(WebView view, String url, Bitmap favicon) {
+ super.onPageStarted(view, url, favicon);
+ }
+ }
+
+ private void cameraMethod() {
+ if (!camera_allow.equals("1")) {
+ findViewById(R.id.lin_camera).setVisibility(View.GONE);
+ } else {
+ findViewById(R.id.lin_camera).setVisibility(View.GONE);
+ }
+ }
+
+ //Planogram List for check and delete on backPress
+ private void prepareDefaultList() {
+ // Planogram After save shelf header data
+ planogramShelfHeaderDataList = db.getPlanogramAddShelfHeaderAfterSaveData(store_id, categoryId);
+ if (planogramShelfHeaderDataList.size() > 0) {
+ for (int i = 0; i < planogramShelfHeaderDataList.size(); i++) {
+ planogramSkuChildDataList = db.getStockAndFacingPlanogramAfterSKUData(planogramShelfHeaderDataList.get(i).getKey_id());
+ //After save sku child data
+ if (planogramSkuChildDataList.size() > 0) {
+ planogramHashMapListChildData.put(planogramShelfHeaderDataList.get(i), planogramSkuChildDataList);
+ }
+ }
+ }
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ }
+
+ private void prepareList() {
+ try {
+ hashMapListHeaderData = new ArrayList<>();
+ hashMapListChildData = new HashMap<>();
+ //Header
+ if (country_id.equals("7") || country_id.equals("8") || country_id.equals("17")) {
+ headerDataList = db.getStockEntryHeaderData(country_id,categoryId, null, null, null,
+ store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE, CommonString.TABLE_MAPPING_SOS_TARGET, store_flag_hide);
+ } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
+ headerDataList = db.getStockEntryHeaderData(country_id,categoryId, keyAccount_id, storeType_id, class_id, store_id,
+ CommonString.TABLE_MAPPING_STOCK_ADHOC, CommonString.TABLE_MAPPING_SOS_TARGET_ADHOC, store_flag_hide);
+ } else {
+ headerDataList = db.getStockEntryHeaderData(country_id,categoryId, keyAccount_id, storeType_id, class_id,
+ store_id, CommonString.TABLE_MAPPING_STOCK, CommonString.TABLE_MAPPING_SOS_TARGET, store_flag_hide);
+ }
+ if (headerDataList.size() > 0) {
+ for (int i = 0; i < headerDataList.size(); i++) {
+ hashMapListHeaderData.add(headerDataList.get(i));
+ if (country_id.equals("7") || country_id.equals("8") || country_id.equals("17")) {
+ db.open();
+ childDataList = db.getStock_Entry_SKUDataNewUpdate(headerDataList.get(i).getSub_category_id(),
+ categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id,
+ CommonString.TABLE_MAPPING_STOCK_STOREWISE, store_flag_hide, visit_date, false);
+ updateCoverage(CommonString.TABLE_MAPPING_STOCK_STOREWISE);
+ } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
+ childDataList = db.getStock_Entry_SKUDataNewUpdate(headerDataList.get(i).getSub_category_id(),
+ categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id,
+ CommonString.TABLE_MAPPING_STOCK_ADHOC, store_flag_hide, visit_date, false);
+ updateCoverage(CommonString.TABLE_MAPPING_STOCK_ADHOC);
+ } else {
+ childDataList = db.getStock_Entry_SKUDataNewUpdate(headerDataList.get(i).getSub_category_id(), categoryId,
+ headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id,
+ CommonString.TABLE_MAPPING_STOCK, store_flag_hide, visit_date, false);
+ updateCoverage(CommonString.TABLE_MAPPING_STOCK);
+ }
+ hashMapListChildData.put(hashMapListHeaderData.get(i), childDataList);
+ }
+ }
+
+ adapter = new ExpandableListAdapter(this, hashMapListHeaderData, hashMapListChildData);
+ expandableListView.setAdapter(adapter);
+ //expand all
+ for (int i = 0; i < adapter.getGroupCount(); i++)
+ expandableListView.expandGroup(i);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ boolean validateData(List listDataHeader,
+ HashMap