diff options
Diffstat (limited to 'src/com/p4square')
| -rw-r--r-- | src/com/p4square/grow/backend/resources/SurveyResultsResource.java | 9 | ||||
| -rw-r--r-- | src/com/p4square/grow/frontend/SurveyPageResource.java | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/com/p4square/grow/backend/resources/SurveyResultsResource.java b/src/com/p4square/grow/backend/resources/SurveyResultsResource.java index 208fa2e..f0bb2aa 100644 --- a/src/com/p4square/grow/backend/resources/SurveyResultsResource.java +++ b/src/com/p4square/grow/backend/resources/SurveyResultsResource.java @@ -139,6 +139,8 @@ public class SurveyResultsResource extends ServerResource { ColumnList<String> row = mDb.getRow("assessments", mUserId); if (!row.isEmpty()) { Score score = new Score(); + boolean scoringDone = false; + int totalAnswers = 0; for (Column<String> c : row) { if (c.getName().equals("lastAnswered") || c.getName().equals("summary")) { continue; @@ -146,14 +148,17 @@ public class SurveyResultsResource extends ServerResource { final String questionId = c.getName(); final String answerId = c.getStringValue(); - if (!scoreQuestion(score, questionId, answerId)) { - break; + if (!scoringDone) { + scoringDone = !scoreQuestion(score, questionId, answerId); } + + totalAnswers++; } sb.append(", \"score\":" + score.sum / score.count); sb.append(", \"sum\":" + score.sum); sb.append(", \"count\":" + score.count); + sb.append(", \"totalAnswers\":" + totalAnswers); sb.append(", \"result\":\"" + score.toString() + "\""); } diff --git a/src/com/p4square/grow/frontend/SurveyPageResource.java b/src/com/p4square/grow/frontend/SurveyPageResource.java index 8fc38ba..415b46c 100644 --- a/src/com/p4square/grow/frontend/SurveyPageResource.java +++ b/src/com/p4square/grow/frontend/SurveyPageResource.java @@ -113,7 +113,7 @@ public class SurveyPageResource extends FreeMarkerPageResource { if (countData != null) { response = backendGet("/accounts/" + mUserId + "/assessment"); if (response.getStatus().isSuccess()) { - Integer completed = (Integer) response.getMap().get("count"); + Integer completed = (Integer) response.getMap().get("totalAnswers"); Integer total = (Integer) countData.get("count"); if (completed != null && total != null && total != 0) { |