Merge c80e201 into 3346430

NetCommons3 · May 4, 2019 · 9d488a2 · 9d488a2
2 parents 3346430 + c80e201
commit 9d488a2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Model/QuestionnaireAnswerSummaryCsv.php b/Model/QuestionnaireAnswerSummaryCsv.php
@@ -13,6 +13,7 @@
  */
 
 App::uses('QuestionnairesAppModel', 'Questionnaires.Model');
+App::uses('NetCommonsTime', 'NetCommons.Utility');
 
 /**
  * Summary for QuestionnaireAnswerSummary Model
@@ -185,7 +186,12 @@ public function getAnswerSummaryCsv($questionnaire, $limit, $offset) {
 					)
 				)
 			));
-			$retArray[] = $this->_getRows($questionnaire, $summary, $answers);
+			//$retArray[] = $this->_getRows($questionnaire, $summary, $answers);
+			//回答日時は固定で1なので
+			$retArray[] = (new NetCommonsTime())->toUserDatetimeArray(
+				$this->_getRows($questionnaire, $summary, $answers),
+				array('1')
+			);
 		}
 
 		return $retArray;

diff --git a/Test/Case/Controller/QuestionnaireBlockRolePermissionsController/EditTest.php b/Test/Case/Controller/QuestionnaireBlockRolePermissionsController/EditTest.php
@@ -64,8 +64,8 @@ private function __getData($isPost) {
 				'QuestionnaireSetting' => array(
 					'id' => 2,
 					'block_key' => 'block_2',
-					'use_workflow' => true,
-					'approval_type' => true,
+					'use_workflow' => '1',
+					'approval_type' => '1',
 				)
 			);
 		} else {