Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"php": "^7.1.3",
"ext-ctype": "*",
"ext-iconv": "*",
"facebook/webdriver": "^1.7",
"sensio/framework-extra-bundle": "^5.1",
"symfony/asset": "4.2.*",
"symfony/console": "4.2.*",
Expand Down Expand Up @@ -77,5 +78,8 @@
"allow-contrib": false,
"require": "4.2.*"
}
},
"require": {
"ext-curl": "^7.3"
}
}
Binary file modified data/database.sqlite
Binary file not shown.
57 changes: 53 additions & 4 deletions src/Controller/ImovelController.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

use App\Entity\Imovel;
use App\Forms\ImovelType;
use App\Service\ImovelService;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\Routing\Annotation\Route;
Expand All @@ -19,7 +20,7 @@ class ImovelController extends AbstractController
* @param Request $request
* @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
*/
public function cadastroImovel(Request $request)
public function cadastroImovel(Request $request, ImovelService $imovelService)
{

$imovel = new Imovel();
Expand All @@ -28,9 +29,11 @@ public function cadastroImovel(Request $request)

if ($form->isSubmitted()) {
$imovel = $form->getData();
$em = $this->getDoctrine()->getManager();
$em->persist($imovel);
$em->flush();
//$em = $this->getDoctrine()->getManager();
//$em->persist($imovel);
//$em->flush();

$imovelService->salvar($imovel);

return $this->redirectToRoute('index');
}
Expand All @@ -41,6 +44,37 @@ public function cadastroImovel(Request $request)

}

/**
* @Route("/editar/{id}", name="editar_imovel")
*/
public function editarImovel(int $id, Request $request, ImovelService $imovelService)
{
$imovel = $this->getDoctrine()->getManager()->getRepository(Imovel::class)->find($id);
//$imovel = $em->getRepository(Imovel::class)->find($id);

if (!$imovel) {
throw new \Exception('Imovel não encontrado');
}

$form = $this->createForm(ImovelType::class, $imovel);
$form->handleRequest($request);

if ($form->isSubmitted()) {
$imovel = $form->getData();
$imovelService->editar($imovel);
//$em = $this->getDoctrine()->getManager();
//$em->merge($imovel);
//$em->flush();

return $this->redirectToRoute('listar_imoveis');
}

return $this->render('imovel_cadastro.html.twig', [
'form' => $form->createView()
]);
}


/**
* @Route("/imovel/listar", name="listar_imoveis")
*/
Expand Down Expand Up @@ -81,6 +115,21 @@ public function imovelVisualizar(Request $request)
]);
}

/**
* @Route("/deletar/{id}", name="deletar_imovel")
*/
public function deletarImovel(int $id, Request $request, ImovelService $imovelService)
{
$imovel = $this->getDoctrine()->getManager()->getRepository(Imovel::class)->find($id);

$imovelService->deletar($imovel);
//$em->remove($imovel);
//$em->flush();
$this->addFlash('success', 'Imovel de id:'.$id.' deletado com sucesso!!!');

return $this->redirectToRoute('listar_imoveis');
}



}
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

faltando linha em branco no fim do arquivo php, psr 2

45 changes: 22 additions & 23 deletions src/Controller/UsuarioController.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@
use App\Entity\Corretor;
use App\Forms\UsuarioType;
use App\Entity\Usuario;
use phpDocumentor\Reflection\DocBlock\Tags\Throws;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
use Symfony\Component\Routing\Annotation\Route;
use App\Service\UsuarioService;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;

