This commit is contained in:
ashishandroid
2017-02-14 12:35:20 +05:30
parent 02d0ad3e82
commit 6799680555
16 changed files with 170 additions and 49 deletions
@@ -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();
@@ -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;
}
}
}
@@ -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";
}
@@ -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);
}
}
}
@@ -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);
}
}
}
@@ -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;
}
@@ -18,6 +18,18 @@ public class STORE_PERFORMANCE_MasterGetterSetter {
ArrayList<String> MSL_AVAILABILITY = new ArrayList<>();
ArrayList<String> OSS = new ArrayList<>();
ArrayList<String> ORDERID = new ArrayList<>();
ArrayList<String> PLANOGRAM = new ArrayList<>();
public ArrayList<String> getPLANOGRAM() {
return PLANOGRAM;
}
public void setPLANOGRAM(String PLANOGRAM) {
this.PLANOGRAM.add(PLANOGRAM);
}
public String getTable_STORE_PERFORMANCE() {
return table_STORE_PERFORMANCE;
@@ -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;
}
@@ -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();
}
@@ -41,12 +41,12 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:weightSum="30">
android:weightSum="28">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_period"
@@ -61,7 +61,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_msl_availability"
@@ -76,7 +76,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_sos"
@@ -91,7 +91,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_t2p"
@@ -106,7 +106,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_promo"
@@ -121,12 +121,28 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_oss"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#000" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/colorPrimary" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_PLANOGRAM"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#000" />
</LinearLayout>
<View
@@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:showIn="@layout/activity_category_wise_performance">
>
<LinearLayout
android:layout_width="match_parent"
@@ -41,12 +41,12 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:weightSum="30">
android:weightSum="28">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_period"
@@ -61,7 +61,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_msl_availability"
@@ -76,7 +76,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_sos"
@@ -91,7 +91,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_t2p"
@@ -106,7 +106,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_promo"
@@ -121,12 +121,28 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_oss"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#000" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/colorPrimary" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_PLANOGRAM"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#000" />
</LinearLayout>
<View
@@ -14,13 +14,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:weightSum="30">
android:weightSum="28">
<TextView
android:id="@+id/txt_period"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="Period"
@@ -36,7 +36,7 @@
android:id="@+id/txt_msl_availability"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="MSL Availability"
@@ -52,7 +52,7 @@
android:id="@+id/txt_sos"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="SOS"
@@ -68,7 +68,7 @@
android:id="@+id/txt_t2p"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="T2P"
@@ -84,7 +84,7 @@
android:id="@+id/txt_promo"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="Promo"
@@ -100,12 +100,29 @@
android:id="@+id/txt_oss"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="OSS"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#000" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/colorPrimary" />
<TextView
android:id="@+id/txt_planogram"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="PLANOGRAM"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#000" />
</LinearLayout>
<View
@@ -14,13 +14,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:weightSum="30">
android:weightSum="28">
<TextView
android:id="@+id/txt_period"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="Period"
@@ -36,7 +36,7 @@
android:id="@+id/txt_msl_availability"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="MSL Availability"
@@ -52,7 +52,7 @@
android:id="@+id/txt_sos"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="SOS"
@@ -68,7 +68,7 @@
android:id="@+id/txt_t2p"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="T2P"
@@ -84,7 +84,7 @@
android:id="@+id/txt_promo"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="Promo"
@@ -100,12 +100,30 @@
android:id="@+id/txt_oss"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="OSS"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#000" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/colorPrimary" />
<TextView
android:id="@+id/txt_planogram"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="PLANOGRAM"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#000" />
</LinearLayout>
<View
@@ -236,6 +236,8 @@
<string name="enter_the_values">Değerleri girin</string>
<string name="datanotfound">Içinde bulunmayan veri</string>
<string name="title_activity_fill_brand">Lütfen marka verilerini doldurun</string>
<string name="category_performance_PLANOGRAM">PLANOGRAM</string>
</resources>
+3 -2
View File
@@ -129,12 +129,12 @@
<string name="promo_compliance_add">Add</string>
<string name="category_performance_period">Period</string>
<string name="category_performance_msl_availability">MSL Availability</string>
<string name="category_performance_msl_availability">MSL</string>
<string name="category_performance_sos">SOS</string>
<string name="category_performance_t2p">T2P</string>
<string name="category_performance_promo">Promo</string>
<string name="category_performance_oss">OSS</string>
<string name="category_performance_PLANOGRAM">Planogram</string>
<string name="category_performance_ltm">LTM</string>
<string name="category_performance_mtd">MTD</string>
<string name="category_performance_lsv">LSV</string>
@@ -267,4 +267,5 @@
<string name="new_update_available">New Update Available \n\n Yeni güncelleme var</string>
<string name="datanotfound">Data not found in</string>
<string name="title_activity_t2p_brand__avaibility">T2pBrand_Avaibility</string>
<string name="title_activity_fill_brand">Please fill brand data</string>
</resources>
+1 -1
View File
@@ -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