Skip to content

Commit

Permalink
WD|Set default sort on Motherregister #4
Browse files Browse the repository at this point in the history
  • Loading branch information
@baksosapi
baksosapi committed Nov 17, 2017
1 parent 5be349b commit d253be4
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 70 deletions.
18 changes: 9 additions & 9 deletions ...src/main/java/org/smartregister/bidan_cloudant/activity/KMotherSmartRegisterActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ public void onPageSelected(int position) {
saveService = new SaveService(context().ziggyFileLoader(), context().formDataRepository(),
context().formSubmissionRouter());
}

public void onPageChanged(int page){
setRequestedOrientation(page == 0
? ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
Expand Down Expand Up @@ -200,13 +201,12 @@ public void saveFormSubmission(String formSubmission, String id, String formName
}
e.printStackTrace();
}



}

@Override
public void OnLocationSelected(String locationJSONString) {
Log.e(TAG, "OnLocationSelected: start" );

if(Support.ONSYNC) {
Toast.makeText(this,"Data still Synchronizing, please wait",Toast.LENGTH_SHORT).show();
return;
Expand All @@ -216,15 +216,15 @@ public void OnLocationSelected(String locationJSONString) {

try {
JSONObject locationJSON = new JSONObject(locationJSONString);
// JSONObject uniqueId = new JSONObject(LoginActivity.generator.uniqueIdController().getUniqueIdJson());

combined = locationJSON;
// Iterator<String> iter = uniqueId.keys();

/* while (iter.hasNext()) {
String key = iter.next();
combined.put(key, uniqueId.get(key));
}*/
// JSONObject uniqueId = new JSONObject(LoginActivity.generator.uniqueIdController().getUniqueIdJson());
// while (iter.hasNext()) {
// String key = iter.next();
// combined.put(key, uniqueId.get(key));
// }

System.out.println("injection string: " + combined.toString());
} catch (JSONException e) {
Expand All @@ -233,7 +233,7 @@ public void OnLocationSelected(String locationJSONString) {

if (combined != null) {
FieldOverrides fieldOverrides = new FieldOverrides(combined.toString());
startFormActivity(KOHORT_MOTHER_REGISTRATION, null, fieldOverrides.getJSONString());
// startFormActivity(KOHORT_MOTHER_REGISTRATION, null, fieldOverrides.getJSONString());
}
}

Expand Down
85 changes: 24 additions & 61 deletions .../src/main/java/org/smartregister/bidan_cloudant/fragment/MotherSmartRegisterFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.smartregister.bidan_cloudant.option.KICommonObjectFilterOption;
import org.smartregister.bidan_cloudant.option.MotherServiceModeOption;
import org.smartregister.bidan_cloudant.provider.MotherSmartClientsProvider;
import org.smartregister.bidan_cloudant.utils.AllConstantsINA;
import org.smartregister.commonregistry.CommonPersonObjectClient;
import org.smartregister.commonregistry.CommonPersonObjectController;
import org.smartregister.cursoradapter.CursorCommonObjectFilterOption;
Expand All @@ -49,13 +50,15 @@
import org.smartregister.view.dialog.EditOption;
import org.smartregister.view.dialog.FilterOption;
import org.smartregister.view.dialog.LocationSelectorDialogFragment;
import org.smartregister.view.dialog.NameSort;
import org.smartregister.view.dialog.ServiceModeOption;
import org.smartregister.view.dialog.SortOption;

import java.util.ArrayList;
import java.util.Map;

import util.AsyncTask;
import util.BidanConstants;

import static android.view.View.INVISIBLE;
import static android.view.View.VISIBLE;
Expand Down Expand Up @@ -102,8 +105,7 @@ public FilterOption villageFilter() {
@Override
public SortOption sortOption() {

return new CursorCommonObjectSort("A-Z", "namaBayi desc");

return new CursorCommonObjectSort("A-Z", "namaIbu desc");
}

@Override
Expand All @@ -127,8 +129,7 @@ public DialogOption[] filterOptions() {
String locationjson = context().anmLocationController().get();
LocationTree locationTree = EntityUtils.fromJson(locationjson, LocationTree.class);

Map<String,TreeNode<String, Location>> locationMap =
locationTree.getLocationsHierarchy();
Map<String,TreeNode<String, Location>> locationMap = locationTree.getLocationsHierarchy();
addChildToList(dialogOptionslist,locationMap);
DialogOption[] dialogOptions = new DialogOption[dialogOptionslist.size()];
for (int i = 0;i < dialogOptionslist.size();i++){
Expand All @@ -147,13 +148,11 @@ public DialogOption[] serviceModeOptions() {
public DialogOption[] sortingOptions() {
// FlurryFacade.logEvent("click_sorting_option_on_kohort_ibu_dashboard");
return new DialogOption[]{
// new HouseholdCensusDueDateSort(),


new CursorCommonObjectSort(getResources().getString(R.string.sort_by_name_label), KiSortByNameAZ()),
new CursorCommonObjectSort(getResources().getString(R.string.sort_by_name_label_reverse), KiSortByNameZA()),
new CursorCommonObjectSort(getResources().getString(R.string.sort_by_child_age), KiSortByAgeASC()),
new CursorCommonObjectSort(getResources().getString(R.string.sort_by_child_age_desc), KiSortByAgeDESC()),
new CursorCommonObjectSort(getResources().getString(R.string.sort_by_wife_age_label), KiSortByAge()),
new CursorCommonObjectSort(getResources().getString(R.string.sort_by_edd_label), KiSortByEdd()),
new CursorCommonObjectSort(getResources().getString(R.string.sort_by_no_ibu_label), KiSortByNoIbu()),
};
}

Expand Down Expand Up @@ -211,33 +210,32 @@ private String sortByAlertmethod() {
}

private void initializeQueries() {
String tableName = "ec_anak";
// String parentTableName = PathConstants.MOTHER_TABLE_NAME;
String tableName = AllConstantsINA.MOTHER_TABLE_NAME;

MotherSmartClientsProvider hhscp = new MotherSmartClientsProvider(getActivity(),
MotherSmartClientsProvider mscp = new MotherSmartClientsProvider(getActivity(),
clientActionHandler, context().alertService(), context().commonrepository(tableName));
clientAdapter = new SmartRegisterPaginatedCursorAdapter(getActivity(), null, hhscp, context().commonrepository(tableName));
clientAdapter = new SmartRegisterPaginatedCursorAdapter(getActivity(), null, mscp,
context().commonrepository(tableName));
clientsView.setAdapter(clientAdapter);

setTablename(tableName);
SmartRegisterQueryBuilder countqueryBUilder = new SmartRegisterQueryBuilder();
countqueryBUilder.SelectInitiateMainTableCounts(tableName);
mainCondition = " is_closed = 0 ";
mainCondition = "is_closed = 0 and namalengkap != '' ";
countSelect = countqueryBUilder.mainCondition(mainCondition);
super.CountExecute();

SmartRegisterQueryBuilder queryBUilder = new SmartRegisterQueryBuilder();
queryBUilder.SelectInitiateMainTable(tableName, new String[]{
tableName + ".relationalid",
tableName + ".details",
tableName + ".is_closed",
tableName + ".relational_id",
tableName + ".details",
tableName + ".tanggalLahirAnak",
tableName + ".namaBayi",

tableName + ".isOutOfArea",
tableName + ".namalengkap",
tableName + ".umur",
tableName + ".namaSuami",
"noIbu"
});
// queryBUilder.customJoin("LEFT JOIN " + parentTableName + " ON " + tableName + ".relational_id = " + parentTableName + ".id");
mainSelect = queryBUilder.mainCondition(mainCondition);
Sortqueries = ((CursorSortOption) getDefaultOptionsProvider().sortOption()).sort();

Expand Down Expand Up @@ -301,37 +299,26 @@ private void showProfileView(ECClient client) {
}
}



private String KiSortByNameAZ() {
return " namaBayi ASC";
return "namalengkap ASC";
}

private String KiSortByNameZA() {
return " namaBayi DESC";
}

private String KiSortByAgeASC() {
return " tanggalLahirAnak DESC";
}

private String KiSortByAgeDESC() {
return " tanggalLahirAnak ASC";
return "namalengkap DESC";
}

private String KiSortByAge() {
return " umur DESC";
return "umur DESC";
}

private String KiSortByNoIbu() {
return " noIbu ASC";
return "noIbu ASC";
}

private String KiSortByEdd() {
return " htp IS NULL, htp";
return "htp IS NULL, htp";
}


private class EditDialogOptionModel implements DialogOptionModel {
@Override
public DialogOption[] getDialogOptions() {
Expand Down Expand Up @@ -543,7 +530,7 @@ public void onClick(DialogInterface dialog, int opt) {
}*/

public void searchTextChangeListener(String s) {
Log.e(TAG, "searchTextChangeListener: " + s);

if (s != null) {
filters = s;
} else {
Expand All @@ -556,36 +543,12 @@ public void beforeTextChanged(CharSequence charSequence, int i, int i2, int i3)
public void onTextChanged(final CharSequence cs, int start, int before, int count) {

(new AsyncTask() {
// SmartRegisterClients filteredClients;

@Override
protected Object doInBackground(Object[] params) {
// currentSearchFilter =
// setCurrentSearchFilter(new HHSearchOption(cs.toString()));
// filteredClients = getClientsAdapter().getListItemProvider()
// .updateClients(getCurrentVillageFilter(), getCurrentServiceModeOption(),
// getCurrentSearchFilter(), getCurrentSortOption());
//

filters = cs.toString();
joinTable = "";
mainCondition = "nama_bayi !=''";
Log.e(TAG, "doInBackground: " + filters);
return null;
}
//
// @Override
// protected void onPostExecute(Object o) {
//// clientsAdapter
//// .refreshList(currentVillageFilter, currentServiceModeOption,
//// currentSearchFilter, currentSortOption);
//// getClientsAdapter().refreshClients(filteredClients);
//// getClientsAdapter().notifyDataSetChanged();
// getSearchCancelView().setVisibility(isEmpty(cs) ? INVISIBLE : VISIBLE);
// CountExecute();
// filterandSortExecute();
// super.onPostExecute(o);
// }
}).execute();
}

Expand Down

0 comments on commit d253be4

Please sign in to comment.