diff --git a/app/Models/DAO/Tree.php b/app/Models/DAO/Tree.php index 04cea0c..1f2b5b4 100644 --- a/app/Models/DAO/Tree.php +++ b/app/Models/DAO/Tree.php @@ -17,7 +17,7 @@ class Tree extends Database { - /** + /** * Create a new object of class Tree * * @param string $id identifier of the tree, its primary key diff --git a/app/Models/bean/Tree.php b/app/Models/bean/Tree.php index 02d2184..339ce88 100644 --- a/app/Models/bean/Tree.php +++ b/app/Models/bean/Tree.php @@ -15,21 +15,21 @@ class Tree implements \JsonSerializable { private $id; - private $nome_comum; + private $nomeComum; private $especie; private $familia; private $cap; - private $altura_total; - private $classe_copa; + private $alturaTotal; + private $classeCopa; private $sanidade; private $crescimento; - private $pos_sociologica; + private $posSociologica; private $utilizacao; private $caracteristicas; - private $data_registro; - private $usuario_nome; - private $usuario_descricao; - private $img_arvore; + private $dataRegistro; + private $usuarioNome; + private $usuarioDescricao; + private $imgArvore; private $latitude; private $longitude; @@ -43,11 +43,11 @@ public function setId($value) { } public function getNomeComum() { - return $this->nome_comum; + return $this->nomeComum; } public function setNomeComum($value) { - $this->nome_comum = $value; + $this->nomeComum = $value; } public function getEspecie() { @@ -75,19 +75,19 @@ public function setCap($value) { } public function getAlturaTotal() { - return $this->altura_total; + return $this->alturaTotal; } public function setAlturaTotal($value) { - $this->altura_total = $value; + $this->alturaTotal = $value; } public function getClasseCopa() { - return $this->classe_copa; + return $this->classeCopa; } public function setClasseCopa($value) { - $this->classe_copa = $value; + $this->classeCopa = $value; } public function getSanidade() { @@ -107,11 +107,11 @@ public function setCrescimento($value) { } public function getPosSociologica() { - return $this->pos_sociologica; + return $this->posSociologica; } public function setPosSociologica($value) { - $this->pos_sociologica = $value; + $this->posSociologica = $value; } public function getUtilizacao() { @@ -131,35 +131,35 @@ public function setCaracteristicas($value) { } public function getDataRegistro() { - return $this->data_registro; + return $this->dataRegistro; } public function setDataRegistro($value) { - $this->data_registro = $value; + $this->dataRegistro = $value; } public function getUsuarioNome() { - return $this->usuario_nome; + return $this->usuarioNome; } public function setUsuarioNome($value) { - $this->usuario_nome = $value; + $this->usuarioNome = $value; } public function getUsuarioDescricao() { - return $this->usuario_descricao; + return $this->usuarioDescricao; } public function setUsuarioDescricao($value) { - $this->usuario_descricao = $value; + $this->usuarioDescricao = $value; } public function getImgArvore() { - return $this->img_arvore; + return $this->imgArvore; } public function setImgArvore($value) { - $this->img_arvore = $value; + $this->imgArvore = $value; } public function getLatitude() { @@ -187,21 +187,21 @@ public function jsonSerialize() { return [ 'id' => $this->getId(), - 'nome_comum' => $this->getNomeComum(), + 'nomeComum' => $this->getNomeComum(), 'especie' => $this->getEspecie(), 'familia' => $this->getFamilia(), 'cap' => $this->getCap(), - 'altura_total' => $this->getAlturaTotal(), - 'classe_copa' => $this->getClasseCopa(), + 'alturaTotal' => $this->getAlturaTotal(), + 'classeCopa' => $this->getClasseCopa(), 'sanidade' => $this->getSanidade(), 'crescimento' => $this->getCrescimento(), - 'pos_sociologica' => $this->getPosSociologica(), + 'posSociologica' => $this->getPosSociologica(), 'utilizacao' => $this->getUtilizacao(), 'localizacao' => $this->getLocalizacao(), 'caracteristicas' => $this->getCaracteristicas(), - 'data_registro' => $this->getDataRegistro(), - 'usuario_nome' => $this->getUsuarioNome(), - 'usuario_descricao' => $this->getUsuarioDescricao() + 'dataRegistro' => $this->getDataRegistro(), + 'usuarioNome' => $this->getUsuarioNome(), + 'usuarioDescricao' => $this->getUsuarioDescricao() ]; } } diff --git a/docs/Thumbs.db b/docs/Thumbs.db new file mode 100644 index 0000000..413700a Binary files /dev/null and b/docs/Thumbs.db differ diff --git a/public/assets/images/Thumbs.db b/public/assets/images/Thumbs.db new file mode 100644 index 0000000..0c181d2 Binary files /dev/null and b/public/assets/images/Thumbs.db differ diff --git a/public/assets/images/tmp/Thumbs.db b/public/assets/images/tmp/Thumbs.db new file mode 100644 index 0000000..c67e243 Binary files /dev/null and b/public/assets/images/tmp/Thumbs.db differ diff --git a/public/assets/images/tmp/tree.png b/public/assets/images/tmp/tree.png index 7ea77d5..5fdf136 100644 Binary files a/public/assets/images/tmp/tree.png and b/public/assets/images/tmp/tree.png differ