Update app.py

app.py

@@ -180,9 +180,9 @@ def load_data():
             
     for emp in data['employees']:
         if 'pin' not in emp: emp['pin'] = '0000'
-        if 'daily_rate' not in emp: emp['daily_rate'] = 230000
-        if 'target_amount' not in emp: emp['target_amount'] = 1500000
-        if 'bonus_percentage' not in emp: emp['bonus_percentage'] = 10
+        if 'daily_rate' not in emp: emp['daily_rate'] = 0
+        if 'target_amount' not in emp: emp['target_amount'] = 0
+        if 'bonus_percentage' not in emp: emp['bonus_percentage'] = 0
 
     if not os.path.exists(DATA_FILE):
         try:
@@ -1196,7 +1196,7 @@ SALARY_TEMPLATE = '''
         label { display: block; margin-bottom: 5px; color: var(--text-muted); font-size: 0.85rem; font-weight: 600; }
 
         .rep-table { width: 100%; border-collapse: collapse; font-size: 0.9rem; }
-        .rep-table th, .rep-table td { padding: 8px 5px; border-bottom: 1px solid var(--border); text-align: left; }
+        .rep-table th, .rep-table td { padding: 8px 5px; border-bottom: 1px solid var(--border); text-align: left; vertical-align: middle; }
         .rep-table th { color: var(--text-muted); font-weight: normal; }
 
         @media (max-width: 600px) {
@@ -1211,50 +1211,36 @@ SALARY_TEMPLATE = '''
             <h1><i class="fas fa-money-bill-wave"></i> Отчет по ЗП</h1>
             <a href="/admin" class="btn btn-dark"><i class="fas fa-arrow-left"></i> Назад в админку</a>
         </div>
-
+        
         <div class="report-section">
-            <h3 style="color:var(--primary); margin-top:0;">Управление штрафами</h3>
-            <form method="POST" style="display:flex; gap:10px; flex-wrap:wrap; margin-bottom: 20px;">
+            <h3 style="color:var(--primary); margin-top:0;">Добавить штраф</h3>
+            <form method="POST" style="display:flex; gap:10px; flex-wrap:wrap; align-items:flex-end;">
                 <input type="hidden" name="action" value="add_fine">
-                <select name="employee_id" required style="flex:1; min-width:150px;">
-                    <option value="">Выберите сотрудника</option>
-                    {% for emp in employees %}
-                    <option value="{{ emp.id }}">{{ emp.name }}</option>
-                    {% endfor %}
-                </select>
-                <input type="date" name="date" id="fineDate" required style="flex:1; min-width:150px;">
-                <input type="number" name="amount" placeholder="Сумма штрафа" required style="flex:1; min-width:150px;">
-                <input type="text" name="reason" placeholder="Причина" required style="flex:2; min-width:200px;">
-                <button type="submit" class="btn btn-danger"><i class="fas fa-plus"></i> Добавить штраф</button>
+                <div style="flex:1; min-width:150px;">
+                    <label>Сотрудник</label>
+                    <select name="employee_id" required>
+                        {% for emp in employees %}
+                        <option value="{{ emp.id }}">{{ emp.name }}</option>
+                        {% endfor %}
+                    </select>
+                </div>
+                <div style="flex:1; min-width:100px;">
+                    <label>Сумма</label>
+                    <input type="number" name="amount" required min="0" step="0.01">
+                </div>
+                <div style="flex:1; min-width:150px;">
+                    <label>Дата</label>
+                    <input type="date" name="date" required value="{{ current_date }}">
+                </div>
+                <div style="flex:2; min-width:200px;">
+                    <label>Причина</label>
+                    <input type="text" name="reason">
+                </div>
+                <button type="submit" class="btn btn-danger" style="height:44px;"><i class="fas fa-minus-circle"></i> Штраф</button>
             </form>
