From 052fae426986fa6d9f08c8684d283a582e7da396 Mon Sep 17 00:00:00 2001 From: yadavendras Date: Thu, 19 Jul 2018 15:27:19 +0530 Subject: [PATCH] Deepak_commit_31_05_2018 --- GSKMTOrange/build.gradle | 13 +++++----- .../com/gskmtorange/Database/GSKOrangeDB.java | 13 +++++++--- .../cpm/com/gskmtorange/MainActivity.java | 5 ++-- .../dailyentry/ConversationActivity.java | 4 +++ .../dailyentry/MessageActivity.java | 12 ++++++--- .../dailyentry/NonWorkingReason.java | 2 ++ .../dailyentry/StoreListActivity.java | 4 ++- .../storeinmap/StoreListRouteActivity.java | 6 +++-- .../main/res/layout/storelistfablayout.xml | 2 +- .../src/main/res/mipmap-xhdpi/download.png | Bin 0 -> 5476 bytes GSKMTOrange/src/main/res/values-ar/string.xml | 23 ++++++++++++++++++ GSKMTOrange/src/main/res/values-tr/string.xml | 23 ++++++++++++++++++ GSKMTOrange/src/main/res/values/strings.xml | 2 +- 13 files changed, 89 insertions(+), 20 deletions(-) create mode 100644 GSKMTOrange/src/main/res/mipmap-xhdpi/download.png diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index 26edea9..8c2f0ef 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -25,16 +25,17 @@ android { versionName "2.6"*/ //For UAE - /*versionCode 15 - versionName "2.7"*/ + versionCode 18 + versionName "3.0" //For Turkey - versionCode 15 - versionName "2.7" + /* versionCode 15 + versionName "2.7"*/ //For KSA - /* versionCode 16 - versionName "2.8"*/ + /* versionCode 18 + versionName "3.0"*/ + multiDexEnabled true 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 9c22e48..bea2c13 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -1922,11 +1922,16 @@ public class GSKOrangeDB extends SQLiteOpenHelper { Cursor dbcursor = null; String table; - if(flag_from.equals(CommonString.FROM_JCP)){ - table = CommonString.KEY_JOURNEY_PLAN; + if(flag_from!=null){ + if(flag_from.equals(CommonString.FROM_JCP)){ + table = CommonString.KEY_JOURNEY_PLAN; + } + else { + table = CommonString.KEY_ADHOC_JOURNEY_PLAN; + } } else { - table = CommonString.KEY_ADHOC_JOURNEY_PLAN; + table = CommonString.KEY_JOURNEY_PLAN; } try { @@ -2553,7 +2558,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - public ArrayList getSKUMasterData(String store_id) { + public ArrayList getSKUMasterData() { Cursor cursordata = null; ArrayList Data = new ArrayList(); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index 1ef8ee6..9879f6c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -252,9 +252,10 @@ public class MainActivity extends AppCompatActivity if (checkNetIsAvailable()) { - storelist = db.getStoreData(date, CommonString.KEY_JOURNEY_PLAN); + //Alert need to change this check so than user can work on Adhoc even having no JCP + //storelist = db.getStoreData(date, CommonString.KEY_JOURNEY_PLAN); - if (storelist.size() == 0) { + if ( db.getSKUMasterData().size() == 0) { Snackbar.make(webView, R.string.title_store_list_download_data, Snackbar.LENGTH_SHORT) .setAction("Action", null).show(); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ConversationActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ConversationActivity.java index caa62b6..c9a7ac2 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ConversationActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ConversationActivity.java @@ -50,6 +50,7 @@ import javax.xml.parsers.SAXParserFactory; import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.GetterSetter.ChatMessageGetterSetter; import cpm.com.gskmtorange.R; +import cpm.com.gskmtorange.constant.CommonFunctions; import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.gsk_dailyentry.StoreWisePerformanceActivity; import cpm.com.gskmtorange.xmlHandlers.FailureXMLHandler; @@ -92,6 +93,9 @@ public class ConversationActivity extends AppCompatActivity { setTitle(message_main); preferences = PreferenceManager.getDefaultSharedPreferences(this); + + CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); + userId = preferences.getString(CommonString.KEY_USERNAME, null); culture_id = preferences.getString(CommonString.KEY_CULTURE_ID, ""); store_id = preferences.getString(CommonString.KEY_STORE_ID, null); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/MessageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/MessageActivity.java index 051fa2e..89cec91 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/MessageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/MessageActivity.java @@ -43,6 +43,7 @@ import java.util.ArrayList; import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.GetterSetter.ChatMessageGetterSetter; import cpm.com.gskmtorange.R; +import cpm.com.gskmtorange.constant.CommonFunctions; import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.gsk_dailyentry.CategoryListActivity; import cpm.com.gskmtorange.gsk_dailyentry.CategoryWisePerformanceActivity; @@ -71,24 +72,26 @@ public class MessageActivity extends AppCompatActivity { GSKOrangeDB db; ArrayList chatmessagelist = new ArrayList<>(); + Toolbar toolbar; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_message); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); getSupportActionBar().setDisplayHomeAsUpEnabled(true); rec = (RecyclerView)findViewById(R.id.rec); - - db = new GSKOrangeDB(MessageActivity.this); db.open(); preferences = PreferenceManager.getDefaultSharedPreferences(this); + + CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); + userId = preferences.getString(CommonString.KEY_USERNAME, null); culture_id = preferences.getString(CommonString.KEY_CULTURE_ID, ""); store_id = preferences.getString(CommonString.KEY_STORE_ID, null); @@ -118,6 +121,9 @@ public class MessageActivity extends AppCompatActivity { protected void onResume() { super.onResume(); + CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); + toolbar.setTitle(getString(R.string.title_activity_message)); + new DowloadAsync(MessageActivity.this).execute(); } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java index d313426..d25c76e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java @@ -414,6 +414,7 @@ public class NonWorkingReason extends AppCompatActivity implements cdata.setRemark(text.getText().toString().replaceAll("[&^<>{}'$]", " ")); cdata.setStatus(CommonString.STORE_STATUS_LEAVE); + cdata.setFlag_from(store_flag_str); database.InsertCoverageData(cdata); @@ -451,6 +452,7 @@ public class NonWorkingReason extends AppCompatActivity implements "[&^<>{}'$]", " ")); cdata.setStatus(CommonString.STORE_STATUS_LEAVE); + cdata.setFlag_from(store_flag_str); database.InsertCoverageData(cdata); 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 e113281..4a78a73 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -666,7 +666,7 @@ public class StoreListActivity extends AppCompatActivity { Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class); in.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID()); - in.putExtra(CommonString.KEY_STORE_FLAG, CommonString.FROM_DEVIATION); + in.putExtra(CommonString.KEY_STORE_FLAG, CommonString.FROM_JCP); startActivity(in); } @@ -686,6 +686,7 @@ public class StoreListActivity extends AppCompatActivity { } else { Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class); in.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID()); + in.putExtra(CommonString.KEY_STORE_FLAG, CommonString.FROM_JCP); startActivity(in); } @@ -693,6 +694,7 @@ public class StoreListActivity extends AppCompatActivity { Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class); in.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID()); + in.putExtra(CommonString.KEY_STORE_FLAG, CommonString.FROM_JCP); startActivity(in); } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/StoreListRouteActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/StoreListRouteActivity.java index 5793446..2650da2 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/StoreListRouteActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/StoreListRouteActivity.java @@ -114,12 +114,14 @@ public class StoreListRouteActivity extends FragmentActivity implements OnMapRea origin = new LatLng(lat, lon); destination = new LatLng(Double.parseDouble(storelist.get(index+1).getLATITUDE()), Double.parseDouble(storelist.get(index+1).getLONGITUDE())); - String url = getUrl(origin, destination); + /* String url = getUrl(origin, destination); Log.d("onMapClick", url.toString()); FetchUrl FetchUrl = new FetchUrl(); // Start downloading json data from Google Directions API - FetchUrl.execute(url); + FetchUrl.execute(url);*/ + + showRoute(index+1); } } diff --git a/GSKMTOrange/src/main/res/layout/storelistfablayout.xml b/GSKMTOrange/src/main/res/layout/storelistfablayout.xml index 635e7bd..e050a18 100644 --- a/GSKMTOrange/src/main/res/layout/storelistfablayout.xml +++ b/GSKMTOrange/src/main/res/layout/storelistfablayout.xml @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_margin" - app:srcCompat="@android:drawable/ic_menu_more" + app:srcCompat="@mipmap/download" app:backgroundTint="@color/colorPrimary" android:visibility="gone" /> diff --git a/GSKMTOrange/src/main/res/mipmap-xhdpi/download.png b/GSKMTOrange/src/main/res/mipmap-xhdpi/download.png new file mode 100644 index 0000000000000000000000000000000000000000..75c322101062170c0ebbd9eec7aee6a3eac3b013 GIT binary patch literal 5476 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 nbfS+rPXPlRQ|;%PPEr2@8Hn9V literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/values-ar/string.xml b/GSKMTOrange/src/main/res/values-ar/string.xml index fdb54cf..c71158d 100644 --- a/GSKMTOrange/src/main/res/values-ar/string.xml +++ b/GSKMTOrange/src/main/res/values-ar/string.xml @@ -253,4 +253,27 @@ ادخل عدد الوجوه Please select present + //update date - 03-07-2018 + POG + POG + مكان + عمودي + أفقي + الجهة غير صحيحة + الخريطة + الخريطة + الخريطة + لا يمكن اضافة فواصل افقية لصفوف ممتلئة + لا يمكن الاضافة الى صف يحتوي على فواصل افقية + + الزيارات غير المخطط لها + الرسائل + الرجاء اختيار سبب عدم وجود الستاند + المحادثات + الرجاء ادخال رد + الزيارات غير المخطط لها + خط السير + غير مخططة + أدخل الرد + diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index edccee4..41fcae9 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -290,6 +290,29 @@ Mevcut olanı seç Rut Planı Arama + //update date - 25-06-2018 + POG + POG + Yerleştirme + Dikey + Yatay + Geçersiz ön yüz + Harita + Harita + Harita + Bu sıraya yatay ayraç eklenemez + Yatay ayraç olan sıraya eklenemez + + Ad hoc ziyaretler + Mesajlar + Teşhir olmamasının sebebini giriniz + Sohbetler + Lütfen cevap giriniz + Ad hoc - Store List + Yolculuk planı + Ad hoc + cevap giriniz + diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index a4daf40..8ffc6c9 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -364,7 +364,7 @@ Conversations Please enter reply Ad hoc - Store List - JCP + JCP(Journey Plan) Ad hoc Type response