brief - new change

laheri72 · laheri72 · commit e8bc03072277 · 2026-02-27T09:25:34.000+05:30
diff --git a/blueprints/finance/routes.py b/blueprints/finance/routes.py
@@ -208,6 +208,146 @@ def delete_bill_permanent(bill_id):
     flash('Bill and all its associated items have been permanently deleted.', 'success')
     return redirect(url_for('finance.expenses'))
 
+@finance_bp.route('/reconcile/atomic', methods=['POST'])
+def atomic_reconcile():
+    user = _require_user()
+    if not user or user.role not in ['admin', 'pantryHead']:
+        return jsonify({'error': 'Unauthorized'}), 403
+
+    data = request.json
+    if not data:
+        return jsonify({'error': 'No data provided'}), 400
+
+    bill_id = data.get('bill_id')
+    reconciliations = data.get('reconciliations', []) # List of {procurement_id: X, cost: Y}
+
+    if not bill_id:
+        return jsonify({'error': 'Bill ID is required'}), 400
+
+    bill = tenant_filter(Bill.query).filter_by(id=bill_id).first()
+    if not bill:
+        return jsonify({'error': 'Bill not found'}), 404
+
+    try:
+        total_reconciled_cost = 0
+        for rec in reconciliations:
+            proc_id = rec.get('procurement_id')
+            cost = float(rec.get('cost') or 0)
+            
+            item = tenant_filter(ProcurementItem.query).filter_by(id=proc_id).first()
+            if item and (user.role == 'admin' or item.floor == bill.floor):
+                item.actual_cost = cost
+                item.bill_id = bill.id
+                item.status = 'completed'
+                item.expense_recorded_at = datetime.utcnow()
+                total_reconciled_cost += cost
+        
+        # Update bill total if it was a manual reconciliation adding to an existing bill
+        # Or if we want the bill to reflect the sum of its items
+        current_total = tenant_filter(db.session.query(func.sum(ProcurementItem.actual_cost))).filter(ProcurementItem.bill_id == bill.id).scalar() or 0
+        bill.total_amount = current_total
+        
+        db.session.commit()
+        return jsonify({'success': True, 'reconciled_count': len(reconciliations), 'new_total': float(bill.total_amount)})
+    except Exception as e:
+        db.session.rollback()
+        return jsonify({'error': str(e)}), 500
+
+@finance_bp.route('/procurement/unbilled', methods=['GET'])
+def get_unbilled_procurement():
+    user = _require_user()
+    if not user:
+        return jsonify({'error': 'Unauthorized'}), 401
+
+    floor = _get_active_floor(user)
+    # Get items that are EITHER completed and unbilled, OR still pending
+    # This allows matching a bill to something that was just bought but not yet marked done
+    items = tenant_filter(ProcurementItem.query).filter(
+        ProcurementItem.floor == floor,
+        ProcurementItem.bill_id == None
+    ).order_by(ProcurementItem.status.desc(), ProcurementItem.created_at.desc()).all()
+
+    return jsonify({
+        'items': [{
+            'id': i.id,
+            'name': i.item_name,
+            'quantity': i.quantity,
+            'status': i.status,
+            'category': i.category,
+            'created_at': i.created_at.strftime('%Y-%m-%d')
+        } for i in items]
+    })
+
+@finance_bp.route('/reconcile/atomic/full', methods=['POST'])
+def atomic_reconcile_full():
+    user = _require_user()
+    if not user or user.role not in ['admin', 'pantryHead']:
+        return jsonify({'error': 'Unauthorized'}), 403
+
+    data = request.json
+    if not data:
+        return jsonify({'error': 'No data provided'}), 400
+
+    floor = _get_active_floor(user)
+    try:
+        bill_date_str = data.get('bill_date')
+        bill_date = datetime.strptime(bill_date_str, '%Y-%m-%d').date() if bill_date_str else date.today()
+
+        # 1. Create the Bill
+        bill = Bill(
+            bill_no=data.get('bill_no') or f"REC-{int(datetime.utcnow().timestamp())}",
+            bill_date=bill_date,
+            shop_name=data.get('shop_name') or 'Generic Vendor',
+            total_amount=data.get('total_amount', 0),
+            floor=floor,
+            source='receipt_scan',
+            original_filename=data.get('filename'),
+            tenant_id=getattr(g, 'tenant_id', None)
+        )
+        db.session.add(bill)
+        db.session.flush()
+
+        # 2. Create NEW ProcurementItems
+        for item_data in data.get('new_items', []):
+            item = ProcurementItem(
+                item_name=item_data.get('name'),
+                quantity=item_data.get('quantity'),
+                category='other',
+                priority='medium',
+                status='completed',
+                floor=floor,
+                created_by_id=user.id,
+                actual_cost=item_data.get('cost'),
+                expense_recorded_at=datetime.utcnow(),
+                bill_id=bill.id,
+                tenant_id=getattr(g, 'tenant_id', None)
+            )
+            db.session.add(item)
+
+        # 3. Reconcile EXISTING ProcurementItems
+        for rec in data.get('reconciliations', []):
+            proc_id = rec.get('procurement_id')
+            cost = float(rec.get('cost') or 0)
+            
+            item = tenant_filter(ProcurementItem.query).filter_by(id=proc_id).first()
+            if item and (user.role == 'admin' or item.floor == floor):
+                item.actual_cost = cost
+                item.bill_id = bill.id
+                item.status = 'completed'
+                item.expense_recorded_at = datetime.utcnow()
+
+        # 4. Final Total Sync
+        db.session.flush() # Ensure all items have costs applied
+        final_total = tenant_filter(db.session.query(func.sum(ProcurementItem.actual_cost))).filter(ProcurementItem.bill_id == bill.id).scalar() or 0
+        bill.total_amount = final_total
+
+        db.session.commit()
+        return jsonify({'success': True, 'bill_id': bill.id})
+    except Exception as e:
+        db.session.rollback()
+        logging.error(f"Atomic Full Reconcile Error: {str(e)}")
+        return jsonify({'error': str(e)}), 500
+
 @finance_bp.route('/budgets/add', methods=['POST'])
 def add_budget():
     user = _require_user()
