diff --git a/.idea/misc.xml b/.idea/misc.xml index bd841ff..6bfc8f4 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -31,7 +31,7 @@ - + diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index 0c8e07d..95a3fb7 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -21,20 +21,20 @@ android { targetSdkVersion 22 //For Egypt - versionCode 19 - versionName "3.1" + /* versionCode 19 + versionName "3.1"*/ //For UAE - /*versionCode 19 - versionName "3.1"*/ + /*versionCode 18 + versionName "3.0"*/ //For Turkey /*versionCode 15 versionName "2.7"*/ //For KSA - /*versionCode 19 - versionName "3.1"*/ + versionCode 20 + versionName "3.2" multiDexEnabled true diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml index 177e941..df65ef7 100644 --- a/GSKMTOrange/src/main/AndroidManifest.xml +++ b/GSKMTOrange/src/main/AndroidManifest.xml @@ -299,7 +299,18 @@ + android:theme="@style/AppTheme.NoActionBar" + android:screenOrientation="portrait"/> + + \ No newline at end of file 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 9759726..bd97dac 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -35,6 +35,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.CategoryMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.CategoryWisePerformaceGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.ChatMessageDownloadGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationContrywiseGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.DisplayChecklistMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.DisplayMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter; @@ -81,7 +82,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean; */ public class GSKOrangeDB extends SQLiteOpenHelper { - public static final String DATABASE_NAME = "GSK_ORANGE_DB35"; + public static final String DATABASE_NAME = "GSK_ORANGE_DB37"; public static final int DATABASE_VERSION = 15; TableBean tableBean; private SQLiteDatabase db; @@ -181,6 +182,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.execSQL(TableBean.getTable_GEO_FENCING()); db.execSQL(TableBean.getTable_NON_WORKING_SUB_REASON());//--Added 26.09.2018 db.execSQL(TableBean.getTable_SUPERVISOR_LIST());//--Added 01.10.2018 + db.execSQL(TableBean.getTable_CONFIGURATION_MASTER());//--Added 03.10.2018 //15-03-2017 db.execSQL(CommonString.CREATE_TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING); @@ -6643,4 +6645,52 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return sb; } + //CONFIGURATION_MASTER + public void InsertCONFIGURATION_MASTER(ConfigurationMasterGetterSetter data) { + db.delete("CONFIGURATION_MASTER", null, null); + + ContentValues values = new ContentValues(); + try { + for (int i = 0; i < data.getCOUNTRY_ID().size(); i++) { + + values.put("COUNTRY_ID", data.getCOUNTRY_ID().get(i)); + values.put("CONFIGURE", data.getCONFIGURE().get(i)); + values.put("ACTIVE", data.getACTIVE().get(i)); + + db.insert("CONFIGURATION_MASTER", null, values); + } + } catch (Exception ex) { + Log.d("Exception ", " in CONFIGURATION_MASTER " + ex.toString()); + } + } + + // get Configuration Master data + public ArrayList getConfigurationMasterData(String country_id) { + + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + + try { + dbcursor = db.rawQuery("SELECT * FROM CONFIGURATION_MASTER WHERE COUNTRY_ID='" + country_id + "'", null); + + if (dbcursor != null) { + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + ConfigurationMasterGetterSetter msg = new ConfigurationMasterGetterSetter(); + + msg.setCONFIGURE(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CONFIGURE"))); + msg.setACTIVE(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ACTIVE"))); + + list.add(msg); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + + Log.d("Exception ", "get Chat Message" + e.toString()); + } + return list; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index de085e9..ccede9b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -37,6 +37,7 @@ import cpm.com.gskmtorange.GetterSetter.CoverageBean; import cpm.com.gskmtorange.GetterSetter.StoreBean; import cpm.com.gskmtorange.constant.CommonFunctions; import cpm.com.gskmtorange.constant.CommonString; +import cpm.com.gskmtorange.dailyentry.DeliveryCallActivity; import cpm.com.gskmtorange.dailyentry.FutureJCPActivity; import cpm.com.gskmtorange.dailyentry.PlanogramPDFActivity; import cpm.com.gskmtorange.dailyentry.ServiceActivity; @@ -46,6 +47,7 @@ import cpm.com.gskmtorange.download.DownloadActivity; import cpm.com.gskmtorange.upload.PreviousDataUploadActivity; import cpm.com.gskmtorange.upload.UploadActivity; import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationContrywiseGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationMasterGetterSetter; import io.fabric.sdk.android.Fabric; public class MainActivity extends AppCompatActivity @@ -146,7 +148,7 @@ public class MainActivity extends AppCompatActivity db.open(); - //Deviation - Ad hoc Stores - enable + /*//Deviation - Ad hoc Stores - enable ArrayList configuration_data = db.getConfigurationData(country_id); if(configuration_data.size()>0){ if(configuration_data.get(0).getADHOC_REPORTING().get(0).equals("1")){ @@ -158,6 +160,25 @@ public class MainActivity extends AppCompatActivity Menu nav_Menu = navigationView.getMenu(); nav_Menu.findItem(R.id.nav_planogram).setVisible(true); } + }*/ + + //Enable disable According to Configuration + ArrayList configurationData = db.getConfigurationMasterData(country_id); + if(configurationData.size()>0){ + for(int i=0; i configurationData = database.getConfigurationMasterData(country_id); + if(configurationData.size()>0){ + + for(int i=0; i(this, @@ -137,8 +161,6 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV case R.id.spinner_coaching_visit: if (position != 0) { - - if(!update_flag){ fab_save.setVisibility(View.VISIBLE); @@ -183,8 +205,6 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV fab_save.setVisibility(View.GONE); } - - break; case R.id.spinner_supervisor: @@ -227,7 +247,7 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV flag = false; error_msg = getString(R.string.title_activity_select_dropdown); } - else if(image_name.equals("")){ + else if(coaching_visit_camera_flag && image_name.equals("")){ flag = false; error_msg = getString(R.string.clickimage); } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallActivity.java new file mode 100644 index 0000000..9a29520 --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallActivity.java @@ -0,0 +1,34 @@ +package cpm.com.gskmtorange.dailyentry; + +import android.content.Intent; +import android.os.Bundle; +import android.support.design.widget.FloatingActionButton; +import android.support.design.widget.Snackbar; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; +import android.view.View; + +import cpm.com.gskmtorange.R; + +public class DeliveryCallActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_delivery_call); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); + fab.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent in = new Intent(getApplicationContext(), DeliveryCallAddStoreActivity.class); + startActivity(in); + + overridePendingTransition(R.anim.activity_in, R.anim.activity_out); + } + }); + } + +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallAddStoreActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallAddStoreActivity.java new file mode 100644 index 0000000..bd3e57a --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallAddStoreActivity.java @@ -0,0 +1,221 @@ +package cpm.com.gskmtorange.dailyentry; + +import android.content.ActivityNotFoundException; +import android.content.Intent; +import android.content.SharedPreferences; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; +import android.net.Uri; +import android.os.Build; +import android.os.Bundle; +import android.preference.PreferenceManager; +import android.provider.MediaStore; +import android.support.design.widget.BaseTransientBottomBar; +import android.support.design.widget.FloatingActionButton; +import android.support.design.widget.Snackbar; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; +import android.util.Log; +import android.view.View; +import android.widget.EditText; +import android.widget.ImageView; + +import com.crashlytics.android.Crashlytics; + +import java.io.File; +import java.util.List; + +import cpm.com.gskmtorange.R; +import cpm.com.gskmtorange.constant.CommonFunctions; +import cpm.com.gskmtorange.constant.CommonString; + +public class DeliveryCallAddStoreActivity extends AppCompatActivity implements View.OnClickListener{ + + EditText et_customer, et_address; + ImageView img_checkin, img_checkout; + String name, address, error_msg, img_checkin_path="", img_checkout_path=""; + boolean checkin_flag = true; + protected String _pathforcheck = "", _path, str, visit_date; + private SharedPreferences preferences; + Uri outputFileUri; + String gallery_package = ""; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_delivery_call_add_store); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + et_customer = findViewById(R.id.et_customer_name); + et_address = findViewById(R.id.et_address); + img_checkin = findViewById(R.id.img_checkin); + img_checkout = findViewById(R.id.img_checkout); + + preferences = PreferenceManager.getDefaultSharedPreferences(this); + visit_date = preferences.getString(CommonString.KEY_DATE, null); + + if(checkin_flag){ + img_checkin.setOnClickListener(this); + } + else { + img_checkout.setOnClickListener(this); + } + + FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); + fab.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + if(isValid()){ + + } + else { + Snackbar.make(et_customer,error_msg,Snackbar.LENGTH_SHORT).show(); + } + } + }); + + str = CommonString.FILE_PATH; + } + + protected boolean isValid(){ + boolean flag = true; + + name = et_customer.getText().toString().replaceAll("[&^<>{}'$]", " "); + address = et_address.getText().toString().replaceAll("[&^<>{}'$]", " "); + + if(name.equals("")){ + error_msg = getString(R.string.please_fill) + " "+ getString(R.string.customer_store_name); + flag = false; + } + else if(address.equals("")){ + error_msg = getString(R.string.please_fill) + " "+ getString(R.string.address); + flag = false; + } + else if(checkin_flag){ + if(img_checkin_path.equals("")){ + error_msg = getString(R.string.please_click) + " "+ getString(R.string.intime_image).toLowerCase(); + flag = false; + } + } + else if(img_checkout_path.equals("")){ + error_msg = getString(R.string.please_click) + " "+ getString(R.string.intime_image).toLowerCase(); + flag = false; + } + + return flag; + } + + @Override + public void onClick(View v) { + switch (v.getId()){ + case R.id.img_checkin: + _pathforcheck = "CoachingVisit" + visit_date.replace("/", "")+ "InTime" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg"; + + _path = CommonString.FILE_PATH + _pathforcheck; + + startCameraActivity(0); + break; + + case R.id.img_checkout: + + _pathforcheck = "CoachingVisit" + visit_date.replace("/", "")+ "OutTime" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg"; + + _path = CommonString.FILE_PATH + _pathforcheck; + + startCameraActivity(0); + break; + } + } + + protected void startCameraActivity(int request_code) { + try { + + Log.i("MakeMachine", "startCameraActivity()"); + File file = new File(_path); + outputFileUri = Uri.fromFile(file); + + String defaultCameraPackage = ""; + final PackageManager packageManager = getPackageManager(); + List list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES); + for (int n = 0; n < list.size(); n++) { + if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) { + Log.e("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString()); + Log.e("TAG", "package name : " + list.get(n).packageName); + + //temp value in case camera is gallery app above jellybean + String packag = list.get(n).loadLabel(packageManager).toString(); + if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri") ||packag.equalsIgnoreCase("الاستوديو") ) { + gallery_package = list.get(n).packageName; + } + + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) { + defaultCameraPackage = list.get(n).packageName; + break; + } + } else { + + if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) { + + defaultCameraPackage = list.get(n).packageName; + break; + } + } + } + } + + //com.android.gallery3d + + Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); + intent.setPackage(defaultCameraPackage); + startActivityForResult(intent, request_code); + } catch (ActivityNotFoundException e) { + e.printStackTrace(); + + Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); + intent.setPackage(gallery_package); + startActivityForResult(intent, request_code); + + } catch (Exception e) { + Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + Crashlytics.logException(e.getCause()); + Crashlytics.logException(new Exception(e.getCause())); + e.printStackTrace(); + } + } + + @SuppressWarnings("deprecation") + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + Log.i("MakeMachine", "resultCode: " + resultCode); + switch (resultCode) { + case 0: + Log.i("MakeMachine", "User cancelled"); + break; + + case -1: + + if (_pathforcheck != null && !_pathforcheck.equals("")) { + if (new File(str + _pathforcheck).exists()) { + + if(requestCode == 0){ + img_checkin.setImageDrawable(getResources().getDrawable(R.mipmap.camera_green)); + img_checkin_path = _pathforcheck; + } + else { + img_checkout.setImageDrawable(getResources().getDrawable(R.mipmap.camera_green)); + img_checkout_path = _pathforcheck; + } + _pathforcheck = ""; + + } + } + + break; + } + + } +} 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 dbadfdf..285917c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -852,15 +852,18 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli if (/*true*/distance > distanceGeoPhence) { flag_entry = false; } + else { + String msg = getString(R.string.distance_from_the_store) + " " + distance + " meters"; + + Toast.makeText(getApplicationContext(), msg, Toast.LENGTH_SHORT).show(); + } } } if(flag_entry){ - String msg = getString(R.string.distance_from_the_store) + " " + distance + " meters"; - Toast.makeText(getApplicationContext(), msg, Toast.LENGTH_SHORT).show(); editor = preferences.edit(); editor.putString(CommonString.KEY_STORE_ID, current.getSTORE_ID()); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java index fddf268..566cff1 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -46,6 +46,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.AdditionalQuestiongetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.CategoryMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationContrywiseGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.DisplayChecklistMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.DisplayMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.GeoFencingGetterSetter; @@ -111,6 +112,7 @@ public class DownloadActivity extends AppCompatActivity { GeoFencingGetterSetter geoFencingGetterSetter; NonWorkingSubReasonGetterSetter nonWorkingSubReasonGetterSetter; SupervisorListGetterSetter supervisorListGetterSetter; + ConfigurationMasterGetterSetter configurationMasterGetterSetter; private Dialog dialog; private ProgressBar pb; @@ -683,17 +685,20 @@ public class DownloadActivity extends AppCompatActivity { xpp.next(); eventType = xpp.getEventType(); nonWorkingSubReasonGetterSetter = XMLHandlers.nonWorkingSubReasonXMLHandler(xpp, eventType); - if (nonWorkingSubReasonGetterSetter.getREASON_ID().size() > 0) { - String reasontable = nonWorkingSubReasonGetterSetter.getTable_NON_WORKING_SUB_REASON(); - if (reasontable != null) { - resultHttp = CommonString.KEY_SUCCESS; - TableBean.setTable_NON_WORKING_SUB_REASON(reasontable); - } - } else { - return "NON_WORKING_SUB_REASON"; + + String reasontable = nonWorkingSubReasonGetterSetter.getTable_NON_WORKING_SUB_REASON(); + if (reasontable != null) { + resultHttp = CommonString.KEY_SUCCESS; + TableBean.setTable_NON_WORKING_SUB_REASON(reasontable); } - data.value = 70; - data.name = "NON_WORKING_SUB_REASON " + getResources().getString(R.string.download_data); + + if (nonWorkingSubReasonGetterSetter.getREASON_ID().size() > 0) { + data.value = 70; + data.name = "NON_WORKING_SUB_REASON " + getResources().getString(R.string.download_data); + } else { + //return "NON_WORKING_SUB_REASON"; + } + } publishProgress(data); @@ -1263,6 +1268,41 @@ public class DownloadActivity extends AppCompatActivity { publishProgress(data); + //CONFIGURATION_MASTER + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD); + request.addProperty("UserName", userId); + request.addProperty("Type", "CONFIGURATION_MASTER"); + request.addProperty("cultureid", culture_id); + + envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); + envelope.dotNet = true; + envelope.setOutputSoapObject(request); + + androidHttpTransport = new HttpTransportSE(CommonString.URL); + androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope); + + result = envelope.getResponse(); + + if (result.toString() != null) { + xpp.setInput(new StringReader(result.toString())); + xpp.next(); + eventType = xpp.getEventType(); + configurationMasterGetterSetter = XMLHandlers.configurationMasterXMLHandler(xpp, eventType); + + String table_configiration = configurationMasterGetterSetter.getTable_CONFIGURATION_MASTER(); + if (table_configiration != null) { + resultHttp = CommonString.KEY_SUCCESS; + TableBean.setTable_CONFIGURATION_MASTER(table_configiration); + } + + if (configurationMasterGetterSetter.getCOUNTRY_ID().size() > 0) { + data.value = 97; + data.name = "CONFIGURATION MASTER DATA" + getResources().getString(R.string.download_data); + } + } + publishProgress(data); + + /* //MAPPING_COUNTRYWISE_PLANOGRAM request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD); request.addProperty("UserName", userId); @@ -1567,6 +1607,7 @@ public class DownloadActivity extends AppCompatActivity { db.InsertNO_CAMERA_LAST_VISIT_DATA(noCameraLastVisitGetterSetter); db.insertSUPERVISOR_LIST_DATA(supervisorListGetterSetter); db.InsertGeoTag_DATA(geoFencingGetterSetter); + db.InsertCONFIGURATION_MASTER(configurationMasterGetterSetter); } catch (MalformedURLException e) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java index bf1d55e..ab9e928 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java @@ -13,6 +13,7 @@ import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; +import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; @@ -31,6 +32,7 @@ import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.dailyentry.CoachingVisitActivity; import cpm.com.gskmtorange.dailyentry.MessageActivity; import cpm.com.gskmtorange.xmlGetterSetter.CategoryWisePerformaceGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.StoreWisePerformaceGetterSetter; public class StoreWisePerformanceActivity extends AppCompatActivity { @@ -41,7 +43,7 @@ public class StoreWisePerformanceActivity extends AppCompatActivity { StoreWisePerformaceAdapter adapter; GSKOrangeDB db; - String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id; + String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, country_id; private SharedPreferences preferences; @@ -68,6 +70,7 @@ public class StoreWisePerformanceActivity extends AppCompatActivity { keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, ""); class_id = preferences.getString(CommonString.KEY_CLASS_ID, ""); storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, ""); + country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, null); toolbar.setTitle(getResources().getString(R.string.title_activity_store_wise_performance)); setSupportActionBar(toolbar); @@ -80,10 +83,35 @@ public class StoreWisePerformanceActivity extends AppCompatActivity { public void onClick(View view) { //Intent intent = new Intent(StoreWisePerformanceActivity.this, CategoryListActivity.class); //Intent intent = new Intent(StoreWisePerformanceActivity.this, MessageActivity.class); - Intent intent = new Intent(StoreWisePerformanceActivity.this, CoachingVisitActivity.class); - startActivity(intent); - finish(); - overridePendingTransition(R.anim.activity_in, R.anim.activity_out); + + + boolean coaching_visit_flag=false; + //Enable disable According to Configuration + ArrayList configurationData = db.getConfigurationMasterData(country_id); + if(configurationData.size()>0){ + + for(int i=0; i COUNTRY_ID = new ArrayList<>(); + ArrayList CONFIGURE = new ArrayList<>(); + ArrayList ACTIVE = new ArrayList<>(); + + public String getTable_CONFIGURATION_MASTER() { + return table_CONFIGURATION_MASTER; + } + + public void setTable_CONFIGURATION_MASTER(String table_CONFIGURATION_MASTER) { + this.table_CONFIGURATION_MASTER = table_CONFIGURATION_MASTER; + } + + public ArrayList getCOUNTRY_ID() { + return COUNTRY_ID; + } + + public void setCOUNTRY_ID(String COUNTRY_ID) { + this.COUNTRY_ID.add(COUNTRY_ID); + } + + public ArrayList getCONFIGURE() { + return CONFIGURE; + } + + public void setCONFIGURE(String CONFIGURE) { + this.CONFIGURE.add(CONFIGURE); + } + + public ArrayList getACTIVE() { + return ACTIVE; + } + + public void setACTIVE(String ACTIVE) { + this.ACTIVE.add(ACTIVE); + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java index 041bdba..6ef079a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java @@ -40,6 +40,7 @@ public class TableBean { public static String Table_GEO_FENCING; public static String Table_NON_WORKING_SUB_REASON; public static String Table_SUPERVISOR_LIST; + public static String Table_CONFIGURATION_MASTER; public static String getTable_NON_WORKING_SUB_REASON() { return Table_NON_WORKING_SUB_REASON; @@ -297,4 +298,12 @@ public class TableBean { public static void setTable_SUPERVISOR_LIST(String table_SUPERVISOR_LIST) { Table_SUPERVISOR_LIST = table_SUPERVISOR_LIST; } + + public static String getTable_CONFIGURATION_MASTER() { + return Table_CONFIGURATION_MASTER; + } + + public static void setTable_CONFIGURATION_MASTER(String table_CONFIGURATION_MASTER) { + Table_CONFIGURATION_MASTER = table_CONFIGURATION_MASTER; + } } 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 3ec63c5..876cab3 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java @@ -11,6 +11,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.CategoryMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.ChatMessageDownloadGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationContrywiseGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.DisplayChecklistMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.DisplayMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter; @@ -1380,4 +1381,36 @@ public class XMLHandlers { } return st; } + + //CONFIGURATION_MASTER + public static ConfigurationMasterGetterSetter configurationMasterXMLHandler(XmlPullParser xpp, int eventType) { + ConfigurationMasterGetterSetter st = new ConfigurationMasterGetterSetter(); + + try { + while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) { + if (xpp.getEventType() == XmlPullParser.START_TAG) { + + if (xpp.getName().equals("META_DATA")) { + st.setTable_CONFIGURATION_MASTER(xpp.nextText()); + } + if (xpp.getName().equals("COUNTRY_ID")) { + st.setCOUNTRY_ID(xpp.nextText()); + } + if (xpp.getName().equals("CONFIGURE")) { + st.setCONFIGURE(xpp.nextText()); + } + + if (xpp.getName().equals("ACTIVE")) { + st.setACTIVE(xpp.nextText()); + } + } + xpp.next(); + } + } catch (XmlPullParserException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + return st; + } } diff --git a/GSKMTOrange/src/main/res/drawable/add.png b/GSKMTOrange/src/main/res/drawable/add.png new file mode 100644 index 0000000..fe41302 Binary files /dev/null and b/GSKMTOrange/src/main/res/drawable/add.png differ diff --git a/GSKMTOrange/src/main/res/layout/activity_delivery_call.xml b/GSKMTOrange/src/main/res/layout/activity_delivery_call.xml new file mode 100644 index 0000000..19f47db --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/activity_delivery_call.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/activity_delivery_call_add_store.xml b/GSKMTOrange/src/main/res/layout/activity_delivery_call_add_store.xml new file mode 100644 index 0000000..367d88f --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/activity_delivery_call_add_store.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/content_delivery_call.xml b/GSKMTOrange/src/main/res/layout/content_delivery_call.xml new file mode 100644 index 0000000..9eb48dc --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/content_delivery_call.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/content_delivery_call_add_store.xml b/GSKMTOrange/src/main/res/layout/content_delivery_call_add_store.xml new file mode 100644 index 0000000..758e91d --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/content_delivery_call_add_store.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml b/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml index b0a7544..250512d 100644 --- a/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml +++ b/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml @@ -28,6 +28,13 @@ android:title="@string/menu_deviation_data" android:visible="false"/> + + توافر تحميل البيانات العلامة التجارية اسم العلامة التجارية - C 126, Okhla II, + الكاميرا إلغاء الأمر قائمة الفئات diff --git a/GSKMTOrange/src/main/res/values-ar-rEG/string.xml b/GSKMTOrange/src/main/res/values-ar-rEG/string.xml index 3e0bc53..7602de1 100644 --- a/GSKMTOrange/src/main/res/values-ar-rEG/string.xml +++ b/GSKMTOrange/src/main/res/values-ar-rEG/string.xml @@ -24,7 +24,7 @@ توافر تحميل البيانات العلامة التجارية اسم العلامة التجارية - C 126, Okhla II, + الكاميرا إلغاء الأمر قائمة الفئات diff --git a/GSKMTOrange/src/main/res/values-ar-rSA/string.xml b/GSKMTOrange/src/main/res/values-ar-rSA/string.xml index 3e0bc53..7602de1 100644 --- a/GSKMTOrange/src/main/res/values-ar-rSA/string.xml +++ b/GSKMTOrange/src/main/res/values-ar-rSA/string.xml @@ -24,7 +24,7 @@ توافر تحميل البيانات العلامة التجارية اسم العلامة التجارية - C 126, Okhla II, + الكاميرا إلغاء الأمر قائمة الفئات diff --git a/GSKMTOrange/src/main/res/values-ar/string.xml b/GSKMTOrange/src/main/res/values-ar/string.xml index 3f975f1..40abe6d 100644 --- a/GSKMTOrange/src/main/res/values-ar/string.xml +++ b/GSKMTOrange/src/main/res/values-ar/string.xml @@ -24,7 +24,7 @@ توافر تحميل البيانات العلامة التجارية اسم العلامة التجارية - C 126, Okhla II, + الكاميرا إلغاء الأمر قائمة الفئات diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index a704f9e..9498f15 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -44,7 +44,7 @@ Delete Store Visited GSK MT ORANGE STORE - C 126, Okhla II, + Click Store Front Image Please select language @@ -376,5 +376,14 @@ Select Supervisor Coaching Visit Please save data + Delivery Call + Add Store + Please fill + Address + Customer Store Name + Please click + In time image + Out time image +