Merge pull request #673 from arnaudbey/add-author-field

add task authorMore field
InnovaLangues · Nov 19, 2014 · 87649a7 · 87649a7
2 parents 1a9525b + d24621b
commit 87649a7
Show file tree

Hide file tree

Showing 9 changed files with 85 additions and 0 deletions.
diff --git a/app/DoctrineMigrations/Version20141119154615.php b/app/DoctrineMigrations/Version20141119154615.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Application\Migrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20141119154615 extends AbstractMigration
+{
+    public function up(Schema $schema)
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('ALTER TABLE questionnaire ADD authorMore LONGTEXT DEFAULT NULL');
+    }
+
+    public function down(Schema $schema)
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('ALTER TABLE questionnaire DROP authorMore');
+    }
+}
diff --git a/src/Innova/SelfBundle/Entity/Questionnaire.php b/src/Innova/SelfBundle/Entity/Questionnaire.php
@@ -32,6 +32,13 @@ class Questionnaire
     */
     protected $author;
 
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="authorMore", type="text", nullable=true)
+     */
+    private $authorMore;
+
     /**
     * @ORM\ManyToMany(targetEntity="User", inversedBy="revisedQuestionnaires")
     * @ORM\JoinTable(name="questionnaires_revisors")
@@ -1155,4 +1162,27 @@ public function getFlow()
     {
         return $this->flow;
     }
+
+    /**
+     * Set authorMore
+     *
+     * @param string $authorMore
+     * @return Questionnaire
+     */
+    public function setAuthorMore($authorMore)
+    {
+        $this->authorMore = $authorMore;
+
+        return $this;
+    }
+
+    /**
+     * Get authorMore
+     *
+     * @return string 
+     */
+    public function getAuthorMore()
+    {
+        return $this->authorMore;
+    }
 }
diff --git a/src/Innova/SelfBundle/Form/Type/QuestionnaireType.php b/src/Innova/SelfBundle/Form/Type/QuestionnaireType.php
@@ -9,6 +9,12 @@ class QuestionnaireType extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
+            $builder ->add('authorMore', 'textarea', array(
+                'attr' => array('class'=>'form-control identity-select','data-field'=>'authorMore'),
+                'label'  => 'editor.identity.authorMore',
+                'translation_domain' => 'messages'
+            ));
+
             $builder ->add('theme', 'text', array(
                 'attr' => array('class'=>'form-control identity-select','data-field'=>'theme'),
                 'label'  => 'editor.identity.theme',

diff --git a/src/Innova/SelfBundle/Manager/QuestionnaireManager.php b/src/Innova/SelfBundle/Manager/QuestionnaireManager.php
@@ -86,6 +86,9 @@ public function setIdentityField($questionnaire, $field, $value)
         $em = $this->entityManager;
 
         switch ($field) {
+            case 'authorMore':
+                $questionnaire->setAuthorMore($value);
+                break;
             case 'authorRightMore':
                 $questionnaire->setAuthorRightMore($value);
                 break;

diff --git a/src/Innova/SelfBundle/Resources/translations/messages.cn.yml b/src/Innova/SelfBundle/Resources/translations/messages.cn.yml
@@ -171,6 +171,7 @@ editor:
         skill: Compétence
         theme: Titre
         fixedOrder: Ordre fixe
+        authorMore: Task author
 
     log:
         editor_create: Création de

diff --git a/src/Innova/SelfBundle/Resources/translations/messages.en.yml b/src/Innova/SelfBundle/Resources/translations/messages.en.yml
@@ -177,6 +177,7 @@ editor:
         skill: Skill
         theme: Title
         fixedOrder: Fixed order
+        authorMore: Task author
 
     log:
         editor_create: Create

diff --git a/src/Innova/SelfBundle/Resources/translations/messages.fr.yml b/src/Innova/SelfBundle/Resources/translations/messages.fr.yml
@@ -184,6 +184,7 @@ editor:
         skill: Compétence
         theme: Titre
         fixedOrder: Ordre fixe
+        authorMore: Auteur(s) de la tâche
 
     log:
         editor_create: Création de

diff --git a/src/Innova/SelfBundle/Resources/translations/messages.it.yml b/src/Innova/SelfBundle/Resources/translations/messages.it.yml
@@ -185,6 +185,8 @@ editor:
         skill: Competenza
         theme: Titolo
         fixedOrder: Ordine fisso
+        authorMore: Auteur(s) de la tâche
+
     log:
         editor_create: Creazione di
         editor_edit: Modifica di

diff --git a/src/Innova/SelfBundle/Resources/views/Editor/partials/identity.html.twig b/src/Innova/SelfBundle/Resources/views/Editor/partials/identity.html.twig
@@ -123,6 +123,19 @@
                     </div>
                 </div>
 
+                <div class="col-md-12">
+                    <div class="col-md-6">
+                        <div class="panel panel-default ">
+                            <div class="panel-heading">{{ 'editor.identity.authorMore' | trans }}</div>
+                            <div class="panel-body">
+                                <div class="form-group">
+                                {{ form_widget(form.authorMore) }}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
                 <div class="col-md-12">
                     <div class="alert alert-info" role="alert">
                     {{ 'editor.identity.createdby' | trans }}