Deepak_commit_31_05_2018

GSKMTOrange/build.gradle

@@ -25,16 +25,17 @@ android {
         versionName "2.6"*/
 
         //For UAE
-        /*versionCode 15
+        versionCode 18
-        versionName "2.7"*/
+        versionName "3.0"
 
         //For Turkey
-        versionCode 15
+        /* versionCode 15
-        versionName "2.7"
+         versionName "2.7"*/
 
         //For KSA
-        /* versionCode 16
+    /*    versionCode 18
-        versionName "2.8"*/
+        versionName "3.0"*/
+
 
         multiDexEnabled true
 

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)){
+        if(flag_from!=null){
-            table = CommonString.KEY_JOURNEY_PLAN;
+            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<SkuMasterGetterSetter> getSKUMasterData(String store_id) {
+    public ArrayList<SkuMasterGetterSetter> getSKUMasterData() {
         Cursor cursordata = null;
         ArrayList<SkuMasterGetterSetter> Data = new ArrayList<SkuMasterGetterSetter>();
 

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();

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);

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<ChatMessageGetterSetter> 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();
     }
 

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);
 

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);
                     }
 

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);
         }
     }
 

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"
         />

GSKMTOrange/src/main/res/values-ar/string.xml

@@ -253,4 +253,27 @@
     <string name="please_facing">ادخل عدد الوجوه</string>
     <string name="msg_select_present">Please select present</string>
 
+    //update date - 03-07-2018
+    <string name="pog">POG</string>
+    <string name="title_activity_pogquestions">POG</string>
+    <string name="placement">مكان</string>
+    <string name="vertical">عمودي</string>
+    <string name="horizontal">أفقي</string>
+    <string name="invalid_facing">الجهة غير صحيحة</string>
+    <string name="title_activity_store_list_map">الخريطة</string>
+    <string name="title_activity_store_list_route">الخريطة</string>
+    <string name="title_activity_store_route">الخريطة</string>
+    <string name="cannot_add_horizontal_to_filled_row">لا يمكن اضافة فواصل افقية لصفوف ممتلئة</string>
+    <string name="cannot_add_to_horizontal_seperatore">لا يمكن الاضافة الى صف يحتوي على فواصل افقية</string>
+
+    <string name="menu_deviation_data">الزيارات غير المخطط لها</string>
+    <string name="title_activity_message">الرسائل</string>
+    <string name="error_message_non_t2p_reason">الرجاء اختيار سبب عدم وجود الستاند</string>
+    <string name="title_activity_conversation">المحادثات</string>
+    <string name="reply_alert">الرجاء ادخال رد</string>
+    <string name="adhoc_store_list">الزيارات غير المخطط لها</string>
+    <string name="jcp">خط السير</string>
+    <string name="adhoc">غير مخططة</string>
+    <string name="hint_reply">أدخل الرد</string>
+
 </resources>

GSKMTOrange/src/main/res/values-tr/string.xml

@@ -290,6 +290,29 @@
     <string name="msg_select_present">Mevcut olanı seç</string>
     <string name="future_route_plan">Rut Planı Arama</string>
 
+    //update date - 25-06-2018
+    <string name="pog">POG</string>
+    <string name="title_activity_pogquestions">POG</string>
+    <string name="placement">Yerleştirme</string>
+    <string name="vertical">Dikey</string>
+    <string name="horizontal">Yatay</string>
+    <string name="invalid_facing">Geçersiz ön yüz</string>
+    <string name="title_activity_store_list_map">Harita</string>
+    <string name="title_activity_store_list_route">Harita</string>
+    <string name="title_activity_store_route">Harita</string>
+    <string name="cannot_add_horizontal_to_filled_row">Bu sıraya yatay ayraç eklenemez</string>
+    <string name="cannot_add_to_horizontal_seperatore">Yatay ayraç olan sıraya eklenemez</string>
+
+    <string name="menu_deviation_data">Ad hoc ziyaretler</string>
+    <string name="title_activity_message">Mesajlar</string>
+    <string name="error_message_non_t2p_reason">Teşhir olmamasının sebebini giriniz</string>
+    <string name="title_activity_conversation">Sohbetler</string>
+    <string name="reply_alert">Lütfen cevap giriniz</string>
+    <string name="adhoc_store_list">Ad hoc - Store List</string>
+    <string name="jcp">Yolculuk planı</string>
+    <string name="adhoc">Ad hoc</string>
+    <string name="hint_reply">cevap giriniz</string>
+
 </resources>
 
 

GSKMTOrange/src/main/res/values/strings.xml

@@ -364,7 +364,7 @@
     <string name="title_activity_conversation">Conversations</string>
     <string name="reply_alert">Please enter reply</string>
     <string name="adhoc_store_list">Ad hoc - Store List</string>
-    <string name="jcp">JCP</string>
+    <string name="jcp">JCP(Journey Plan)</string>
     <string name="adhoc">Ad hoc</string>
     <string name="hint_reply">Type response</string>