From 27131212db9606119f6c7b9b6988279e0f3c8dc8 Mon Sep 17 00:00:00 2001
From: Robin Drangmeister <robin.drangmeister@outlook.com>
Date: Thu, 22 Sep 2016 23:09:52 +0200
Subject: [PATCH] Satisfied JSCS
---
src/main/webapp/app/internationalization.js | 8 +++++
.../webapp/app/view/FreetextAnswerPanel.js | 27 +++++++--------
.../view/speaker/QuestionStatisticChart.js | 34 +++++++++----------
3 files changed, 37 insertions(+), 32 deletions(-)
diff --git a/src/main/webapp/app/internationalization.js b/src/main/webapp/app/internationalization.js
index 6cfa8e63b..c7dc2fcff 100755
--- a/src/main/webapp/app/internationalization.js
+++ b/src/main/webapp/app/internationalization.js
@@ -1685,6 +1685,14 @@
QUESTIONS_IMPORT_ABSTENTION_ERROR: "Error in field 'abstention'",
QUESTIONS_IMPORT_INVALID_FORMAT: "Invalid file format",
FLASHCARDS_CHOOSE_SUBJECT: "Enter a subject for the imported flashcard-set"
+
+ /* CSV import */
+ QUESTIONS_CSV_IMPORT_BUTTON: "Import<br>questions",
+ QUESTIONS_CSV_IMPORT_MSBOX_TITLE: "Import content",
+ QUESTIONS_CSV_IMPORT_ERR_IN_ROW: "at line",
+ QUESTIONS_CSV_IMPORT_TYPE_ERROR: "Invalid question type",
+ QUESTIONS_CSV_IMPORT_ABSTENTION_ERROR: "Error in field 'abstention'",
+ QUESTIONS_CSV_IMPORT_INVALID_FORMAT: "Invalid file format"
};
switch (variation) {
diff --git a/src/main/webapp/app/view/FreetextAnswerPanel.js b/src/main/webapp/app/view/FreetextAnswerPanel.js
index 03559c3ad..d5bd1fcf4 100644
--- a/src/main/webapp/app/view/FreetextAnswerPanel.js
+++ b/src/main/webapp/app/view/FreetextAnswerPanel.js
@@ -124,35 +124,32 @@ Ext.define('ARSnova.view.FreetextAnswerPanel', {
docked: 'top',
ui: 'light',
title: Ext.util.Format.htmlEncode(this.questionObj.subject),
- items: [this.backButton
- ,{
+ items: [this.backButton, {
xtype: 'button',
text: Messages.QUESTIONS_CSV_EXPORT_ANSWERS_BUTTON,
align: 'right',
- handler: function(){
+ handler: function () {
//Format
- var exp="data:text/csv;charset=utf-8,";
+ var exp = "data:text/csv;charset=utf-8,";
//Subject and Question
- exp+=Messages.QUESTION_SUBJECT+": "+self.questionObj.subject+";"+Messages.QUESTION+": "+self.questionObj.text;
+ exp += Messages.QUESTION_SUBJECT + ": " + self.questionObj.subject + ";" + Messages.QUESTION + ": " + self.questionObj.text;
//Table header
- exp+="\n"+Messages.QUESTION_DATE+";"+Messages.QUESTIONS_CSV_EXPORT_ANSWERS_TIME+";"+Messages.QUESTIONS_CSV_EXPORT_ANSWERS_SUBJECT+";"+Messages.FREETEXT_DETAIL_ANSWER+";Timestamp";
-
+ exp += "\n" + Messages.QUESTION_DATE + ";" + Messages.QUESTIONS_CSV_EXPORT_ANSWERS_TIME + ";" + Messages.QUESTIONS_CSV_EXPORT_ANSWERS_SUBJECT + ";" + Messages.FREETEXT_DETAIL_ANSWER + ";Timestamp";
//Table contents (answers)
- self.freetextAnswerStore._data.all.forEach(function(item){
- exp+="\n"+item._data.groupDate+";"+item._data.formattedTime+";"+item._data.answerSubject+";"+item._data.answerText+";"+item._data.timestamp;
+ self.freetextAnswerStore._data.all.forEach(function (item) {
+ exp += "\n" + item._data.groupDate + ";" + item._data.formattedTime + ";" + item._data.answerSubject + ";" + item._data.answerText + ";" + item._data.timestamp;
});
-
//Download file
//stackoverflow.com/questions/14964035/
var encodedUri = encodeURI(exp);
var link = document.createElement("a");
link.setAttribute("href", encodedUri);
- link.setAttribute("download", self.questionObj.subject+"_"+self.questionObj.text+"-Answers.csv");
- document.body.appendChild(link); // Required for FF
- link.click();
+ link.setAttribute("download", self.questionObj.subject + "_" + self.questionObj.text + "-Answers.csv");
+ document.body.appendChild(link);// Required for FF
+ link.click();
},
hidden: (ARSnova.app.userRole === ARSnova.app.USER_ROLE_STUDENT)
- }]
+ }]
});
// Create standard panel with framework support
@@ -428,4 +425,4 @@ Ext.define('ARSnova.view.FreetextAnswerPanel', {
}
}, -1, -1);
}
-});
\ No newline at end of file
+});
diff --git a/src/main/webapp/app/view/speaker/QuestionStatisticChart.js b/src/main/webapp/app/view/speaker/QuestionStatisticChart.js
index 729c04134..27b809006 100755
--- a/src/main/webapp/app/view/speaker/QuestionStatisticChart.js
+++ b/src/main/webapp/app/view/speaker/QuestionStatisticChart.js
@@ -154,8 +154,8 @@ Ext.define('ARSnova.view.speaker.QuestionStatisticChart', {
docked: 'top',
ui: 'light',
title: Ext.util.Format.htmlEncode(this.questionObj.subject),
- items: [this.backButton,
- this.answerCounter, {
+ items: [this.backButton,
+ this.answerCounter, {
xtype: 'button',
align: 'right',
iconCls: 'icon-check',
@@ -164,22 +164,22 @@ Ext.define('ARSnova.view.speaker.QuestionStatisticChart', {
handler: this.toggleCorrectHandler,
hidden: !hasCorrectAnswers() || this.questionObj.questionType === 'grid' ||
(ARSnova.app.userRole === ARSnova.app.USER_ROLE_STUDENT && !this.questionObj.showAnswer)
- },{
+ }, {
xtype: 'button',
text: Messages.QUESTIONS_CSV_EXPORT_ANSWERS_BUTTON,
align: 'right',
- handler: function(){
+ handler: function () {
//Format
- var exp="data:text/csv;charset=utf-8,";
+ var exp = "data:text/csv;charset=utf-8,";
//Subeject and Question
- exp+=Messages.QUESTION_SUBJECT+": "+me.questionObj.subject+";"+Messages.QUESTION+": "+me.questionObj.text;
+ exp += Messages.QUESTION_SUBJECT + ": " + me.questionObj.subject + ";" + Messages.QUESTION + ": " + me.questionObj.text;
//Table header
- exp+="\n"+Messages.ANSWERS+";"
- +Messages.FIRST_ROUND+" "+Messages.GRID_LABEL_RELATIVE+";"+Messages.FIRST_ROUND+" "+Messages.GRID_LABEL_ABSOLUTE+";"
- +Messages.SECOND_ROUND+" "+Messages.GRID_LABEL_RELATIVE+";"+Messages.SECOND_ROUND+" "+Messages.GRID_LABEL_ABSOLUTE;
+ exp += "\n" + Messages.ANSWERS + ";"
+ + Messages.FIRST_ROUND + " " + Messages.GRID_LABEL_RELATIVE + ";" + Messages.FIRST_ROUND + " " + Messages.GRID_LABEL_ABSOLUTE + ";"
+ + Messages.SECOND_ROUND + " " + Messages.GRID_LABEL_RELATIVE + ";" + Messages.SECOND_ROUND + " " + Messages.GRID_LABEL_ABSOLUTE;
//Table contents (answers)
me.questionStore.each(function (record) {
- exp+="\n"+record.get('text')+";"+record.get('percent-round1')+";"+record.get('value-round1')+";"+record.get('percent-round2')+";"+record.get('value-round2');
+ exp += "\n" + record.get('text') + ";" + record.get('percent-round1') + ";" + record.get('value-round1') + ";" + record.get('percent-round2') + ";" + record.get('value-round2');
});
//Download file
@@ -187,13 +187,13 @@ Ext.define('ARSnova.view.speaker.QuestionStatisticChart', {
var encodedUri = encodeURI(exp);
var link = document.createElement("a");
link.setAttribute("href", encodedUri);
- link.setAttribute("download", me.questionObj.subject+"_"+me.questionObj.text+"-Answers.csv");
- document.body.appendChild(link); // Required for FF
- link.click();
+ link.setAttribute("download", me.questionObj.subject + "_" + me.questionObj.text + "-Answers.csv");
+ document.body.appendChild(link);// Required for FF
+ link.click();
},
- hidden: (ARSnova.app.userRole === ARSnova.app.USER_ROLE_STUDENT||me.questionObj.questionType==='grid')
- }
- ]
+ hidden: (ARSnova.app.userRole === ARSnova.app.USER_ROLE_STUDENT || me.questionObj.questionType === 'grid')
+ }
+ ]
});
this.piToolbar = Ext.create('Ext.Toolbar', {
@@ -1009,4 +1009,4 @@ Ext.define('ARSnova.view.speaker.QuestionStatisticChart', {
return lighterColors;
}
-});
\ No newline at end of file
+});
--
GitLab