diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 09e294a..961689d 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,8 +3,9 @@ - + diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index c7b9aad..cabd1b3 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 + compileSdkVersion 23 buildToolsVersion "24.0.1" useLibrary 'org.apache.http.legacy' diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml index 278247a..e548e34 100644 --- a/GSKMTOrange/src/main/AndroidManifest.xml +++ b/GSKMTOrange/src/main/AndroidManifest.xml @@ -40,7 +40,6 @@ android:label="@string/app_name" android:theme="@style/AppTheme.NoActionBar" /> - + getStoreData(String date) { + + + ArrayList list = new ArrayList(); + Cursor dbcursor = null; + + try { + + dbcursor = db.rawQuery("SELECT * from JOURNEY_PLAN where VISIT_DATE ='" + date + "'", null); + + if (dbcursor != null) { + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + StoreBean sb = new StoreBean(); + + sb.setSTORE_ID(dbcursor.getString(dbcursor + .getColumnIndexOrThrow("STORE_ID"))); + + sb.setEMP_ID((dbcursor.getString(dbcursor + .getColumnIndexOrThrow("EMP_ID")))); + + sb.setKEYACCOUNT(dbcursor.getString(dbcursor + .getColumnIndexOrThrow("KEYACCOUNT"))); + + sb.setSTORE_NAME(dbcursor.getString(dbcursor + .getColumnIndexOrThrow("STORE_NAME"))); + + sb.setADDRESS((dbcursor.getString(dbcursor + .getColumnIndexOrThrow("ADDRESS")))); + sb.setCITY(dbcursor.getString(dbcursor + .getColumnIndexOrThrow("CITY"))); + + sb.setSTORETYPE(dbcursor.getString(dbcursor + .getColumnIndexOrThrow("STORETYPE"))); + + sb.setCLASSIFICATION(dbcursor.getString(dbcursor + .getColumnIndexOrThrow("CLASSIFICATION"))); + + sb.setKEYACCOUNT_ID(dbcursor.getString(dbcursor + .getColumnIndexOrThrow("KEYACCOUNT_ID"))); + + sb.setSTORETYPE_ID(dbcursor.getString(dbcursor + .getColumnIndexOrThrow("STORETYPE_ID"))); + + sb.setCLASS_ID(dbcursor.getString(dbcursor + .getColumnIndexOrThrow("CLASS_ID"))); + + sb.setVISIT_DATE(dbcursor.getString(dbcursor + .getColumnIndexOrThrow("VISIT_DATE"))); + + sb.setCAMERA_ALLOW(dbcursor.getString(dbcursor + .getColumnIndexOrThrow("CAMERA_ALLOW"))); + + sb.setUPLOAD_STATUS(dbcursor.getString(dbcursor + .getColumnIndexOrThrow("UPLOAD_STATUS"))); + sb.setCHECKOUT_STATUS(dbcursor.getString(dbcursor + .getColumnIndexOrThrow("CHECKOUT_STATUS"))); + + sb.setGEO_TAG(dbcursor.getString(dbcursor + .getColumnIndexOrThrow("GEO_TAG"))); + + + list.add(sb); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + + } catch (Exception e) { + Log.d("Exception get JCP!", e.toString()); + return list; + } + + + return list; + } + + + + + + + + + + } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java index b3c647d..c5f53bd 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java @@ -53,6 +53,7 @@ public class GeoTagActivity extends AppCompatActivity { mapFragment = (SupportMapFragment) getSupportFragmentManager() .findFragmentById(R.id.map); //mapFragment.getMapAsync(this); + // mapFragment.getMapAsync(this); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/StoreBean.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/StoreBean.java new file mode 100644 index 0000000..31cf805 --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/StoreBean.java @@ -0,0 +1,158 @@ +package cpm.com.gskmtorange.GetterSetter; + +/** + * Created by ashishc on 29-12-2016. + */ + +public class StoreBean { + + String STORE_ID; + String EMP_ID; + String KEYACCOUNT; + String STORE_NAME; + String ADDRESS; + String CITY; + String STORETYPE; + String CLASSIFICATION; + String KEYACCOUNT_ID; + String STORETYPE_ID; + String CLASS_ID; + String VISIT_DATE; + String CAMERA_ALLOW; + String UPLOAD_STATUS; + + public String getSTORE_ID() { + return STORE_ID; + } + + public void setSTORE_ID(String STORE_ID) { + this.STORE_ID = STORE_ID; + } + + public String getEMP_ID() { + return EMP_ID; + } + + public void setEMP_ID(String EMP_ID) { + this.EMP_ID = EMP_ID; + } + + public String getKEYACCOUNT() { + return KEYACCOUNT; + } + + public void setKEYACCOUNT(String KEYACCOUNT) { + this.KEYACCOUNT = KEYACCOUNT; + } + + public String getSTORE_NAME() { + return STORE_NAME; + } + + public void setSTORE_NAME(String STORE_NAME) { + this.STORE_NAME = STORE_NAME; + } + + public String getADDRESS() { + return ADDRESS; + } + + public void setADDRESS(String ADDRESS) { + this.ADDRESS = ADDRESS; + } + + public String getCITY() { + return CITY; + } + + public void setCITY(String CITY) { + this.CITY = CITY; + } + + public String getSTORETYPE() { + return STORETYPE; + } + + public void setSTORETYPE(String STORETYPE) { + this.STORETYPE = STORETYPE; + } + + public String getCLASSIFICATION() { + return CLASSIFICATION; + } + + public void setCLASSIFICATION(String CLASSIFICATION) { + this.CLASSIFICATION = CLASSIFICATION; + } + + public String getKEYACCOUNT_ID() { + return KEYACCOUNT_ID; + } + + public void setKEYACCOUNT_ID(String KEYACCOUNT_ID) { + this.KEYACCOUNT_ID = KEYACCOUNT_ID; + } + + public String getSTORETYPE_ID() { + return STORETYPE_ID; + } + + public void setSTORETYPE_ID(String STORETYPE_ID) { + this.STORETYPE_ID = STORETYPE_ID; + } + + public String getCLASS_ID() { + return CLASS_ID; + } + + public void setCLASS_ID(String CLASS_ID) { + this.CLASS_ID = CLASS_ID; + } + + public String getVISIT_DATE() { + return VISIT_DATE; + } + + public void setVISIT_DATE(String VISIT_DATE) { + this.VISIT_DATE = VISIT_DATE; + } + + public String getCAMERA_ALLOW() { + return CAMERA_ALLOW; + } + + public void setCAMERA_ALLOW(String CAMERA_ALLOW) { + this.CAMERA_ALLOW = CAMERA_ALLOW; + } + + public String getUPLOAD_STATUS() { + return UPLOAD_STATUS; + } + + public void setUPLOAD_STATUS(String UPLOAD_STATUS) { + this.UPLOAD_STATUS = UPLOAD_STATUS; + } + + public String getCHECKOUT_STATUS() { + return CHECKOUT_STATUS; + } + + public void setCHECKOUT_STATUS(String CHECKOUT_STATUS) { + this.CHECKOUT_STATUS = CHECKOUT_STATUS; + } + + public String getGEO_TAG() { + return GEO_TAG; + } + + public void setGEO_TAG(String GEO_TAG) { + this.GEO_TAG = GEO_TAG; + } + + String CHECKOUT_STATUS; + String GEO_TAG ; + + + + +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index 18b2901..fdae3b6 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -22,6 +22,7 @@ import android.widget.TextView; import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.gsk_dailyentry.CategoryListActivity; +import cpm.com.gskmtorange.dailyentry.StoreListActivity; import cpm.com.gskmtorange.download.DownloadActivity; public class MainActivity extends AppCompatActivity @@ -129,6 +130,13 @@ public class MainActivity extends AppCompatActivity int id = item.getItemId(); if (id == R.id.nav_route_plan) { + + Intent startDownload = new Intent(this,StoreListActivity.class); + startActivity(startDownload); + + overridePendingTransition(R.anim.activity_in, R.anim.activity_out); + + // Handle the camera action } else if (id == R.id.nav_download) { 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 058d962..5f114c9 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java @@ -13,6 +13,9 @@ public class CommonString { public static final String KEY_USERNAME = "username"; public static final String KEY_PASSWORD = "password"; public static final String KEY_DATE = "date"; + public static final String KEY_STOREVISITED_STATUS = "STOREVISITED_STATUS"; + + public static final String KEY_PATH = "path"; public static final String KEY_VERSION = "APP_VERSION"; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java new file mode 100644 index 0000000..a7884d4 --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -0,0 +1,217 @@ +package cpm.com.gskmtorange.dailyentry; + +import android.app.AlertDialog; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.content.SharedPreferences; +import android.os.Bundle; +import android.preference.PreferenceManager; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; +import android.view.LayoutInflater; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; +import android.widget.AdapterView; +import android.widget.BaseAdapter; +import android.widget.Button; +import android.widget.ImageView; +import android.widget.ListView; +import android.widget.RelativeLayout; +import android.widget.TextView; +import android.widget.Toast; + +import java.util.ArrayList; + +import cpm.com.gskmtorange.Database.GSKOrangeDB; +import cpm.com.gskmtorange.GetterSetter.StoreBean; +import cpm.com.gskmtorange.R; +import cpm.com.gskmtorange.constant.CommonString; + +/** + * Created by ashishc on 29-12-2016. + */ + +public class StoreListActivity extends AppCompatActivity { + + ArrayList storelist = new ArrayList(); + + + ListView list; + private SharedPreferences preferences; + + String date,visit_status; + GSKOrangeDB db; + + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.storelist); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + + + preferences = PreferenceManager.getDefaultSharedPreferences(this); + date = preferences.getString(CommonString.KEY_DATE, null); + visit_status = preferences.getString(CommonString.KEY_STOREVISITED_STATUS, ""); + + db = new GSKOrangeDB(StoreListActivity.this); + db.open(); + + + list = (ListView)findViewById(R .id.list_id); + + + storelist = db.getStoreData(date); + + + if (storelist.size()>0) { + list.setAdapter(new MyAdaptor()); + } + + list.setOnItemClickListener(new AdapterView.OnItemClickListener() { + + @Override + public void onItemClick(AdapterView parent, View view, + int position, long id) { + + + Toast.makeText(getApplicationContext(),"Click",Toast.LENGTH_LONG).show(); + + + + } + }); + + } + + + private class MyAdaptor extends BaseAdapter { + + @Override + public int getCount() { + + return storelist.size(); + } + + @Override + public Object getItem(int position) { + + return position; + } + + @Override + public long getItemId(int position) { + + return position; + } + + @Override + public View getView(final int position, View convertView, ViewGroup parent) { + ViewHolder holder = null; + if (convertView == null) { + holder = new ViewHolder(); + + LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE); + convertView = inflater.inflate(R.layout.storeviewlist, null); + + holder.storename = (TextView) convertView + .findViewById(R.id.storelistviewxml_storename); + holder.storeaddress = (TextView) convertView + .findViewById(R.id.storelistviewxml_storeaddress); + + holder.imgtick = (ImageView) convertView + .findViewById(R.id.storelistviewxml_storeico); + + holder.checkout = (Button) convertView + .findViewById(R.id.chkout); + + holder.l1 = (RelativeLayout) convertView + .findViewById(R.id.storenamelistview_layout); + + convertView.setTag(holder); + + } else { + holder = (ViewHolder) convertView.getTag(); + } + holder.storename.setText(storelist.get(position).getSTORE_NAME()); + holder.storeaddress.setText(storelist.get(position).getCITY()); + + + + + + holder.checkout.setOnClickListener(new View.OnClickListener() { + + @Override + public void onClick(View v) { + + AlertDialog.Builder builder = new AlertDialog.Builder( + StoreListActivity.this); + builder.setMessage("Are you sure you want to checkout") + .setCancelable(false) + .setPositiveButton("OK", + new DialogInterface.OnClickListener() { + public void onClick( + DialogInterface dialog, int id) { + + + } + }) + .setNegativeButton("Cancel", + new DialogInterface.OnClickListener() { + public void onClick( + DialogInterface dialog, int id) { + dialog.cancel(); + } + }); + AlertDialog alert = builder.create(); + alert.show(); + + } + }); + + + + return convertView; + } + + } + + + private class ViewHolder { + TextView storename, storeaddress; + ImageView imgtick; + Button checkout; + + RelativeLayout l1; + + } + + + @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){ + + // NavUtils.navigateUpFromSameTask(this); + finish(); + + overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); + + } + + return super.onOptionsItemSelected(item); + } + + +} 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 7173a92..f9d1685 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -25,6 +25,10 @@ import java.io.IOException; import java.io.StringReader; import java.net.MalformedURLException; + +import cpm.com.gskmtorange.Database.GSKOrangeDB; +import cpm.com.gskmtorange.LoginActivity; + import cpm.com.gskmtorange.R; import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter; @@ -45,7 +49,7 @@ public class DownloadActivity extends AppCompatActivity { private TextView percentage, message; Data data; int eventType; - + GSKOrangeDB db; private SharedPreferences preferences = null; String userId, culture_id; @@ -63,6 +67,8 @@ public class DownloadActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_download); + db = new GSKOrangeDB(this); + preferences = PreferenceManager.getDefaultSharedPreferences(this); userId = preferences.getString(CommonString.KEY_USERNAME, null); culture_id = preferences.getString(CommonString.KEY_CULTURE_ID, null); @@ -433,6 +439,28 @@ public class DownloadActivity extends AppCompatActivity { publishProgress(data); + + + + + + + db.open(); + + db.InsertJCP(jcpgettersetter); + + + + + + + + + + + + + }catch (MalformedURLException e) { /*final AlertMessage message = new AlertMessage( diff --git a/GSKMTOrange/src/main/res/drawable-v21/gradient_bg.xml b/GSKMTOrange/src/main/res/drawable-v21/gradient_bg.xml new file mode 100644 index 0000000..b16ac3b --- /dev/null +++ b/GSKMTOrange/src/main/res/drawable-v21/gradient_bg.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/drawable-v21/gradient_bg_hover.xml b/GSKMTOrange/src/main/res/drawable-v21/gradient_bg_hover.xml new file mode 100644 index 0000000..791f976 --- /dev/null +++ b/GSKMTOrange/src/main/res/drawable-v21/gradient_bg_hover.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/drawable-v21/list_selector.xml b/GSKMTOrange/src/main/res/drawable-v21/list_selector.xml new file mode 100644 index 0000000..448c9f5 --- /dev/null +++ b/GSKMTOrange/src/main/res/drawable-v21/list_selector.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/drawable-v21/store.png b/GSKMTOrange/src/main/res/drawable-v21/store.png new file mode 100644 index 0000000..259ec99 Binary files /dev/null and b/GSKMTOrange/src/main/res/drawable-v21/store.png differ diff --git a/GSKMTOrange/src/main/res/layout/storelist.xml b/GSKMTOrange/src/main/res/layout/storelist.xml new file mode 100644 index 0000000..1078dae --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/storelist.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/storeviewlist.xml b/GSKMTOrange/src/main/res/layout/storeviewlist.xml new file mode 100644 index 0000000..09ee2cb --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/storeviewlist.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + +