sgalationov · FilippMuffin · Jul 3, 2018
diff --git a/.gitignore b/.gitignore
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/app/.htaccess b/app/.htaccess
diff --git a/app/AppCache.php b/app/AppCache.php
diff --git a/app/AppKernel.php b/app/AppKernel.php
diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
diff --git a/app/Resources/views/default/index.html.twig b/app/Resources/views/default/index.html.twig
diff --git a/app/Resources/views/employee/edit.html.twig b/app/Resources/views/employee/edit.html.twig
diff --git a/app/Resources/views/employee/index.html.twig b/app/Resources/views/employee/index.html.twig
diff --git a/app/Resources/views/employee/new.html.twig b/app/Resources/views/employee/new.html.twig
diff --git a/app/Resources/views/employee/show.html.twig b/app/Resources/views/employee/show.html.twig
diff --git a/app/Resources/views/lecture/edit.html.twig b/app/Resources/views/lecture/edit.html.twig
diff --git a/app/Resources/views/lecture/index.html.twig b/app/Resources/views/lecture/index.html.twig
diff --git a/app/Resources/views/lecture/new.html.twig b/app/Resources/views/lecture/new.html.twig
@@ -5,9 +5,10 @@
 
     {{ form_start(form) }}
         {{ form_widget(form) }}
+
         <input type="submit" value="Создать" />
     {{ form_end(form) }}
-
+        </ul>
     <ul>
         <li>
             <a href="{{ path('lecture_index') }}">Назад к списку</a>

diff --git a/app/Resources/views/lecture/show.html.twig b/app/Resources/views/lecture/show.html.twig
diff --git a/app/Resources/views/student/edit.html.twig b/app/Resources/views/student/edit.html.twig
diff --git a/app/Resources/views/student/index.html.twig b/app/Resources/views/student/index.html.twig
diff --git a/app/Resources/views/student/new.html.twig b/app/Resources/views/student/new.html.twig
diff --git a/app/Resources/views/student/show.html.twig b/app/Resources/views/student/show.html.twig
diff --git a/app/Resources/views/subject/edit.html.twig b/app/Resources/views/subject/edit.html.twig
diff --git a/app/Resources/views/subject/index.html.twig b/app/Resources/views/subject/index.html.twig
diff --git a/app/Resources/views/subject/new.html.twig b/app/Resources/views/subject/new.html.twig
diff --git a/app/Resources/views/subject/show.html.twig b/app/Resources/views/subject/show.html.twig
diff --git a/app/Resources/views/university/edit.html.twig b/app/Resources/views/university/edit.html.twig
diff --git a/app/Resources/views/university/index.html.twig b/app/Resources/views/university/index.html.twig
diff --git a/app/Resources/views/university/new.html.twig b/app/Resources/views/university/new.html.twig
diff --git a/app/Resources/views/university/show.html.twig b/app/Resources/views/university/show.html.twig
diff --git a/app/Resources/views/user/edit.html.twig b/app/Resources/views/user/edit.html.twig
diff --git a/app/Resources/views/user/index.html.twig b/app/Resources/views/user/index.html.twig
diff --git a/app/Resources/views/user/new.html.twig b/app/Resources/views/user/new.html.twig
diff --git a/app/Resources/views/user/show.html.twig b/app/Resources/views/user/show.html.twig
diff --git a/app/config/config.yml b/app/config/config.yml
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml
diff --git a/app/config/config_test.yml b/app/config/config_test.yml
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
diff --git a/app/config/routing.yml b/app/config/routing.yml
diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml
diff --git a/app/config/security.yml b/app/config/security.yml
diff --git a/app/config/services.yml b/app/config/services.yml
diff --git a/composer.json b/composer.json
diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
diff --git a/src/.htaccess b/src/.htaccess
diff --git a/src/AppBundle/AppBundle.php b/src/AppBundle/AppBundle.php
diff --git a/src/AppBundle/Controller/DefaultController.php b/src/AppBundle/Controller/DefaultController.php
diff --git a/src/AppBundle/Controller/EmployeeController.php b/src/AppBundle/Controller/EmployeeController.php
diff --git a/src/AppBundle/Controller/LectureController.php b/src/AppBundle/Controller/LectureController.php
diff --git a/src/AppBundle/Controller/StudentController.php b/src/AppBundle/Controller/StudentController.php
diff --git a/src/AppBundle/Controller/SubjectController.php b/src/AppBundle/Controller/SubjectController.php
diff --git a/src/AppBundle/Controller/UniversityController.php b/src/AppBundle/Controller/UniversityController.php
diff --git a/src/AppBundle/Entity/Employee.php b/src/AppBundle/Entity/Employee.php
diff --git a/src/AppBundle/Entity/Lecture.php b/src/AppBundle/Entity/Lecture.php
diff --git a/src/AppBundle/Entity/Student.php b/src/AppBundle/Entity/Student.php
diff --git a/src/AppBundle/Entity/Subject.php b/src/AppBundle/Entity/Subject.php
diff --git a/src/AppBundle/Entity/University.php b/src/AppBundle/Entity/University.php
diff --git a/src/AppBundle/Entity/User.php b/src/AppBundle/Entity/User.php
diff --git a/src/AppBundle/Form/EmployeeType.php b/src/AppBundle/Form/EmployeeType.php
diff --git a/src/AppBundle/Form/LectureType.php b/src/AppBundle/Form/LectureType.php
diff --git a/src/AppBundle/Form/StudentType.php b/src/AppBundle/Form/StudentType.php
diff --git a/src/AppBundle/Form/SubjectType.php b/src/AppBundle/Form/SubjectType.php
@@ -8,6 +8,8 @@
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
+
+
 class SubjectType extends AbstractType
 {
     /**
@@ -20,7 +22,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('countHours', null, ['label' => 'Количество часов: '])
             ->add('students', null, ['label' => 'Студент: '])
             ->add('lecturers', null, ['label' => ' Лектор: '])
-            ->add('lectures')
+            ->add('lectures',  CollectionType::class, array(
+                'entry_type' => LectureType::class,
+                'entry_options' => array('label' => false),
+            ))
         ;
     }
 

diff --git a/src/AppBundle/Form/UniversityType.php b/src/AppBundle/Form/UniversityType.php
diff --git a/src/AppBundle/Form/UserType.php b/src/AppBundle/Form/UserType.php
diff --git a/src/AppBundle/Tests/Controller/EmployeeControllerTest.php b/src/AppBundle/Tests/Controller/EmployeeControllerTest.php
diff --git a/src/AppBundle/Tests/Controller/LectureControllerTest.php b/src/AppBundle/Tests/Controller/LectureControllerTest.php
diff --git a/src/AppBundle/Tests/Controller/StudentControllerTest.php b/src/AppBundle/Tests/Controller/StudentControllerTest.php
diff --git a/src/AppBundle/Tests/Controller/SubjectControllerTest.php b/src/AppBundle/Tests/Controller/SubjectControllerTest.php
diff --git a/src/AppBundle/Tests/Controller/UniversityControllerTest.php b/src/AppBundle/Tests/Controller/UniversityControllerTest.php
diff --git a/src/AppBundle/Tests/Controller/UserControllerTest.php b/src/AppBundle/Tests/Controller/UserControllerTest.php
diff --git a/tests/AppBundle/Controller/DefaultControllerTest.php b/tests/AppBundle/Controller/DefaultControllerTest.php
diff --git a/var/SymfonyRequirements.php b/var/SymfonyRequirements.php
diff --git a/var/cache/.gitkeep b/var/cache/.gitkeep
diff --git a/var/logs/.gitkeep b/var/logs/.gitkeep
diff --git a/var/sessions/.gitkeep b/var/sessions/.gitkeep
diff --git a/web/.htaccess b/web/.htaccess
diff --git a/web/app.php b/web/app.php
diff --git a/web/app_dev.php b/web/app_dev.php
diff --git a/web/apple-touch-icon.png b/web/apple-touch-icon.png
diff --git a/web/config.php b/web/config.php
diff --git a/web/favicon.ico b/web/favicon.ico
diff --git a/web/robots.txt b/web/robots.txt