YSY commit

.idea/misc.xml

@@ -31,7 +31,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

GSKMTOrange/build.gradle

@@ -21,20 +21,20 @@ android {
         targetSdkVersion 22
 
         //For Egypt
-       /* versionCode 19
+       /*versionCode 20
-        versionName "3.1"*/
+        versionName "3.2"*/
 
         //For UAE
         /*versionCode 18
         versionName "3.0"*/
 
         //For Turkey
-        /*versionCode 15
+        versionCode 19
-         versionName "2.7"*/
+         versionName "3.1"
 
         //For KSA
-       versionCode 20
+        /*versionCode 21
-        versionName "3.2"
+        versionName "3.3"*/
 
 
         multiDexEnabled true

GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java

@@ -83,7 +83,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
  */
 
 public class GSKOrangeDB extends SQLiteOpenHelper {
-    public static final String DATABASE_NAME = "GSK_ORANGE_DB38";
+    public static final String DATABASE_NAME = "GSK_ORANGE_DB39";
     public static final int DATABASE_VERSION = 15;
     TableBean tableBean;
     private SQLiteDatabase db;
@@ -5654,6 +5654,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                 values.put("CAMERA_ALLOW", data.getCAMERA_ALLOW().get(i));
                 values.put("KEYACCOUNT_ID", data.getKEYACCOUNT_ID().get(i));
                 values.put("NO_OF_CAMERA", data.getNO_OF_CAMERA().get(i));
+                values.put("TYPE", data.getTYPE().get(i));
 
                 db.insert("ADDITIONAL_QUESTION", null, values);
             }
@@ -5684,6 +5685,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                             .getColumnIndexOrThrow("ANSWER_TYPE")));
                     sb.setKEYACCOUNT_ID(cursordata.getString(cursordata
                             .getColumnIndexOrThrow("KEYACCOUNT_ID")));
+                    sb.setCHECK_TYPE(cursordata.getString(cursordata
+                            .getColumnIndexOrThrow("TYPE")));
 
                     auditData.add(sb);
                     cursordata.moveToNext();

GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java

@@ -178,6 +178,12 @@ public class MainActivity extends AppCompatActivity
                     Menu nav_Menu = navigationView.getMenu();
                     nav_Menu.findItem(R.id.nav_planogram).setVisible(true);
                 }
+
+                if(configurationData.get(i).getCONFIGURE().get(0).equalsIgnoreCase("DELIVERY CALLS") &&
+                        configurationData.get(i).getACTIVE().get(0).equalsIgnoreCase("1")){
+                    Menu nav_Menu = navigationView.getMenu();
+                    nav_Menu.findItem(R.id.nav_delivery_call).setVisible(true);
+                }
             }
         }
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java

@@ -77,6 +77,8 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV
 
         CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
 
+        toolbar.setTitle(getResources().getString(R.string.title_activity_coaching_visit));
+
         str = CommonString.FILE_PATH;
 
         username = preferences.getString(CommonString.KEY_USERNAME, "");
@@ -122,8 +124,8 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV
         String select_str = getResources().getString(R.string.select);
 
         exist_adapter.add(select_str);
-        exist_adapter.add("Yes");
+        exist_adapter.add(getResources().getString(R.string.yes));
-        exist_adapter.add("No");
+        exist_adapter.add(getResources().getString(R.string.no));
 
         exist_spinner.setAdapter(exist_adapter);
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallActivity.java

@@ -41,6 +41,7 @@ import java.util.List;
 import cpm.com.gskmtorange.Database.GSKOrangeDB;
 import cpm.com.gskmtorange.GetterSetter.StoreBean;
 import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
 import cpm.com.gskmtorange.constant.CommonString;
 import cpm.com.gskmtorange.upload.UploadActivity;
 import cpm.com.gskmtorange.upload.UploadImageWithRetrofit;
