cambios campania

app/Resources/views/backend_content/pages/campanias/nuevaCampania.html.twig

@@ -521,7 +521,7 @@
                         lastIndex = data.contenidoId;
                         var valorFila = data.filaValor;
                         json.id = lastIndex;
-                        var actionColumns = '\n\<a id="edit_'+lastIndex+'" href="" onclick="showModalEditar(event,25)" class="navi-link"><span class="btn btn-icon btn-light btn-hover-primary btn-sm"><i class="fa fa-lg fa-edit"></i></span></a>\n\\n\
+                        var actionColumns = '\n\<a id="edit_'+lastIndex+'" href="" onclick="showModalEditar(event,25)" class="navi-link"><span class="btn btn-icon btn-light btn-hover-primary btn-sm"><i class="fa fa-lg fa-edit"></i></span></a>\n\
                             <a id="delete_' + lastIndex + '" href="" onclick="eliminarContenido(event,' + lastIndex + ', ' + $("#generador-contenido-selector-fila-editar").val() + ')" class="navi-link">\n\
                                 <span class="btn btn-icon btn-light btn-hover-primary btn-sm">\n\
                                     <i class="fa fa-lg fa-trash"></i>\n\

app/propel/generated-schemas/conn1_reversed_schema.xml

@@ -80,6 +80,7 @@
     <column name="cco_id" phpName="CcoId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
     <column name="cam_id" phpName="CamId" type="INTEGER" required="false"/>
     <column name="dis_id" phpName="DisId" type="INTEGER" required="false"/>
+    <column name="dco_id" phpName="DcoId" type="INTEGER" required="false"/>
     <column name="sec_id" phpName="SecId" type="INTEGER" required="false"/>
     <column name="fil_id" phpName="FilId" type="INTEGER" required="false"/>
     <column name="cco_entorno" phpName="CcoEntorno" type="INTEGER" required="false"/>
@@ -94,6 +95,9 @@
     <foreign-key foreignTable="campania" name="fk_cam_pk_fk" onDelete="RESTRICT" onUpdate="RESTRICT">
       <reference local="cam_id" foreign="cam_id"/>
     </foreign-key>
+    <foreign-key foreignTable="disposicion_columnas" name="fk_dis_col_pk_fk" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference local="dco_id" foreign="dco_id"/>
+    </foreign-key>
     <foreign-key foreignTable="disposicion" name="fk_dis_pk_fk" onDelete="RESTRICT" onUpdate="RESTRICT">
       <reference local="dis_id" foreign="dis_id"/>
     </foreign-key>
@@ -115,6 +119,9 @@
     <index name="fk_fil_pk_fk_idx">
       <index-column name="fil_id"/>
     </index>
+    <index name="fk_dis_col_pk_fk_idx">
+      <index-column name="dco_id"/>
+    </index>
     <vendor type="mysql">
       <parameter name="Engine" value="InnoDB"/>
     </vendor>

src/AppBundle/Model/map/CampaniaContenidoTableMap.php

@@ -44,12 +44,13 @@ class CampaniaContenidoTableMap extends TableMap
         // columns
         $this->addPrimaryKey('cco_id', 'CcoId', 'INTEGER', true, null, null);
         $this->addForeignKey('cam_id', 'CamId', 'INTEGER', 'campania', 'cam_id', false, null, null);
-        $this->addForeignKey('dis_id', 'DisId', 'INTEGER', 'disposicion', 'dis_id', false, 6, null);
-        $this->addForeignKey('sec_id', 'SecId', 'INTEGER', 'seccion', 'sec_id', false, 6, null);
-        $this->addForeignKey('fil_id', 'FilId', 'INTEGER', 'fila', 'fil_id', false, 6, null);
+        $this->addForeignKey('dis_id', 'DisId', 'INTEGER', 'disposicion', 'dis_id', false, null, null);
+        $this->addForeignKey('dco_id', 'DcoId', 'INTEGER', 'disposicion_columnas', 'dco_id', false, null, null);
+        $this->addForeignKey('sec_id', 'SecId', 'INTEGER', 'seccion', 'sec_id', false, null, null);
+        $this->addForeignKey('fil_id', 'FilId', 'INTEGER', 'fila', 'fil_id', false, null, null);
         $this->addColumn('cco_entorno', 'CcoEntorno', 'INTEGER', false, null, null);
         $this->addColumn('cco_contenido', 'CcoContenido', 'LONGVARCHAR', false, null, null);
-        $this->addColumn('cco_columna', 'CcoColumna', 'INTEGER', false, 6, null);
+        $this->addColumn('cco_columna', 'CcoColumna', 'INTEGER', false, null, null);
         $this->addColumn('cco_orden', 'CcoOrden', 'INTEGER', false, null, null);
         $this->addColumn('cco_tipo', 'CcoTipo', 'INTEGER', false, null, null);
         $this->addColumn('cco_estado', 'CcoEstado', 'INTEGER', false, null, null);