diff --git a/blueprints/pantry/routes.py b/blueprints/pantry/routes.py
@@ -1,6 +1,6 @@
 from flask import render_template, request, redirect, url_for, session, flash, abort, jsonify, g
 from app import db
-from models import User, Dish, Menu, Feedback, Request, ProcurementItem, Team, TeamMember, TeaTask, FloorLendBorrow, SpecialEvent, Announcement, Suggestion, SuggestionVote, Expense
+from models import User, Dish, Menu, Feedback, Request, ProcurementItem, Team, TeamMember, TeaTask, FloorLendBorrow, SpecialEvent, Announcement, Suggestion, SuggestionVote, Expense, Budget
 from datetime import datetime, date, timedelta
 from sqlalchemy import or_, func
 from sqlalchemy.orm import joinedload
@@ -192,6 +192,88 @@ def dashboard():
     # Sort notifications by time
     notifications.sort(key=lambda x: x['time'], reverse=True)
     
+    # Morning Brief for Pantry Heads
+    morning_brief = None
+    if user.role == 'pantryHead':
+        morning_brief = {
+            'absent_staff_count': 0,
+            'breakfast_rating': 0,
+            'breakfast_feedback_count': 0,
+            'budget_usage_pct': 0,
+            'budget_remaining_days': 0,
+            'pending_procurement_count': 0,
+            'breakfast_dish_name': 'Breakfast'
+        }
+        
+        # 1. Staff Absent today
+        morning_brief['absent_staff_count'] = tenant_filter(Request.query).filter(
+            Request.floor == floor,
+            Request.request_type == 'absence',
+            Request.status == 'approved',
+            Request.start_date <= today,
+            Request.end_date >= today
+        ).count()
+        
+        # 2. Breakfast Feedback (Most recent breakfast today or yesterday)
+        recent_breakfast = tenant_filter(Menu.query).filter(
+            Menu.floor == floor,
+            Menu.meal_type == 'breakfast',
+            Menu.date <= today
+        ).order_by(Menu.date.desc()).first()
+        
+        if recent_breakfast:
+            morning_brief['breakfast_dish_name'] = recent_breakfast.title
+            feedback_stats = tenant_filter(db.session.query(
+                func.avg(Feedback.rating),
+                func.count(Feedback.id)
+            )).filter(Feedback.menu_id == recent_breakfast.id).first()
+            
+            if feedback_stats and feedback_stats[1] > 0:
+                morning_brief['breakfast_rating'] = round(float(feedback_stats[0]), 1)
+                morning_brief['breakfast_feedback_count'] = feedback_stats[1]
+        
+        # 3. Budget Alert
+        start_of_week = today - timedelta(days=today.weekday())
+        end_of_week = start_of_week + timedelta(days=6)
+        
+        # Get all budgets that overlap with the current week
+        active_budgets = tenant_filter(Budget.query).filter(
+            Budget.floor == floor,
+            Budget.start_date <= end_of_week,
+            or_(Budget.end_date >= start_of_week, Budget.end_date.is_(None))
+        ).all()
+        
+        if active_budgets:
+            total_allocated = sum(float(b.amount_allocated) for b in active_budgets)
+            
+            # Spent this week: Legacy Expenses + Finalized Procurement
+            spent_proc = tenant_filter(db.session.query(func.sum(ProcurementItem.actual_cost))).filter(
+                ProcurementItem.floor == floor,
+                ProcurementItem.status == 'completed',
+                ProcurementItem.bill_id.isnot(None),
+                ProcurementItem.expense_recorded_at >= datetime.combine(start_of_week, datetime.min.time())
+            ).scalar() or 0
+            
+            spent_legacy = tenant_filter(db.session.query(func.sum(Expense.amount))).filter(
+                Expense.floor == floor,
+                Expense.date >= start_of_week
+            ).scalar() or 0
+            
+            total_spent = float(spent_proc) + float(spent_legacy)
+            
+            if total_allocated > 0:
+                morning_brief['budget_usage_pct'] = min(100, round((total_spent / total_allocated) * 100))
+            
+            # Days remaining in the current week or until the earliest end_date
+            remaining_days = (end_of_week - today).days
+            morning_brief['budget_remaining_days'] = max(0, remaining_days)
+                
+        # 4. Procurement Pending
+        morning_brief['pending_procurement_count'] = tenant_filter(ProcurementItem.query).filter(
+            ProcurementItem.floor == floor,
+            ProcurementItem.status != 'completed'
+        ).count()
+
     return render_template(
         'dashboard.html',
         user=user,
@@ -206,6 +288,7 @@ def dashboard():
         today=today,
         upcoming_until=upcoming_until,
         current_user=user,
+        morning_brief=morning_brief
     )
 
 @pantry_bp.route('/home')
