Skip to content

AC-771 fixed the ill formed provider fields #751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
f4ww4z merged 1 commit into from
Jun 1, 2020
Merged

AC-771 fixed the ill formed provider fields #751

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
14 changes: 4 additions & 10 deletions ...g/openmrs/mobile/activities/providermanagerdashboard/addprovider/AddProviderFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,10 @@
import static android.app.Activity.RESULT_OK;

public class AddProviderFragment extends ACBaseFragment<AddProviderContract.Presenter>
implements AddProviderContract.View {

implements AddProviderContract.View {
private FloatingActionButton doneFAB;
private TextInputEditText firstNameEt, lastNameEt, identifierEt;
private TextInputLayout firstNameTIL, lastNameTIL, identifierTIL;

private Provider editProvider = null;
private ArrayList<Provider> existingProviders;

Expand All @@ -64,10 +62,10 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
View root = inflater.inflate(R.layout.fragment_add_provider, container, false);

editProvider = (Provider) (Objects.requireNonNull(getActivity()).getIntent()
.getSerializableExtra(ApplicationConstants.BundleKeys.PROVIDER_ID_BUNDLE));
.getSerializableExtra(ApplicationConstants.BundleKeys.PROVIDER_ID_BUNDLE));

existingProviders = (ArrayList<Provider>) (Objects.requireNonNull(getActivity()).getIntent()
.getSerializableExtra(ApplicationConstants.BundleKeys.EXISTING_PROVIDERS_BUNDLE));
.getSerializableExtra(ApplicationConstants.BundleKeys.EXISTING_PROVIDERS_BUNDLE));

setupUI(root);
return root;
Expand Down Expand Up @@ -117,14 +115,11 @@ void setupUI(View root) {
} else {
setProviderResult(provider);
}

} else {
provider = mPresenter.editExistingProvider(editProvider, person, identifier);
setProviderResult(provider);
}

}

});
}

Expand All @@ -150,7 +145,6 @@ public boolean validateFields() {
firstNameTIL.setErrorEnabled(false);
}


// Family name validation
if (ViewUtils.isEmpty(lastNameEt)) {
lastNameTIL.setErrorEnabled(true);
Expand Down Expand Up @@ -195,7 +189,6 @@ public void showMatchingProvidersDialog(List<Provider> matchingProviders, Provid

builder.setPositiveButton(getActivity().getString(R.string.dialog_matching_provider_positive_btn), (dialog, which) -> {
setProviderResult(provider);

}).setNegativeButton(getActivity().getString(R.string.dialog_button_cancel), (dialog, which) -> {
// Do nothing and cancel the dialog box
});
Expand All @@ -206,6 +199,7 @@ public void showMatchingProvidersDialog(List<Provider> matchingProviders, Provid

/**
* This will set the Intent result with new/existing providers
*
* @param provider
*/
public void setProviderResult(Provider provider) {
Expand Down
9 changes: 7 additions & 2 deletions .../openmrs/mobile/activities/providermanagerdashboard/addprovider/AddProviderPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import java.util.List;

public class AddProviderPresenter extends BasePresenter implements AddProviderContract.Presenter {

@NotNull
private final AddProviderContract.View addProviderView;

Expand All @@ -47,6 +46,9 @@ public Person createPerson(String firstName, String lastName) {
PersonName personName = new PersonName();
personName.setGivenName(firstName);
personName.setFamilyName(lastName);
person.setUuid(null);

person.setDisplay(firstName + " " + lastName);

List<PersonName> names = new ArrayList<>();
names.add(personName);
Expand All @@ -68,6 +70,8 @@ public Provider createNewProvider(Person person, String identifier) {
Provider provider = new Provider();
provider.setPerson(person);

provider.setUuid(null);
provider.setDisplay(identifier + " - " + person.getDisplay());
provider.setIdentifier(identifier);

provider.setRetired(false);
Expand Down Expand Up @@ -110,8 +114,9 @@ public List<Provider> getMatchingProviders(ArrayList<Provider> existingProviders
String fName = currentProvider.getPerson().getName().getGivenName().toLowerCase();
String lName = currentProvider.getPerson().getName().getFamilyName().toLowerCase();

if (name.contains(fName) || name.contains(lName))
if (name.contains(fName) || name.contains(lName)) {
matchingProviders.add(provider);
}
}
return matchingProviders;
}
Expand Down
4 changes: 2 additions & 2 deletions openmrs-client/src/main/java/org/openmrs/mobile/api/retrofit/ProviderRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
import retrofit2.Response;

public class ProviderRepository {

public LiveData<List<Provider>> getProviders(RestApi restApi) {

final MutableLiveData<List<Provider>> providerLiveData = new MutableLiveData<>();
Expand All @@ -55,7 +54,6 @@ public void onResponse(@NotNull Call<Results<Provider>> call, @NotNull Response<
ToastUtil.error(OpenMRS.getInstance().getString(R.string.unable_to_fetch_providers));
providerLiveData.setValue(null);
}

}

@Override
Expand Down Expand Up @@ -105,6 +103,8 @@ public void addProvider(RestApi restApi, Provider provider, CustomApiCallback ca
@Override
public void onResponse(@NotNull Call<Provider> call, @NotNull Response<Provider> response) {
if (response.isSuccessful()) {
provider.setUuid(response.body().getUuid());
provider.getPerson().setUuid(response.body().getPerson().getUuid());
ToastUtil.success(OpenMRS.getInstance().getString(R.string.add_provider_success_msg));
OpenMRS.getInstance().getOpenMRSLogger().e("Adding Provider Successful " + response.raw());
callback.onSuccess();
Expand Down