Revize b323292b

Merge branch 'develop'

app/Http/Controllers/CategoriesController.php

@@ -14 +14 @@
         $this->middleware('auth');
     }
 
-    public function calculateClusters($categoriesCount)
-    {
-        if(isset($categoriesCount))
-        {
-            $min = PHP_INT_MAX;
-            $max = PHP_INT_MIN;
-            foreach($categoriesCount as $category)
-            {
-                $c = count($category);
-                if($c < $min)
-                {
-                    $min = $c;
-                }
-
-                if($c > $max)
-                {
-                    $max = $c;
-                }
-            }
-            $center = $min + (($max - $min)/2);
-            return array($min, $center, $max);
-        }
-        else
-        {
-            return null;
-        }
-    }
-
     /**
      * Display a listing of the resource.
      *
@@ -53 +25 @@
         {
             $userId = Auth::user()->id;
 
-            $categoryNames = Category::all();
+            $categoryNames = Category::orderBy('id')->get();
             $countCategory = count($categoryNames);
-            $categories = array();
-            for($i = 1; $i <= $countCategory;$i++)
-            {
-                array_push($categories, Category::find($i)->artefacts()->get());
-            }
-            $clusters = $this->calculateClusters($categories);
-
-            $categorySizes = array();
-            if(isset($clusters))
-            {
-                foreach($categories as $category)
-                {
-                    $c = count($category);
-                    $type1 = abs($clusters['0'] - $c);
-                    $type2 = abs($clusters['1'] - $c);
-                    $type3 = abs($clusters['2'] - $c);
-
-                    if($type1 <= $type2 && $type1 <= $type3)
-                    {
-                        array_push($categorySizes, 1);
-                    }
-                    else if($type2 <= $type1 && $type2 <= $type3)
-                    {
-                        array_push($categorySizes, 2);
-                    }
-                    else
-                    {
-                        array_push($categorySizes, 3);
-                    }
-                }
-            }
 
             $data = array(
                 'title' => 'Categories',
                 'user' => User::find($userId),
                 'count' => $countCategory,
-                'categories' => $categories,
-                'categorySizes' => $categorySizes,
                 'categoryNames' => $categoryNames
             );
             return view('categories.index') -> with($data);