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 0000000..75c3221 Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-xhdpi/download.png differ 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