Commit bebbdb15 authored by rahadi's avatar rahadi

Added Pemutakhiran Module

parent dda81035
......@@ -421,7 +421,7 @@ public class MainMenuActivity extends AppCompatActivity {
.logAction(this, "onCreateOptionsMenu", "show");
super.onCreateOptionsMenu(menu);
getMenuInflater().inflate(R.menu.vsen_main_menu, menu);
getMenuInflater().inflate(R.menu.main_menu, menu);
return true;
}
......
......@@ -36,6 +36,7 @@ import org.odk.collect.android.R;
import org.odk.collect.android.application.Collect;
import org.odk.collect.android.capi.activity.CapiLoginActivity;
import org.odk.collect.android.capi.preferences.CapiInstancePreferences;
import org.odk.collect.android.pemutakhiran.BlokSensusActivity;
import org.odk.collect.android.preferences.GeneralSharedPreferences;
import org.odk.collect.android.preferences.PreferenceKeys;
......@@ -82,7 +83,7 @@ public class SplashScreenActivity extends AppCompatActivity {
if (preferences.getBoolean(PreferenceKeys.KEY_LOGIN_STATUS, false)) {
// startActivity(new Intent(this, CapiMainActivity.class));
startActivity(new Intent(this, BlokSensusSampleActivity.class));
startActivity(new Intent(this, BlokSensusActivity.class));
} else {
startActivity(new Intent(this, CapiLoginActivity.class));
}
......
......@@ -43,7 +43,7 @@ public class AdminPreferencesFragment extends BasePreferenceFragment implements
findPreference(KEY_CHANGE_ADMIN_PASSWORD).setOnPreferenceClickListener(this);
findPreference(KEY_IMPORT_SETTINGS).setOnPreferenceClickListener(this);
findPreference("vsen_main_menu").setOnPreferenceClickListener(this);
findPreference("main_menu").setOnPreferenceClickListener(this);
findPreference("user_settings").setOnPreferenceClickListener(this);
findPreference("form_entry").setOnPreferenceClickListener(this);
}
......@@ -124,7 +124,7 @@ public class AdminPreferencesFragment extends BasePreferenceFragment implements
fragment = new ShowQRCodeFragment();
break;
case "vsen_main_menu":
case "main_menu":
fragment = new MainMenuAccessPreferences();
break;
case "user_settings":
......
......@@ -295,7 +295,7 @@ public class GridMultiWidget extends QuestionWidget {
stopAudio();
}
Collect.getInstance().getActivityLogger().logInstanceAction(this,
"getDsrtActivityClass.deselect",
"onItemClick.deselect",
items.get(position).getValue(), formEntryPrompt.getIndex());
} else {
......@@ -306,7 +306,7 @@ public class GridMultiWidget extends QuestionWidget {
imageViews[position].setBackgroundColor(Color.rgb(orangeRedVal, orangeGreenVal,
orangeBlueVal));
Collect.getInstance().getActivityLogger().logInstanceAction(this,
"getDsrtActivityClass.select",
"onItemClick.select",
items.get(position).getValue(), formEntryPrompt.getIndex());
if (audioHandlers[position] != null) {
audioHandlers[position].playAudio(getContext());
......
......@@ -302,7 +302,7 @@ public class GridWidget extends QuestionWidget {
}
selected[position] = true;
Collect.getInstance().getActivityLogger().logInstanceAction(this,
"getDsrtActivityClass.select",
"onItemClick.select",
items.get(position).getValue(), formEntryPrompt.getIndex());
imageViews[position].setBackgroundColor(Color.rgb(orangeRedVal, orangeGreenVal,
orangeBlueVal));
......
......@@ -131,13 +131,13 @@ public class ListMultiWidget extends QuestionWidget {
if (buttonView.isChecked()) {
buttonView.setChecked(false);
Collect.getInstance().getActivityLogger().logInstanceAction(this,
"getDsrtActivityClass.deselect",
"onItemClick.deselect",
items.get((Integer) buttonView.getTag()).getValue(),
formEntryPrompt.getIndex());
} else {
buttonView.setChecked(true);
Collect.getInstance().getActivityLogger().logInstanceAction(this,
"getDsrtActivityClass.select",
"onItemClick.select",
items.get((Integer) buttonView.getTag()).getValue(),
formEntryPrompt.getIndex());
}
......
......@@ -118,13 +118,13 @@ public class SelectMultiWidget extends QuestionWidget {
if (buttonView.isChecked()) {
buttonView.setChecked(false);
Collect.getInstance().getActivityLogger().logInstanceAction(this,
"getDsrtActivityClass.deselect",
"onItemClick.deselect",
items.get((Integer) buttonView.getTag()).getValue(),
formEntryPrompt.getIndex());
} else {
buttonView.setChecked(true);
Collect.getInstance().getActivityLogger().logInstanceAction(this,
"getDsrtActivityClass.select",
"onItemClick.select",
items.get((Integer) buttonView.getTag()).getValue(),
formEntryPrompt.getIndex());
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment