add random cocktail option

Author: AndreWohnsland

src/config/config_manager.py

@@ -117,6 +117,8 @@ class ConfigManager:
     MAKER_USE_RECIPE_VOLUME: bool = False
     # Option to add the single ingredient option to the maker pane
     MAKER_ADD_SINGLE_INGREDIENT: bool = False
+    # Option to show a random cocktail tile in the maker tab
+    MAKER_RANDOM_COCKTAIL: bool = False
     # List of normal (non-addressable) LED configurations
     LED_NORMAL: ClassVar[list[NormalLedConfig]] = []
     # List of WS281x (addressable) LED configurations
@@ -225,6 +227,7 @@ def __init__(self) -> None:
             "MAKER_CHECK_INTERNET": BoolType(check_name="Check Internet"),
             "MAKER_USE_RECIPE_VOLUME": BoolType(check_name="Use Recipe Volume"),
             "MAKER_ADD_SINGLE_INGREDIENT": BoolType(check_name="Can Spend Single Ingredient"),
+            "MAKER_RANDOM_COCKTAIL": BoolType(check_name="Random Cocktail Option"),
             "LED_NORMAL": ListType(
                 DictType(
                     {

src/language.yaml

@@ -449,6 +449,12 @@ ui:
     nfc_scan_to_proceed:
       en: 'Scan NFC to proceed'
       de: 'NFC scannen um fortzufahren'
+    random_cocktail_label:
+      en: 'Random Cocktail'
+      de: 'Zufalls-Cocktail'
+    random_be_surprised:
+      en: 'Be Surprised!'
+      de: 'Lass dich überraschen!'
 
   cocktail_selection:
     # best is to use some space before to get a padding for icon
@@ -762,6 +768,9 @@ ui:
     MAKER_ADD_SINGLE_INGREDIENT:
       en: 'Adds the option to also spend a single ingredient to the cocktails in the maker tab'
       de: 'Fügt eine Option zu den Cocktails in dem Maker Tab hinzu, auch einzelne Zutaten ausgeben zu können'
+    MAKER_RANDOM_COCKTAIL:
+      en: 'Adds a random cocktail tile to the maker tab that picks a surprise cocktail on prepare'
+      de: 'Fügt eine Zufalls-Cocktail Kachel zum Maker Tab hinzu, die beim Zubereiten einen Überraschungscocktail wählt'
     LED_NORMAL:
       en: 'List with config for each normal (non-addressable) LED: pin, default on state, preparation state (on/off/effects)'
       de: 'Liste mit Einstellung für jeden normalen (nicht ansteuerbaren) LED: Pin, Standard an-Zustand, Zustand bei Zubereitung (an/aus/Effekte)'

src/ui/cocktail_view.py

@@ -45,6 +45,37 @@ def _square_size() -> int:
     return int(cfg.UI_WIDTH / (n_columns * 1.17))
 
 
+def generate_random_image_block(cocktails: list[Cocktail], mainscreen: MainScreen) -> QVBoxLayout:
+    """Generate an image block for the random cocktail tile."""
+    square_size = _square_size()
+    header_font_size = round(square_size / 15.8)
+    header_height = round(square_size / 6.3)
+    random_label = UI_LANGUAGE.get_translation("random_cocktail_label", "main_window")
+    button = create_button(
+        random_label,
+        font_size=header_font_size,
+        min_h=0,
+        max_h=header_height,
+        max_w=square_size,
+        css_class="btn-inverted btn-half-top",
+    )
+    label = ClickableLabel(random_label)
+    label.setProperty("cssClass", "cocktail-picture-view")
+    pixmap = QPixmap(str(DEFAULT_COCKTAIL_IMAGE))
+    label.setPixmap(pixmap)
+    label.setScaledContents(True)
+    label.setSizePolicy(QSizePolicy.Policy.Ignored, QSizePolicy.Policy.Ignored)
+    label.setMinimumSize(square_size, square_size)
+    label.setMaximumSize(square_size, square_size)
+    layout = QVBoxLayout()
+    layout.setSpacing(0)
+    layout.addWidget(button)
+    layout.addWidget(label)
+    button.clicked.connect(lambda _, c=cocktails: mainscreen.open_random_cocktail_detail(c))
+    label.clicked.connect(lambda c=cocktails: mainscreen.open_random_cocktail_detail(c))
+    return layout
+
+
 def generate_image_block(cocktail: Cocktail | None, mainscreen: MainScreen) -> QVBoxLayout:
     """Generate a image block for the given cocktail."""
     # those factors are taken from calculations based on the old static values
@@ -193,16 +224,22 @@ def _populate_cocktails_grid(self) -> None:
                 cocktails = [c for c in cocktails if c.is_allowed]
         # sort cocktails by name
         cocktails.sort(key=lambda x: x.name.lower())
+        # optionally prepend the random cocktail tile
+        offset = 0
+        if cfg.MAKER_RANDOM_COCKTAIL and cocktails:
+            block = generate_random_image_block(cocktails, self.mainscreen)
+            self.grid.addLayout(block, 0, 0)
+            offset = 1
         # fill the grid with n_columns columns, then go to another row
-        for i in range(0, len(cocktails), n_columns):
-            for j in range(n_columns):
-                if i + j >= len(cocktails):
-                    break
-                block = generate_image_block(cocktails[i + j], self.mainscreen)
-                self.grid.addLayout(block, i // n_columns, j)
+        for idx, cocktail in enumerate(cocktails):
+            pos = idx + offset
+            row = pos // n_columns
+            col = pos % n_columns
+            block = generate_image_block(cocktail, self.mainscreen)
+            self.grid.addLayout(block, row, col)
         # Optionally add the single ingredient block after all cocktails
         if cfg.MAKER_ADD_SINGLE_INGREDIENT and not cfg.payment_enabled:
-            total = len(cocktails)
+            total = len(cocktails) + offset
             row = total // n_columns
             col = total % n_columns
             block = generate_image_block(None, self.mainscreen)

src/ui/setup_cocktail_selection.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import random
 from typing import TYPE_CHECKING
 
 from PyQt6.QtGui import QFont, QPixmap
@@ -9,6 +10,7 @@
 from src.database_commander import DB_COMMANDER
 from src.dialog_handler import UI_LANGUAGE
 from src.display_controller import DP_CONTROLLER
+from src.filepath import DEFAULT_COCKTAIL_IMAGE
 from src.image_utils import find_cocktail_image
 from src.models import Cocktail, Ingredient
 from src.ui.creation_utils import LARGE_FONT, create_button, create_label, set_underline
@@ -23,12 +25,20 @@
 class CocktailSelection(QDialog, Ui_CocktailSelection):
     """Class for the Cocktail selection view."""
 
-    def __init__(self, mainscreen: MainScreen, cocktail: Cocktail) -> None:
+    def __init__(
+        self,
+        mainscreen: MainScreen,
+        cocktail: Cocktail,
+        random_mode: bool = False,
+        random_pool: list[Cocktail] | None = None,
+    ) -> None:
         super().__init__(parent=mainscreen)
         self.setupUi(self)
         DP_CONTROLLER.initialize_window_object(self)
         self.cocktail = cocktail
         self.mainscreen = mainscreen
+        self.random_mode = random_mode
+        self.random_pool = random_pool or []
         # Store references for dynamic button label updates
         self._volume_buttons: list[tuple[int, QPushButton]] = []  # list of (volume, button) tuples
         # build the image
@@ -94,8 +104,53 @@ def set_cocktail(self, cocktail: Cocktail) -> None:
         self.cocktail = cocktail
         self._set_image()
 
+    def update_random_display(self) -> None:
+        """Update the display for random cocktail mode."""
+        pixmap = QPixmap(str(DEFAULT_COCKTAIL_IMAGE))
+        self.image_container.setPixmap(pixmap)
+        random_label = UI_LANGUAGE.get_translation("random_cocktail_label", "main_window")
+        surprise_label = UI_LANGUAGE.get_translation("random_be_surprised", "main_window")
+        self.LAlkoholname.setText(random_label)
+        self.LAlkoholgehalt.setText("?")
+        self.LMenge.setText("")
+        # hide alcohol low/high buttons
+        self.increase_alcohol.setVisible(False)
+        self.decrease_alcohol.setVisible(False)
+        # show virgin toggle only if any cocktail in pool has virgin_available
+        has_virgin = any(c.virgin_available for c in self.random_pool)
+        self.virgin_toggle.setVisible(has_virgin)
+        self.virgin_toggle.setChecked(False)
+        # show surprise message in first ingredient label, clear rest
+        fields_ingredient = self.get_labels_maker_ingredients()
+        fields_volume = self.get_labels_maker_volume()
+        for field_ingredient, field_volume in zip(fields_ingredient, fields_volume):
+            field_ingredient.setText("")
+            field_volume.setText("")
+        if fields_ingredient:
+            fields_ingredient[0].setText(surprise_label)
+
+    def _prepare_random_cocktail(self, amount: int) -> None:
+        """Pick a random cocktail from the pool and prepare it."""
+        if self.is_virgin:
+            pool = [c for c in self.random_pool if c.virgin_available]
+        else:
+            pool = [c for c in self.random_pool if not c.only_virgin]
+        if not pool:
+            return
+        chosen = random.choice(pool)
+        # Re-fetch from DB for up-to-date data
+        db_cocktail = DB_COMMANDER.get_cocktail(chosen.id)
+        if db_cocktail is not None:
+            chosen = db_cocktail
+        self.cocktail = chosen
+        self._scale_cocktail(amount)
+        qt_prepare_flow(self.mainscreen, self.cocktail)
+
     def _prepare_cocktail(self, amount: int) -> None:
         """Prepare the cocktail and switches to the maker screen, if successful."""
+        if self.random_mode:
+            self._prepare_random_cocktail(amount)
+            return
         # same applies here, need to refetch the cocktail from db
         db_cocktail = DB_COMMANDER.get_cocktail(self.cocktail.id)
         if db_cocktail is not None:
@@ -245,7 +300,8 @@ def _toggle_virgin(self, _: bool) -> None:
         """Toggle the virgin option."""
         self.decrease_alcohol.setChecked(False)
         self.increase_alcohol.setChecked(False)
-        self.update_cocktail_data()
+        if not self.random_mode:
+            self.update_cocktail_data()
 
     def _adjust_preparation_buttons(self) -> None:
         """Decide if to use a single or multiple buttons and adjusts the text accordingly.

src/ui/setup_mainwindow.py

@@ -228,22 +228,34 @@ def _handle_restricted_mode_click(self, index: int) -> None:
         # Remove the event filter since it's no longer needed
         self.tabWidget.tabBar().removeEventFilter(self)  # type: ignore
 
-    def open_cocktail_detail(self, cocktail: Cocktail) -> None:
-        """Open the cocktail selection screen."""
+    def _cleanup_cocktail_selection(self) -> None:
+        """Clean up any existing cocktail selection widget."""
         if self.cocktail_selection is not None:
-            # Clean up all internal layouts and widgets recursively
             DP_CONTROLLER.delete_items_of_layout(self.cocktail_selection.layout())
-            # Remove from stacked widget
             self.container_maker.removeWidget(self.cocktail_selection)
-            # Schedule for deletion and remove reference
             self.cocktail_selection.deleteLater()
             self.cocktail_selection = None
+
+    def open_cocktail_detail(self, cocktail: Cocktail) -> None:
+        """Open the cocktail selection screen."""
+        self._cleanup_cocktail_selection()
         self.cocktail_selection = CocktailSelection(self, cocktail)
         self.container_maker.addWidget(self.cocktail_selection)
         self.cocktail_selection.set_cocktail(cocktail)
         self.cocktail_selection.update_cocktail_data()
         self.switch_to_cocktail_detail()
 
+    def open_random_cocktail_detail(self, cocktails: list[Cocktail]) -> None:
+        """Open the cocktail selection screen in random mode."""
+        if not cocktails:
+            return
+        self._cleanup_cocktail_selection()
+        # Use the first cocktail as a placeholder; actual cocktail is chosen at prepare time
+        self.cocktail_selection = CocktailSelection(self, cocktails[0], random_mode=True, random_pool=cocktails)
+        self.container_maker.addWidget(self.cocktail_selection)
+        self.cocktail_selection.update_random_display()
+        self.switch_to_cocktail_detail()
+
     def switch_to_cocktail_detail(self) -> None:
         if self.cocktail_selection is None:
             return

web_client/src/components/cocktail/CocktailList.tsx

@@ -1,6 +1,7 @@
 import type React from 'react';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import { FaQuestion } from 'react-icons/fa';
 import { MdNoDrinks } from 'react-icons/md';
 import Modal from 'react-modal';
 import { useCocktails } from '../../api/cocktails';
@@ -15,6 +16,7 @@ import LockScreen from '../common/LockScreen';
 import SearchBar from '../common/SearchBar';
 import UserDisplay from '../common/UserDisplay';
 import CocktailSelection from './CocktailSelection';
+import RandomCocktailSelection from './RandomCocktailSelection';
 import SingleIngredientSelection from './SingleIngredientSelection';
 
 const CocktailList: React.FC = () => {
@@ -23,6 +25,7 @@ const CocktailList: React.FC = () => {
   const { data: cocktails, error, isLoading } = useCocktails(true, config.MAKER_MAX_HAND_INGREDIENTS ?? 0);
   const [selectedCocktail, setSelectedCocktail] = useState<Cocktail | null>(null);
   const [singleIngredientOpen, setSingleIngredientOpen] = useState(false);
+  const [randomCocktailOpen, setRandomCocktailOpen] = useState(false);
   const [search, setSearch] = useState<string | null>(null);
   const [showOnlyVirginPossible, setShowOnlyVirginPossible] = useState(false);
   const { t } = useTranslation();
@@ -99,6 +102,25 @@ const CocktailList: React.FC = () => {
         </div>
       </div>
       <div className='flex flex-wrap gap-3 justify-center items-center w-full mb-4'>
+        {config.MAKER_RANDOM_COCKTAIL && displayedCocktails && displayedCocktails.length > 0 && !search && (
+          <button
+            className='border-2 border-primary active:border-secondary rounded-xl box-border overflow-hidden min-w-56 max-w-64 basis-1 grow text-xl font-bold bg-primary active:bg-secondary text-background'
+            onClick={() => setRandomCocktailOpen(true)}
+            type='button'
+          >
+            <p className='text-center py-1 flex items-center justify-center'>
+              <FaQuestion className='mr-2' />
+              {t('cocktails.randomCocktail')}
+            </p>
+            <div className='relative w-full' style={{ paddingTop: '100%' }}>
+              <img
+                src={`${API_URL}/static/default/default.jpg`}
+                alt={t('cocktails.randomCocktail')}
+                className='absolute top-0 left-0 w-full h-full object-cover'
+              />
+            </div>
+          </button>
+        )}
         {displayedCocktails
           ?.sort((a, b) => a.name.localeCompare(b.name))
           .map((cocktail) => {
@@ -176,6 +198,19 @@ const CocktailList: React.FC = () => {
       <Modal isOpen={singleIngredientOpen} className='modal slim' overlayClassName='overlay z-20' preventScroll={true}>
         <SingleIngredientSelection onClose={() => setSingleIngredientOpen(false)} />
       </Modal>
+      <Modal
+        isOpen={randomCocktailOpen}
+        onRequestClose={() => setRandomCocktailOpen(false)}
+        contentLabel='Random Cocktail'
+        className='modal'
+        overlayClassName='overlay z-20'
+        preventScroll={true}
+      >
+        <RandomCocktailSelection
+          handleCloseModal={() => setRandomCocktailOpen(false)}
+          cocktails={displayedCocktails || []}
+        />
+      </Modal>
     </div>
   );
 };

web_client/src/components/cocktail/CocktailSelection.tsx

@@ -1,12 +1,9 @@
 import type React from 'react';
 import { useEffect, useState } from 'react';
-import { FaGlassMartiniAlt, FaSkullCrossbones, FaWineGlassAlt } from 'react-icons/fa';
+import { FaSkullCrossbones } from 'react-icons/fa';
 import { GrFormNextLink, GrFormPreviousLink } from 'react-icons/gr';
-import { ImMug } from 'react-icons/im';
 import { IoIosHappy } from 'react-icons/io';
 import { MdNoDrinks } from 'react-icons/md';
-import { PiPintGlassFill } from 'react-icons/pi';
-import { TbGlassChampagne } from 'react-icons/tb';
 import { prepareCocktail } from '../../api/cocktails';
 import { API_URL } from '../../api/common';
 import { Tabs } from '../../constants/tabs';
@@ -18,6 +15,7 @@ import CloseButton from '../common/CloseButton';
 import ProgressModal from './ProgressModal';
 import RefillPrompt from './RefillPrompt';
 import TeamSelection from './TeamSelection';
+import { FALLBACK_SERVING_SIZES, getServingSizeIconIndex, servingSizeIcons } from './utils';
 
 interface CocktailModalProps {
   selectedCocktail: Cocktail;
@@ -28,8 +26,6 @@ interface CocktailModalProps {
 
 type alcoholState = 'high' | 'low' | 'normal' | 'virgin';
 
-const fallbackServingSize = [200, 250, 300];
-const icons = [TbGlassChampagne, FaWineGlassAlt, FaGlassMartiniAlt, PiPintGlassFill, ImMug];
 const alcoholFactor = {
   high: 1.25,
   low: 0.75,
@@ -57,7 +53,7 @@ const CocktailSelection: React.FC<CocktailModalProps> = ({
   const { config } = useConfig();
   const possibleServingSizes = config.MAKER_USE_RECIPE_VOLUME
     ? [displayCocktail.amount]
-    : (config.MAKER_PREPARE_VOLUME ?? fallbackServingSize);
+    : (config.MAKER_PREPARE_VOLUME ?? FALLBACK_SERVING_SIZES);
 
   useEffect(() => {
     const initialAlcoholState = selectedCocktail.only_virgin ? 'virgin' : 'normal';
@@ -120,23 +116,6 @@ const CocktailSelection: React.FC<CocktailModalProps> = ({
     .filter((ingredient) => ingredient.hand)
     .sort((a, b) => b.amount - a.amount);
 
-  const getIconIndex = (idx: number) => {
-    const totalIcons = icons.length;
-    const needed = Math.min(possibleServingSizes.length, totalIcons);
-    const center = Math.floor(totalIcons / 2);
-
-    // Choose a centered contiguous window; for even sizes bias to the right.
-    let start = needed % 2 === 1 ? center - Math.floor(needed / 2) : center - needed / 2 + 1;
-
-    if (start < 0) start = 0;
-    if (start + needed > totalIcons) start = totalIcons - needed;
-
-    // If more buttons than icons, clamp to last icon.
-    if (idx >= needed) return totalIcons - 1;
-
-    return start + idx;
-  };
-
   const calculateDisplayPrice = (amount: number, pricePer100: number): string => {
     if (config.PAYMENT_TYPE === 'Disabled') return '';
     const virginMultiplier = alcohol === 'virgin' ? config.PAYMENT_VIRGIN_MULTIPLIER / 100 : 1;
@@ -256,7 +235,7 @@ const CocktailSelection: React.FC<CocktailModalProps> = ({
                   onClick={() => prepareCocktailClick(amount)}
                   textSize='lg'
                   className='w-full'
-                  icon={icons[getIconIndex(index)]}
+                  icon={servingSizeIcons[getServingSizeIconIndex(index, possibleServingSizes.length)]}
                   iconSize={25}
                 />
               ))}