From 47d3e12bd5f63fbcf1d1e31dd0e4cd0aefd551ea Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Thu, 3 Feb 2022 18:40:06 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20DB=E3=81=AB=E7=99=BB=E9=8C=B2=E3=81=95?= =?UTF-8?q?=E3=82=8C=E3=81=A6=E3=81=84=E3=82=8B=E6=97=A5=E6=99=82(GMT)?= =?UTF-8?q?=E3=82=92=E3=81=9D=E3=81=AE=E3=81=BE=E3=81=BE=E5=87=BA=E5=8A=9B?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=84=E3=81=9F=E3=81=9F=E3=82=81=E3=83=80?= =?UTF-8?q?=E3=82=A6=E3=83=B3=E3=83=AD=E3=83=BC=E3=83=89=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=81=AE=E3=82=BF=E3=82=A4=E3=83=A0?= =?UTF-8?q?=E3=82=BE=E3=83=BC=E3=83=B3=E3=81=AB=E5=A4=89=E6=8F=9B=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3=20https:?= =?UTF-8?q?//github.com/NetCommons3/NetCommons3/issues/1471?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/QuizAnswerSummaryCsv.php | 14 ++++++++++++- .../GetAnswerSummaryCsvTest.php | 20 +++++++++---------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/Model/QuizAnswerSummaryCsv.php b/Model/QuizAnswerSummaryCsv.php index a016288..4471e72 100644 --- a/Model/QuizAnswerSummaryCsv.php +++ b/Model/QuizAnswerSummaryCsv.php @@ -14,6 +14,7 @@ App::uses('QuizzesAppModel', 'Quizzes.Model'); App::uses('QuizAnswerSummary', 'Quizzes.Model'); +App::uses('NetCommonsTime', 'NetCommons.Utility'); /** * Summary for QuizAnswerSummary Model @@ -60,6 +61,13 @@ class QuizAnswerSummaryCsv extends QuizAnswerSummary { public $hasMany = array( ); +/** + * 日時を変換するクラス + * + * @var NetCommonsTime + */ + private $__NetCommonsTime; + /** * Constructor. Binds the model's database table to the object. * @@ -77,6 +85,7 @@ public function __construct($id = false, $table = null, $ds = null) { 'Quiz' => 'Quizzes.Quiz', 'QuizAnswer' => 'Quizzes.QuizAnswer', ]); + $this->__NetCommonsTime = new NetCommonsTime(); } /** @@ -301,7 +310,10 @@ protected function _getRows($quiz, $sampScore, $summary, $answers) { $cols = array(); $cols[] = $this->_getUserName($quiz, $summary); - $cols[] = $summary['QuizAnswerSummaryCsv']['answer_finish_time']; + $cols[] = $this->__NetCommonsTime->dateFormat( + $summary['QuizAnswerSummaryCsv']['answer_finish_time'], + 'Y-m-d H:i:s' + ); $cols[] = $summary['QuizAnswerSummaryCsv']['elapsed_second']; $cols[] = $summary['QuizAnswerSummaryCsv']['answer_number']; $cols[] = $summary['QuizAnswerSummaryCsv']['summary_score']; diff --git a/Test/Case/Model/QuizAnswerSummaryCsv/GetAnswerSummaryCsvTest.php b/Test/Case/Model/QuizAnswerSummaryCsv/GetAnswerSummaryCsvTest.php index fc31f92..ba52fa7 100644 --- a/Test/Case/Model/QuizAnswerSummaryCsv/GetAnswerSummaryCsvTest.php +++ b/Test/Case/Model/QuizAnswerSummaryCsv/GetAnswerSummaryCsvTest.php @@ -118,28 +118,28 @@ public function dataProviderGet() { __d('quizzes', 'Score') ), // header array( - '非会員', '2016-06-10 06:35:02', '10', '1', '0', '40', '', __d('quizzes', 'Ungraded'), + '非会員', '2016-06-10 15:35:02', '10', '1', '0', '40', '', __d('quizzes', 'Ungraded'), ), // data1 array( - '非会員', '2016-06-10 06:36:46', '77', '1', '8', '59', '正解で部分点でお願いします', 8, + '非会員', '2016-06-10 15:36:46', '77', '1', '8', '59', '正解で部分点でお願いします', 8, ), // data2 array( - '非会員', '2016-06-10 06:37:26', '24', '1', '10', '64', '正解で満点でお願いします', 10, + '非会員', '2016-06-10 15:37:26', '24', '1', '10', '64', '正解で満点でお願いします', 10, ), // data3 array( - '非会員', '2016-06-10 06:38:17', '30', '1', '2', '45', '間違い部分点でお願いします', 2, + '非会員', '2016-06-10 15:38:17', '30', '1', '2', '45', '間違い部分点でお願いします', 2, ), // data4 array( - '非会員', '2016-06-10 06:39:14', '35', '1', '0', '40', '間違いで０点でお願いします', 0, + '非会員', '2016-06-10 15:39:14', '35', '1', '0', '40', '間違いで０点でお願いします', 0, ), // data5 array( - 'Editor', '2016-06-10 06:47:11', '27', '1', '0', '40', '未採点のままにしてください', __d('quizzes', 'Ungraded'), + 'Editor', '2016-06-10 15:47:11', '27', '1', '0', '40', '未採点のままにしてください', __d('quizzes', 'Ungraded'), ), // data6 array( - 'Editor', '2016-06-10 06:47:56', '26', '2', '10', '64', '正解満点でお願いします', 10, + 'Editor', '2016-06-10 15:47:56', '26', '2', '10', '64', '正解満点でお願いします', 10, ), // data6 array( - 'Editor', '2016-06-10 06:48:55', '27', '3', '4', '49', '間違い部分点でお願いします', 4, + 'Editor', '2016-06-10 15:48:55', '27', '3', '4', '49', '間違い部分点でお願いします', 4, ), // data6 ); $expect2 = array( @@ -169,7 +169,7 @@ public function dataProviderGet() { __d('quizzes', 'Score') ), // header array( - '非会員', '2016-06-10 06:20:53', '14', '1', '10', '50.0', '新規選択肢1', 10, + '非会員', '2016-06-10 15:20:53', '14', '1', '10', '50.0', '新規選択肢1', 10, ), // data2 ); return array( @@ -179,4 +179,4 @@ public function dataProviderGet() { ); } -} \ No newline at end of file +}