diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index bd841ff..6bfc8f4 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -31,7 +31,7 @@ - + diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index 9246309..e9bf4e8 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'io.fabric' android { compileSdkVersion 26 - buildToolsVersion '26.0.2' + buildToolsVersion '27.0.3' useLibrary 'org.apache.http.legacy' @@ -21,17 +21,21 @@ android { targetSdkVersion 22 //For Egypt - /*versionCode 14 + /* versionCode 14 versionName "2.6"*/ //For KSA - versionCode 12 - versionName "2.5" + /* versionCode 15 + versionName "2.7"*/ //For Turkey - /*versionCode 11 - versionName "2.4" -*/ + /* versionCode 15 + versionName "2.7"*/ + + //For UAE + versionCode 15 + versionName "2.7" + multiDexEnabled true testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -78,4 +82,4 @@ dependencies { } -apply plugin: 'com.google.gms.google-services' \ No newline at end of file +apply plugin: 'com.google.gms.google-services' diff --git a/GSKMTOrange/google-services.json b/GSKMTOrange/google-services.json new file mode 100644 index 0000000..f0e0ead --- /dev/null +++ b/GSKMTOrange/google-services.json @@ -0,0 +1,415 @@ +{ + "project_info": { + "project_number": "629309347341", + "firebase_url": "https://silicon-airlock-129611.firebaseio.com", + "project_id": "silicon-airlock-129611", + "storage_bucket": "silicon-airlock-129611.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:629309347341:android:52eff943897b15fd", + "android_client_info": { + "package_name": "com.cpm.LorealGt" + } + }, + "oauth_client": [ + { + "client_id": "629309347341-uljbor88e9g2lju39i72lrmmu5c3f7s0.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.cpm.LorealGt", + "certificate_hash": "95d49e939c2b2ac2229560df2ec290bccc0e9819" + } + }, + { + "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyBeJUz9RFpsAVDKBrgjICrUVgRb_hpa8xc" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "ads_service": { + "status": 2 + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:629309347341:android:faf02f88429f03e0", + "android_client_info": { + "package_name": "com.cpm.abbott" + } + }, + "oauth_client": [ + { + "client_id": "629309347341-hvjk4q7195vt8nh4uhhpsdt0acbkl2sf.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.cpm.abbott", + "certificate_hash": "65b3e7895b38f52816092df3f55ba516ae1cf016" + } + }, + { + "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyBeJUz9RFpsAVDKBrgjICrUVgRb_hpa8xc" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "ads_service": { + "status": 2 + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:629309347341:android:668747f586c42392", + "android_client_info": { + "package_name": "com.cpm.gt_gsk1" + } + }, + "oauth_client": [ + { + "client_id": "629309347341-fml2r5aqpn0b6qbgavp7oksfgr3arejd.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.cpm.gt_gsk1", + "certificate_hash": "95d49e939c2b2ac2229560df2ec290bccc0e9819" + } + }, + { + "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyBeJUz9RFpsAVDKBrgjICrUVgRb_hpa8xc" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "ads_service": { + "status": 2 + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:629309347341:android:12d80bf4582fe855", + "android_client_info": { + "package_name": "com.cpm.lorealpromoter" + } + }, + "oauth_client": [ + { + "client_id": "629309347341-c9rhlpsqdg06su38oid993itbs5utma1.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.cpm.lorealpromoter", + "certificate_hash": "b18b4acbf3fdcd122e94365fe82d8211efc2f82a" + } + }, + { + "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyBeJUz9RFpsAVDKBrgjICrUVgRb_hpa8xc" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "ads_service": { + "status": 2 + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:629309347341:android:c150baa45302cd82", + "android_client_info": { + "package_name": "com.cpm.pgattendance" + } + }, + "oauth_client": [ + { + "client_id": "629309347341-9roncgt1vf683lneim5ulf42l8iu82ku.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.cpm.pgattendance", + "certificate_hash": "95d49e939c2b2ac2229560df2ec290bccc0e9819" + } + }, + { + "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyBeJUz9RFpsAVDKBrgjICrUVgRb_hpa8xc" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "ads_service": { + "status": 2 + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:629309347341:android:2c19a23e62057200", + "android_client_info": { + "package_name": "com.cpm.phillips" + } + }, + "oauth_client": [ + { + "client_id": "629309347341-69urr0gm27goh7k5fmsts52t0qd9tt1p.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.cpm.phillips", + "certificate_hash": "8ab20329082aa45376fcf5903996a69416a8e122" + } + }, + { + "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyBeJUz9RFpsAVDKBrgjICrUVgRb_hpa8xc" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "ads_service": { + "status": 2 + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:629309347341:android:a93714e4fd084096", + "android_client_info": { + "package_name": "com.yadu.myfirestore" + } + }, + "oauth_client": [ + { + "client_id": "629309347341-hcrk3tspevuiie8bnnigejbm5m0ccfi9.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.yadu.myfirestore", + "certificate_hash": "124b531f404f1deb57c5e5d45e19a8b89a0fb4be" + } + }, + { + "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyBeJUz9RFpsAVDKBrgjICrUVgRb_hpa8xc" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "ads_service": { + "status": 2 + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:629309347341:android:fc7344f5ebbccd0d", + "android_client_info": { + "package_name": "cpm.com.gskmtorange" + } + }, + "oauth_client": [ + { + "client_id": "629309347341-9vle41ingne4d8itn8cf8ge4gqg3nth4.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "cpm.com.gskmtorange", + "certificate_hash": "f4469c047dfd3b33b1a34b8c38bd770cd43698e5" + } + }, + { + "client_id": "629309347341-8uvuq4m1r17e40j69djksdjlpnj75ofk.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "cpm.com.gskmtorange", + "certificate_hash": "124b531f404f1deb57c5e5d45e19a8b89a0fb4be" + } + }, + { + "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyBeJUz9RFpsAVDKBrgjICrUVgRb_hpa8xc" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "ads_service": { + "status": 2 + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:629309347341:android:a71c1fa09957cdab", + "android_client_info": { + "package_name": "cpm.com.intelre" + } + }, + "oauth_client": [ + { + "client_id": "629309347341-8irkpjkupn1iqa14o00fa8io09bnrni1.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "cpm.com.intelre", + "certificate_hash": "2c33c124346971cca5ed7da54ee42779822d5bfe" + } + }, + { + "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyBeJUz9RFpsAVDKBrgjICrUVgRb_hpa8xc" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "ads_service": { + "status": 2 + } + } + } + ], + "configuration_version": "1" +} \ 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 new file mode 100644 index 0000000..27397a5 --- /dev/null +++ b/GSKMTOrange/src/debug/res/values/google_maps_api.xml @@ -0,0 +1,24 @@ + + + AIzaSyDdgvyAY0_pb-k7PLPJoG6wR-KN0xnhkRE + diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml index d912ee2..1194bbb 100644 --- a/GSKMTOrange/src/main/AndroidManifest.xml +++ b/GSKMTOrange/src/main/AndroidManifest.xml @@ -77,12 +77,14 @@ android:screenOrientation="portrait" android:theme="@style/AppTheme.NoActionBar" /> + + android:exported="true"> - + + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java index 58d9425..8d01b99 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -50,6 +50,8 @@ import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NoCameraDataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.POGGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.POGQuestionGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.RowColumnGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter; @@ -70,7 +72,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean; */ public class GSKOrangeDB extends SQLiteOpenHelper { - public static final String DATABASE_NAME = "GSK_ORANGE_DB19"; + public static final String DATABASE_NAME = "GSK_ORANGE_DB26"; public static final int DATABASE_VERSION = 15; TableBean tableBean; private SQLiteDatabase db; @@ -162,11 +164,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.execSQL(TableBean.getSkugroupMaster()); db.execSQL(TableBean.getTable_ADDITIONAL_QUESTION()); + db.execSQL(TableBean.getTable_POG_QUESTION()); //15-03-2017 db.execSQL(CommonString.CREATE_TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING); 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); } catch (SQLException e) { e.printStackTrace(); @@ -215,6 +219,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.delete(CommonString.TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING, "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); + db.delete(CommonString.TABLE_POG_DATA_SAVE, "STORE_CD" + "='" + storeid + "'", null); } @@ -248,6 +254,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { 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); } public void InsertJCP(JourneyPlanGetterSetter data) { @@ -289,6 +297,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put("GEO_TAG", data.getGEO_TAG().get(i)); values.put("VISIT_ORDER", data.getVISIT_ORDER().get(i)); + values.put("LATITUDE", data.getLATITUDE().get(i)); + values.put("LONGITUDE", data.getLONGITUDE().get(i)); db.insert("JOURNEY_PLAN", null, values); @@ -456,7 +466,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - dbcursor = db.rawQuery("SELECT DISTINCT SM.SKU, SM.SKU_ID, BR.BRAND_ID FROM MAPPING_STOCK MS INNER JOIN SKU_MASTER SM ON MS.SKU_ID = SM.SKU_ID INNER JOIN BRAND_MASTER BR ON SM.BRAND_ID=BR.BRAND_ID INNER JOIN SUB_CATEGORY_MASTER SCM ON BR.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID WHERE MS.KEYACCOUNT_ID ='" + key_account_id + "' AND STORETYPE_ID ='" + store_type_id + "' AND CLASS_ID = '" + class_id + "' AND SM.BRAND_ID='" + brand_id + "' ORDER BY SM.PROMO_SKU, SM.SKU", null); + dbcursor = db.rawQuery("SELECT DISTINCT SM.SKU, SM.SKU_ID, BR.BRAND_ID FROM MAPPING_STOCK MS INNER JOIN SKU_MASTER SM ON MS.SKU_ID = SM.SKU_ID INNER JOIN BRAND_MASTER BR ON SM.BRAND_ID=BR.BRAND_ID INNER JOIN SUB_CATEGORY_MASTER SCM ON BR.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID " + + "WHERE MS.KEYACCOUNT_ID ='" + key_account_id + "' AND STORETYPE_ID ='" + store_type_id + "' AND CLASS_ID = '" + class_id + "' AND SM.BRAND_ID='" + brand_id + "' AND MS.SHOW_ADDITIONAL_VISIBILITY='1' ORDER BY SM.PROMO_SKU, SM.SKU", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -549,6 +560,11 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setGEO_TAG(dbcursor.getString(dbcursor .getColumnIndexOrThrow("GEO_TAG"))); + sb.setLATITUDE(dbcursor.getString(dbcursor + .getColumnIndexOrThrow("LATITUDE"))); + + sb.setLONGITUDE(dbcursor.getString(dbcursor + .getColumnIndexOrThrow("LONGITUDE"))); list.add(sb); dbcursor.moveToNext(); @@ -924,6 +940,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put("SKU_ID", data.getSKU_ID().get(i)); 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("MAPPING_STOCK", null, values); } @@ -2460,7 +2477,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - cursordata = db.rawQuery("SELECT BR.BRAND_ID, SB.SUB_CATEGORY||'-'||BR.BRAND AS BRAND FROM BRAND_MASTER BR 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 COMPANY_ID =1 AND SB.CATEGORY_ID ='" + category_id + "'", null); + cursordata = db.rawQuery("SELECT BR.BRAND_ID, SB.SUB_CATEGORY ||'-'|| BR.BRAND AS BRAND FROM BRAND_MASTER BR " + + "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 COMPANY_ID =1 AND SB.CATEGORY_ID ='" + category_id + "'", null); if (cursordata != null) { cursordata.moveToFirst(); @@ -5238,6 +5257,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put(CommonString.KEY_ROW_NO, i); values.put(CommonString.KEY_COLUMN_NO, j + 1); values.put(CommonString.KEY_FACING, data.getFacing()); + values.put(CommonString.KEY_ISVERTICAL, data.isVertical()); db.insert(CommonString.TABLE_INSERT_NO_CAMERA_FACING_DATA, null, values); } @@ -5398,7 +5418,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - dbcursor = db.rawQuery("SELECT NC.SKU_GROUP_ID, SM.SKUGROUP_NAME, NC.FACING FROM NO_CAMERA_FACING_DATA NC " + + dbcursor = db.rawQuery("SELECT NC.SKU_GROUP_ID, SM.SKUGROUP_NAME, NC.FACING, NC.ISVERTICAL FROM NO_CAMERA_FACING_DATA NC " + "INNER JOIN SKUGROUP_MASTER SM ON NC.SKU_GROUP_ID = SM.SKUGROUP_ID " + "WHERE NC.STORE_ID = '" + store_id + "' AND NC.CATEGORY_ID = '" + category_id + "' AND NC.SUB_CATEGORY_ID = '" + sub_category_id + "' AND ROW_NO = '" + row + "' AND COLUMN_NO = '" + column + "'", null); @@ -5410,6 +5430,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { column_data.setSKUGROUP_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_GROUP_ID"))); column_data.setSKUGROUP_NAME(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKUGROUP_NAME"))); column_data.setFacing(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("FACING"))); + column_data.setVertical(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("ISVERTICAL"))==1); dbcursor.moveToNext(); } @@ -5552,6 +5573,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put("ANSWER", data.getANSWER().get(i)); values.put("STORETYPE_ID", data.getSTORETYPE_ID().get(i)); values.put("CAMERA_ALLOW", data.getCAMERA_ALLOW().get(i)); + values.put("KEYACCOUNT_ID", data.getKEYACCOUNT_ID().get(i)); + values.put("NO_OF_CAMERA", data.getNO_OF_CAMERA().get(i)); db.insert("ADDITIONAL_QUESTION", null, values); } @@ -5567,7 +5590,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - cursordata = db.rawQuery("Select DISTINCT QUESTION ,QUESTION_ID, ANSWER_TYPE 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 from ADDITIONAL_QUESTION " + "where CATEGORY_ID ='" + categoryId + "' AND STORETYPE_ID='"+ store_type_id +"'", null); if (cursordata != null) { cursordata.moveToFirst(); @@ -5580,6 +5603,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { .getColumnIndexOrThrow("QUESTION_ID"))); sb.setANSWER_TYPE(cursordata.getString(cursordata .getColumnIndexOrThrow("ANSWER_TYPE"))); + sb.setKEYACCOUNT_ID(cursordata.getString(cursordata + .getColumnIndexOrThrow("KEYACCOUNT_ID"))); auditData.add(sb); cursordata.moveToNext(); @@ -5617,6 +5642,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { 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"))); list.add(sb); dbcursor.moveToNext(); @@ -5651,6 +5677,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put("ANSWER_TYPE", data.getANSWER_TYPE()); values.put("CATEGORY_ID", category_cd); values.put("ANS_CAM_IMAGE", data.getCAM_IMAGE()); + values.put("ANS_CAM_IMAGE2", data.getCAM_IMAGE2()); values.put("CAMERA_ALLOW", data.getCAMERA_ALLOW()); db.insert(CommonString.TABLE_AUDIT_DATA_SAVE, null, values); @@ -5679,6 +5706,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setANSWER_TYPE(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ANSWER_TYPE"))); sb.setCATEGORY_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID"))); sb.setCAM_IMAGE(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ANS_CAM_IMAGE"))); + sb.setCAM_IMAGE2(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ANS_CAM_IMAGE2"))); sb.setCAMERA_ALLOW(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CAMERA_ALLOW"))); list.add(sb); @@ -5714,6 +5742,259 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setANSWER_TYPE(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ANSWER_TYPE"))); sb.setCATEGORY_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID"))); sb.setCAM_IMAGE(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ANS_CAM_IMAGE"))); + sb.setCAM_IMAGE2(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ANS_CAM_IMAGE2"))); + + list.add(sb); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + e.printStackTrace(); + return list; + } + + return list; + } + + //POG_QUESTION + public void InsertPOGQUESTION(POGQuestionGetterSetter data) { + db.delete("POG_QUESTION", null, null); + + ContentValues values = new ContentValues(); + try { + for (int i = 0; i < data.getQUESTION_ID().size(); i++) { + + values.put("QUESTION_ID", data.getQUESTION_ID().get(i)); + values.put("CULTURE_ID", data.getCULTURE_ID().get(i)); + values.put("SUB_CATEGORY_ID", data.getSUB_CATEGORY_ID().get(i)); + values.put("QUESTION", data.getQUESTION().get(i)); + values.put("QTYPE_ID", data.getQTYPE_ID().get(i)); + values.put("ANSWER_ID", data.getANSWER_ID().get(i)); + values.put("ANSWER", data.getANSWER().get(i)); + values.put("QTYPE", data.getQTYPE().get(i)); + values.put("KPI", data.getKPI().get(i)); + + db.insert("POG_QUESTION", null, values); + } + } catch (Exception ex) { + Log.d("Exception ", " in POG_QUESTION " + ex.toString()); + } + } + + //Sub Category wise POG + public ArrayList getPOGSubCategoryWise(String sub_category_id) { + Cursor cursordata = null; + ArrayList pogData = new ArrayList<>(); + + try { + + cursordata = db.rawQuery("Select DISTINCT QUESTION ,QUESTION_ID from POG_QUESTION " + "where SUB_CATEGORY_ID ='" + sub_category_id + "'", null); + + if (cursordata != null) { + cursordata.moveToFirst(); + while (!cursordata.isAfterLast()) { + POGGetterSetter sb = new POGGetterSetter(); + + sb.setQUESTION(cursordata.getString(cursordata + .getColumnIndexOrThrow("QUESTION"))); + sb.setQUESTION_ID(cursordata.getString(cursordata + .getColumnIndexOrThrow("QUESTION_ID"))); + + pogData.add(sb); + cursordata.moveToNext(); + } + cursordata.close(); + } + + } catch (Exception ex) { + Log.d("Exception ", " in ADDITIONAL_QUESTION " + ex.toString()); + } + return pogData; + + } + + //get POG Answer data + public ArrayList getPOGAnswerData(String question_id, String sub_category_id, String select) { + Log.d("Fetching", "Ansdata--------------->Start<------------"); + + ArrayList list = new ArrayList<>(); + POGGetterSetter sb1 = new POGGetterSetter(); + sb1.setANSWER_ID("0"); + sb1.setANSWER(select); + list.add(0, sb1); + + Cursor dbcursor = null; + + try { + dbcursor = db.rawQuery("Select DISTINCT ANSWER_ID,ANSWER from POG_QUESTION " + + "where QUESTION_ID='" + question_id + "' AND SUB_CATEGORY_ID ='" + sub_category_id + "'", null); + + if (dbcursor != null) { + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + POGGetterSetter sb = new POGGetterSetter(); + + sb.setANSWER_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ANSWER_ID"))); + sb.setANSWER(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ANSWER"))); + + list.add(sb); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + Log.d("Exception", " answer " + e.toString()); + return list; + } + Log.d("Fetching", " audit answer-->Stop<-"); + return list; + } + + //save audit insert data + public void savePOGQuestionAnswerData(HashMap> hashMapListChildData, + List headerDataList, + String store_cd, String category_cd) { + db.delete(CommonString.TABLE_POG_DATA_SAVE, "STORE_CD" + "='" + store_cd + "' AND CATEGORY_ID ='" + + category_cd + "'", null); + + ContentValues values = new ContentValues(); + try { + + for(int l=0; l childList = hashMapListChildData.get(headerDataList.get(l)); + for (int i = 0; i < childList.size(); i++) { + POGGetterSetter data = childList.get(i); + + values.put("STORE_CD", store_cd); + values.put("QUESTION_ID", data.getQUESTION_ID()); + values.put("QUESTION", data.getQUESTION()); + values.put("ANSWER_ID", data.getANSWER_ID()); + values.put("SUB_CATEGORY_ID", headerDataList.get(l).getSub_category_id()); + values.put("CATEGORY_ID", category_cd); + + db.insert(CommonString.TABLE_POG_DATA_SAVE, null, values); + } + } + + } catch (Exception ex) { + Log.d("Database ", "Exception while Insert Audit Data " + ex.toString()); + } + } + + public ArrayList getSubCategoryMasterForPOG( + String category_id) { + + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + + try { + + dbcursor = db.rawQuery("SELECT DISTINCT SM.SUB_CATEGORY_ID,SM.SUB_CATEGORY FROM SUB_CATEGORY_MASTER SM INNER JOIN POG_QUESTION PG ON SM.SUB_CATEGORY_ID = PG.SUB_CATEGORY_ID WHERE CATEGORY_ID = '" + category_id + "'", 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"))); + + list.add(cd); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString()); + return list; + } + return list; + } + + //get inserted POG data + public ArrayList getAfterSavePOGQuestionAnswerData(String store_cd, String category_id, String sub_category_id) { + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + try { + dbcursor = db.rawQuery("Select * " + "From " + CommonString.TABLE_POG_DATA_SAVE + + " where STORE_CD='" + store_cd + "' AND CATEGORY_ID ='" + category_id + "' AND SUB_CATEGORY_ID ='" + sub_category_id +"'", null); + + if (dbcursor != null) { + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + POGGetterSetter sb = new POGGetterSetter(); + + 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"))); + + list.add(sb); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + e.printStackTrace(); + return list; + } + + return list; + } + + //get POG Data + public ArrayList getAfterSavePOGUploadQuestionAnswerData(String store_cd, String category_id) { + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + try { + dbcursor = db.rawQuery("Select * " + "From " + CommonString.TABLE_POG_DATA_SAVE + + " where STORE_CD='" + store_cd + "' AND CATEGORY_ID ='" + category_id + "'", null); + + if (dbcursor != null) { + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + POGGetterSetter sb = new POGGetterSetter(); + + 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"))); + + list.add(sb); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + e.printStackTrace(); + return list; + } + + return list; + } + + //get POG Data for Upload + public ArrayList getAfterSavePOGForUploadData(String store_cd) { + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + try { + dbcursor = db.rawQuery("Select * " + "From " + CommonString.TABLE_POG_DATA_SAVE + + " where STORE_CD='" + store_cd + "'", null); + + if (dbcursor != null) { + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + POGGetterSetter sb = new POGGetterSetter(); + + 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"))); + sb.setSUB_CATEGORY_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY_ID"))); + sb.setCATEGORY_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID"))); list.add(sb); dbcursor.moveToNext(); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/StoreBean.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/StoreBean.java index 31cf805..cf8e88b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/StoreBean.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/StoreBean.java @@ -1,10 +1,12 @@ package cpm.com.gskmtorange.GetterSetter; +import java.io.Serializable; + /** * Created by ashishc on 29-12-2016. */ -public class StoreBean { +public class StoreBean implements Serializable{ String STORE_ID; String EMP_ID; @@ -20,6 +22,8 @@ public class StoreBean { String VISIT_DATE; String CAMERA_ALLOW; String UPLOAD_STATUS; + String LATITUDE; + String LONGITUDE; public String getSTORE_ID() { return STORE_ID; @@ -153,6 +157,19 @@ public class StoreBean { String GEO_TAG ; + public String getLATITUDE() { + return LATITUDE; + } + public void setLATITUDE(String LATITUDE) { + this.LATITUDE = LATITUDE; + } + public String getLONGITUDE() { + return LONGITUDE; + } + + public void setLONGITUDE(String LONGITUDE) { + this.LONGITUDE = LONGITUDE; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java index 6d25933..5ce5751 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java @@ -5,6 +5,7 @@ import android.animation.AnimatorListenerAdapter; import android.annotation.TargetApi; import android.app.AlertDialog; import android.app.ProgressDialog; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; @@ -22,6 +23,7 @@ import android.view.KeyEvent; import android.view.View; import android.view.View.OnClickListener; import android.view.inputmethod.EditorInfo; +import android.view.inputmethod.InputMethodManager; import android.widget.ArrayAdapter; import android.widget.AutoCompleteTextView; import android.widget.Button; @@ -613,7 +615,7 @@ public class LoginActivity extends AppCompatActivity { if (counter < 3) { new AuthenticateTask().execute(); } else { - showAlert(CommonString.MESSAGE_SOCKETEXCEPTION); + showAlert(getString(R.string.nonetwork)); counter = 1; } } @@ -753,7 +755,7 @@ public class LoginActivity extends AppCompatActivity { File f = new File(CommonString.FILE_PATH_OLD); if(f!=null){ File file[] = f.listFiles(); - if(file!=null){ + if(file!=null && file.length>0){ String newPattern = "EEE MMM dd HH:mm:ss Z yyyy"; SimpleDateFormat sdf = new SimpleDateFormat(newPattern, Locale.ENGLISH); @@ -775,7 +777,7 @@ public class LoginActivity extends AppCompatActivity { long diff = visitdate.getTime() - file_date.getTime(); System.out.println ("Days: " + TimeUnit.DAYS.convert(diff, TimeUnit.MILLISECONDS)); long difference = TimeUnit.DAYS.convert(diff, TimeUnit.MILLISECONDS); - if(difference>6){ + if(difference>12){ file[i].delete(); } @@ -812,6 +814,13 @@ public class LoginActivity extends AppCompatActivity { } public void sendToMain(){ + // Check if no view has focus: + View view = this.getCurrentFocus(); + if (view != null) { + InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE); + imm.hideSoftInputFromWindow(view.getWindowToken(), 0); + } + Intent intent = new Intent(getBaseContext(), MainActivity.class); startActivity(intent); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index f1504a7..0740e13 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -91,7 +91,6 @@ public class MainActivity extends AppCompatActivity //user_type = preferences.getString(CommonString.KEY_USER_TYPE, null); db = new GSKOrangeDB(MainActivity.this); - db.open(); webView.setWebViewClient(new MyWebViewClient()); @@ -136,9 +135,6 @@ public class MainActivity extends AppCompatActivity protected void onResume() { super.onResume(); - db.open(); - coverageList = db.getCoverageData(date); - preferences = PreferenceManager.getDefaultSharedPreferences(this); CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); toolbar.setTitle(getString(R.string.main_menu_activity_name)); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/adapter/MyAdapter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/adapter/MyAdapter.java index 47f8dc7..2cd0eb3 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/adapter/MyAdapter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/adapter/MyAdapter.java @@ -8,12 +8,14 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; +import android.widget.RelativeLayout; import android.widget.TextView; import java.util.Collections; import java.util.List; import cpm.com.gskmtorange.R; +import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.listener.DragListener; import cpm.com.gskmtorange.listener.Listener; import cpm.com.gskmtorange.xmlGetterSetter.NoCameraDataGetterSetter; @@ -60,8 +62,23 @@ public class MyAdapter extends RecyclerView.Adapter { else { holder.parent_card.setVisibility(View.VISIBLE); } + + LinearLayout.LayoutParams lprams = new LinearLayout.LayoutParams( + LinearLayout.LayoutParams.MATCH_PARENT, + LinearLayout.LayoutParams.MATCH_PARENT); + + int width; + if(current.isVertical()){ + width = current.getFacing()* CommonString.UNIT_VERTICAL; + } + else { + width = current.getFacing()* CommonString.UNIT_HORIZONTAL; + } + + lprams.width = width; + lprams.setMargins(2,0,0,0); + holder.parent_card.setLayoutParams(lprams); } - //holder.parent_card.setOnDragListener(new DragListener(listener)); final String name = current.getSKUGROUP_NAME(); @@ -76,7 +93,10 @@ public class MyAdapter extends RecyclerView.Adapter { holder.linear_parent.setOnLongClickListener(new View.OnLongClickListener() { @Override public boolean onLongClick(View view) { - listener.deleteItem(view, position, rec,current); + //Blank item cannot be edited or deleted + if(!current.getSKUGROUP_ID().equals("-1")){ + listener.deleteItem(view, position, rec,current); + } return false; } 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 9f59a0d..d050bc8 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java @@ -87,6 +87,7 @@ public class CommonString { public static final String KEY_CATEGORY_ID = "CATEGORY_ID"; public static final String KEY_PROCESS_ID = "PROCESS_ID"; public static final String KEY_CATEGORY_FIXTURE = "CATEGORY_FIXTURE"; + public static final String KEY_STORE_LIST = "STORE_LIST"; public static final String KEY_JOURNEY_PLAN = "JOURNEY_PLAN"; public static final String TABLE_INSERT_STOCK_DIALOG = "STOCK_DIALOG"; @@ -118,6 +119,9 @@ public class CommonString { public static final String KEY_NO_DATA = "NODATA"; + public static final int UNIT_VERTICAL = 50; + public static final int UNIT_HORIZONTAL = 200; + public static String URL = "http://gskme.parinaam.in/Gskwebservice.asmx"; public static final String NAMESPACE = "http://tempuri.org/"; public static final String METHOD_LOGIN = "UserLoginDetail"; @@ -835,6 +839,7 @@ public class CommonString { public static final String KEY_ROW_NO = "ROW_NO"; public static final String KEY_COLUMN_NO = "COLUMN_NO"; public static final String KEY_FACING = "FACING"; + public static final String KEY_ISVERTICAL = "ISVERTICAL"; public static final String CREATE_TABLE_INSERT_NO_CAMERA_FACING_DATA = "CREATE TABLE IF NOT EXISTS " + TABLE_INSERT_NO_CAMERA_FACING_DATA + " (" @@ -845,6 +850,7 @@ public class CommonString { + KEY_SKU_GROUP_ID + " INTEGER," + KEY_ROW_NO + " INTEGER," + KEY_COLUMN_NO + " INTEGER," + + KEY_ISVERTICAL + " INTEGER," + KEY_FACING + " INTEGER)"; public static final String TABLE_AUDIT_DATA_SAVE = "Audit_Data_Save"; @@ -866,6 +872,9 @@ public class CommonString { + "ANS_CAM_IMAGE" + " VARCHAR," + + "ANS_CAM_IMAGE2" + + " VARCHAR," + + "CAMERA_ALLOW" + " INTEGER," @@ -878,5 +887,32 @@ public class CommonString { + "ANSWER_TYPE" + " VARCHAR" + + ")"; + + public static final String TABLE_POG_DATA_SAVE = "POG_Data_Save"; + public static final String CREATE_TABLE_POG_DATA_SAVE = "CREATE TABLE IF NOT EXISTS " + + TABLE_POG_DATA_SAVE + + " (" + + "KEY_ID" + + " INTEGER PRIMARY KEY AUTOINCREMENT ," + + + "STORE_CD" + + " INTEGER," + + + "QUESTION_ID" + + " INTEGER," + + + "QUESTION" + + " VARCHAR," + + + "ANSWER_ID" + + " INTEGER," + + + "SUB_CATEGORY_ID" + + " INTEGER," + + + "CATEGORY_ID" + + " INTEGER" + + ")"; } 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 fe5ba4b..5997220 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AuditActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AuditActivity.java @@ -38,6 +38,7 @@ import android.widget.TextView; import java.io.File; import java.util.ArrayList; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import cpm.com.gskmtorange.Database.GSKOrangeDB; @@ -53,7 +54,7 @@ public class AuditActivity extends AppCompatActivity { List checkHeaderArray = new ArrayList<>(); boolean checkflag = true; private SharedPreferences preferences; - String categoryName, categoryId, Error_Message = "", pathforcheck = "", _path = "",str,img_str=""; + 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; GSKOrangeDB db; ArrayList question_list, childListData; @@ -63,7 +64,7 @@ public class AuditActivity extends AppCompatActivity { Uri outputFileUri; String gallery_package = ""; int child_position = -1; - String error_msg=""; + String error_msg = ""; Toolbar toolbar; @Override @@ -103,6 +104,15 @@ public class AuditActivity extends AppCompatActivity { question_list = db.getAfterSaveAuditQuestionAnswerData(store_id, categoryId); if (question_list.size() == 0) { 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() + // Check condition + if (!item.getKEYACCOUNT_ID().equals("0") && !item.getKEYACCOUNT_ID().equals(keyAccount_id)) { + iterator.remove(); + } + } } hashMapAnsListChildData = new HashMap<>(); @@ -153,7 +163,7 @@ public class AuditActivity extends AppCompatActivity { alert.show(); } else { questionAdapter.notifyDataSetChanged(); - Snackbar.make(recyclerView,error_msg , Snackbar.LENGTH_SHORT).show(); + Snackbar.make(recyclerView, error_msg, Snackbar.LENGTH_SHORT).show(); } } }); @@ -266,15 +276,27 @@ public class AuditActivity extends AppCompatActivity { holder.data.setCAMERA_ALLOW(ans.getCAMERA_ALLOW()); if (holder.data.getCAMERA_ALLOW().equals("1")) { holder.parent_cam_layout.setVisibility(View.VISIBLE); + if (ans.getNO_OF_CAMERA().equals("2")) { + holder.img_cam2.setVisibility(View.VISIBLE); + } else { + holder.img_cam2.setVisibility(View.GONE); + } } else { holder.parent_cam_layout.setVisibility(View.GONE); - if (holder.data.getCAM_IMAGE()!=null && holder.data.getCAM_IMAGE().equals("")) { + if (holder.data.getCAM_IMAGE() != null && holder.data.getCAM_IMAGE().equals("")) { if (new File(str + holder.data.getCAM_IMAGE()).exists()) { new File(str + holder.data.getCAM_IMAGE()).delete(); } } + if (holder.data.getCAM_IMAGE2() != null && holder.data.getCAM_IMAGE2().equals("")) { + if (new File(str + holder.data.getCAM_IMAGE2()).exists()) { + new File(str + holder.data.getCAM_IMAGE2()).delete(); + } + } holder.data.setCAM_IMAGE(""); + holder.data.setCAM_IMAGE2(""); holder.img_cam.setBackgroundResource(R.mipmap.camera_orange); + holder.img_cam2.setBackgroundResource(R.mipmap.camera_orange); } } @@ -292,7 +314,19 @@ public class AuditActivity extends AppCompatActivity { _path = CommonString.FILE_PATH + pathforcheck; intime = CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()); child_position = position; - startCameraActivity(); + startCameraActivity(0); + } + }); + + holder.img_cam2.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + pathforcheck = store_id + "AuditAnsPic2" + categoryId + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg"; + + _path = CommonString.FILE_PATH + pathforcheck; + intime = CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()); + child_position = position; + startCameraActivity(1); } }); @@ -315,21 +349,33 @@ public class AuditActivity extends AppCompatActivity { } } - if(!img_str.equals("")){ - if(child_position==position){ + if (!img_str.equals("")) { + if (child_position == position) { holder.data.setCAM_IMAGE(img_str); - img_str=""; + img_str = ""; + child_position = -1; + } + } + if (!img_str2.equals("")) { + if (child_position == position) { + holder.data.setCAM_IMAGE2(img_str2); + img_str2 = ""; child_position = -1; } } - if(holder.data.getCAM_IMAGE().equals("")){ + if (holder.data.getCAM_IMAGE().equals("")) { holder.img_cam.setBackgroundResource(R.mipmap.camera_orange); - } - else { + } else { holder.img_cam.setBackgroundResource(R.mipmap.camera_green); } + if (holder.data.getCAM_IMAGE2().equals("")) { + holder.img_cam2.setBackgroundResource(R.mipmap.camera_orange); + } else { + holder.img_cam2.setBackgroundResource(R.mipmap.camera_green); + } + if (!checkflag) { if (checkHeaderArray.contains(position)) { @@ -350,7 +396,7 @@ public class AuditActivity extends AppCompatActivity { public final TextView txt_question; public final Spinner sp_auditAnswer; public final EditText edt_answer; - public final ImageView img_cam; + public final ImageView img_cam, img_cam2; public final RelativeLayout parent_cam_layout; CardView card_view; AuditDataGetterSetter data; @@ -364,6 +410,7 @@ public class AuditActivity extends AppCompatActivity { card_view = (CardView) view.findViewById(R.id.card_view); edt_answer = (EditText) view.findViewById(R.id.edt_answer); img_cam = (ImageView) view.findViewById(R.id.img_cam); + img_cam2 = (ImageView) view.findViewById(R.id.img_cam2); parent_cam_layout = (RelativeLayout) view.findViewById(R.id.parent_cam_layout); } } @@ -419,11 +466,13 @@ public class AuditActivity extends AppCompatActivity { 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).getCAM_IMAGE().equals("")) { error_msg = getString(R.string.click_image); checkflag = false; - } - else { + } else if (data.get(i).getCAMERA_ALLOW().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; + }else { checkflag = true; } @@ -437,7 +486,7 @@ public class AuditActivity extends AppCompatActivity { return checkflag; } - protected void startCameraActivity() { + protected void startCameraActivity(int code) { try { Log.i("MakeMachine", "startCameraActivity()"); @@ -479,14 +528,14 @@ public class AuditActivity extends AppCompatActivity { Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); intent.setPackage(defaultCameraPackage); - startActivityForResult(intent, 0); + startActivityForResult(intent, code); } 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); + startActivityForResult(intent, code); } catch (Exception e) { e.printStackTrace(); @@ -506,7 +555,12 @@ public class AuditActivity extends AppCompatActivity { if (pathforcheck != null && !pathforcheck.equals("")) { if (new File(str + pathforcheck).exists()) { - img_str = pathforcheck; + if (requestCode == 0) { + img_str = pathforcheck; + } else { + img_str2 = pathforcheck; + } + pathforcheck = ""; questionAdapter.notifyDataSetChanged(); } 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 19386a9..f1aae7f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NoCameraActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NoCameraActivity.java @@ -30,6 +30,8 @@ import android.webkit.WebView; import android.webkit.WebViewClient; import android.widget.AdapterView; import android.widget.Button; +import android.widget.CheckBox; +import android.widget.CompoundButton; import android.widget.EditText; import android.widget.ImageView; import android.widget.LinearLayout; @@ -188,7 +190,6 @@ public class NoCameraActivity extends AppCompatActivity implements Listener { linear_bottom_parent.addView(rLayout); - ids.add(dynamic_ids); rec_bottom.setLayoutManager(new LinearLayoutManager( this, LinearLayoutManager.HORIZONTAL, false)); @@ -203,6 +204,9 @@ public class NoCameraActivity extends AppCompatActivity implements Listener { sku_group_master.add(column_data); } + dynamic_ids.setTotal_unit(getTotalUnit(sku_group_master)); + ids.add(dynamic_ids); + MyAdapter adapter = new MyAdapter(getApplicationContext(), sku_group_master, this, rec_bottom); rec_bottom.setAdapter(adapter); @@ -343,6 +347,14 @@ public class NoCameraActivity extends AppCompatActivity implements Listener { }); } + private int getTotalUnit(List sku_group_master) { + int unit=0; + for(int i=0; i prepareTopList(String category_id) { return db.getSkuGroupMasterData(category_id, sub_category_data.getSub_category_id()); @@ -355,7 +367,7 @@ public class NoCameraActivity extends AppCompatActivity implements Listener { } @Override - public void deleteItem(View v, final int column_no, final RecyclerView rec, final NoCameraDataGetterSetter item) { + public void deleteItem(final View view, final int column_no, final RecyclerView rec, final NoCameraDataGetterSetter item) { final Dialog dialog = new Dialog(NoCameraActivity.this); dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); @@ -382,17 +394,138 @@ public class NoCameraActivity extends AppCompatActivity implements Listener { final Button btn_ok = (Button) dialog_facing.findViewById(R.id.btn_ok); + //final boolean isVertical = item.isVertical(); + + final CheckBox vertical = (CheckBox)dialog_facing.findViewById(R.id.cb_vertical); + final CheckBox horizontal =(CheckBox)dialog_facing.findViewById(R.id.cb_horizontal); + + if(item.isVertical()){ + vertical.setChecked(true); + } + else { + horizontal.setChecked(true); + } + + et_facing.setText(item.getFacing()+""); + + vertical.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + if (vertical.isChecked()) { + vertical.setChecked(true); + horizontal.setChecked(false); + } + } + }); + + horizontal.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + if (horizontal.isChecked()) { + horizontal.setChecked(true); + vertical.setChecked(false); + } + } + }); + btn_ok.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { String facing = et_facing.getText().toString(); + boolean isVertical = vertical.isChecked(); if (facing.equals("")) { Snackbar.make(btn_ok, R.string.please_facing, Snackbar.LENGTH_SHORT).show(); } else { + + DynamycIdsGetterSetter current_id = new DynamycIdsGetterSetter(); + + for (int i = 0; i < ids.size(); i++) { + + if (ids.get(i).getRecycler_id() == rec.getId()) { + current_id = ids.get(i); + break; + } + } + + boolean flag = true; int facing_int = Integer.parseInt(facing); - customListMyTarget.get(column_no).setFacing(facing_int); + int total_facing = 0; + int total_width = 0; + + for (int i = 0; i < customListMyTarget.size(); i++) { + + total_facing = total_facing + customListMyTarget.get(i).getFacing(); + total_width = total_width + getWidth(customListMyTarget.get(i).isVertical(), customListMyTarget.get(i).getFacing()); + + if (customListMyTarget.get(i).getSKUGROUP_ID().equals("-1")) { + int blank_width = getWidth(customListMyTarget.get(i).isVertical(),customListMyTarget.get(i).getFacing()); + int width = getWidth(isVertical,facing_int) - getWidth(customListMyTarget.get(column_no).isVertical(),customListMyTarget.get(column_no).getFacing()); + int remaining_width = blank_width - width; + + if(remaining_width>=0){ + + if(remaining_width!=0){ + //set remaining width to blank icon + customListMyTarget.get(i).setFacing(remaining_width/CommonString.UNIT_VERTICAL); + } + else { + customListMyTarget.remove(i); + } + + //set updated data to edited item + customListMyTarget.get(column_no).setFacing(facing_int); + customListMyTarget.get(column_no).setVertical(isVertical); + + } + else { + //current_id.setTotal_unit(current_id.getTotal_unit() - remaining_width); + Snackbar.make(scroll_no_camera, R.string.invalid_facing, Snackbar.LENGTH_SHORT).show(); + } + + flag = false; + break; + } + else { + if (customListMyTarget.get(i).getSKUGROUP_ID().equals("21")) { + int access_width = getWidth(isVertical,facing_int) - getWidth(customListMyTarget.get(column_no).isVertical(),customListMyTarget.get(column_no).getFacing()); + + if(access_width>0){ + Snackbar.make(scroll_no_camera, R.string.invalid_facing, Snackbar.LENGTH_SHORT).show(); + } + else { + if(access_width<0){ + NoCameraDataGetterSetter item = new NoCameraDataGetterSetter(); + item.setSKUGROUP_ID("-1"); + item.setSKUGROUP_NAME(""); + item.setFacing((-access_width)/CommonString.UNIT_VERTICAL); + item.setVertical(true); + + customListMyTarget.add(i, item); + } + + //set updated data to edited item + customListMyTarget.get(column_no).setFacing(facing_int); + customListMyTarget.get(column_no).setVertical(isVertical); + } + + flag = false; + break; + } + } + + } + + if (flag) { + + int width = getWidth(isVertical, facing_int); + + current_id.setTotal_unit(current_id.getTotal_unit() - getWidth(item.isVertical(), item.getFacing()) + width); + + customListMyTarget.get(column_no).setFacing(facing_int); + customListMyTarget.get(column_no).setVertical(isVertical); + } adapterMYTarget.updateList(customListMyTarget); adapterMYTarget.notifyDataSetChanged(); @@ -416,12 +549,21 @@ public class NoCameraActivity extends AppCompatActivity implements Listener { dialog.cancel(); + DynamycIdsGetterSetter current_id = new DynamycIdsGetterSetter(); + for (int i = 0; i < ids.size(); i++) { + + if (ids.get(i).getRecycler_id() == rec.getId()) { + current_id = ids.get(i); + break; + } + } + + //if Block separator is deleted every separator and Space is deleted in every row if (item.getSKUGROUP_ID().equals("21")) { for (int i = 0; i < ids.size(); i++) { RecyclerView rec = findViewById(ids.get(i).getRecycler_id()); MyAdapter adapterMYTarget = (MyAdapter) rec.getAdapter(); List customListMyTarget = adapterMYTarget.getList(); - customListMyTarget.remove(column_no); Iterator iterator = customListMyTarget.iterator(); while (iterator.hasNext()) { @@ -429,6 +571,11 @@ public class NoCameraActivity extends AppCompatActivity implements Listener { // Check condition if (item.getSKUGROUP_ID().equals("-1")) { iterator.remove(); + current_id.setTotal_unit(current_id.getTotal_unit()- getWidth(item.isVertical(),item.getFacing())); + } + else if(item.getSKUGROUP_ID().equals("21")){ + iterator.remove(); + current_id.setTotal_unit(current_id.getTotal_unit()- getWidth(item.isVertical(),item.getFacing())); } } @@ -446,27 +593,43 @@ public class NoCameraActivity extends AppCompatActivity implements Listener { List customListMyTarget = adapterMYTarget.getList(); + //if there are more items after deleted item if (customListMyTarget.size() - 1 > column_no) { - boolean flag = false; + boolean flag = true; + int index=0; for (int l = column_no + 1; l < customListMyTarget.size(); l++) { - if (customListMyTarget.get(l).getSKUGROUP_ID().equals("21")) { - flag = true; + if (customListMyTarget.get(l).getSKUGROUP_ID().equals("-1")) { + flag = false; + customListMyTarget.get(l).setFacing(customListMyTarget.get(l).getFacing() + getWidth(item.isVertical(), item.getFacing())/CommonString.UNIT_VERTICAL); + break; + } + else if(customListMyTarget.get(l).getSKUGROUP_ID().equals("21")){ + flag = false; + + NoCameraDataGetterSetter new_item = new NoCameraDataGetterSetter(); + + int width = getWidth(item.isVertical(), item.getFacing()); + + new_item.setSKUGROUP_ID("-1"); + new_item.setSKUGROUP_NAME(""); + new_item.setFacing(width/CommonString.UNIT_VERTICAL); + new_item.setVertical(true); + + customListMyTarget.add(l, new_item); + break; } } - if (flag) { - NoCameraDataGetterSetter item = new NoCameraDataGetterSetter(); - item.setSKUGROUP_ID("-1"); - item.setSKUGROUP_NAME(""); - item.setFacing(0); - customListMyTarget.set(column_no, item); - } else { - customListMyTarget.remove(column_no); + customListMyTarget.remove(column_no); + if(flag){ + current_id.setTotal_unit(current_id.getTotal_unit()- getWidth(item.isVertical(),item.getFacing())); } + } else { customListMyTarget.remove(column_no); + current_id.setTotal_unit(current_id.getTotal_unit()- getWidth(item.isVertical(),item.getFacing())); } @@ -563,7 +726,6 @@ public class NoCameraActivity extends AppCompatActivity implements Listener { //public void showAddFacingDialog(final MyAdapter adapterMYTarget, final List customListMyTarget, final NoCameraDataGetterSetter parent_item, final View view, final int view_id) { public void showAddFacingDialog(final NoCameraDataGetterSetter parent_item, final View view, final int view_id) { // ArrayList skuMasterGetterSetterArrayList = db.getSkuT2PData("1", "1", "1",) - final Dialog dialog = new Dialog(NoCameraActivity.this); dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); @@ -574,16 +736,44 @@ public class NoCameraActivity extends AppCompatActivity implements Listener { final Button btn_ok = (Button) dialog.findViewById(R.id.btn_ok); + final CheckBox vertical = (CheckBox)dialog.findViewById(R.id.cb_vertical); + final CheckBox horizontal =(CheckBox)dialog.findViewById(R.id.cb_horizontal); + horizontal.setChecked(true); + + vertical.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + if (vertical.isChecked()) { + vertical.setChecked(true); + horizontal.setChecked(false); + } + } + }); + + horizontal.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + if (horizontal.isChecked()) { + horizontal.setChecked(true); + vertical.setChecked(false); + } + } + }); + btn_ok.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { String facing = et_facing.getText().toString(); + boolean isVertical = vertical.isChecked(); + if (facing.equals("")) { Snackbar.make(btn_ok, R.string.please_facing, Snackbar.LENGTH_SHORT).show(); } else { + DynamycIdsGetterSetter current_id = new DynamycIdsGetterSetter(); + int rv_id = 0; if (view instanceof TextView) { @@ -591,6 +781,7 @@ public class NoCameraActivity extends AppCompatActivity implements Listener { if (ids.get(i).getTextview_id() == view_id) { rv_id = ids.get(i).getRecycler_id(); + current_id = ids.get(i); } } @@ -600,6 +791,14 @@ public class NoCameraActivity extends AppCompatActivity implements Listener { } else { rv_id = view_id; + + for (int i = 0; i < ids.size(); i++) { + + if (ids.get(i).getRecycler_id() == rv_id) { + current_id = ids.get(i); + break; + } + } } if (parent_item.getSKUGROUP_ID().equals("21")) { @@ -614,24 +813,38 @@ public class NoCameraActivity extends AppCompatActivity implements Listener { MyAdapter adapterMYTarget = (MyAdapter) target.getAdapter(); List customListMyTarget = adapterMYTarget.getList(); biglistMap.put(ids.get(i), customListMyTarget); - if (max < customListMyTarget.size()) { + /* if (max < customListMyTarget.size()) { max = customListMyTarget.size(); + } */ + if (max < ids.get(i).getTotal_unit()) { + max = ids.get(i).getTotal_unit(); } } for (int i = 0; i < ids.size(); i++) { List customList = biglistMap.get(ids.get(i)); - if (customList.size() < max) { - int count = max - customList.size(); + //if (customList.size() < max) { + if (ids.get(i).getTotal_unit() < max) { + //int count = max - customList.size(); + int count = max - ids.get(i).getTotal_unit(); - for (int j = 0; j < count; j++) { + /*for (int j = 0; j < count; j++) { NoCameraDataGetterSetter item = new NoCameraDataGetterSetter(); item.setSKUGROUP_ID("-1"); item.setSKUGROUP_NAME(""); item.setFacing(0); customList.add(item); - } + }*/ + + NoCameraDataGetterSetter item = new NoCameraDataGetterSetter(); + item.setSKUGROUP_ID("-1"); + item.setSKUGROUP_NAME(""); + item.setFacing(count/CommonString.UNIT_VERTICAL); + item.setVertical(true); + customList.add(item); + + ids.get(i).setTotal_unit(ids.get(i).getTotal_unit() + count); } int facing_int = Integer.parseInt(facing); @@ -640,7 +853,16 @@ public class NoCameraActivity extends AppCompatActivity implements Listener { item.setSKUGROUP_ID(parent_item.getSKUGROUP_ID()); item.setSKUGROUP_NAME(parent_item.getSKUGROUP_NAME()); item.setFacing(facing_int); + item.setVertical(isVertical); customList.add(item); + int width; + if(isVertical){ + width = facing_int* CommonString.UNIT_VERTICAL; + } + else { + width = facing_int* CommonString.UNIT_HORIZONTAL; + } + ids.get(i).setTotal_unit(ids.get(i).getTotal_unit() + width); RecyclerView target = (RecyclerView) view.getRootView().findViewById(rv_id); @@ -668,11 +890,34 @@ public class NoCameraActivity extends AppCompatActivity implements Listener { item.setSKUGROUP_ID(parent_item.getSKUGROUP_ID()); item.setSKUGROUP_NAME(parent_item.getSKUGROUP_NAME()); item.setFacing(facing_int); + item.setVertical(isVertical); boolean flag = true; for (int i = 0; i < customListMyTarget.size(); i++) { if (customListMyTarget.get(i).getSKUGROUP_ID().equals("-1")) { - customListMyTarget.set(i, item); + int facing_blank = customListMyTarget.get(i).getFacing(); + int width = getWidth(isVertical, facing_int); + int remaining_width = facing_blank * CommonString.UNIT_VERTICAL - width; + + if(remaining_width>=0){ + + customListMyTarget.set(i, item); + + if(remaining_width!=0){ + NoCameraDataGetterSetter blank_item = new NoCameraDataGetterSetter(); + blank_item.setSKUGROUP_ID("-1"); + blank_item.setSKUGROUP_NAME(""); + blank_item.setFacing(remaining_width/CommonString.UNIT_VERTICAL); + blank_item.setVertical(true); + customListMyTarget.add(i+1 ,blank_item); + } + + } + else { + //current_id.setTotal_unit(current_id.getTotal_unit() - remaining_width); + Snackbar.make(scroll_no_camera, R.string.invalid_facing, Snackbar.LENGTH_SHORT).show(); + } + flag = false; break; } @@ -680,6 +925,9 @@ public class NoCameraActivity extends AppCompatActivity implements Listener { if (flag) { customListMyTarget.add(item); + + int width= getWidth(isVertical, facing_int); + current_id.setTotal_unit(current_id.getTotal_unit() + width); } adapterMYTarget.updateList(customListMyTarget); @@ -832,4 +1080,15 @@ public class NoCameraActivity extends AppCompatActivity implements Listener { super.onPageStarted(view, url, favicon); } } + + int getWidth(boolean isVertical, int facing_int){ + int width; + if(isVertical){ + width = facing_int* CommonString.UNIT_VERTICAL; + } + else { + width = facing_int* CommonString.UNIT_HORIZONTAL; + } + return width; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/POGQuestionsActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/POGQuestionsActivity.java new file mode 100644 index 0000000..0ac19a2 --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/POGQuestionsActivity.java @@ -0,0 +1,479 @@ +package cpm.com.gskmtorange.dailyentry; + +import android.app.Activity; +import android.app.AlertDialog; +import android.content.Context; +import android.content.DialogInterface; +import android.content.SharedPreferences; +import android.graphics.Typeface; +import android.os.Bundle; +import android.preference.PreferenceManager; +import android.support.design.widget.FloatingActionButton; +import android.support.design.widget.Snackbar; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.CardView; +import android.support.v7.widget.Toolbar; +import android.text.InputFilter; +import android.view.LayoutInflater; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +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.RelativeLayout; +import android.widget.Spinner; +import android.widget.TextView; +import android.widget.ToggleButton; + +import java.io.File; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +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.xmlGetterSetter.AuditDataGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.POGGetterSetter; + +public class POGQuestionsActivity extends AppCompatActivity { + + ExpandableListView expandableListView; + + String categoryName, categoryId, Error_Message = ""; + String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow, country_id; + boolean isDialogOpen = true; + private SharedPreferences preferences; + int scrollPosition = 0; + + GSKOrangeDB db; + + List headerDataList; + HashMap> hashMapListChildData; + + ExpandableListAdapter adapter; + + List checkHeaderArray = new ArrayList<>(); + String error_msg=""; + boolean checkflag = true; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_pogquestions); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + expandableListView = (ExpandableListView) findViewById(R.id.expandableListView); + + db = new GSKOrangeDB(this); + db.open(); + + //preference data + preferences = PreferenceManager.getDefaultSharedPreferences(this); + CommonFunctions.updateLangResources(getApplicationContext(), 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); + 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, ""); + + //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.pog)); + setSupportActionBar(toolbar); + getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + + FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); + fab.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + if (validateData()) { + + AlertDialog.Builder builder = new AlertDialog.Builder(POGQuestionsActivity.this); + builder.setMessage(R.string.title_activity_Want_save) + .setCancelable(false) + .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + + db.savePOGQuestionAnswerData(hashMapListChildData, headerDataList,store_id, categoryId); + finish(); + overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); + } + }) + .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.cancel(); + } + }); + AlertDialog alert = builder.create(); + alert.show(); + } else { + adapter.notifyDataSetChanged(); + expandableListView.invalidateViews(); + Snackbar.make(expandableListView,error_msg , Snackbar.LENGTH_SHORT).show(); + } + } + }); + + prepareListData(); + } + + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // 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) { + + android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(POGQuestionsActivity.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); + } + }) + .setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + + } + }); + android.app.AlertDialog alert = builder.create(); + alert.show(); + } + + return super.onOptionsItemSelected(item); + } + + @Override + public void onBackPressed() { + //super.onBackPressed(); + + android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(POGQuestionsActivity.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); + } + }) + .setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + + } + }); + android.app.AlertDialog alert = builder.create(); + alert.show(); + } + + + void prepareListData(){ + headerDataList = new ArrayList<>(); + + headerDataList = db.getSubCategoryMasterForPOG(categoryId); + + if (headerDataList.size() > 0) { + for (int i = 0; i < headerDataList.size(); i++) { + + ArrayList quizDataList = db.getAfterSavePOGQuestionAnswerData(store_id, categoryId, headerDataList.get(i).getSub_category_id()); + + if(quizDataList.size()==0){ + quizDataList = db.getPOGSubCategoryWise(headerDataList.get(i).getSub_category_id()); + } + + hashMapListChildData = new HashMap<>(); + ArrayList childListData = new ArrayList<>(); + + if (quizDataList.size() > 0) { + String select = getString(R.string.title_activity_select_dropdown); + // Adding child data + for (int j = 0; j < quizDataList.size();j++) { + childListData = db.getPOGAnswerData(quizDataList.get(j).getQUESTION_ID(), headerDataList.get(i).getSub_category_id(), select); + quizDataList.get(j).setAnswerList(childListData); + } + } + + //childDataList = new ArrayList<>(); + /* childDataList = db.getMSL_Availability_StockFacingSKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id); + if (!(childDataList.size() > 0)) { + childDataList = db.getPOGSubCategoryWise(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id); + }*/ + + hashMapListChildData.put(headerDataList.get(i), quizDataList); + } + } + + adapter = new ExpandableListAdapter(this, headerDataList, hashMapListChildData); + expandableListView.setAdapter(adapter); + + } + + 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_msl_availability_stock_facing_header, 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); + + txt_categoryHeader.setText(headerTitle.getSub_category()); + + + 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 POGGetterSetter childData = + (POGGetterSetter) getChild(groupPosition, childPosition); + ArrayList ans_list = childData.getAnswerList(); + ViewHolder holder = null; + + if (convertView == null) { + LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + convertView = infalInflater.inflate(R.layout.pog_question, null, false); + + holder = new ViewHolder(); + holder.txt_question = (TextView) convertView.findViewById(R.id.txt_question); + holder.sp_auditAnswer = (Spinner) convertView.findViewById(R.id.sp_auditAnswer); + holder.cardView = (CardView) convertView.findViewById(R.id.card_view); + convertView.setTag(holder); + } else { + holder = (ViewHolder) convertView.getTag(); + } + + holder.sp_auditAnswer.setAdapter(new AnswerSpinnerAdapter(POGQuestionsActivity.this, R.layout.custom_spinner_item, ans_list)); + + final ArrayList finalAns_list = ans_list; + holder.sp_auditAnswer.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView parent, View view, int position, long id) { + POGGetterSetter ans = finalAns_list.get(position); + childData.setANSWER_ID(ans.getANSWER_ID()); + childData.setANSWER(ans.getANSWER()); + + } + + @Override + public void onNothingSelected(AdapterView parent) { + + } + }); + + holder.txt_question.setText(childData.getQUESTION()); + + for (int i = 0; i < ans_list.size(); i++) { + if ( ans_list.get(i).getANSWER_ID().equals(childData.getANSWER_ID())) { + holder.sp_auditAnswer.setSelection(i); + break; + } + } + + if(!checkflag){ + if(childData.getANSWER_ID().equals("0")){ + holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark)); + + }else { + holder.cardView.setCardBackgroundColor(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; + View mView; + TextView txt_question; + Spinner sp_auditAnswer; + } + + public class AnswerSpinnerAdapter extends ArrayAdapter { + List list; + Context context; + int resourceId; + + public AnswerSpinnerAdapter(Context context, int resourceId, ArrayList list) { + super(context, resourceId, list); + this.context = context; + this.list = list; + this.resourceId = resourceId; + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + + View view = convertView; + LayoutInflater inflater = ((Activity) context).getLayoutInflater(); + view = inflater.inflate(resourceId, parent, false); + POGGetterSetter cm = list.get(position); + TextView txt_spinner = (TextView) view.findViewById(R.id.tv_text); + txt_spinner.setText(list.get(position).getANSWER()); + + return view; + } + + @Override + public View getDropDownView(int position, View convertView, ViewGroup parent) { + View view = convertView; + LayoutInflater inflater = ((Activity) context).getLayoutInflater(); + view = inflater.inflate(resourceId, parent, false); + + POGGetterSetter cm = list.get(position); + + TextView txt_spinner = (TextView) view.findViewById(R.id.tv_text); + txt_spinner.setText(cm.getANSWER()); + + return view; + } + } + + boolean validateData() { + //boolean flag = true; + checkHeaderArray.clear(); + + checkflag = true; + for(int l=0; l child_data = hashMapListChildData.get(headerDataList.get(l)); + for (int i = 0; i < child_data.size(); i++) { + if (child_data.get(i).getANSWER_ID().equalsIgnoreCase("0")) { + error_msg = getString(R.string.pls_answer_all_qns); + checkflag = false; + } + + if (checkflag == false) { + break; + } + } + + if (checkflag == false) { + if (!checkHeaderArray.contains(l)) { + checkHeaderArray.add(l); + } + break; + } + } + + return checkflag; + } +} 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 564ca48..52ecaab 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -20,6 +20,8 @@ import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; @@ -44,6 +46,9 @@ import cpm.com.gskmtorange.constant.CommonFunctions; import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.download.DownloadActivity; import cpm.com.gskmtorange.gsk_dailyentry.StoreWisePerformanceActivity; +import cpm.com.gskmtorange.storeinmap.StoreListMapActivity; +import cpm.com.gskmtorange.storeinmap.StoreListRouteActivity; +import cpm.com.gskmtorange.storeinmap.StoreRouteActivity; /** * Created by ashishc on 29-12-2016. @@ -138,6 +143,16 @@ public class StoreListActivity extends AppCompatActivity { overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); } + /* @Override + public boolean onCreateOptionsMenu(Menu menu) { + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.sorelist_menu, menu); + + // return true so that the menu pop up is opened + return true; + }*/ + + @Override public boolean onOptionsItemSelected(MenuItem item) { // Handle action bar item clicks here. The action bar will @@ -154,6 +169,12 @@ public class StoreListActivity extends AppCompatActivity { overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); + }else if (id == R.id.iconMap) { + + //Intent in = new Intent(getApplicationContext(), StoreListMapActivity.class); + Intent in = new Intent(getApplicationContext(), StoreListRouteActivity.class); + in.putExtra(CommonString.KEY_STORE_LIST, storelist); + startActivity(in); } return super.onOptionsItemSelected(item); @@ -176,7 +197,7 @@ public class StoreListActivity extends AppCompatActivity { @Override public StoreListActivity.ValueAdapter.MyViewHolder onCreateViewHolder(ViewGroup parent, int i) { - View view = inflator.inflate(R.layout.storeviewlist, parent, false); + View view = inflator.inflate(R.layout.storelist_child, parent, false); StoreListActivity.ValueAdapter.MyViewHolder holder = new StoreListActivity.ValueAdapter.MyViewHolder(view); @@ -209,41 +230,49 @@ public class StoreListActivity extends AppCompatActivity { viewHolder.imageview.setVisibility(View.VISIBLE); viewHolder.imageview.setBackgroundResource(R.mipmap.tick); 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)) { viewHolder.imageview.setVisibility(View.VISIBLE); viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation); viewHolder.chkbtn.setVisibility(View.INVISIBLE); + viewHolder.cancel_btn.setVisibility(View.GONE); viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange)); } else if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_Y)) { viewHolder.imageview.setVisibility(View.VISIBLE); viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation); 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_P)) { viewHolder.imageview.setVisibility(View.VISIBLE); viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation); 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_L)) { viewHolder.imageview.setVisibility(View.VISIBLE); viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation); 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.STORE_STATUS_LEAVE)) { viewHolder.imageview.setVisibility(View.VISIBLE); viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation); 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)){ 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)){ viewHolder.imageview.setVisibility(View.INVISIBLE); - viewHolder.chkbtn.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)) { @@ -251,6 +280,7 @@ public class StoreListActivity extends AppCompatActivity { viewHolder.imageview.setVisibility(View.VISIBLE); viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation); viewHolder.chkbtn.setVisibility(View.INVISIBLE); + viewHolder.cancel_btn.setVisibility(View.GONE); viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange)); }/* else if (checkleavestatus(storeid)) { @@ -323,10 +353,11 @@ public class StoreListActivity extends AppCompatActivity { viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange)); viewHolder.imageview.setVisibility(View.INVISIBLE); viewHolder.chkbtn.setVisibility(View.INVISIBLE); + viewHolder.cancel_btn.setVisibility(View.GONE); } - viewHolder.relativelayout.setOnClickListener(new View.OnClickListener() { + viewHolder.parent_layout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -372,7 +403,6 @@ public class StoreListActivity extends AppCompatActivity { if (!store_id.equals(coverage.get(i).getStoreId())) { Snackbar.make(v, R.string.title_store_list_checkout_current, Snackbar.LENGTH_SHORT).setAction("Action", null).show(); enteryflag = false; - } break; } @@ -390,10 +420,26 @@ public class StoreListActivity extends AppCompatActivity { } }); + viewHolder.imgview_navigation.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent in = new Intent(getApplicationContext(), StoreRouteActivity.class); + in.putExtra(CommonString.KEY_STORE_LIST,current); + startActivity(in); + } + }); + + viewHolder.cancel_btn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + cancelStore(current); + } + }); viewHolder.chkbtn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + AlertDialog.Builder builder = new AlertDialog.Builder(StoreListActivity.this); builder.setMessage(R.string.wantcheckout) .setCancelable(false) @@ -449,9 +495,10 @@ public class StoreListActivity extends AppCompatActivity { TextView txt, address; ImageView icon; - RelativeLayout relativelayout; + LinearLayout parent_layout; ImageView imageview; - Button chkbtn; + ImageView imgview_navigation; + Button chkbtn, cancel_btn; CardView Cardbtn; public MyViewHolder(View itemView) { @@ -459,13 +506,14 @@ public class StoreListActivity extends AppCompatActivity { txt = (TextView) itemView.findViewById(R.id.storelistviewxml_storename); address = (TextView) itemView.findViewById(R.id.storelistviewxml_storeaddress); - relativelayout = (RelativeLayout) itemView.findViewById(R.id.storenamelistview_layout); + parent_layout = (LinearLayout) itemView.findViewById(R.id.storenamelistview_layout); //imageview = (ImageView) itemView.findViewById(R.id.imageView2); imageview = (ImageView) itemView.findViewById(R.id.storelistviewxml_storeico); - + imgview_navigation = (ImageView) itemView.findViewById(R.id.navigate); chkbtn = (Button) itemView.findViewById(R.id.chkout); + cancel_btn = (Button) itemView.findViewById(R.id.btn_cancel); Cardbtn = (CardView) itemView.findViewById(R.id.card_view); } @@ -558,7 +606,7 @@ public class StoreListActivity extends AppCompatActivity { GSKOrangeDB db = new GSKOrangeDB(StoreListActivity.this); db.open(); - coverage = db.getCoverageWithStoreID_Data(storeCd); + coverage = db.getCoverageWithStoreID_Data(current.getSTORE_ID()); if (coverage.size() > 0) { @@ -571,7 +619,7 @@ public class StoreListActivity extends AppCompatActivity { public void onClick(DialogInterface dialog, int id) { - UpdateStore(store_id); + UpdateStore(current.getSTORE_ID()); Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class); in.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID()); @@ -661,7 +709,37 @@ public class StoreListActivity extends AppCompatActivity { return result_flag; } + void cancelStore(final StoreBean current) { + 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) { + UpdateStore(current.getSTORE_ID()); + storelist = db.getStoreData(date); + coverage = db.getCoverageData(date); + adapter.notifyDataSetChanged(); + + } + }) + .setNegativeButton(getResources().getString(R.string.no), + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, + int id) { + + + dialog.cancel(); + } + }); + AlertDialog alert = builder.create(); + + alert.show(); + } + } } 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 ef252e4..446a10c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -59,6 +59,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter; +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; @@ -96,6 +97,7 @@ public class DownloadActivity extends AppCompatActivity { MappingCategoryImageAllowGetterSetter mappingCategoryImageAllowGetterSetter; SkuGroupMasterGetterSetter skuGroupMasterGetterSetter; AdditionalQuestiongetterSetter additionalQuestiongetterSetter; + POGQuestionGetterSetter pogQuestionGetterSetter; private Dialog dialog; private ProgressBar pb; @@ -958,6 +960,40 @@ public class DownloadActivity extends AppCompatActivity { } publishProgress(data); + //ADDITIONAL_QUESTION + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD); + request.addProperty("UserName", userId); + request.addProperty("Type", "POG_QUESTION"); + 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(); + + if (result.toString() != null) { + xpp.setInput(new StringReader(result.toString())); + xpp.next(); + eventType = xpp.getEventType(); + pogQuestionGetterSetter = XMLHandlers.pogQuestionsXMLHandler(xpp, eventType); + + String table_pog_qns_table = pogQuestionGetterSetter.getTable_POG_QUESTION(); + if (table_pog_qns_table != null) { + resultHttp = CommonString.KEY_SUCCESS; + TableBean.setTable_POG_QUESTION(table_pog_qns_table); + } + + if (pogQuestionGetterSetter.getQUESTION_ID().size() > 0) { + data.value = 97; + data.name = "POG_QUESTION " + getResources().getString(R.string.download_data); + } + } + publishProgress(data); + /* //MAPPING_COUNTRYWISE_PLANOGRAM request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD); request.addProperty("UserName", userId); @@ -1252,6 +1288,7 @@ public class DownloadActivity extends AppCompatActivity { //db.InsertMappingCountrywisePlanogram(mappingPlanogramCountrywiseGetterSetter); db.InsertSkuGroupMaster(skuGroupMasterGetterSetter); db.InsertADDITIONALQUESTION(additionalQuestiongetterSetter); + db.InsertPOGQUESTION(pogQuestionGetterSetter); } catch (MalformedURLException e) { 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 23c11c0..fff1082 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java @@ -81,13 +81,13 @@ public class ServiceActivityFragment extends Fragment { serviceList = new ArrayList<>(); serviceList.add(service); - //Upload all images from folder + /*//Upload all images from folder ServiceGetterSetter service2 = new ServiceGetterSetter(); service2.setName(getString(R.string.image)); service2.setIcon(R.mipmap.entry_grey); //SelectLanguageFragment selectLanguageFragment = new SelectLanguageFragment(); service2.setFragment(null); - serviceList.add(service2); + serviceList.add(service2);*/ rec.setLayoutManager(new LinearLayoutManager(getActivity())); @@ -121,7 +121,7 @@ public class ServiceActivityFragment extends Fragment { showExportDialog(); // restoreBackup(); } - else if(position==1){ + /* else if(position==1){ File f = new File(CommonString.FILE_PATH); if(f!=null){ @@ -137,7 +137,7 @@ public class ServiceActivityFragment extends Fragment { } } - } + }*/ } }); 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 34ba5b4..60a495e 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 @@ -34,6 +34,7 @@ import cpm.com.gskmtorange.dailyentry.AdditionalVisibility; import cpm.com.gskmtorange.dailyentry.AuditActivity; import cpm.com.gskmtorange.dailyentry.CategoryPicture; import cpm.com.gskmtorange.dailyentry.CreateSelfActivity; +import cpm.com.gskmtorange.dailyentry.POGQuestionsActivity; import cpm.com.gskmtorange.dailyentry.StockDataActivity; import cpm.com.gskmtorange.dailyentry.T2PComplianceActivity; import cpm.com.gskmtorange.xmlGetterSetter.DailyDataMenuGetterSetter; @@ -250,6 +251,22 @@ public class DailyDataMenuActivity extends AppCompatActivity { data.setCategory_name(getString(R.string.audit)); categoryList.add(data); + //POG + data = new DailyDataMenuGetterSetter(); + if (db.getSubCategoryMasterForPOG(categoryId).size()>0) { + if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, categoryId).size() > 0) { + 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.pog)); + categoryList.add(data); + /*data = new DailyDataMenuGetterSetter(); data.setCategory_name(getResources().getString(R.string.daily_data_menu_competition_tracking)); @@ -373,6 +390,14 @@ public class DailyDataMenuActivity extends AppCompatActivity { holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background)); } + } + else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.pog))) { + if (db.getSubCategoryMasterForPOG(categoryId).size()>0) { + holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); + } else { + holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background)); + } + } holder.lay_menu.setOnClickListener(new View.OnClickListener() { @@ -461,6 +486,16 @@ public class DailyDataMenuActivity extends AppCompatActivity { overridePendingTransition(R.anim.activity_in, R.anim.activity_out); } + }else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.pog))) { + + if( db.getSubCategoryMasterForPOG(categoryId).size()>0){ + Intent intent = new Intent(DailyDataMenuActivity.this, POGQuestionsActivity.class); + intent.putExtra("categoryName", dailyData.getCategory_name()); + intent.putExtra("categoryId", categoryId); + startActivity(intent); + overridePendingTransition(R.anim.activity_in, R.anim.activity_out); + } + } } 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 85487ec..b7b0da1 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 @@ -552,9 +552,8 @@ public class PromoComplianceActivity extends AppCompatActivity { break; case 1: data.setIn_stock("1"); - img_promotion.setClickable(true); if (camera_allow.equals("1")) { - + img_promotion.setClickable(true); img_promotion.setBackgroundResource(R.mipmap.camera_orange); img_promotion.setOnClickListener(new View.OnClickListener() { @Override @@ -648,6 +647,7 @@ public class PromoComplianceActivity extends AppCompatActivity { break; case "1": spinner_inStock.setSelection(1); + img_promotion.setClickable(true); break; } @@ -756,6 +756,7 @@ public class PromoComplianceActivity extends AppCompatActivity { if (data.getIn_stock().equals("1")) { if (data.getImage_promotion().equals("")) { img_promotion.setBackgroundResource(R.mipmap.camera_orange); + img_promotion.setClickable(true); } else { img_promotion.setBackgroundResource(R.mipmap.camera_green); } @@ -1006,6 +1007,7 @@ public class PromoComplianceActivity extends AppCompatActivity { if (new File(str + _pathforcheck).exists()) { img = _pathforcheck; promoSkuListView(); + lin_promo_sku.invalidate(); //t2PAdapter.notifyDataSetChanged(); _pathforcheck = ""; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/DataParser.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/DataParser.java new file mode 100644 index 0000000..d14e7a0 --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/DataParser.java @@ -0,0 +1,102 @@ +package cpm.com.gskmtorange.storeinmap; + +import com.google.android.gms.maps.model.LatLng; + +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +public class DataParser { + + /** Receives a JSONObject and returns a list of lists containing latitude and longitude */ + public List>> parse(JSONObject jObject){ + + List>> routes = new ArrayList<>() ; + JSONArray jRoutes; + JSONArray jLegs; + JSONArray jSteps; + + try { + + jRoutes = jObject.getJSONArray("routes"); + + /** Traversing all routes */ + for(int i=0;i(); + + /** Traversing all legs */ + for(int j=0;j list = decodePoly(polyline); + + /** Traversing all points */ + for(int l=0;l hm = new HashMap<>(); + hm.put("lat", Double.toString((list.get(l)).latitude) ); + hm.put("lng", Double.toString((list.get(l)).longitude) ); + path.add(hm); + } + } + routes.add(path); + } + } + + } catch (JSONException e) { + e.printStackTrace(); + }catch (Exception e){ + } + + + return routes; + } + + + /** + * Method to decode polyline points + * Courtesy : http://jeffreysambells.com/2010/05/27/decoding-polylines-from-google-maps-direction-api-with-java + * */ + private List decodePoly(String encoded) { + + List poly = new ArrayList<>(); + int index = 0, len = encoded.length(); + int lat = 0, lng = 0; + + while (index < len) { + int b, shift = 0, result = 0; + do { + b = encoded.charAt(index++) - 63; + result |= (b & 0x1f) << shift; + shift += 5; + } while (b >= 0x20); + int dlat = ((result & 1) != 0 ? ~(result >> 1) : (result >> 1)); + lat += dlat; + + shift = 0; + result = 0; + do { + b = encoded.charAt(index++) - 63; + result |= (b & 0x1f) << shift; + shift += 5; + } while (b >= 0x20); + int dlng = ((result & 1) != 0 ? ~(result >> 1) : (result >> 1)); + lng += dlng; + + LatLng p = new LatLng((((double) lat / 1E5)), + (((double) lng / 1E5))); + poly.add(p); + } + + return poly; + } +} + diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/StoreListMapActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/StoreListMapActivity.java new file mode 100644 index 0000000..f32dee2 --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/StoreListMapActivity.java @@ -0,0 +1,77 @@ +package cpm.com.gskmtorange.storeinmap; + +import android.graphics.Bitmap; +import android.support.v4.app.FragmentActivity; +import android.os.Bundle; +import android.view.View; +import android.widget.LinearLayout; +import android.widget.TextView; + +import com.google.android.gms.maps.CameraUpdateFactory; +import com.google.android.gms.maps.GoogleMap; +import com.google.android.gms.maps.OnMapReadyCallback; +import com.google.android.gms.maps.SupportMapFragment; +import com.google.android.gms.maps.model.BitmapDescriptorFactory; +import com.google.android.gms.maps.model.LatLng; +import com.google.android.gms.maps.model.MarkerOptions; + +import java.util.ArrayList; + +import cpm.com.gskmtorange.GetterSetter.StoreBean; +import cpm.com.gskmtorange.R; +import cpm.com.gskmtorange.constant.CommonString; + +public class StoreListMapActivity extends FragmentActivity implements OnMapReadyCallback { + + private GoogleMap mMap; + ArrayList storelist = new ArrayList(); + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_store_list_map); + + storelist = (ArrayList)getIntent().getSerializableExtra(CommonString.KEY_STORE_LIST); + // Obtain the SupportMapFragment and get notified when the map is ready to be used. + SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager() + .findFragmentById(R.id.map); + mapFragment.getMapAsync(this); + } + + + /** + * Manipulates the map once available. + * This callback is triggered when the map is ready to be used. + * This is where we can add markers or lines, add listeners or move the camera. In this case, + * we just add a marker near Sydney, Australia. + * If Google Play services is not installed on the device, the user will be prompted to install + * it inside the SupportMapFragment. This method will only be triggered once the user has + * installed Google Play services and returned to the app. + */ + @Override + public void onMapReady(GoogleMap googleMap) { + mMap = googleMap; + + for (int i=0;i storelist = new ArrayList(); + int global_index = 0; + LatLng origin, destination; + double lat, lon; + + ArrayList color_list = new ArrayList<>(); + + //for optimize path + ArrayList sortedList = new ArrayList<>(); + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_store_list_route); + storelist = (ArrayList)getIntent().getSerializableExtra(CommonString.KEY_STORE_LIST); + // Obtain the SupportMapFragment and get notified when the map is ready to be used. + SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager() + .findFragmentById(R.id.map); + mapFragment.getMapAsync(this); + + color_list.add("#f44336"); + color_list.add("#1e88e5"); + color_list.add("#2e7d32"); + color_list.add("#ab47bc"); + color_list.add("#ffcc80"); + color_list.add("#fdd835"); + + } + + + /** + * Manipulates the map once available. + * This callback is triggered when the map is ready to be used. + * This is where we can add markers or lines, add listeners or move the camera. In this case, + * we just add a marker near Sydney, Australia. + * If Google Play services is not installed on the device, the user will be prompted to install + * it inside the SupportMapFragment. This method will only be triggered once the user has + * installed Google Play services and returned to the app. + */ + @Override + public void onMapReady(GoogleMap googleMap) { + mMap = googleMap; + + showRoute(global_index); + } + + public void showRoute(int index){ + LinearLayout tv = (LinearLayout) this.getLayoutInflater().inflate(R.layout.marker_view, null, false); + + TextView desc = (TextView) tv.findViewById(R.id.tv_desc); + desc.setText(storelist.get(global_index).getSTORE_NAME()); + + tv.measure(View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), + View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED)); + tv.layout(0, 0, tv.getMeasuredWidth(), tv.getMeasuredHeight()); + + tv.setDrawingCacheEnabled(true); + tv.buildDrawingCache(); + Bitmap bm = tv.getDrawingCache(); + lat = Double.parseDouble(storelist.get(index).getLATITUDE()); + lon = Double.parseDouble(storelist.get(index).getLONGITUDE()); + LatLng loc = new LatLng(lat, lon); + + mMap.addMarker(new MarkerOptions().position(loc).anchor(0.5f, 0.5f).icon(BitmapDescriptorFactory.fromBitmap(bm))); + + if(index==0){ + mMap.moveCamera(CameraUpdateFactory.newLatLng(loc)); + mMap.animateCamera(CameraUpdateFactory.zoomTo(15)); + } + + if(index+1 { + + @Override + protected String doInBackground(String... url) { + + // For storing data from web service + String data = ""; + + try { + // Fetching the data from web service + data = downloadUrl(url[0]); + Log.d("Background Task data", data.toString()); + } catch (Exception e) { + Log.d("Background Task", e.toString()); + } + return data; + } + + @Override + protected void onPostExecute(String result) { + super.onPostExecute(result); + + ParserTask parserTask = new ParserTask(); + + // Invokes the thread for parsing the JSON data + parserTask.execute(result); + + } + } + + /** + * A class to parse the Google Places in JSON format + */ + private class ParserTask extends AsyncTask>>> { + + // Parsing the data in non-ui thread + @Override + protected List>> doInBackground(String... jsonData) { + + JSONObject jObject; + List>> routes = null; + + try { + jObject = new JSONObject(jsonData[0]); + Log.d("ParserTask",jsonData[0].toString()); + DataParser parser = new DataParser(); + Log.d("ParserTask", parser.toString()); + + // Starts parsing data + routes = parser.parse(jObject); + Log.d("ParserTask","Executing routes"); + Log.d("ParserTask",routes.toString()); + + } catch (Exception e) { + Log.d("ParserTask",e.toString()); + e.printStackTrace(); + } + return routes; + } + + // Executes in UI thread, after the parsing process + @Override + protected void onPostExecute(List>> result) { + ArrayList points; + PolylineOptions lineOptions = null; + + // Traversing through all the routes + for (int i = 0; i < result.size(); i++) { + points = new ArrayList<>(); + lineOptions = new PolylineOptions(); + + // Fetching i-th route + List> path = result.get(i); + + // Fetching all the points in i-th route + for (int j = 0; j < path.size(); j++) { + HashMap point = path.get(j); + + double lat = Double.parseDouble(point.get("lat")); + double lng = Double.parseDouble(point.get("lng")); + LatLng position = new LatLng(lat, lng); + + points.add(position); + } + + // Adding all the points in the route to LineOptions + lineOptions.addAll(points); + lineOptions.width(10); + + /* Random rnd = new Random(); + int color = Color.argb(255, rnd.nextInt(256), rnd.nextInt(256), rnd.nextInt(256));*/ + int color; + if(global_index= color_list.size()){ + index = index - color_list.size(); + } + + return index; + } + + void getShortestPath(StoreBean store){ + + sortedList.add(store); + + if(sortedList.size() { + + @Override + protected String doInBackground(String... url) { + + // For storing data from web service + String data = ""; + + try { + // Fetching the data from web service + data = downloadUrl(url[0]); + Log.d("Background Task data", data.toString()); + } catch (Exception e) { + Log.d("Background Task", e.toString()); + } + return data; + } + + @Override + protected void onPostExecute(String result) { + super.onPostExecute(result); + + ParserTask parserTask = new ParserTask(); + + // Invokes the thread for parsing the JSON data + parserTask.execute(result); + + } + } + + /** + * A class to parse the Google Places in JSON format + */ + private class ParserTask extends AsyncTask>>> { + + // Parsing the data in non-ui thread + @Override + protected List>> doInBackground(String... jsonData) { + + JSONObject jObject; + List>> routes = null; + + try { + jObject = new JSONObject(jsonData[0]); + Log.d("ParserTask",jsonData[0].toString()); + DataParser parser = new DataParser(); + Log.d("ParserTask", parser.toString()); + + // Starts parsing data + routes = parser.parse(jObject); + Log.d("ParserTask","Executing routes"); + Log.d("ParserTask",routes.toString()); + + } catch (Exception e) { + Log.d("ParserTask",e.toString()); + e.printStackTrace(); + } + return routes; + } + + // Executes in UI thread, after the parsing process + @Override + protected void onPostExecute(List>> result) { + ArrayList points; + PolylineOptions lineOptions = null; + + // Traversing through all the routes + for (int i = 0; i < result.size(); i++) { + points = new ArrayList<>(); + lineOptions = new PolylineOptions(); + + // Fetching i-th route + List> path = result.get(i); + + // Fetching all the points in i-th route + for (int j = 0; j < path.size(); j++) { + HashMap point = path.get(j); + + double lat = Double.parseDouble(point.get("lat")); + double lng = Double.parseDouble(point.get("lng")); + LatLng position = new LatLng(lat, lng); + + points.add(position); + } + + // Adding all the points in the route to LineOptions + lineOptions.addAll(points); + lineOptions.width(10); + lineOptions.color(Color.parseColor("#64dd17")); + + Log.d("onPostExecute","onPostExecute lineoptions decoded"); + + } + + // Drawing polyline in the Google Map for the i-th route + if(lineOptions != null) { + mMap.addPolyline(lineOptions); + } + else { + Log.d("onPostExecute","without Polylines drawn"); + } + } + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java index 9311727..ee23fd6 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java @@ -45,10 +45,13 @@ 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.xmlGetterSetter.AuditDataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.NoCameraDataGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.POGGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.StockFacing_PlanogramTrackerDataGetterSetter; @@ -245,7 +248,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity { for (int i = 0; i < coverageList.size(); i++) { - storeData = db.getSpecificStoreData(coverageList.get(i).getVisitDate(), coverageList.get(i).getStoreId()); + storeData = db.getSpecificStoreData(date, coverageList.get(i).getStoreId()); if (storeData.getSTORE_ID() != null) { if (storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_Y) || @@ -417,6 +420,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity { //MSL_Availability_StockFacing String mslAvailability_stockFacing_xml = ""; onXML = ""; + db.open(); msl_availabilityStockFacingList = db.getMSL_Availability_StockFacing_UploadServerData(coverageList.get(i).getStoreId()); if (msl_availabilityStockFacingList.size() > 0) { @@ -473,6 +477,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity { //Promo Compliance - Promotion Data String promoition_data_xml = ""; onXML = ""; + db.open(); promotionSkuList = db.getPromoComplianceSkuServerUploadData(coverageList.get(i).getStoreId()); if (promotionSkuList.size() > 0) { @@ -525,6 +530,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity { //Promo Compliance -Additional Promotion Data String additional_promoition_data_xml = ""; onXML = ""; + db.open(); additionalPromotionList = db.getAdditionalPromotionServerUploadData(coverageList.get(i).getStoreId()); if (additionalPromotionList.size() > 0) { @@ -581,6 +587,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity { String onXMLdIALOG = ""; String imageV1, imageV2, imageV3; + db.open(); additionalVisibilityList = db.getAdditionalStockUpload(coverageList.get(i).getStoreId()); if (additionalVisibilityList.size() > 0) { @@ -676,6 +683,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity { //T2p Upload Data String t2p_data_xml = ""; onXML = ""; + db.open(); t2PGetterSetters = db.getT2pComplianceData(coverageList.get(i).getStoreId(), null); if (t2PGetterSetters.size() > 0) { @@ -738,12 +746,12 @@ public class PreviousDataUploadActivity extends AppCompatActivity { } } - String present = ""; + /* String present = ""; if (t2PGetterSetters.get(i1).isPresent()) { present = "1"; } else { present = "0"; - } + }*/ onXML = "[T2P_DATA]" + "[MID]" + mid + "[/MID]" @@ -755,9 +763,10 @@ public class PreviousDataUploadActivity extends AppCompatActivity { + "[IMAGE]" + t2PGetterSetters.get(i1).getImage() + "[/IMAGE]" + "[IMAGE1]" + t2PGetterSetters.get(i1).getImage1() + "[/IMAGE1]" + "[IMAGE2]" + t2PGetterSetters.get(i1).getImage2() + "[/IMAGE2]" - + "[PRESENT]" + present + "[/PRESENT]" + + "[PRESENT]" + t2PGetterSetters.get(i1).getPresent() + "[/PRESENT]" + "[GAPS_DATA]" + gaps_xml + "[/GAPS_DATA]" + "[SKU_DATA]" + sku_xml + "[/SKU_DATA]" + + "[CATEGORY_FIXTURE]" + t2PGetterSetters.get(i1).getCategory_fixture() + "[/CATEGORY_FIXTURE]" + "[BRAND_DATA]" + brandxml + "[/BRAND_DATA]" + "[/T2P_DATA]"; @@ -768,7 +777,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity { request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); request.addProperty("XMLDATA", t2p_final_xml); - request.addProperty("KEYS", "T2P_DATA_NEW"); + request.addProperty("KEYS", "T2P_DATA_FIXTURE"); request.addProperty("USERNAME", userId); request.addProperty("MID", mid); @@ -793,6 +802,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity { //Stock Facing Planogram Tracker String stock_facing_planogram_xml = ""; onXML = ""; + db.open(); stockFacingPlanogramDataList = db.getStockAndFacingPlanogramServerUploadData(coverageList.get(i).getStoreId()); if (stockFacingPlanogramDataList.size() > 0) { @@ -847,6 +857,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity { String CategoryLISTDATA = ""; String image1, image2, image3, image4; + db.open(); adddata = db.getCategoryPictureUpload(coverageList.get(i).getStoreId()); if (adddata.size() > 0) { @@ -931,11 +942,138 @@ public class PreviousDataUploadActivity extends AppCompatActivity { /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; }*/ + } else { + + db.open(); + ArrayList nocamera_data_list = db.getNoCameraCategoryStoreWiseDataInserted(coverageList.get(i).getStoreId()); + + if (nocamera_data_list.size() > 0) { + + String onXml_nodata = "", No_camera_data = ""; + for (int n = 0; n < nocamera_data_list.size(); n++) { + + onXml_nodata = "[NO_CAMERA_POG_DATA]" + + "[MID]" + mid + "[/MID]" + + "[USER_ID]" + userId + "[/USER_ID]" + + "[CATEGORY_ID]" + nocamera_data_list.get(n).getCATEGORY_ID() + "[/CATEGORY_ID]" + + "[SUB_CATEGORY_ID]" + nocamera_data_list.get(n).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]" + + "[SKU_GROUP_ID]" + nocamera_data_list.get(n).getSKUGROUP_ID() + "[/SKU_GROUP_ID]" + + "[ROW_NO]" + nocamera_data_list.get(n).getRow_no() + "[/ROW_NO]" + + "[COLUMN_NO]" + nocamera_data_list.get(n).getColumn_no() + "[/COLUMN_NO]" + + "[FACING]" + nocamera_data_list.get(n).getFacing() + "[/FACING]" + + "[/NO_CAMERA_POG_DATA]"; + + No_camera_data = No_camera_data + onXml_nodata; + } + + final String sos_xml = "[DATA]" + No_camera_data + "[/DATA]"; + + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); + request.addProperty("XMLDATA", sos_xml); + request.addProperty("KEYS", "NO_CAMERA_POG"); + request.addProperty("USERNAME", userId); + request.addProperty("MID", mid); + + envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); + envelope.dotNet = true; + envelope.setOutputSoapObject(request); + + androidHttpTransport = new HttpTransportSE(CommonString.URL); + androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope); + + result = envelope.getResponse(); + } + } data.value = 60; data.name = getString(R.string.additional_data_uploading); publishProgress(data); + //Audit data + db.open(); + ArrayList audit_data = db.getAuditDataForUpload(coverageList.get(i).getStoreId()); + + if (audit_data.size() > 0) { + + String onXml_audit_data = "", Audit_data = ""; + for (int n = 0; n < audit_data.size(); n++) { + + onXml_audit_data = "[AUDIT_DATA]" + + "[MID]" + mid + "[/MID]" + + "[USER_ID]" + userId + "[/USER_ID]" + + "[CATEGORY_ID]" + audit_data.get(n).getCATEGORY_ID() + "[/CATEGORY_ID]" + + "[QUESTION_ID]" + audit_data.get(n).getQUESTION_ID() + "[/QUESTION_ID]" + + "[ANSWER_ID]" + audit_data.get(n).getANSWER_ID() + "[/ANSWER_ID]" + + "[ANSWER_IMAGE]" + audit_data.get(n).getCAM_IMAGE() + "[/ANSWER_IMAGE]" + + "[/AUDIT_DATA]"; + + Audit_data = Audit_data + onXml_audit_data; + } + + final String sos_xml = "[DATA]" + Audit_data + "[/DATA]"; + + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); + request.addProperty("XMLDATA", sos_xml); + request.addProperty("KEYS", "AUDIT_DATA"); + request.addProperty("USERNAME", userId); + request.addProperty("MID", mid); + + envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); + envelope.dotNet = true; + envelope.setOutputSoapObject(request); + + androidHttpTransport = new HttpTransportSE(CommonString.URL); + androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope); + + result = envelope.getResponse(); + } + + data.value = 62; + data.name = getString(R.string.audit); + publishProgress(data); + + //POG data + db.open(); + ArrayList pog_data = db.getAfterSavePOGForUploadData(coverageList.get(i).getStoreId()); + + if (pog_data.size() > 0) { + + String onXml_pog_data = "", POG_data = ""; + for (int n = 0; n < pog_data.size(); n++) { + + onXml_pog_data = "[POG_DATA]" + + "[MID]" + mid + "[/MID]" + + "[USER_ID]" + userId + "[/USER_ID]" + + "[CATEGORY_ID]" + pog_data.get(n).getCATEGORY_ID() + "[/CATEGORY_ID]" + + "[SUB_CATEGORY_ID]" + pog_data.get(n).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]" + + "[QUESTION_ID]" + pog_data.get(n).getQUESTION_ID() + "[/QUESTION_ID]" + + "[ANSWER_ID]" + pog_data.get(n).getANSWER_ID() + "[/ANSWER_ID]" + + "[/POG_DATA]"; + + POG_data = POG_data + onXml_pog_data; + } + + final String sos_xml = "[DATA]" + POG_data + "[/DATA]"; + + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); + request.addProperty("XMLDATA", sos_xml); + request.addProperty("KEYS", "POG_DATA"); + request.addProperty("USERNAME", userId); + request.addProperty("MID", mid); + + envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); + envelope.dotNet = true; + envelope.setOutputSoapObject(request); + + androidHttpTransport = new HttpTransportSE(CommonString.URL); + androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope); + + result = envelope.getResponse(); + } + + data.value = 63; + data.name = getString(R.string.pog); + publishProgress(data); // Images Upload @@ -1006,7 +1144,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity { } } - data.value = 60; + data.value = 64; publishProgress(data); // ashish close image @@ -1016,7 +1154,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity { for (int J = 0; J < adddata.size(); J++) { String KeyID = adddata.get(J).getKEY_ID(); - + db.open(); listdat = db.getCategoryPictureListUploaded(KeyID); if (listdat.size() > 0) { @@ -1425,6 +1563,29 @@ public class PreviousDataUploadActivity extends AppCompatActivity { } } } + + //Audit Answer Image + for (int m = 0; m < audit_data.size(); m++) { + + if (audit_data.get(m).getCAM_IMAGE() != null && !audit_data.get(m).getCAM_IMAGE().equals("")) { + if (new File(CommonString.FILE_PATH + audit_data.get(m).getCAM_IMAGE()).exists()) { + + try { + result = UploadImage(audit_data.get(m).getCAM_IMAGE(), "AuditImages"); + + runOnUiThread(new Runnable() { + public void run() { + message.setText("Audit Images Uploaded"); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + } + data.value = 90; publishProgress(data); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java index 3732301..d436242 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -66,6 +66,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NoCameraDataGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.POGGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.StockFacing_PlanogramTrackerDataGetterSetter; @@ -1032,6 +1033,7 @@ public class UploadActivity extends AppCompatActivity { + "[QUESTION_ID]" + audit_data.get(n).getQUESTION_ID() + "[/QUESTION_ID]" + "[ANSWER_ID]" + audit_data.get(n).getANSWER_ID() + "[/ANSWER_ID]" + "[ANSWER_IMAGE]" + audit_data.get(n).getCAM_IMAGE() + "[/ANSWER_IMAGE]" + + "[ANSWER_IMAGE2]" + audit_data.get(n).getCAM_IMAGE2() + "[/ANSWER_IMAGE2]" + "[/AUDIT_DATA]"; Audit_data = Audit_data + onXml_audit_data; @@ -1041,7 +1043,7 @@ public class UploadActivity extends AppCompatActivity { request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); request.addProperty("XMLDATA", sos_xml); - request.addProperty("KEYS", "AUDIT_DATA"); + request.addProperty("KEYS", "AUDIT_DATA_NEW"); request.addProperty("USERNAME", userId); request.addProperty("MID", mid); @@ -1059,6 +1061,49 @@ public class UploadActivity extends AppCompatActivity { data.name = getString(R.string.audit); publishProgress(data); + //POG data + db.open(); + ArrayList pog_data = db.getAfterSavePOGForUploadData(coverageList.get(i).getStoreId()); + + if (pog_data.size() > 0) { + + String onXml_pog_data = "", POG_data = ""; + for (int n = 0; n < pog_data.size(); n++) { + + onXml_pog_data = "[POG_DATA]" + + "[MID]" + mid + "[/MID]" + + "[USER_ID]" + userId + "[/USER_ID]" + + "[CATEGORY_ID]" + pog_data.get(n).getCATEGORY_ID() + "[/CATEGORY_ID]" + + "[SUB_CATEGORY_ID]" + pog_data.get(n).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]" + + "[QUESTION_ID]" + pog_data.get(n).getQUESTION_ID() + "[/QUESTION_ID]" + + "[ANSWER_ID]" + pog_data.get(n).getANSWER_ID() + "[/ANSWER_ID]" + + "[/POG_DATA]"; + + POG_data = POG_data + onXml_pog_data; + } + + final String sos_xml = "[DATA]" + POG_data + "[/DATA]"; + + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); + request.addProperty("XMLDATA", sos_xml); + request.addProperty("KEYS", "POG_DATA"); + request.addProperty("USERNAME", userId); + request.addProperty("MID", mid); + + envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); + envelope.dotNet = true; + envelope.setOutputSoapObject(request); + + androidHttpTransport = new HttpTransportSE(CommonString.URL); + androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope); + + result = envelope.getResponse(); + } + + data.value = 63; + data.name = getString(R.string.pog); + publishProgress(data); + // Images Upload // ashish visibility image start diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/AdditionalQuestiongetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/AdditionalQuestiongetterSetter.java index 5a7a9f3..55ad1e6 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/AdditionalQuestiongetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/AdditionalQuestiongetterSetter.java @@ -19,6 +19,8 @@ public class AdditionalQuestiongetterSetter { ArrayList ANSWER = new ArrayList<>(); ArrayList STORETYPE_ID = new ArrayList<>(); ArrayList CAMERA_ALLOW = new ArrayList<>(); + ArrayList KEYACCOUNT_ID = new ArrayList<>(); + ArrayList NO_OF_CAMERA = new ArrayList<>(); public String getTable_ADDITIONAL_QUESTION() { return table_ADDITIONAL_QUESTION; @@ -99,4 +101,20 @@ public class AdditionalQuestiongetterSetter { public void setCAMERA_ALLOW(String CAMERA_ALLOW) { this.CAMERA_ALLOW.add(CAMERA_ALLOW); } + + public ArrayList getKEYACCOUNT_ID() { + return KEYACCOUNT_ID; + } + + public void setKEYACCOUNT_ID(String KEYACCOUNT_ID) { + this.KEYACCOUNT_ID.add(KEYACCOUNT_ID); + } + + public ArrayList getNO_OF_CAMERA() { + return NO_OF_CAMERA; + } + + public void setNO_OF_CAMERA(String NO_OF_CAMERA) { + this.NO_OF_CAMERA.add(NO_OF_CAMERA); + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/AuditDataGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/AuditDataGetterSetter.java index dbf394a..a020cf7 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/AuditDataGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/AuditDataGetterSetter.java @@ -6,7 +6,7 @@ package cpm.com.gskmtorange.xmlGetterSetter; public class AuditDataGetterSetter { - String QUESTION_ID, CULTURE_ID, CATEGORY_ID, QUESTION, ANSWER_TYPE, ANSWER_ID, ANSWER, CAM_IMAGE="", CAMERA_ALLOW="0"; + String QUESTION_ID, CULTURE_ID, CATEGORY_ID, QUESTION, ANSWER_TYPE, ANSWER_ID, ANSWER, CAM_IMAGE="", CAMERA_ALLOW="0", KEYACCOUNT_ID="0", NO_OF_CAMERA ="1", CAM_IMAGE2=""; public String getQUESTION_ID() { @@ -80,4 +80,28 @@ public class AuditDataGetterSetter { public void setCAMERA_ALLOW(String CAMERA_ALLOW) { this.CAMERA_ALLOW = CAMERA_ALLOW; } + + public String getKEYACCOUNT_ID() { + return KEYACCOUNT_ID; + } + + public void setKEYACCOUNT_ID(String KEYACCOUNT_ID) { + this.KEYACCOUNT_ID = KEYACCOUNT_ID; + } + + public String getNO_OF_CAMERA() { + return NO_OF_CAMERA; + } + + public void setNO_OF_CAMERA(String NO_OF_CAMERA) { + this.NO_OF_CAMERA = NO_OF_CAMERA; + } + + public String getCAM_IMAGE2() { + return CAM_IMAGE2; + } + + public void setCAM_IMAGE2(String CAM_IMAGE2) { + this.CAM_IMAGE2 = CAM_IMAGE2; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/DynamycIdsGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/DynamycIdsGetterSetter.java index 6ca94c7..c229aee 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/DynamycIdsGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/DynamycIdsGetterSetter.java @@ -8,6 +8,7 @@ public class DynamycIdsGetterSetter { int recycler_id = 0; int textview_id = 0; + int total_unit = 0; public int getRecycler_id() { return recycler_id; @@ -24,4 +25,12 @@ public class DynamycIdsGetterSetter { public void setTextview_id(int textview_id) { this.textview_id = textview_id; } + + public int getTotal_unit() { + return total_unit; + } + + public void setTotal_unit(int total_unit) { + this.total_unit = total_unit; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/JourneyPlanGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/JourneyPlanGetterSetter.java index faa6b10..ffada7e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/JourneyPlanGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/JourneyPlanGetterSetter.java @@ -1,8 +1,9 @@ package cpm.com.gskmtorange.xmlGetterSetter; +import java.io.Serializable; import java.util.ArrayList; -public class JourneyPlanGetterSetter { +public class JourneyPlanGetterSetter implements Serializable{ String table_journey_plan; @@ -24,6 +25,8 @@ public class JourneyPlanGetterSetter { ArrayList CLASS_ID = new ArrayList(); ArrayList CAMERA_ALLOW = new ArrayList(); ArrayList VISIT_ORDER = new ArrayList(); + ArrayList LATITUDE = new ArrayList(); + ArrayList LONGITUDE = new ArrayList(); public ArrayList getCHANNEL_ID() { @@ -164,4 +167,20 @@ public class JourneyPlanGetterSetter { public void setVISIT_ORDER(String VISIT_ORDER) { this.VISIT_ORDER.add(VISIT_ORDER); } + + public ArrayList getLATITUDE() { + return LATITUDE; + } + + public void setLATITUDE(String LATITUDE) { + this.LATITUDE.add(LATITUDE); + } + + public ArrayList getLONGITUDE() { + return LONGITUDE; + } + + public void setLONGITUDE(String LONGITUDE) { + this.LONGITUDE.add(LONGITUDE); + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MappingStockGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MappingStockGetterSetter.java index c881dea..006823c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MappingStockGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MappingStockGetterSetter.java @@ -16,6 +16,7 @@ public class MappingStockGetterSetter { ArrayList SKU_ID = new ArrayList<>(); ArrayList MUST_HAVE = new ArrayList<>(); ArrayList MBQ = new ArrayList<>(); + ArrayList SHOW_ADDITIONAL_VISIBILITY = new ArrayList<>(); public String getTable_MAPPING_STOCK() { return table_MAPPING_STOCK; @@ -72,4 +73,12 @@ public class MappingStockGetterSetter { public void setMBQ(String MBQ) { this.MBQ.add(MBQ); } + + public ArrayList getSHOW_ADDITIONAL_VISIBILITY() { + return SHOW_ADDITIONAL_VISIBILITY; + } + + public void setSHOW_ADDITIONAL_VISIBILITY(String SHOW_ADDITIONAL_VISIBILITY) { + this.SHOW_ADDITIONAL_VISIBILITY.add(SHOW_ADDITIONAL_VISIBILITY); + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/NoCameraDataGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/NoCameraDataGetterSetter.java index 6cf424a..d827024 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/NoCameraDataGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/NoCameraDataGetterSetter.java @@ -9,6 +9,8 @@ public class NoCameraDataGetterSetter { String SKUGROUP_ID; String SKUGROUP_NAME; + boolean isVertical=false; + public String getSKUGROUP_ID() { return SKUGROUP_ID; } @@ -77,4 +79,12 @@ public class NoCameraDataGetterSetter { public void setSUB_CATEGORY(String SUB_CATEGORY) { this.SUB_CATEGORY = SUB_CATEGORY; } + + public boolean isVertical() { + return isVertical; + } + + public void setVertical(boolean vertical) { + isVertical = vertical; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/POGGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/POGGetterSetter.java new file mode 100644 index 0000000..f1b1425 --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/POGGetterSetter.java @@ -0,0 +1,114 @@ +package cpm.com.gskmtorange.xmlGetterSetter; + +import java.util.ArrayList; + +public class POGGetterSetter { + + String QUESTION_ID, CULTURE_ID, SUB_CATEGORY_ID, QUESTION, ANSWER_TYPE, ANSWER_ID, ANSWER, CAM_IMAGE="", CAMERA_ALLOW="0",QTYPE_ID,QTYPE, CATEGORY_ID; + + ArrayList answerList = new ArrayList<>(); + + public String getQUESTION_ID() { + return QUESTION_ID; + } + + public void setQUESTION_ID(String QUESTION_ID) { + this.QUESTION_ID = QUESTION_ID; + } + + public String getCULTURE_ID() { + return CULTURE_ID; + } + + public void setCULTURE_ID(String CULTURE_ID) { + this.CULTURE_ID = CULTURE_ID; + } + + public String getSUB_CATEGORY_ID() { + return SUB_CATEGORY_ID; + } + + public void setSUB_CATEGORY_ID(String SUB_CATEGORY_ID) { + this.SUB_CATEGORY_ID = SUB_CATEGORY_ID; + } + + public String getQUESTION() { + return QUESTION; + } + + public void setQUESTION(String QUESTION) { + this.QUESTION = QUESTION; + } + + public String getANSWER_TYPE() { + return ANSWER_TYPE; + } + + public void setANSWER_TYPE(String ANSWER_TYPE) { + this.ANSWER_TYPE = ANSWER_TYPE; + } + + public String getANSWER_ID() { + return ANSWER_ID; + } + + public void setANSWER_ID(String ANSWER_ID) { + this.ANSWER_ID = ANSWER_ID; + } + + public String getANSWER() { + return ANSWER; + } + + public void setANSWER(String ANSWER) { + this.ANSWER = ANSWER; + } + + public String getCAM_IMAGE() { + return CAM_IMAGE; + } + + public void setCAM_IMAGE(String CAM_IMAGE) { + this.CAM_IMAGE = CAM_IMAGE; + } + + public String getCAMERA_ALLOW() { + return CAMERA_ALLOW; + } + + public void setCAMERA_ALLOW(String CAMERA_ALLOW) { + this.CAMERA_ALLOW = CAMERA_ALLOW; + } + + public String getQTYPE_ID() { + return QTYPE_ID; + } + + public void setQTYPE_ID(String QTYPE_ID) { + this.QTYPE_ID = QTYPE_ID; + } + + public String getQTYPE() { + return QTYPE; + } + + public void setQTYPE(String QTYPE) { + this.QTYPE = QTYPE; + } + + public ArrayList getAnswerList() { + return answerList; + } + + public void setAnswerList(ArrayList answerList) { + this.answerList = answerList; + } + + public String getCATEGORY_ID() { + return CATEGORY_ID; + } + + public void setCATEGORY_ID(String CATEGORY_ID) { + this.CATEGORY_ID = CATEGORY_ID; + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/POGQuestionGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/POGQuestionGetterSetter.java new file mode 100644 index 0000000..b8b72b1 --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/POGQuestionGetterSetter.java @@ -0,0 +1,97 @@ +package cpm.com.gskmtorange.xmlGetterSetter; + +import java.util.ArrayList; + +public class POGQuestionGetterSetter { + String table_POG_QUESTION; + + ArrayList QUESTION_ID = new ArrayList<>(); + ArrayList CULTURE_ID = new ArrayList<>(); + ArrayList QUESTION = new ArrayList<>(); + ArrayList SUB_CATEGORY_ID = new ArrayList<>(); + ArrayList QTYPE_ID = new ArrayList<>(); + ArrayList QTYPE = new ArrayList<>(); + ArrayList KPI = new ArrayList<>(); + ArrayList ANSWER_ID = new ArrayList<>(); + ArrayList ANSWER = new ArrayList<>(); + + public String getTable_POG_QUESTION() { + return table_POG_QUESTION; + } + + public void setTable_POG_QUESTION(String table_POG_QUESTION) { + this.table_POG_QUESTION = table_POG_QUESTION; + } + + public ArrayList getQUESTION_ID() { + return QUESTION_ID; + } + + public void setQUESTION_ID(String QUESTION_ID) { + this.QUESTION_ID.add(QUESTION_ID); + } + + public ArrayList getCULTURE_ID() { + return CULTURE_ID; + } + + public void setCULTURE_ID(String CULTURE_ID) { + this.CULTURE_ID.add(CULTURE_ID); + } + + public ArrayList getQUESTION() { + return QUESTION; + } + + public void setQUESTION(String QUESTION) { + this.QUESTION.add(QUESTION); + } + + public ArrayList getSUB_CATEGORY_ID() { + return SUB_CATEGORY_ID; + } + + public void setSUB_CATEGORY_ID(String SUB_CATEGORY_ID) { + this.SUB_CATEGORY_ID.add(SUB_CATEGORY_ID); + } + + public ArrayList getQTYPE_ID() { + return QTYPE_ID; + } + + public void setQTYPE_ID(String QTYPE_ID) { + this.QTYPE_ID.add(QTYPE_ID); + } + + public ArrayList getQTYPE() { + return QTYPE; + } + + public void setQTYPE(String QTYPE) { + this.QTYPE.add(QTYPE); + } + + public ArrayList getKPI() { + return KPI; + } + + public void setKPI(String KPI) { + this.KPI.add(KPI); + } + + public ArrayList getANSWER_ID() { + return ANSWER_ID; + } + + public void setANSWER_ID(String ANSWER_ID) { + this.ANSWER_ID.add(ANSWER_ID); + } + + public ArrayList getANSWER() { + return ANSWER; + } + + public void setANSWER(String ANSWER) { + this.ANSWER.add(ANSWER); + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java index fd352bf..0c7b990 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java @@ -32,6 +32,7 @@ public class TableBean { public static String MAPPING_CATEGORY_IMAGE_ALLOW; public static String MAPPING_COUNTRYWISE_PLANOGRAM; public static String Table_ADDITIONAL_QUESTION; + public static String Table_POG_QUESTION; public static String getAdditionalDisplay() { @@ -226,4 +227,12 @@ public class TableBean { public static void setTable_ADDITIONAL_QUESTION(String table_ADDITIONAL_QUESTION) { Table_ADDITIONAL_QUESTION = table_ADDITIONAL_QUESTION; } + + public static String getTable_POG_QUESTION() { + return Table_POG_QUESTION; + } + + public static void setTable_POG_QUESTION(String table_POG_QUESTION) { + Table_POG_QUESTION = table_POG_QUESTION; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java index 918f711..de97c08 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java @@ -25,6 +25,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter; +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; @@ -195,8 +196,13 @@ public class XMLHandlers { jcpGetterSetter.setVISIT_ORDER(xpp.nextText()); } + if (xpp.getName().equals("LATITUDE")) { + jcpGetterSetter.setLATITUDE(xpp.nextText()); + } - + if (xpp.getName().equals("LONGITUDE")) { + jcpGetterSetter.setLONGITUDE(xpp.nextText()); + } } xpp.next(); } @@ -426,6 +432,8 @@ public class XMLHandlers { } if (xpp.getName().equals("MBQ")) { stock.setMBQ(xpp.nextText()); + }if (xpp.getName().equals("SHOW_ADDITIONAL_VISIBILITY")) { + stock.setSHOW_ADDITIONAL_VISIBILITY(xpp.nextText()); } } xpp.next(); @@ -1015,6 +1023,61 @@ public class XMLHandlers { if (xpp.getName().equals("CAMERA_ALLOW")) { st.setCAMERA_ALLOW(xpp.nextText()); } + if (xpp.getName().equals("KEYACCOUNT_ID")) { + st.setKEYACCOUNT_ID(xpp.nextText()); + } + if (xpp.getName().equals("NO_OF_CAMERA")) { + st.setNO_OF_CAMERA(xpp.nextText()); + } + } + xpp.next(); + } + } catch (XmlPullParserException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + return st; + } + + //POG_QUESTION + public static POGQuestionGetterSetter pogQuestionsXMLHandler(XmlPullParser xpp, int eventType) { + POGQuestionGetterSetter st = new POGQuestionGetterSetter(); + + try { + while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) { + if (xpp.getEventType() == XmlPullParser.START_TAG) { + + if (xpp.getName().equals("META_DATA")) { + st.setTable_POG_QUESTION(xpp.nextText()); + } + if (xpp.getName().equals("QUESTION_ID")) { + st.setQUESTION_ID(xpp.nextText()); + } + if (xpp.getName().equals("SUB_CATEGORY_ID")) { + st.setSUB_CATEGORY_ID(xpp.nextText()); + } + if (xpp.getName().equals("QUESTION")) { + st.setQUESTION(xpp.nextText()); + } + if (xpp.getName().equals("CULTURE_ID")) { + st.setCULTURE_ID(xpp.nextText()); + } + if (xpp.getName().equals("QTYPE_ID")) { + st.setQTYPE_ID(xpp.nextText()); + } + if (xpp.getName().equals("ANSWER_ID")) { + st.setANSWER_ID(xpp.nextText()); + } + if (xpp.getName().equals("ANSWER")) { + st.setANSWER(xpp.nextText()); + } + if (xpp.getName().equals("QTYPE")) { + st.setQTYPE(xpp.nextText()); + } + if (xpp.getName().equals("KPI")) { + st.setKPI(xpp.nextText()); + } } xpp.next(); } diff --git a/GSKMTOrange/src/main/res/drawable/baseline_map_white_36dp.png b/GSKMTOrange/src/main/res/drawable/baseline_map_white_36dp.png new file mode 100644 index 0000000..c5c9097 Binary files /dev/null and b/GSKMTOrange/src/main/res/drawable/baseline_map_white_36dp.png differ diff --git a/GSKMTOrange/src/main/res/drawable/baseline_store_black_18dp.png b/GSKMTOrange/src/main/res/drawable/baseline_store_black_18dp.png new file mode 100644 index 0000000..13cec60 Binary files /dev/null and b/GSKMTOrange/src/main/res/drawable/baseline_store_black_18dp.png differ diff --git a/GSKMTOrange/src/main/res/layout/activity_pogquestions.xml b/GSKMTOrange/src/main/res/layout/activity_pogquestions.xml new file mode 100644 index 0000000..352e206 --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/activity_pogquestions.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/activity_store_list_map.xml b/GSKMTOrange/src/main/res/layout/activity_store_list_map.xml new file mode 100644 index 0000000..713e9e2 --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/activity_store_list_map.xml @@ -0,0 +1,9 @@ + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/activity_store_list_route.xml b/GSKMTOrange/src/main/res/layout/activity_store_list_route.xml new file mode 100644 index 0000000..51bc5d3 --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/activity_store_list_route.xml @@ -0,0 +1,9 @@ + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/activity_store_route.xml b/GSKMTOrange/src/main/res/layout/activity_store_route.xml new file mode 100644 index 0000000..6f1b3b6 --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/activity_store_route.xml @@ -0,0 +1,9 @@ + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/add_facing_custom_dialog.xml b/GSKMTOrange/src/main/res/layout/add_facing_custom_dialog.xml index f644d66..5a1e471 100644 --- a/GSKMTOrange/src/main/res/layout/add_facing_custom_dialog.xml +++ b/GSKMTOrange/src/main/res/layout/add_facing_custom_dialog.xml @@ -58,12 +58,45 @@ + + + + + + + + + android:layout_marginBottom="5dp" + android:layout_marginTop="4dp"> - + + + + + + + + diff --git a/GSKMTOrange/src/main/res/layout/brand_item.xml b/GSKMTOrange/src/main/res/layout/brand_item.xml index 242dc9b..004ca55 100644 --- a/GSKMTOrange/src/main/res/layout/brand_item.xml +++ b/GSKMTOrange/src/main/res/layout/brand_item.xml @@ -17,7 +17,7 @@ @@ -45,8 +45,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="2dp" - android:textSize="14sp" - android:text="kdfkdfjk" + android:textSize="12sp" + android:text="kdfkdfjkhfdvhdgf" android:gravity="center" /> diff --git a/GSKMTOrange/src/main/res/layout/content_no_camera_individual.xml b/GSKMTOrange/src/main/res/layout/content_no_camera_individual.xml index 30ce49b..11eaaa9 100644 --- a/GSKMTOrange/src/main/res/layout/content_no_camera_individual.xml +++ b/GSKMTOrange/src/main/res/layout/content_no_camera_individual.xml @@ -14,7 +14,7 @@ android:id="@+id/rvTop" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_weight="3.5" /> + android:layout_weight="4" /> + android:layout_weight="6"> + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/custom_spinner_item.xml b/GSKMTOrange/src/main/res/layout/custom_spinner_item.xml index 0f15c06..20acaec 100644 --- a/GSKMTOrange/src/main/res/layout/custom_spinner_item.xml +++ b/GSKMTOrange/src/main/res/layout/custom_spinner_item.xml @@ -7,12 +7,12 @@ android:background="@android:color/transparent" > - + >--> - + diff --git a/GSKMTOrange/src/main/res/layout/item_msl_availability_stock_facing_header.xml b/GSKMTOrange/src/main/res/layout/item_msl_availability_stock_facing_header.xml index a7fbe99..cecb0f9 100644 --- a/GSKMTOrange/src/main/res/layout/item_msl_availability_stock_facing_header.xml +++ b/GSKMTOrange/src/main/res/layout/item_msl_availability_stock_facing_header.xml @@ -25,6 +25,7 @@ android:layout_centerVertical="true" android:layout_marginLeft="25dp" android:text="Brand Name " + android:padding="7dp" android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="#222" /> @@ -36,7 +37,7 @@ android:layout_centerVertical="true" android:layout_marginRight="30dp" android:src="@drawable/ic_menu_camera" - android:visibility="invisible" /> + android:visibility="gone" /> \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/marker_view.xml b/GSKMTOrange/src/main/res/layout/marker_view.xml new file mode 100644 index 0000000..7a26f72 --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/marker_view.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/pog_question.xml b/GSKMTOrange/src/main/res/layout/pog_question.xml new file mode 100644 index 0000000..9ba3615 --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/pog_question.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/storelist_child.xml b/GSKMTOrange/src/main/res/layout/storelist_child.xml new file mode 100644 index 0000000..b0dc27e --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/storelist_child.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +