From 8c3a2478c36a998189f69f69e466c257be450a87 Mon Sep 17 00:00:00 2001 From: Jesse Morgan Date: Mon, 9 Sep 2013 23:31:57 -0700 Subject: Adding the progress bar to the assessment. Also adding a header to the Assessment Results page. --- src/com/p4square/grow/frontend/SurveyPageResource.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src/com/p4square/grow/frontend/SurveyPageResource.java') diff --git a/src/com/p4square/grow/frontend/SurveyPageResource.java b/src/com/p4square/grow/frontend/SurveyPageResource.java index 787314a..1389f11 100644 --- a/src/com/p4square/grow/frontend/SurveyPageResource.java +++ b/src/com/p4square/grow/frontend/SurveyPageResource.java @@ -110,6 +110,21 @@ public class SurveyPageResource extends FreeMarkerPageResource { root.put("question", questionData); root.put("selectedAnswerId", selectedAnswer); + // Get the question count and compute progress + Map countData = getQuestion("count"); + if (countData != null) { + JsonResponse response = backendGet("/accounts/" + mUserId + "/assessment"); + if (response.getStatus().isSuccess()) { + Integer completed = (Integer) response.getMap().get("count"); + Integer total = (Integer) countData.get("count"); + + if (completed != null && total != null && total != 0) { + root.put("percentComplete", String.valueOf((int) (100.0 * completed) / total)); + } + } + } + + return new TemplateRepresentation(mSurveyTemplate, root, MediaType.TEXT_HTML); } catch (Exception e) { -- cgit v1.2.3