diff --git a/src/main/java/teammates/ui/template/StudentFeedbackResultsQuestionWithResponses.java b/src/main/java/teammates/ui/template/StudentFeedbackResultsQuestionWithResponses.java index f754088a3ee..3b60b29d6ce 100644 --- a/src/main/java/teammates/ui/template/StudentFeedbackResultsQuestionWithResponses.java +++ b/src/main/java/teammates/ui/template/StudentFeedbackResultsQuestionWithResponses.java @@ -1,5 +1,6 @@ package teammates.ui.template; +import java.util.ArrayList; import java.util.List; public class StudentFeedbackResultsQuestionWithResponses { @@ -21,4 +22,30 @@ public List getResponseTables() { return responseTables; } + public List getSelfResponseTables() { + + List selfResponseTables = new ArrayList<>(); + + for (int i = 0; i < responseTables.size(); i++) { + if (responseTables.get(i).isGiverNameYou()) { + selfResponseTables.add(responseTables.get(i)); + } + } + + return selfResponseTables; + } + + public List getOthersResponseTables() { + + List othersResponseTables = new ArrayList<>(); + + for (int i = 0; i < responseTables.size(); i++) { + if (!responseTables.get(i).isGiverNameYou()) { + othersResponseTables.add(responseTables.get(i)); + } + } + + return othersResponseTables; + } + } diff --git a/src/main/webapp/WEB-INF/tags/student/feedbackResults/feedbackSessionSelfResponse.tag b/src/main/webapp/WEB-INF/tags/student/feedbackResults/feedbackSessionSelfResponse.tag new file mode 100644 index 00000000000..0f3e373d376 --- /dev/null +++ b/src/main/webapp/WEB-INF/tags/student/feedbackResults/feedbackSessionSelfResponse.tag @@ -0,0 +1,5 @@ +<%@ tag description="studentFeedbackResults.jsp - Displays feedback session self-response title" pageEncoding="UTF-8" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib tagdir="/WEB-INF/tags/student/feedbackResults" prefix="feedbackResults" %> + +

Your own response

diff --git a/src/main/webapp/WEB-INF/tags/student/feedbackResults/othersResponse.tag b/src/main/webapp/WEB-INF/tags/student/feedbackResults/othersResponse.tag new file mode 100644 index 00000000000..c93c3b83757 --- /dev/null +++ b/src/main/webapp/WEB-INF/tags/student/feedbackResults/othersResponse.tag @@ -0,0 +1,28 @@ +<%@ tag description="othersResponseTable.tag - Others-responses given to a particular recipient" pageEncoding="UTF-8" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib tagdir="/WEB-INF/tags/shared" prefix="shared"%> +<%@ attribute name="othersResponse" type="teammates.ui.template.FeedbackResultsResponse" required="true" %> + + + + From: ${fn:escapeXml(othersResponse.giverName)} + + + + + <%-- Note: When an element has class text-preserve-space, do not insert HTML spaces --%> + ${othersResponse.answer} + + + + + +
    + + + +
+ + + diff --git a/src/main/webapp/WEB-INF/tags/student/feedbackResults/othersResponseTable.tag b/src/main/webapp/WEB-INF/tags/student/feedbackResults/othersResponseTable.tag new file mode 100644 index 00000000000..49dac8b936c --- /dev/null +++ b/src/main/webapp/WEB-INF/tags/student/feedbackResults/othersResponseTable.tag @@ -0,0 +1,20 @@ +<%@ tag description="questionWithOthersResponses.tag - Others-responses given to a particular recipient" pageEncoding="UTF-8" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib tagdir="/WEB-INF/tags/student/feedbackResults" prefix="feedbackResults" %> +<%@ attribute name="othersResponseTable" type="teammates.ui.template.FeedbackResultsResponseTable" required="true" %> + + + +
+
+ To: ${fn:escapeXml(othersResponseTable.recipientName)} +
+ + + + + + +
+
diff --git a/src/main/webapp/WEB-INF/tags/student/feedbackResults/questionWithOthersResponses.tag b/src/main/webapp/WEB-INF/tags/student/feedbackResults/questionWithOthersResponses.tag new file mode 100644 index 00000000000..289297fff5a --- /dev/null +++ b/src/main/webapp/WEB-INF/tags/student/feedbackResults/questionWithOthersResponses.tag @@ -0,0 +1,22 @@ +<%@ tag description="studentFeedbackResults.jsp - Student feedback results question with others-responses" pageEncoding="UTF-8" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib tagdir="/WEB-INF/tags/student/feedbackResults" prefix="feedbackResults" %> +<%@ attribute name="questionWithOthersResponses" type="teammates.ui.template.StudentFeedbackResultsQuestionWithResponses" required="true" %> + +
+
+ <%-- Note: When an element has class text-preserve-space, do not insert HTML spaces --%> +

Question ${questionWithOthersResponses.questionDetails.questionIndex}: ${questionWithOthersResponses.questionDetails.additionalInfo}

+ + ${questionWithOthersResponses.questionDetails.questionResultStatistics} + + + + + + + + +
+
+
diff --git a/src/main/webapp/WEB-INF/tags/student/feedbackResults/questionWithResponses.tag b/src/main/webapp/WEB-INF/tags/student/feedbackResults/questionWithResponses.tag deleted file mode 100644 index caf51fcae94..00000000000 --- a/src/main/webapp/WEB-INF/tags/student/feedbackResults/questionWithResponses.tag +++ /dev/null @@ -1,22 +0,0 @@ -<%@ tag description="studentFeedbackResults.jsp - Student feedback results question with responses" pageEncoding="UTF-8" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib tagdir="/WEB-INF/tags/student/feedbackResults" prefix="feedbackResults" %> -<%@ attribute name="questionWithResponses" type="teammates.ui.template.StudentFeedbackResultsQuestionWithResponses" required="true" %> - -
-
- <%-- Note: When an element has class text-preserve-space, do not insert HTML spaces --%> -

Question ${questionWithResponses.questionDetails.questionIndex}: ${questionWithResponses.questionDetails.additionalInfo}

- - ${questionWithResponses.questionDetails.questionResultStatistics} - - - - - - - - -
-
-
diff --git a/src/main/webapp/WEB-INF/tags/student/feedbackResults/questionWithSelfResponses.tag b/src/main/webapp/WEB-INF/tags/student/feedbackResults/questionWithSelfResponses.tag new file mode 100644 index 00000000000..2c327db5d82 --- /dev/null +++ b/src/main/webapp/WEB-INF/tags/student/feedbackResults/questionWithSelfResponses.tag @@ -0,0 +1,22 @@ +<%@ tag description="studentFeedbackResults.jsp - Student feedback results question with self-responses" pageEncoding="UTF-8" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib tagdir="/WEB-INF/tags/student/feedbackResults" prefix="feedbackResults" %> +<%@ attribute name="questionWithSelfResponses" type="teammates.ui.template.StudentFeedbackResultsQuestionWithResponses" required="true" %> + +
+
+ <%-- Note: When an element has class text-preserve-space, do not insert HTML spaces --%> +

Question ${questionWithSelfResponses.questionDetails.questionIndex}: ${questionWithSelfResponses.questionDetails.additionalInfo}

+ + ${questionWithSelfResponses.questionDetails.questionResultStatistics} + + + + + + + + +
+
+
diff --git a/src/main/webapp/WEB-INF/tags/student/feedbackResults/responseTable.tag b/src/main/webapp/WEB-INF/tags/student/feedbackResults/responseTable.tag deleted file mode 100644 index 61a8b4eaf46..00000000000 --- a/src/main/webapp/WEB-INF/tags/student/feedbackResults/responseTable.tag +++ /dev/null @@ -1,27 +0,0 @@ -<%@ tag description="questionWithResponses.tag - Responses given to a particular recipient" pageEncoding="UTF-8" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<%@ taglib tagdir="/WEB-INF/tags/student/feedbackResults" prefix="feedbackResults" %> -<%@ attribute name="responseTable" type="teammates.ui.template.FeedbackResultsResponseTable" required="true" %> - - - - - - - - - - -
-
- To: ${fn:escapeXml(responseTable.recipientName)} -
- - - - - - -
-
diff --git a/src/main/webapp/WEB-INF/tags/student/feedbackResults/response.tag b/src/main/webapp/WEB-INF/tags/student/feedbackResults/selfResponse.tag similarity index 52% rename from src/main/webapp/WEB-INF/tags/student/feedbackResults/response.tag rename to src/main/webapp/WEB-INF/tags/student/feedbackResults/selfResponse.tag index ce2f84acb8f..f4df65b25d9 100644 --- a/src/main/webapp/WEB-INF/tags/student/feedbackResults/response.tag +++ b/src/main/webapp/WEB-INF/tags/student/feedbackResults/selfResponse.tag @@ -1,25 +1,25 @@ -<%@ tag description="responseTable.tag - Responses given to a particular recipient" pageEncoding="UTF-8" %> +<%@ tag description="selfResponseTable.tag - Self-responses given to a particular recipient" pageEncoding="UTF-8" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@ taglib tagdir="/WEB-INF/tags/shared" prefix="shared"%> -<%@ attribute name="response" type="teammates.ui.template.FeedbackResultsResponse" required="true" %> +<%@ attribute name="selfResponse" type="teammates.ui.template.FeedbackResultsResponse" required="true" %> - From: ${fn:escapeXml(response.giverName)} + From: ${fn:escapeXml(selfResponse.giverName)} <%-- Note: When an element has class text-preserve-space, do not insert HTML spaces --%> - ${response.answer} + ${selfResponse.answer} - +
    - +
diff --git a/src/main/webapp/WEB-INF/tags/student/feedbackResults/selfResponseTable.tag b/src/main/webapp/WEB-INF/tags/student/feedbackResults/selfResponseTable.tag new file mode 100644 index 00000000000..c803160ecec --- /dev/null +++ b/src/main/webapp/WEB-INF/tags/student/feedbackResults/selfResponseTable.tag @@ -0,0 +1,20 @@ +<%@ tag description="questionWithSelfResponses.tag - Self-responses given to a particular recipient" pageEncoding="UTF-8" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib tagdir="/WEB-INF/tags/student/feedbackResults" prefix="feedbackResults" %> +<%@ attribute name="selfResponseTable" type="teammates.ui.template.FeedbackResultsResponseTable" required="true" %> + + + +
+
+ To: ${fn:escapeXml(selfResponseTable.recipientName)} +
+ + + + + + +
+
diff --git a/src/main/webapp/jsp/studentFeedbackResults.jsp b/src/main/webapp/jsp/studentFeedbackResults.jsp index 3316e690f23..a61bf61c503 100644 --- a/src/main/webapp/jsp/studentFeedbackResults.jsp +++ b/src/main/webapp/jsp/studentFeedbackResults.jsp @@ -19,8 +19,16 @@
- - + + + +
+ + +
+ + + diff --git a/src/test/resources/pages/newlyJoinedInstructorStudentFeedbackResultsPage.html b/src/test/resources/pages/newlyJoinedInstructorStudentFeedbackResultsPage.html index c4b7f4d2017..d349afb203d 100644 --- a/src/test/resources/pages/newlyJoinedInstructorStudentFeedbackResultsPage.html +++ b/src/test/resources/pages/newlyJoinedInstructorStudentFeedbackResultsPage.html @@ -134,76 +134,76 @@

