From af4271360ad4e9ef5a13f3ce2aa0d8a4434c0d96 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Fri, 13 Jan 2017 10:07:07 +0530 Subject: [PATCH] Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest # Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml --- .../com/gskmtorange/Database/GSKOrangeDB.java | 36 +++++++++- .../download/DownloadActivity.java | 63 ++++++++++++++++++ .../gsk_dailyentry/CategoryListActivity.java | 2 +- .../gsk_dailyentry/DailyDataMenuActivity.java | 2 +- .../MSL_AvailabilityActivity.java | 23 +++++++ .../PromoComplianceActivity.java | 28 +++++++- .../gsk_dailyentry/Stock_FacingActivity.java | 28 +++++++- .../MAPPING_PLANOGRAM_DataGetterSetter.java | 51 ++++++++++++++ GSKMTOrange/src/main/res/menu/planogram.xml | 2 +- .../res/mipmap-hdpi/ref_images_orange.png | Bin 0 -> 1325 bytes .../main/res/mipmap-hdpi/ref_images_white.png | Bin 0 -> 1414 bytes 11 files changed, 225 insertions(+), 10 deletions(-) create mode 100644 GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_DataGetterSetter.java create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/ref_images_orange.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/ref_images_white.png 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 b38031b..b09bcc3 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -18,6 +18,7 @@ import cpm.com.gskmtorange.GetterSetter.StoreBean; import cpm.com.gskmtorange.xmlGetterSetter.CategoryWisePerformaceGetterSetter; import cpm.com.gskmtorange.GetterSetter.AdditionalDialogGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter; import cpm.com.gskmtorange.constant.CommonString; @@ -2455,11 +2456,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper { Cursor dbcursor = null; try { - if(category_id == null){ + if (category_id == null) { dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_COMPLIANCE + " where " + CommonString.KEY_STORE_ID + "='" + store_id + "'", null); - } - else{ + } else { dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_COMPLIANCE + " where " + CommonString.KEY_STORE_ID + "='" + store_id + "' AND " + CommonString.KEY_CATEGORY_ID + "='" + category_id + "'", null); @@ -2577,6 +2577,36 @@ public class GSKOrangeDB extends SQLiteOpenHelper { Log.d("Exception ", " MAPPING_PLANOGRAM " + ex.toString()); } } + + public ArrayList getMappingPlanogramData(String category_id) { + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + try { + dbcursor = db.rawQuery("SELECT * FROM MAPPING_PLANOGRAM", null); + + if (dbcursor != null) { + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + MAPPING_PLANOGRAM_DataGetterSetter mp = new MAPPING_PLANOGRAM_DataGetterSetter(); + + mp.setKEYACCOUNT_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("KEYACCOUNT_ID"))); + mp.setSTORETYPE_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STORETYPE_ID"))); + mp.setCLASS_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CLASS_ID"))); + mp.setPLANOGRAM_IMAGE(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PLANOGRAM_IMAGE"))); + mp.setIMAGE_PATH(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE_PATH"))); + + list.add(mp); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + return list; + } + return list; + } + //Gagan end new code 2 } 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 33e3d0d..9c64cee 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -8,6 +8,7 @@ import android.content.SharedPreferences; import android.graphics.drawable.ColorDrawable; import android.os.AsyncTask; import android.os.Bundle; +import android.os.Environment; import android.preference.PreferenceManager; import android.support.v7.app.AppCompatActivity; import android.view.Window; @@ -21,9 +22,15 @@ import org.ksoap2.transport.HttpTransportSE; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserFactory; +import java.io.File; +import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import java.io.StringReader; +import java.net.HttpURLConnection; import java.net.MalformedURLException; +import java.net.URL; +import java.text.DecimalFormat; import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.R; @@ -678,6 +685,62 @@ public class DownloadActivity extends AppCompatActivity { publishProgress(data); + //MAPPING_PLANOGRAM Image save into folder + if (mapping_planogram_masterGetterSetter != null) { + + for (int i = 0; i < mapping_planogram_masterGetterSetter.getIMAGE_PATH().size(); i++) { + //publishing image download + data.value = data.value + 1; + if (data.value < 100) { + publishProgress(data); + } + + String image_name = mapping_planogram_masterGetterSetter.getPLANOGRAM_IMAGE().get(i); + String path = mapping_planogram_masterGetterSetter.getIMAGE_PATH().get(i); + + if (!image_name.equalsIgnoreCase("NA") && !image_name.equalsIgnoreCase("")) { + URL url = new URL(path + "/" + image_name); + HttpURLConnection c = (HttpURLConnection) url.openConnection(); + c.setRequestMethod("GET"); + c.getResponseCode(); + c.connect(); + + if (c.getResponseCode() == 200) { + int length = c.getContentLength(); + + String size = new DecimalFormat("##.##").format((double) length / 1024) + " KB"; + + //String PATH = Environment.getExternalStorageDirectory() + "/Download/GT_GSK_Images/"; + String PATH = CommonString.FILE_PATH; + File file = new File(PATH); + if (!file.isDirectory()) { + file.mkdir(); + } + + // Environment.getExternalStorageDirectory() + "/GT_GSK_Images/" + _pathforcheck1; + if (!new File(PATH + image_name).exists() && !size.equalsIgnoreCase("0 KB")) { + File outputFile = new File(file, image_name); + FileOutputStream fos = new FileOutputStream(outputFile); + InputStream is1 = c.getInputStream(); + + int bytes = 0; + byte[] buffer = new byte[1024]; + int len1 = 0; + + while ((len1 = is1.read(buffer)) != -1) { + bytes = (bytes + len1); + // data.value = (int) ((double) (((double) + // bytes) / length) * 100); + fos.write(buffer, 0, len1); + } + fos.close(); + is1.close(); + } + } + } + } + } + //Gagan end code diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java index a4a887f..4603c3a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java @@ -95,7 +95,7 @@ public class CategoryListActivity extends AppCompatActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.main, menu); + //getMenuInflater().inflate(R.menu.main, menu); return true; } 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 b055e81..bacd5ce 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 @@ -161,7 +161,7 @@ public class DailyDataMenuActivity extends AppCompatActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.main, menu); + //getMenuInflater().inflate(R.menu.main, menu); return true; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java index 02c615f..9e78b17 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java @@ -266,6 +266,29 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { return super.onOptionsItemSelected(item); } + @Override + public void onBackPressed() { + //super.onBackPressed(); + + android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(MSL_AvailabilityActivity.this); + builder.setTitle("Parinaam"); + builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false) + .setPositiveButton("OK", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + + finish(); + } + }) + .setNegativeButton("Cancel ", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + + } + }); + android.app.AlertDialog alert = builder.create(); + alert.show(); + } + public class ExpandableListAdapter extends BaseExpandableListAdapter { private Context _context; private List _listDataHeader; 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 8824f9d..48fb3c2 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 @@ -41,9 +41,8 @@ public class PromoComplianceActivity extends AppCompatActivity { GSKOrangeDB db; String categoryName, categoryId; - - private SharedPreferences preferences; String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id; + private SharedPreferences preferences; @Override protected void onCreate(Bundle savedInstanceState) { @@ -411,7 +410,7 @@ public class PromoComplianceActivity extends AppCompatActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.main, menu); + //getMenuInflater().inflate(R.menu.main, menu); return true; } @@ -433,4 +432,27 @@ public class PromoComplianceActivity extends AppCompatActivity { return super.onOptionsItemSelected(item); } + + @Override + public void onBackPressed() { + //super.onBackPressed(); + + android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(PromoComplianceActivity.this); + builder.setTitle("Parinaam"); + builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false) + .setPositiveButton("OK", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + + finish(); + } + }) + .setNegativeButton("Cancel ", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + + } + }); + android.app.AlertDialog alert = builder.create(); + alert.show(); + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java index c1f991e..fa5688d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java @@ -58,6 +58,7 @@ import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.R; import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.dailyentry.T2PComplianceActivity; +import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter; @@ -543,7 +544,9 @@ public class Stock_FacingActivity extends AppCompatActivity { ImageView img_planogram = (ImageView) dialog.findViewById(R.id.img_planogram); - String planogram_image = ""; + ArrayList mp = db.getMappingPlanogramData(""); + + String planogram_image = mp.get(0).getPLANOGRAM_IMAGE(); if (new File(str + planogram_image).exists()) { Bitmap bmp = BitmapFactory.decodeFile(str + planogram_image); img_planogram.setImageBitmap(bmp); @@ -574,6 +577,29 @@ public class Stock_FacingActivity extends AppCompatActivity { return super.onOptionsItemSelected(item); } + @Override + public void onBackPressed() { + //super.onBackPressed(); + + android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(Stock_FacingActivity.this); + builder.setTitle("Parinaam"); + builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false) + .setPositiveButton("OK", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + + finish(); + } + }) + .setNegativeButton("Cancel ", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + + } + }); + android.app.AlertDialog alert = builder.create(); + alert.show(); + } + public class ExpandableListAdapter extends BaseExpandableListAdapter { private Context _context; private List _listDataHeader; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_DataGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_DataGetterSetter.java new file mode 100644 index 0000000..e6c0b90 --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_DataGetterSetter.java @@ -0,0 +1,51 @@ +package cpm.com.gskmtorange.xmlGetterSetter; + +import java.util.ArrayList; + +/** + * Created by gagang on 12-01-2017. + */ + +public class MAPPING_PLANOGRAM_DataGetterSetter { + String KEYACCOUNT_ID, STORETYPE_ID, CLASS_ID, PLANOGRAM_IMAGE, IMAGE_PATH; + + public String getKEYACCOUNT_ID() { + return KEYACCOUNT_ID; + } + + public void setKEYACCOUNT_ID(String KEYACCOUNT_ID) { + this.KEYACCOUNT_ID = KEYACCOUNT_ID; + } + + public String getSTORETYPE_ID() { + return STORETYPE_ID; + } + + public void setSTORETYPE_ID(String STORETYPE_ID) { + this.STORETYPE_ID = STORETYPE_ID; + } + + public String getCLASS_ID() { + return CLASS_ID; + } + + public void setCLASS_ID(String CLASS_ID) { + this.CLASS_ID = CLASS_ID; + } + + public String getPLANOGRAM_IMAGE() { + return PLANOGRAM_IMAGE; + } + + public void setPLANOGRAM_IMAGE(String PLANOGRAM_IMAGE) { + this.PLANOGRAM_IMAGE = PLANOGRAM_IMAGE; + } + + public String getIMAGE_PATH() { + return IMAGE_PATH; + } + + public void setIMAGE_PATH(String IMAGE_PATH) { + this.IMAGE_PATH = IMAGE_PATH; + } +} diff --git a/GSKMTOrange/src/main/res/menu/planogram.xml b/GSKMTOrange/src/main/res/menu/planogram.xml index a538a1b..2aa7f62 100644 --- a/GSKMTOrange/src/main/res/menu/planogram.xml +++ b/GSKMTOrange/src/main/res/menu/planogram.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/ref_images_orange.png b/GSKMTOrange/src/main/res/mipmap-hdpi/ref_images_orange.png new file mode 100644 index 0000000000000000000000000000000000000000..de62d47cb3463918383ca55554d145de030b8300 GIT binary patch literal 1325 zcmeAS@N?(olHy`uVBq!ia0vp^G9b*s1|*Ak?@s|zk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87 z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$ zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`f(~1RD^r68eAMwS&*t9 zlvv ztM~P_^2{qPNz6-5^>ndS0-B(gnVDi`YGPn&X>8%-VrgP(Xy|I@=xSu(WMpD!>g4QV zYH48!)9aF-T$-DjR|3v4~Pj*wm=R%;iu*SQ+p9GS&LhzK4xHGTCgZF_RO}7k2yAMXnM%ASC^&oVvFCmxs8!0JhlnGRdMlDeOxal6V&DKhUJKVV}-oH z|3%ZpH%89jJTkd)hUBUJJV&-U{F%rhZ{S?}SA4pVn#n#B0e^>0JS-)RJNi8MLzp)T z*s;D4o5g4-Emmsg^5Y!yD}%rwotiG^yTMG;8XwhYnxuGa`XD0k-c6WUbq1f!v__{C z)1ZK^NwYHkG+M}a#5VpA6!`8a%%^9-+tEAmhsse!j+*vgCnP(BIU}a=96jM6;?413 z>x75|hO>4&7P@Ovo-j_@du4-wNY3kq8N%%{JR*#RA~yApHca4^YR{?AiQ&@i-N4AX z;{A_>Vofp$o#ziJWjx!@;%o7OVajzIjvsPqeD+h`_MUc{@Q6zzTDGIyaq=FMkTcC4 zLGB_itQA+Z^1KjRbY1N7f>cebA52Gt7Zy3O=&&sPr0EdTrKZP!gnyzg%hFxO8BaBK zGCXmRGuc?8Ft1Z)$>fzOlFVYK9S+D@@-6PrTA;}+ccSozh-TsikpriK92Ne#vH#u? j@#02c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87 z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$ zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`kBtHuNWFoz#!AFNG#Ad)HBe}%?0@jth%@)C>7xhtg4GcDhpEegHnt0 zON)|$@sXws(+mtd{1$-}0$pR}Uz7=ql*AmD{N&Qy)VvZ;7h5Huj9yA+ij}FGg@w6` zrIU$)i-oJ1p`oRji-D7gv8%a}vze=jlPSy$Y>#D)oXxPua$FAYGO%#QAmD%4lD%(WaO9R7iZ)b zC^!e3DQJXe=B4D97i)r|2jW|o)S}F?)D*X({9FZa_*!LRv7fNNA$n8D2{V15WAs6Z z11YhRAyZ`xzE^uTk@po!{5*CT~-$J~Y=ngZ{c zAH|1sJL@FPbg+@^n7Q!JX@?x{Bl4Xe7>%!7ukZ9-ddb0t@uZQ!1=dGaO11&KN1T?V za2qS69bR;^Lsy(0aSfrbw zDrm*9G{;$?j^l{UhDU-k3cfhBn(yL|zM#Y0D4?*9acVTsPZ5h&I&9*Jv0>7k?EGC( zv?#7(#z6=XZom3|i(P1Q+0kR-`*Ls@;6MiN&BS0j7T1iRKS-!1trj+u@M r|J>Mr?}&JDqoL`^;l%r&*f