Skip to content
This repository has been archived by the owner on Jan 11, 2024. It is now read-only.

Fix-313: Network check added to Create Customer and Group activities. #175

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Fix-313: Network check added to Create Customer and Group activities. #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions .../fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.apache.fineract.ui.online.customers.createcustomer.OnNavigationBarListener;
import org.apache.fineract.ui.online.customers.customerdetails.CustomerDetailsActivity;
import org.apache.fineract.utils.ConstantKeys;
import org.apache.fineract.utils.NetworkUtil;

import java.util.List;

Expand Down Expand Up @@ -103,15 +104,19 @@ protected void onRestoreInstanceState(Bundle savedInstanceState) {

@Override
public void onCompleted(View completeButton) {
stepperLayout.setNextButtonEnabled(false);
customer.setType(Customer.Type.PERSON.name());
switch (customerAction) {
case CREATE:
createCustomerPresenter.createCustomer(customer);
break;
case EDIT:
createCustomerPresenter.updateCustomer(customerIdentifier, customer);
break;
if (NetworkUtil.isConnected(CreateCustomerActivity.this)) {
stepperLayout.setNextButtonEnabled(false);
customer.setType(Customer.Type.PERSON.name());
switch (customerAction) {
case CREATE:
createCustomerPresenter.createCustomer(customer);
break;
case EDIT:
createCustomerPresenter.updateCustomer(customerIdentifier, customer);
break;
}
} else {
Toaster.show(completeButton, getString(R.string.no_internet_connection));
}
}

Expand Down
15 changes: 10 additions & 5 deletions app/src/main/java/org/apache/fineract/ui/online/groups/creategroup/CreateGroupActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@ import org.apache.fineract.data.models.customer.Address
import org.apache.fineract.ui.base.FineractBaseActivity
import org.apache.fineract.ui.base.Toaster
import org.apache.fineract.ui.online.groups.GroupAction
import org.apache.fineract.ui.online.groups.grouplist.GroupViewModelFactory
import org.apache.fineract.ui.online.groups.grouplist.GroupViewModel
import org.apache.fineract.ui.online.groups.grouplist.GroupViewModelFactory
import org.apache.fineract.utils.Constants
import org.apache.fineract.utils.DateUtils
import org.apache.fineract.utils.NetworkUtil
import javax.inject.Inject

/*
Expand Down Expand Up @@ -96,11 +97,15 @@ class CreateGroupActivity : FineractBaseActivity(), StepperLayout.StepperListene
}

override fun onCompleted(completeButton: View?) {
when (groupAction) {
GroupAction.EDIT -> group.identifier?.let {
viewModel.updateGroup(it, group)
if (NetworkUtil.isConnected(this)) {
when (groupAction) {
GroupAction.EDIT -> group.identifier?.let {
viewModel.updateGroup(it, group)
}
GroupAction.CREATE -> viewModel.createGroup(group)
}
GroupAction.CREATE -> viewModel.createGroup(group)
} else {
Toaster.show(completeButton, getString(R.string.no_internet_connection))
}
}

Expand Down