Skip to content

Commit

Permalink
Merge branch 'master' into issue111
Browse files Browse the repository at this point in the history
  • Loading branch information
@ekigamba
ekigamba committed Oct 9, 2017
2 parents e8a0dcf + 5d31939 commit 578ab4d
Show file tree
Hide file tree
Showing 4 changed files with 186 additions and 96 deletions.
24 changes: 17 additions & 7 deletions opensrp-path/src/main/java/org/smartregister/path/activity/ChildDetailTabbedActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,10 @@ public void onClick(View v) {
public void onClick(View v) {
FragmentTransaction ft = getFragmentManager().beginTransaction();
android.app.Fragment prev = getFragmentManager().findFragmentByTag(DIALOG_TAG);

StatusEditDialogFragment.newInstance(ChildDetailTabbedActivity.this, details).show(ft, DIALOG_TAG);
if (prev != null) {
ft.remove(prev);
}
StatusEditDialogFragment.newInstance(details).show(ft, DIALOG_TAG);
}
});

Expand Down Expand Up @@ -349,7 +351,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
// User chose the "Settings" item, show the app settings UI...
return true;
case R.id.immunization_data:
viewPager.setCurrentItem(1);
if (viewPager.getCurrentItem() != 1) {
viewPager.setCurrentItem(1);
}
childUnderFiveFragment.loadView(true, false, false);
saveButton.setVisibility(View.VISIBLE);
for (int i = 0; i < overflow.size(); i++) {
Expand All @@ -358,15 +362,19 @@ public boolean onOptionsItemSelected(MenuItem item) {
return true;

case R.id.recurring_services_data:
viewPager.setCurrentItem(1);
if (viewPager.getCurrentItem() != 1) {
viewPager.setCurrentItem(1);
}
childUnderFiveFragment.loadView(false, true, false);
saveButton.setVisibility(View.VISIBLE);
for (int i = 0; i < overflow.size(); i++) {
overflow.getItem(i).setVisible(false);
}
return true;
case R.id.weight_data:
viewPager.setCurrentItem(1);
if (viewPager.getCurrentItem() != 1) {
viewPager.setCurrentItem(1);
}
childUnderFiveFragment.loadView(false, false, true);
saveButton.setVisibility(View.VISIBLE);
for (int i = 0; i < overflow.size(); i++) {
Expand All @@ -381,8 +389,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
case R.id.change_status:
FragmentTransaction ft = this.getFragmentManager().beginTransaction();
android.app.Fragment prev = this.getFragmentManager().findFragmentByTag(DIALOG_TAG);

StatusEditDialogFragment.newInstance(this, details).show(ft, DIALOG_TAG);
if (prev != null) {
ft.remove(prev);
}
StatusEditDialogFragment.newInstance(details).show(ft, DIALOG_TAG);
return true;
case R.id.report_adverse_event:
return launchAdverseEventForm();
Expand Down
219 changes: 150 additions & 69 deletions opensrp-path/src/main/java/org/smartregister/path/fragment/StatusEditDialogFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.DialogFragment;
import android.content.Context;
import android.app.ProgressDialog;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
import android.view.LayoutInflater;
Expand All @@ -15,25 +16,24 @@

import org.smartregister.path.R;
import org.smartregister.path.listener.StatusChangeListener;
import org.smartregister.util.Utils;

import java.util.Map;

@SuppressLint("ValidFragment")
public class StatusEditDialogFragment extends DialogFragment {
private final Context context;
private StatusChangeListener listener;
private static Map<String, String> details;
private static final String inactive = "inactive";
private static final String lostToFollowUp = "lost_to_follow_up";

private StatusEditDialogFragment(Context context, Map<String, String> details) {
this.context = context;
private StatusEditDialogFragment(Map<String, String> details) {
StatusEditDialogFragment.details = details;
}

public static StatusEditDialogFragment newInstance(
Context context, Map<String, String> details) {
public static StatusEditDialogFragment newInstance(Map<String, String> details) {

return new StatusEditDialogFragment(context, details);
return new StatusEditDialogFragment(details);
}

@Override
Expand Down Expand Up @@ -86,83 +86,31 @@ public View onCreateView(final LayoutInflater inflater, final ViewGroup containe
activeLayout.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if ((details.containsKey(inactive) && details.get(inactive).equalsIgnoreCase(Boolean.TRUE.toString())) || (details.containsKey(lostToFollowUp) && details.get(lostToFollowUp).equalsIgnoreCase(Boolean.TRUE.toString()))) {
((StatusChangeListener) context).updateClientAttribute(inactive, false);
if (details.containsKey(lostToFollowUp) && details.get(lostToFollowUp).equalsIgnoreCase(Boolean.TRUE.toString())) {
((StatusChangeListener) context).updateClientAttribute(lostToFollowUp, false);
}
activeImageView.setVisibility(View.VISIBLE);
inactiveImageView.setVisibility(View.INVISIBLE);
lostToFollowUpImageView.setVisibility(View.INVISIBLE);
UpdateView updateView = new UpdateView(STATUS.ACTIVE, listener, details);
updateView.setImageView(activeImageView, inactiveImageView, lostToFollowUpImageView);

} else if (details.containsKey(lostToFollowUp) && details.get(lostToFollowUp).equalsIgnoreCase(Boolean.TRUE.toString())) {
((StatusChangeListener) context).updateClientAttribute(lostToFollowUp, false);
((StatusChangeListener) context).updateClientAttribute(inactive, false);
Utils.startAsyncTask(updateView, null);

activeImageView.setVisibility(View.VISIBLE);
inactiveImageView.setVisibility(View.INVISIBLE);
lostToFollowUpImageView.setVisibility(View.INVISIBLE);

}

((StatusChangeListener) context).updateStatus();
dismiss();
}
});

inactiveLayout.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if ((details.containsKey(inactive) && details.get(inactive).equalsIgnoreCase(Boolean.FALSE.toString())) || (details.containsKey(inactive) && details.get(inactive).equalsIgnoreCase(""))) {
((StatusChangeListener) context).updateClientAttribute(inactive, true);
if (details.containsKey(lostToFollowUp) && details.get(lostToFollowUp).equalsIgnoreCase(Boolean.TRUE.toString())) {
((StatusChangeListener) context).updateClientAttribute(lostToFollowUp, false);
}
activeImageView.setVisibility(View.INVISIBLE);
inactiveImageView.setVisibility(View.VISIBLE);
lostToFollowUpImageView.setVisibility(View.INVISIBLE);
UpdateView updateView = new UpdateView(STATUS.IN_ACTIVE, listener, details);
updateView.setImageView(activeImageView, inactiveImageView, lostToFollowUpImageView);

} else if (!details.containsKey(inactive)) {
((StatusChangeListener) context).updateClientAttribute(inactive, true);
if (details.containsKey(lostToFollowUp) && details.get(lostToFollowUp).equalsIgnoreCase(Boolean.TRUE.toString())) {
((StatusChangeListener) context).updateClientAttribute(lostToFollowUp, false);
}
activeImageView.setVisibility(View.INVISIBLE);
inactiveImageView.setVisibility(View.VISIBLE);
lostToFollowUpImageView.setVisibility(View.INVISIBLE);

}

((StatusChangeListener) context).updateStatus();
dismiss();
Utils.startAsyncTask(updateView, null);
}
});

lostToFollowUpLayout.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if ((details.containsKey(lostToFollowUp) && details.get(lostToFollowUp).equalsIgnoreCase(Boolean.FALSE.toString())) || (details.containsKey(lostToFollowUp) && details.get(lostToFollowUp).equalsIgnoreCase(""))) {
((StatusChangeListener) context).updateClientAttribute(lostToFollowUp, true);
if (details.containsKey(inactive) && details.get(inactive).equalsIgnoreCase(Boolean.TRUE.toString())) {
((StatusChangeListener) context).updateClientAttribute(inactive, false);
}
activeImageView.setVisibility(View.INVISIBLE);
inactiveImageView.setVisibility(View.INVISIBLE);
lostToFollowUpImageView.setVisibility(View.VISIBLE);

} else if (!details.containsKey(lostToFollowUp)) {
((StatusChangeListener) context).updateClientAttribute(lostToFollowUp, true);
if (details.containsKey(inactive) && details.get(inactive).equalsIgnoreCase(Boolean.TRUE.toString())) {
((StatusChangeListener) context).updateClientAttribute(inactive, false);
}
activeImageView.setVisibility(View.INVISIBLE);
inactiveImageView.setVisibility(View.INVISIBLE);
lostToFollowUpImageView.setVisibility(View.VISIBLE);

}
UpdateView updateView = new UpdateView(STATUS.LOST_TO_FOLLOW_UP, listener, details);
updateView.setImageView(activeImageView, inactiveImageView, lostToFollowUpImageView);

((StatusChangeListener) context).updateStatus();
dismiss();
Utils.startAsyncTask(updateView, null);
}
});

