AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

//Stock_FacingActivity Changes today

Browse Source
This commit is contained in:
Gagan290
2017-01-20 11:36:41 +05:30
parent f8daaac242
commit 3523124716
8 changed files with 1234 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/AndroidManifest.xml
+18 -14
View File
@@ -31,8 +31,8 @@
<activity
android:name=".LoginActivity"
android:label="@string/title_activity_login"
android:theme="@style/AppTheme.NoActionBar"
android:screenOrientation="portrait"/>
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".MainActivity"
android:label="@string/main_menu_activity_name"
@@ -44,8 +44,8 @@
<activity
android:name=".SelectLanguageActivity"
android:label="@string/title_activity_select_language"
android:theme="@style/AppTheme.NoActionBar"
android:screenOrientation="portrait"/>
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".download.DownloadActivity"
android:screenOrientation="portrait" />
@@ -90,16 +90,15 @@
<activity
android:name=".gsk_dailyentry.CategoryListActivity"
android:configChanges="screenSize|orientation|keyboardHidden"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustPan"
android:screenOrientation="portrait"/>
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".gsk_dailyentry.CategoryWisePerformanceActivity"
android:configChanges="screenSize|orientation|keyboardHidden"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustPan"
/>
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".gsk_dailyentry.DailyDataMenuActivity"
@@ -154,18 +153,23 @@
<activity
android:name=".dailyentry.SettingsActivity"
android:label="@string/title_activity_settings"
android:theme="@style/AppTheme.NoActionBar"
android:screenOrientation="portrait"/>
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".dailyentry.CheckoutActivity"
android:label="@string/title_activity_checkout"
android:theme="@style/AppTheme.NoActionBar"
android:screenOrientation="portrait"/>
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".dailyentry.ServiceActivity"
android:label="@string/title_activity_service"
android:theme="@style/AppTheme.NoActionBar"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".upload.PreviousDataUploadActivity"
android:configChanges="screenSize|orientation|keyboardHidden"
android:label="@string/title_activity_upload"
android:screenOrientation="portrait" />
</application>
</manifest>
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+71
View File
@@ -3151,5 +3151,76 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
public ArrayList<CoverageBean> getPreviousCoverageData(String visitdate) {
ArrayList<CoverageBean> list = new ArrayList<CoverageBean>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("SELECT * from " + CommonString.TABLE_COVERAGE_DATA + " where "
+ CommonString.KEY_VISIT_DATE + "<>'" + visitdate + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
CoverageBean sb = new CoverageBean();
sb.setStoreId(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_STORE_ID)));
sb.setUserId((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_USER_ID))));
sb.setInTime(((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IN_TIME)))));
sb.setOutTime(((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_OUT_TIME)))));
sb.setVisitDate((((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_VISIT_DATE))))));
sb.setLatitude(((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_LATITUDE)))));
sb.setLongitude(((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_LONGITUDE)))));
sb.setStatus((((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_COVERAGE_STATUS))))));
sb.setImage((((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE))))));
sb.setReason((((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_REASON))))));
sb.setReasonid((((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_REASON_ID))))));
sb.setMID(Integer.parseInt(((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_ID))))));
if (dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_COVERAGE_REMARK)) == null) {
sb.setRemark("");
} else {
sb.setRemark((((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_COVERAGE_REMARK))))));
}
list.add(sb);
dbcursor.moveToNext();
}
dbcursor.close();
return list;
}
} catch (Exception e) {
Log.d("Exception ", " PreviousCoverageData Upload " + e.toString());
return list;
}
return list;
}
//check if table is empty
public boolean isCoverageDataFilled(String visit_date) {
boolean filled = false;
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("SELECT * FROM COVERAGE_DATA "
+ "where " + CommonString.KEY_VISIT_DATE + "<>'" + visit_date + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
int icount = dbcursor.getInt(0);
dbcursor.close();
if (icount > 0) {
filled = true;
} else {
filled = false;
}
}
} catch (Exception e) {
Log.d("Exception ", " when fetching Records!!!!!!!!!!!!!!!!!!!!! " + e.toString());
return filled;
}
return filled;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
+5 -8
View File
@@ -171,7 +171,6 @@ public class LoginActivity extends AppCompatActivity {
mProgressView = findViewById(R.id.login_progress);
// Create a Folder for Images
@@ -523,7 +522,8 @@ public class LoginActivity extends AppCompatActivity {
editor.putString(CommonString.KEY_VERSION, lgs.getAPP_VERSION());
editor.putString(CommonString.KEY_PATH, lgs.getAPP_PATH());
editor.putString(CommonString.KEY_DATE, lgs.getCURRENTDATE());
//editor.putString(CommonString.KEY_DATE, lgs.getCURRENTDATE());
editor.putString(CommonString.KEY_DATE, "01/21/2017");
editor.commit();
@@ -605,8 +605,7 @@ public class LoginActivity extends AppCompatActivity {
startActivity(intent);
finish();
}
else{
} else {
updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
@@ -674,11 +673,9 @@ public class LoginActivity extends AppCompatActivity {
if (language.equalsIgnoreCase("English")) {
lang = "EN";
}
else if(language.equalsIgnoreCase("UAE")) {
} else if (language.equalsIgnoreCase("UAE")) {
lang = "AR";
}
else {
} else {
lang = "TR";
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
+24 -1
View File
@@ -49,6 +49,7 @@ import cpm.com.gskmtorange.dailyentry.T2PComplianceActivity;
import cpm.com.gskmtorange.dailyentry.StoreListActivity;
import cpm.com.gskmtorange.download.DownloadActivity;
import cpm.com.gskmtorange.gsk_dailyentry.CategoryListActivity;
import cpm.com.gskmtorange.upload.PreviousDataUploadActivity;
import cpm.com.gskmtorange.upload.UploadActivity;
public class MainActivity extends AppCompatActivity
@@ -186,9 +187,31 @@ public class MainActivity extends AppCompatActivity
// Handle the camera action
} else if (id == R.id.nav_download) {
if (checkNetIsAvailable()) {
if (db.isCoverageDataFilled(date)) {
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
builder.setTitle("Parinaam");
builder.setMessage(getResources().getString(R.string.previous_data_upload)).setCancelable(false)
.setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
Intent in = new Intent(getApplicationContext(), PreviousDataUploadActivity.class);
startActivity(in);
finish();
}
});
AlertDialog alert = builder.create();
alert.show();
} else {
Intent in = new Intent(getApplicationContext(), DownloadActivity.class);
startActivity(in);
}
} else {
Snackbar.make(webView, getResources().getString(R.string.nonetwork), Snackbar.LENGTH_SHORT)
.setAction("Action", null).show();
}
} else if (id == R.id.nav_upload) {
@@ -228,7 +251,7 @@ public class MainActivity extends AppCompatActivity
} else {
Snackbar.make(webView, "No Network Available", Snackbar.LENGTH_SHORT)
Snackbar.make(webView, getResources().getString(R.string.nonetwork), Snackbar.LENGTH_SHORT)
.setAction("Action", null).show();
// Toast.makeText(getApplicationContext(), "No Network Available", Toast.LENGTH_SHORT).show();
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
+1103
View File
File diff suppressed because it is too large Load Diff
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
-18
View File
@@ -1051,24 +1051,6 @@ public class UploadActivity extends AppCompatActivity {
}
}
public void showAlert(String str) {
AlertDialog.Builder builder = new AlertDialog.Builder(UploadActivity.this);
builder.setTitle("Parinaam");
builder.setMessage(str).setCancelable(false)
.setPositiveButton("OK", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
/* Intent i = new Intent(activity, StorelistActivity.class);
activity.startActivity(i);
activity.finish();*/
finish();
}
});
AlertDialog alert = builder.create();
alert.show();
}
@Override
protected void onResume() {
super.onResume();
GSKMTOrange/src/main/res/values-tr/string.xml
+2
View File
@@ -189,6 +189,8 @@
<string name="dialog_title">Parinaam</string>
<!--Gagan end new code 2-->
<string name="previous_data_upload">Lütfen Önceki Verileri Paylaşın</string>
</resources>
GSKMTOrange/src/main/res/values/strings.xml
+1
View File
@@ -224,5 +224,6 @@
<string name="data_downloaded_successfully">Data downloaded successfully</string>
<string name="export_database">Export Database</string>
<string name="data_exported_successfully">Database Exported Successfully</string>
<string name="previous_data_upload">Please Upload Previous Data First</string>
</resources>