- - - + + - + - - - - + + + + - + - + +
- - My view: - - +
+ + My view: + + of me: - + E +10% - + of others: - + E +10% - , - + , + E +10% - , - + , + E -20% -
- - Team's view: - - +
+ + Team's view: + + of me: - + E +9% - + of others: - + E +9% - , - + , + E +9% - , - + , + E -18% -
@@ -218,30 +218,52 @@

Comments about your contribution (shown to other teammates)

-
+
To: - You + Charlie Davis
- - + - - - - + Charlie Davis + + + + + + + +
+
From: - You -
- I was the project lead. I designed the application architecture and managed the project to ensure we deliver the product on time. -
+ I am a bit slow compared to my team mates, but the members helped me to catch up. +
+
    +
  • +
    +
    + + From: AHPUiT Instrúctör WithPlusInEmail [Tue, 01 May 2012, 05:36 AM UTC+0800] + +
    +
    +
    +
    +
    +

    + Well, Being your first team project always takes some time. I hope you had nice experience working with the team. +

    +
    +
    • +
+
@@ -250,47 +272,47 @@

To: - Charlie Davis + Francis Gabriel

- - + - - - - - - + + + + + + - + +
+

+ Design could have been more interactive. +

+
+ + + +
+
From: - Charlie Davis -
- I am a bit slow compared to my team mates, but the members helped me to catch up. -
-
    -
  • -
    -
    + Francis Gabriel +
+ I was the designer. I did all the UI work. +
+
    +
  • +
    +
    - From: AHPUiT Instrúctör WithPlusInEmail [Tue, 01 May 2012, 05:36 AM UTC+0800] + From: AHPUiT Instrúctör WithPlusInEmail [Tue, 01 May 2012, 05:39 AM UTC+0800] -
    -
    -
    -
    -

    - Well, Being your first team project always takes some time. I hope you had nice experience working with the team. -

    +
    -
    • -
-
@@ -299,74 +321,306 @@

To: - Francis Gabriel + Gene Hudson - - + - - - - - - - + Gene Hudson + + + + +
+
From: - Francis Gabriel -
- I was the designer. I did all the UI work. -
-
    -
  • -
    -
    - - From: AHPUiT Instrúctör WithPlusInEmail [Tue, 01 May 2012, 05:39 AM UTC+0800] - -
    -
    -
    -
    -
    -

    - Design could have been more interactive. -

    -
    -
    • -
-
+ I am the programmer for the team. I did most of the coding. +
+ + +
+
+
+

+ Question 3: + + Your comments about this teammate (confidential and only shown to instructor) + +

+
+
+
+
+
+

+ Question 4: + + Comments about team dynamics (confidential and only shown to instructor) + +

+
+
+
+
+
+

+ Question 5: + + Your feedback to this teammate (shown anonymously to the teammate) + +

To: - Gene Hudson + You +
+ + + + + + + + + + + + + + + + + + + + + +
+ + + From: + + + Anonymous student +
+ Thank you AHPUiT Instrúctör WithPlusInEmail for all the hardwork! +
+ + + From: + + + Anonymous student +
+ Thank you AHPUiT Instrúctör WithPlusInEmail for all the help in the project. +
+ + + From: + + + Anonymous student +
+ Thank you AHPUiT Instrúctör WithPlusInEmail for being such a good team leader! +
+
+
+
+
+
+

+ Your own response +

+
+
+
+

+ Question 1: + + Please rate the estimated contribution of your team members and yourself.  + + + [more] + +
+ + + +

+
+
+ Comparison of work distribution   + + + [how to interpret, etc..] + +
+ + +
+ + + + + + + + + + + + + +
+ + My view: + + + + + of me: + + + + E +10% + + + + + of others: + + + + E +10% + + , + + E +10% + + , + + E -20% + +
+ + Team's view: + + + + + of me: + + + + E +9% + + + + + of others: + + + + E +9% + + , + + E +9% + + , + + E -18% + +
+
+
+
+
+
+
+

+ Question 2: + + Comments about your contribution (shown to other teammates) + +

+
+
+ + To: + + You
- - + - - - - + You + + + + +
+
From: - Gene Hudson -
- I am the programmer for the team. I did most of the coding. -
+ I was the project lead. I designed the application architecture and managed the project to ensure we deliver the product on time. +
@@ -381,7 +635,7 @@

Your comments about this teammate (confidential and only shown to instructor)

-
+
To: @@ -390,25 +644,25 @@

- - + - - - - + You + + + + +
+
From: - You -
- A bit weak in terms of technical skills. He spent lots of time in picking up the skills. Although a bit slow in development, his attitude is good. -
+ A bit weak in terms of technical skills. He spent lots of time in picking up the skills. Although a bit slow in development, his attitude is good. +
-
+
To: @@ -417,25 +671,25 @@

- - + - - - - + You + + + + +
+
From: - You -
- Francis is the designer of the project. He did a good job! -
+ Francis is the designer of the project. He did a good job! +
-
+
To: @@ -444,21 +698,21 @@

- - + - - - - + You + + + + +
+
From: - You -
- Gene is the programmer for our team. She put in a lot of effort in coding a significant portion of the project. -
+ Gene is the programmer for our team. She put in a lot of effort in coding a significant portion of the project. +
@@ -473,7 +727,7 @@

Comments about team dynamics (confidential and only shown to instructor)

-
+
To: @@ -482,21 +736,21 @@

- - + - - - - + You + + + + +
+
From: - You -
- I had a great time with this team. Thanks for all the support from the members. -
+ I had a great time with this team. Thanks for all the support from the members. +
@@ -511,64 +765,7 @@

Your feedback to this teammate (shown anonymously to the teammate)

-
-
- - To: - - You -
- - - - - - - - - - - - - - - - - - - - - -
- - - From: - - - Anonymous student -
- Thank you AHPUiT Instrúctör WithPlusInEmail for all the hardwork! -
- - - From: - - - Anonymous student -
- Thank you AHPUiT Instrúctör WithPlusInEmail for all the help in the project. -
- - - From: - - - Anonymous student -
- Thank you AHPUiT Instrúctör WithPlusInEmail for being such a good team leader! -
-
-
+
To: @@ -577,25 +774,25 @@

- - + - - - - + You + + + + +
+
From: - You -
- Good try Charlie! Thanks for showing great effort in picking up the skills. -
+ Good try Charlie! Thanks for showing great effort in picking up the skills. +
-
+
To: @@ -604,25 +801,25 @@

- - + - - - - + You + + + + +
+
From: - You -
- Nice work Francis! -
+ Nice work Francis! +
-
+
To: @@ -631,21 +828,21 @@

- - + - - - - + You + + + + +
+
From: - You -
- Keep up the good work Gene! -
+ Keep up the good work Gene! +
diff --git a/src/test/resources/pages/studentExtendedFeedbackResultsPageRubric.html b/src/test/resources/pages/studentExtendedFeedbackResultsPageRubric.html index 84758aad041..fee3765b0d9 100644 --- a/src/test/resources/pages/studentExtendedFeedbackResultsPageRubric.html +++ b/src/test/resources/pages/studentExtendedFeedbackResultsPageRubric.html @@ -97,224 +97,53 @@

- - - - - + + + + + - - - - - - - - - - + + + + + + + + + +
- -

- Yes -

- 		-

- No -

-
+ +

+ Yes +

+ 		+

+ No +

+
-

- a) You have done a good job. -

- 		- 67% (2) - - 33% (1) -
-

- b) You have tried your best. -

- 		- 33% (1) - - 67% (2) -
+

+ a) You have done a good job. +

+ 		+ 67% (2) + + 33% (1) +
+

+ b) You have tried your best. +

+ 		+ 33% (1) + + 67% (2) +

-
-
- - To: - - - -
- - - - - - - - - - - - - - - - - - - - - -
- - - From: - - - You -
- - - - - - - - - - - - - - - - - - - - -
- Criteria - - Yes - - No -
- You have done a good job. - - - - -
- You have tried your best. - - - - -
-
- - - From: - - - Anonymous student -
- - - - - - - - - - - - - - - - - - - - -
- Criteria - - Yes - - No -
- You have done a good job. - - - - -
- You have tried your best. - - - - -
-
- - - From: - - - Anonymous student -
- - - - - - - - - - - - - - - - - - - - -
- Criteria - - Yes - - No -
- You have done a good job. - - - - -
- You have tried your best. - - - - -
-
-

@@ -353,65 +182,65 @@

- - - + + - + - - +

+ + + - - - - - - - - - - - - + + + + + + + + + + + +
- -

- Yes - +

+ +

+ Yes + (Weight: 1.01) -

- 		-

- No - +

+ 		+

+ No + (Weight: -0.99) -

- 		-

- Average -

-
+

+ Average +

+
-

- a) This student has done a good job. -

- 		- 50% (1) - - 50% (1) - - 0.01 -
-

- b) This student has tried his/her best. -

- 		- 50% (1) - - 50% (1) - - 0.01 -
+

+ a) This student has done a good job. +

+ 		+ 50% (1) + + 50% (1) + + 0.01 +
+

+ b) This student has tried his/her best. +

+ 		+ 50% (1) + + 50% (1) + + 0.01 +
@@ -423,345 +252,162 @@

'"'" - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-

- Team -

- 		-

- Recipient Name -

- 		-

- Sub Question -

- 		-

- Yes (Weight: 1.01) -

- 		-

- No (Weight: -0.99) -

- 		-

- Total -

- 		-

- Average -

-
+

+ Team +

+ 		+

+ Recipient Name +

+ 		+

+ Sub Question +

+ 		+

+ Yes (Weight: 1.01) +

+ 		+

+ No (Weight: -0.99) +

+ 		+

+ Total +

+ 		+

+ Average +

+
- Team 1 - - - '" - - Alice Betsy - - a) This student has done a good job. - - 1 - - 1 - - 0.02 - - 0.01 -
- Team 1 - - - '" - - Alice Betsy - - b) This student has tried his/her best. - - 1 - - 1 - - 0.02 - - 0.01 -
- Team 1 - - - '" - - Benny Charles - - a) This student has done a good job. - - 1 - - 0 - - 1.01 - - 1.01 -
- Team 1 - - - '" - - Benny Charles - - b) This student has tried his/her best. - - 1 - - 0 - - 1.01 - - 1.01 -
+ Team 1 + + + '" + + Alice Betsy + + a) This student has done a good job. + + 1 + + 1 + + 0.02 + + 0.01 +
+ Team 1 + + + '" + + Alice Betsy + + b) This student has tried his/her best. + + 1 + + 1 + + 0.02 + + 0.01 +
+ Team 1 + + + '" + + Benny Charles + + a) This student has done a good job. + + 1 + + 0 + + 1.01 + + 1.01 +
+ Team 1 + + + '" + + Benny Charles + + b) This student has tried his/her best. + + 1 + + 0 + + 1.01 + + 1.01 +

