backend/migrations/028_goal_categories_priorities.sql

@@ -1,58 +0,0 @@
--- Migration 028: Goal Categories and Priorities
--- Date: 2026-03-27
--- Purpose: Multi-dimensional goal priorities (one primary goal per category)
-
--- ============================================================================
--- Add category and priority columns
--- ============================================================================
-
-ALTER TABLE goals
-ADD COLUMN category VARCHAR(50),
-ADD COLUMN priority INTEGER DEFAULT 2 CHECK (priority >= 1 AND priority <= 3);
-
-COMMENT ON COLUMN goals.category IS 'Goal category: body, training, nutrition, recovery, health, other';
-COMMENT ON COLUMN goals.priority IS 'Priority level: 1=high, 2=medium, 3=low';
-
--- ============================================================================
--- Migrate existing goals to categories based on goal_type
--- ============================================================================
-
-UPDATE goals SET category = CASE
-  -- Body composition goals
-  WHEN goal_type IN ('weight', 'body_fat', 'lean_mass') THEN 'body'
-
-  -- Training goals
-  WHEN goal_type IN ('strength', 'flexibility', 'training_frequency') THEN 'training'
-
-  -- Health/cardio goals
-  WHEN goal_type IN ('vo2max', 'rhr', 'bp', 'hrv') THEN 'health'
-
-  -- Recovery goals
-  WHEN goal_type IN ('sleep_quality', 'sleep_duration', 'rest_days') THEN 'recovery'
-
-  -- Nutrition goals
-  WHEN goal_type IN ('calories', 'protein', 'healthy_eating') THEN 'nutrition'
-
-  -- Default
-  ELSE 'other'
-END
-WHERE category IS NULL;
-
--- ============================================================================
--- Set priority based on is_primary
--- ============================================================================
-
-UPDATE goals SET priority = CASE
-  WHEN is_primary = true THEN 1  -- Primary goals get priority 1
-  ELSE 2                          -- Others get priority 2 (medium)
-END;
-
--- ============================================================================
--- Create index for category-based queries
--- ============================================================================
-
-CREATE INDEX IF NOT EXISTS idx_goals_category_priority
-ON goals(profile_id, category, priority)
-WHERE is_active = true;
-
-COMMENT ON INDEX idx_goals_category_priority IS 'Fast lookup for category-grouped goals sorted by priority';

backend/routers/goals.py

@@ -42,12 +42,10 @@ class FocusAreasUpdate(BaseModel):
 class GoalCreate(BaseModel):
     """Create or update a concrete goal"""
     goal_type: str  # weight, body_fat, lean_mass, vo2max, strength, flexibility, bp, rhr
-    is_primary: bool = False  # Kept for backward compatibility
+    is_primary: bool = False
     target_value: float
     unit: str  # kg, %, ml/kg/min, bpm, mmHg, cm, reps
     target_date: Optional[date] = None
-    category: Optional[str] = 'other'  # body, training, nutrition, recovery, health, other
-    priority: Optional[int] = 2  # 1=high, 2=medium, 3=low
     name: Optional[str] = None
     description: Optional[str] = None
 
@@ -56,9 +54,7 @@ class GoalUpdate(BaseModel):
     target_value: Optional[float] = None
     target_date: Optional[date] = None
     status: Optional[str] = None  # active, reached, abandoned, expired
-    is_primary: Optional[bool] = None  # Kept for backward compatibility
+    is_primary: Optional[bool] = None
-    category: Optional[str] = None  # body, training, nutrition, recovery, health, other
-    priority: Optional[int] = None  # 1=high, 2=medium, 3=low
     name: Optional[str] = None
     description: Optional[str] = None
 
