diff --git a/controllers/BatteriesController.php b/controllers/BatteriesController.php index 05d8a803..c693badc 100644 --- a/controllers/BatteriesController.php +++ b/controllers/BatteriesController.php @@ -26,7 +26,7 @@ class BatteriesController extends BaseController $countDueNextXDays = count(FindAllItemsInArrayByValue($nextChargeTimes, date('Y-m-d', strtotime("+$nextXDays days")), '<')); $countOverdue = count(FindAllItemsInArrayByValue($nextChargeTimes, date('Y-m-d', strtotime('-1 days')), '<')); return $this->AppContainer->view->render($response, 'batteriesoverview', [ - 'batteries' => $this->Database->batteries(), + 'batteries' => $this->Database->batteries()->orderBy('name'), 'current' => $this->BatteriesService->GetCurrent(), 'nextChargeTimes' => $nextChargeTimes, 'nextXDays' => $nextXDays, @@ -38,14 +38,14 @@ class BatteriesController extends BaseController public function TrackChargeCycle(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args) { return $this->AppContainer->view->render($response, 'batterytracking', [ - 'batteries' => $this->Database->batteries() + 'batteries' => $this->Database->batteries()->orderBy('name') ]); } public function BatteriesList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args) { return $this->AppContainer->view->render($response, 'batteries', [ - 'batteries' => $this->Database->batteries() + 'batteries' => $this->Database->batteries()->orderBy('name') ]); } diff --git a/controllers/HabitsController.php b/controllers/HabitsController.php index 9b0f8fc2..9753880b 100644 --- a/controllers/HabitsController.php +++ b/controllers/HabitsController.php @@ -26,7 +26,7 @@ class HabitsController extends BaseController $countDueNextXDays = count(FindAllItemsInArrayByValue($nextHabitTimes, date('Y-m-d', strtotime("+$nextXDays days")), '<')); $countOverdue = count(FindAllItemsInArrayByValue($nextHabitTimes, date('Y-m-d', strtotime('-1 days')), '<')); return $this->AppContainer->view->render($response, 'habitsoverview', [ - 'habits' => $this->Database->habits(), + 'habits' => $this->Database->habits()->orderBy('name'), 'currentHabits' => $this->HabitsService->GetCurrentHabits(), 'nextHabitTimes' => $nextHabitTimes, 'nextXDays' => $nextXDays, @@ -38,14 +38,14 @@ class HabitsController extends BaseController public function TrackHabitExecution(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args) { return $this->AppContainer->view->render($response, 'habittracking', [ - 'habits' => $this->Database->habits() + 'habits' => $this->Database->habits()->orderBy('name') ]); } public function HabitsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args) { return $this->AppContainer->view->render($response, 'habits', [ - 'habits' => $this->Database->habits() + 'habits' => $this->Database->habits()->orderBy('name') ]); } diff --git a/controllers/StockController.php b/controllers/StockController.php index c553e2e8..72d8d74a 100644 --- a/controllers/StockController.php +++ b/controllers/StockController.php @@ -22,8 +22,8 @@ class StockController extends BaseController $countExpiringNextXDays = count(FindAllObjectsInArrayByPropertyValue($currentStock, 'best_before_date', date('Y-m-d', strtotime('+5 days')), '<')); $countAlreadyExpired = count(FindAllObjectsInArrayByPropertyValue($currentStock, 'best_before_date', date('Y-m-d', strtotime('-1 days')), '<')); return $this->AppContainer->view->render($response, 'stockoverview', [ - 'products' => $this->Database->products(), - 'quantityunits' => $this->Database->quantity_units(), + 'products' => $this->Database->products()->orderBy('name'), + 'quantityunits' => $this->Database->quantity_units()->orderBy('name'), 'currentStock' => $currentStock, 'missingProducts' => $this->StockService->GetMissingProducts(), 'nextXDays' => $nextXDays, @@ -35,21 +35,21 @@ class StockController extends BaseController public function Purchase(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args) { return $this->AppContainer->view->render($response, 'purchase', [ - 'products' => $this->Database->products() + 'products' => $this->Database->products()->orderBy('name') ]); } public function Consume(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args) { return $this->AppContainer->view->render($response, 'consume', [ - 'products' => $this->Database->products() + 'products' => $this->Database->products()->orderBy('name') ]); } public function Inventory(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args) { return $this->AppContainer->view->render($response, 'inventory', [ - 'products' => $this->Database->products() + 'products' => $this->Database->products()->orderBy('name') ]); } @@ -57,8 +57,8 @@ class StockController extends BaseController { return $this->AppContainer->view->render($response, 'shoppinglist', [ 'listItems' => $this->Database->shopping_list(), - 'products' => $this->Database->products(), - 'quantityunits' => $this->Database->quantity_units(), + 'products' => $this->Database->products()->orderBy('name'), + 'quantityunits' => $this->Database->quantity_units()->orderBy('name'), 'missingProducts' => $this->StockService->GetMissingProducts() ]); } @@ -66,23 +66,23 @@ class StockController extends BaseController public function ProductsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args) { return $this->AppContainer->view->render($response, 'products', [ - 'products' => $this->Database->products(), - 'locations' => $this->Database->locations(), - 'quantityunits' => $this->Database->quantity_units() + 'products' => $this->Database->products()->orderBy('name'), + 'locations' => $this->Database->locations()->orderBy('name'), + 'quantityunits' => $this->Database->quantity_units()->orderBy('name') ]); } public function LocationsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args) { return $this->AppContainer->view->render($response, 'locations', [ - 'locations' => $this->Database->locations() + 'locations' => $this->Database->locations()->orderBy('name') ]); } public function QuantityUnitsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args) { return $this->AppContainer->view->render($response, 'quantityunits', [ - 'quantityunits' => $this->Database->quantity_units() + 'quantityunits' => $this->Database->quantity_units()->orderBy('name') ]); } @@ -91,8 +91,8 @@ class StockController extends BaseController if ($args['productId'] == 'new') { return $this->AppContainer->view->render($response, 'productform', [ - 'locations' => $this->Database->locations(), - 'quantityunits' => $this->Database->quantity_units(), + 'locations' => $this->Database->locations()->orderBy('name'), + 'quantityunits' => $this->Database->quantity_units()->orderBy('name'), 'mode' => 'create' ]); } @@ -100,8 +100,8 @@ class StockController extends BaseController { return $this->AppContainer->view->render($response, 'productform', [ 'product' => $this->Database->products($args['productId']), - 'locations' => $this->Database->locations(), - 'quantityunits' => $this->Database->quantity_units(), + 'locations' => $this->Database->locations()->orderBy('name'), + 'quantityunits' => $this->Database->quantity_units()->orderBy('name'), 'mode' => 'edit' ]); } @@ -146,7 +146,7 @@ class StockController extends BaseController if ($args['itemId'] == 'new') { return $this->AppContainer->view->render($response, 'shoppinglistform', [ - 'products' => $this->Database->products(), + 'products' => $this->Database->products()->orderBy('name'), 'mode' => 'create' ]); } @@ -154,7 +154,7 @@ class StockController extends BaseController { return $this->AppContainer->view->render($response, 'shoppinglistform', [ 'listItem' => $this->Database->shopping_list($args['itemId']), - 'products' => $this->Database->products(), + 'products' => $this->Database->products()->orderBy('name'), 'mode' => 'edit' ]); }