-
-
- - To: - - You -
- - - - - - - - - - - - - - - -
- - - From: - - - You -
- - - - - - - - - - - - - - - - - - - - -
- Criteria - - Yes - - No -
- This student has done a good job. - - - - -
- This student has tried his/her best. - - - - -
-
- - - From: - - - Anonymous student -
- - - - - - - - - - - - - - - - - - - - -
- Criteria - - Yes - - No -
- This student has done a good job. - - - - -
- This student has tried his/her best. - - - - -
-
-
-
-
- - To: - - Benny Charles -
- - - - - - - - - -
- - - From: - - - You -
- - - - - - - - - - - - - - - - - - - - -
- Criteria - - Yes - - No -
- This student has done a good job. - - - - -
- This student has tried his/her best. - - - - -
-
-

@@ -800,65 +446,389 @@

- - - + + - + - - +

+ + + - - - - - - - + + + + + + + + + + + + + +
- -

- Yes - +

+ +

+ Yes + (Weight: 2) -

- 		-

- No - +

+ 		+

+ No + (Weight: 0) -

- 		-

- Average -

-
+

+ Average +

+
-

- a) This student has done a good job. -

- 		- 100% (1) - - 0% (0) - - 2.00 -
+

+ a) This student has done a good job. +

+ 		+ 100% (1) + + 0% (0) + + 2.00 +
+

+ b) This student has tried his/her best. +

+ 		+ 0% (0) + + 100% (1) + + 0.00 +
+
+
+
+ + Per Recipient Statistics + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

+ Team +

+ 		+

+ Recipient Name +

+ 		+

+ Sub Question +

+ 		+

+ Yes (Weight: 2) +

+ 		+

+ No (Weight: 0) +

+ 		+

+ Total +

+ 		+

+ Average +

+
+ + Team 1 + + + '" + + a) This student has done a good job. + + 1 + + 0 + + 2.00 + + 2.00 +
+ + Team 1 + + + '" + + b) This student has tried his/her best. + + 0 + + 1 + + 0.00 + + 0.00 +
+ + Team 2 + + + '" + + a) This student has done a good job. + + 1 + + 0 + + 2.00 + + 2.00 +
+ + Team 2 + + + '" + + b) This student has tried his/her best. + + 1 + + 0 + + 2.00 + + 2.00 +
+
+ + +
+
+ + To: + + Your Team (Team 1</option><option value="dump"></td><td>'") +
+ + + + + + + + + +
+ + + From: + + + Anonymous student +
+ + + + + + + + + + - - + + + + + +
+ Criteria + + Yes + + No +
-

- b) This student has tried his/her best. -

+ This student has done a good job. 		- 0% (0) + + + - 100% (1) +
- 0.00 + This student has tried his/her best. + + + +
+
+
+ + +
+
+
+

+ Question 4: + + Recipient: OWN_TEAM_MEMBERS. See responses: recipients, instructor. No received responses.  + + + [more] + +
+ + + +

+
+
+
+ + Response Summary (of received responses) + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + +
+ +

+ Yes + + (Weight: 0.01) + +

+ 		+

+ No + + (Weight: -0.01) + +

+ 		+

+ Average +

+
+

+ a) This student has done a good job. +

+ 		+ - (0) + + - (0) + + - +
+

+ b) This student has tried his/her best. +

+ 		+ - (0) + + - (0) + + - +
@@ -869,224 +839,1074 @@

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

+ Team +

+ 		+

+ Recipient Name +

+ 		+

+ Sub Question +

+ 		+

+ Yes (Weight: 0.01) +

+ 		+

+ No (Weight: -0.01) +

+ 		+

+ Total +

+ 		+

+ Average +

+
+ Team 1 + + + '" + + Benny Charles + + a) This student has done a good job. + + 1 + + 0 + + 0.01 + + 0.01 +
+ Team 1 + + + '" + + Benny Charles + + b) This student has tried his/her best. + + 1 + + 0 + + 0.01 + + 0.01 +
+

+
+
+
+ +
+
+

+ Your own response +

+
+
+
+

+ Question 1: + + Recipient: None. See responses: students, instructor.   + + + [more] + +
+ + + +

+
+
+
+ + Response Summary (of visible responses) + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + +
+ +

+ Yes +

+ 		+

+ No +

+
+

+ a) You have done a good job. +

+ 		+ 67% (2) + + 33% (1) +
+

+ b) You have tried your best. +

+ 		+ 33% (1) + + 67% (2) +
+
+
+
+
+
+ + To: + + - +
+ + + + + + + + + + + + + + + + + + + + + +
+ + + From: + + + You +
+ + - - - - - - - - + + - - + + - - + + +
-

- Team -

- 		-

- Recipient Name -

- 		-

- Sub Question -

- 		-

- Yes (Weight: 2) -

- 		-

- No (Weight: 0) -

+ Criteria 		-

- Total -

+ 		+ Yes -

- Average -

+ 		+ No
+ You have done a good job. - Team 1 - + + + - '" +
- a) This student has done a good job. + You have tried your best. - 1 + + + - 0 +
+
+ + + From: + + + Anonymous student +
+ + + + + + + + + + - + - - + + +
+ Criteria + + Yes + + No +
- 2.00 + You have done a good job. - 2.00 + + + +
+ You have tried your best. - Team 1 - + - '" + + +
+
+ + + From: + + + Anonymous student +
+ + + + + + + + + + - - + + - + + +
+ Criteria + + Yes + + No +
- b) This student has tried his/her best. + You have done a good job. - 0 + - 1 + + +
- 0.00 + You have tried your best. - 0.00 + + + +
+
+
+
+
+
+
+
+

+ Question 2: + + Recipient: OWN_TEAM_MEMBERS_INCLUDING_SELF. See responses: recipients, instructor.  + + + [more] + +
+ + + +

+
+
+
+ + Response Summary (of received responses) + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
+ +

+ Yes + + (Weight: 1.01) + +

+ 		+

+ No + + (Weight: -0.99) + +

+ 		+

+ Average +

+
+

+ a) This student has done a good job. +

+ 		+ 50% (1) + + 50% (1) + + 0.01 +
+

+ b) This student has tried his/her best. +

+ 		+ 50% (1) + + 50% (1) + + 0.01 +
+
+
+
+ + Per Recipient Statistics + + '"'" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

+ Team +

+ 		+

+ Recipient Name +

+ 		+

+ Sub Question +

+ 		+

+ Yes (Weight: 1.01) +

+ 		+

+ No (Weight: -0.99) +

+ 		+

+ Total +

+ 		+

+ Average +

+
+ Team 1 + + + '" + + Alice Betsy + + a) This student has done a good job. + + 1 + + 1 + + 0.02 + + 0.01 +
+ Team 1 + + + '" + + Alice Betsy + + b) This student has tried his/her best. + + 1 + + 1 + + 0.02 + + 0.01 +
+ Team 1 + + + '" + + Benny Charles + + a) This student has done a good job. + + 1 + + 0 + + 1.01 + + 1.01 +
+ Team 1 + + + '" + + Benny Charles + + b) This student has tried his/her best. + + 1 + + 0 + + 1.01 + + 1.01 +
+
+
+
+
+
+ + To: + + You +
+ + + + + + + + + + + + + +
+ + + From: + + + You +
+ + + + + + + + + - - - - + + - - + +
+ Criteria + + Yes + + No +
+ This student has done a good job. - Team 2 - - - '" - - a) This student has done a good job. + + + - 1 +
- 0 + This student has tried his/her best. - 2.00 + + + - 2.00 +
+
+ + + From: + + + Anonymous student +
+ + + + + + + + + - - - - + + - - - -
+ Criteria + + Yes + + No +
+ This student has done a good job. - Team 2 - - - '" - - b) This student has tried his/her best. + - 1 + + +
- 0 + This student has tried his/her best. - 2.00 + - 2.00 + + +
- - +
+ + + +
-
+
To: - Your Team (Team 1</option><option value="dump"></td><td>'") + Benny Charles
- - + - - - +
+
From: - Anonymous student -
- - - - - - - - - - - - + + + - + + + + +
- Criteria - - Yes - - No -
- This student has done a good job. - + You +
+ + + + + + + + + + + + - - - - - - + + + + + - - -
+ Criteria + + Yes + + No +
+ This student has done a good job. + - -
- This student has tried his/her best. - - + +
+ This student has tried his/her best. + -
-
+
+
-
+
+
+
+
+
+

+ Question 3: + + Recipient: TEAMS. See responses: recipients, instructor.  + + + [more] + +
+ + + +

+
+
+
+ + Response Summary (of received responses) + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
+ +

+ Yes + + (Weight: 2) + +

+ 		+

+ No + + (Weight: 0) + +

+ 		+

+ Average +

+
+

+ a) This student has done a good job. +

+ 		+ 100% (1) + + 0% (0) + + 2.00 +
+

+ b) This student has tried his/her best. +

+ 		+ 0% (0) + + 100% (1) + + 0.00 +
+
+
+
+ + Per Recipient Statistics + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

+ Team +

+ 		+

+ Recipient Name +

+ 		+

+ Sub Question +

+ 		+

+ Yes (Weight: 2) +

+ 		+

+ No (Weight: 0) +

+ 		+

+ Total +

+ 		+

+ Average +

+
+ + Team 1 + + + '" + + a) This student has done a good job. + + 1 + + 0 + + 2.00 + + 2.00 +
+ + Team 1 + + + '" + + b) This student has tried his/her best. + + 0 + + 1 + + 0.00 + + 0.00 +
+ + Team 2 + + + '" + + a) This student has done a good job. + + 1 + + 0 + + 2.00 + + 2.00 +
+ + Team 2 + + + '" + + b) This student has tried his/her best. + + 1 + + 0 + + 2.00 + + 2.00 +
+
+
+
+
To: @@ -1095,59 +1915,59 @@

- - + - - - +
+
From: - You -
- - - - - - - - - - - - + + + - + + + + +
- Criteria - - Yes - - No -
- This student has done a good job. - + You +
+ + + + + + + + + + + + - - - - - + + + + + - - - -
+ Criteria + + Yes + + No +
+ This student has done a good job. + - -
- This student has tried his/her best. - + +
+ This student has tried his/her best. + - -
-
+
+
@@ -1189,65 +2009,65 @@

- - - + + - + - - +

+ + + - - - - - - - - - - - - + + + + + + + + + + + +
- -

- Yes - +

+ +

+ Yes + (Weight: 0.01) -

- 		-

- No - +

+ 		+

+ No + (Weight: -0.01) -

- 		-

- Average -

-
+

+ Average +

+
-

- a) This student has done a good job. -

- 		- - (0) - - - (0) - - - -
-

- b) This student has tried his/her best. -

- 		- - (0) - - - (0) - - - -
+

+ a) This student has done a good job. +

+ 		+ - (0) + + - (0) + + - +
+

+ b) This student has tried his/her best. +

+ 		+ - (0) + + - (0) + + - +
@@ -1258,107 +2078,107 @@

- - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +
-

- Team -

