added global activities (#259)

src/DataFixtures/CustomerFixtures.php

@@ -30,6 +30,8 @@ class CustomerFixtures extends Fixture
     public const MAX_CUSTOMERS = 15;
     public const MIN_BUDGET = 0;
     public const MAX_BUDGET = 100000;
+    public const MIN_GLOBAL_ACTIVITIES = 5;
+    public const MAX_GLOBAL_ACTIVITIES = 50;
     public const MIN_PROJECTS_PER_CUSTOMER = 10;
     public const MAX_PROJECTS_PER_CUSTOMER = 50;
     public const MIN_ACTIVITIES_PER_PROJECT = 0;
@@ -66,6 +68,16 @@ class CustomerFixtures extends Fixture
             $manager->flush();
             $manager->clear();
         }
+
+        $amountGlobalActivities = rand(self::MIN_GLOBAL_ACTIVITIES, self::MAX_GLOBAL_ACTIVITIES);
+        for ($c = 1; $c <= $amountGlobalActivities; $c++) {
+            $visibleActivity = 0 != $a % 3;
+            $activity = $this->createActivity($faker, null, $visibleActivity);
+            $manager->persist($activity);
+        }
+
+        $manager->flush();
+        $manager->clear();
     }
 
     /**
@@ -113,11 +125,11 @@ class CustomerFixtures extends Fixture
 
     /**
      * @param Generator $faker
-     * @param Project $project
+     * @param Project|null $project
      * @param bool $visible
      * @return Activity
      */
-    private function createActivity(Generator $faker, Project $project, $visible)
+    private function createActivity(Generator $faker, ?Project $project, $visible)
     {
         $entry = new Activity();
         $entry

src/DataFixtures/TimesheetFixtures.php

@@ -10,6 +10,7 @@
 namespace App\DataFixtures;
 
 use App\Entity\Activity;
+use App\Entity\Project;
 use App\Entity\Timesheet;
 use App\Entity\User;
 use App\Entity\UserPreference;
@@ -56,6 +57,7 @@ class TimesheetFixtures extends Fixture implements DependentFixtureInterface
     {
         $allUser = $this->getAllUsers($manager);
         $activities = $this->getAllActivities($manager);
+        $projects = $this->getAllProjects($manager);
 
         $faker = Factory::create();
 
@@ -80,6 +82,7 @@ class TimesheetFixtures extends Fixture implements DependentFixtureInterface
                 $entry = $this->createTimesheetEntry(
                     $user,
                     $activities[array_rand($activities)],
+                    $projects[array_rand($projects)],
                     $description
                 );
 
@@ -98,6 +101,7 @@ class TimesheetFixtures extends Fixture implements DependentFixtureInterface
                 $entry = $this->createTimesheetEntry(
                     $user,
                     $activities[array_rand($activities)],
+                    $projects[array_rand($projects)],
                     null,
                     false
                 );
@@ -126,6 +130,22 @@ class TimesheetFixtures extends Fixture implements DependentFixtureInterface
         return $all;
     }
 
+    /**
+     * @param ObjectManager $manager
+     * @return Project[]
+     */
+    protected function getAllProjects(ObjectManager $manager)
+    {
+        $all = [];
+        /* @var Project[] $entries */
+        $entries = $manager->getRepository(Project::class)->findAll();
+        foreach ($entries as $temp) {
+            $all[$temp->getId()] = $temp;
+        }
+
+        return $all;
+    }
+
     /**
      * @param ObjectManager $manager
      * @return Activity[]
@@ -133,7 +153,7 @@ class TimesheetFixtures extends Fixture implements DependentFixtureInterface
     protected function getAllActivities(ObjectManager $manager)
     {
         $all = [];
-        /* @var User[] $entries */
+        /* @var Activity[] $entries */
         $entries = $manager->getRepository(Activity::class)->findAll();
         foreach ($entries as $temp) {
             $all[$temp->getId()] = $temp;
@@ -142,7 +162,7 @@ class TimesheetFixtures extends Fixture implements DependentFixtureInterface
         return $all;
     }
 
-    private function createTimesheetEntry(User $user, Activity $activity, $description, $setEndDate = true)
+    private function createTimesheetEntry(User $user, Activity $activity, Project $project, $description, $setEndDate = true)
     {
         $start = new \DateTime();
         $start = $start->modify('- ' . (rand(1, self::TIMERANGE_DAYS)) . ' days');
@@ -151,6 +171,7 @@ class TimesheetFixtures extends Fixture implements DependentFixtureInterface
         $entry = new Timesheet();
         $entry
             ->setActivity($activity)
+            ->setProject($activity->getProject() ?? $project)
             ->setDescription($description)
             ->setUser($user)
             ->setBegin($start);