/**
* Class UsuarioController
Expand All @@ -21,24 +19,24 @@ class UsuarioController extends AbstractController
{

/**
*@IsGranted("ROLE_ADMIN")

* @Route("/usuario", name="usuario_novo")
*/
public function cadastroUsuario(Request $request)
public function cadastroUsuario(Request $request, UsuarioService $usuarioService)
{
$usuario = new Usuario();
$form = $this->createForm(UsuarioType::class, $usuario);
$form->handleRequest($request);

if ($form->isSubmitted()) {
$usuario = $form->getData();
$em = $this->getDoctrine()->getManager();
$em->persist($usuario);
$em->flush();
// $em = $this->getDoctrine()->getManager();
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

poderia remover o codigo comentado

// $em->persist($usuario);
// $em->flush();

$usuarioService->salvar($usuario);

return $this->redirectToRoute('index');
}

return $this->render('usuario_cadastro.html.twig', [
'form' => $form->createView()
]);
Expand Down Expand Up @@ -71,24 +69,24 @@ public function listarUsuarios(Request $request)
/**
* @Route("/editar/{id}", name="editar_usuario")
*/
public function editarUsuario(int $id, Request $request)
public function editarUsuario(int $id, Request $request, UsuarioService $usuarioService)
{
$em = $this->getDoctrine()->getManager();
$usuario = $em->getRepository(Usuario::class)->find($id);
$usuario = $this->getDoctrine()->getManager()->getRepository(Usuario::class)->find($id);
//$usuario = $em->getRepository(Usuario::class)->find($id);

if (!$usuario) {
throw new \Exception('Usuario não encontrado');
}

$form = $this->createForm(UsuarioType::class, $usuario);

$form->handleRequest($request);

if ($form->isSubmitted()) {
$usuario = $form->getData();
$em = $this->getDoctrine()->getManager();
$em->merge($usuario);
$em->flush();
$usuarioService->editar($usuario);
//$em = $this->getDoctrine()->getManager();
//$em->merge($usuario);
//$em->flush();

return $this->redirectToRoute('listar_usuarios');
}
Expand All @@ -101,12 +99,13 @@ public function editarUsuario(int $id, Request $request)
/**
* @Route("/deletar/{id}", name="deletar_usuario")
*/
public function deletarUsuario(int $id, Request $request)
public function deletarUsuario(int $id, Request $request, UsuarioService $usuarioService)
{
$em = $this->getDoctrine()->getManager();
$usuario = $em->getRepository(Usuario::class)->find($id);
$em->remove($usuario);
$em->flush();
$usuario = $this->getDoctrine()->getManager()->getRepository(Usuario::class)->find($id);

$usuarioService->deletar($usuario);
//$em->remove($usuario);
//$em->flush();
$this->addFlash('success', 'Usuario de id:'.$id.' deletado com sucesso!!!');

return $this->redirectToRoute('listar_usuarios');
Expand Down
107 changes: 107 additions & 0 deletions src/Entity/ContratoAdm.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
<?php


namespace App\Entity;

use Doctrine\ORM\Mapping as ORM;

/**
* @ORM\Entity
*/

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

phpdoc fora do lugar


class ContratoAdm
{
/**
* @ORM\Id
* @ORM\Column(type="integer")
* @ORM\GeneratedValue(strategy="AUTO")
*/
private $id;

/**
* @ORM\Column(type="date")
*/

private $dt_cadastro;

/**
* @ORM\ManyToOne(targetEntity="App\Entity\Usuario", inversedBy="contrato", cascade={"persist"}, fetch="EAGER")
* @ORM\JoinColumn(name="usuario_id", referencedColumnName="id", unique=true)
*/
private $usuario_id;


/**
* @ORM\ManyToOne(targetEntity="App\Entity\Imovel", inversedBy="contrato", cascade={"persist"}, fetch="EAGER")
* @ORM\JoinColumn(name="imovel_id", referencedColumnName="id", unique=true)
*/
private $imovel_id;

/**
* @ORM\Column(type="text", nullable=true)
*/
private $clausula_contratual;

/**
* @return mixed
*/
public function getId()
{
return $this->id;
}/**
* @param mixed $id
*/
public function setId($id): void
{
$this->id = $id;
}/**
* @return mixed
*/
public function getDtCadastro()
{
return $this->dt_cadastro;
}/**
* @param mixed $dt_cadastro
*/
public function setDtCadastro($dt_cadastro): void
{
$this->dt_cadastro = $dt_cadastro;
}/**
* @return mixed
*/
public function getUsuarioId()
{
return $this->usuario_id;
}/**
* @param mixed $usuario_id
*/
public function setUsuarioId($usuario_id): void
{
$this->usuario_id = $usuario_id;
}/**
* @return mixed
*/
public function getImovelId()
{
return $this->imovel_id;
}/**
* @param mixed $imovel_id
*/
public function setImovelId($imovel_id): void
{
$this->imovel_id = $imovel_id;
}/**
* @return mixed
*/
public function getClausulaContratual()
{
return $this->clausula_contratual;
}/**
* @param mixed $clausula_contratual
*/
public function setClausulaContratual($clausula_contratual): void
{
$this->clausula_contratual = $clausula_contratual;
}
}
57 changes: 57 additions & 0 deletions src/Entity/ContratoLocacao.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<?php


namespace App\Entity;

/**
* @ORM\Entity
*/

class ContratoLocacao
{
/**
* @ORM\Id
* @ORM\Column(type="integer")
* @ORM\GeneratedValue(strategy="AUTO")
*/
private $id;

/**
* @ORM\Column(type="date")
*/

private $dt_cadastro;


/**
* @ORM\Column(type="date")
*/

private $dt_validade;

/**
* @ORM\Column(type="string", length=150, nullable=true)
*/
private $forma_pagamento;


/**
* @ORM\Column(type="integer")
*/

private $dt_vencimento;

/**
* @ORM\ManyToOne(targetEntity="App\Entity\Usuario", inversedBy="contrato_adm", cascade={"persist"}, fetch="EAGER")
* @ORM\JoinColumn(name="usuario_id", referencedColumnName="id", unique=true)
*/
private $usuario_id;


/**
* @ORM\ManyToOne(targetEntity="App\Entity\Imovel", inversedBy="contrato_adm", cascade={"persist"}, fetch="EAGER")
* @ORM\JoinColumn(name="imovel_id", referencedColumnName="id", unique=true)
*/
private $imovel_id;

}
10 changes: 5 additions & 5 deletions src/Entity/Usuario.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ class Usuario
/**
// * @ORM\OneToMany(targetEntity="Entity\contratoLocacao", mappedBy="usuario")
// */
// private $contratoLocacao;
private $contratoLocacao;

// /**
// * @ORM\OneToMany(targetEntity="Entity\ContratoAdm", mappedBy="usuario")
// */
// private $contratoAdm;
/**
* @ORM\OneToMany(targetEntity="Entity\ContratoAdm", mappedBy="usuario")
*/
private $contratoAdm;

/**
* @var string
Expand Down
Loading