@@ -65,6 +66,7 @@ class CampaniaContenidoTableMap extends TableMap
     public function buildRelations()
     {
         $this->addRelation('Campania', 'AppBundle\\Model\\Campania', RelationMap::MANY_TO_ONE, array('cam_id' => 'cam_id', ), null, null);
+        $this->addRelation('DisposicionColumnas', 'AppBundle\\Model\\DisposicionColumnas', RelationMap::MANY_TO_ONE, array('dco_id' => 'dco_id', ), null, null);
         $this->addRelation('Disposicion', 'AppBundle\\Model\\Disposicion', RelationMap::MANY_TO_ONE, array('dis_id' => 'dis_id', ), null, null);
         $this->addRelation('Fila', 'AppBundle\\Model\\Fila', RelationMap::MANY_TO_ONE, array('fil_id' => 'fil_id', ), null, null);
         $this->addRelation('Seccion', 'AppBundle\\Model\\Seccion', RelationMap::MANY_TO_ONE, array('sec_id' => 'sec_id', ), null, null);

src/AppBundle/Model/map/DisposicionColumnasTableMap.php

@@ -55,6 +55,7 @@ class DisposicionColumnasTableMap extends TableMap
      */
     public function buildRelations()
     {
+        $this->addRelation('CampaniaContenido', 'AppBundle\\Model\\CampaniaContenido', RelationMap::ONE_TO_MANY, array('dco_id' => 'dco_id', ), null, null, 'CampaniaContenidos');
         $this->addRelation('Fila', 'AppBundle\\Model\\Fila', RelationMap::ONE_TO_MANY, array('dco_id' => 'dco_id', ), null, null, 'Filas');
     } // buildRelations()
 

src/AppBundle/Model/om/BaseCampania.php

@@ -2194,6 +2194,31 @@ abstract class BaseCampania extends BaseObject implements Persistent
     }
 
 
