Skip to content

GitLab

B
backend-mcafee
Commit 6eee2167 authored by Cristian Mauricio Diaz Canales's avatar Cristian Mauricio Diaz Canales 💬
Browse files
Options

fixes varios

parent 8f0920c1
Show whitespace changes
Inline Side-by-side
Showing with 147 additions and 93 deletions
app/AppKernel.php
View file @ 6eee2167
...@@ -23,6 +23,7 @@ class AppKernel extends Kernel ...@@ -23,6 +23,7 @@ class AppKernel extends Kernel
new AppBundle\AppBundle(), new AppBundle\AppBundle(),
new BackendBundle\BackendBundle(), new BackendBundle\BackendBundle(),
new CampaniaBundle\CampaniaBundle(), new CampaniaBundle\CampaniaBundle(),
new CampaniaFrontBundle\CampaniaFrontBundle(),
new WsBundle\WsBundle(), new WsBundle\WsBundle(),
); );
......
app/Resources/views/backend_content/pages/campanias/nuevaCampania.html.twig
View file @ 6eee2167
...@@ -90,6 +90,7 @@ ...@@ -90,6 +90,7 @@
<input id="url_campania" type="text" class="form-control" value="{{campania.getCamUrlFinalCampania()}}" placeholder="" disabled="disabled"/> <input id="url_campania" type="text" class="form-control" value="{{campania.getCamUrlFinalCampania()}}" placeholder="" disabled="disabled"/>
<div class="input-group-append"> <div class="input-group-append">
<a href="#" onclick="urlCopy(event)" title="copiar url de la campaña" class="btn btn-secondary" data-clipboard="true" data-clipboard-target="#url_campania"><i class="la la-copy"></i></a> <a href="#" onclick="urlCopy(event)" title="copiar url de la campaña" class="btn btn-secondary" data-clipboard="true" data-clipboard-target="#url_campania"><i class="la la-copy"></i></a>
<a href="#" onclick="urlPreview(event)" title="previsualizar campaña generada" class="btn btn-secondary"><i class="la la-eye"></i></a>
</div> </div>
</div> </div>
<span class="form-text text-muted">Url generada para la campaña. Puede copiar este elemento para poder abrirlo en el navegador.</span> <span class="form-text text-muted">Url generada para la campaña. Puede copiar este elemento para poder abrirlo en el navegador.</span>
...@@ -1149,6 +1150,11 @@ ...@@ -1149,6 +1150,11 @@
$("#url_campania").prop("disabled", true); $("#url_campania").prop("disabled", true);
} }
function urlPreview(event){
event.preventDefault();
window.open($("#url_campania").val(),'_blank');
}
/** /**
* CARGA DEL DOCUMENTO * CARGA DEL DOCUMENTO
* *
......
app/config/routing.yml
View file @ 6eee2167
...@@ -17,5 +17,9 @@ NelmioApiDocBundle: ...@@ -17,5 +17,9 @@ NelmioApiDocBundle:
campania_api_test: campania_api_test:
path: mcafee/landing/1 path: mcafee/landing/1
defaults: { _controller: CampaniaBundle:Campania:cargarHtmlFront } defaults: { _controller: CampaniaFrontBundle:CampaniaFront:cargarHtmlFront }
campania_api_test_2:
path: mcafee/landing/2
defaults: { _controller: CampaniaFrontBundle:CampaniaFront:cargarHtmlFront }
\ No newline at end of file
src/CampaniaBundle/Controller/CampaniaController.php
View file @ 6eee2167
...@@ -507,41 +507,6 @@ class CampaniaController extends Controller { ...@@ -507,41 +507,6 @@ class CampaniaController extends Controller {
return $this->render("backend_content/pages/campanias/listadoCampanias.html.twig", array("campanias" => $campanias)); return $this->render("backend_content/pages/campanias/listadoCampanias.html.twig", array("campanias" => $campanias));
} }
//BORRAR LUEGO, SOLO PRUEBA
public function cargarHtmlFrontAction(Request $request) {
$data = array('id' => 24);
$data_json = json_encode($data);
$htmlContent = array();
$username = "userApi";
$password = "34lq4od8usda";
$headers = array(
'Content-Type:application/json',
'Authorization: Basic ' . base64_encode("$username:$password") // <---
);
try {
$url = Utiles::getParametroConfiguracion("url_base") . "/api/mcafee/campania/obtener/contenido.json";
$ch = curl_init($url);
//curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json'));
curl_setopt($ch, CURLOPT_POST, 1);
curl_setopt($ch, CURLOPT_USERAGENT, $request->headers->get('User-Agent'));
curl_setopt($ch, CURLOPT_POSTFIELDS, $data_json);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_TIMEOUT, 60);
//curl_setopt($ch, CURLOPT_USERPWD, $username . ":" . $password);
curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
$output = curl_exec($ch);
curl_close($ch);
$htmlContent = json_decode($output, true);
} catch (\Exception $e) {
}
//MODO DE PRUEBA
//print_r($htmlContent);
//exit();
return $this->render('front/campania/prueba.html.twig', array("templateCss" => $htmlContent["templateCss"], "headContent" => $htmlContent["contenidoHead"], "bodyContent" => $htmlContent["contenidoBody"], "footerContent" => $htmlContent["contenidoFooter"]));
}
public function loadDataContenidoAction(Request $request) { public function loadDataContenidoAction(Request $request) {
$log = Utiles::setLog('CampaniaBundle\Controller\CampaniaController:loadDataContenidoAction', 'mcafee/campania/index'); $log = Utiles::setLog('CampaniaBundle\Controller\CampaniaController:loadDataContenidoAction', 'mcafee/campania/index');
$user = $this->get('security.token_storage')->getToken()->getUser(); $user = $this->get('security.token_storage')->getToken()->getUser();
......
src/CampaniaBundle/Resources/config/routing.yml
View file @ 6eee2167
campania_listado:
path: /listado/campanias
defaults: {_controller: CampaniaBundle:Campania:listadoCampanias}
campania_generando_nueva_campania:
path: /generando/nueva/campania
defaults: {_controller: CampaniaBundle:Campania:generandoNuevaCampania}
campania_crear:
path: /nueva/{camId}
defaults: { _controller: CampaniaBundle:Campania:nuevaCampania, camId : none}
requirements:
camId: '\d+'
campania_eliminar:
path: /eliminar/{camId}
defaults: {_controller : CampaniaBundle:Campania:eliminarCampania, camId: none}
requirements:
camId: '\d+'
campania_eliminar_contenido:
path: /eliminar/contenido
defaults: {_controller: CampaniaBundle:Campania:eliminarContenido}
campania_crear_fila_seccion:
path: /crear/fila/seccion
defaults: { _controller: CampaniaBundle:Campania:generarNuevaFila}
campania_crear_fila_seccion_editar:
path: /crear/fila/seccion/editar
defaults: { _controller: CampaniaBundle:Campania:generarNuevaFilaEditar}
campania_recargar_fila_selector:
path: /recargar/fila/selector
defaults: { _controller: CampaniaBundle:Campania:reloadFilaSelector}
campania_recargar_columna_selector:
path: /recargar/columna/selector
defaults: { _controller: CampaniaBundle:Campania:reloadColumnaSelector}
campania_save_contenido:
path: /guardar/contenido/campania
defaults: { _controller: CampaniaBundle:Campania:saveContenido}
campania_actualizar_con_contenido:
path: /actualizar/campania
defaults: { _controller: CampaniaBundle:Campania:actualizarCampania}
campania_cargar_datos_contenido:
path: /cargar/datos/contenido/campania
defaults: {_controller: CampaniaBundle:Campania:loadDataContenido}
campania_update_contenido:
path: /actualizar/contenido/campania
defaults: { _controller: CampaniaBundle:Campania:updateContenido}
\ No newline at end of file
src/CampaniaFrontBundle/CampaniaFrontBundle.php 0 → 100644
View file @ 6eee2167
<?php
namespace CampaniaFrontBundle;
use Symfony\Component\HttpKernel\Bundle\Bundle;
class CampaniaFrontBundle extends Bundle
{
}
src/CampaniaFrontBundle/Controller/CampaniaFrontController.php 0 → 100644
View file @ 6eee2167
<?php
namespace CampaniaFrontBundle\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\JsonResponse;
use AppBundle\Lib\Utiles;
use AppBundle\Model\Seccion;
use AppBundle\Model\Disposicion;
use AppBundle\Model\DisposicionColumnas;
use AppBundle\Model\Fila;
use AppBundle\Model\Tipo;
use AppBundle\Model\SeccionQuery;
use AppBundle\Model\DisposicionQuery;
use AppBundle\Model\DisposicionColumnasQuery;
use AppBundle\Model\FilaQuery;
use AppBundle\Model\TipoQuery;
use AppBundle\Model\Campania;
use AppBundle\Model\CampaniaQuery;
use AppBundle\Model\CampaniaContenido;
use AppBundle\Model\CampaniaContenidoQuery;
use AppBundle\Model\Template;
use AppBundle\Model\TemplateQuery;
class CampaniaFrontController extends Controller {
//BORRAR LUEGO, SOLO PRUEBA
public function cargarHtmlFrontAction(Request $request) {
$data = array('id' => 24);
$data_json = json_encode($data);
$htmlContent = array();
$username = "userApi";
$password = "34lq4od8usda";
$headers = array(
'Content-Type:application/json',
'Authorization: Basic ' . base64_encode("$username:$password") // <---
);
try {
$url = Utiles::getParametroConfiguracion("url_base") . "/api/mcafee/campania/obtener/contenido.json";
$ch = curl_init($url);
//curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json'));
curl_setopt($ch, CURLOPT_POST, 1);
curl_setopt($ch, CURLOPT_USERAGENT, $request->headers->get('User-Agent'));
curl_setopt($ch, CURLOPT_POSTFIELDS, $data_json);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_TIMEOUT, 120);
//curl_setopt($ch, CURLOPT_USERPWD, $username . ":" . $password);
curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
$output = curl_exec($ch);
curl_close($ch);
$htmlContent = json_decode($output, true);
} catch (\Exception $e) {
}
//MODO DE PRUEBA
//print_r($htmlContent);
//exit();
return $this->render('front/campania/prueba.html.twig', array("templateCss" => $htmlContent["templateCss"], "headContent" => $htmlContent["contenidoHead"], "bodyContent" => $htmlContent["contenidoBody"], "footerContent" => $htmlContent["contenidoFooter"]));
}
}
src/CampaniaFrontBundle/Resources/config/routing.yml 0 → 100644
View file @ 6eee2167
campania_listado:
path: /listado/campanias
defaults: {_controller: CampaniaBundle:Campania:listadoCampanias}
campania_generando_nueva_campania:
path: /generando/nueva/campania
defaults: {_controller: CampaniaBundle:Campania:generandoNuevaCampania}
campania_crear:
path: /nueva/{camId}
defaults: { _controller: CampaniaBundle:Campania:nuevaCampania, camId : none}
requirements:
camId: '\d+'
campania_eliminar:
path: /eliminar/{camId}
defaults: {_controller : CampaniaBundle:Campania:eliminarCampania, camId: none}
requirements:
camId: '\d+'
campania_eliminar_contenido:
path: /eliminar/contenido
defaults: {_controller: CampaniaBundle:Campania:eliminarContenido}
campania_crear_fila_seccion:
path: /crear/fila/seccion
defaults: { _controller: CampaniaBundle:Campania:generarNuevaFila}
campania_crear_fila_seccion_editar:
path: /crear/fila/seccion/editar
defaults: { _controller: CampaniaBundle:Campania:generarNuevaFilaEditar}
campania_recargar_fila_selector:
path: /recargar/fila/selector
defaults: { _controller: CampaniaBundle:Campania:reloadFilaSelector}
campania_recargar_columna_selector:
path: /recargar/columna/selector
defaults: { _controller: CampaniaBundle:Campania:reloadColumnaSelector}
campania_save_contenido:
path: /guardar/contenido/campania
defaults: { _controller: CampaniaBundle:Campania:saveContenido}
campania_actualizar_con_contenido:
path: /actualizar/campania
defaults: { _controller: CampaniaBundle:Campania:actualizarCampania}
campania_cargar_datos_contenido:
path: /cargar/datos/contenido/campania
defaults: {_controller: CampaniaBundle:Campania:loadDataContenido}
campania_update_contenido:
path: /actualizar/contenido/campania
defaults: { _controller: CampaniaBundle:Campania:updateContenido}
\ No newline at end of file
src/CampaniaFrontBundle/Resources/config/services.yml 0 → 100644
View file @ 6eee2167
services:
# campania.example:
# class: CampaniaBundle\Example
# arguments: ["@service_id", "plain_value", "%parameter%"]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment