diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 865d964..f6de050 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,11 +1,11 @@ + diff --git a/.idea/modules.xml b/.idea/modules.xml index 83437da..4467985 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,11 @@ + + + diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index 29fa2a6..3cdf07b 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -21,8 +21,8 @@ android { targetSdkVersion 26 //For Egypt - /* versionCode 28 - versionName "4.0"*/ + /* versionCode 29 + versionName "4.1"*/ //For UAE /* versionCode 24 @@ -30,8 +30,8 @@ android { //For Turkey - /* versionCode 23 - versionName "3.5"*/ + /* versionCode 25 + versionName "3.7"*/ //For KSA versionCode 26 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 49e2e5f..d21e096 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -75,6 +75,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.PharmaSOSGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.PromoComplianceSkuwiseGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.RowColumnGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.STORE_CATEGORY_WISEGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter; @@ -229,6 +230,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.execSQL(CommonString.CREATE_TABLE_INSERT_PHARMA_MSL_DATA);//--Added 30.04.2019 db.execSQL(TableBean.getTable_MAPPING_PHARMA_MSL());//--Added 16.05.2019 db.execSQL(TableBean.getTable_PROMOTION_TYPE_MASTER());//--Added 18.12.2019 + db.execSQL(TableBean.getCategoryWiseSos());//--Added 01.06.2020 db.execSQL(CommonString.CREATE_TABLE_INSERT_PHARMA_IMAGE_DATA);//--Added 20.05.2019 db.execSQL(CommonString.CREATE_TABLE_INSERT_COMPETIOTIONN_PROMO);//--Added 17.12.2019 db.execSQL(CommonString.CREATE_TABLE_INSERT_COMPETIOTIONN_PROMO_EXISTS);//--Added 17.12.2019 @@ -8693,5 +8695,88 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } + public void InsertCATEGORYWISE_SOS_TARGET(STORE_CATEGORY_WISEGetterSetter data) { + db.delete("CATEGORYWISE_SOS_TARGET", null, null); + + ContentValues values = new ContentValues(); + try { + + for (int i = 0; i < data.getCATEGORY_ID().size(); i++) { + + values.put("STORE_ID", data.getSTORE_ID().get(i)); + values.put("CATEGORY_ID", data.getCATEGORY_ID().get(i)); + values.put("SUB_CATEGORY", data.getSUB_CATEGORY().get(i)); + values.put("SOS_TARGET", data.getSOS_TARGET().get(i)); + db.insert("CATEGORYWISE_SOS_TARGET", null, values); + + } + + } catch (Exception ex) { + + } + } + + public ArrayList getCATEGORYWISE_SOS_TARGETData() { + Cursor cursordata = null; + ArrayList Data = new ArrayList(); + + try { + + cursordata = db.rawQuery("SELECT * FROM CATEGORYWISE_SOS_TARGET", null); + + if (cursordata != null) { + cursordata.moveToFirst(); + while (!cursordata.isAfterLast()) { + STORE_CATEGORY_WISEGetterSetter sb = new STORE_CATEGORY_WISEGetterSetter(); + + sb.setCATEGORY_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("CATEGORY_ID"))); + sb.setSOS_TARGET(cursordata.getString(cursordata.getColumnIndexOrThrow("SOS_TARGET"))); + sb.setSTORE_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("STORE_ID"))); + sb.setSUB_CATEGORY(cursordata.getString(cursordata.getColumnIndexOrThrow("SUB_CATEGORY"))); + + Data.add(sb); + cursordata.moveToNext(); + } + cursordata.close(); + } + + } catch (Exception ex) { + + } + return Data; + + } + + + + public ArrayList getSTORE_CATEGORY_WISE(String store_id, String category_id, String tableName) { + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + + try { + dbcursor = db.rawQuery("Select * from " + tableName + + " where STORE_ID='" + store_id + "' and CATEGORY_ID='" + category_id + "'", null); + + if (dbcursor != null) { + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + STORE_CATEGORY_WISEGetterSetter cd = new STORE_CATEGORY_WISEGetterSetter(); + + cd.setSTORE_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STORE_ID"))); + cd.setCATEGORY_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID"))); + cd.setSUB_CATEGORY(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY"))); + cd.setSOS_TARGET(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SOS_TARGET"))); + list.add(cd); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + Log.d("Exception ", "getPromoComplianceSkuData!" + e.toString()); + return list; + } + return list; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java index 8e8bb21..cc50cfc 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java @@ -193,9 +193,13 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. //populateAutoComplete(); mPasswordView = (EditText) findViewById(R.id.password); - // museridView.setText("egypt.1"); - // museridView.setText("DSR_Alex_61"); - // mPasswordView.setText("cpm123"); + /* museridView.setText("egypt.1"); + mPasswordView.setText("cpm123");*/ + /* museridView.setText("DSR_Alex_61"); + mPasswordView.setText("cpm123");*/ + + /* museridView.setText("DSR_Delta_24"); + mPasswordView.setText("cpm123");*/ /* museridView.setText("mini_ka_84_1"); mPasswordView.setText("cpm123");*/ @@ -205,11 +209,12 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. mPasswordView.setText("cpm@123");*/ //KSA - /* museridView.setText("mohamed.o"); + /* museridView.setText("mohamed.o"); mPasswordView.setText("cpm@123");*/ - /* museridView.setText("belinda.l"); + //turkey + /* museridView.setText("testmer"); mPasswordView.setText("cpm123");*/ mPasswordView.setOnEditorActionListener(new TextView.OnEditorActionListener() { @Override diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java index 1619589..bb6f142 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java @@ -504,7 +504,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic String status; //if (store_flag_str.equals(CommonString.FROM_JCP) || country_id.equalsIgnoreCase("5") || country_id.equalsIgnoreCase(CommonString.COUNTRY_ID_EGYPT +"") // || store_flag_str.equals(CommonString.FROM_ADDITIONAL) || store_flag_str.equals(CommonString.FROM_PHARMA)) { - if (store_flag_str.equals(CommonString.FROM_JCP) || country_id.equalsIgnoreCase("5") || store_flag_str.equals(CommonString.FROM_PHARMA)) { + if (store_flag_str.equals(CommonString.FROM_JCP) || country_id.equalsIgnoreCase("5") || store_flag_str.equals(CommonString.FROM_PHARMA)|| store_flag_str.equals(CommonString.FROM_DEVIATION)) { status = CommonString.KEY_INVALID; } else { status = CommonString.KEY_VALID; @@ -938,7 +938,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic dialog.dismiss(); //if (store_flag_str.equals(CommonString.FROM_JCP)|| country_id.equalsIgnoreCase("5")|| store_flag_str.equals(CommonString.FROM_ADDITIONAL) // || country_id.equalsIgnoreCase(CommonString.COUNTRY_ID_EGYPT +"")) { - if (store_flag_str.equals(CommonString.FROM_JCP)|| country_id.equalsIgnoreCase("5")) { + if (store_flag_str.equals(CommonString.FROM_JCP)|| country_id.equalsIgnoreCase("5")||store_flag_str.equals(CommonString.FROM_DEVIATION)) { Intent in = new Intent(StoreimageActivity.this, StoreWisePerformanceActivity.class); startActivity(in); finish(); 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 e7bf179..c270384 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -71,6 +71,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingSubReasonGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.POGQuestionGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.PROMOTION_TYPE_MASTERGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.STORE_CATEGORY_WISEGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuGroupMasterGetterSetter; @@ -129,6 +130,7 @@ public class DownloadActivity extends AppCompatActivity { MappingPharmaQuestionGetterSetter mappingPharmaQuestionGetterSetter; MappingPharmaMSLGetterSetter mappingPharmaMSLGetterSetter; PROMOTION_TYPE_MASTERGetterSetter promotion_type_masterGetterSetter; + STORE_CATEGORY_WISEGetterSetter store_category_wiseGetterSetter; private Dialog dialog; private ProgressBar pb; @@ -1011,7 +1013,6 @@ public class DownloadActivity extends AppCompatActivity { } publishProgress(data); - // //MAPPING_PLANOGRAM_STORE_WISE request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD); request.addProperty("UserName", userId); @@ -1083,6 +1084,43 @@ public class DownloadActivity extends AppCompatActivity { } publishProgress(data); + //CATEGORYWISE_SOS_TARGET + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD); + request.addProperty("UserName", userId); + request.addProperty("Type", "CATEGORYWISE_SOS_TARGET"); + 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(); + store_category_wiseGetterSetter = XMLHandlers.CATEGORYWISE_SOS_TARGETXMLHandler(xpp, eventType); + + String table_store_performace = store_category_wiseGetterSetter.getTable_CATEGORYWISE_SOS_TARGET(); + if (table_store_performace != null) { + resultHttp = CommonString.KEY_SUCCESS; + TableBean.setCategoryWiseSos(table_store_performace); + } + + if (store_category_wiseGetterSetter.getSTORE_ID().size() > 0) { + data.value = 85; + data.name = "CATEGORYWISE_SOS_TARGET Data Download"; + } else { + //return "CATEGORYWISE_SOS_TARGET"; + } + + } + publishProgress(data); + //SHELF_MASTER request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD); @@ -1989,9 +2027,7 @@ public class DownloadActivity extends AppCompatActivity { db.InsertMappingDisplayChecklist(mappingChecklistGetterSetter); db.InsertMAPPING_PROMOTION(mappingPromotionGetterSetter, "MAPPING_PROMOTION"); db.InsertMAPPING_ADDITIONAL_PROMOTION(mapping_additional_promotion_masterGetterSetter, "MAPPING_ADDITIONAL_PROMOTION"); - db.insertNonWorkingData(nonWorkingReasonGetterSetter); - //NON_WORKING_SUB_REASON added - 26.09.2018 db.insertNonWorkingSubreasonData(nonWorkingSubReasonGetterSetter); //usk @@ -2022,6 +2058,7 @@ public class DownloadActivity extends AppCompatActivity { db.InsertMAPPING_PHARMA_MSL(mappingPharmaMSLGetterSetter); db.InsertAdditionalAdhocJCP(additionalAdhocJcpGetterSetter); db.InsertPROMOTION_TYPE_MASTER(promotion_type_masterGetterSetter); + db.InsertCATEGORYWISE_SOS_TARGET(store_category_wiseGetterSetter); } catch (MalformedURLException e) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java index 381de67..22dea0c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java @@ -30,15 +30,17 @@ import cpm.com.gskmtorange.constant.CommonFunctions; import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.dailyentry.MessageActivity; import cpm.com.gskmtorange.xmlGetterSetter.CategoryWisePerformaceGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.STORE_CATEGORY_WISEGetterSetter; public class CategoryWisePerformanceActivity extends AppCompatActivity { - RecyclerView recyclerView; + RecyclerView recyclerView,recyclerView_sos; + LinearLayout lay_sos; Toolbar toolbar; - String categoryName = "", categoryId; - ArrayList categoryWisePerformanceList; + ArrayList store_category_wiseGetterSetters; CategoryWisePerformaceAdapter adapter; + CategoryWiseSosPerformaceAdapter sos_adapter; GSKOrangeDB db; String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, store_flag_str; @@ -52,6 +54,8 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { toolbar = (Toolbar) findViewById(R.id.toolbar); recyclerView = (RecyclerView) findViewById(R.id.recyclerView); + recyclerView_sos = (RecyclerView) findViewById(R.id.recyclerView_sos); + lay_sos = (LinearLayout) findViewById(R.id.lay_sos); db = new GSKOrangeDB(this); @@ -110,10 +114,18 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { categoryWisePerformanceList = db.getCategoryWisePerformance(store_id, categoryId, "STORE_PERFORMANCE_REVISED"); } - + store_category_wiseGetterSetters = db.getSTORE_CATEGORY_WISE(store_id, categoryId, "CATEGORYWISE_SOS_TARGET"); + if (store_category_wiseGetterSetters.size()==0){ + lay_sos.setVisibility(View.GONE); + } adapter = new CategoryWisePerformaceAdapter(CategoryWisePerformanceActivity.this, categoryWisePerformanceList); recyclerView.setAdapter(adapter); recyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext())); + + sos_adapter = new CategoryWiseSosPerformaceAdapter(CategoryWisePerformanceActivity.this, store_category_wiseGetterSetters); + recyclerView_sos.setAdapter(sos_adapter); + recyclerView_sos.setLayoutManager(new LinearLayoutManager(getApplicationContext())); + } catch (Exception e) { e.printStackTrace(); } @@ -208,4 +220,49 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { } } + //category wise + public class CategoryWiseSosPerformaceAdapter extends RecyclerView.Adapter { + Context context; + List list = Collections.emptyList(); + private LayoutInflater inflator; + + public CategoryWiseSosPerformaceAdapter(Context context, List list) { + inflator = LayoutInflater.from(context); + this.list = list; + this.context = context; + } + + @Override + public CategoryWiseSosPerformaceAdapter.MyViewHolder onCreateViewHolder(ViewGroup parent, int i) { + View view = inflator.inflate(R.layout.item_sos_category_wise_performance, parent, false); + CategoryWiseSosPerformaceAdapter.MyViewHolder holder = new CategoryWiseSosPerformaceAdapter.MyViewHolder(view); + return holder; + } + + @Override + public void onBindViewHolder(CategoryWiseSosPerformaceAdapter.MyViewHolder holder, int position) { + final STORE_CATEGORY_WISEGetterSetter categoryData = list.get(position); + + holder.txt_period.setText(categoryData.getSUB_CATEGORY().get(0)); + holder.txt_msl_availability.setText(categoryData.getSOS_TARGET().get(0)); + + + } + + @Override + public int getItemCount() { + return list.size(); + } + + class MyViewHolder extends RecyclerView.ViewHolder { + TextView txt_period,txt_msl_availability; + public MyViewHolder(View itemView) { + super(itemView); + txt_period = (TextView) itemView.findViewById(R.id.txt_period); + txt_msl_availability = (TextView) itemView.findViewById(R.id.txt_msl_availability); + + } + } + } + } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/STORE_CATEGORY_WISEGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/STORE_CATEGORY_WISEGetterSetter.java new file mode 100644 index 0000000..6b44bef --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/STORE_CATEGORY_WISEGetterSetter.java @@ -0,0 +1,56 @@ +package cpm.com.gskmtorange.xmlGetterSetter; + +import java.util.ArrayList; + +/** + * Created by UPENDRA on 01-06-2020. + */ + +public class STORE_CATEGORY_WISEGetterSetter { + String table_CATEGORYWISE_SOS_TARGET; + + ArrayList STORE_ID = new ArrayList<>(); + ArrayList CATEGORY_ID = new ArrayList<>(); + ArrayList SUB_CATEGORY = new ArrayList<>(); + ArrayList SOS_TARGET = new ArrayList<>(); + + public String getTable_CATEGORYWISE_SOS_TARGET() { + return table_CATEGORYWISE_SOS_TARGET; + } + + public void setTable_CATEGORYWISE_SOS_TARGET(String table_CATEGORYWISE_SOS_TARGET) { + this.table_CATEGORYWISE_SOS_TARGET = table_CATEGORYWISE_SOS_TARGET; + } + + public ArrayList getSTORE_ID() { + return STORE_ID; + } + + public void setSTORE_ID(String STORE_ID) { + this.STORE_ID.add(STORE_ID); + } + + public ArrayList getCATEGORY_ID() { + return CATEGORY_ID; + } + + public void setCATEGORY_ID(String CATEGORY_ID) { + this.CATEGORY_ID.add(CATEGORY_ID); + } + + public ArrayList getSUB_CATEGORY() { + return SUB_CATEGORY; + } + + public void setSUB_CATEGORY(String SUB_CATEGORY) { + this.SUB_CATEGORY.add(SUB_CATEGORY); + } + + public ArrayList getSOS_TARGET() { + return SOS_TARGET; + } + + public void setSOS_TARGET(String SOS_TARGET) { + this.SOS_TARGET.add(SOS_TARGET); + } +} 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 d21927b..f53a68c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java @@ -20,6 +20,16 @@ public class TableBean { public static String NON_WORKING_REASON; public static String MAPPING_PROMOTION; + public static String getCategoryWiseSos() { + return CATEGORY_WISE_SOS; + } + + public static void setCategoryWiseSos(String categoryWiseSos) { + CATEGORY_WISE_SOS = categoryWiseSos; + } + + public static String CATEGORY_WISE_SOS; + //Gagan start code public static String MAPPING_ADDITIONAL_PROMOTION; public static String STORE_PERFORMANCE; 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 c5f80fd..f959643 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java @@ -39,6 +39,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingSubReasonGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.POGQuestionGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.PROMOTION_TYPE_MASTERGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.STORE_CATEGORY_WISEGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuGroupMasterGetterSetter; @@ -1621,4 +1622,39 @@ public class XMLHandlers { return stock; } + + public static STORE_CATEGORY_WISEGetterSetter CATEGORYWISE_SOS_TARGETXMLHandler(XmlPullParser xpp, int eventType) { + STORE_CATEGORY_WISEGetterSetter st = new STORE_CATEGORY_WISEGetterSetter(); + + try { + while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) { + if (xpp.getEventType() == XmlPullParser.START_TAG) { + + if (xpp.getName().equals("META_DATA")) { + st.setTable_CATEGORYWISE_SOS_TARGET(xpp.nextText()); + } + if (xpp.getName().equals("STORE_ID")) { + st.setSTORE_ID(xpp.nextText()); + } + if (xpp.getName().equals("CATEGORY_ID")) { + st.setCATEGORY_ID(xpp.nextText()); + } + if (xpp.getName().equals("SUB_CATEGORY")) { + st.setSUB_CATEGORY(xpp.nextText()); + } + if (xpp.getName().equals("SOS_TARGET")) { + st.setSOS_TARGET(xpp.nextText()); + } + + } + xpp.next(); + } + } catch (XmlPullParserException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + return st; + } + } diff --git a/GSKMTOrange/src/main/res/layout/content_category_wise_performance.xml b/GSKMTOrange/src/main/res/layout/content_category_wise_performance.xml index f94c503..dd54b63 100644 --- a/GSKMTOrange/src/main/res/layout/content_category_wise_performance.xml +++ b/GSKMTOrange/src/main/res/layout/content_category_wise_performance.xml @@ -140,8 +140,62 @@ + + + + + + + + + + + + + + + + + + diff --git a/GSKMTOrange/src/main/res/layout/item_sos_category_wise_performance.xml b/GSKMTOrange/src/main/res/layout/item_sos_category_wise_performance.xml new file mode 100644 index 0000000..7cde862 --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/item_sos_category_wise_performance.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + diff --git a/library/build/outputs/logs/manifest-merger-debug-report.txt b/library/build/outputs/logs/manifest-merger-debug-report.txt index d643700..4bbb248 100644 --- a/library/build/outputs/logs/manifest-merger-debug-report.txt +++ b/library/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,41 +1,41 @@ -- Merging decision tree log --- manifest -ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 -INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 -INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 -INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 -INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 -INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 -INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 +ADDED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 +INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 +INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 +INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 +INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 +INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 +INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 package - ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:3:5-49 - INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml - INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml + ADDED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:3:5-49 + INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml + INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml android:versionName - INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml - ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 - INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml + INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml + ADDED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 + INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml android:versionCode - INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml - ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 - INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml + INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml + ADDED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 + INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml xmlns:android - ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:11-69 + ADDED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:11-69 application -ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:5:5-7:19 +ADDED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:5:5-7:19 android:allowBackup - ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:5:18-44 + ADDED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:5:18-44 uses-sdk -INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml reason: use-sdk injection requested -INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml -INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml -INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml -INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml +INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml reason: use-sdk injection requested +INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml +INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml +INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml +INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml android:targetSdkVersion - INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml - ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml - INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml + INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml + ADDED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml + INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml android:minSdkVersion - INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml - ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml - INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml + INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml + ADDED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml + INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml