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

Merge pull request #27 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/NONWOKingChangesN

Browse Source 
review
This commit is contained in:
ashishchauhan009
2017-02-24 17:51:58 +05:30
committed by GitHub
parent bded1a499a 3cd4ca334b
commit a6b35dffdf
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/misc.xml
Generated
+1 -1
View File
@@ -41,7 +41,7 @@
<ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" /> <ConfirmationsSetting value="0" id="Remove" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
+9 -2
View File
@@ -558,6 +558,7 @@ public class StoreListActivity extends AppCompatActivity {
coverage = db.getCoverageWithStoreID_Data(storeCd); coverage = db.getCoverageWithStoreID_Data(storeCd);
if (coverage.size() > 0) {
if (coverage.get(0).getStatus().equals(CommonString.KEY_INVALID) || coverage.get(0).getStatus().equals(CommonString.KEY_VALID)) { if (coverage.get(0).getStatus().equals(CommonString.KEY_INVALID) || coverage.get(0).getStatus().equals(CommonString.KEY_VALID)) {
AlertDialog.Builder builder = new AlertDialog.Builder(StoreListActivity.this); AlertDialog.Builder builder = new AlertDialog.Builder(StoreListActivity.this);
@@ -573,7 +574,7 @@ public class StoreListActivity extends AppCompatActivity {
Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class); Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class);
in.putExtra(CommonString.KEY_STORE_ID,current.getSTORE_ID()); in.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID());
startActivity(in); startActivity(in);
} }
@@ -590,8 +591,14 @@ public class StoreListActivity extends AppCompatActivity {
AlertDialog alert = builder.create(); AlertDialog alert = builder.create();
alert.show(); alert.show();
} else { }
else{
Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class);
in.putExtra(CommonString.KEY_STORE_ID,current.getSTORE_ID());
startActivity(in);
}
}else {
Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class); Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class);
in.putExtra(CommonString.KEY_STORE_ID,current.getSTORE_ID()); in.putExtra(CommonString.KEY_STORE_ID,current.getSTORE_ID());