diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index e18ffec..7705f9b 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -15,8 +15,8 @@ android { minSdkVersion 15 targetSdkVersion 22 - versionCode 9 - versionName "2.2" + versionCode 10 + versionName "2.3" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } 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 f13ff42..c8577bc 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 @@ -39,6 +39,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.List; import java.util.Locale; +import java.util.logging.StreamHandler; import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.R; @@ -413,9 +414,9 @@ public class PromoComplianceActivity extends AppCompatActivity { ArrayAdapter sp_promo_adapter = new ArrayAdapter<>(PromoComplianceActivity.this, android.R.layout.simple_list_item_1); for (int i = 0; i < promoSpinnerListData.size(); i++) { sp_promo_adapter.add(promoSpinnerListData.get(i).getPromo()); + } - sp_promo_adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - //sp_promo_adapter.setDropDownViewResource(R.layout.spinner_text_view); + sp_promo_adapter.setDropDownViewResource(R.layout.spinner_text_view); sp_promo.setAdapter(sp_promo_adapter); } catch (Exception e) { e.printStackTrace(); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java index 16c33d6..357c173 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java @@ -1378,7 +1378,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity { db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), coverageList.get(i) .getVisitDate(), CommonString.KEY_U); - db.deleteTableWithStoreID(coverageList.get(i).getStoreId()); + //db.deleteTableWithStoreID(coverageList.get(i).getStoreId()); } data.value = 100; publishProgress(data); @@ -1411,6 +1411,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity { }*/ dialog.dismiss(); + db.deleteAllTables(); if (result.contains(CommonString.KEY_SUCCESS)) { //db.deleteAllTables(); showAlert(getString(R.string.menu_upload_data)); diff --git a/GSKMTOrange/src/main/res/layout/spinner_text_view.xml b/GSKMTOrange/src/main/res/layout/spinner_text_view.xml index b563543..89c8132 100644 --- a/GSKMTOrange/src/main/res/layout/spinner_text_view.xml +++ b/GSKMTOrange/src/main/res/layout/spinner_text_view.xml @@ -1,16 +1,11 @@ - - - - \ No newline at end of file + android:layout_height="wrap_content" + android:paddingBottom="5dp" + android:paddingLeft="15dp" + android:paddingRight="15dp" + android:paddingTop="5dp" + android:text="Text" + android:textSize="15dp" />