Merge branch '522-add-date_update-to-battery-fields' into 'master'

Resolve "Add date_update to battery fields"

Closes #522

See merge request jankstudio/resq!606
This commit is contained in:
Kendrick Chan 2020-10-20 00:05:42 +00:00
commit 735bcffdd8
3 changed files with 47 additions and 0 deletions

View file

@ -37,6 +37,7 @@ class BatteryController extends APIController
'id' => $batt->getID(),
'size' => $batt->getSize()->getID(),
'brand' => $batt->getBrand()->getID(),
'date_update' => $batt->getDateUpdate()->format('YmdHis'),
];
}

View file

@ -7,6 +7,8 @@ use Doctrine\Common\Collections\ArrayCollection;
use Symfony\Component\Validator\Constraints as Assert;
use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
use DateTime;
/**
* @ORM\Entity
* @ORM\Table(name="battery")
@ -21,6 +23,16 @@ class Battery
*/
protected $id;
/**
* @ORM\Column(type="datetime")
*/
protected $date_create;
/**
* @ORM\Column(type="datetime", columnDefinition="timestamp default current_timestamp on update current_timestamp")
*/
protected $date_update;
// manufacturer
/**
* @ORM\ManyToOne(targetEntity="BatteryManufacturer", inversedBy="batteries")
@ -145,6 +157,8 @@ class Battery
$this->width = 0;
$this->height = 0;
$this->total_height = 0;
$this->date_create = new DateTime();
}
public function getID()
@ -152,6 +166,16 @@ class Battery
return $this->id;
}
public function getDateCreate()
{
return $this->date_create;
}
public function getDateUpdate()
{
return $this->date_update;
}
public function setManufacturer($manufacturer)
{
$this->manufacturer = $manufacturer;

View file

@ -6,6 +6,7 @@ use Doctrine\ORM\Mapping as ORM;
use Doctrine\Common\Collections\ArrayCollection;
use Symfony\Component\Validator\Constraints as Assert;
use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
use DateTime;
/**
* @ORM\Entity
@ -20,6 +21,16 @@ class SAPBattery
*/
protected $id;
/**
* @ORM\Column(type="datetime")
*/
protected $date_create;
/**
* @ORM\Column(type="datetime", columnDefinition="timestamp default current_timestamp on update current_timestamp")
*/
protected $date_update;
// brand
/**
* @ORM\ManyToOne(targetEntity="SAPBatteryBrand", inversedBy="batteries")
@ -37,6 +48,7 @@ class SAPBattery
public function __construct()
{
$this->date_create = new DateTime();
}
public function setID($id)
@ -50,6 +62,16 @@ class SAPBattery
return $this->id;
}
public function getDateCreate()
{
return $this->date_create;
}
public function getDateUpdate()
{
return $this->date_update;
}
public function setBrand($brand)
{
$this->brand = $brand;