+    /**
+     * If this collection has already been initialized with
+     * an identical criteria, it returns the collection.
+     * Otherwise if this Campania is new, it will return
+     * an empty collection; or if this Campania has previously
+     * been saved, it will retrieve related CampaniaContenidos from storage.
+     *
+     * This method is protected by default in order to keep the public
+     * api reasonable.  You can provide public methods for those you
+     * actually need in Campania.
+     *
+     * @param Criteria $criteria optional Criteria object to narrow the query
+     * @param PropelPDO $con optional connection object
+     * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN)
+     * @return PropelObjectCollection|CampaniaContenido[] List of CampaniaContenido objects
+     */
+    public function getCampaniaContenidosJoinDisposicionColumnas($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN)
+    {
+        $query = CampaniaContenidoQuery::create(null, $criteria);
+        $query->joinWith('DisposicionColumnas', $join_behavior);
+
+        return $this->getCampaniaContenidos($query, $con);
+    }
+
+
     /**
      * If this collection has already been initialized with
      * an identical criteria, it returns the collection.

src/AppBundle/Model/om/BaseDisposicion.php

@@ -1219,6 +1219,31 @@ abstract class BaseDisposicion extends BaseObject implements Persistent
     }
 
 
+    /**
+     * If this collection has already been initialized with
+     * an identical criteria, it returns the collection.
+     * Otherwise if this Disposicion is new, it will return
+     * an empty collection; or if this Disposicion has previously
+     * been saved, it will retrieve related CampaniaContenidos from storage.
+     *
+     * This method is protected by default in order to keep the public
+     * api reasonable.  You can provide public methods for those you
+     * actually need in Disposicion.
+     *
+     * @param Criteria $criteria optional Criteria object to narrow the query
+     * @param PropelPDO $con optional connection object
+     * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN)
+     * @return PropelObjectCollection|CampaniaContenido[] List of CampaniaContenido objects
+     */
+    public function getCampaniaContenidosJoinDisposicionColumnas($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN)
+    {
+        $query = CampaniaContenidoQuery::create(null, $criteria);
+        $query->joinWith('DisposicionColumnas', $join_behavior);
+
+        return $this->getCampaniaContenidos($query, $con);
+    }
+
+
     /**
      * If this collection has already been initialized with
      * an identical criteria, it returns the collection.

src/AppBundle/Model/om/BaseDisposicionColumnasQuery.php

@@ -12,6 +12,7 @@ use \PropelCollection;
 use \PropelException;
 use \PropelObjectCollection;
 use \PropelPDO;
+use AppBundle\Model\CampaniaContenido;
 use AppBundle\Model\DisposicionColumnas;
 use AppBundle\Model\DisposicionColumnasPeer;
 use AppBundle\Model\DisposicionColumnasQuery;
@@ -34,6 +35,10 @@ use AppBundle\Model\Fila;
  * @method DisposicionColumnasQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
  * @method DisposicionColumnasQuery innerJoin($relation) Adds a INNER JOIN clause to the query
  *
+ * @method DisposicionColumnasQuery leftJoinCampaniaContenido($relationAlias = null) Adds a LEFT JOIN clause to the query using the CampaniaContenido relation
+ * @method DisposicionColumnasQuery rightJoinCampaniaContenido($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CampaniaContenido relation
+ * @method DisposicionColumnasQuery innerJoinCampaniaContenido($relationAlias = null) Adds a INNER JOIN clause to the query using the CampaniaContenido relation
+ *
  * @method DisposicionColumnasQuery leftJoinFila($relationAlias = null) Adds a LEFT JOIN clause to the query using the Fila relation
  * @method DisposicionColumnasQuery rightJoinFila($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Fila relation
  * @method DisposicionColumnasQuery innerJoinFila($relationAlias = null) Adds a INNER JOIN clause to the query using the Fila relation
@@ -442,6 +447,80 @@ abstract class BaseDisposicionColumnasQuery extends ModelCriteria
         return $this->addUsingAlias(DisposicionColumnasPeer::DCO_ELIMINADO, $dcoEliminado, $comparison);
     }
 
+    /**
+     * Filter the query by a related CampaniaContenido object
+     *
+     * @param   CampaniaContenido|PropelObjectCollection $campaniaContenido  the related object to use as filter
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return                 DisposicionColumnasQuery The current query, for fluid interface
+     * @throws PropelException - if the provided filter is invalid.
+     */
+    public function filterByCampaniaContenido($campaniaContenido, $comparison = null)
+    {
+        if ($campaniaContenido instanceof CampaniaContenido) {
+            return $this
+                ->addUsingAlias(DisposicionColumnasPeer::DCO_ID, $campaniaContenido->getDcoId(), $comparison);
+        } elseif ($campaniaContenido instanceof PropelObjectCollection) {
+            return $this
+                ->useCampaniaContenidoQuery()
+                ->filterByPrimaryKeys($campaniaContenido->getPrimaryKeys())
+                ->endUse();
+        } else {
+            throw new PropelException('filterByCampaniaContenido() only accepts arguments of type CampaniaContenido or PropelCollection');
+        }
+    }
+
+    /**
+     * Adds a JOIN clause to the query using the CampaniaContenido relation
+     *
+     * @param     string $relationAlias optional alias for the relation
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return DisposicionColumnasQuery The current query, for fluid interface
+     */
+    public function joinCampaniaContenido($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    {
+        $tableMap = $this->getTableMap();
+        $relationMap = $tableMap->getRelation('CampaniaContenido');
+
+        // create a ModelJoin object for this join
+        $join = new ModelJoin();
+        $join->setJoinType($joinType);
+        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+        if ($previousJoin = $this->getPreviousJoin()) {
+            $join->setPreviousJoin($previousJoin);
+        }
+
+        // add the ModelJoin to the current object
+        if ($relationAlias) {
+            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+            $this->addJoinObject($join, $relationAlias);
+        } else {
+            $this->addJoinObject($join, 'CampaniaContenido');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Use the CampaniaContenido relation CampaniaContenido object
+     *
+     * @see       useQuery()
+     *
+     * @param     string $relationAlias optional alias for the relation,
+     *                                   to be used as main alias in the secondary query
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return   \AppBundle\Model\CampaniaContenidoQuery A secondary query class using the current class as primary query
+     */
+    public function useCampaniaContenidoQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    {
+        return $this
+            ->joinCampaniaContenido($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'CampaniaContenido', '\AppBundle\Model\CampaniaContenidoQuery');
+    }
+
     /**
      * Filter the query by a related Fila object
      *

src/AppBundle/Model/om/BaseFila.php

@@ -1910,6 +1910,31 @@ abstract class BaseFila extends BaseObject implements Persistent
     }
 
 
+    /**
+     * If this collection has already been initialized with
+     * an identical criteria, it returns the collection.
+     * Otherwise if this Fila is new, it will return
+     * an empty collection; or if this Fila has previously
+     * been saved, it will retrieve related CampaniaContenidos from storage.
+     *
+     * This method is protected by default in order to keep the public
+     * api reasonable.  You can provide public methods for those you
+     * actually need in Fila.
+     *
+     * @param Criteria $criteria optional Criteria object to narrow the query
+     * @param PropelPDO $con optional connection object
+     * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN)
+     * @return PropelObjectCollection|CampaniaContenido[] List of CampaniaContenido objects
+     */
+    public function getCampaniaContenidosJoinDisposicionColumnas($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN)
+    {
+        $query = CampaniaContenidoQuery::create(null, $criteria);
+        $query->joinWith('DisposicionColumnas', $join_behavior);
+
+        return $this->getCampaniaContenidos($query, $con);
+    }
+
+
     /**
      * If this collection has already been initialized with
      * an identical criteria, it returns the collection.

src/AppBundle/Model/om/BaseSeccion.php

@@ -1273,6 +1273,31 @@ abstract class BaseSeccion extends BaseObject implements Persistent
     }
 
 
+    /**
+     * If this collection has already been initialized with
+     * an identical criteria, it returns the collection.
+     * Otherwise if this Seccion is new, it will return
+     * an empty collection; or if this Seccion has previously
+     * been saved, it will retrieve related CampaniaContenidos from storage.
+     *
+     * This method is protected by default in order to keep the public
+     * api reasonable.  You can provide public methods for those you
+     * actually need in Seccion.
+     *
+     * @param Criteria $criteria optional Criteria object to narrow the query
+     * @param PropelPDO $con optional connection object
+     * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN)
+     * @return PropelObjectCollection|CampaniaContenido[] List of CampaniaContenido objects
+     */
+    public function getCampaniaContenidosJoinDisposicionColumnas($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN)
+    {
+        $query = CampaniaContenidoQuery::create(null, $criteria);
+        $query->joinWith('DisposicionColumnas', $join_behavior);
+
+        return $this->getCampaniaContenidos($query, $con);
+    }
+
+
     /**
      * If this collection has already been initialized with
      * an identical criteria, it returns the collection.

src/AppBundle/Resources/config/conn1_reversed_schema.xml

@@ -76,12 +76,13 @@
   <table name="campania_contenido" phpName="CampaniaContenido" idMethod="native">
     <column name="cco_id" phpName="CcoId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
     <column name="cam_id" phpName="CamId" type="INTEGER" required="false"/>
-    <column name="dis_id" phpName="DisId" type="INTEGER" size="6" required="false"/>
-    <column name="sec_id" phpName="SecId" type="INTEGER" size="6" required="false"/>
-    <column name="fil_id" phpName="FilId" type="INTEGER" size="6" required="false"/>
+    <column name="dis_id" phpName="DisId" type="INTEGER" required="false"/>
+    <column name="dco_id" phpName="DcoId" type="INTEGER" required="false"/>
+    <column name="sec_id" phpName="SecId" type="INTEGER" required="false"/>
+    <column name="fil_id" phpName="FilId" type="INTEGER" required="false"/>
     <column name="cco_entorno" phpName="CcoEntorno" type="INTEGER" required="false"/>
     <column name="cco_contenido" phpName="CcoContenido" type="LONGVARCHAR" required="false"/>
-    <column name="cco_columna" phpName="CcoColumna" type="INTEGER" size="6" required="false"/>
+    <column name="cco_columna" phpName="CcoColumna" type="INTEGER" required="false"/>
     <column name="cco_orden" phpName="CcoOrden" type="INTEGER" required="false"/>
     <column name="cco_tipo" phpName="CcoTipo" type="INTEGER" required="false"/>
     <column name="cco_estado" phpName="CcoEstado" type="INTEGER" required="false"/>
@@ -90,6 +91,9 @@
     <foreign-key foreignTable="campania" name="fk_cam_pk_fk" onDelete="RESTRICT" onUpdate="RESTRICT">
       <reference local="cam_id" foreign="cam_id"/>
     </foreign-key>
+    <foreign-key foreignTable="disposicion_columnas" name="fk_dis_col_pk_fk" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference local="dco_id" foreign="dco_id"/>
+    </foreign-key>
     <foreign-key foreignTable="disposicion" name="fk_dis_pk_fk" onDelete="RESTRICT" onUpdate="RESTRICT">
       <reference local="dis_id" foreign="dis_id"/>
     </foreign-key>
@@ -111,6 +115,9 @@
     <index name="fk_fil_pk_fk_idx">
       <index-column name="fil_id"/>
     </index>
+    <index name="fk_dis_col_pk_fk_idx">
+      <index-column name="dco_id"/>
+    </index>
     <vendor type="mysql">
       <parameter name="Engine" value="InnoDB"/>
     </vendor>

src/CampaniaBundle/Controller/CampaniaController.php

@@ -329,7 +329,8 @@ class CampaniaController extends Controller {
         $log->debug("generando contenido nuevo asociado a la camapaña $campaniaId...");
         $contenidoCampania = new CampaniaContenido();
         $contenidoCampania->setCamId($campaniaId);
-        $contenidoCampania->setDisId($disposicionId);
+        $contenidoCampania->setDisId($entorno);
+        $contenidoCampania->setDcoId($disposicionId);
         $contenidoCampania->setSecId($seccionId);
         $contenidoCampania->setFilId($filaId);
         $contenidoCampania->setCcoContenido($contenido);