fixes for budgets

src/Bundle/ChillBudgetBundle/Controller/ElementController.php

@@ -19,6 +19,7 @@ use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
+use Monolog\DateTimeImmutable;
 use Psr\Log\LoggerInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -123,10 +124,34 @@ class ElementController extends AbstractController
             $results = $this->calculator->calculateDefault($elements);
         }
 
+        // quick solution to calculate the sum, difference and amount from
+        // controller. This should be done from the calculators
+        // TODO replace this by calculators
+        $wholeCharges = $actualCharges;
+        $wholeResources = $actualResources;
+        foreach ($household->getCurrentPersons() as $person) {
+            $wholeCharges = array_merge(
+                $wholeCharges,
+                $this->em
+                    ->getRepository(Charge::class)
+                    ->findByEntityAndDate($person, $now));
+            $wholeResources = array_merge(
+                $wholeResources,
+                $this->em
+                ->getRepository(Resource::class)
+                ->findByEntityAndDate($person, $now));
+        }
+
         return $this->render('ChillBudgetBundle:Household:index.html.twig', [
             'household' => $household,
             'charges' => $charges,
             'resources' => $ressources,
+            'wholeResources' => array_filter($wholeResources, function (Resource $r) use ($now) {
+                return $r->getStartDate() <= $now and ($r->getEndDate() === null or $r->getEndDate() >= $now);
+            }),
+            'wholeCharges' => array_filter($wholeCharges, function (Charge $c) use ($now) {
+                return $c->getStartDate() <= $now and ($c->getEndDate() === null or $c->getEndDate() >= $now);
+            }),
             'results' => $results ?? [],
         ]);
     }