Merge pull request #726 from support-project/fix/issue724_report_survey

Fix/issue724 report survey
support-project · May 16, 2017 · 80f8411 · 80f8411
2 parents 3c15b08 + 175ef21
commit 80f8411
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -22,13 +22,20 @@ gulp.task('min', function() {
     .pipe(gulp.dest('target/knowledge/WEB-INF/views/'));
 });
 
-gulp.task('copy', ['copy:bootswatch', 'copy:highlightjs', 'copy:font-awesome', 'copy:flag-icon-css', 
+gulp.task('copy', ['copy:bootswatch', 'copy:bootswatch2', 'copy:highlightjs', 'copy:font-awesome', 'copy:flag-icon-css', 
     'copy:html5shiv', 'copy:respond', 'copy:MathJax', 'copy:emoji-parser', 'copy:free-file-icons',
     'copy:diff2html', 'copy:jsdiff']);
+
 gulp.task('copy:bootswatch', function() {
     return gulp.src([
         'src/main/webapp/bower/bootswatch/**/*'
     ])
+    .pipe(gulp.dest('target/knowledge/bower/bootswatch'));
+});
+gulp.task('copy:bootswatch2', function() {
+    return gulp.src([
+        'src/main/webapp/bower/bootswatch/**/*.css'
+    ])
     .pipe(replace(/^@import url\("https:\/\/fonts.googleapis.com\/css.*\)\;/, ''))
     .pipe(gulp.dest('target/knowledge/bower/bootswatch'));
 });

diff --git a/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java b/src/main/java/org/support/project/knowledge/control/protect/SurveyControl.java
@@ -31,6 +31,7 @@
 import org.support.project.web.control.service.Get;
 import org.support.project.web.control.service.Post;
 import org.support.project.web.exception.InvalidParamException;
+import org.support.project.web.logic.DateConvertLogic;
 
 import net.arnx.jsonic.JSONException;
 
@@ -239,6 +240,10 @@ public Boundary report() throws InvalidParamException {
             return sendError(HttpStatus.SC_403_FORBIDDEN, "FORBIDDEN");
         }
         SurveyReport report = SurveyLogic.get().loadAnswers(knowledgeId, getLoginUserId());
+        List<SurveyAnswersEntity> answers = report.getAnswers();
+        for (SurveyAnswersEntity ans : answers) {
+            ans.setLocalDatetime(DateConvertLogic.get().convertDate(ans.getInsertDatetime(), getRequest()));
+        }
         return send(report);
     }
 

diff --git a/src/main/java/org/support/project/knowledge/entity/SurveyAnswersEntity.java b/src/main/java/org/support/project/knowledge/entity/SurveyAnswersEntity.java
@@ -19,6 +19,8 @@ public class SurveyAnswersEntity extends GenSurveyAnswersEntity {
 
     /** 回答者の名前 */
     private String userName;
+    /** 回答集計を操作しているユーザのタイムゾーン／ロケールでの日付文字列 */
+    private String localDatetime;
 
     /** SerialVersion */
     private static final long serialVersionUID = 1L;
@@ -76,4 +78,18 @@ public void setUserName(String userName) {
         this.userName = userName;
     }
 
+    /**
+     * @return the localDatetime
+     */
+    public String getLocalDatetime() {
+        return localDatetime;
+    }
+
+    /**
+     * @param localDatetime the localDatetime to set
+     */
+    public void setLocalDatetime(String localDatetime) {
+        this.localDatetime = localDatetime;
+    }
+
 }
diff --git a/src/main/webapp/js/survey-answers.js b/src/main/webapp/js/survey-answers.js
@@ -35,7 +35,8 @@ $(document).ready(function() {
 
             result.answers.forEach(function(answer) {
                 var row = {};
-                row.answer_datetime = moment(answer.insertDatetime, 'YYYY-MM-DD HH:mm:ss.SSS').format('YYYY-MM-DD HH:mm');
+                row.answer_datetime = answer.localDatetime;
+//                row.answer_datetime = moment(answer.insertDatetime, 'YYYY-MM-DD HH:mm:ss.SSS').format('YYYY-MM-DD HH:mm');
                 row.answer_user = answer.userName;
 
                 answer.items.forEach(function(answerItem) {