@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | { |
25 | 25 | $em = $this->doctrine->getManager(); |
26 | 26 | $question = $em->getRepository('AppBundle:Question') |
27 | - ->find($data['idQuestion']); |
|
27 | + ->find($data[ 'idQuestion' ]); |
|
28 | 28 | |
29 | 29 | $originalAnswers = $question->getAnswers(); |
30 | 30 | $countOriginalAnswers = $question->getCountAnswers(); |
@@ -37,8 +37,8 @@ discard block |
||
37 | 37 | |
38 | 38 | foreach ($originalAnswers as $item) { |
39 | 39 | $item->getCorrectly() ? $countAllTrueAnswers++ : null; |
40 | - $data["answer_{$item->getId()}"] ? $countAllChecks++ : null; |
|
41 | - if ($item->getCorrectly() === $data["answer_{$item->getId()}"]) { |
|
40 | + $data[ "answer_{$item->getId()}" ] ? $countAllChecks++ : null; |
|
41 | + if ($item->getCorrectly() === $data[ "answer_{$item->getId()}" ]) { |
|
42 | 42 | $sumAllCorrect++; |
43 | 43 | if ($item->getCorrectly()) |
44 | 44 | $sumCorrectChecks++; |
@@ -55,8 +55,8 @@ discard block |
||
55 | 55 | $maxCountAnswers = $countAllTrueAnswers; |
56 | 56 | } |
57 | 57 | |
58 | - if ($question->getAllIncorrect() || $data['answer_all_incorrect']) { |
|
59 | - if ($question->getAllIncorrect() === $data['answer_all_incorrect'] && $question->getAllIncorrect() === true && |
|
58 | + if ($question->getAllIncorrect() || $data[ 'answer_all_incorrect' ]) { |
|
59 | + if ($question->getAllIncorrect() === $data[ 'answer_all_incorrect' ] && $question->getAllIncorrect() === true && |
|
60 | 60 | $sumAllCorrect == $countOriginalAnswers |
61 | 61 | ) |
62 | 62 | return $result = 1; |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | if ($sumAllCorrect && $sumCorrectChecks && $countAllChecks <= $maxCountAnswers) { |
69 | 69 | // second type question |
70 | 70 | if ($countAllTrueAnswers == 1) { |
71 | - $result = (1 / $maxCountAnswers) * ($sumCorrectChecks + ($sumFalseAnswers > 0 ? 0: 1)); |
|
71 | + $result = (1 / $maxCountAnswers) * ($sumCorrectChecks + ($sumFalseAnswers > 0 ? 0 : 1)); |
|
72 | 72 | } |
73 | 73 | // third type question |
74 | 74 | elseif ($countAllTrueAnswers > 1) { |
@@ -1,10 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * Created by PhpStorm. |
|
4 | - * User: device |
|
5 | - * Date: 04.03.16 |
|
6 | - * Time: 15:50 |
|
7 | - */ |
|
3 | + * Created by PhpStorm. |
|
4 | + * User: device |
|
5 | + * Date: 04.03.16 |
|
6 | + * Time: 15:50 |
|
7 | + */ |
|
8 | 8 | |
9 | 9 | namespace AppBundle\Services; |
10 | 10 |
@@ -40,8 +40,9 @@ discard block |
||
40 | 40 | $data["answer_{$item->getId()}"] ? $countAllChecks++ : null; |
41 | 41 | if ($item->getCorrectly() === $data["answer_{$item->getId()}"]) { |
42 | 42 | $sumAllCorrect++; |
43 | - if ($item->getCorrectly()) |
|
44 | - $sumCorrectChecks++; |
|
43 | + if ($item->getCorrectly()) { |
|
44 | + $sumCorrectChecks++; |
|
45 | + } |
|
45 | 46 | } else { |
46 | 47 | if ($item->getCorrectly() === false) { |
47 | 48 | $sumFalseAnswers++; |
@@ -58,8 +59,9 @@ discard block |
||
58 | 59 | if ($question->getAllIncorrect() || $data['answer_all_incorrect']) { |
59 | 60 | if ($question->getAllIncorrect() === $data['answer_all_incorrect'] && $question->getAllIncorrect() === true && |
60 | 61 | $sumAllCorrect == $countOriginalAnswers |
61 | - ) |
|
62 | - return 1; |
|
62 | + ) { |
|
63 | + return 1; |
|
64 | + } |
|
63 | 65 | |
64 | 66 | return 0; |
65 | 67 | } |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | { |
25 | 25 | $em = $this->doctrine->getManager(); |
26 | 26 | $question = $em->getRepository('AppBundle:Question') |
27 | - ->find($data['idQuestion']); |
|
27 | + ->find($data[ 'idQuestion' ]); |
|
28 | 28 | |
29 | 29 | $originalAnswers = $question->getAnswers(); |
30 | 30 | $countOriginalAnswers = count($originalAnswers); |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | |
38 | 38 | foreach ($originalAnswers as $item) { |
39 | 39 | $item->getCorrectly() ? $countAllTrueAnswers++ : $countAllFalseAnswers++; |
40 | - if ($item->getCorrectly() === $data["answer_{$item->getId()}"]) { |
|
40 | + if ($item->getCorrectly() === $data[ "answer_{$item->getId()}" ]) { |
|
41 | 41 | if ($item->getCorrectly() === true) { |
42 | 42 | $sumTrueCorrect++; |
43 | 43 | } |
@@ -49,8 +49,8 @@ discard block |
||
49 | 49 | } |
50 | 50 | } |
51 | 51 | //first type question |
52 | - if ($question->getAllIncorrect() || $data['answer_all_incorrect']) { |
|
53 | - if ($question->getAllIncorrect() === $data['answer_all_incorrect'] && $question->getAllIncorrect() === true && $sumTrueCorrect == 0) { |
|
52 | + if ($question->getAllIncorrect() || $data[ 'answer_all_incorrect' ]) { |
|
53 | + if ($question->getAllIncorrect() === $data[ 'answer_all_incorrect' ] && $question->getAllIncorrect() === true && $sumTrueCorrect == 0) { |
|
54 | 54 | |
55 | 55 | return $result = 1; |
56 | 56 | } |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | // $result = $sumTrueCorrect != 0 ? ((1 / $countAllTrueAnswers) * $sumTrueCorrect) - ((1 / $countAllFalseAnswers) * $countFalseAnswers) : 0; |
75 | 75 | $result = $sumAllCorrect != 0 ? ((1 / $countOriginalAnswers) * $sumAllCorrect) : 0; |
76 | 76 | } else { |
77 | - $result = 0; |
|
77 | + $result = 0; |
|
78 | 78 | } |
79 | 79 | } |
80 | 80 |
@@ -64,8 +64,7 @@ |
||
64 | 64 | $result = $sumTrueCorrect != 0 ? 1 / $sumTrueCorrect / 2 : 0; |
65 | 65 | } elseif ($countFalseAnswers > 1) { |
66 | 66 | $result = 0; |
67 | - } |
|
68 | - else { |
|
67 | + } else { |
|
69 | 68 | $result = $sumTrueCorrect != 0 ? 1 / $sumTrueCorrect : 0; |
70 | 69 | } |
71 | 70 | //third type question |
@@ -34,7 +34,7 @@ |
||
34 | 34 | |
35 | 35 | if ($countTrueAnswers > 3) { |
36 | 36 | $this->session->getFlashBag()->add('notice', |
37 | - 'You have to add not more than 3 true answers for question '.$question->getTextQuestion()); |
|
37 | + 'You have to add not more than 3 true answers for question ' . $question->getTextQuestion()); |
|
38 | 38 | |
39 | 39 | return false; |
40 | 40 | } |
@@ -1,10 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * Created by PhpStorm. |
|
4 | - * User: device |
|
5 | - * Date: 09.03.16 |
|
6 | - * Time: 19:01 |
|
7 | - */ |
|
3 | + * Created by PhpStorm. |
|
4 | + * User: device |
|
5 | + * Date: 09.03.16 |
|
6 | + * Time: 19:01 |
|
7 | + */ |
|
8 | 8 | |
9 | 9 | namespace AppBundle\Services; |
10 | 10 |
@@ -39,7 +39,7 @@ |
||
39 | 39 | if ($passModule->getPercentResult() >= $module->getPersentSuccess()) { |
40 | 40 | $moduleUser->setStatus(ModuleUser::STATUS_SUCCESS); |
41 | 41 | $moduleUser->setRating($passModule->getRating()); |
42 | - } else if ($moduleUser->getCountPassModules() >= $module->getAttempts()){ |
|
42 | + } else if ($moduleUser->getCountPassModules() >= $module->getAttempts()) { |
|
43 | 43 | $moduleUser->setStatus(ModuleUser::STATUS_FAILED); |
44 | 44 | //$moduleUser->setRating($passModule->getRating()); |
45 | 45 | } |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | { |
34 | 34 | $rating = $this->checkAnswers->checkAnswers($data); |
35 | 35 | $passModule = $this->doctrine->getRepository('AppBundle:PassModule') |
36 | - ->findOneById($data['idPassModule']); |
|
36 | + ->findOneById($data[ 'idPassModule' ]); |
|
37 | 37 | |
38 | 38 | $passModule->addAnsweredQuestionId($passModule->getCurrentQuestion()->getId()); |
39 | 39 | |
@@ -43,18 +43,18 @@ discard block |
||
43 | 43 | $passModule->addRating($rating); |
44 | 44 | |
45 | 45 | |
46 | - if($nextQuestionForPass === null) { |
|
46 | + if ($nextQuestionForPass === null) { |
|
47 | 47 | // $passModule->setIsActive(false); |
48 | 48 | // $passModule->setTimeFinish(new \DateTime()); |
49 | 49 | // $this->doctrine->getEntityManager()->flush(); |
50 | 50 | $timeFinish = new \DateTime(); |
51 | 51 | $this->deactivation->deactivation($passModule, $timeFinish); |
52 | - return $this->generateOutput('redirect_to_result', 301, $data['idPassModule']); |
|
52 | + return $this->generateOutput('redirect_to_result', 301, $data[ 'idPassModule' ]); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | $passModule->setCurrentQuestion($nextQuestionForPass); |
56 | 56 | $this->doctrine->getEntityManager()->flush(); |
57 | 57 | |
58 | - return $this->generateOutput('redirect_to_pass', 301, $data['idPassModule']); |
|
58 | + return $this->generateOutput('redirect_to_pass', 301, $data[ 'idPassModule' ]); |
|
59 | 59 | } |
60 | 60 | } |
@@ -1,10 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * Created by PhpStorm. |
|
4 | - * User: device |
|
5 | - * Date: 04.03.16 |
|
6 | - * Time: 15:50 |
|
7 | - */ |
|
3 | + * Created by PhpStorm. |
|
4 | + * User: device |
|
5 | + * Date: 04.03.16 |
|
6 | + * Time: 15:50 |
|
7 | + */ |
|
8 | 8 | |
9 | 9 | namespace AppBundle\Services; |
10 | 10 |
@@ -1,7 +1,7 @@ |
||
1 | 1 | <?php |
2 | 2 | namespace AppBundle\Traits; |
3 | 3 | |
4 | -trait GenerateOutput{ |
|
4 | +trait GenerateOutput { |
|
5 | 5 | |
6 | 6 | private function generateOutput($status, $code, $message) |
7 | 7 | { |
@@ -17,24 +17,24 @@ |
||
17 | 17 | public function setUp() |
18 | 18 | { |
19 | 19 | $this->client = static::createClient(); |
20 | - $this->runCommand(['command' => 'doctrine:database:create']); |
|
21 | - $this->runCommand(['command' => 'doctrine:schema:update', '--force' => true]); |
|
22 | - $this->runCommand(['command' => 'doctrine:fixtures:load', '--no-interaction' => true]); |
|
20 | + $this->runCommand([ 'command' => 'doctrine:database:create' ]); |
|
21 | + $this->runCommand([ 'command' => 'doctrine:schema:update', '--force' => true ]); |
|
22 | + $this->runCommand([ 'command' => 'doctrine:fixtures:load', '--no-interaction' => true ]); |
|
23 | 23 | |
24 | 24 | } |
25 | 25 | |
26 | 26 | public function tearDown() |
27 | 27 | { |
28 | - $this->runCommand(['command' => 'doctrine:database:drop', '--force' => true]); |
|
28 | + $this->runCommand([ 'command' => 'doctrine:database:drop', '--force' => true ]); |
|
29 | 29 | $this->client = null; |
30 | 30 | } |
31 | 31 | |
32 | - protected function runCommand(array $arguments = []) |
|
32 | + protected function runCommand(array $arguments = [ ]) |
|
33 | 33 | { |
34 | 34 | $application = new Application($this->client->getKernel()); |
35 | 35 | $application->setAutoExit(false); |
36 | - $arguments['--quiet'] = true; |
|
37 | - $arguments['-e'] = 'test'; |
|
36 | + $arguments[ '--quiet' ] = true; |
|
37 | + $arguments[ '-e' ] = 'test'; |
|
38 | 38 | $input = new ArrayInput($arguments); |
39 | 39 | $application->run($input, new ConsoleOutput()); |
40 | 40 | } |
@@ -1,10 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * Created by PhpStorm. |
|
4 | - * User: device |
|
5 | - * Date: 18.03.16 |
|
6 | - * Time: 18:33 |
|
7 | - */ |
|
3 | + * Created by PhpStorm. |
|
4 | + * User: device |
|
5 | + * Date: 18.03.16 |
|
6 | + * Time: 18:33 |
|
7 | + */ |
|
8 | 8 | |
9 | 9 | namespace AppBundle\Tests\Controller\Admin; |
10 | 10 |
@@ -1,10 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * Created by PhpStorm. |
|
4 | - * User: device |
|
5 | - * Date: 18.03.16 |
|
6 | - * Time: 18:37 |
|
7 | - */ |
|
3 | + * Created by PhpStorm. |
|
4 | + * User: device |
|
5 | + * Date: 18.03.16 |
|
6 | + * Time: 18:37 |
|
7 | + */ |
|
8 | 8 | |
9 | 9 | namespace AppBundle\Tests\Controller\Admin; |
10 | 10 |