Skip to content

Commit

Permalink
MI | Fixing null when registering FP #4
Browse files Browse the repository at this point in the history 
Signed-off-by: mib-iqbal <[email protected]>
  • Loading branch information
@mib-iqbal
mib-iqbal committed Dec 4, 2017
1 parent 23b47aa commit c2cdeb9
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 64 deletions.
5 changes: 0 additions & 5 deletions opensrp-bidan-cloudant-nofr/src/main/assets/ec_client_classification.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@
"field_value": "Identitas Ibu",
"creates_case":["ec_kartu_ibu"]
},
{
"field":"eventType",
"field_value": "Tambah KB",
"creates_case":["ec_kartu_ibu"]
},
{
"field":"eventType",
"field_value": "Kohort Pelayanan KB",
Expand Down
35 changes: 34 additions & 1 deletion ...nt-nofr/src/main/java/org/smartregister/bidan/activity/NativeKISmartRegisterActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,20 @@
import org.smartregister.bidan.fragment.KISmartRegisterFragment;
import org.smartregister.bidan.pageradapter.BaseRegisterActivityPagerAdapter;
import org.smartregister.bidan.sync.ClientProcessor;
import org.smartregister.commonregistry.CommonPersonObjectClient;
import org.smartregister.domain.form.FieldOverrides;
import org.smartregister.domain.form.FormSubmission;
import org.smartregister.enketo.listener.DisplayFormListener;
import org.smartregister.enketo.view.fragment.DisplayFormFragment;
import org.smartregister.provider.SmartRegisterClientsProvider;
import org.smartregister.repository.DetailsRepository;
import org.smartregister.service.ZiggyService;
import org.smartregister.bidan.utils.VaksinatorFormUtils;
import org.smartregister.view.activity.SecuredNativeSmartRegisterActivity;
import org.smartregister.view.contract.SmartRegisterClient;
import org.smartregister.view.dialog.DialogOption;
import org.smartregister.view.dialog.DialogOptionModel;
import org.smartregister.view.dialog.EditOption;
import org.smartregister.view.dialog.LocationSelectorDialogFragment;
import org.smartregister.view.dialog.OpenFormOption;
import org.smartregister.view.fragment.SecuredNativeSmartRegisterFragment;
Expand All @@ -42,6 +47,7 @@
import static org.smartregister.bidan.utils.AllConstantsINA.FormNames.KARTU_IBU_CLOSE;
import static org.smartregister.bidan.utils.AllConstantsINA.FormNames.KARTU_IBU_REGISTRATION;
import static org.smartregister.bidan.utils.AllConstantsINA.FormNames.KOHORT_KB_PELAYANAN;
import static org.smartregister.util.Utils.getValue;

/**
* Created by sid-tech on 11/28/17.
Expand Down Expand Up @@ -295,6 +301,33 @@ public void startFormActivity(String formName, String entityId, String metaData)
}

}

public class EditDialogOptionModel implements DialogOptionModel {
@Override
public DialogOption[] getDialogOptions() {
return getEditOptions();
}
@Override
public void onDialogOptionSelection(DialogOption option, Object tag) {
CommonPersonObjectClient pc = (CommonPersonObjectClient) tag;
DetailsRepository detailsRepository = org.smartregister.Context.getInstance().detailsRepository();
detailsRepository.updateDetails(pc);
// String ibuCaseId = getValue(pc.getColumnmaps(), "relational_id", true).toLowerCase();
Log.d(TAG, "onDialogOptionSelection: "+pc.getDetails());
JSONObject fieldOverrides = new JSONObject();
try {
fieldOverrides.put("Province", pc.getDetails().get("stateProvince"));
fieldOverrides.put("District", pc.getDetails().get("countyDistrict"));
fieldOverrides.put("Sub-district", pc.getDetails().get("address2"));
fieldOverrides.put("Village", pc.getDetails().get("cityVillage"));
fieldOverrides.put("Sub-village", pc.getDetails().get("address1"));
fieldOverrides.put("jenis_kelamin", pc.getDetails().get("gender"));
// fieldOverrides.put("ibuCaseId", ibuCaseId);
} catch (JSONException e) {
e.printStackTrace();
}
FieldOverrides fo = new FieldOverrides(fieldOverrides.toString());
onEditSelectionWithMetadata((EditOption) option, (SmartRegisterClient) tag, fo.getJSONString());
}
}

}
58 changes: 21 additions & 37 deletions ...cloudant-nofr/src/main/java/org/smartregister/bidan/fragment/FPSmartRegisterFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.smartregister.bidan.options.AllKBServiceMode;
import org.smartregister.bidan.options.MotherFilterOption;
import org.smartregister.bidan.provider.KBClientsProvider;
import org.smartregister.bidan.provider.KIClientsProvider;
import org.smartregister.commonregistry.CommonPersonObjectClient;
import org.smartregister.commonregistry.CommonRepository;
import org.smartregister.cursoradapter.CursorCommonObjectFilterOption;
Expand Down Expand Up @@ -200,52 +201,37 @@ public String KartuIbuMainCount(){
@TargetApi(Build.VERSION_CODES.KITKAT)
public void initializeQueries(String s){
try {
KBClientsProvider kbScp = new KBClientsProvider(getActivity(), clientActionHandler, context().alertService());
clientAdapter = new SmartRegisterPaginatedCursorAdapter(getActivity(), null, kbScp,
new CommonRepository(
tableName,
new String []{
"is_closed",
"namalengkap",
"umur",
"namaSuami",
"isOutOfArea"
}));

KBClientsProvider kiscp =
new KBClientsProvider(getActivity(), clientActionHandler, context().alertService());
clientAdapter = new SmartRegisterPaginatedCursorAdapter(
getActivity(),
null,
kiscp,
new CommonRepository("ec_kartu_ibu",
new String[]{"ec_kartu_ibu.is_closed", "ec_kartu_ibu.namalengkap", "ec_kartu_ibu.umur", "ec_kartu_ibu.namaSuami", "noIbu"}));
clientsView.setAdapter(clientAdapter);

setTablename(tableName);
setTablename("ec_kartu_ibu");
SmartRegisterQueryBuilder countqueryBuilder = new SmartRegisterQueryBuilder();
countqueryBuilder.SelectInitiateMainTableCounts(tableName);
// countqueryBuilder.customJoin("LEFT JOIN ec_ibu on ec_kartu_ibu.id = ec_ibu.base_entity_id");
countqueryBuilder.SelectInitiateMainTableCounts("ec_kartu_ibu");
// countqueryBuilder.customJoin("LEFT JOIN ec_anak ON ec_kartu_ibu.id = ec_anak.relational_id ");

if (s == null || Objects.equals(s, "!")) {
Log.e(TAG, "initializeQueries: "+"Not Initialized" );
mainCondition = "is_closed = 0 and jenisKontrasepsi != '0' AND namalengkap != '' ";
mainCondition = "is_closed = 0 and namalengkap != '' and jenisKontrasepsi !='' ";
// mainCondition = "is_closed = 0";
Log.e(TAG, "initializeQueries: Not Initialized");
} else {
Log.e(TAG, "initializeQueries: " + s);
mainCondition = "is_closed = 0 and jenisKontrasepsi != '0' AND object_id LIKE '%" + s + "%'";
Log.e(TAG, "initializeQueries: id " + s);
mainCondition = "is_closed = 0 and namalengkap != '' and jenisKontrasepsi !='' AND object_id LIKE '%" + s + "%'";
}

joinTable = "";
countSelect = countqueryBuilder.mainCondition(mainCondition);
super.CountExecute();

SmartRegisterQueryBuilder queryBuilder = new SmartRegisterQueryBuilder();
queryBuilder.SelectInitiateMainTable(
tableName,
new String[]{
tableName + ".relationalid",
tableName + ".is_closed",
tableName + ".details",
tableName + ".isOutOfArea",
"namalengkap",
"umur",
"namaSuami",
});

// queryBuilder.customJoin("LEFT JOIN ec_ibu ON "+tableName+".id = ec_ibu.base_entity_id LEFT JOIN ImageList imagelist ON ec_ibu.base_entity_id=imagelist.entityID ");
queryBuilder.customJoin("LEFT JOIN ec_ibu ON "+tableName+".id = ec_ibu.base_entity_id");

queryBuilder.SelectInitiateMainTable("ec_kartu_ibu", new String[]{"ec_kartu_ibu.relationalid", "ec_kartu_ibu.is_closed", "ec_kartu_ibu.details", "ec_kartu_ibu.isOutOfArea", "ec_kartu_ibu.namalengkap", "ec_kartu_ibu.umur", "ec_kartu_ibu.namaSuami", "noIbu"});
// queryBuilder.customJoin("LEFT JOIN ec_anak ON ec_kartu_ibu.id = ec_anak.relational_id ");
mainSelect = queryBuilder.mainCondition(mainCondition);
Sortqueries = KiSortByNameAZ();

Expand All @@ -258,11 +244,9 @@ public void initializeQueries(String s){

refresh();

} catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
}
finally {
}

}

Expand Down
34 changes: 13 additions & 21 deletions ...cloudant-nofr/src/main/java/org/smartregister/bidan/fragment/KISmartRegisterFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@

import static android.view.View.INVISIBLE;
import static org.smartregister.bidan.utils.AllConstantsINA.FormNames.KARTU_IBU_PNC_OA;
import static org.smartregister.view.activity.NativeECSmartRegisterActivity.locationDialogTAG;

/**
* Created by sid-tech on 11/29/17.
Expand Down Expand Up @@ -178,36 +179,27 @@ protected void onInitialization() {
// context.formSubmissionRouter().getHandlerMap().put("census_enrollment_form", new CensusEnrollmentHandler());
}

@Override
public void startRegistration() {

// if (BuildConfig.SYNC_WAIT){
// if(Support.ONSYNC) {
// Toast.makeText(getActivity(), "Data still Synchronizing, please wait", Toast.LENGTH_SHORT).show();
// return;
// }
// }
//

// if (BuildConfig.UNIQUE_ID){
// String uniqueIdJson = LoginActivity.generator.uniqueIdController().getUniqueIdJson();
// if (uniqueIdJson == null || uniqueIdJson.isEmpty()) {
// Toast.makeText(getActivity(), "no unique id", Toast.LENGTH_LONG).show();
// return;
// }
// }
/* if(Support.ONSYNC) {
Toast.makeText(getActivity(), "Data still Synchronizing, please wait", Toast.LENGTH_SHORT).show();
return;
}*/

FragmentTransaction ft = getActivity().getFragmentManager().beginTransaction();
String locationDialogTAG = "locationDialogTAG";
Fragment prev = getActivity().getFragmentManager().findFragmentByTag(locationDialogTAG);
if (prev != null) {
ft.remove(prev);
}

// String uniqueIdJson = LoginActivity.generator.uniqueIdController().getUniqueIdJson();
/* if(uniqueIdJson == null || uniqueIdJson.isEmpty()){
Toast.makeText(getActivity(),"No unique id",Toast.LENGTH_LONG).show();
return;
}*/

ft.addToBackStack(null);
LocationSelectorDialogFragment
.newInstance((NativeKISmartRegisterActivity) getActivity(), new
EditDialogOptionModel(), context().anmLocationController().get(),
"kartu_ibu_registration")
.newInstance((NativeKISmartRegisterActivity) getActivity(), ((NativeKISmartRegisterActivity)getActivity()).new EditDialogOptionModel(), context().anmLocationController().get(), "kartu_ibu_registration")
.show(ft, locationDialogTAG);
}

Expand Down

0 comments on commit c2cdeb9

Please sign in to comment.