* fault-type added
* expensive confirm step is now mandatory
This commit is contained in:
parent
84750f8ac3
commit
cee4134a21
@ -37,6 +37,12 @@ class Fault implements JsonSerializable
|
|||||||
*/
|
*/
|
||||||
private $worksheetNumber;
|
private $worksheetNumber;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @ORM\Column(name="fault_type", type="string", length=30, nullable=true, options={"default": "uzemeltetesi"})
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
private $faultType;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ORM\JoinColumn(name="facility_location_id", nullable=false)
|
* @ORM\JoinColumn(name="facility_location_id", nullable=false)
|
||||||
* @ORM\ManyToOne(targetEntity="FacilityLocation", inversedBy="faults")
|
* @ORM\ManyToOne(targetEntity="FacilityLocation", inversedBy="faults")
|
||||||
@ -271,6 +277,24 @@ class Fault implements JsonSerializable
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public function getFaultType(): ?string
|
||||||
|
{
|
||||||
|
return $this->faultType;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $faultType
|
||||||
|
* @return Fault
|
||||||
|
*/
|
||||||
|
public function setFaultType(?string $faultType): Fault
|
||||||
|
{
|
||||||
|
$this->faultType = $faultType;
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return FacilityLocation
|
* @return FacilityLocation
|
||||||
*/
|
*/
|
||||||
@ -868,6 +892,7 @@ class Fault implements JsonSerializable
|
|||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'id' => $this->id,
|
'id' => $this->id,
|
||||||
|
'faultType' => $this->getFaultType(),
|
||||||
'facilityLocation' => $this->getFacilityLocation(),
|
'facilityLocation' => $this->getFacilityLocation(),
|
||||||
'facilityLocationDescription' => $this->getFacilityLocationDescription(),
|
'facilityLocationDescription' => $this->getFacilityLocationDescription(),
|
||||||
'errorCategory' => $this->getErrorCategory(),
|
'errorCategory' => $this->getErrorCategory(),
|
||||||
@ -905,6 +930,7 @@ class Fault implements JsonSerializable
|
|||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'id' => $this->id,
|
'id' => $this->id,
|
||||||
|
'faultType' => $this->getFaultType(),
|
||||||
'facilityLocation' => $this->getFacilityLocation()->getId(),
|
'facilityLocation' => $this->getFacilityLocation()->getId(),
|
||||||
'facilityLocationDescription' => $this->getFacilityLocationDescription(),
|
'facilityLocationDescription' => $this->getFacilityLocationDescription(),
|
||||||
'errorCategory' => $this->getErrorCategory()->getId(),
|
'errorCategory' => $this->getErrorCategory()->getId(),
|
||||||
|
|||||||
@ -317,7 +317,7 @@ class FaultManagerService
|
|||||||
|
|
||||||
$this->mailer->sendFaultMail(
|
$this->mailer->sendFaultMail(
|
||||||
$recipients,
|
$recipients,
|
||||||
sprintf("[WN] Kisértékű munka - %s", $fault->getWorksheetNumber()),
|
sprintf("[WN] Új munka - %s", $fault->getWorksheetNumber()),
|
||||||
$fault,
|
$fault,
|
||||||
sprintf(
|
sprintf(
|
||||||
"Becsült munkaköltség: %s\nBecsült alapanyagköltség: %s\nVisszaigazolta: %s",
|
"Becsült munkaköltség: %s\nBecsült alapanyagköltség: %s\nVisszaigazolta: %s",
|
||||||
@ -341,7 +341,7 @@ class FaultManagerService
|
|||||||
|
|
||||||
$this->mailer->sendFaultMail(
|
$this->mailer->sendFaultMail(
|
||||||
$recipients,
|
$recipients,
|
||||||
"[WN] Nagyértékű munka",
|
"[WN] Új munka",
|
||||||
$fault,
|
$fault,
|
||||||
sprintf(
|
sprintf(
|
||||||
"Becsült munkaköltség: %s\nBecsült alapanyagköltség: %s\nVisszaigazolta: %s",
|
"Becsült munkaköltség: %s\nBecsült alapanyagköltség: %s\nVisszaigazolta: %s",
|
||||||
@ -365,7 +365,7 @@ class FaultManagerService
|
|||||||
|
|
||||||
$this->mailer->sendFaultMail(
|
$this->mailer->sendFaultMail(
|
||||||
$recipients,
|
$recipients,
|
||||||
sprintf("[WN] Nagyértékű munka jóváhagyva - %s", $fault->getWorksheetNumber()),
|
sprintf("[WN] Munka jóváhagyva - %s", $fault->getWorksheetNumber()),
|
||||||
$fault,
|
$fault,
|
||||||
sprintf(
|
sprintf(
|
||||||
"Becsült munkaköltség: %s\nBecsült alapanyagköltség: %s\nJóváhagyta: %s",
|
"Becsült munkaköltség: %s\nBecsült alapanyagköltség: %s\nJóváhagyta: %s",
|
||||||
@ -389,7 +389,7 @@ class FaultManagerService
|
|||||||
|
|
||||||
$this->mailer->sendFaultMail(
|
$this->mailer->sendFaultMail(
|
||||||
$recipients,
|
$recipients,
|
||||||
"[WN] Nagyértékű munka elutasítva",
|
"[WN] Munka elutasítva",
|
||||||
$fault,
|
$fault,
|
||||||
sprintf("A hiba javítását %s elutasította", $user->getName())
|
sprintf("A hiba javítását %s elutasította", $user->getName())
|
||||||
);
|
);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user