@@ -196,6 +197,8 @@ public class DeliveryCallActivity extends AppCompatActivity implements View.OnCl
     protected void onResume() {
         super.onResume();
 
+        CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
         deliveryCallsList = database.getDeliveryCallsData(visit_date);
 
         if (deliveryCallsList.size() > 0) {
@@ -333,7 +336,7 @@ public class DeliveryCallActivity extends AppCompatActivity implements View.OnCl
 
                 for (int i = 0; i < fileAll.length; i++) {
                     String name = fileAll[i].getName();
-                    if(name.contains("CoachingVisit")){
+                    if(name.contains("DeliveryCalls")){
                         file_list.add(name);
                     }
                 }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallAddStoreActivity.java

@@ -62,6 +62,8 @@ public class DeliveryCallAddStoreActivity extends AppCompatActivity implements V
         preferences = PreferenceManager.getDefaultSharedPreferences(this);
         visit_date = preferences.getString(CommonString.KEY_DATE, null);
 
+        CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
         checkin_flag = getIntent().getBooleanExtra(CommonString.KEY_STORE_FLAG, true);
         deliveryCallsData = (DeliveryCallsGetterSetter) getIntent().getSerializableExtra(CommonString.KEY_STORE_ID);
 
@@ -149,7 +151,7 @@ public class DeliveryCallAddStoreActivity extends AppCompatActivity implements V
 
                 in_time = CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext());
 
-                _pathforcheck = "CoachingVisit" + visit_date.replace("/", "")+ "InTime" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
+                _pathforcheck = "DeliveryCalls" + visit_date.replace("/", "")+ "InTime" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
 
                 _path = CommonString.FILE_PATH + _pathforcheck;
 
@@ -160,7 +162,7 @@ public class DeliveryCallAddStoreActivity extends AppCompatActivity implements V
 
                 out_time = CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext());
 
-                _pathforcheck = "CoachingVisit" + visit_date.replace("/", "")+ "OutTime" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
+                _pathforcheck = "DeliveryCalls" + visit_date.replace("/", "")+ "OutTime" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
 
                 _path = CommonString.FILE_PATH + _pathforcheck;
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java

@@ -402,7 +402,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
             Bitmap resizedBitmap = Bitmap.createScaledBitmap(roughBitmap, (int) (roughBitmap.getWidth() * values[0]), (int) (roughBitmap.getHeight() * values[4]), true);
             // save image
             FileOutputStream out = new FileOutputStream(file2);
-            resizedBitmap.compress(Bitmap.CompressFormat.JPEG, 88, out);
+            resizedBitmap.compress(Bitmap.CompressFormat.JPEG, 80, out);
 
         } catch (Exception e) {
             Log.e("Image", e.toString(), e);

GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java

@@ -234,6 +234,8 @@ public class UploadImageWithRetrofit {
                             foldername = "AuditImages";
                         } else if (file[i].getName().contains("CoachingVisit")) {
                             foldername = "CoachingVisits";
+                        }  else if (file[i].getName().contains("DeliveryCalls")) {
+                            foldername = "DeliveryCallsImages";
                         } else{
                             foldername = "Bulkimages";
                         }
@@ -444,15 +446,15 @@ public class UploadImageWithRetrofit {
             // decode full image pre-resized
             in = new FileInputStream(file2);
             options = new BitmapFactory.Options();
-            // calc rought re-size (this is no exact resize)
+            // calc rough re-size (this is no exact resize)
-            options.inSampleSize = Math.max(inWidth / 800, inHeight / 500);
+            options.inSampleSize = Math.max(inWidth / 1632, inHeight / 1224);
             // decode full image
             Bitmap roughBitmap = BitmapFactory.decodeStream(in, null, options);
 
             // calc exact destination size
             Matrix m = new Matrix();
             RectF inRect = new RectF(0, 0, roughBitmap.getWidth(), roughBitmap.getHeight());
-            RectF outRect = new RectF(0, 0, 800, 500);
+            RectF outRect = new RectF(0, 0, 1632, 1224);
             m.setRectToRect(inRect, outRect, Matrix.ScaleToFit.CENTER);
             float[] values = new float[9];
             m.getValues(values);
@@ -460,7 +462,7 @@ public class UploadImageWithRetrofit {
             Bitmap resizedBitmap = Bitmap.createScaledBitmap(roughBitmap, (int) (roughBitmap.getWidth() * values[0]), (int) (roughBitmap.getHeight() * values[4]), true);
             // save image
             FileOutputStream out = new FileOutputStream(file2);
-            resizedBitmap.compress(Bitmap.CompressFormat.JPEG, 100, out);
+            resizedBitmap.compress(Bitmap.CompressFormat.JPEG, 80, out);
 
         } catch (Exception e) {
             Log.e("Image", e.toString(), e);

GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/AdditionalQuestiongetterSetter.java

@@ -21,6 +21,7 @@ public class AdditionalQuestiongetterSetter {
     ArrayList<String> CAMERA_ALLOW = new ArrayList<>();
     ArrayList<String> KEYACCOUNT_ID = new ArrayList<>();
     ArrayList<String> NO_OF_CAMERA = new ArrayList<>();
+    ArrayList<String> TYPE = new ArrayList<>();
 
     public String getTable_ADDITIONAL_QUESTION() {
         return table_ADDITIONAL_QUESTION;
@@ -117,4 +118,12 @@ public class AdditionalQuestiongetterSetter {
     public void setNO_OF_CAMERA(String NO_OF_CAMERA) {
         this.NO_OF_CAMERA.add(NO_OF_CAMERA);
     }
+
+    public ArrayList<String> getTYPE() {
+        return TYPE;
+    }
+
+    public void setTYPE(String TYPE) {
+        this.TYPE.add(TYPE);
+    }
 }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/AuditDataGetterSetter.java

@@ -6,7 +6,7 @@ package cpm.com.gskmtorange.xmlGetterSetter;
 
 public class AuditDataGetterSetter {
 
-    String QUESTION_ID, CULTURE_ID, CATEGORY_ID, QUESTION, ANSWER_TYPE, ANSWER_ID, ANSWER, CAM_IMAGE="", CAMERA_ALLOW="0", KEYACCOUNT_ID="0", NO_OF_CAMERA ="1", CAM_IMAGE2="";
+    String QUESTION_ID, CULTURE_ID, CATEGORY_ID, QUESTION, ANSWER_TYPE, ANSWER_ID, ANSWER, CAM_IMAGE="", CAMERA_ALLOW="0", KEYACCOUNT_ID="0", NO_OF_CAMERA ="1", CAM_IMAGE2="", CHECK_TYPE;
 
 
     public String getQUESTION_ID() {
@@ -104,4 +104,12 @@ public class AuditDataGetterSetter {
     public void setCAM_IMAGE2(String CAM_IMAGE2) {
         this.CAM_IMAGE2 = CAM_IMAGE2;
     }
+
+    public String getCHECK_TYPE() {
+        return CHECK_TYPE;
+    }
+
+    public void setCHECK_TYPE(String CHECK_TYPE) {
+        this.CHECK_TYPE = CHECK_TYPE;
+    }
 }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java

@@ -1051,6 +1051,9 @@ public class XMLHandlers {
                     if (xpp.getName().equals("NO_OF_CAMERA")) {
                         st.setNO_OF_CAMERA(xpp.nextText());
                     }
+                    if (xpp.getName().equals("TYPE")) {
+                        st.setTYPE(xpp.nextText());
+                    }
                 }
                 xpp.next();
             }

GSKMTOrange/src/main/res/layout/activity_coaching_visit.xml

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context=".dailyentry.CoachingVisitActivity">
 
     <android.support.design.widget.AppBarLayout

GSKMTOrange/src/main/res/menu/activity_main_drawer.xml

@@ -32,7 +32,7 @@
             android:id="@+id/nav_delivery_call"
             android:icon="@mipmap/baseline_local_shipping_black_48"
             android:title="@string/delivery_call"
-            android:visible="true"
+            android:visible="false"
             />
 
         <item

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

@@ -279,4 +279,18 @@
     <string name="you_need_to_be_in_the_store">يجب ان تكون داخل المحل حتى تتمكن من فتح/اغلاق الزيارة</string>
     <string name="distance_from_the_store">المسافة عن المحل</string>
 
+    <string name="meters">meters</string>
+    <string name="title_activity_coaching_visit">تدريب يزور</string>
+    <string name="select_supervisor">Select Supervisor</string>
+    <string name="coaching_visit">تدريب يزور</string>
+    <string name="please_save_data">الرجاء حفظ المعلومات</string>
+    <string name="delivery_call">زيارات توصيل</string>
+    <string name="add_store">اضافة محل</string>
+    <string name="please_fill">الرجاء تعبئة</string>
+    <string name="address">العنوان</string>
+    <string name="customer_store_name">اسم العميل / المحل</string>
+    <string name="please_click">الرجاء الضغط على</string>
+    <string name="intime_image">صورة الدخول</string>
+    <string name="outtime_image">صورة الخروج</string>
+
 </resources>