Expand All @@ -174,7 +122,14 @@ public void onClick(View v) {
public void onAttach(Activity activity) {
super.onAttach(activity);
// Verify that the host activity implements the callback interface

try {
// Instantiate the NoticeDialogListener so we can send events to the host
listener = (StatusChangeListener) activity;
} catch (ClassCastException e) {
// The activity doesn't implement the interface, throw exception
throw new ClassCastException(activity.toString()
+ " must implement StatusChangeListener");
}
}


Expand All @@ -192,4 +147,130 @@ public void run() {
});

}

////////////////////////////////////////////////////////////////
// Inner classes
////////////////////////////////////////////////////////////////
private class UpdateView extends AsyncTask<Void, Void, Boolean> {
private StatusChangeListener listener;
private STATUS status;
private Map<String, String> details;
private ImageView activeImageView;
private ImageView inactiveImageView;
private ImageView lostToFollowUpImageView;
private ProgressDialog progressDialog;

private UpdateView(STATUS status, StatusChangeListener listener, Map<String, String> details) {
this.status = status;
this.listener = listener;
this.details = details;

this.progressDialog = new ProgressDialog(getActivity());
this.progressDialog.setCancelable(false);
this.progressDialog.setTitle(getString(R.string.updating_dialog_title));
this.progressDialog.setMessage(getString(R.string.please_wait_message));
}

private void setImageView(ImageView activeImageView, ImageView inactiveImageView, ImageView lostToFollowUpImageView) {
this.activeImageView = activeImageView;
this.inactiveImageView = inactiveImageView;
this.lostToFollowUpImageView = lostToFollowUpImageView;
}

@Override
protected Boolean doInBackground(Void... params) {
boolean updateViews = false;
switch (status) {
case ACTIVE:
if (details.containsKey(inactive) && details.get(inactive).equalsIgnoreCase(Boolean.TRUE.toString())) {
listener.updateClientAttribute(inactive, false);
updateViews = true;
}

if (details.containsKey(lostToFollowUp) && details.get(lostToFollowUp).equalsIgnoreCase(Boolean.TRUE.toString())) {
listener.updateClientAttribute(lostToFollowUp, false);
updateViews = true;
}

break;

case IN_ACTIVE:
if ((details.containsKey(inactive) && details.get(inactive).equalsIgnoreCase(Boolean.FALSE.toString())) || (details.containsKey(inactive) && details.get(inactive).equalsIgnoreCase(""))) {
listener.updateClientAttribute(inactive, true);
if (details.containsKey(lostToFollowUp) && details.get(lostToFollowUp).equalsIgnoreCase(Boolean.TRUE.toString())) {
listener.updateClientAttribute(lostToFollowUp, false);
}
updateViews = true;

} else if (!details.containsKey(inactive)) {
listener.updateClientAttribute(inactive, true);
if (details.containsKey(lostToFollowUp) && details.get(lostToFollowUp).equalsIgnoreCase(Boolean.TRUE.toString())) {
listener.updateClientAttribute(lostToFollowUp, false);
}
updateViews = true;
}
break;
case LOST_TO_FOLLOW_UP:
if ((details.containsKey(lostToFollowUp) && details.get(lostToFollowUp).equalsIgnoreCase(Boolean.FALSE.toString())) || (details.containsKey(lostToFollowUp) && details.get(lostToFollowUp).equalsIgnoreCase(""))) {
listener.updateClientAttribute(lostToFollowUp, true);
if (details.containsKey(inactive) && details.get(inactive).equalsIgnoreCase(Boolean.TRUE.toString())) {
listener.updateClientAttribute(inactive, false);
}
updateViews = true;
} else if (!details.containsKey(lostToFollowUp)) {
listener.updateClientAttribute(lostToFollowUp, true);
if (details.containsKey(inactive) && details.get(inactive).equalsIgnoreCase(Boolean.TRUE.toString())) {
listener.updateClientAttribute(inactive, false);
}
updateViews = true;
}
break;
default:
break;

}

return updateViews;
}

@Override
protected void onPreExecute() {
this.progressDialog.show();
}

@Override
protected void onPostExecute(Boolean updateViews) {
this.progressDialog.dismiss();
if (updateViews) {
switch (status) {
case ACTIVE:
activeImageView.setVisibility(View.VISIBLE);
inactiveImageView.setVisibility(View.INVISIBLE);
lostToFollowUpImageView.setVisibility(View.INVISIBLE);
break;
case IN_ACTIVE:
activeImageView.setVisibility(View.INVISIBLE);
inactiveImageView.setVisibility(View.VISIBLE);
lostToFollowUpImageView.setVisibility(View.INVISIBLE);
break;
case LOST_TO_FOLLOW_UP:
activeImageView.setVisibility(View.INVISIBLE);
inactiveImageView.setVisibility(View.INVISIBLE);
lostToFollowUpImageView.setVisibility(View.VISIBLE);
break;
default:
break;
}
}

listener.updateStatus();
dismiss();

}
}

