diff --git a/.idea/misc.xml b/.idea/misc.xml index 6bfc8f4..bd841ff 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -31,7 +31,7 @@ - + diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index 95a3fb7..8981aea 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -21,20 +21,20 @@ android { targetSdkVersion 22 //For Egypt - /* versionCode 19 - versionName "3.1"*/ + /*versionCode 20 + versionName "3.2"*/ //For UAE /*versionCode 18 versionName "3.0"*/ //For Turkey - /*versionCode 15 - versionName "2.7"*/ + versionCode 19 + versionName "3.1" //For KSA - versionCode 20 - versionName "3.2" + /*versionCode 21 + versionName "3.3"*/ 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 df278d0..b2a30f7 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/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(); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index 0e89d7c..f5ede16 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/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); + } } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java index 5b9686a..e713340 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java +++ b/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("No"); + exist_adapter.add(getResources().getString(R.string.yes)); + exist_adapter.add(getResources().getString(R.string.no)); exist_spinner.setAdapter(exist_adapter); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallActivity.java index 7ab5dd0..0eb7ac0 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallActivity.java +++ b/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); } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallAddStoreActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallAddStoreActivity.java index 5c9883f..4801bd3 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallAddStoreActivity.java +++ b/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; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java index 55cb338..c7e79de 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java +++ b/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); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java index 83abdea..7a0191f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java +++ b/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) - options.inSampleSize = Math.max(inWidth / 800, inHeight / 500); + // calc rough re-size (this is no exact resize) + 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); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/AdditionalQuestiongetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/AdditionalQuestiongetterSetter.java index 55ad1e6..b7a0fe7 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/AdditionalQuestiongetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/AdditionalQuestiongetterSetter.java @@ -21,6 +21,7 @@ public class AdditionalQuestiongetterSetter { ArrayList CAMERA_ALLOW = new ArrayList<>(); ArrayList KEYACCOUNT_ID = new ArrayList<>(); ArrayList NO_OF_CAMERA = new ArrayList<>(); + ArrayList 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 getTYPE() { + return TYPE; + } + + public void setTYPE(String TYPE) { + this.TYPE.add(TYPE); + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/AuditDataGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/AuditDataGetterSetter.java index a020cf7..a2c0cc6 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/AuditDataGetterSetter.java +++ b/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; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java index 876cab3..0630737 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java +++ b/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(); } diff --git a/GSKMTOrange/src/main/res/layout/activity_coaching_visit.xml b/GSKMTOrange/src/main/res/layout/activity_coaching_visit.xml index eb65612..8873c52 100644 --- a/GSKMTOrange/src/main/res/layout/activity_coaching_visit.xml +++ b/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"> يجب ان تكون داخل المحل حتى تتمكن من فتح/اغلاق الزيارة المسافة عن المحل + meters + تدريب يزور + Select Supervisor + تدريب يزور + الرجاء حفظ المعلومات + زيارات توصيل + اضافة محل + الرجاء تعبئة + العنوان + اسم العميل / المحل + الرجاء الضغط على + صورة الدخول + صورة الخروج +