diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index 79406d5..992c541 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 + compileSdkVersion 24 buildToolsVersion "24.0.1" useLibrary 'org.apache.http.legacy' @@ -35,11 +35,11 @@ dependencies { compile 'com.android.support:appcompat-v7:24.2.1' compile 'com.android.support:design:24.2.1' - compile 'com.google.android.gms:play-services-location:9.4.0' - compile 'com.google.android.gms:play-services-maps:9.4.0' + compile 'com.google.android.gms:play-services-location:9.8.0' + compile 'com.google.android.gms:play-services-maps:9.8.0' compile 'com.android.support:cardview-v7:24.2.1' - compile 'com.google.android.gms:play-services-appindexing:9.4.0' + compile 'com.google.android.gms:play-services-appindexing:9.8.0' compile 'com.android.support:support-v4:24.2.1' - testCompile 'junit:junit:4.12' compile 'com.google.code.gson:gson:2.7' + testCompile 'junit:junit:4.12' } diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml index 9d8b764..7695ad8 100644 --- a/GSKMTOrange/src/main/AndroidManifest.xml +++ b/GSKMTOrange/src/main/AndroidManifest.xml @@ -152,6 +152,10 @@ + 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 9a7fa32..50c98df 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -51,7 +51,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean; */ public class GSKOrangeDB extends SQLiteOpenHelper { - public static final String DATABASE_NAME = "GSK_ORANGE"; + public static final String DATABASE_NAME = "GSK_ORANGE_DB"; public static final int DATABASE_VERSION = 13; TableBean tableBean; private SQLiteDatabase db; @@ -130,6 +130,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); + db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); + db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); + db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); + db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); + db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); + } public void deleteAllTables() { @@ -191,7 +197,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - dbcursor = db.rawQuery("Select BM.BRAND As BRAND, BM.BRAND_ID As BRAND_ID, DM.DISPLAY As DISPLAY, DM.DISPLAY_ID As DISPLAY_ID from BRAND_MASTER BM INNER JOIN MAPPING_T2P T ON BM.BRAND_ID = T.BRAND_ID INNER JOIN DISPLAY_MASTER DM ON T.DISPLAY_ID= DM.DISPLAY_ID WHERE T.STORE_ID = '" + store_id + "'", null); + dbcursor = db.rawQuery("Select BM.BRAND As BRAND, BM.BRAND_ID As BRAND_ID, DM.DISPLAY As DISPLAY, DM.DISPLAY_ID As DISPLAY_ID, DM.IMAGE_URL As IMAGE_URL, DM.IMAGE_PATH As IMAGE_PATH from BRAND_MASTER BM INNER JOIN MAPPING_T2P T ON BM.BRAND_ID = T.BRAND_ID INNER JOIN DISPLAY_MASTER DM ON T.DISPLAY_ID= DM.DISPLAY_ID WHERE T.STORE_ID = '" + store_id + "'", null); if (dbcursor != null) { dbcursor.moveToFirst(); while (!dbcursor.isAfterLast()) { @@ -210,6 +216,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper { t2p.setDisplay(dbcursor.getString(dbcursor .getColumnIndexOrThrow("DISPLAY"))); + t2p.setRef_image_url(dbcursor.getString(dbcursor + .getColumnIndexOrThrow("IMAGE_URL"))); + + t2p.setRef_image_path(dbcursor.getString(dbcursor + .getColumnIndexOrThrow("IMAGE_PATH"))); + t2p.setImage(""); t2p.setRemark(""); @@ -483,6 +495,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put("DISPLAY_ID", data.getDISPLAY_ID().get(i)); values.put("DISPLAY", data.getDISPLAY().get(i)); values.put("IMAGE_URL", data.getIMAGE_URL().get(i)); + values.put("IMAGE_PATH", data.getIMAGE_PATH().get(i)); db.insert("DISPLAY_MASTER", null, values); } @@ -2471,6 +2484,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put(CommonString.KEY_BRAND_ID, data.get(i).getBrand_id()); values.put(CommonString.KEY_BRAND, data.get(i).getBrand()); values.put(CommonString.KEY_DISPLAY, data.get(i).getDisplay()); + values.put(CommonString.KEY_IMAGE_URL, data.get(i).getRef_image_url()); + values.put(CommonString.KEY_IMAGE_PATH, data.get(i).getRef_image_path()); values.put(CommonString.KEY_IMAGE, data.get(i).getImage()); values.put(CommonString.KEY_REMARK, data.get(i).getRemark()); values.put(CommonString.KEY_PRESENT, data.get(i).isPresent()); @@ -2512,6 +2527,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } } + public boolean additionalVisibilitydata(String store_id, String category_id) { Log.d("AdditionalVisibility ", "AdditionalVisibility data--------------->Start<------------"); ArrayList list = new ArrayList<>(); @@ -2712,6 +2728,47 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } + if (dbcursor != null) { + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + T2PGetterSetter tp = new T2PGetterSetter(); + + tp.setKey_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_ID))); + tp.setDisplay_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_DISPLAY_ID))); + tp.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_BRAND_ID))); + tp.setBrand(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_BRAND))); + tp.setDisplay(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_DISPLAY))); + tp.setRef_image_url(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE_URL))); + tp.setRef_image_path(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE_PATH))); + tp.setImage(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE))); + tp.setRemark(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_REMARK))); + tp.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CATEGORY_ID))); + tp.setPresent((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_PRESENT)).equalsIgnoreCase("1"))); + + list.add(tp); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + return list; + } + return list; + } + + // get T2P Compliance store wise data + public ArrayList getT2pComplianceStorewiseData(String store_id) { + + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + try { + + + dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_COMPLIANCE + " where " + + CommonString.KEY_STORE_ID + "='" + store_id + "'", null); + + if (dbcursor != null) { dbcursor.moveToFirst(); while (!dbcursor.isAfterLast()) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index 0c5c891..0cbbd36 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -43,6 +43,7 @@ import cpm.com.gskmtorange.GetterSetter.CoverageBean; import cpm.com.gskmtorange.GetterSetter.StoreBean; import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.dailyentry.AdditionalVisibility; +import cpm.com.gskmtorange.dailyentry.ServiceActivity; import cpm.com.gskmtorange.dailyentry.SettingsActivity; import cpm.com.gskmtorange.dailyentry.T2PComplianceActivity; import cpm.com.gskmtorange.dailyentry.StoreListActivity; @@ -223,16 +224,6 @@ public class MainActivity extends AppCompatActivity } - - - - /* - intent = new Intent(getBaseContext(), - UploadOptionActivity.class); - startActivity(intent); - - MainMenuActivity.this.finish();*/ - } } else { @@ -260,88 +251,28 @@ public class MainActivity extends AppCompatActivity } else if (id == R.id.nav_exit) { - - /* Intent startDownload = new Intent(this,AdditionalVisibility.class); - startActivity(startDownload); - - overridePendingTransition(R.anim.activity_in, R.anim.activity_out); -*/ finish(); - - } else if (id == R.id.nav_services) { - - /*Intent startDownload = new Intent(this,T2PComplianceActivity.class); - startActivity(startDownload); -*/ - //overridePendingTransition(R.anim.activity_in, R.anim.activity_out); + overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); } else if (id == R.id.nav_setting) { Intent startDownload = new Intent(this, SettingsActivity.class); startActivity(startDownload); + finish(); + overridePendingTransition(R.anim.activity_in, R.anim.activity_out); //startActivity(new Intent(MainActivity.this, CategoryListActivity.class)); - } /*else if (id == R.id.nav_export) { + } else if (id == R.id.nav_services) { - AlertDialog.Builder builder1 = new AlertDialog.Builder(MainActivity.this); - builder1.setMessage("Are you sure you want to take the backup of your data") - .setCancelable(false) - .setPositiveButton("OK", new DialogInterface.OnClickListener() { - @SuppressWarnings("resource") - public void onClick(DialogInterface dialog, int id) { - try { - *//*File file = new File(Environment - .getExternalStorageDirectory(), - "capital_backup"); - if (!file.isDirectory()) { - file.mkdir(); - }*//* + Intent startservice = new Intent(this, ServiceActivity.class); + startActivity(startservice); - File sd = Environment.getExternalStorageDirectory(); - File data = Environment.getDataDirectory(); + overridePendingTransition(R.anim.activity_in, R.anim.activity_out); - if (sd.canWrite()) { - long date = System.currentTimeMillis(); - - SimpleDateFormat sdf = new SimpleDateFormat("MMM/dd/yy"); - String dateString = sdf.format(date); - - String currentDBPath = "//data//cpm.com.gskmtorange//databases//" + GSKOrangeDB.DATABASE_NAME; - String backupDBPath = "GSKMT_ORANGE_Database_backup" + dateString.replace('/', '-'); - - String path = Environment.getExternalStorageDirectory().getPath(); - - File currentDB = new File(data, currentDBPath); - File backupDB = new File(path, backupDBPath); - - //Snackbar.make(rec_store_data, "Database Exported Successfully", Snackbar.LENGTH_SHORT).show(); - Toast.makeText(MainActivity.this, "Database Exported Successfully", Toast.LENGTH_SHORT).show(); - - if (currentDB.exists()) { - @SuppressWarnings("resource") - FileChannel src = new FileInputStream(currentDB).getChannel(); - FileChannel dst = new FileOutputStream(backupDB).getChannel(); - dst.transferFrom(src, 0, src.size()); - src.close(); - dst.close(); - } - } - } catch (Exception e) { - System.out.println(e.getMessage()); - } - } - }) - .setNegativeButton("Cancel", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - dialog.cancel(); - } - }); - AlertDialog alert1 = builder1.create(); - alert1.show(); - }*/ + } DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); drawer.closeDrawer(GravityCompat.START); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java index 93cffca..ddda97a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java @@ -77,7 +77,7 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On intent.putExtra(CommonString.KEY_LOGIN_DATA, login_data); startActivity(intent); } else { - Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) + Snackbar.make(view, getString(R.string.select_language), Snackbar.LENGTH_LONG) .setAction("Action", null).show(); } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java index 8c9d341..2764e2e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java @@ -50,6 +50,7 @@ public class CommonString { public static final String KEY_COVERAGE_REMARK = "REMARK"; public static final String KEY_IMAGE = "IMAGE"; public static final String KEY_IMAGE_URL = "IMAGE_URL"; + public static final String KEY_IMAGE_PATH = "IMAGE_PATH"; public static final String KEY_ID = "Id"; public static final String KEY_MERCHANDISER_ID = "MERCHANDISER_ID"; @@ -493,6 +494,8 @@ public class CommonString { + KEY_BRAND_ID + " INTEGER," + KEY_DISPLAY_ID + " INTEGER," + KEY_BRAND + " VARCHAR," + + KEY_IMAGE_URL + " VARCHAR," + + KEY_IMAGE_PATH+ " VARCHAR," + KEY_DISPLAY + " VARCHAR," + KEY_IMAGE + " VARCHAR," + KEY_REMARK + " VARCHAR," 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 b9f39ec..e372d74 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java @@ -257,7 +257,7 @@ public class NonWorkingReason extends AppCompatActivity implements if (_pathforcheck != null && !_pathforcheck.equals("")) { if (new File(str + _pathforcheck).exists()) { - camera.setImageDrawable(getResources().getDrawable(R.drawable.cam_deactive)); + camera.setImageDrawable(getResources().getDrawable(R.mipmap.camera_green)); image1 = _pathforcheck; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ServiceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ServiceActivity.java new file mode 100644 index 0000000..6d3002f --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ServiceActivity.java @@ -0,0 +1,111 @@ +package cpm.com.gskmtorange.dailyentry; + +import android.content.Context; +import android.content.SharedPreferences; +import android.content.res.Configuration; +import android.content.res.Resources; +import android.os.Bundle; +import android.preference.PreferenceManager; +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.MenuItem; +import android.view.View; + +import java.util.Locale; + +import cpm.com.gskmtorange.R; +import cpm.com.gskmtorange.constant.CommonString; +import cpm.com.gskmtorange.fragment.ServiceActivityFragment; + +public class ServiceActivity extends AppCompatActivity { + + private SharedPreferences preferences; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_service); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + + //preference data + preferences = PreferenceManager.getDefaultSharedPreferences(this); + + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + + /* ServiceActivityFragment fragment = new ServiceActivityFragment(); + getSupportFragmentManager().beginTransaction().add(R.id.fragment,fragment).commit();*/ + + FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); + fab.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) + .setAction("Action", null).show(); + } + }); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + + if (id == android.R.id.home) { + finish(); + overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); + } + + //noinspection SimplifiableIfStatement + if (id == R.id.action_settings) { + return true; + } + + return super.onOptionsItemSelected(item); + } + + @Override + public void onBackPressed() { + super.onBackPressed(); + overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); + } + + @Override + protected void onResume() { + super.onResume(); + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + } + + private static boolean updateResources(Context context, String language) { + String lang; + + if(language.equalsIgnoreCase("English")){ + lang = "EN"; + } + else if(language.equalsIgnoreCase("UAE")) { + + lang = "AR"; + } else { + lang = "TR"; + } + + Locale locale = new Locale(lang); + Locale.setDefault(locale); + + Resources resources = context.getResources(); + + Configuration configuration = resources.getConfiguration(); + configuration.locale = locale; + + resources.updateConfiguration(configuration, resources.getDisplayMetrics()); + + return true; + } + +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java index f227b48..5545ec5 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java @@ -1,20 +1,38 @@ package cpm.com.gskmtorange.dailyentry; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.content.SharedPreferences; +import android.content.res.Configuration; +import android.content.res.Resources; import android.net.Uri; import android.os.Bundle; +import android.preference.PreferenceManager; 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.MenuItem; import android.view.View; +import java.util.Locale; + +import cpm.com.gskmtorange.MainActivity; import cpm.com.gskmtorange.R; +import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.fragment.SelectLanguageFragment; import cpm.com.gskmtorange.fragment.SettingsActivityFragment; public class SettingsActivity extends AppCompatActivity implements SelectLanguageFragment.OnFragmentInteractionListener { - boolean isSelected = false; + String selected_lang = "", culture_id, notice_url; + + FloatingActionButton fab; + + private SharedPreferences preferences; + + private SharedPreferences.Editor editor = null; @Override protected void onCreate(Bundle savedInstanceState) { @@ -23,20 +41,38 @@ public class SettingsActivity extends AppCompatActivity implements SelectLanguag Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); - SettingsActivityFragment fragment = new SettingsActivityFragment(); - getSupportFragmentManager().beginTransaction().add(R.id.fragment,fragment).commit(); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); - FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); + //preference data + preferences = PreferenceManager.getDefaultSharedPreferences(this); + editor = preferences.edit(); + + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + + /* SettingsActivityFragment fragment = new SettingsActivityFragment(); + getSupportFragmentManager().beginTransaction().add(R.id.fragment,fragment).commit();*/ + + fab = (FloatingActionButton) findViewById(R.id.fab); fab.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if(isSelected){ - finish(); - } - else { - Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) + if (selected_lang.equals("")) { + + Snackbar.make(view, getString(R.string.select_language), Snackbar.LENGTH_LONG) .setAction("Action", null).show(); + } else { + + updateResources(getApplicationContext(),selected_lang); + + editor.putString(CommonString.KEY_LANGUAGE, selected_lang); + editor.putString(CommonString.KEY_CULTURE_ID, culture_id); + editor.putString(CommonString.KEY_NOTICE_BOARD_LINK, notice_url); + editor.commit(); + + Intent startDownload = new Intent(getApplicationContext(), MainActivity.class); + startActivity(startDownload); + finish(); } @@ -45,7 +81,81 @@ public class SettingsActivity extends AppCompatActivity implements SelectLanguag } @Override - public void onFragmentInteraction(boolean isSelected) { - this.isSelected = isSelected; + public void onFragmentInteraction(String selected_lang, String culture_id, String notice_url) { + + this.selected_lang = selected_lang; + this.culture_id = culture_id; + this.notice_url = notice_url; + + if (!selected_lang.equals("")) { + fab.setVisibility(View.VISIBLE); + } + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + + if (id == android.R.id.home) { + + Intent startDownload = new Intent(getApplicationContext(), MainActivity.class); + startActivity(startDownload); + + finish(); + overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); + } + + //noinspection SimplifiableIfStatement + if (id == R.id.action_settings) { + return true; + } + + return super.onOptionsItemSelected(item); + } + + @Override + public void onBackPressed() { + //super.onBackPressed(); + Intent startDownload = new Intent(getApplicationContext(), MainActivity.class); + startActivity(startDownload); + + finish(); + + overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); + } + + @Override + protected void onResume() { + super.onResume(); + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + } + + private static boolean updateResources(Context context, String language) { + String lang; + + if(language.equalsIgnoreCase("English")){ + lang = "EN"; + } + else if(language.equalsIgnoreCase("UAE")) { + + lang = "AR"; + } else { + lang = "TR"; + } + + Locale locale = new Locale(lang); + Locale.setDefault(locale); + + Resources resources = context.getResources(); + + Configuration configuration = resources.getConfiguration(); + configuration.locale = locale; + + resources.updateConfiguration(configuration, resources.getDisplayMetrics()); + + return true; } } 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 f945fd3..1bf6f63 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -135,6 +135,12 @@ public class StoreListActivity extends AppCompatActivity { } + @Override + public void onBackPressed() { + super.onBackPressed(); + overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); + } + @Override public boolean onOptionsItemSelected(MenuItem item) { // Handle action bar item clicks here. The action bar will @@ -522,17 +528,13 @@ public class StoreListActivity extends AppCompatActivity { public boolean setcheckedmenthod(String store_cd) { - + boolean result_flag = false; for (int i = 0; i < coverage.size(); i++) { if (store_cd.equals(coverage.get(i).getStoreId())) { if (coverage.get(i).getOutTime() != null) { result_flag = true; break; } - } else { - - result_flag = false; - } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java index 2c026fe..9990de6 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java @@ -102,7 +102,7 @@ public class T2PComplianceActivity extends AppCompatActivity { //preference data preferences = PreferenceManager.getDefaultSharedPreferences(this); - updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); store_id = preferences.getString(CommonString.KEY_STORE_ID, null); visit_date = preferences.getString(CommonString.KEY_DATE, null); @@ -174,7 +174,7 @@ public class T2PComplianceActivity extends AppCompatActivity { protected void onResume() { super.onResume(); - updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); } @@ -218,7 +218,18 @@ public class T2PComplianceActivity extends AppCompatActivity { @Override public void onClick(View v) { - mItem.setPresent(((ToggleButton) v).getText().toString().equalsIgnoreCase(getResources().getString(R.string.yes))); + if (((ToggleButton) v).getText().toString().equalsIgnoreCase(getResources().getString(R.string.yes))) { + mItem.setPresent(true); + } else { + mItem.setPresent(false); + mItem.getGapsChecklist().clear(); + mItem.getSkulist().clear(); + if (!mItem.getImage().equals("")) { + new File(str + mItem.getImage()).delete(); + mItem.setImage(""); + } + + } t2PAdapter.notifyDataSetChanged(); } @@ -239,7 +250,14 @@ public class T2PComplianceActivity extends AppCompatActivity { } } - if(camera_allow.equals("1")){ + holder.btn_ref_img.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + + } + }); + + if (camera_allow.equals("1")) { holder.img_cam.setOnClickListener(new View.OnClickListener() { @Override @@ -253,28 +271,49 @@ public class T2PComplianceActivity extends AppCompatActivity { }); if (mItem.getImage().equals("")) { - holder.img_cam.setBackgroundResource(R.mipmap.camera_orange); + if (mItem.isPresent()) { + holder.img_cam.setBackgroundResource(R.mipmap.camera_orange); + } else { + //if not present camera disabled + holder.img_cam.setBackgroundResource(R.mipmap.camera_grey); + } + } else { holder.img_cam.setBackgroundResource(R.mipmap.camera_green); } - } - else { + } else { holder.img_cam.setBackgroundResource(R.mipmap.camera_grey); } - holder.toggle_btn.setChecked(mItem.isPresent()); + boolean is_enabled = mItem.isPresent(); + + holder.toggle_btn.setChecked(is_enabled); + holder.img_cam.setEnabled(is_enabled); + holder.btn_gaps.setEnabled(is_enabled); + holder.btn_sku.setEnabled(is_enabled); + if (mItem.getGapsChecklist().size() > 0) { holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.green)); } else { - holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); + if(mItem.isPresent()){ + holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); + } + else { + holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.grey_background)); + } } if (mItem.getSkulist().size() > 0) { holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.green)); } else { - holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); + if(mItem.isPresent()){ + holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); + } + else { + holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.grey_background)); + } } } @@ -516,7 +555,24 @@ public class T2PComplianceActivity extends AppCompatActivity { int id = item.getItemId(); if (id == android.R.id.home) { - finish(); + android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(T2PComplianceActivity.this); + builder.setTitle("Parinaam"); + builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false) + .setPositiveButton("OK", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + + finish(); + overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); + } + }) + .setNegativeButton("Cancel ", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + + } + }); + android.app.AlertDialog alert = builder.create(); + alert.show(); } //noinspection SimplifiableIfStatement @@ -618,19 +674,22 @@ public class T2PComplianceActivity extends AppCompatActivity { for (int i = 0; i < t2PGetterSetters.size(); i++) { - if (camera_allow.equals("1") && t2PGetterSetters.get(i).getImage().equals("")) { - flag = false; - error_msg = getResources().getString(R.string.click_image); - break; - } else if (t2PGetterSetters.get(i).getGapsChecklist().size() == 0) { - flag = false; - error_msg = getResources().getString(R.string.fill_gaps_data); - break; - } else if (t2PGetterSetters.get(i).getSkulist().size() == 0) { - flag = false; - error_msg = getResources().getString(R.string.fill_sku_data); - break; + if(t2PGetterSetters.get(i).isPresent()){ + if (camera_allow.equals("1") && t2PGetterSetters.get(i).getImage().equals("")) { + flag = false; + error_msg = getResources().getString(R.string.click_image); + break; + } else if (t2PGetterSetters.get(i).getGapsChecklist().size() == 0) { + flag = false; + error_msg = getResources().getString(R.string.fill_gaps_data); + break; + } else if (t2PGetterSetters.get(i).getSkulist().size() == 0) { + flag = false; + error_msg = getResources().getString(R.string.fill_sku_data); + break; + } } + } return flag; @@ -647,6 +706,7 @@ public class T2PComplianceActivity extends AppCompatActivity { public void onClick(DialogInterface dialog, int id) { finish(); + overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); } }) .setNegativeButton("Cancel ", new DialogInterface.OnClickListener() { @@ -896,15 +956,13 @@ public class T2PComplianceActivity extends AppCompatActivity { private static boolean updateResources(Context context, String language) { - String lang ; + String lang; - if(language.equalsIgnoreCase("English")){ + if (language.equalsIgnoreCase("English")) { lang = "EN"; - } - else if(language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("UAE")) { lang = "AR"; - } - else { + } else { lang = "TR"; } 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 2eb1c82..f7a6d1f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -249,7 +249,7 @@ public class DownloadActivity extends AppCompatActivity { return "BRAND_MASTER"; } - data.value = 30; + data.value = 25; data.name = "BRAND_MASTER "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -284,7 +284,7 @@ public class DownloadActivity extends AppCompatActivity { } else { return "SUB_CATEGORY_MASTER"; } - data.value = 40; + data.value = 30; data.name = "SUB_CATEGORY_MASTER "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -319,7 +319,7 @@ public class DownloadActivity extends AppCompatActivity { } else { return "CATEGORY_MASTER"; } - data.value = 50; + data.value = 35; data.name = "CATEGORY_MASTER "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -354,7 +354,7 @@ public class DownloadActivity extends AppCompatActivity { } else { return "DISPLAY_MASTER"; } - data.value = 60; + data.value = 40; data.name = "DISPLAY_MASTER "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -389,7 +389,7 @@ public class DownloadActivity extends AppCompatActivity { } else { return "MAPPING_STOCK"; } - data.value = 80; + data.value = 45; data.name = "MAPPING_STOCK "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -424,7 +424,7 @@ public class DownloadActivity extends AppCompatActivity { } else { //return "MAPPING_T2P"; } - data.value = 100; + data.value = 50; data.name = "MAPPING_T2P "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -458,7 +458,7 @@ public class DownloadActivity extends AppCompatActivity { } else { return "DISPLAY_CHECKLIST_MASTER"; } - data.value = 100; + data.value = 55; data.name = "DISPLAY_CHECKLIST_MASTER "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -492,7 +492,7 @@ public class DownloadActivity extends AppCompatActivity { } else { //return "MAPPING_DISPLAY_CHECKLIST"; } - data.value = 100; + data.value = 60; data.name = "MAPPING_DISPLAY_CHECKLIST "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -527,7 +527,7 @@ public class DownloadActivity extends AppCompatActivity { } else { return "NON_WORKING_REASON"; } - data.value = 100; + data.value = 65; data.name = "NON_WORKING_REASON "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -562,7 +562,7 @@ public class DownloadActivity extends AppCompatActivity { /*} else { //return "MAPPING_PROMOTION"; }*/ - data.value = 100; + data.value = 70; data.name = "MAPPING_PROMOTION "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -600,7 +600,7 @@ public class DownloadActivity extends AppCompatActivity { /*} else { //return "MAPPING_ADDITIONAL_PROMOTION"; }*/ - data.value = 100; + data.value = 75; data.name = "MAPPING_ADDITIONAL_PROMOTION "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -636,7 +636,7 @@ public class DownloadActivity extends AppCompatActivity { } else { //return "STORE_PERFORMANCE"; } - data.value = 100; + data.value = 80; data.name = "STORE_PERFORMANCE Data Download"; } publishProgress(data); @@ -708,7 +708,7 @@ public class DownloadActivity extends AppCompatActivity { } else { //return "MAPPING_PLANOGRAM"; } - data.value = 100; + data.value = 85; data.name = "MAPPING_PLANOGRAM Data Download"; } publishProgress(data); @@ -772,6 +772,61 @@ public class DownloadActivity extends AppCompatActivity { //Gagan end code + //Display Master Image save into folder + if (displayMasterGetterSetter != null) { + + for (int i = 0; i < displayMasterGetterSetter.getIMAGE_URL().size(); i++) { + //publishing image download + data.value = data.value + 1; + if (data.value < 100) { + publishProgress(data); + } + + String image_name = displayMasterGetterSetter.getIMAGE_URL().get(i); + String img_url = displayMasterGetterSetter.getIMAGE_PATH().get(i); + + if (!img_url.equalsIgnoreCase("") && !image_name.equalsIgnoreCase("")) { + URL url = new URL(img_url + image_name); + HttpURLConnection c = (HttpURLConnection) url.openConnection(); + c.setRequestMethod("GET"); + c.getResponseCode(); + c.connect(); + + if (c.getResponseCode() == 200) { + int length = c.getContentLength(); + + String size = new DecimalFormat("##.##").format((double) length / 1024) + " KB"; + + //String PATH = Environment.getExternalStorageDirectory() + "/Download/GT_GSK_Images/"; + String PATH = CommonString.FILE_PATH; + File file = new File(PATH); + if (!file.isDirectory()) { + file.mkdir(); + } + + // Environment.getExternalStorageDirectory() + "/GT_GSK_Images/" + _pathforcheck1; + if (!new File(PATH + image_name).exists() && !size.equalsIgnoreCase("0 KB")) { + File outputFile = new File(file, image_name); + FileOutputStream fos = new FileOutputStream(outputFile); + InputStream is1 = c.getInputStream(); + + int bytes = 0; + byte[] buffer = new byte[1024]; + int len1 = 0; + + while ((len1 = is1.read(buffer)) != -1) { + bytes = (bytes + len1); + // data.value = (int) ((double) (((double) + // bytes) / length) * 100); + fos.write(buffer, 0, len1); + } + fos.close(); + is1.close(); + } + } + } + } + } db.open(); db.InsertJCP(jcpgettersetter); @@ -839,7 +894,9 @@ public class DownloadActivity extends AppCompatActivity { super.onPostExecute(s); dialog.dismiss(); - finish(); + + showAlert(getString(R.string.data_downloaded_successfully)); + } } @@ -855,6 +912,7 @@ public class DownloadActivity extends AppCompatActivity { /* Intent i = new Intent(activity, StorelistActivity.class); activity.startActivity(i); activity.finish();*/ + finish(); } }); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java index 8e8b4c8..b57f7a1 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java @@ -111,6 +111,17 @@ public class SelectLanguageFragment extends Fragment implements View.OnClickList btn_lang_1.setText(language.get(0)); btn_lang_2.setText(language.get(1)); + String lang = preferences.getString(CommonString.KEY_LANGUAGE, ""); + + if(lang.equals(language.get(0))){ + btn_lang_1.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); + btn_lang_2.setBackgroundColor(getResources().getColor(R.color.grey_background)); + } + else if(lang.equals(language.get(1))){ + btn_lang_1.setBackgroundColor(getResources().getColor(R.color.grey_background)); + btn_lang_2.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); + } + btn_lang_1.setOnClickListener(this); btn_lang_2.setOnClickListener(this); } @@ -118,10 +129,10 @@ public class SelectLanguageFragment extends Fragment implements View.OnClickList } // TODO: Rename method, update argument and hook method into UI event - public void onButtonPressed(boolean selected_flag) { + public void onButtonPressed(String selected_lang, String culture_id, String notice_url) { if (mListener != null) { - mListener.onFragmentInteraction(selected_flag); + mListener.onFragmentInteraction(selected_lang,culture_id,notice_url); } } @@ -150,7 +161,7 @@ public class SelectLanguageFragment extends Fragment implements View.OnClickList case R.id.btn_language_one: //selected_flag = true; - onButtonPressed(true); + onButtonPressed(language.get(0),culture_id.get(0),login_data.getNOTICE_URL().get(0)); updateResources(getActivity(), language.get(0)); @@ -168,7 +179,7 @@ public class SelectLanguageFragment extends Fragment implements View.OnClickList //selected_flag = true; - onButtonPressed(true); + onButtonPressed(language.get(1),culture_id.get(1),login_data.getNOTICE_URL().get(1)); updateResources(getActivity(), language.get(1)); @@ -196,7 +207,7 @@ public class SelectLanguageFragment extends Fragment implements View.OnClickList */ public interface OnFragmentInteractionListener { // TODO: Update argument type and name - void onFragmentInteraction(boolean flag); + void onFragmentInteraction(String lang, String culture_id, String notice); } private void getDataFromSharedPreferences(){ diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java new file mode 100644 index 0000000..985c532 --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java @@ -0,0 +1,203 @@ +package cpm.com.gskmtorange.fragment; + +import android.content.DialogInterface; +import android.os.Environment; +import android.support.v4.app.Fragment; +import android.os.Bundle; +import android.support.v7.app.AlertDialog; +import android.support.v7.widget.CardView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; +import android.widget.Toast; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.nio.channels.FileChannel; +import java.text.SimpleDateFormat; +import java.util.ArrayList; + +import cpm.com.gskmtorange.Database.GSKOrangeDB; +import cpm.com.gskmtorange.R; +import cpm.com.gskmtorange.dailyentry.ServiceActivity; + +/** + * A placeholder fragment containing a simple view. + */ +public class ServiceActivityFragment extends Fragment { + + public ServiceActivityFragment() { + } + + ArrayList serviceList; + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.fragment_service, container, false); + + RecyclerView rec = (RecyclerView) view.findViewById(R.id.rec_settings); + + ServiceGetterSetter service = new ServiceGetterSetter(); + service.setName(getString(R.string.export_database)); + service.setIcon(R.mipmap.entry_grey); + //SelectLanguageFragment selectLanguageFragment = new SelectLanguageFragment(); + service.setFragment(null); + + serviceList = new ArrayList<>(); + serviceList.add(service); + + rec.setLayoutManager(new LinearLayoutManager(getActivity())); + ServiceAdapter serviceAdapter = new ServiceAdapter(); + rec.setAdapter(serviceAdapter); + + return view; + } + + class ServiceAdapter extends RecyclerView.Adapter{ + + @Override + public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + View view = LayoutInflater.from(parent.getContext()) + .inflate(R.layout.settings_item_layout, parent, false); + return new ViewHolder(view); + } + + @Override + public void onBindViewHolder(ViewHolder holder, int position) { + final ServiceGetterSetter mItem = serviceList.get(position); + holder.tv_settings.setText(mItem.getName()); + + holder.cardView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Fragment nextFrag= mItem.getFragment(); + + if(nextFrag != null){ + getActivity().getSupportFragmentManager().beginTransaction() + .replace(R.id.fragment, nextFrag,"Settings") + .addToBackStack(null) + .commit(); + } + else{ + showExportDialog(); + } + + + } + }); + } + + @Override + public int getItemCount() { + return serviceList.size(); + } + + class ViewHolder extends RecyclerView.ViewHolder{ + + public CardView cardView; + public TextView tv_settings; + + public ViewHolder(View itemView) { + super(itemView); + cardView = (CardView) itemView.findViewById(R.id.card_layout); + tv_settings = (TextView) itemView.findViewById(R.id.tv_settings); + } + } + } + + class ServiceGetterSetter{ + + String name; + int icon; + Fragment fragment; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getIcon() { + return icon; + } + + public void setIcon(int icon) { + this.icon = icon; + } + + + public Fragment getFragment() { + return fragment; + } + + public void setFragment(Fragment fragment) { + this.fragment = fragment; + } + } + + public void showExportDialog(){ + + AlertDialog.Builder builder1 = new AlertDialog.Builder(getActivity()); + builder1.setMessage("Are you sure you want to take the backup of your data") + .setCancelable(false) + .setPositiveButton("OK", new DialogInterface.OnClickListener() { + @SuppressWarnings("resource") + public void onClick(DialogInterface dialog, int id) { + try { + File file = new File(Environment + .getExternalStorageDirectory(), + "gsk_orange_backup"); + if (!file.isDirectory()) { + file.mkdir(); + } + + File sd = Environment.getExternalStorageDirectory(); + File data = Environment.getDataDirectory(); + + if (sd.canWrite()) { + long date = System.currentTimeMillis(); + + SimpleDateFormat sdf = new SimpleDateFormat("MMM/dd/yy"); + String dateString = sdf.format(date); + + String currentDBPath = "//data//cpm.com.gskmtorange//databases//" + GSKOrangeDB.DATABASE_NAME; + String backupDBPath = "GSKMT_ORANGE_Database_backup" + dateString.replace('/', '-'); + + String path = Environment.getExternalStorageDirectory().getPath()+ "/gsk_orange_backup"; + + File currentDB = new File(data, currentDBPath); + File backupDB = new File(path, backupDBPath); + + //Snackbar.make(rec_store_data, "Database Exported Successfully", Snackbar.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), getString(R.string.data_exported_successfully), Toast.LENGTH_SHORT).show(); + + if (currentDB.exists()) { + @SuppressWarnings("resource") + FileChannel src = new FileInputStream(currentDB).getChannel(); + FileChannel dst = new FileOutputStream(backupDB).getChannel(); + dst.transferFrom(src, 0, src.size()); + src.close(); + dst.close(); + } + } + } catch (Exception e) { + System.out.println(e.getMessage()); + } + } + }) + .setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.cancel(); + } + }); + AlertDialog alert1 = builder1.create(); + alert1.show(); + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SettingsActivityFragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SettingsActivityFragment.java index 1d68584..bbdeaf7 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SettingsActivityFragment.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SettingsActivityFragment.java @@ -79,7 +79,7 @@ public class SettingsActivityFragment extends Fragment { public void onClick(View v) { Fragment nextFrag= mItem.getFragment(); getActivity().getSupportFragmentManager().beginTransaction() - .replace(R.id.fragment, nextFrag,"Settings") + .add(R.id.fragment, nextFrag,"Settings") .addToBackStack(null) .commit(); } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java index 239bcee..a0441a1 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java @@ -230,7 +230,7 @@ public class PromoComplianceActivity extends AppCompatActivity { toggle_add_promoAnnouncer.setChecked(true); toggle_add_runningPos.setChecked(true); - Snackbar.make(v, "promo is add", Snackbar.LENGTH_LONG).setAction("Action", null).show(); + Snackbar.make(v, "promo is added", Snackbar.LENGTH_LONG).setAction("Action", null).show(); //Toast.makeText(getApplicationContext(), "promo is add", Toast.LENGTH_LONG).show(); } }) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java index aba8c57..f9c5e9d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java @@ -7,6 +7,7 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; +import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.res.Configuration; @@ -14,6 +15,7 @@ import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Color; +import android.graphics.Matrix; import android.graphics.Typeface; import android.graphics.drawable.ColorDrawable; import android.net.Uri; @@ -38,6 +40,8 @@ import android.view.ViewGroup; import android.view.Window; import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; +import android.webkit.WebView; +import android.webkit.WebViewClient; import android.widget.AbsListView; import android.widget.BaseExpandableListAdapter; import android.widget.Button; @@ -67,6 +71,8 @@ import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter; +import static android.R.attr.angle; + public class Stock_FacingActivity extends AppCompatActivity { static int child_position = -1; ExpandableListView expandableListView; @@ -265,7 +271,7 @@ public class Stock_FacingActivity extends AppCompatActivity { getCurrentFocus().clearFocus(); } - fab.setVisibility(View.INVISIBLE); + fab.setVisibility(View.VISIBLE); } }); @@ -334,8 +340,9 @@ public class Stock_FacingActivity extends AppCompatActivity { //Camera allow enable if (camera_allow.equalsIgnoreCase("1")) { - if (!imagePath.equals("") || !imagePath1.equals("")) { - if (!stock.equals("0")) { + //if (!imagePath.equals("") || !imagePath1.equals("")) { + if (!stock.equals("0")) { + if (!imagePath.equals("") || !imagePath1.equals("")) { if (stock.equals("") || faceup.equals("")) { if (!checkHeaderArray.contains(i)) { checkHeaderArray.add(i); @@ -346,17 +353,26 @@ public class Stock_FacingActivity extends AppCompatActivity { break; } } else { - if (stock.equals("")) { - if (!checkHeaderArray.contains(i)) { - checkHeaderArray.add(i); - } - - flag = false; - Error_Message = getResources().getString(R.string.fill_data); - break; + if (!checkHeaderArray.contains(i)) { + checkHeaderArray.add(i); } + + flag = false; + Error_Message = getResources().getString(R.string.click_image); + break; } } else { + if (stock.equals("")) { + if (!checkHeaderArray.contains(i)) { + checkHeaderArray.add(i); + } + + flag = false; + Error_Message = getResources().getString(R.string.fill_data); + break; + } + } + /*} else { if (!checkHeaderArray.contains(i)) { checkHeaderArray.add(i); } @@ -364,7 +380,7 @@ public class Stock_FacingActivity extends AppCompatActivity { flag = false; Error_Message = getResources().getString(R.string.click_image); break; - } + }*/ } else { //Camera allow disable @@ -660,7 +676,6 @@ public class Stock_FacingActivity extends AppCompatActivity { builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false) .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { - finish(); } }) @@ -683,24 +698,35 @@ public class Stock_FacingActivity extends AppCompatActivity { //dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); dialog.setContentView(R.layout.planogram_dialog_layout); dialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT); - - ImageView img_planogram = (ImageView) dialog.findViewById(R.id.img_planogram); + dialog.setCancelable(false); ArrayList mp = db.getMappingPlanogramData(""); + //ImageView img_planogram = (ImageView) dialog.findViewById(R.id.img_planogram); + setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); + + WebView webView = (WebView) dialog.findViewById(R.id.webview); + webView.setWebViewClient(new MyWebViewClient()); + + webView.getSettings().setAllowFileAccess(true); + webView.getSettings().setJavaScriptEnabled(true); + webView.getSettings().setBuiltInZoomControls(true); + String planogram_image = mp.get(0).getPLANOGRAM_IMAGE(); if (new File(str + planogram_image).exists()) { Bitmap bmp = BitmapFactory.decodeFile(str + planogram_image); - img_planogram.setImageBitmap(bmp); - } else { - img_planogram.setBackgroundResource(R.drawable.sad_cloud); - } + // img_planogram.setRotation(90); + //img_planogram.setImageBitmap(bmp); - /*if (new File(str + "Stock_Cam1_3_9_01122017_162052.jpg").exists()) { - Bitmap bmp = BitmapFactory.decodeFile(str + "Stock_Cam1_3_9_01122017_162052.jpg"); - img_planogram.setImageBitmap(bmp); - } else { - img_planogram.setBackgroundResource(R.drawable.sad_cloud); + String imagePath = "file://" + CommonString.FILE_PATH + "/" + planogram_image; + String html = ""; + webView.loadDataWithBaseURL("", html, "text/html", "utf-8", ""); + + dialog.show(); + } /*else { + //webView.loadUrl(String.valueOf(R.drawable.sad_cloud)); + + //img_planogram.setBackgroundResource(R.drawable.sad_cloud); }*/ @@ -708,17 +734,39 @@ public class Stock_FacingActivity extends AppCompatActivity { cancel.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); dialog.dismiss(); } }); - dialog.show(); + //dialog.show(); return true; } return super.onOptionsItemSelected(item); } + private class MyWebViewClient extends WebViewClient { + + @Override + public boolean shouldOverrideUrlLoading(WebView view, String url) { + view.loadUrl(url); + return true; + } + + @Override + public void onPageFinished(WebView view, String url) { + super.onPageFinished(view, url); + view.clearCache(true); + } + + @Override + public void onPageStarted(WebView view, String url, Bitmap favicon) { + super.onPageStarted(view, url, favicon); + } + } + + @Override public void onBackPressed() { //super.onBackPressed(); @@ -728,14 +776,12 @@ public class Stock_FacingActivity extends AppCompatActivity { builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false) .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { - finish(); } }) .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - } }); android.app.AlertDialog alert = builder.create(); @@ -951,7 +997,11 @@ public class Stock_FacingActivity extends AppCompatActivity { } if (childData.getStock().equals("0")) { - holder.ed_facing.setEnabled(false); + if (childData.getCompany_id().equals("1")) { + holder.ed_facing.setEnabled(false); + } else { + holder.ed_facing.setEnabled(true); + } } else { holder.ed_facing.setEnabled(true); } @@ -971,6 +1021,7 @@ public class Stock_FacingActivity extends AppCompatActivity { if (stock.equals("0")) { childData.setFacing("0"); finalHolder.ed_facing.setText("0"); + finalHolder.ed_facing.setEnabled(false); } else { childData.setFacing(childData.getFacing()); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/DisplayMasterGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/DisplayMasterGetterSetter.java index a07c1c1..01d3d4c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/DisplayMasterGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/DisplayMasterGetterSetter.java @@ -13,6 +13,7 @@ public class DisplayMasterGetterSetter { ArrayList DISPLAY_ID = new ArrayList<>(); ArrayList DISPLAY = new ArrayList<>(); ArrayList IMAGE_URL = new ArrayList<>(); + ArrayList IMAGE_PATH = new ArrayList<>(); public String getTable_DISPLAY_MASTER() { return table_DISPLAY_MASTER; @@ -45,4 +46,12 @@ public class DisplayMasterGetterSetter { public void setIMAGE_URL(String IMAGE_URL) { this.IMAGE_URL.add(IMAGE_URL); } + + public ArrayList getIMAGE_PATH() { + return IMAGE_PATH; + } + + public void setIMAGE_PATH(String IMAGE_PATH) { + this.IMAGE_PATH.add(IMAGE_PATH); + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java index b040e6b..63b2c3f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java @@ -8,7 +8,7 @@ import java.util.ArrayList; public class T2PGetterSetter { - String brand_id, display_id, brand, display, image, remark, key_id, category_id; + String brand_id, display_id, brand, display, image, remark, key_id, category_id, ref_image_url, ref_image_path; boolean isPresent; ArrayList gapsChecklist = new ArrayList<>(); @@ -101,4 +101,20 @@ public class T2PGetterSetter { public void setCategory_id(String category_id) { this.category_id = category_id; } + + public String getRef_image_url() { + return ref_image_url; + } + + public void setRef_image_url(String ref_image_url) { + this.ref_image_url = ref_image_url; + } + + public String getRef_image_path() { + return ref_image_path; + } + + public void setRef_image_path(String ref_image_path) { + this.ref_image_path = ref_image_path; + } } 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 540baa1..a92fe34 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java @@ -363,6 +363,10 @@ public class XMLHandlers { if (xpp.getName().equals("IMAGE_URL")) { display.setIMAGE_URL(xpp.nextText()); } + if (xpp.getName().equals("IMAGE_PATH")) { + display.setIMAGE_PATH(xpp.nextText()); + } + } xpp.next(); } diff --git a/GSKMTOrange/src/main/res/layout/activity_service.xml b/GSKMTOrange/src/main/res/layout/activity_service.xml new file mode 100644 index 0000000..0c93ec7 --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/activity_service.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + diff --git a/GSKMTOrange/src/main/res/layout/activity_settings.xml b/GSKMTOrange/src/main/res/layout/activity_settings.xml index 15fe336..d308ca1 100644 --- a/GSKMTOrange/src/main/res/layout/activity_settings.xml +++ b/GSKMTOrange/src/main/res/layout/activity_settings.xml @@ -25,10 +25,11 @@ + app:srcCompat="@mipmap/tick" /> diff --git a/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml b/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml index 0ca712f..076f30b 100644 --- a/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml +++ b/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml @@ -76,7 +76,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:background="#70888888" + android:background="@color/colorPrimaryDark" android:orientation="vertical"> diff --git a/GSKMTOrange/src/main/res/layout/fragment_select_language.xml b/GSKMTOrange/src/main/res/layout/fragment_select_language.xml index bf946b4..6e87033 100644 --- a/GSKMTOrange/src/main/res/layout/fragment_select_language.xml +++ b/GSKMTOrange/src/main/res/layout/fragment_select_language.xml @@ -16,6 +16,7 @@ android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" app:layout_behavior="@string/appbar_scrolling_view_behavior" + android:background="@color/grey_background" > + card_view:cardCornerRadius="5dp" + app:cardElevation="2dp"> + + + + + diff --git a/GSKMTOrange/src/main/res/layout/nonworking.xml b/GSKMTOrange/src/main/res/layout/nonworking.xml index 34874d3..978ee11 100644 --- a/GSKMTOrange/src/main/res/layout/nonworking.xml +++ b/GSKMTOrange/src/main/res/layout/nonworking.xml @@ -73,7 +73,7 @@ android:layout_height="wrap_content" android:layout_centerInParent="true" android:background="@null" - android:src="@drawable/cam_active" /> + android:src="@mipmap/camera_orange" /> - + android:src="@drawable/sad_cloud" />--> + + + diff --git a/GSKMTOrange/src/main/res/layout/service_item_layout.xml b/GSKMTOrange/src/main/res/layout/service_item_layout.xml new file mode 100644 index 0000000..323ba99 --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/service_item_layout.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/menu/menu_.xml b/GSKMTOrange/src/main/res/menu/menu_.xml new file mode 100644 index 0000000..7b0ac1e --- /dev/null +++ b/GSKMTOrange/src/main/res/menu/menu_.xml @@ -0,0 +1,10 @@ + + + diff --git a/GSKMTOrange/src/main/res/menu/planogram.xml b/GSKMTOrange/src/main/res/menu/planogram.xml index 2aa7f62..7fb463b 100644 --- a/GSKMTOrange/src/main/res/menu/planogram.xml +++ b/GSKMTOrange/src/main/res/menu/planogram.xml @@ -5,6 +5,6 @@ android:id="@+id/action_planogram" android:icon="@mipmap/ref_images_white" android:orderInCategory="100" - android:title="planogram" + android:title="@string/stock_facing_planogram_dialog_title" app:showAsAction="always" /> diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/export.png b/GSKMTOrange/src/main/res/mipmap-hdpi/export.png new file mode 100644 index 0000000..dd605d4 Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/export.png differ diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/language.png b/GSKMTOrange/src/main/res/mipmap-hdpi/language.png new file mode 100644 index 0000000..c3ac47c Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/language.png differ diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index 5256dbf..191caf2 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -73,20 +73,22 @@ Promosyon Ürün Adı - MBQ + X Bulunurluk Örnek Fotoğraf Ürün Adı - Stock + Stock Önyüz Raf Payı Hedefi Raf Payi + + Promosyon - Additional Promos - Promos + Ek Promosyon + Promosyon Promosyon Ürünü Promosyon Ürünü Ürün Bulunuyor @@ -106,11 +108,7 @@ Son Ziyaret Mağaza Performansı - - - - Planogram - + Stock Ek Teşhir @@ -128,6 +126,31 @@ Verileri silmek istiyor musun Silme için Evet tıklayın Please Select dropdown + Please Take a image + + Please fill sku data + Please enter Quantity + Do you want to save the data + + + Please click the image + GPS IS DISABLED... + Click ok to enable GPS. + Please Take Image Before Save + This device is not supported. + Uploading Data + Uploading Geotag Data... + failure + Uploading Geotag Images + success + Are you sure you want to Checkout + No Network + + Please click image + + Veritabanı Aktar + Servisler + En az bir fotoğraf çekiniz Ürün ekle @@ -163,6 +186,7 @@ Sil Veri Eklemek İçin Evet tıklayın Teşhir Türü + Click Store Front Image Brand Name SKU Name @@ -172,6 +196,20 @@ Remark Please fill Remark + + + Örnek Fotoğraf + Ayarlar + + Tamam + Veriyi saklamak istiyor musunuz? + Veriler Kaydedildi + Veriler Kaydedildi + Tüm alanlari doldurunuz + Tüm alanlari doldurunuz + Parinaam + + diff --git a/GSKMTOrange/src/main/res/values/dimens.xml b/GSKMTOrange/src/main/res/values/dimens.xml index 7f965e1..46979ce 100644 --- a/GSKMTOrange/src/main/res/values/dimens.xml +++ b/GSKMTOrange/src/main/res/values/dimens.xml @@ -7,7 +7,7 @@ 16dp 16dp - 10dp + 5dp 20sp 16sp diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index 16b7bb4..026d1cc 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -68,7 +68,6 @@ T2P Compliance - Category List Categorywise Performance Daily Data Menu @@ -93,7 +92,6 @@ Facing SOS Target SOS - Store Uploaded @@ -195,8 +193,8 @@ Daily Data Menu - Planogram - SettingsActivity + Reference Image + Settings OK Are you sure you want to save @@ -205,7 +203,6 @@ Fill the value Please fill all the data Parinaam - Select language @@ -214,6 +211,7 @@ Hello blank fragment CheckoutActivity Checkout Success + Network Error , Data Not Uploaded , Display Name @@ -221,5 +219,10 @@ Remark Please fill Remark + Service + + Data downloaded successfully + Export Database + Database Exported Successfully