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 50e43a8..e696a4d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -2144,7 +2144,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { //Store wise Performance public void InsertSTORE_PERFORMANCE(STORE_PERFORMANCE_MasterGetterSetter data) { - db.delete("STORE_PERFORMANCE", null, null); + db.delete("STORE_PERFORMANCE_NEW", null, null); ContentValues values = new ContentValues(); try { @@ -2153,17 +2153,18 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put("STORE_ID", data.getSTORE_ID().get(i)); values.put("CATEGORY_ID", data.getCATEGORY_ID().get(i)); values.put("PERIOD", data.getPERIOD().get(i)); - values.put("MSL_AVAILABILITY", data.getMSL_AVAILABILITY().get(i)); + values.put("MSL", data.getMSL_AVAILABILITY().get(i)); values.put("SOS", data.getSOS().get(i)); values.put("T2P", data.getT2P().get(i)); values.put("PROMO", data.getPROMO().get(i)); values.put("OSS", data.getOSS().get(i)); values.put("ORDERID", data.getORDERID().get(i)); + values.put("PLANOGRAM", data.getPLANOGRAM().get(i)); - db.insert("STORE_PERFORMANCE", null, values); + db.insert("STORE_PERFORMANCE_NEW", null, values); } } catch (Exception ex) { - Log.d("Exception ", " STORE_PERFORMANCE " + ex.toString()); + Log.d("Exception ", " STORE_PERFORMANCE_NEW " + ex.toString()); } } @@ -2173,7 +2174,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { Cursor dbcursor = null; try { - dbcursor = db.rawQuery("Select * from STORE_PERFORMANCE " + + dbcursor = db.rawQuery("Select * from STORE_PERFORMANCE_NEW " + "where STORE_ID='" + store_id + "' and CATEGORY_ID='" + category_id + "'", null); if (dbcursor != null) { @@ -2184,13 +2185,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper { cd.setStore_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STORE_ID"))); cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID"))); cd.setPeriod(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PERIOD"))); - cd.setMsl_availability(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MSL_AVAILABILITY"))); + cd.setMsl_availability(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MSL"))); cd.setSos(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SOS"))); cd.setT2p(dbcursor.getString(dbcursor.getColumnIndexOrThrow("T2P"))); cd.setPromo(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO"))); cd.setOss(dbcursor.getString(dbcursor.getColumnIndexOrThrow("OSS"))); cd.setOrder_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ORDERID"))); - + cd.setPLANOGRAM(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PLANOGRAM"))); list.add(cd); dbcursor.moveToNext(); } @@ -2209,9 +2210,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper { Cursor dbcursor = null; try { - dbcursor = db.rawQuery("Select PERIOD, ROUND(avg(MSL_AVAILABILITY),1) as MSL_AVAILABILITY,ROUND(avg(sos),1) as SOS ," + - " ROUND(avg(t2p),1) as T2P,ROUND(avg(pROMO),1) as PROMO,ROUND(SUM(oss),1) AS OSS " + - "from STORE_PERFORMANCE " + + dbcursor = db.rawQuery("Select PERIOD, ROUND(avg(MSL),1) as MSL,ROUND(avg(sos),1) as SOS ," + + " ROUND(avg(t2p),1) as T2P,ROUND(avg(pROMO),1) as PROMO , ROUND(avg(pLANOGRAM),1) as PLANOGRAM, ROUND(SUM(oss),1) AS OSS " + + "from STORE_PERFORMANCE_NEW " + "where STORE_ID='" + store_id + "' " + "GROUP BY PERIOD " + "ORDER BY ORDERID ", null); @@ -2224,12 +2225,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper { /* cd.setStore_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STORE_ID"))); cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID")));*/ cd.setPeriod(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PERIOD"))); - cd.setMsl_availability(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MSL_AVAILABILITY"))); + cd.setMsl_availability(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MSL"))); cd.setSos(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SOS"))); cd.setT2p(dbcursor.getString(dbcursor.getColumnIndexOrThrow("T2P"))); cd.setPromo(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO"))); cd.setOss(dbcursor.getString(dbcursor.getColumnIndexOrThrow("OSS"))); - // cd.setOrder_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ORDERID"))); + cd.setPLANOGRAM(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PLANOGRAM"))); list.add(cd); dbcursor.moveToNext(); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java index 25f651f..e03baa2 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java @@ -919,6 +919,12 @@ public class T2PComplianceActivity extends AppCompatActivity { error_msg = getResources().getString(R.string.click_image); break; } + else if (t2PGetterSetters.get(i).getBrandlist().size() == 0) { + flag = false; + error_msg = getResources().getString(R.string.title_activity_fill_brand); + break; + } + } } 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 2be485f..19042ed 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -633,7 +633,7 @@ public class DownloadActivity extends AppCompatActivity { //STORE_PERFORMANCE request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD); request.addProperty("UserName", userId); - request.addProperty("Type", "STORE_PERFORMANCE"); + request.addProperty("Type", "STORE_PERFORMANCE_NEW"); request.addProperty("cultureid", culture_id); envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); @@ -659,7 +659,7 @@ public class DownloadActivity extends AppCompatActivity { if (store_performance_masterGetterSetter.getSTORE_ID().size() > 0) { data.value = 85; - data.name = "STORE_PERFORMANCE Data Download"; + data.name = "STORE_PERFORMANCE_NEW Data Download"; } else { //return "STORE_PERFORMANCE"; } 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 b22b319..fe2c4a7 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 @@ -163,6 +163,8 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { holder.txt_t2p.setText(categoryData.getT2p()); holder.txt_promo.setText(categoryData.getPromo()); holder.txt_oss.setText(categoryData.getOss()); + holder.txt_planogram.setText(categoryData.getPLANOGRAM()); + } @Override @@ -171,7 +173,7 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { } class MyViewHolder extends RecyclerView.ViewHolder { - TextView txt_period, txt_sos, txt_t2p, txt_promo, txt_msl_availability, txt_oss; + TextView txt_period, txt_sos, txt_t2p, txt_promo, txt_msl_availability, txt_oss,txt_planogram; LinearLayout lay_menu; public MyViewHolder(View itemView) { @@ -183,6 +185,8 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { txt_promo = (TextView) itemView.findViewById(R.id.txt_promo); txt_msl_availability = (TextView) itemView.findViewById(R.id.txt_msl_availability); txt_oss = (TextView) itemView.findViewById(R.id.txt_oss); + txt_planogram = (TextView) itemView.findViewById(R.id.txt_planogram); + } } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java index 5bc2700..004c2b7 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java @@ -181,6 +181,8 @@ public class StoreWisePerformanceActivity extends AppCompatActivity { holder.txt_t2p.setText(categoryData.getT2p()); holder.txt_promo.setText(categoryData.getPromo()); holder.txt_oss.setText(categoryData.getOss()); + holder.txt_planogram.setText(categoryData.getPLANOGRAM()); + } @Override @@ -189,7 +191,7 @@ public class StoreWisePerformanceActivity extends AppCompatActivity { } class MyViewHolder extends RecyclerView.ViewHolder { - TextView txt_period, txt_sos, txt_t2p, txt_promo, txt_msl_availability, txt_oss; + TextView txt_period, txt_sos, txt_t2p, txt_promo, txt_msl_availability, txt_oss,txt_planogram; LinearLayout lay_menu; public MyViewHolder(View itemView) { @@ -201,6 +203,9 @@ public class StoreWisePerformanceActivity extends AppCompatActivity { txt_promo = (TextView) itemView.findViewById(R.id.txt_promo); txt_msl_availability = (TextView) itemView.findViewById(R.id.txt_msl_availability); txt_oss = (TextView) itemView.findViewById(R.id.txt_oss); + txt_planogram = (TextView) itemView.findViewById(R.id.txt_planogram); + + } } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/CategoryWisePerformaceGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/CategoryWisePerformaceGetterSetter.java index 2982517..bb2b301 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/CategoryWisePerformaceGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/CategoryWisePerformaceGetterSetter.java @@ -7,6 +7,15 @@ package cpm.com.gskmtorange.xmlGetterSetter; public class CategoryWisePerformaceGetterSetter { String store_id, category_id, period, msl_availability, sos, t2p, promo, oss, order_id; + public String getPLANOGRAM() { + return PLANOGRAM; + } + + public void setPLANOGRAM(String PLANOGRAM) { + this.PLANOGRAM = PLANOGRAM; + } + + String PLANOGRAM; public String getStore_id() { return store_id; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/STORE_PERFORMANCE_MasterGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/STORE_PERFORMANCE_MasterGetterSetter.java index 9b546b7..1114991 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/STORE_PERFORMANCE_MasterGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/STORE_PERFORMANCE_MasterGetterSetter.java @@ -18,6 +18,18 @@ public class STORE_PERFORMANCE_MasterGetterSetter { ArrayList MSL_AVAILABILITY = new ArrayList<>(); ArrayList OSS = new ArrayList<>(); ArrayList ORDERID = new ArrayList<>(); + ArrayList PLANOGRAM = new ArrayList<>(); + public ArrayList getPLANOGRAM() { + return PLANOGRAM; + } + + public void setPLANOGRAM(String PLANOGRAM) { + this.PLANOGRAM.add(PLANOGRAM); + } + + + + public String getTable_STORE_PERFORMANCE() { return table_STORE_PERFORMANCE; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StoreWisePerformaceGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StoreWisePerformaceGetterSetter.java index 9f290d7..5bfa4c5 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StoreWisePerformaceGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StoreWisePerformaceGetterSetter.java @@ -7,6 +7,16 @@ package cpm.com.gskmtorange.xmlGetterSetter; public class StoreWisePerformaceGetterSetter { String store_id, category_id, period, msl_availability, sos, t2p, promo, oss, order_id; + public String getPLANOGRAM() { + return PLANOGRAM; + } + + public void setPLANOGRAM(String PLANOGRAM) { + this.PLANOGRAM = PLANOGRAM; + } + + String PLANOGRAM; + public String getStore_id() { return store_id; } 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 2ebe7ea..40aa50c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java @@ -658,7 +658,7 @@ public class XMLHandlers { if (xpp.getName().equals("PROMO")) { st.setPROMO(xpp.nextText()); } - if (xpp.getName().equals("MSL_AVAILABILITY")) { + if (xpp.getName().equals("MSL")) { st.setMSL_AVAILABILITY(xpp.nextText()); } if (xpp.getName().equals("OSS")) { @@ -667,6 +667,10 @@ public class XMLHandlers { if (xpp.getName().equals("ORDERID")) { st.setORDERID(xpp.nextText()); } + if (xpp.getName().equals("PLANOGRAM")) { + st.setPLANOGRAM(xpp.nextText()); + } + } xpp.next(); } 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 7f24658..73411db 100644 --- a/GSKMTOrange/src/main/res/layout/content_category_wise_performance.xml +++ b/GSKMTOrange/src/main/res/layout/content_category_wise_performance.xml @@ -41,12 +41,12 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:orientation="horizontal" - android:weightSum="30"> + android:weightSum="28"> + + + + + + > + android:weightSum="28"> + + + + + + android:weightSum="28"> + + + + + + android:weightSum="28"> + + + + + + Değerleri girin Içinde bulunmayan veri + Lütfen marka verilerini doldurun + PLANOGRAM diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index 5025cdf..6b8302c 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -129,12 +129,12 @@ Add Period - MSL Availability + MSL SOS T2P Promo OSS - + Planogram LTM MTD LSV @@ -267,4 +267,5 @@ New Update Available \n\n Yeni güncelleme var Data not found in T2pBrand_Avaibility + Please fill brand data diff --git a/build.gradle b/build.gradle index c20bca1..74b2ab0 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.2' + classpath 'com.android.tools.build:gradle:2.2.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files