diff --git a/app/build.gradle b/app/build.gradle index 76ff1a2..0c4337f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,5 +23,5 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' compile 'com.android.support:appcompat-v7:23.2.1' - compile 'org.researchstack:backbone:1.0.0.rc1' + compile 'org.researchstack:backbone:1.1.2' } diff --git a/app/src/main/java/org/researchstack/backboneapp/MainActivity.java b/app/src/main/java/org/researchstack/backboneapp/MainActivity.java index 1eabaa0..cf2852a 100644 --- a/app/src/main/java/org/researchstack/backboneapp/MainActivity.java +++ b/app/src/main/java/org/researchstack/backboneapp/MainActivity.java @@ -3,7 +3,6 @@ import android.content.Intent; import android.graphics.BitmapFactory; import android.os.Bundle; -import android.support.annotation.NonNull; import android.support.v7.app.ActionBar; import android.support.v7.widget.AppCompatButton; import android.support.v7.widget.Toolbar; @@ -20,9 +19,7 @@ import org.researchstack.backbone.answerformat.BooleanAnswerFormat; import org.researchstack.backbone.answerformat.ChoiceAnswerFormat; import org.researchstack.backbone.answerformat.DateAnswerFormat; -import org.researchstack.backbone.answerformat.IntegerAnswerFormat; import org.researchstack.backbone.answerformat.TextAnswerFormat; -import org.researchstack.backbone.answerformat.UnknownAnswerFormat; import org.researchstack.backbone.model.Choice; import org.researchstack.backbone.model.ConsentDocument; import org.researchstack.backbone.model.ConsentSection; @@ -41,7 +38,6 @@ import org.researchstack.backbone.ui.ViewTaskActivity; import org.researchstack.backbone.ui.step.layout.ConsentSignatureStepLayout; -import java.util.ArrayList; import java.util.Collections; public class MainActivity extends PinCodeActivity @@ -51,17 +47,9 @@ public class MainActivity extends PinCodeActivity private static final int REQUEST_SURVEY = 1; // Task/Step Identifiers - public static final String FORM_STEP = "form_step"; - public static final String AGE = "age"; public static final String INSTRUCTION = "identifier"; - public static final String BASIC_INFO_HEADER = "basic_info_header"; - public static final String FORM_AGE = "form_age"; - public static final String FORM_GENDER = "gender"; - public static final String FORM_MULTI_CHOICE = "multi_choice"; - public static final String FORM_DATE_OF_BIRTH = "date_of_birth"; public static final String NUTRITION = "nutrition"; public static final String SIGNATURE = "signature"; - public static final String SIGNATURE_DATE = "signature_date"; public static final String VISUAL_CONSENT_IDENTIFIER = "visual_consent_identifier"; public static final String CONSENT_DOC = "consent_doc"; public static final String SIGNATURE_FORM_STEP = "form_step"; @@ -69,10 +57,10 @@ public class MainActivity extends PinCodeActivity public static final String CONSENT = "consent"; public static final String MULTI_STEP = "multi_step"; public static final String DATE = "date"; - public static final String DECIMAL = "decimal"; - private static final String FORM_NAME = "form_name"; public static final String SAMPLE_SURVEY = "sample_survey"; + public static final String SKIPPED_RESULT_VALUE = "[SKIPPED_RESULT]"; + // Views private AppCompatButton consentButton; private AppCompatButton surveyButton; @@ -362,49 +350,6 @@ private void launchSurvey() startActivityForResult(intent, REQUEST_SURVEY); } - @NonNull - private FormStep createFormStep() - { - FormStep formStep = new FormStep(FORM_STEP, "Form", "Form groups multi-entry in one page"); - ArrayList formItems = new ArrayList<>(); - - QuestionStep basicInfoHeader = new QuestionStep(BASIC_INFO_HEADER, - "Basic Information", - new UnknownAnswerFormat()); - formItems.add(basicInfoHeader); - - TextAnswerFormat format = new TextAnswerFormat(); - format.setIsMultipleLines(false); - QuestionStep nameItem = new QuestionStep(FORM_NAME, "Name", format); - formItems.add(nameItem); - - QuestionStep ageItem = new QuestionStep(FORM_AGE, "Age", new IntegerAnswerFormat(18, 90)); - formItems.add(ageItem); - - AnswerFormat genderFormat = new ChoiceAnswerFormat(AnswerFormat.ChoiceAnswerStyle.SingleChoice, - new Choice<>("Male", 0), - new Choice<>("Female", 1)); - QuestionStep genderFormItem = new QuestionStep(FORM_GENDER, "Gender", genderFormat); - formItems.add(genderFormItem); - - AnswerFormat multiFormat = new ChoiceAnswerFormat(AnswerFormat.ChoiceAnswerStyle.MultipleChoice, - new Choice<>("Zero", 0), - new Choice<>("One", 1), - new Choice<>("Two", 2)); - QuestionStep multiFormItem = new QuestionStep(FORM_MULTI_CHOICE, "Test Multi", multiFormat); - formItems.add(multiFormItem); - - AnswerFormat dateOfBirthFormat = new DateAnswerFormat(AnswerFormat.DateAnswerStyle.Date); - QuestionStep dateOfBirthFormItem = new QuestionStep(FORM_DATE_OF_BIRTH, - "Birthdate", - dateOfBirthFormat); - formItems.add(dateOfBirthFormItem); - - // ... And so on, adding additional items - formStep.setFormSteps(formItems); - return formStep; - } - private void processSurveyResult(TaskResult result) { StorageAccess.getInstance().getAppDatabase().saveTaskResult(result); @@ -421,10 +366,19 @@ private void printSurveyInfo(TextView surveyAnswer) .loadLatestTaskResult(SAMPLE_SURVEY); String results = ""; + String currentResult; for(String id : taskResult.getResults().keySet()) { StepResult stepResult = taskResult.getStepResult(id); - results += id + ": " + stepResult.getResult().toString() + "\n"; + if (stepResult.getResult() == null) + { + currentResult = SKIPPED_RESULT_VALUE; + } + else + { + currentResult = stepResult.getResult().toString(); + } + results += id + ": " + currentResult + "\n"; } surveyAnswer.setText(results);