- 		-

- Recipient Name -

- 		-

- Sub Question -

- 		-

- Yes (Weight: 0.01) -

- 		-

- No (Weight: -0.01) -

- 		-

- Total -

- 		-

- Average -

-
+

+ Team +

+ 		+

+ Recipient Name +

+ 		+

+ Sub Question +

+ 		+

+ Yes (Weight: 0.01) +

+ 		+

+ No (Weight: -0.01) +

+ 		+

+ Total +

+ 		+

+ Average +

+
- Team 1 - - - '" - - Benny Charles - - a) This student has done a good job. - - 1 - - 0 - - 0.01 - - 0.01 -
- Team 1 - - - '" - - Benny Charles - - b) This student has tried his/her best. - - 1 - - 0 - - 0.01 - - 0.01 -
+ Team 1 + + + '" + + Benny Charles + + a) This student has done a good job. + + 1 + + 0 + + 0.01 + + 0.01 +
+ Team 1 + + + '" + + Benny Charles + + b) This student has tried his/her best. + + 1 + + 0 + + 0.01 + + 0.01 +

-
+
To: @@ -1367,59 +2187,59 @@

- - + - - - +
+
From: - You -
- - - - - - - - - - - - + + + - + + + + +
- Criteria - - Yes - - No -
- This student has done a good job. - + You +
+ + + + + + + + + + + + - - - - - + + + + + - - - -
+ Criteria + + Yes + + No +
+ This student has done a good job. + - -
- This student has tried his/her best. - + +
+ This student has tried his/her best. + - -
-
+
+
diff --git a/src/test/resources/pages/studentFeedbackResultsPageCONSTSUM.html b/src/test/resources/pages/studentFeedbackResultsPageCONSTSUM.html index aa65bbc6a61..d39bec98077 100644 --- a/src/test/resources/pages/studentFeedbackResultsPageCONSTSUM.html +++ b/src/test/resources/pages/studentFeedbackResultsPageCONSTSUM.html @@ -88,40 +88,6 @@

-
-
- - To: - - You -
- - - - - - - - - -
- - - From: - - - You -
-
    -
  • - Grades: 20 -
    • -
  • - Fun: 80 -
    • -
-
-

@@ -144,84 +110,147 @@

-
+
+ +
+
+
+

+ Question 3: + + Split points among your team members by how much they contributed.  + + + [more] + +
+ + + +

+
To: - Benny Charles + You
- - + - - - - + Benny Charles + + + + +
+
From: - You -
- 80 -
+ 99 +
-
+
To: - Charlie Davis + Benny Charles
- - + - - - - + Benny Charles + + + + +
+
From: - You -
- 120 -
+ 101 +
-
+
+
+
+
+

+ Your own response +

+
+
+
+

+ Question 1: + + How important are the following factors to you? Give points accordingly.  + + + [more] + +
+ + + +

+
To: - Danny Engrid + You
- - + - - - - + You + + + + +
+
From: - You -
- 100 -
+
    +
  • + Grades: 20 +
    • +
  • + Fun: 80 +
    • +
+
@@ -231,15 +260,15 @@

- Question 3: + Question 2: - Split points among your team members by how much they contributed.  + Split points among 3 students.  - + [more]
-

- - - + + - + - - - - + + + + - + - + + + +
- - My view: - - +
+ + My view: + + of me: - + E +10% - + of others: - + E -
- - Team's view: - - +
+ + Team's view: + + of me: - + N/A - + of others: - + E -
+
+

+
+
+
+

+ Your own response +

+
+
+
+

+ Question 1: + + Rate the contribution by yourself and your team members.  + + + [more] + +
+ + + +

+
+
+ Comparison of work distribution   + + + [how to interpret, etc..] + +
+ + +
+ + + + + + + + + + + +
+ + My view: + + + + + of me: + + + + E +10% + + + + + of others: + + + + E + +
+ + Team's view: + + + + + of me: + + + + N/A + + + + + of others: + + + + E + +
diff --git a/src/test/resources/pages/studentFeedbackResultsPageEmpty.html b/src/test/resources/pages/studentFeedbackResultsPageEmpty.html index e8cbf3db38c..7a5cb674b1b 100644 --- a/src/test/resources/pages/studentFeedbackResultsPageEmpty.html +++ b/src/test/resources/pages/studentFeedbackResultsPageEmpty.html @@ -1,14 +1,14 @@ - - Feedback Results - - - - - - - + + Feedback Results + + + + + + +
diff --git a/src/test/resources/pages/studentFeedbackResultsPageMCQ.html b/src/test/resources/pages/studentFeedbackResultsPageMCQ.html index 8a852ce8d63..f05a7d166d7 100644 --- a/src/test/resources/pages/studentFeedbackResultsPageMCQ.html +++ b/src/test/resources/pages/studentFeedbackResultsPageMCQ.html @@ -87,33 +87,6 @@

-
-
- - To: - - You -
- - - - - - - - - -
- - - From: - - - You -
- Algo -
-

@@ -145,143 +118,220 @@

-
+
To: - Benny Charles + Anonymous student
- - + - - - - + Anonymous student + + + + +
+
From: - You -
- Good -
+ Good +
-
+
To: - Danny Engrid + Anonymous student
- - + - - - - + Anonymous student + + + + +
+
From: - You -
- OK -
+ Good +
+
+
+
+
+
+

+ Question 3: + + Give feedback to your team mates  + + + [more] + +
+ + + +

To: - Anonymous student + You
- - + - - - - + Benny Charles + + + + +
+
From: - Anonymous student -
- Good -
+ Can improve +
+
+
+
+
+
+

+ Question 4: + + Choose the best student in the course.  + + + [more] + +
+ + + +

+
+
+
+
+
+

+ Question 5: + + Choose the best team in the course.  + + + [more] + +
+ + + +

To: - Anonymous student + You
- - + - - - - + Benny Charles + + + + +
+
From: - Anonymous student -
- Good -
+ Team 1 +

+
+

+ Your own response +

+

- Question 3: + Question 1: - Give feedback to your team mates  + What is the best selling point of your product?  - + [more]
-

-
+
To: @@ -290,21 +340,21 @@

- - + - - - - + You + + + + +
+
From: - Benny Charles -
- Can improve -
+ Algo +
@@ -314,23 +364,59 @@

- Question 4: + Question 2: - Choose the best student in the course.  + Rate 3 other students' products  - + [more]
-

-
+
+
+ + To: + + Benny Charles +
+ + + + + + + + + +
+ + + From: + + + You +
+ Good +
+
+
To: @@ -339,21 +425,21 @@

- - + - - - - + You + + + + +
+
From: - You -
- Danny -
+ OK +
@@ -363,50 +449,100 @@

- Question 5: + Question 3: - Choose the best team in the course.  + Give feedback to your team mates  - + [more]
- + +

+
+
+
+
+
+

+ Question 4: + + Choose the best student in the course.  + + + [more] + +
+

-
+
To: - You + Danny Engrid
- - + - - - - + You + + + + +
+
From: - Benny Charles -
- Team 1 -
+ Danny +

+
+
+

+ Question 5: + + Choose the best team in the course.  + + + [more] + +
+ + + +

+
+
+
diff --git a/src/test/resources/pages/studentFeedbackResultsPageMSQ.html b/src/test/resources/pages/studentFeedbackResultsPageMSQ.html index 74d2ffa25df..a6162f55a27 100644 --- a/src/test/resources/pages/studentFeedbackResultsPageMSQ.html +++ b/src/test/resources/pages/studentFeedbackResultsPageMSQ.html @@ -87,7 +87,66 @@

-
+
+
+
+
+
+

+ Question 2: + + Rate 3 other students' products  + + + [more] + +
+ + + +

+
+
+
+
+
+

+ Question 3: + + Give feedback to your team mates  + + + [more] + +
+ + + +

+
To: @@ -96,25 +155,167 @@

- - + - - - - + Benny Charles + + + + + + +
+
From: - You -
-
    -
  • - Algo -
    • -
-
+
    +
  • + Can improve +
    • +
+
+
+
+
+
+
+
+

+ Question 4: + + Choose the students you were impressed by in the course.  + + + [more] + +
+ + + +

+
+
+
+
+
+

+ Question 5: + + Choose the teams you were impressed by in the course.  + + + [more] + +
+ + + +

+
+
+ + To: + + You +
+ + + + + + + + + +
+ + + From: + + + Benny Charles +
+
    +
  • + Team 1 +
    • +
  • + Team 2 +
    • +
+
+
+
+
+
+
+

+ Your own response +

+
+
+
+

+ Question 1: + + What is the best selling point of your product?  + + + [more] + +
+ + + +

+
+
+ + To: + + You +
+ + + + + + + +
+ + + From: + + + You +
+
    +
  • + Algo +
    • +
+
@@ -149,7 +350,7 @@

-
+
To: @@ -158,32 +359,32 @@

- - + - - - - + You + + + + +
+
From: - You -
-
    -
  • - Good -
    • -
  • - OK -
    • -
-
+
    +
  • + Good +
    • +
  • + OK +
    • +
+
-
+
To: @@ -192,28 +393,28 @@

- - + - - - - + You + + + + +
+
From: - You -
-
    -
  • - OK -
    • -
  • - Poor -
    • -
-
+
    +
  • + OK +
    • +
  • + Poor +
    • +
+
@@ -245,37 +446,6 @@

-
-
- - To: - - You -
- - - - - - - - - -
- - - From: - - - Benny Charles -
-
    -
  • - Can improve -
    • -
-
-

@@ -298,7 +468,7 @@

-
+
To: @@ -307,28 +477,28 @@

- - + - - - - + You + + + + +
+
From: - You -
-
    -
  • - Danny -
    • -
  • - Alice -
    • -
-
+
    +
  • + Danny +
    • +
  • + Alice +
    • +
+
@@ -354,40 +524,6 @@

-
-
- - To: - - You -
- - - - - - - - - -
- - - From: - - - Benny Charles -
-
    -
  • - Team 1 -
    • -
  • - Team 2 -
    • -
-
-

diff --git a/src/test/resources/pages/studentFeedbackResultsPageNUMSCALE.html b/src/test/resources/pages/studentFeedbackResultsPageNUMSCALE.html index a0c40e38912..717275637de 100644 --- a/src/test/resources/pages/studentFeedbackResultsPageNUMSCALE.html +++ b/src/test/resources/pages/studentFeedbackResultsPageNUMSCALE.html @@ -81,7 +81,997 @@

-
+
+
+
+
+
+

+ Question 2: + + Rate others' product?  + + + [more] + +
+ + + +

+
+
+
+
+
+

+ Question 3: + + Rate your team's product?  + + + [more] + +
+ + + +

+
+
+
+ + Summary of responses received by you + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + +
+ Team + + + + Recipient + + + + + Average + + + + + + Max + + + + + + Min + + + + + + Average excluding self response + + + +
+ Team 1</td></div>'" + + You + + 2.25 + + 2.5 + + 2 + + 2.25 +
+
+
+
+
+
+ + To: + + You +
+ + + + + + + + + + + + + + + +
+ + + From: + + + Benny Charles +
+ 2.5 +
+ + + From: + + + Danny Engrid +
+ 2 +
+
+
+
+
+
+
+

