Skip to content

Commit

Permalink
Merge branch 'master' into issue135
Browse files Browse the repository at this point in the history
  • Loading branch information
@ekigamba
ekigamba committed Nov 2, 2017
2 parents d1ef08b + acac9c0 commit ff1893c
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 8 deletions.
2 changes: 1 addition & 1 deletion opensrp-path/build.gradle
View file
Expand Up @@ -106,7 +106,7 @@ dependencies {
transitive = true
exclude group: 'com.github.bmelnychuk', module: 'atv'
}
compile('org.smartregister:opensrp-client-immunization:1.1.2-SNAPSHOT@aar') {
compile('org.smartregister:opensrp-client-immunization:1.1.3-SNAPSHOT@aar') {
transitive = true
}
compile('org.smartregister:opensrp-client-growth-monitoring:1.0.3-SNAPSHOT@aar') {
Expand Down
48 changes: 48 additions & 0 deletions opensrp-path/src/main/java/org/smartregister/path/activity/ChildImmunizationActivity.java
View file
Expand Up @@ -4,6 +4,7 @@
import android.app.FragmentTransaction;
import android.content.ContentValues;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.drawable.ColorDrawable;
import android.os.AsyncTask;
Expand Down Expand Up @@ -135,6 +136,7 @@ public class ChildImmunizationActivity extends BaseActivity
private CommonPersonObjectClient childDetails;
private RegisterClickables registerClickables;
private DetailsRepository detailsRepository;
private boolean dialogOpen = false;

@Override
protected void onCreate(Bundle savedInstanceState) {
Expand Down Expand Up @@ -384,12 +386,20 @@ private void updateServiceViews(Map<String, List<ServiceType>> serviceTypeMap, L
@Override
public void onClick(ServiceGroup serviceGroup, ServiceWrapper
serviceWrapper) {
if (dialogOpen) {
return;
}
dialogOpen = true;
addServiceDialogFragment(serviceWrapper, serviceGroup);
}
});
curGroup.setOnServiceUndoClickListener(new ServiceGroup.OnServiceUndoClickListener() {
@Override
public void onUndoClick(ServiceGroup serviceGroup, ServiceWrapper serviceWrapper) {
if (dialogOpen) {
return;
}
dialogOpen = true;
addServiceUndoDialogFragment(serviceGroup, serviceWrapper);
}
});
Expand Down Expand Up @@ -462,12 +472,20 @@ private void addVaccineGroup(int canvasId, JSONObject vaccineGroupData, List<Vac
curGroup.setOnRecordAllClickListener(new VaccineGroup.OnRecordAllClickListener() {
@Override
public void onClick(VaccineGroup vaccineGroup, ArrayList<VaccineWrapper> dueVaccines) {
if (dialogOpen) {
return;
}
dialogOpen = true;
addVaccinationDialogFragment(dueVaccines, vaccineGroup);
}
});
curGroup.setOnVaccineClickedListener(new VaccineGroup.OnVaccineClickedListener() {
@Override
public void onClick(VaccineGroup vaccineGroup, VaccineWrapper vaccine) {
if (dialogOpen) {
return;
}
dialogOpen = true;
ArrayList<VaccineWrapper> vaccineWrappers = new ArrayList<>();
vaccineWrappers.add(vaccine);
addVaccinationDialogFragment(vaccineWrappers, vaccineGroup);
Expand All @@ -476,6 +494,11 @@ public void onClick(VaccineGroup vaccineGroup, VaccineWrapper vaccine) {
curGroup.setOnVaccineUndoClickListener(new VaccineGroup.OnVaccineUndoClickListener() {
@Override
public void onUndoClick(VaccineGroup vaccineGroup, VaccineWrapper vaccine) {
if (dialogOpen) {
return;
}

dialogOpen = true;
addVaccineUndoDialogFragment(vaccineGroup, vaccine);
}
});
Expand Down Expand Up @@ -510,6 +533,12 @@ private void addVaccineUndoDialogFragment(VaccineGroup vaccineGroup, VaccineWrap

UndoVaccinationDialogFragment undoVaccinationDialogFragment = UndoVaccinationDialogFragment.newInstance(vaccineWrapper);
undoVaccinationDialogFragment.show(ft, DIALOG_TAG);
undoVaccinationDialogFragment.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
dialogOpen = false;
}
});
}

private void addServiceUndoDialogFragment(ServiceGroup serviceGroup, ServiceWrapper serviceWrapper) {
Expand All @@ -524,6 +553,12 @@ private void addServiceUndoDialogFragment(ServiceGroup serviceGroup, ServiceWrap

UndoServiceDialogFragment undoServiceDialogFragment = UndoServiceDialogFragment.newInstance(serviceWrapper);
undoServiceDialogFragment.show(ft, DIALOG_TAG);
undoServiceDialogFragment.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
dialogOpen = false;
}
});
}

private void updateWeightViews(Weight lastUnsyncedWeight) {
Expand Down Expand Up @@ -795,6 +830,13 @@ private void addVaccinationDialogFragment(ArrayList<VaccineWrapper> vaccineWrapp

VaccinationDialogFragment vaccinationDialogFragment = VaccinationDialogFragment.newInstance(dob, vaccineList, vaccineWrappers, true);
vaccinationDialogFragment.show(ft, DIALOG_TAG);
vaccinationDialogFragment.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
dialogOpen = false;
}
});

}

private void addServiceDialogFragment(ServiceWrapper serviceWrapper, ServiceGroup serviceGroup) {
Expand All @@ -818,6 +860,12 @@ private void addServiceDialogFragment(ServiceWrapper serviceWrapper, ServiceGrou

ServiceDialogFragment serviceDialogFragment = ServiceDialogFragment.newInstance(dob, serviceRecordList, serviceWrapper, true);
serviceDialogFragment.show(ft, DIALOG_TAG);
serviceDialogFragment.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
dialogOpen = false;
}
});
}

private void performRegisterActions() {
Expand Down
6 changes: 4 additions & 2 deletions opensrp-path/src/main/java/org/smartregister/path/activity/LoginActivity.java
View file
Expand Up @@ -521,8 +521,10 @@ protected LoginResponse doInBackground(Void... params) {
@Override
protected void onPostExecute(LoginResponse loginResponse) {
super.onPostExecute(loginResponse);
progressDialog.dismiss();
afterLoginCheck.onEvent(loginResponse);
if (!isDestroyed()) {
progressDialog.dismiss();
afterLoginCheck.onEvent(loginResponse);
}
}
}

Expand Down
6 changes: 1 addition & 5 deletions opensrp-path/src/main/java/org/smartregister/path/activity/PathJsonFormActivity.java
View file
Expand Up @@ -437,12 +437,8 @@ private void stockVialsenteredinReceivedForm(String key, String value) {
}
}

if (StringUtils.isNotBlank(value)) {
if (StringUtils.isNotBlank(value) && StringUtils.isNumeric(value)) {
displaybalance = currentBalance + Integer.parseInt(value);
// if (balancetextview != null) {
// balancetextview.setErrorColor(Color.BLACK);
// balancetextview.setError("New balance : " + displaybalance);
// }
pathJsonFormFragment.getLabelViewFromTag("Balance", "New balance: " + displaybalance);

} else {
Expand Down

0 comments on commit ff1893c

Please sign in to comment.