-            <div style="overflow-x:auto;">
-                <table class="rep-table">
-                    <tr><th>Дата</th><th>Сотрудник</th><th>Причина</th><th>Сумма</th><th>Действие</th></tr>
-                    {% for fine in fines|sort(attribute='date', reverse=True) %}
-                    <tr>
-                        <td>{{ fine.date }}</td>
-                        <td>
-                            {% for emp in employees %}
-                                {% if emp.id == fine.employee_id %}{{ emp.name }}{% endif %}
-                            {% endfor %}
-                        </td>
-                        <td>{{ fine.reason }}</td>
-                        <td>{{ fine.amount }} {{ currency_code }}</td>
-                        <td>
-                            <form method="POST" onsubmit="return confirm('Удалить штраф?');" style="margin:0;">
-                                <input type="hidden" name="action" value="delete_fine">
-                                <input type="hidden" name="fine_id" value="{{ fine.id }}">
-                                <button type="submit" class="btn btn-dark" style="padding:5px 10px; font-size:0.8rem;"><i class="fas fa-trash" style="color:var(--danger);"></i></button>
-                            </form>
-                        </td>
-                    </tr>
-                    {% endfor %}
-                </table>
-            </div>
         </div>
-        
+
         <div class="report-section">
-            <h3 style="color:var(--primary); margin-top:0;">Расчет зарплаты</h3>
             <div class="form-row" style="margin-bottom: 20px; align-items: flex-end;">
                 <div>
                     <label>Дата начала</label>
@@ -1270,13 +1256,19 @@ SALARY_TEMPLATE = '''
                 <table class="rep-table" id="tableSalary"></table>
             </div>
         </div>
+
+        <div class="report-section" style="margin-top: 20px;">
+            <h3 style="color:var(--danger); margin-top:0;">История штрафов за период</h3>
+            <div style="overflow-x:auto;">
+                <table class="rep-table" id="tableFines"></table>
+            </div>
+        </div>
     </div>
     
     <script>
         const allOrders = {{ orders_json|safe }};
-        const workdays = {{ workdays_json|safe }};
         const employees = {{ employees_json|safe }};
-        const fines = {{ fines_json|safe }};
+        const allFines = {{ fines_json|safe }};
         const currencyCode = '{{ currency_code }}';
 
         function getLocalDateStr(d) {
@@ -1289,7 +1281,6 @@ SALARY_TEMPLATE = '''
             const firstDay = new Date(today.getFullYear(), today.getMonth(), 1);
             document.getElementById('salStart').value = getLocalDateStr(firstDay);
             document.getElementById('salEnd').value = todayStr;
-            document.getElementById('fineDate').value = todayStr;
             generateSalaryReport();
         }
 