+ Question 4: + + Rate the class  + + + [more] + +
+ + + +

+
+
+
+ + Response Summary + +
+
+
+
+ + + + + + + + + + + + + + + + + + + +
+ Team + + + + Recipient + + + + + Average + + + + + + Max + + + + + + Min + + + +
+ - + + General + + 0.25 + + 2.5 + + -2 +
+
+
+
+
+
+
+
+
+

+ Question 5: + + Rate other team's products  + + + [more] + +
+ + + +

+
+
+
+ + Summary of responses received by your team + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + +
+ Team + + + + Recipient + + + + + Average + + + + + + Max + + + + + + Min + + + + + + Average excluding self response + + + +
+ + Your Team (Team 1</td></div>'") + + 3.75 + + 4 + + 3.5 + + 3.75 +
+
+
+
+
+
+ + To: + + Your Team (Team 1</td></div>'") +
+ + + + + + + + + + + + + + + +
+ + + From: + + + Team 2 +
+ 3.5 +
+ + + From: + + + Team 3 +
+ 4 +
+
+
+
+
+
+
+

+ Question 6: + + Rate other team's products. Responses are visible to the entire class  + + + [more] + +
+ + + +

+
+
+
+ + Response Summary + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Team + + + + Recipient + + + + + Average + + + + + + Max + + + + + + Min + + + + + + Average excluding self response + + + +
+ + Your Team (Team 1</td></div>'") + + 4 + + 4.5 + + 3.5 + + 4 +
+ + Team 2 + + 4.25 + + 5 + + 3.5 + + 4.25 +
+
+
+
+
+
+ + To: + + Your Team (Team 1</td></div>'") +
+ + + + + + + + + + + + + + + +
+ + + From: + + + Team 2 +
+ 3.5 +
+ + + From: + + + Team 2 +
+ 4.5 +
+
+
+
+ + To: + + Team 2 +
+ + + + + + + + + + + + + + + +
+ + + From: + + + Your Team (Team 1</td></div>'") +
+ 3.5 +
+ + + From: + + + Your Team (Team 1</td></div>'") +
+ 5 +
+
+
+
+
+
+
+

+ Question 7: + + Rate your team member's individual products, including your own  + + + [more] + +
+ + + +

+
+
+
+ + Summary of responses received by you + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + +
+ Team + + + + Recipient + + + + + Average + + + + + + Max + + + + + + Min + + + + + + Average excluding self response + + + +
+ Team 1</td></div>'" + + You + + 3.25 + + 3.5 + + 3 + + 3 +
+
+
+
+
+
+
+
+
+

+ Question 8: + + Rate every student's individual products. Responses are visible to the entire class  + + + [more] + +
+ + + +

+
+
+
+ + Response Summary + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Team + + + + Recipient + + + + + Average + + + + + + Max + + + + + + Min + + + + + + Average excluding self response + + + +
+ Team 2 + + Charlie Davis + + 2.75 + + 4.5 + + 1 + + 2.75 +
+ Team 1</td></div>'" + + Benny Charles + + 2.75 + + 4 + + 1.5 + + 2.75 +
+
+
+
+
+
+
+
+
+

+ Question 9: + + Rate other teams' products. Responses, but not giver or recipient names, are visible to the entire class  + + + [more] + +
+ + + +

+
+
+ + To: + + Anonymous team +
+ + + + + + + + + +
+ + + From: + + + Anonymous student +
+ 2 +
+
+
+
+ + To: + + Anonymous team +
+ + + + + + + + + +
+ + + From: + + + Anonymous student +
+ 3 +
+
+
+
+
+
+
+

+ Question 10: + + Rate teammates, recipient hidden.   + + + [more] + +
+ + + +

+
+
+ + To: + + Anonymous student +
+ + + + + + + + + + + + + + + +
+ + + From: + + + Charlie Davis +
+ 2 +
+ + + From: + + + Emily +
+ 1 +
+
+
+
+
+
+

+ Your own response +

+
+
+
+

+ Question 1: + + Rate your product?  + + + [more] + +
+ + + +

+
To: @@ -90,21 +1080,21 @@

- - + - - - - + You + + + + +
+
From: - You -
- 1 -
+ 1 +
@@ -130,7 +1120,7 @@

-
+
To: @@ -139,25 +1129,25 @@

- - + - - - - + You + + + + +
+
From: - You -
- 5 -
+ 5 +
-
+
To: @@ -166,21 +1156,21 @@

- - + - - - - + You + + + + +
+
From: - You -
- 3.5 -
+ 3.5 +
@@ -218,115 +1208,73 @@

- - - - + + + - + - + - + - + + - - - - - - - - + + + + + + + +
- Team - - - - Recipient - - - +
+ Team + + + + Recipient + + + Average - + - + Max - + - + Min - + - + Average excluding self response - + -
- Team 1</td></div>'" - - You - - 2.25 - - 2.5 - - 2 - - 2.25 -
+ Team 1</td></div>'" + + You + + 2.25 + + 2.5 + + 2 + + 2.25 +

-
-
- - To: - - You -
- - - - - - - - - - - - - - - -
- - - From: - - - Benny Charles -
- 2.5 -
- - - From: - - - Danny Engrid -
- 2 -
-

@@ -361,64 +1309,64 @@

- - - - + + + - + - + - + + - - - - - - - + + + + + + +
- Team - - - - Recipient - - - +
+ Team + + + + Recipient + + + Average - + - + Max - + - + Min - + -
- - - - General - - 0.25 - - 2.5 - - -2 -
+ - + + General + + 0.25 + + 2.5 + + -2 +

-
+
To: @@ -427,36 +1375,36 @@

- - + - - - - - - + + + + + + - - - - + Anonymous student + + + + +
+
From: - You -
- 2.5 -
+ You +
+ 2.5 +
From: - Anonymous student -
- -2 -
+ -2 +
@@ -494,114 +1442,72 @@

- - - - + + + - + - + - + - + + - - - - - - - - + + + + + + + +
- Team - - - - Recipient - - - +
+ Team + + + + Recipient + + + Average - + - + Max - + - + Min - + - + Average excluding self response - + -
- - Your Team (Team 1</td></div>'") - - 3.75 - - 4 - - 3.5 - - 3.75 -
+ + Your Team (Team 1</td></div>'") + + 3.75 + + 4 + + 3.5 + + 3.75 +

-
-
- - To: - - Your Team (Team 1</td></div>'") -
- - - - - - - - - - - - - - - -
- - - From: - - - Team 2 -
- 3.5 -
- - - From: - - - Team 3 -
- 4 -
-

@@ -636,175 +1542,91 @@

- - - - + + + - + - + - + - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +
- Team - - - - Recipient - - - +
+ Team + + + + Recipient + + + Average - + - + Max - + - + Min - + - + Average excluding self response - + -
- - Your Team (Team 1</td></div>'") - - 4 - - 4.5 - - 3.5 - - 4 -
- - Team 2 - - 4.25 - - 5 - - 3.5 - - 4.25 -
+ + Your Team (Team 1</td></div>'") + + 4 + + 4.5 + + 3.5 + + 4 +
+ + Team 2 + + 4.25 + + 5 + + 3.5 + + 4.25 +

-
-
- - To: - - Your Team (Team 1</td></div>'") -
- - - - - - - - - - - - - - - -
- - - From: - - - Team 2 -
- 3.5 -
- - - From: - - - Team 2 -
- 4.5 -
-
-
-
- - To: - - Team 2 -
- - - - - - - - - - - - - - - -
- - - From: - - - Your Team (Team 1</td></div>'") -
- 3.5 -
- - - From: - - - Your Team (Team 1</td></div>'") -
- 5 -
-

@@ -839,74 +1661,74 @@

- - - - + + + - + - + - + - + + - - - - - - - - + + + + + + + +
- Team - - - - Recipient - - - +
+ Team + + + + Recipient + + + Average - + - + Max - + - + Min - + - + Average excluding self response - + -
- Team 1</td></div>'" - - You - - 3.25 - - 3.5 - - 3 - - 3 -
+ Team 1</td></div>'" + + You + + 3.25 + + 3.5 + + 3 + + 3 +
-
+
To: @@ -915,40 +1737,40 @@

- - + - - - - - - + + + + + + - - - - + Benny Charles + + + + +
+
From: - You -
- 3.5 -
+ You +
+ 3.5 +
From: - Benny Charles -
- 3 -
+ 3 +
-
+
To: @@ -957,21 +1779,21 @@

- - + - - - - + You + + + + +
+
From: - You -
- 5 -
+ 5 +
@@ -1009,94 +1831,94 @@

- - - - + + + - + - + - + - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +
- Team - - - - Recipient - - - +
+ Team + + + + Recipient + + + Average - + - + Max - + - + Min - + - + Average excluding self response - + -
- Team 2 - - Charlie Davis - - 2.75 - - 4.5 - - 1 - - 2.75 -
- Team 1</td></div>'" - - Benny Charles - - 2.75 - - 4 - - 1.5 - - 2.75 -
+ Team 2 + + Charlie Davis + + 2.75 + + 4.5 + + 1 + + 2.75 +
+ Team 1</td></div>'" + + Benny Charles + + 2.75 + + 4 + + 1.5 + + 2.75 +

-
+
To: @@ -1105,40 +1927,40 @@

- - + - - - - - - + + + + + + - - - - + Anonymous student + + + + +
+
From: - You -
- 4 -
+ You +
+ 4 +
From: - Anonymous student -
- 1.5 -
+ 1.5 +
-
+
To: @@ -1147,36 +1969,36 @@

- - + - - - - - - + + + + + + - - - - + Anonymous student + + + + +
+
From: - You -
- 4.5 -
+ You +
+ 4.5 +
From: - Anonymous student -
- 1 -
+ 1 +
@@ -1202,7 +2024,7 @@

-
+
To: @@ -1211,75 +2033,21 @@

- - - - - - - -
- - - From: - - - You -
- 5 -
-
-
-
- - To: - - Anonymous team -
- - - - - - - - - -
- - - From: - - - Anonymous student -
- 2 -
-
-
-
- - To: - - Anonymous team -
- - - - + - - - - + You + + + + +
+
From: - Anonymous student -
- 3 -
+ 5 +
@@ -1305,7 +2073,7 @@

-
+
To: @@ -1314,63 +2082,21 @@

- - - - - - - -
- - - From: - - - You -
- 4.5 -
-
-
-
- - To: - - Anonymous student -
- - - - - - - - - - + - - - - + You + + + + +
- - - From: - - - Charlie Davis -
- 2 -
+
From: - Emily -
- 1 -
+ 4.5 +
diff --git a/src/test/resources/pages/studentFeedbackResultsPageNewlyRegistered.html b/src/test/resources/pages/studentFeedbackResultsPageNewlyRegistered.html index e2649bb0532..f1e2065a20d 100644 --- a/src/test/resources/pages/studentFeedbackResultsPageNewlyRegistered.html +++ b/src/test/resources/pages/studentFeedbackResultsPageNewlyRegistered.html @@ -82,55 +82,55 @@

- - + - - - - - - + + + + + + - + +
+ Instructor second comment to Alice +
+ + + +
+
From: - Anonymous student -
- Alice self feedback. -
-
    -
  • -
    -
    + Anonymous student +
+ Alice self feedback. +
+
    +
  • +
    +
    From: Teammates Test [Mon, 02 Mar 2026, 07:59 AM UTC+0800] (last edited by Teammates Test at Tue, 03 Mar 2026, 07:59 AM UTC+0800) -
    -
    -
    -
    - Instructor first comment to Alice +
    -
    • -
  • -
    -
    +
    +
    + Instructor first comment to Alice +
    +
    • +
  • +
    +
    From: Teammates Test [Tue, 03 Mar 2026, 07:59 AM UTC+0800] -
    -
    -
    -
    - Instructor second comment to Alice +
    -
    • -
-
@@ -145,111 +145,122 @@

Rate 3 other students' products

-
+
To: - Alice Betsy</option></td></div>'" + You
- - + - - - - + Anonymous student + + + + +
+
From: - You -
- Response to Alice from Dropout. -
+ Response to Dropout. +
-
+
To: - Benny Charles + Anonymous student
- - + - - - - + Anonymous student + + + + +
+
From: - You -
- Response to Benny from Dropout. -
+ Response to Benny. +
-
+
To: - Danny Engrid + Anonymous student
- - + - - - - + Anonymous student + + + + +
+
From: - You -
- Response to Danny from Dropout. -
+ Response to Danny. +
+
+
+
+
+
+

+ Question 3: + + Give feedback to 3 other teams. + +

To: - You + Team 1</td></div>'"
- - + - - - - + Your Team (Team 2) + + + + +
+
From: - Anonymous student -
- Response to Dropout. -
+ Team 2 (danny) to team 1 +
@@ -258,121 +269,148 @@

To: - Anonymous student + Your Team (Team 2)

- - + - - - - + Team 1</td></div>'" + + + + +
+
From: - Anonymous student -
- Response to Benny. -
+ alice to team 2 +
-
+
+
+
+
+

+ Your own response +

+
+
+
+

+ Question 1: + + What is the best selling point of your product? + +

+
+
+
+
+
+

+ Question 2: + + Rate 3 other students' products + +

+
To: - Anonymous student + Alice Betsy</option></td></div>'"
- - + - - - - + You + + + + +
+
From: - Anonymous student -
- Response to Danny. -
+ Response to Alice from Dropout. +
-
-
-
-
-
-

- Question 3: - - Give feedback to 3 other teams. - -

-
+
To: - Team 1</td></div>'" + Benny Charles
- - + - - - - + You + + + + +
+
From: - Your Team (Team 2) -
- Team 2 (danny) to team 1 -
+ Response to Benny from Dropout. +
-
+
To: - Your Team (Team 2) + Danny Engrid
- - + - - - - + You + + + + +
+
From: - Team 1</td></div>'" -
- alice to team 2 -
+ Response to Danny from Dropout. +

+
+
+

+ Question 3: + + Give feedback to 3 other teams. + +

+
+
+
diff --git a/src/test/resources/pages/studentFeedbackResultsPageOpen.html b/src/test/resources/pages/studentFeedbackResultsPageOpen.html index 36e05ea9e91..af540ad5035 100644 --- a/src/test/resources/pages/studentFeedbackResultsPageOpen.html +++ b/src/test/resources/pages/studentFeedbackResultsPageOpen.html @@ -70,67 +70,6 @@

What is the best selling point of your product?

-
-
- - To: - - You -
- - - - - - - - - - - - -
- - - From: - - - You -
- Alice self feedback. -
-
    -
  • -
    -
    - - From: Teammates Test [Mon, 02 Mar 2026, 07:59 AM UTC+0800] (last edited by Teammates Test at Tue, 03 Mar 2026, 07:59 AM UTC+0800) - -
    -
    -
    -
    -
    - Instructor first comment to Alice -
    -
    • -
  • -
    -
    - - From: Teammates Test [Tue, 03 Mar 2026, 07:59 AM UTC+0800] - -
    -
    -
    -
    -
    - Instructor second comment to Alice -
    -
    • -
-
-

@@ -151,129 +90,166 @@

- - + - - - - + Anonymous student + + + + +
+
From: - Anonymous student -
- Response to Alice from Dropout. -
+ Response to Alice from Dropout. +
-
+
To: - Benny Charles + Anonymous student
- - + - - - - + Anonymous student + + + + +
+
From: - You -
- Response to Benny. -
+ Response to Benny from Dropout. +
-
+
To: - Danny Engrid + Anonymous student
- - + - - - - + Anonymous student + + + + +
+
From: - You -
- Response to Danny. -
+ Response to Danny from Dropout. +
-
+
+
+
+
+
+

+ Question 3: + + Feedback to class + +

+
To: - Drop out + -
- - + - - - - + Anonymous student + + + + +
+
From: - You -
- Response to Dropout. -
+ Secret feedback about class. (to nobody test) +
+
+
+
+
+
+

+ Question 4: + + Give feedback to 3 other teams. + +

To: - Anonymous student + Your Team (Team 1</td></div>'")
- - + - - - - + Team 2 + + + + + + + + + + +
+
From: - Anonymous student -
- Response to Benny from Dropout. -
+ Team 2 (danny) to team 1 +
+ + + From: + + + Team 3 +
+ Team 3 to Team 1 multiline special char test +
@@ -282,25 +258,25 @@

To: - Anonymous student + Team 2

- - + - - - - + Your Team (Team 1</td></div>'") + + + + +
+
From: - Anonymous student -
- Response to Danny from Dropout. -
+ alice to team 2 +
@@ -310,9 +286,9 @@

- Question 3: + Question 5: - Feedback to class + Give feedback to your team mates

@@ -320,25 +296,25 @@

To: - - + You

- - + - - - - + Benny Charles + + + + +
+
From: - Anonymous student -
- Secret feedback about class. (to nobody test) -
+ Teammate feedback from benny +
@@ -348,121 +324,216 @@

- Question 4: + Question 6: - Give feedback to 3 other teams. + Give feedback on how well the team worked together.

-
+
+
+
+
+

+ Your own response +

+
+
+
+

+ Question 1: + + What is the best selling point of your product? + +

+
To: - Your Team (Team 1</td></div>'") + You
- - + - - - - - - + + + + + + + + +
+
From: - Team 2 -
- Team 2 (danny) to team 1 -
+ You +
+ Alice self feedback. +
+
    +
  • +
    +
    + + From: Teammates Test [Mon, 02 Mar 2026, 07:59 AM UTC+0800] (last edited by Teammates Test at Tue, 03 Mar 2026, 07:59 AM UTC+0800) + +
    +
    +
    +
    +
    + Instructor first comment to Alice +
    +
    • +
  • +
    +
    + + From: Teammates Test [Tue, 03 Mar 2026, 07:59 AM UTC+0800] + +
    +
    +
    +
    +
    + Instructor second comment to Alice +
    +
    • +
+
+
+
+
+
+
+
+

+ Question 2: + + Rate 3 other students' products + +

+
+
+ + To: + + Benny Charles +
+ + + + - - - - + You + + + + +
From: - Team 3 -
- Team 3 to Team 1 multiline special char test -
+ Response to Benny. +
-
+
To: - Team 2 + Danny Engrid
- - + - - - - + You + + + + +
+
From: - Your Team (Team 1</td></div>'") -
- alice to team 2 -
+ Response to Danny. +
-
-
-
-
-
-

- Question 5: - - Give feedback to your team mates - -

-
+
To: - You + Drop out
- - + - - - - + You + + + + +
+
From: - Benny Charles -
- Teammate feedback from benny -
+ Response to Dropout. +

+
+
+

+ Question 3: + + Feedback to class + +

+
+
+
+
+
+

+ Question 4: + + Give feedback to 3 other teams. + +

+
+
+
+
+
+

+ Question 5: + + Give feedback to your team mates + +

+
+
+

@@ -471,7 +542,7 @@

Give feedback on how well the team worked together.

-
+
To: @@ -480,21 +551,21 @@

- - + - - - - + You + + + + +
+
From: - You -
- Feedback from alice to the team -
+ Feedback from alice to the team +
diff --git a/src/test/resources/pages/studentFeedbackResultsPageRank.html b/src/test/resources/pages/studentFeedbackResultsPageRank.html index e52607c95a4..85e89194460 100644 --- a/src/test/resources/pages/studentFeedbackResultsPageRank.html +++ b/src/test/resources/pages/studentFeedbackResultsPageRank.html @@ -93,46 +93,6 @@

-
-
- - To: - - Teammates Helper who can only see section 1 -
- - - - - - - - - -
- - - From: - - - You -
-
    -
  • - 1: Approachability -
    • -
  • - 3: Timeliness -
    • -
  • - 3: Level of detail -
    • -
  • - 4: Effort -
    • -
-
-

@@ -154,57 +114,78 @@

-
+
+
+
+
+
+

+ Question 3: + + Rank you and your team members, own team members can see the responses but not recipient name  + + + [more] + +
+ + + +

+
To: - Teammates Helper who can only see section 1 + Anonymous student
- - + - - - - + Benny Charles + + + + +
+
From: - You -
- 1 -
+ 1 +
-
+
To: - Teammates Test + Anonymous student
- - + - - - - + Benny Charles + + + + +
+
From: - You -
- 2 -
+ 1 +
@@ -214,22 +195,22 @@

- Question 3: + Question 4: - Rank you and your team members, own team members can see the responses but not recipient name  + Rank up to 7 students in the course. All students can see the responses, but not the giver's name.  - + [more]
-

-
+
To: @@ -238,132 +219,331 @@

- - - - - - - - + - - - - - - - - - - + Charlie Davis + + + + +
- - - From: - - - You -
- 1 -
+
From: - Benny Charles -
- 2 -
- - - From: - - - Charlie Davis -
- 2 -
+ 2 +
-
+
+
+
+
+
+

+ Question 5: + + Rank the other teams, you can give the same rank multiple times.  + + + [more] + +
+ + + +

+
To: - Charlie Davis + Your Team (Team 1</option><option value="dump"></td><td>'")
- - + - - - - + Charlie Davis + + + + + + + + + + +
+
From: - You -
- 2 -
+ 2 +
+ + + From: + + + Emily F. +
+ 1 +
+
+
+
+
+
+

+ Question 6: + + As a student, rank the areas of improvement you think you should make progress on.   + + + [more] + +
+ + + +

+
+
+
+
+
+

+ Question 7: + + As an instructor, rank for the 4 students you are mentoring, their areas of their reports that were good.   + + + [more] + +
+ + + +

To: - Anonymous student + You
- - + - - - - + Teammates Test + + + + +
+
From: - Benny Charles -
- 1 -
+
    +
  • + 1: Future work +
    • +
  • + 2: Progress made +
    • +
  • + 3: Related work +
    • +
  • + 4: Organisation +
    • +
  • + 5: Style +
    • +
  • + 6: Motivation +
    • +
  • + 7: Pictures +
    • +
  • + 8: Graphs +
    • +
  • + 9: Reporting +
    • +
  • + 10: Level of detail +
    • +
  • + 11: Samples of data collected and work +
    • +
  • + 12: ; +
    • +
  • + 13: Originality +
    • +
  • + 14: Introduction +
    • +
+
-
+
+
+
+
+

+ Your own response +

+
+
+
+

+ Question 1: + + As a student, rank every instructors on their feedback provided. Give the quality that the instructor should improve on most rank 1. You can give the same rank multiple times  + + + [more] + +
+ + + +

+
To: - Anonymous student + Teammates Helper who can only see section 1
- - + - - - - + You + + + + +
+
From: - Benny Charles -
- 1 -
+
    +
  • + 1: Approachability +
    • +
  • + 3: Timeliness +
    • +
  • + 3: Level of detail +
    • +
  • + 4: Effort +
    • +
+
@@ -373,91 +553,154 @@

- Question 4: + Question 2: - Rank up to 7 students in the course. All students can see the responses, but not the giver's name.  + As a student, rank the instructors  - + [more]
-

-
+
To: - You + Teammates Helper who can only see section 1
- - + - - - - + You + + + + +
+
From: - Charlie Davis -
- 2 -
+ 1 +
-
+
To: - Benny Charles + Teammates Test +
+ + + + + + + + + +
+ + + From: + + + You +
+ 2 +
+
+
+
+
+
+
+

+ Question 3: + + Rank you and your team members, own team members can see the responses but not recipient name  + + + [more] + +
+ + + +

+
+
+ + To: + + You
- - + + + + + + + - - - - - - + + + + + + - - - - + Charlie Davis + + + + +
+
+ + + From: + + + You +
+ 1 +
From: - You -
- 2 -
+ Benny Charles +
+ 2 +
From: - Anonymous student -
- 2 -
+ 2 +
-
+
To: @@ -466,21 +709,21 @@

- - + - - - - + You + + + + +
+
From: - You -
- 1 -
+ 2 +
@@ -490,64 +733,112 @@

- Question 5: + Question 4: - Rank the other teams, you can give the same rank multiple times.  + Rank up to 7 students in the course. All students can see the responses, but not the giver's name.  - + [more]
-

-
+
To: - Your Team (Team 1</option><option value="dump"></td><td>'") + Benny Charles
- - + - - - - - - + + + + + + - - - - + Anonymous student + + + + +
+
From: - Charlie Davis -
- 2 -
+ You +
+ 2 +
From: - Emily F. -
- 1 -
+ 2 +
-
+
+
+ + To: + + Charlie Davis +
+ + + + + + + + + +
+ + + From: + + + You +
+ 1 +
+
+
+
+
+
+
+

+ Question 5: + + Rank the other teams, you can give the same rank multiple times.  + + + [more] + +
+ + + +

+
To: @@ -556,25 +847,25 @@

- - + - - - - + You + + + + +
+
From: - You -
- 1 -
+ 1 +
-
+
To: @@ -583,21 +874,21 @@

- - + - - - - + You + + + + +
+
From: - You -
- 1 -
+ 1 +
@@ -635,7 +926,7 @@

-
+
To: @@ -644,34 +935,34 @@

- - + - - - - + You + + + + +
+
From: - You -
-
    -
  • - 1: Related work -
    • -
  • - 2: Sleep -
    • -
  • - 3: Style -
    • -
  • - 4: Quality of work -
    • -
-
+
    +
  • + 1: Related work +
    • +
  • + 2: Sleep +
    • +
  • + 3: Style +
    • +
  • + 4: Quality of work +
    • +
+
@@ -739,76 +1030,6 @@

-
-
- - To: - - You -
- - - - - - - - - -
- - - From: - - - Teammates Test -
-
    -
  • - 1: Future work -
    • -
  • - 2: Progress made -
    • -
  • - 3: Related work -
    • -
  • - 4: Organisation -
    • -
  • - 5: Style -
    • -
  • - 6: Motivation -
    • -
  • - 7: Pictures -
    • -
  • - 8: Graphs -
    • -
  • - 9: Reporting -
    • -
  • - 10: Level of detail -
    • -
  • - 11: Samples of data collected and work -
    • -
  • - 12: ; -
    • -
  • - 13: Originality -
    • -
  • - 14: Introduction -
    • -
-
-

diff --git a/src/test/resources/pages/studentFeedbackResultsPageRubric.html b/src/test/resources/pages/studentFeedbackResultsPageRubric.html index 1554a614639..136a882e96d 100644 --- a/src/test/resources/pages/studentFeedbackResultsPageRubric.html +++ b/src/test/resources/pages/studentFeedbackResultsPageRubric.html @@ -97,65 +97,65 @@

- - - + + - + - - +

+ + + - - - - - - - - - - - - + + + + + + + + + + + +
- -

- Yes - +

+ +

+ Yes + (Weight: 1.01) -

- 		-

- No - +

+ 		+

+ No + (Weight: -0.99) -

- 		-

- Average -

-
+

+ Average +

+
-

- a) This student has done a good job. -

- 		- 50% (1) - - 50% (1) - - 0.01 -
-

- b) This student has tried his/her best. -

- 		- 0% (0) - - 100% (1) - - -0.99 -
+

+ a) This student has done a good job. +

+ 		+ 50% (1) + + 50% (1) + + 0.01 +
+

+ b) This student has tried his/her best. +

+ 		+ 0% (0) + + 100% (1) + + -0.99 +
@@ -167,219 +167,609 @@

'"'" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

+ Team +

+ 		+

+ Recipient Name +

+ 		+

+ Sub Question +

+ 		+

+ Yes (Weight: 1.01) +

+ 		+

+ No (Weight: -0.99) +

+ 		+

+ Total +

+ 		+

+ Average +

+
+ Team 1 + + + '" + + Alice Betsy + + a) This student has done a good job. + + 1 + + 1 + + 0.02 + + 0.01 +
+ Team 1 + + + '" + + Alice Betsy + + b) This student has tried his/her best. + + 0 + + 1 + + -0.99 + + -0.99 +
+ Team 1 + + + '" + + Benny Charles + + a) This student has done a good job. + + 1 + + 1 + + 0.02 + + 0.01 +
+ Team 1 + + + '" + + Benny Charles + + b) This student has tried his/her best. + + 2 + + 0 + + 2.02 + + 1.01 +
+ Team 2 + + + '" + + Colin Daniels + + a) This student has done a good job. + + 0 + + 1 + + -0.99 + + -0.99 +
+ Team 2 + + + '" + + Colin Daniels + + b) This student has tried his/her best. + + 1 + + 0 + + 1.01 + + 1.01 +
+

+
+
+
+
+ + To: + + Colin Daniels +
+ + + + + + + + + +
+ + + From: + + + Colin Daniels +
+ + - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
-

- Team -

- 		-

- Recipient Name -

- 		-

- Sub Question -

- 		-

- Yes (Weight: 1.01) -

- 		-

- No (Weight: -0.99) -

+ Criteria 		-

- Total -

+ 		+ Yes -

- Average -

+ 		+ No
- Team 1 - - - '" - - Alice Betsy - - a) This student has done a good job. - - 1 - - 1 - - 0.02 - - 0.01 -
- Team 1 - + This student has done a good job. - '" - - Alice Betsy - - b) This student has tried his/her best. - - 0 - - 1 - - -0.99 - - -0.99 -
- Team 1 - + - '" - - Benny Charles - - a) This student has done a good job. - - 1 - - 1 - - 0.02 - - 0.01 + + +
- Team 1 - - - '" - - Benny Charles + This student has tried his/her best. - b) This student has tried his/her best. - - 2 - - 0 - - 2.02 + + + - 1.01 +
- Team 2 - - - '" - - Colin Daniels - +
+
+
+
+

+
+
+

+ Your own response +

+
+
+
+

+ Question 1: + + Please choose the best choice for the following sub-questions.  + + + [more] + +
+ + + +

+
+
+
+ + Response Summary (of received responses) + +
+
+
+
+ + + + + + + + + + + + - - - - - - - - - - + + + + + + - - - - - +

+ + + + + + +
+ +

+ Yes + + (Weight: 1.01) + +

+ 		+

+ No + + (Weight: -0.99) + +

+ 		+

+ Average +

+
+

a) This student has done a good job. -

- 0 - - 1 - - -0.99 - - -0.99 -
- Team 2 - - - '" - - Colin Daniels - +

+ 		+ 50% (1) + + 50% (1) + + 0.01 +
+

b) This student has tried his/her best. -

- 1 - - 0 - - 1.01 - - 1.01 -
+ 0% (0) + + 100% (1) + + -0.99 +
+
+
+
+ + Per Recipient Statistics + + '"'" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

+ Team +

+ 		+

+ Recipient Name +

+ 		+

+ Sub Question +

+ 		+

+ Yes (Weight: 1.01) +

+ 		+

+ No (Weight: -0.99) +

+ 		+

+ Total +

+ 		+

+ Average +

+
+ Team 1 + + + '" + + Alice Betsy + + a) This student has done a good job. + + 1 + + 1 + + 0.02 + + 0.01 +
+ Team 1 + + + '" + + Alice Betsy + + b) This student has tried his/her best. + + 0 + + 1 + + -0.99 + + -0.99 +
+ Team 1 + + + '" + + Benny Charles + + a) This student has done a good job. + + 1 + + 1 + + 0.02 + + 0.01 +
+ Team 1 + + + '" + + Benny Charles + + b) This student has tried his/her best. + + 2 + + 0 + + 2.02 + + 1.01 +
+ Team 2 + + + '" + + Colin Daniels + + a) This student has done a good job. + + 0 + + 1 + + -0.99 + + -0.99 +
+ Team 2 + + + '" + + Colin Daniels + + b) This student has tried his/her best. + + 1 + + 0 + + 1.01 + + 1.01 +
-
+
To: @@ -388,114 +778,114 @@

- - + - - - + + + - - - +
+
From: - You -
- - - - - - - - - - - - - + + + - - - + + + + + + + +
- Criteria - - Yes - - No -
- This student has done a good job. - - + You +
+ + + + + + + + + + + + + - - - - - - - -
+ Criteria + + Yes + + No +
+ This student has done a good job. + + -
- This student has tried his/her best. - - -
-
+
+ This student has tried his/her best. + + +
+
From: - Benny Charles -
- - - - - - - - - - - - + + + - + + + +
- Criteria - - Yes - - No -
- This student has done a good job. - + Benny Charles +
+ + + + + + + + + + + + - - - - - - + + + + + + - - -
+ Criteria + + Yes + + No +
+ This student has done a good job. + - -
- This student has tried his/her best. - - + +
+ This student has tried his/her best. + + -
-
+
-
+
To: @@ -504,177 +894,112 @@

- - - - - - - - + - - - + + + - - - +
- - - From: - - - You -
- - - - - - - - - - - - - - - - - - - - -
- Criteria - - Yes - - No -
- This student has done a good job. - - - - -
- This student has tried his/her best. - - - - -
-
+
From: - Benny Charles -
- - - - - - - - - - - - + + + - - -
- Criteria - - Yes - - No -
- This student has done a good job. - + You +
+ + + + + + + + + + + + + - - - - - + + + + - - - -
+ Criteria + + Yes + + No +
+ This student has done a good job. + + - -
- This student has tried his/her best. - +
+ This student has tried his/her best. + - -
-
- -
-
- - To: - - Colin Daniels -
- - - - + + + +
+ +
+
From: - Colin Daniels -
- - - - - - - - - - - - - + + + - + + + + +
- Criteria - - Yes - - No -
- This student has done a good job. - - + Benny Charles +
+ + + + + + + + + + + + - - - - + + + + + - - - -
+ Criteria + + Yes + + No +
+ This student has done a good job. + -
- This student has tried his/her best. - + +
+ This student has tried his/her best. + - -
-
+
+
diff --git a/src/test/resources/pages/studentFeedbackResultsPageTeamToTeam.html b/src/test/resources/pages/studentFeedbackResultsPageTeamToTeam.html index 6e4c5e22f35..c56b20fd0f9 100644 --- a/src/test/resources/pages/studentFeedbackResultsPageTeamToTeam.html +++ b/src/test/resources/pages/studentFeedbackResultsPageTeamToTeam.html @@ -79,55 +79,55 @@

- - + - - - - - - + + + + + + - + +
+ Instructor second comment to Alice +
+ + + +
+
From: - Anonymous student -
- Alice self feedback. -
-
    -
  • -
    -
    + Anonymous student +
+ Alice self feedback. +
+
    +
  • +
    +
    From: Teammates Test [Mon, 02 Mar 2026, 07:59 AM UTC+0800] (last edited by Teammates Test at Tue, 03 Mar 2026, 07:59 AM UTC+0800) -
    -
    -
    -
    - Instructor first comment to Alice +
    -
    • -
  • -
    -
    +
    +
    + Instructor first comment to Alice +
    +
    • +
  • +
    +
    From: Teammates Test [Tue, 03 Mar 2026, 07:59 AM UTC+0800] -
    -
    -
    -
    - Instructor second comment to Alice +
    -
    • -
-
@@ -151,36 +151,36 @@

- - + - - - - - - + + + + + + - - - - + Anonymous student + + + + +
+
From: - Alice Betsy</option></td></div>'" -
- Response to Benny. -
+ Alice Betsy</option></td></div>'" +
+ Response to Benny. +
From: - Anonymous student -
- Response to Benny from Dropout. -
+ Response to Benny from Dropout. +
@@ -193,36 +193,36 @@

- - + - - - - - - + + + + + + - - - - + Anonymous student + + + + +
+
From: - Alice Betsy</option></td></div>'" -
- Response to Danny. -
+ Alice Betsy</option></td></div>'" +
+ Response to Danny. +
From: - Anonymous student -
- Response to Danny from Dropout. -
+ Response to Danny from Dropout. +
@@ -235,21 +235,21 @@

- - + - - - - + Alice Betsy</option></td></div>'" + + + + +
+
From: - Alice Betsy</option></td></div>'" -
- Response to Dropout. -
+ Response to Dropout. +
@@ -262,21 +262,21 @@

- - + - - - - + Anonymous student + + + + +
+
From: - Anonymous student -
- Response to Alice from Dropout. -
+ Response to Alice from Dropout. +
@@ -291,33 +291,6 @@

Feedback to class

-
-
- - To: - - - -
- - - - - - - - - -
- - - From: - - - You -
- Secret feedback about class. (to nobody test) -
-

@@ -338,36 +311,36 @@

- - + - - - - - - + + + + + + - - - - + Team 3 + + + + +
+
From: - Team 2 -
- Team 2 (danny) to team 1 -
+ Team 2 +
+ Team 2 (danny) to team 1 +
From: - Team 3 -
- Team 3 to Team 1 multiline special char test -
+ Team 3 to Team 1 multiline special char test +

@@ -380,21 +353,21 @@

- - + - - - - + Your Team (Team 1</td></div>'") + + + + +
+
From: - Your Team (Team 1</td></div>'") -
- alice to team 2 -
+ alice to team 2 +
@@ -409,72 +382,170 @@

Give feedback to your team mates

-
+
+
+
+
+
+

+ Question 6: + + Give feedback on how well the team worked together. + +

+
To: - Alice Betsy</option></td></div>'" + Team 1</td></div>'"
- - + - - - - + Alice Betsy</option></td></div>'" + + + + +
+
From: - You -
- Teammate feedback from benny -
+ Feedback from alice to the team +

+
+

+ Your own response +

+

- Question 6: + Question 1: - Give feedback on how well the team worked together. + What is the best selling point of your product?

-
+
+
+
+
+
+

+ Question 2: + + Rate 3 other students' products + +

+
+
+
+
+
+

+ Question 3: + + Feedback to class + +

+
To: - Team 1</td></div>'" + -
- - + - - - - + You + + + + +
+
From: - Alice Betsy</option></td></div>'" -
- Feedback from alice to the team -
+ Secret feedback about class. (to nobody test) +

+
+
+

+ Question 4: + + Give feedback to 3 other teams. + +

+
+
+
+
+
+

+ Question 5: + + Give feedback to your team mates + +

+
+
+ + To: + + Alice Betsy</option></td></div>'" +
+ + + + + + + + + +
+ + + From: + + + You +
+ Teammate feedback from benny +
+
+
+
+
+
+
+

+ Question 6: + + Give feedback on how well the team worked together. + +

+
+
+
diff --git a/src/test/resources/pages/unregisteredStudentFeedbackResultsPageMCQ.html b/src/test/resources/pages/unregisteredStudentFeedbackResultsPageMCQ.html index 09d3a996847..027ae8f8f5c 100644 --- a/src/test/resources/pages/unregisteredStudentFeedbackResultsPageMCQ.html +++ b/src/test/resources/pages/unregisteredStudentFeedbackResultsPageMCQ.html @@ -1,14 +1,14 @@ - - Feedback Results - - - - - - - + + Feedback Results + + + + + + + - - + - - - - + Anonymous student + + + + +
+
From: - Anonymous student -
- Algo -
+ Algo +
@@ -208,60 +208,82 @@

-
+
To: - Charlie Davis + Anonymous student
- - + - - - - + Anonymous student + + + + +
+
From: - You -
- Good -
+ Good +
-
+
To: - Danny Engrid + Anonymous student
- - + - - - - + Anonymous student + + + + +
+
From: - You -
- Good -
+ OK +
+
+
+
+
+
+

+ Question 3: + + Choose the best student in the course.  + + + [more] + +
+ + + +

@@ -271,48 +293,139 @@

- - + - - - - + Anonymous student + + + + +
+
From: - Anonymous student -
- Good -
+ Danny +
-
+
+
+
+
+

+ Your own response +

+
+
+
+

+ Question 1: + + What is the best selling point of your product?  + + + [more] + +
+ + + +

+
+
+
+
+
+

+ Question 2: + + Rate 3 other students' products  + + + [more] + +
+ + + +

+
To: - Anonymous student + Charlie Davis
- - + - - - - + You + + + + + + +
+
From: - Anonymous student -
- OK -
+ Good +
+
+
+
+ + To: + + Danny Engrid +
+ + + + + + + +
+ + + From: + + + You +
+ Good +
@@ -338,33 +451,6 @@

-
-
- - To: - - Anonymous student -
- - - - - - - - - -
- - - From: - - - Anonymous student -
- Danny -
-

@@ -378,7 +464,7 @@

TEAMMATES - V${version}] + V6.0.0]

diff --git a/src/test/resources/pages/unregisteredStudentFeedbackResultsPageOpen.html b/src/test/resources/pages/unregisteredStudentFeedbackResultsPageOpen.html index 9d02896b905..56bf2957b89 100644 --- a/src/test/resources/pages/unregisteredStudentFeedbackResultsPageOpen.html +++ b/src/test/resources/pages/unregisteredStudentFeedbackResultsPageOpen.html @@ -90,55 +90,55 @@

- - + - - - - - - + + + + + + - + +
+ Instructor second comment to Alice +
+ + + +
+
From: - Anonymous student -
- Alice self feedback. -
-
    -
  • -
    -
    + Anonymous student +
+ Alice self feedback. +
+
    +
  • +
    +
    From: Teammates Test [Mon, 02 Mar 2026, 07:59 AM UTC+0800] (last edited by Teammates Test at Tue, 03 Mar 2026, 07:59 AM UTC+0800) -
    -
    -
    -
    - Instructor first comment to Alice +
    -
    • -
  • -
    -
    +
    +
    + Instructor first comment to Alice +
    +
    • +
  • +
    +
    From: Teammates Test [Tue, 03 Mar 2026, 07:59 AM UTC+0800] -
    -
    -
    -
    - Instructor second comment to Alice +
    -
    • -
-
@@ -153,111 +153,122 @@

Rate 3 other students' products

-
+
To: - Alice Betsy</option></td></div>'" + You
- - + - - - - + Anonymous student + + + + +
+
From: - You -
- Response to Alice from Dropout. -
+ Response to Dropout. +
-
+
To: - Benny Charles + Anonymous student
- - + - - - - + Anonymous student + + + + +
+
From: - You -
- Response to Benny from Dropout. -
+ Response to Benny. +
-
+
To: - Danny Engrid + Anonymous student
- - + - - - - + Anonymous student + + + + +
+
From: - You -
- Response to Danny from Dropout. -
+ Response to Danny. +
+
+
+
+
+
+

+ Question 3: + + Give feedback to 3 other teams. + +

To: - You + Team 1</td></div>'"
- - + - - - - + Your Team (Team 2) + + + + +
+
From: - Anonymous student -
- Response to Dropout. -
+ Team 2 (danny) to team 1 +
@@ -266,121 +277,148 @@

To: - Anonymous student + Your Team (Team 2)

- - + - - - - + Team 1</td></div>'" + + + + +
+
From: - Anonymous student -
- Response to Benny. -
+ alice to team 2 +
-
+
+
+
+
+

+ Your own response +

+
+
+
+

+ Question 1: + + What is the best selling point of your product? + +

+
+
+
+
+
+

+ Question 2: + + Rate 3 other students' products + +

+
To: - Anonymous student + Alice Betsy</option></td></div>'"
- - + - - - - + You + + + + +
+
From: - Anonymous student -
- Response to Danny. -
+ Response to Alice from Dropout. +
-
-
-
-
-
-

- Question 3: - - Give feedback to 3 other teams. - -

-
+
To: - Team 1</td></div>'" + Benny Charles
- - + - - - - + You + + + + +
+
From: - Your Team (Team 2) -
- Team 2 (danny) to team 1 -
+ Response to Benny from Dropout. +
-
+
To: - Your Team (Team 2) + Danny Engrid
- - + - - - - + You + + + + +
+
From: - Team 1</td></div>'" -
- alice to team 2 -
+ Response to Danny from Dropout. +

+
+
+

+ Question 3: + + Give feedback to 3 other teams. + +

+
+
+