diff --git a/squeez.md b/squeez.md
@@ -0,0 +1,28 @@
+✦ To make AJS Pantry the definitive platform for pantry management, we need to shift the Pantry Head's (PH) role from Data Entry Clerk to
+  Operations Director.
+
+  Here is a senior-level automation strategy focused on "squeezing" manual effort out of every module, keeping your existing models.py and
+  ROUTE_MAP.md in mind.
+
+  ---
+
+
+  1. The "Menu Blueprint" System (Pantry Module)
+  Current Effort: Manually creating 21 meals (Breakfast/Lunch/Dinner) every week.
+  The "Squeeze": Implement Recursive Templates.
+   * The Idea: Allow PHs to save a "Standard Week" as a template. With one click, they can "Project" that template onto any future week.
+   * Intelligence: The system checks the Request table for absences during that future week and warns the PH: "Your assigned Menu Head (User X)
+     is on leave on Tuesday; please re-assign."
+   * Benefit: Reduces 30 minutes of manual clicking to 10 seconds of verification.
+
+
+
+
+
+  Implementation Priority Plan:
+   1. High Impact / Low Effort: Global Absence Shield (Dropdown filtering).
+   2. High Impact / Med Effort: Recursive Menu Templates (One-click weekly planning).
+   3. Maximum Impact / High Effort: Atomic Bill Reconciliation (Linking OCR to Procurement).
+
+
+  Which of these directions aligns most with your current needs? I can start detailing the logic for whichever you choose.
diff --git a/static/style.css b/static/style.css
@@ -1011,3 +1011,11 @@ body {
 main {
     flex: 1 0 auto;
 }
+
+/* Utility classes for soft backgrounds */
+.bg-soft-primary { background-color: rgba(33, 150, 243, 0.1) !important; color: #2196F3 !important; }
+.bg-soft-success { background-color: rgba(76, 175, 80, 0.1) !important; color: #4CAF50 !important; }
+.bg-soft-warning { background-color: rgba(255, 152, 0, 0.1) !important; color: #FF9800 !important; }
+.bg-soft-danger { background-color: rgba(244, 67, 54, 0.1) !important; color: #F44336 !important; }
+.bg-soft-info { background-color: rgba(33, 150, 243, 0.1) !important; color: #2196F3 !important; }
+.bg-soft-teal { background-color: rgba(38, 166, 154, 0.1) !important; color: #26A69A !important; }
diff --git a/templates/dashboard.html b/templates/dashboard.html
diff --git a/templates/expenses.html b/templates/expenses.html
