WD|Add Neonatal visit, Immunization Status #4 Child Cohort

opensrp-bidan/src/main/AndroidManifest.xml → opensrp-bidan-cloudant-nofr/src/main/AndroidManifest.xml

@@ -31,7 +31,11 @@
             android:screenOrientation="landscape"
             android:theme="@style/AppThemeNoActionBarAndTitle"
             android:windowSoftInputMode="adjustResize" />
-        <activity android:name=".activity.NativeKIAnakSmartRegisterActivity" />
+        <activity android:name=".activity.NativeKIAnakSmartRegisterActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="landscape"
+            android:theme="@style/AppThemeNoActionBarAndTitle"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name="org.smartregister.bidan.activity.AnakDetailActivity"
             android:screenOrientation="landscape"

opensrp-bidan/src/main/java/org/smartregister/bidan/activity/LoginActivity.java → opensrp-bidan-cloudant-nofr/src/main/java/org/smartregister/bidan/activity/LoginActivity.java

@@ -261,7 +261,8 @@ public void onClick(DialogInterface dialogInterface, int i) {
     }
 
     private void goToHome() {
-        startActivity(new Intent(this, BidanHomeActivity.class));
+//        startActivity(new Intent(this, BidanHomeActivity.class));
+        startActivity(new Intent(this, NativeKIAnakSmartRegisterActivity.class));
         finish();
     }
 

opensrp-bidan/src/main/java/org/smartregister/bidan/activity/NativeKIAnakSmartRegisterActivity.java → opensrp-bidan-cloudant-nofr/src/main/java/org/smartregister/bidan/activity/NativeKIAnakSmartRegisterActivity.java

@@ -56,6 +56,7 @@
  * Created by Dimas Ciputra on 4/7/15.
  */
 public class NativeKIAnakSmartRegisterActivity extends SecuredNativeSmartRegisterActivity {
+
     SimpleDateFormat timer = new SimpleDateFormat("hh:mm:ss");
     public static final String TAG = NativeKIAnakSmartRegisterFragment.class.getSimpleName();
     @Bind(R.id.view_pager)
@@ -66,7 +67,6 @@ public class NativeKIAnakSmartRegisterActivity extends SecuredNativeSmartRegiste
     private String[] formNames = new String[]{};
     private android.support.v4.app.Fragment mBaseFragment = null;
 
-
     ZiggyService ziggyService;
 
     // WD need for initialize queries
@@ -181,11 +181,8 @@ public DialogOption[] getEditOptions() {
                 new OpenFormOption(getString(R.string.str_anak_neonatal), BAYI_NEONATAL_PERIOD, formController),
                 new OpenFormOption(getString(R.string.str_anak_bayi_visit), KOHORT_BAYI_KUNJUNGAN, formController),
                 new OpenFormOption(getString(R.string.str_anak_balita_visit), BALITA_KUNJUNGAN, formController),
-                //      new OpenFormOption(getString(R.string.str_anak_edit), KOHORT_BAYI_EDIT, formController),
                 new OpenFormOption(getString(R.string.str_child_immunizations), BAYI_IMUNISASI, formController),
                 new OpenFormOption(getString(R.string.str_child_close), KARTU_IBU_ANAK_CLOSE, formController),
-                //    new OpenFormOption(getString(R.string.str_tutup_anak),
-                //           BAYI_IMUNISASI, formController),
 
         };
     }

opensrp-bidan/src/main/java/org/smartregister/bidan/fragment/NativeKIAnakSmartRegisterFragment.java → opensrp-bidan-cloudant-nofr/src/main/java/org/smartregister/bidan/fragment/NativeKIAnakSmartRegisterFragment.java

@@ -150,11 +150,9 @@ public DialogOption[] serviceModeOptions() {
             public DialogOption[] sortingOptions() {
 //                FlurryFacade.logEvent("click_sorting_option_on_kohort_anak_dashboard");
                 return new DialogOption[]{
-
                         new CursorCommonObjectSort(getResources().getString(R.string.sort_by_name_label), AnakNameShort()),
                         new CursorCommonObjectSort(getResources().getString(R.string.sort_by_name_label_reverse), AnakNameShortR()),
                         new CursorCommonObjectSort(getResources().getString(R.string.sort_by_dob_label), AnakDOB()),//tanggalLahirAnak
-
                 };
             }
 
@@ -225,7 +223,7 @@ public void initializeQueries(String s){
                 tableName + ".namaBayi",
         });
 
-        queryBuilder.customJoin("LEFT JOIN ec_ibu ON ec_ibu.id = ec_anak.relationalid");
+        queryBuilder.customJoin("LEFT JOIN ec_ibu ON ec_ibu.id = ec_anak.relational_id");
 
 //        mainSelect = queryBuilder.mainCondition("ec_anak.is_closed = 0 and relationalid != ''");
         mainSelect = queryBuilder.mainCondition(mainCondition);
@@ -260,11 +258,12 @@ public void onClick(View view) {
                     break;
                 case R.id.btn_edit:
 //                    FlurryFacade.logEvent("click_visit_button_on_kohort_anak_dashboard");
+//                    showFragmentDialog(((GiziSmartRegisterActivity)getActivity()).new EditDialogOptionModel(), view.getTag());
+
                     showFragmentDialog(new EditDialogOptionModel(), view.getTag());
                     break;
             }
         }
-
     }
 
 

opensrp-bidan/src/main/java/org/smartregister/bidan/options/AnakOverviewServiceMode.java → opensrp-bidan-cloudant-nofr/src/main/java/org/smartregister/bidan/options/AnakOverviewServiceMode.java

@@ -34,14 +34,18 @@ public int weightSum() {
 
             @Override
             public int[] weights() {
-                return new int[]{26, 16, 15, 15, 23, 8};
+                return new int[]{26, 16, 16, 16, 18, 8};
             }
 
             @Override
             public int[] headerTextResourceIds() {
                 return new int[]{
-                        R.string.header_name, R.string.header_dok_persalinan, R.string.str_header_neonatal,
-                        R.string.str_child_immunizations, R.string.header_birth_status, R.string.header_edit};
+                        R.string.header_name,
+                        R.string.header_dok_persalinan,
+                        R.string.header_neonatal,
+                        R.string.header_immunizations,
+                        R.string.header_birth_status,
+                        R.string.header_edit};
             }
         };
     }

opensrp-bidan/src/main/java/org/smartregister/bidan/options/ChildFilterOption.java → opensrp-bidan-cloudant-nofr/src/main/java/org/smartregister/bidan/options/ChildFilterOption.java

@@ -17,7 +17,6 @@ public class ChildFilterOption implements CursorFilterOption {
     public String filter() {
         if(StringUtils.isNotBlank(fieldname) && !fieldname.equals("location_name")){
             return  " AND " + tablename+ ".base_entity_id IN ( SELECT DISTINCT base_entity_id FROM ec_details WHERE key MATCH '"+fieldname+"' INTERSECT SELECT DISTINCT base_entity_id FROM ec_details WHERE value MATCH '"+criteria+"' ) ";
-          //  Log.v("fieldoverride", "");
         } else{
             return  " AND " + tablename+ ".base_entity_id IN ( SELECT DISTINCT base_entity_id FROM ec_details WHERE value MATCH '"+criteria+"' ) ";
         }