Skip to content

Commit

Permalink
Merge pull request #34 from OpenSRP/beneficiary_priority
Browse files Browse the repository at this point in the history
priority beneficiary
  • Loading branch information
mahmud6390 authored Nov 1, 2020
2 parents c74c5f8 + 0552294 commit 6dba727
Show file tree
Hide file tree
Showing 60 changed files with 1,378 additions and 136 deletions.
2 changes: 1 addition & 1 deletion opensrp-brac-hnpp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ android {
buildConfigField "String[]", "ALLOWED_LOCATION_LEVELS", '{"MOH Jhpiego Facility Name" , "Village"}'
buildConfigField "String", 'DEFAULT_LOCATION', '"Village"'
buildConfigField "boolean", 'SUPPORT_QR', 'false'
buildConfigField "int", "DATABASE_VERSION", '23'
buildConfigField "int", "DATABASE_VERSION", '25'
buildConfigField "int", "DATA_SYNC_DURATION_MINUTES", '10'
buildConfigField "long", "MAX_SERVER_TIME_DIFFERENCE", "1800000l"
buildConfigField "boolean", "TIME_CHECK", "false"
Expand Down
16 changes: 16 additions & 0 deletions opensrp-brac-hnpp/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,22 @@
android:name="org.smartregister.brac.hnpp.activity.HnppAncRegisterActivity"
android:screenOrientation="portrait"
android:theme="@style/HNPPTheme.NoActionBar" />
<activity
android:name="org.smartregister.brac.hnpp.activity.HnppAncRiskRegisterActivity"
android:screenOrientation="portrait"
android:theme="@style/HNPPTheme.NoActionBar" />
<activity
android:name="org.smartregister.brac.hnpp.activity.HnppElcoRiskRegisterActivity"
android:screenOrientation="portrait"
android:theme="@style/HNPPTheme.NoActionBar" />
<activity
android:name="org.smartregister.brac.hnpp.activity.HnppChildRiskRegisterActivity"
android:screenOrientation="portrait"
android:theme="@style/HNPPTheme.NoActionBar" />
<activity
android:name="org.smartregister.brac.hnpp.activity.HnppPncRiskRegisterActivity"
android:screenOrientation="portrait"
android:theme="@style/HNPPTheme.NoActionBar" />
<activity
android:name="org.smartregister.brac.hnpp.activity.AncMemberProfileActivity"
android:screenOrientation="portrait"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -749,10 +749,6 @@
"value": "true",
"err": "নাম লিখুন"
},
"v_regex": {
"value": "^[\\.\\- ]*",
"err": "একটি বৈধ নাম লিখুন"
},
"calculation": {
"rules-engine": {
"ex-rules": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@
import org.smartregister.brac.hnpp.activity.HNPPMemberJsonFormActivity;
import org.smartregister.brac.hnpp.activity.HnppAllMemberRegisterActivity;
import org.smartregister.brac.hnpp.activity.HnppAncRegisterActivity;
import org.smartregister.brac.hnpp.activity.HnppAncRiskRegisterActivity;
import org.smartregister.brac.hnpp.activity.HnppChildRiskRegisterActivity;
import org.smartregister.brac.hnpp.activity.HnppElcoMemberRegisterActivity;
import org.smartregister.brac.hnpp.activity.HnppElcoRiskRegisterActivity;
import org.smartregister.brac.hnpp.activity.HnppPncRegisterActivity;
import org.smartregister.brac.hnpp.activity.HnppPncRiskRegisterActivity;
import org.smartregister.brac.hnpp.activity.SSInfoActivity;
import org.smartregister.brac.hnpp.activity.SimprintsIdentityActivity;
import org.smartregister.brac.hnpp.custom_view.HnppNavigationTopView;
Expand All @@ -33,6 +37,7 @@
import org.smartregister.brac.hnpp.presenter.HnppNavigationPresenter;
import org.smartregister.brac.hnpp.repository.HnppChwRepository;
import org.smartregister.brac.hnpp.repository.HnppVisitLogRepository;
import org.smartregister.brac.hnpp.repository.RiskDetailsRepository;
import org.smartregister.brac.hnpp.repository.SSLocationRepository;
import org.smartregister.brac.hnpp.repository.HouseholdIdRepository;
import org.smartregister.brac.hnpp.sync.HnppClientProcessor;
Expand Down Expand Up @@ -83,6 +88,7 @@ public class HnppApplication extends CoreChwApplication implements CoreApplicati
private HouseholdIdRepository householdIdRepository;
private HnppVisitLogRepository hnppVisitLogRepository;
private static SSLocationRepository locationRepository;
private static RiskDetailsRepository riskDetailsRepository;
private static CommonFtsObject commonFtsObject = null;
private EventClientRepository eventClientRepository;
@Override
Expand Down Expand Up @@ -225,7 +231,10 @@ public void clearSharePreference(){
registeredActivities.put(CoreConstants.REGISTERED_ACTIVITIES.REFERRALS_REGISTER_ACTIVITY, ReferralRegisterActivity.class);
registeredActivities.put(CoreConstants.REGISTERED_ACTIVITIES.MALARIA_REGISTER_ACTIVITY, FamilyRegisterActivity.class);
registeredActivities.put(CoreConstants.REGISTERED_ACTIVITIES.FORUM_ACTIVITY, ForumActivity.class);

registeredActivities.put(CoreConstants.REGISTERED_ACTIVITIES.ANC_RISK_REGISTER_ACTIVITY, HnppAncRiskRegisterActivity.class);
registeredActivities.put(CoreConstants.REGISTERED_ACTIVITIES.PNC_RISK_REGISTER_ACTIVITY, HnppPncRiskRegisterActivity.class);
registeredActivities.put(CoreConstants.REGISTERED_ACTIVITIES.ELCO_RISK_REGISTER_ACTIVITY, HnppElcoRiskRegisterActivity.class);
registeredActivities.put(CoreConstants.REGISTERED_ACTIVITIES.CHILD_RISK_REGISTER_ACTIVITY, HnppChildRiskRegisterActivity.class);
registeredActivities.put(CoreConstants.REGISTERED_ACTIVITIES.SS_INFO_ACTIVITY, SSInfoActivity.class);
registeredActivities.put(CoreConstants.REGISTERED_ACTIVITIES.SIMPRINTS_REGISTER_ACTIVITY, SimprintsIdentityActivity.class);

Expand Down Expand Up @@ -264,7 +273,12 @@ public static SSLocationRepository getSSLocationRepository() {
}
return locationRepository;
}

public static RiskDetailsRepository getRiskDetailsRepository() {
if ( riskDetailsRepository == null) {
riskDetailsRepository = new RiskDetailsRepository(getInstance().getRepository());
}
return riskDetailsRepository;
}
public void setOpenSRPUrl() {
AllSharedPreferences preferences = Utils.getAllSharedPreferences();
boolean isRelease = HnppConstants.isReleaseBuild();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package org.smartregister.brac.hnpp.activity;

import org.smartregister.brac.hnpp.fragment.HnppRiskAncRegisterFragment;
import org.smartregister.chw.anc.interactor.BaseAncRegisterInteractor;
import org.smartregister.chw.anc.model.BaseAncRegisterModel;
import org.smartregister.chw.anc.presenter.BaseAncRegisterPresenter;
import org.smartregister.view.fragment.BaseRegisterFragment;


public class HnppAncRiskRegisterActivity extends HnppAncRegisterActivity {

@Override
protected void initializePresenter() {
presenter = new BaseAncRegisterPresenter(this, new BaseAncRegisterModel(), new BaseAncRegisterInteractor());
}

@Override
protected BaseRegisterFragment getRegisterFragment() {
return new HnppRiskAncRegisterFragment();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package org.smartregister.brac.hnpp.activity;

import org.smartregister.brac.hnpp.fragment.HnppRiskChildRegisterFragment;
import org.smartregister.view.fragment.BaseRegisterFragment;


public class HnppChildRiskRegisterActivity extends ChildRegisterActivity {



@Override
protected BaseRegisterFragment getRegisterFragment() {
return new HnppRiskChildRegisterFragment();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package org.smartregister.brac.hnpp.activity;

import org.smartregister.brac.hnpp.fragment.HnppRiskElcoMemberRegisterFragment;
import org.smartregister.view.fragment.BaseRegisterFragment;


public class HnppElcoRiskRegisterActivity extends HnppElcoMemberRegisterActivity {



@Override
protected BaseRegisterFragment getRegisterFragment() {
return new HnppRiskElcoMemberRegisterFragment();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package org.smartregister.brac.hnpp.activity;

import org.smartregister.brac.hnpp.fragment.HnppRiskAncRegisterFragment;
import org.smartregister.brac.hnpp.fragment.HnppRiskPncRegisterFragment;
import org.smartregister.chw.anc.interactor.BaseAncRegisterInteractor;
import org.smartregister.chw.anc.model.BaseAncRegisterModel;
import org.smartregister.chw.anc.presenter.BaseAncRegisterPresenter;
import org.smartregister.view.fragment.BaseRegisterFragment;


public class HnppPncRiskRegisterActivity extends HnppPncRegisterActivity{

@Override
protected void initializePresenter() {
presenter = new BaseAncRegisterPresenter(this, new BaseAncRegisterModel(), new BaseAncRegisterInteractor());
}

@Override
protected BaseRegisterFragment getRegisterFragment() {
return new HnppRiskPncRegisterFragment();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ protected void onCreate(Bundle savedInstanceState) {
passwordText = findViewById(R.id.login_password_edit_text);
userNameView = findViewById(R.id.login_user_name_view);
passwordView = findViewById(R.id.login_password_view);
if(BuildConfig.DEBUG){
userNameText.setText("testsk");
passwordText.setText("brac2019");
}

userNameText.addTextChangedListener(new TextWatcher() {
@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ private void switchViews(View dueOnlyLayout, boolean isPress) {
protected int getToolBarTitle() {
return R.string.menu_anc_clients;
}
private String getCondition() {
protected String getCondition() {
return " " + HnppConstants.TABLE_NAME.FAMILY_MEMBER + "." + DBConstants.KEY.DATE_REMOVED + " is null " +
"AND " + HnppConstants.TABLE_NAME.ANC_MEMBER + "." + DBConstants.KEY.IS_CLOSED + " = '0' " +
"AND " + HnppConstants.TABLE_NAME.FAMILY_MEMBER + "." + DBConstants.KEY.IS_CLOSED + " = '0' " ;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,10 @@ protected void onResumption() {


}
public static String childMainFilter(String mainCondition, String mainMemberCondition, String filters, String sort, int limit, int offset) {
return "SELECT " + CommonFtsObject.idColumn + " FROM " + CommonFtsObject.searchTableName(CoreConstants.TABLE_NAME.CHILD) + " WHERE " + CommonFtsObject.idColumn + " IN " +
" ( SELECT " + CommonFtsObject.idColumn + " FROM " + CommonFtsObject.searchTableName(CoreConstants.TABLE_NAME.CHILD) + " WHERE " + mainCondition + " AND " + CommonFtsObject.phraseColumn + HnppDBUtils.matchPhrase(filters) +
" UNION " +
" SELECT " + tableColConcat(CommonFtsObject.searchTableName(CoreConstants.TABLE_NAME.CHILD), CommonFtsObject.idColumn) + " FROM " + CommonFtsObject.searchTableName(CoreConstants.TABLE_NAME.CHILD) +
" JOIN " + CommonFtsObject.searchTableName(CoreConstants.TABLE_NAME.FAMILY) + " on " + tableColConcat(CommonFtsObject.searchTableName(CoreConstants.TABLE_NAME.CHILD), CommonFtsObject.relationalIdColumn) + " = " + tableColConcat(CommonFtsObject.searchTableName(CoreConstants.TABLE_NAME.FAMILY), CommonFtsObject.idColumn) +
" WHERE " + mainMemberCondition + " AND " + tableColConcat(CommonFtsObject.searchTableName(CoreConstants.TABLE_NAME.FAMILY), CommonFtsObject.phraseColumn + HnppDBUtils.matchPhrase(filters)) +
") " + orderByClause(sort) + limitClause(limit, offset);

@Override
protected int getToolBarTitle() {
return R.string.menu_child_clients;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ private void switchViews(View dueOnlyLayout, boolean isPress) {
}
}

private String getCondition() {
protected String getCondition() {
return " " + HnppConstants.TABLE_NAME.FAMILY_MEMBER + "." + DBConstants.KEY.DATE_REMOVED + " is null " +
"AND " + HnppConstants.TABLE_NAME.ANC_PREGNANCY_OUTCOME + "." + DBConstants.KEY.IS_CLOSED + " is 0 " +
"AND " + HnppConstants.TABLE_NAME.FAMILY_MEMBER + "." + DBConstants.KEY.IS_CLOSED + " = '0' ";
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package org.smartregister.brac.hnpp.fragment;

import org.smartregister.brac.hnpp.R;
import org.smartregister.brac.hnpp.model.AncRegisterFragmentModel;
import org.smartregister.brac.hnpp.presenter.HnppRiskAncRegisterFragmentPresenter;
import org.smartregister.chw.core.utils.CoreConstants;

public class HnppRiskAncRegisterFragment extends HnppAncRegisterFragment {
@Override
protected void initializePresenter() {
if (getActivity() == null) {
return;
}
presenter = new HnppRiskAncRegisterFragmentPresenter(this, new AncRegisterFragmentModel(), null);

}
protected int getToolBarTitle() {
return R.string.menu_anc_risk_clients;
}

@Override
protected String getCondition() {
return super.getCondition()+" AND "+ CoreConstants.TABLE_NAME.FAMILY_MEMBER + ".is_risk = 'true'";
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package org.smartregister.brac.hnpp.fragment;

import org.smartregister.brac.hnpp.R;
import org.smartregister.brac.hnpp.model.HnppChildRegisterFragmentModel;
import org.smartregister.brac.hnpp.presenter.HnppChildRegisterFragmentPresenter;
import org.smartregister.brac.hnpp.presenter.HnppRiskChildRegisterFragmentPresenter;
import org.smartregister.view.activity.BaseRegisterActivity;

public class HnppRiskChildRegisterFragment extends HnppChildRegisterFragment {
@Override
protected void initializePresenter() {
if (getActivity() == null) {
return;
}

String viewConfigurationIdentifier = ((BaseRegisterActivity) getActivity()).getViewIdentifiers().get(0);
presenter = new HnppRiskChildRegisterFragmentPresenter(this, new HnppChildRegisterFragmentModel(), viewConfigurationIdentifier);

}
@Override
protected int getToolBarTitle() {
return R.string.menu_anc_risk_clients;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package org.smartregister.brac.hnpp.fragment;

import org.smartregister.brac.hnpp.R;
import org.smartregister.brac.hnpp.model.HnppElcoMemberRegisterFragmentModel;
import org.smartregister.brac.hnpp.presenter.HnppElcoMemberRegisterFragmentPresenter;
import org.smartregister.brac.hnpp.presenter.HnppRiskElcoMemberRegisterFragmentPresenter;
import org.smartregister.view.activity.BaseRegisterActivity;

public class HnppRiskElcoMemberRegisterFragment extends HnppElcoMemberRegisterFragment {
@Override
protected void initializePresenter() {
if (getActivity() == null) {
return;
}

String viewConfigurationIdentifier = ((BaseRegisterActivity) getActivity()).getViewIdentifiers().get(0);
presenter = new HnppRiskElcoMemberRegisterFragmentPresenter(this, new HnppElcoMemberRegisterFragmentModel(), viewConfigurationIdentifier);

}
@Override
protected int getToolBarTitle() {
return R.string.menu_anc_risk_clients;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package org.smartregister.brac.hnpp.fragment;

import org.smartregister.brac.hnpp.R;
import org.smartregister.brac.hnpp.model.AncRegisterFragmentModel;
import org.smartregister.brac.hnpp.presenter.HnppRiskAncRegisterFragmentPresenter;
import org.smartregister.brac.hnpp.presenter.HnppRiskPncRegisterFragmentPresenter;
import org.smartregister.chw.core.utils.CoreConstants;

public class HnppRiskPncRegisterFragment extends HnppPncRegisterFragment {

protected int getToolBarTitle() {
return R.string.menu_anc_risk_clients;
}

@Override
protected String getCondition() {
return super.getCondition()+" AND "+ CoreConstants.TABLE_NAME.FAMILY_MEMBER + ".is_risk = 'true'";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,21 @@ else if(CoreConstants.DrawerMenu.FORUM.equals(tag)){
}

}

@Override
public void onClickSubMenu(String type) {
super.onClickSubMenu(type);
if (CoreConstants.DrawerMenu.ANC_RISK.equals(type)) {
startRegisterActivity(getActivity(CoreConstants.REGISTERED_ACTIVITIES.ANC_RISK_REGISTER_ACTIVITY));

}else if (CoreConstants.DrawerMenu.PNC_RISK.equals(type)) {
startRegisterActivity(getActivity(CoreConstants.REGISTERED_ACTIVITIES.PNC_RISK_REGISTER_ACTIVITY));
}
else if (CoreConstants.DrawerMenu.ELCO_RISK.equals(type)) {
startRegisterActivity(getActivity(CoreConstants.REGISTERED_ACTIVITIES.ELCO_RISK_REGISTER_ACTIVITY));
}
else if (CoreConstants.DrawerMenu.CHILD_RISK.equals(type)) {
startRegisterActivity(getActivity(CoreConstants.REGISTERED_ACTIVITIES.CHILD_RISK_REGISTER_ACTIVITY));
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ protected String[] mainColumns(String tableName) {
columnList.add(CoreConstants.TABLE_NAME.FAMILY + "." + HnppConstants.KEY.SERIAL_NO);
columnList.add(CoreConstants.TABLE_NAME.FAMILY_MEMBER + "." + DBConstants.KEY.RELATIONAL_ID + " as " + ChildDBConstants.KEY.RELATIONAL_ID);
columnList.add(tableName + "." + org.smartregister.chw.anc.util.DBConstants.KEY.LAST_MENSTRUAL_PERIOD);
columnList.add(CoreConstants.TABLE_NAME.FAMILY_MEMBER + "." + HnppConstants.KEY.IS_RISK);
columnList.add(CoreConstants.TABLE_NAME.FAMILY_MEMBER + "." + DBConstants.KEY.FIRST_NAME);
columnList.add(CoreConstants.TABLE_NAME.FAMILY_MEMBER + "." + DBConstants.KEY.MIDDLE_NAME);
columnList.add(CoreConstants.TABLE_NAME.FAMILY_MEMBER + "." + DBConstants.KEY.LAST_NAME);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public static String[] mainColumns(String familyTable, String familyMemberTable)
columnList.add(familyMemberTable + "." + DBConstants.KEY.LAST_NAME);
columnList.add(familyMemberTable + "." + DBConstants.KEY.MIDDLE_NAME );
columnList.add(familyMemberTable + "." + ChildDBConstants.PHONE_NUMBER);
columnList.add(familyMemberTable + "." + DBConstants.KEY.BASE_ENTITY_ID);
columnList.add(familyMemberTable + "." + DBConstants.KEY.RELATIONAL_ID +" as "+ChildDBConstants.KEY.RELATIONAL_ID);
columnList.add(familyMemberTable + "." +DBConstants.KEY.ENTITY_TYPE);
columnList.add(familyTable + "." + DBConstants.KEY.VILLAGE_TOWN +" as "+HnppConstants.KEY.VILLAGE_NAME);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.smartregister.brac.hnpp.model;

import org.smartregister.brac.hnpp.utils.HnppConstants;
import org.smartregister.brac.hnpp.utils.HnppDBConstants;
import org.smartregister.chw.core.model.CoreChildRegisterFragmentModel;
import org.smartregister.chw.core.utils.ChildDBConstants;
import org.smartregister.cursoradapter.SmartRegisterQueryBuilder;
Expand Down Expand Up @@ -29,6 +30,7 @@ public static String[] mainColumns(String tableName, String familyTable, String
columnList.add(tableName + "." + DBConstants.KEY.BASE_ENTITY_ID);
columnList.add(tableName + "." + DBConstants.KEY.FIRST_NAME);
columnList.add(tableName + "." + DBConstants.KEY.MIDDLE_NAME);
columnList.add(familyMemberTable + "." + HnppConstants.KEY.IS_RISK);
columnList.add(familyMemberTable + "." + DBConstants.KEY.FIRST_NAME + " as " + ChildDBConstants.KEY.FAMILY_FIRST_NAME);
columnList.add(familyMemberTable + "." + DBConstants.KEY.LAST_NAME + " as " + ChildDBConstants.KEY.FAMILY_LAST_NAME);
columnList.add(familyMemberTable + "." + DBConstants.KEY.MIDDLE_NAME + " as " + ChildDBConstants.KEY.FAMILY_MIDDLE_NAME);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public static String[] mainColumns(String familyTable, String familyMemberTable)
columnList.add(familyMemberTable + "." + DBConstants.KEY.LAST_NAME);
columnList.add(familyMemberTable + "." + DBConstants.KEY.MIDDLE_NAME );
columnList.add(familyMemberTable + "." + ChildDBConstants.PHONE_NUMBER);
columnList.add(familyMemberTable + "." + DBConstants.KEY.BASE_ENTITY_ID);
columnList.add(familyMemberTable + "." + DBConstants.KEY.RELATIONAL_ID +" as "+ChildDBConstants.KEY.RELATIONAL_ID);
columnList.add(familyMemberTable + "." +DBConstants.KEY.ENTITY_TYPE);
columnList.add(familyTable + "." + DBConstants.KEY.VILLAGE_TOWN +" as "+HnppConstants.KEY.VILLAGE_NAME);
Expand Down
Loading

0 comments on commit 6dba727

Please sign in to comment.