private enum STATUS {
ACTIVE, IN_ACTIVE, LOST_TO_FOLLOW_UP
}

}
17 changes: 1 addition & 16 deletions ...path/src/main/java/org/smartregister/path/tabfragments/ChildRegistrationDataFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,27 +61,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
this.container = container;
this.layout = layout;

// layout.addView(createTableRow(inflater,container,"Catchment Area","Linda"));
// layout.addView(createTableRow(inflater,container,"Catchment Area","Linda"));
// layout.addView(createTableRow(inflater,container,"Catchment Area","Linda"));
// layout.addView(createTableRow(inflater,container,"Catchment Area","Linda"));
// layout.addView(createTableRow(inflater,container,"Catchment Area","Linda"));
// layout.addView(createTableRow(inflater,container,"Catchment Area","Linda"));
// layout.addView(createTableRow(inflater,container,"Catchment Area","Linda"));
// layout.addView(createTableRow(inflater,container,"Catchment Area","Linda"));
// layout.addView(createTableRow(inflater,container,"Catchment Area","Linda"));

loadData();

// Inflate the layout for this fragment
return fragmentview;
}

@Override
public void onResume() {
super.onResume();
loadData();
}

public void loadData() {
if (layout != null && container != null && inflater != null) {
if (layout.getChildCount() > 0) {
Expand Down
Loading

0 comments on commit 578ab4d

Please sign in to comment.