Skip to content

Commit 319e965

Browse files
authored
Merge pull request #2763 from objectcomputing/bug-2762/merit-report-answers
Do not use sentiment at all. Always take the answer text.
2 parents 665d0e8 + f0fc674 commit 319e965

File tree

2 files changed

+1
-37
lines changed

2 files changed

+1
-37
lines changed

server/src/main/java/com/objectcomputing/checkins/services/reports/ReportDataCollation.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -306,12 +306,7 @@ private List<Feedback> getFeedbackType(FeedbackType type) {
306306
feedbackAnswers.add(
307307
new Feedback.Answer(
308308
recipientName, request.getSubmitDate(), questionText,
309-
questionType.equals(textQuestion) ||
310-
questionType.equals(radioQuestion) ?
311-
answer.getAnswer() :
312-
String.valueOf(answer.getSentiment()),
313-
questionType,
314-
questionNumber));
309+
answer.getAnswer(), questionType, questionNumber));
315310
}
316311
}
317312
}

web-ui/src/pages/MeritReportPage.jsx

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,6 @@ import { useQueryParameters } from '../helpers/query-parameters';
2020
import markdown from 'markdown-builder';
2121

2222
const MeritReportPage = () => {
23-
const agreeMarks = [
24-
'Strongly Disagree',
25-
'Disagree',
26-
'Neither Agree nor Disagree',
27-
'Agree',
28-
'Strongly Agree'
29-
];
30-
const frequencyMarks = [
31-
'Very Infrequently',
32-
'Infrequently',
33-
'Neither Frequently nor Infrequently',
34-
'Frequently',
35-
'Very Frequently'
36-
];
37-
3823
const { state, dispatch } = useContext(AppContext);
3924

4025
const csrf = selectCsrfToken(state);
@@ -338,22 +323,6 @@ const MeritReportPage = () => {
338323
};
339324

340325
const getAnswerText = (answer) => {
341-
if (answer.type == "SLIDER" || answer.type == "FREQ") {
342-
const sentiment = parseFloat(answer.answer);
343-
if (!isNaN(sentiment)) {
344-
if (answer.type == "SLIDER") {
345-
const index = sentiment * agreeMarks.length;
346-
if (index >= 0 && index < agreeMarks.length) {
347-
return agreeMarks[index];
348-
}
349-
} else if (answer.type == "FREQ") {
350-
const index = sentiment * frequencyMarks.length;
351-
if (index >= 0 && index < frequencyMarks.length) {
352-
return frequencyMarks[index];
353-
}
354-
}
355-
}
356-
}
357326
return answer.answer;
358327
};
359328

0 commit comments

Comments
 (0)