diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3195c64..36cd2b9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,22 +3,21 @@ on: branches: - main - master - - availability pull_request: branches: - main - master - - availability 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 + if: env.SLACK_WEBHOOK != '' env: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }} SLACK_CHANNEL: notify-nc3-tests @@ -28,7 +27,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 +91,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 @@ -139,7 +145,7 @@ jobs: # テスト失敗時はこちらのステップが実行される - name: Slack Notification on Failure uses: rtCamp/action-slack-notify@v2.2.0 - if: failure() + if: env.SLACK_WEBHOOK != '' && failure() env: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }} SLACK_CHANNEL: notify-nc3-tests @@ -148,13 +154,13 @@ jobs: teardown: name: teardown - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest needs: tests steps: # テスト成功時はこちらのステップが実行される - name: Slack Notification on Success - if: success() uses: rtCamp/action-slack-notify@v2.2.0 + if: env.SLACK_WEBHOOK != '' && success() env: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }} SLACK_CHANNEL: notify-nc3-tests diff --git a/Model/QuestionnaireAnswerSummary.php b/Model/QuestionnaireAnswerSummary.php index 2441f21..f6cd2ea 100644 --- a/Model/QuestionnaireAnswerSummary.php +++ b/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', diff --git a/Model/QuestionnaireAnswerSummaryCsv.php b/Model/QuestionnaireAnswerSummaryCsv.php index 781fc2c..578f5b8 100644 --- a/Model/QuestionnaireAnswerSummaryCsv.php +++ b/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) { diff --git a/VERSION.txt b/VERSION.txt index 9c25013..86fb650 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -3.3.6 +3.3.7