@@ -1309,12 +1300,45 @@ SALARY_TEMPLATE = '''
                     empSales[o.employee_id][oDate] += o.total_price;
                 }
             });
+
+            let empFines = {};
+            let finesHtml = '<tr><th>Дата</th><th>Сотрудник</th><th>Сумма</th><th>Причина</th><th>Действие</th></tr>';
+            let hasFines = false;
+
+            allFines.forEach(f => {
+                if (f.date >= start && f.date <= end) {
+                    hasFines = true;
+                    if (!empFines[f.employee_id]) empFines[f.employee_id] = 0;
+                    empFines[f.employee_id] += parseFloat(f.amount);
+                    
+                    const emp = employees.find(e => e.id === f.employee_id);
+                    const empName = emp ? emp.name : 'Удален';
+                    
+                    finesHtml += `<tr>
+                        <td>${f.date}</td>
+                        <td>${empName}</td>
+                        <td style="color:var(--danger);">${parseFloat(f.amount).toFixed(2)} ${currencyCode}</td>
+                        <td>${f.reason}</td>
+                        <td>
+                            <form method="POST" style="margin:0;" onsubmit="return confirm('Удалить штраф?');">
+                                <input type="hidden" name="action" value="delete_fine">
+                                <input type="hidden" name="fine_id" value="${f.id}">
+                                <button type="submit" class="btn btn-danger" style="padding:4px 8px; font-size:0.8rem; border-radius:6px;"><i class="fas fa-trash"></i></button>
+                            </form>
+                        </td>
+                    </tr>`;
+                }
+            });
+
+            if (!hasFines) {
+                finesHtml += '<tr><td colspan="5">Нет штрафов за выбранный период</td></tr>';
+            }
+            document.getElementById('tableFines').innerHTML = finesHtml;
             
             employees.forEach(emp => {
                 let daysWorked = 0;
                 let fixedSal = 0;
                 let bonusSal = 0;
-                let employeeFines = 0;
                 
                 let currDate = new Date(start);
                 const endDate = new Date(end);
@@ -1325,16 +1349,10 @@ SALARY_TEMPLATE = '''
                     
                     if (dailySales > 0) {
                         daysWorked++;
+                        fixedSal += parseFloat(emp.daily_rate || 0);
                         
-                        let rate = parseFloat(emp.daily_rate);
-                        if (isNaN(rate) || rate === 0) rate = 230000;
-                        fixedSal += rate;
-                        
-                        let target = parseFloat(emp.target_amount);
-                        if (isNaN(target) || target === 0) target = 1500000;
-                        
-                        let pct = parseFloat(emp.bonus_percentage);
-                        if (isNaN(pct) || pct === 0) pct = 10;
+                        const target = parseFloat(emp.target_amount || 0);
+                        const pct = parseFloat(emp.bonus_percentage || 0);
                         
                         if (pct > 0 && dailySales > target) {
                             bonusSal += (dailySales - target) * (pct / 100);
@@ -1342,22 +1360,18 @@ SALARY_TEMPLATE = '''
                     }
                     currDate.setDate(currDate.getDate() + 1);
                 }
-
-                fines.forEach(f => {
-                    if (f.employee_id === emp.id && f.date >= start && f.date <= end) {
-                        employeeFines += parseFloat(f.amount);
-                    }
-                });
                 
-                const total = fixedSal + bonusSal - employeeFines;
-                if (daysWorked > 0 || total !== 0 || employeeFines > 0) {
+                const totalFines = empFines[emp.id] || 0;
+                const total = fixedSal + bonusSal - totalFines;
+
+                if (daysWorked > 0 || total !== 0 || totalFines > 0) {
                     html += `<tr>
                         <td>${emp.name}</td>
                         <td>${daysWorked}</td>
                         <td>${fixedSal.toFixed(2)} ${currencyCode}</td>
                         <td>${bonusSal.toFixed(2)} ${currencyCode}</td>
-                        <td style="color:var(--danger);">${employeeFines.toFixed(2)} ${currencyCode}</td>
-                        <td style="font-weight:bold; color:var(--success);">${total.toFixed(2)} ${currencyCode}</td>
+                        <td style="color:var(--danger);">${totalFines > 0 ? '-' + totalFines.toFixed(2) : '0.00'} ${currencyCode}</td>
+                        <td style="font-weight:bold; color:${total >= 0 ? 'var(--success)' : 'var(--danger)'};">${total.toFixed(2)} ${currencyCode}</td>
                     </tr>`;
                 }
             });
@@ -1516,9 +1530,9 @@ ADMIN_TEMPLATE = '''
                         <input type="hidden" name="action" value="add_employee">
                         <div style="flex:1; min-width:150px;"><label>Имя</label><input type="text" name="employee_name" required autocomplete="off"></div>
                         <div style="flex:1; min-width:100px;"><label>PIN (4 цифры)</label><input type="text" name="pin" pattern="\\d{4}" required autocomplete="off"></div>
-                        <div style="flex:1; min-width:100px;"><label>Ставка за день</label><input type="number" name="daily_rate" value="230000" required></div>
-                        <div style="flex:1; min-width:100px;"><label>Цель (n сумма)</label><input type="number" name="target_amount" value="1500000" required></div>
-                        <div style="flex:1; min-width:100px;"><label>Бонус (%)</label><input type="number" name="bonus_percentage" value="10" step="0.1" required></div>
+                        <div style="flex:1; min-width:100px;"><label>Ставка за день</label><input type="number" name="daily_rate" value="0" required></div>
+                        <div style="flex:1; min-width:100px;"><label>Цель (n сумма)</label><input type="number" name="target_amount" value="0" required></div>
+                        <div style="flex:1; min-width:100px;"><label>Бонус (%)</label><input type="number" name="bonus_percentage" value="0" step="0.1" required></div>
                         <button type="submit" class="btn btn-dark" style="width:100%; margin-top:10px;"><i class="fas fa-plus"></i> Добавить</button>
                     </form>
                 </div>
@@ -1958,14 +1972,18 @@ def admin_salary():
     if request.method == 'POST':
         action = request.form.get('action')
         if action == 'add_fine':
+            emp_id = request.form.get('employee_id')
+            amount = float(request.form.get('amount', 0))
+            date = request.form.get('date', get_current_date())
+            reason = request.form.get('reason', '')
             if 'fines' not in data:
                 data['fines'] = []
             data['fines'].append({
                 'id': uuid4().hex,
-                'employee_id': request.form.get('employee_id'),
-                'date': request.form.get('date'),
-                'amount': float(request.form.get('amount', 0)),
-                'reason': request.form.get('reason', '')
+                'employee_id': emp_id,
+                'amount': amount,
+                'date': date,
+                'reason': reason
             })
             save_data(data)
         elif action == 'delete_fine':
@@ -1977,17 +1995,15 @@ def admin_salary():
 
     orders = data.get('orders', {})
     employees = data.get('employees', [])
-    workdays = data.get('workdays', {})
     fines = data.get('fines', [])
     
     return render_template_string(
         SALARY_TEMPLATE,
         orders_json=json.dumps(list(orders.values())),
         employees_json=json.dumps(employees),
-        workdays_json=json.dumps(workdays),
         fines_json=json.dumps(fines),
         employees=employees,
-        fines=fines,
+        current_date=get_current_date(),
         currency_code=CURRENCY_CODE
     )
 
@@ -2016,12 +2032,12 @@ def admin():
         elif action == 'add_employee':
             emp_name = request.form.get('employee_name', '').strip()
             pin = request.form.get('pin', '0000').strip()
-            try: daily_rate = float(request.form.get('daily_rate', 230000))
-            except: daily_rate = 230000
-            try: target_amount = float(request.form.get('target_amount', 1500000))
-            except: target_amount = 1500000
-            try: bonus_percentage = float(request.form.get('bonus_percentage', 10))
-            except: bonus_percentage = 10
+            try: daily_rate = float(request.form.get('daily_rate', 0))
+            except: daily_rate = 0
+            try: target_amount = float(request.form.get('target_amount', 0))
+            except: target_amount = 0
+            try: bonus_percentage = float(request.form.get('bonus_percentage', 0))
+            except: bonus_percentage = 0
             
             if emp_name:
                 employees.append({
@@ -2041,12 +2057,12 @@ def admin():
                 if e.get('id') == emp_id:
                     e['name'] = request.form.get('name', '').strip()
                     e['pin'] = request.form.get('pin', '0000').strip()
-                    try: e['daily_rate'] = float(request.form.get('daily_rate', 230000))
-                    except: e['daily_rate'] = 230000
-                    try: e['target_amount'] = float(request.form.get('target_amount', 1500000))
-                    except: e['target_amount'] = 1500000
-                    try: e['bonus_percentage'] = float(request.form.get('bonus_percentage', 10))
-                    except: e['bonus_percentage'] = 10
+                    try: e['daily_rate'] = float(request.form.get('daily_rate', 0))
+                    except: e['daily_rate'] = 0
+                    try: e['target_amount'] = float(request.form.get('target_amount', 0))
+                    except: e['target_amount'] = 0
+                    try: e['bonus_percentage'] = float(request.form.get('bonus_percentage', 0))
+                    except: e['bonus_percentage'] = 0
                     break
             data['employees'] = employees
             save_data(data)