@@ -407,13 +403,13 @@ def create_goal(data: GoalCreate, session: dict = Depends(require_auth)):
             INSERT INTO goals (
                 profile_id, goal_type, is_primary,
                 target_value, current_value, start_value, unit,
-                target_date, category, priority, name, description
+                target_date, name, description
-            ) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
+            ) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
             RETURNING id
         """, (
             pid, data.goal_type, data.is_primary,
             data.target_value, current_value, current_value, data.unit,
-            data.target_date, data.category, data.priority, data.name, data.description
+            data.target_date, data.name, data.description
         ))
 
         goal_id = cur.fetchone()['id']
@@ -465,14 +461,6 @@ def update_goal(goal_id: str, data: GoalUpdate, session: dict = Depends(require_
             updates.append("is_primary = %s")
             params.append(data.is_primary)
 
-        if data.category is not None:
-            updates.append("category = %s")
-            params.append(data.category)
-
-        if data.priority is not None:
-            updates.append("priority = %s")
-            params.append(data.priority)
-
         if data.name is not None:
             updates.append("name = %s")
             params.append(data.name)
@@ -511,52 +499,6 @@ def delete_goal(goal_id: str, session: dict = Depends(require_auth)):
 
         return {"message": "Ziel gelöscht"}
 
-@router.get("/grouped")
-def get_goals_grouped(session: dict = Depends(require_auth)):
-    """
-    Get goals grouped by category, sorted by priority.
-
-    Returns structure:
-    {
-      "body": [{"id": "...", "goal_type": "weight", "priority": 1, ...}, ...],
-      "training": [...],
-      "nutrition": [...],
-      "recovery": [...],
-      "health": [...],
-      "other": [...]
-    }
-    """
-    pid = session['profile_id']
-
-    with get_db() as conn:
-        cur = get_cursor(conn)
-
-        # Get all active goals with type definitions
-        cur.execute("""
-            SELECT
-                g.id, g.goal_type, g.target_value, g.current_value, g.start_value,
-                g.unit, g.target_date, g.status, g.is_primary, g.category, g.priority,
-                g.name, g.description, g.progress_pct, g.linear_projection,
-                g.created_at, g.updated_at,
-                gt.label_de, gt.icon, gt.category as type_category
-            FROM goals g
-            LEFT JOIN goal_type_definitions gt ON g.goal_type = gt.type_key
-            WHERE g.profile_id = %s AND g.is_active = true
-            ORDER BY g.category, g.priority ASC, g.created_at DESC
-        """, (pid,))
-
-        goals = cur.fetchall()
-
-        # Group by category
-        grouped = {}
-        for goal in goals:
-            cat = goal['category'] or 'other'
-            if cat not in grouped:
-                grouped[cat] = []
-            grouped[cat].append(r2d(goal))
-
-        return grouped
-
 # ============================================================================
 # Training Phases
 # ============================================================================

frontend/src/pages/GoalsPage.jsx

@@ -5,22 +5,44 @@ import dayjs from 'dayjs'
 import 'dayjs/locale/de'
 dayjs.locale('de')
 
-// Goal Categories
+// Goal Mode Definitions
-const GOAL_CATEGORIES = {
+const GOAL_MODES = [
-  body: { label: 'Körper', icon: '📉', color: '#D85A30', description: 'Gewicht, Körperfett, Muskelmasse' },
+  {
-  training: { label: 'Training', icon: '🏋️', color: '#378ADD', description: 'Kraft, Frequenz, Performance' },
+    id: 'weight_loss',
-  nutrition: { label: 'Ernährung', icon: '🍎', color: '#1D9E75', description: 'Kalorien, Makros, Essgewohnheiten' },
+    icon: '📉',
-  recovery: { label: 'Erholung', icon: '😴', color: '#7B68EE', description: 'Schlaf, Regeneration, Ruhetage' },
+    label: 'Gewichtsreduktion',
-  health: { label: 'Gesundheit', icon: '❤️', color: '#E67E22', description: 'Vitalwerte, Blutdruck, HRV' },
+    description: 'Kaloriendefizit, Fettabbau',
-  other: { label: 'Sonstiges', icon: '📌', color: '#94A3B8', description: 'Weitere Ziele' }
+    color: '#D85A30'
-}
+  },
-
+  {
-// Priority Levels
+    id: 'strength',
-const PRIORITY_LEVELS = {
+    icon: '💪',
-  1: { label: 'Hoch', stars: '⭐⭐⭐', color: 'var(--accent)' },
+    label: 'Kraftaufbau',
-  2: { label: 'Mittel', stars: '⭐⭐', color: '#94A3B8' },
+    description: 'Muskelwachstum, progressive Belastung',
-  3: { label: 'Niedrig', stars: '⭐', color: '#CBD5E1' }
+    color: '#378ADD'
-}
+  },
+  {
+    id: 'endurance',
+    icon: '🏃',
+    label: 'Ausdauer',
+    description: 'VO2Max, aerobe Kapazität',
+    color: '#1D9E75'
+  },
+  {
+    id: 'recomposition',
+    icon: '⚖️',
+    label: 'Körperkomposition',
+    description: 'Gleichzeitig Fett ab- & Muskeln aufbauen',
+    color: '#7B68EE'
+  },
+  {
+    id: 'health',
+    icon: '❤️',
+    label: 'Allgemeine Gesundheit',
+    description: 'Ausgewogen, präventiv',
+    color: '#E67E22'
+  }
+]
 
 export default function GoalsPage() {
   const [goalMode, setGoalMode] = useState(null)
@@ -34,8 +56,7 @@ export default function GoalsPage() {
     flexibility_pct: 0,
     health_pct: 0
   })
-  const [goals, setGoals] = useState([]) // Kept for backward compat
+  const [goals, setGoals] = useState([])
-  const [groupedGoals, setGroupedGoals] = useState({}) // Category-grouped goals
   const [goalTypes, setGoalTypes] = useState([]) // Dynamic from DB (Phase 1.5)
   const [goalTypesMap, setGoalTypesMap] = useState({}) // For quick lookup
   const [showGoalForm, setShowGoalForm] = useState(false)
@@ -48,8 +69,6 @@ export default function GoalsPage() {
   const [formData, setFormData] = useState({
     goal_type: 'weight',
     is_primary: false,
-    category: 'body',
-    priority: 2,
     target_value: '',
     unit: 'kg',
     target_date: '',
@@ -65,16 +84,14 @@ export default function GoalsPage() {
     setLoading(true)
     setError(null)
     try {
-      const [modeData, goalsData, groupedData, typesData, focusData] = await Promise.all([
+      const [modeData, goalsData, typesData, focusData] = await Promise.all([
         api.getGoalMode(),
         api.listGoals(),
-        api.listGoalsGrouped(), // v2.1: Load grouped by category
         api.listGoalTypeDefinitions(), // Phase 1.5: Load from DB
         api.getFocusAreas() // v2.0: Load focus areas
       ])
       setGoalMode(modeData.goal_mode)
       setGoals(goalsData)
-      setGroupedGoals(groupedData)
 
       // Ensure all focus fields are present and numeric
       const sanitizedFocus = {
@@ -141,8 +158,6 @@ export default function GoalsPage() {
     setFormData({
       goal_type: firstType,
       is_primary: goals.length === 0, // First goal is primary by default
-      category: 'body',
-      priority: 2,
       target_value: '',
       unit: goalTypesMap[firstType]?.unit || 'kg',
       target_date: '',
@@ -157,8 +172,6 @@ export default function GoalsPage() {
     setFormData({
       goal_type: goal.goal_type,
       is_primary: goal.is_primary,
-      category: goal.category || 'other',
-      priority: goal.priority || 2,
       target_value: goal.target_value,
       unit: goal.unit,
       target_date: goal.target_date || '',
@@ -186,8 +199,6 @@ export default function GoalsPage() {
       const data = {
         goal_type: formData.goal_type,
         is_primary: formData.is_primary,
-        category: formData.category,
-        priority: formData.priority,
         target_value: parseFloat(formData.target_value),
         unit: formData.unit,
         target_date: formData.target_date || null,
@@ -356,6 +367,32 @@ export default function GoalsPage() {
               })}
             </div>
 
+            {/* Weight Total Display */}
+            <div style={{
+              padding: 12,
+              background: 'var(--surface2)',
+              border: '1px solid var(--border)',
+              borderRadius: 8,
+              marginBottom: 16
+            }}>
+              <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
+                <span style={{ fontWeight: 600, color: 'var(--text2)' }}>
+                  Gewichtung gesamt:
+                </span>
+                <span style={{ fontSize: 18, fontWeight: 600, color: 'var(--text1)' }}>
+                  {(() => {
+                    const total = Object.entries(focusTemp)
+                      .filter(([k]) => k.endsWith('_pct'))
+                      .reduce((acc, [k, v]) => acc + (Number(v) || 0), 0)
+                    return (total / 10).toFixed(1)
+                  })()}
+                </span>
+              </div>
+              <div style={{ fontSize: 12, marginTop: 4, color: 'var(--text3)' }}>
+                💡 Die Prozentanteile werden automatisch berechnet
+              </div>
+            </div>
+
             {/* Action Buttons */}
             <div style={{ display: 'flex', gap: 12 }}>
               <button
@@ -445,7 +482,7 @@ export default function GoalsPage() {
         )}
       </div>
 
-      {/* Tactical Goals List - Category Grouped */}
+      {/* Tactical Goals List */}
       <div className="card">
         <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 16 }}>
           <h2 style={{ margin: 0 }}>🎯 Konkrete Ziele</h2>
@@ -454,7 +491,7 @@ export default function GoalsPage() {
           </button>
         </div>
 
-        {Object.keys(groupedGoals).length === 0 ? (
+        {goals.length === 0 ? (
           <div style={{ textAlign: 'center', padding: '40px 20px', color: 'var(--text2)' }}>
             <Target size={48} style={{ opacity: 0.3, marginBottom: 16 }} />
             <p>Noch keine Ziele definiert</p>
@@ -463,78 +500,48 @@ export default function GoalsPage() {
             </button>
           </div>
         ) : (
-          <div style={{ display: 'flex', flexDirection: 'column', gap: 32 }}>
-            {Object.entries(GOAL_CATEGORIES).map(([catKey, catInfo]) => {
-              const categoryGoals = groupedGoals[catKey] || []
-              if (categoryGoals.length === 0) return null
-
-              return (
-                <div key={catKey}>
-                  {/* Category Header */}
-                  <div style={{
-                    display: 'flex',
-                    alignItems: 'center',
-                    gap: 12,
-                    marginBottom: 16,
-                    paddingBottom: 12,
-                    borderBottom: `3px solid ${catInfo.color}`
-                  }}>
-                    <span style={{ fontSize: 28 }}>{catInfo.icon}</span>
-                    <div style={{ flex: 1 }}>
-                      <h3 style={{ margin: 0, color: catInfo.color, fontSize: 18 }}>{catInfo.label}</h3>
-                      <p style={{ margin: 0, fontSize: 13, color: 'var(--text3)' }}>{catInfo.description}</p>
-                    </div>
-                    <span style={{
-                      background: catInfo.color,
-                      color: 'white',
-                      padding: '4px 12px',
-                      borderRadius: 16,
-                      fontSize: 13,
-                      fontWeight: 600
-                    }}>
-                      {categoryGoals.length} {categoryGoals.length === 1 ? 'Ziel' : 'Ziele'}
-                    </span>
-                  </div>
-
-                  {/* Goals in Category */}
           <div style={{ display: 'flex', flexDirection: 'column', gap: 12 }}>
-                    {categoryGoals.map(goal => {
+            {goals.map(goal => {
-                      const typeInfo = goalTypesMap[goal.goal_type] || { label_de: goal.goal_type, unit: '', icon: '📊' }
+              const typeInfo = goalTypesMap[goal.goal_type] || { label: goal.goal_type, unit: '', icon: '📊' }
-                      const priorityInfo = PRIORITY_LEVELS[goal.priority] || PRIORITY_LEVELS[2]
-
               return (
                 <div
                   key={goal.id}
                   className="card"
                   style={{
                     background: 'var(--surface2)',
-                            border: `1px solid var(--border)`,
+                    border: goal.is_primary ? '2px solid var(--accent)' : '1px solid var(--border)'
-                            borderLeft: `5px solid ${catInfo.color}`
                   }}
                 >
-                          <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'flex-start', gap: 16 }}>
+                  <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'flex-start' }}>
                     <div style={{ flex: 1 }}>
-                              <div style={{ display: 'flex', alignItems: 'center', gap: 8, marginBottom: 8, flexWrap: 'wrap' }}>
+                      <div style={{ display: 'flex', alignItems: 'center', gap: 8, marginBottom: 8 }}>
                         <span style={{ fontSize: 20 }}>{typeInfo.icon}</span>
-                                <span style={{ fontWeight: 600, fontSize: 16 }}>
+                        <span style={{ fontWeight: 600 }}>
-                                  {goal.name || typeInfo.label_de}
+                          {goal.name || typeInfo.label}
                         </span>
-                                <span style={{ fontSize: 16 }} title={priorityInfo.label}>
+                        {goal.is_primary && (
-                                  {priorityInfo.stars}
+                          <span style={{
+                            background: 'var(--accent)',
+                            color: 'white',
+                            fontSize: 11,
+                            padding: '2px 8px',
+                            borderRadius: 4
+                          }}>
+                            PRIMÄR
                           </span>
+                        )}
                         <span style={{
                           background: goal.status === 'active' ? '#E6F4F1' : '#F3F4F6',
                           color: goal.status === 'active' ? 'var(--accent)' : 'var(--text2)',
                           fontSize: 11,
-                                  padding: '3px 8px',
+                          padding: '2px 8px',
-                                  borderRadius: 4,
+                          borderRadius: 4
-                                  fontWeight: 500
                         }}>
-                                  {goal.status === 'active' ? 'AKTIV' : goal.status?.toUpperCase() || 'AKTIV'}
+                          {goal.status === 'active' ? 'AKTIV' : goal.status?.toUpperCase()}
                         </span>
                       </div>
 
-                              <div style={{ display: 'flex', gap: 20, marginBottom: 12, fontSize: 14, flexWrap: 'wrap' }}>
+                      <div style={{ display: 'flex', gap: 24, marginBottom: 12, fontSize: 14 }}>
                         <div>
                           <span style={{ color: 'var(--text2)' }}>Start:</span>{' '}
                           <strong>{goal.start_value} {goal.unit}</strong>
@@ -545,10 +552,10 @@ export default function GoalsPage() {
                         </div>
                         <div>
                           <span style={{ color: 'var(--text2)' }}>Ziel:</span>{' '}
-                                  <strong style={{ color: catInfo.color }}>{goal.target_value} {goal.unit}</strong>
+                          <strong>{goal.target_value} {goal.unit}</strong>
                         </div>
                         {goal.target_date && (
-                                  <div style={{ color: 'var(--text2)' }}>
+                          <div>
                             <Calendar size={14} style={{ verticalAlign: 'middle', marginRight: 4 }} />
                             {dayjs(goal.target_date).format('DD.MM.YYYY')}
                           </div>
@@ -561,36 +568,49 @@ export default function GoalsPage() {
                             display: 'flex',
                             justifyContent: 'space-between',
                             fontSize: 12,
-                                    marginBottom: 4,
+                            marginBottom: 4
-                                    color: 'var(--text2)'
                           }}>
                             <span>Fortschritt</span>
-                                    <span style={{ fontWeight: 600, color: 'var(--text1)' }}>{goal.progress_pct}%</span>
+                            <span style={{ fontWeight: 600 }}>{goal.progress_pct}%</span>
                           </div>
                           <div style={{
                             width: '100%',
-                                    height: 8,
+                            height: 6,
                             background: 'var(--surface)',
-                                    borderRadius: 4,
+                            borderRadius: 3,
                             overflow: 'hidden'
                           }}>
                             <div style={{
                               width: `${Math.min(100, Math.max(0, goal.progress_pct))}%`,
                               height: '100%',
-                                      background: catInfo.color,
+                              background: getProgressColor(goal.progress_pct),
                               transition: 'width 0.3s ease'
                             }} />
                           </div>
+
+                          {goal.on_track !== null && (
+                            <div style={{ marginTop: 8, fontSize: 12 }}>
+                              {goal.on_track ? (
+                                <span style={{ color: 'var(--accent)' }}>
+                                  ✓ Ziel voraussichtlich erreichbar bis {dayjs(goal.target_date).format('DD.MM.YYYY')}
+                                </span>
+                              ) : (
+                                <span style={{ color: '#D85A30' }}>
+                                  ⚠ Prognose: {goal.projection_date ? dayjs(goal.projection_date).format('DD.MM.YYYY') : 'Offen'}
+                                  {goal.target_date && ' (später als geplant)'}
+                                </span>
+                              )}
+                            </div>
+                          )}
                         </div>
                       )}
                     </div>
 
-                            <div style={{ display: 'flex', gap: 8, flexShrink: 0 }}>
+                    <div style={{ display: 'flex', gap: 8 }}>
                       <button
                         className="btn-secondary"
                         onClick={() => handleEditGoal(goal)}
                         style={{ padding: '6px 12px' }}
-                                title="Bearbeiten"
                       >
                         <Pencil size={14} />
                       </button>
@@ -598,7 +618,6 @@ export default function GoalsPage() {
                         className="btn-secondary"
                         onClick={() => handleDeleteGoal(goal.id)}
                         style={{ padding: '6px 12px', color: '#DC2626' }}
-                                title="Löschen"
                       >
                         <Trash2 size={14} />
                       </button>
@@ -608,10 +627,6 @@ export default function GoalsPage() {
               )
             })}
           </div>
-                </div>
-              )
-            })}
-          </div>
         )}
       </div>
 
@@ -802,61 +817,34 @@ export default function GoalsPage() {
               />
             </div>
 
-            {/* Category & Priority */}
+            {/* Primärziel */}
-            <div style={{ fontSize: 14, fontWeight: 600, marginBottom: 8, marginTop: 20, color: 'var(--text1)' }}>
+            <div style={{
-              📂 Kategorisierung
+              padding: 12,
-            </div>
+              background: 'var(--surface2)',
-
+              borderRadius: 8,
-            <div style={{ display: 'flex', gap: 12, marginBottom: 16 }}>
+              marginBottom: 20
-              {/* Category */}
-              <div style={{ flex: 1 }}>
-                <label style={{
-                  display: 'block',
-                  fontSize: 13,
-                  fontWeight: 500,
-                  marginBottom: 4,
-                  color: 'var(--text2)'
             }}>
-                  Kategorie *
-                </label>
-                <select
-                  className="form-input"
-                  style={{ width: '100%' }}
-                  value={formData.category}
-                  onChange={e => setFormData(f => ({ ...f, category: e.target.value }))}
-                >
-                  {Object.entries(GOAL_CATEGORIES).map(([key, info]) => (
-                    <option key={key} value={key}>
-                      {info.icon} {info.label}
-                    </option>
-                  ))}
-                </select>
-              </div>
-
-              {/* Priority */}
-              <div style={{ flex: 1 }}>
               <label style={{
-                  display: 'block',
+                display: 'flex',
-                  fontSize: 13,
+                alignItems: 'flex-start',
-                  fontWeight: 500,
+                gap: 10,
-                  marginBottom: 4,
+                cursor: 'pointer'
-                  color: 'var(--text2)'
               }}>
-                  Priorität *
+                <input
-                </label>
+                  type="checkbox"
-                <select
+                  checked={formData.is_primary}
-                  className="form-input"
+                  onChange={e => setFormData(f => ({ ...f, is_primary: e.target.checked }))}
-                  style={{ width: '100%' }}
+                  style={{ marginTop: 2 }}
-                  value={formData.priority}
+                />
-                  onChange={e => setFormData(f => ({ ...f, priority: parseInt(e.target.value) }))}
+                <div>
-                >
+                  <div style={{ fontSize: 13, fontWeight: 600, marginBottom: 2 }}>
-                  {Object.entries(PRIORITY_LEVELS).map(([level, info]) => (
+                    Als Primärziel setzen
-                    <option key={level} value={level}>
-                      {info.stars} {info.label}
-                    </option>
-                  ))}
-                </select>
                   </div>
+                  <div style={{ fontSize: 12, color: 'var(--text2)' }}>
+                    Dein Primärziel hat höchste Priorität in Analysen und Charts
+                  </div>
+                </div>
+              </label>
             </div>
 
             {/* Buttons */}

frontend/src/utils/api.js

@@ -340,7 +340,6 @@ export const api = {
   updateFocusAreas:       (d)     => req('/goals/focus-areas', jput(d)),
 
   listGoals:              ()      => req('/goals/list'),
-  listGoalsGrouped:       ()      => req('/goals/grouped'),
   createGoal:             (d)     => req('/goals/create', json(d)),
   updateGoal:             (id,d)  => req(`/goals/${id}`, jput(d)),
   deleteGoal:             (id)    => req(`/goals/${id}`, {method:'DELETE'}),