fix: アンケートの確認画面を表示後に回答を終了せずにブラウザを閉じ、その後あらためて回答した際にブラウザを閉じる前の回答日時がCSVに出力されてしまうバグの修正

.github/workflows/tests.yml

@@ -15,7 +15,7 @@ name: tests
 jobs:
   setup:
     name: setup
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - name: Slack Notification on Start
         uses: rtCamp/action-slack-notify@v2.2.0
@@ -28,7 +28,7 @@ jobs:
   tests:
     name: tests
     needs: setup
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         php: [ '7.2', '7.3', '7.4' ]
@@ -92,46 +92,53 @@ jobs:
           docker-compose exec -T nc3app bash /opt/scripts/app-build.sh
 
       - name: phpcs (PHP CodeSniffer)
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose exec -T nc3app bash /opt/scripts/phpcs.sh
 
       - name: phpmd (PHP Mess Detector)
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose exec -T nc3app bash /opt/scripts/phpmd.sh
 
       - name: phpcpd (PHP Copy/Paste Detector)
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose exec -T nc3app bash /opt/scripts/phpcpd.sh
 
       - name: gjslint (JavaScript Style Check)
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose exec -T nc3app bash /opt/scripts/gjslint.sh
 
       - name: phpdoc (PHP Documentor)
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose exec -T nc3app bash /opt/scripts/phpdoc.sh
 
       - name: phpunit (PHP UnitTest)
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose exec -T nc3app bash /opt/scripts/phpunit.sh
           sudo -s chmod a+w -R ${NC3_BUILD_DIR}/build
 
-      - name: push coveralls
-        env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          COVERALLS_FLAG_NAME: ${{ matrix.php }}
-        run: |
-          cd ${NC3_BUILD_DIR}
-          ls -la ${NC3_BUILD_DIR}
-          vendors/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v
+#       - name: push coveralls
+#         env:
+#           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#           COVERALLS_FLAG_NAME: ${{ matrix.php }}
+#         run: |
+#           cd ${NC3_BUILD_DIR}
+#           ls -la ${NC3_BUILD_DIR}
+#           vendors/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v
 
       - name: docker-compose remove
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose rm -f
@@ -148,7 +155,7 @@ jobs:
 
   teardown:
     name: teardown
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     needs: tests
     steps:
       # テスト成功時はこちらのステップが実行される

Model/QuestionnaireAnswerSummary.php

@@ -113,11 +113,13 @@ class QuestionnaireAnswerSummary extends QuestionnairesAppModel {
  */
 	public function saveAnswerStatus($questionnaire, $summary, $status) {
 		$summary['QuestionnaireAnswerSummary']['answer_status'] = $status;
+		if ($status == QuestionnairesComponent::ACTION_ACT) {
+			// サマリの状態を完了にして確定する
+			$summary['QuestionnaireAnswerSummary']['answer_time'] = (new NetCommonsTime())->getNowDatetime();
+		}
 
 		if ($status == QuestionnairesComponent::ACTION_ACT &&
 			$questionnaire['Questionnaire']['is_answer_mail_send']) {
-			// サマリの状態を完了にして確定する
-			$summary['QuestionnaireAnswerSummary']['answer_time'] = (new NetCommonsTime())->getNowDatetime();
 			// メールのembed のURL設定を行っておく
 			$url = NetCommonsUrl::actionUrl(array(
 				'controller' => 'questionnaire_blocks',

Model/QuestionnaireAnswerSummaryCsv.php

@@ -257,7 +257,12 @@ protected function _getRows($questionnaire, $summary, $answers) {
 		$cols = array();
 
 		$cols[] = $this->_getUserName($questionnaire, $summary);
-		$cols[] = $summary['QuestionnaireAnswerSummaryCsv']['modified'];
+		if (isset($summary['QuestionnaireAnswerSummaryCsv']['answer_time'])) {
+			$anserTime = $summary['QuestionnaireAnswerSummaryCsv']['answer_time'];
+		} else {
+			$anserTime = $summary['QuestionnaireAnswerSummaryCsv']['modified'];
+		}
+		$cols[] = $anserTime;
 		$cols[] = $summary['QuestionnaireAnswerSummaryCsv']['answer_number'];
 
 		foreach ($questionnaire['QuestionnairePage'] as $page) {