Skip to content

fix: DBに登録されている日時(GMT)をそのまま出力していたためダウンロードするユーザのタイムゾーンに変換するように修正 #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
s-nakajima merged 1 commit into from
Feb 3, 2022
Merged

fix: DBに登録されている日時(GMT)をそのまま出力していたためダウンロードするユーザのタイムゾーンに変換するように修正 #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion Model/QuizAnswerSummaryCsv.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

App::uses('QuizzesAppModel', 'Quizzes.Model');
App::uses('QuizAnswerSummary', 'Quizzes.Model');
App::uses('NetCommonsTime', 'NetCommons.Utility');

/**
* Summary for QuizAnswerSummary Model
Expand Down Expand Up @@ -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.
*
Expand All @@ -77,6 +85,7 @@ public function __construct($id = false, $table = null, $ds = null) {
'Quiz' => 'Quizzes.Quiz',
'QuizAnswer' => 'Quizzes.QuizAnswer',
]);
$this->__NetCommonsTime = new NetCommonsTime();
}

/**
Expand Down Expand Up @@ -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'];
Expand Down
20 changes: 10 additions & 10 deletions Test/Case/Model/QuizAnswerSummaryCsv/GetAnswerSummaryCsvTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand All @@ -179,4 +179,4 @@ public function dataProviderGet() {
);
}

}
}