From 6153dadd703c1dfd60898986492d671c509c901e Mon Sep 17 00:00:00 2001 From: Thomas Zilio Date: Wed, 11 Sep 2019 17:58:40 +0200 Subject: [PATCH] Fix ore preventivo --- modules/preventivi/src/Preventivo.php | 43 ++++----------------------- 1 file changed, 5 insertions(+), 38 deletions(-) diff --git a/modules/preventivi/src/Preventivo.php b/modules/preventivi/src/Preventivo.php index 75cdb846c..55c9e69d8 100644 --- a/modules/preventivi/src/Preventivo.php +++ b/modules/preventivi/src/Preventivo.php @@ -80,53 +80,20 @@ class Preventivo extends Document // Attributi Eloquent - public function getOreProgrammateAttribute() + public function getOreInterventiAttribute() { - if (!isset($this->info['ore_programmate'])) { + if (!isset($this->info['ore_interventi'])) { $sessioni = collect(); - $interventi = $this->interventi()->whereHas('stato', function ($query) { - $query->where('completato', '=', 0); - })->get(); - + $interventi = $this->interventi; foreach ($interventi as $intervento) { $sessioni = $sessioni->merge($intervento->sessioni); } - $this->info['ore_programmate'] = $sessioni->sum('ore'); + $this->info['ore_interventi'] = $sessioni->sum('ore'); } - return $this->info['ore_programmate']; - } - - public function getOreCompletateAttribute() - { - if (!isset($this->info['ore_completate'])) { - $sessioni = collect(); - - $interventi = $this->interventi()->whereHas('stato', function ($query) { - $query->where('completato', '=', 1); - })->get(); - - foreach ($interventi as $intervento) { - $sessioni = $sessioni->merge($intervento->sessioni); - } - - $this->info['ore_completate'] = $sessioni->sum('ore'); - } - - return $this->info['ore_completate']; - } - - public function getOrePrevisteAttribute() - { - if (!isset($this->info['ore_previste'])) { - $sessioni = $this->getRighe()->where('um', 'ore'); - - $this->info['ore_previste'] = $sessioni->sum('qta'); - } - - return $this->info['ore_previste']; + return $this->info['ore_interventi']; } /**