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'] = 0
-        if 'target_amount' not in emp: emp['target_amount'] = 0
-        if 'bonus_percentage' not in emp: emp['bonus_percentage'] = 0
+        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 not os.path.exists(DATA_FILE):
         try:
@@ -1184,15 +1184,15 @@ SALARY_TEMPLATE = '''
         .btn { padding: 12px 20px; border: none; border-radius: 10px; font-weight: 700; cursor: pointer; color: #000; text-decoration: none; display: inline-flex; align-items: center; gap: 8px; font-size: 0.95rem; transition: opacity 0.2s; }
         .btn:active { opacity: 0.8; }
         .btn-success { background: var(--success); }
-        .btn-danger { background: var(--danger); color: #fff; }
+        .btn-danger { background: var(--danger); }
         .btn-dark { background: #1a1a1a; color: var(--primary); border: 1px solid var(--border); }
 
         .report-section { background: var(--surface); padding: 20px; border-radius: 16px; border: 1px solid var(--border); margin-bottom: 20px; }
         
         .form-row { display: flex; gap: 10px; flex-wrap: wrap; }
         .form-row > * { flex: 1; min-width: 150px; }
-        input[type="date"], input[type="text"], input[type="number"], select { width: 100%; padding: 12px 15px; border: 1px solid var(--border); border-radius: 10px; font-size: 0.95rem; outline: none; transition: border-color 0.2s; background: #1a1a1a; color: var(--text); }
-        input[type="date"]:focus, input[type="text"]:focus, input[type="number"]:focus, select:focus { border-color: var(--primary); background: #222; }
+        input[type="date"], input[type="number"], input[type="text"], select { width: 100%; padding: 12px 15px; border: 1px solid var(--border); border-radius: 10px; font-size: 0.95rem; outline: none; transition: border-color 0.2s; background: #1a1a1a; color: var(--text); }
+        input[type="date"]:focus, input[type="number"]:focus, input[type="text"]:focus, select:focus { border-color: var(--primary); background: #222; }
         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; }
@@ -1211,54 +1211,22 @@ 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">
-            <div class="form-row" style="margin-bottom: 20px; align-items: flex-end;">
-                <div>
-                    <label>Дата начала</label>
-                    <input type="date" id="salStart">
-                </div>
-                <div>
-                    <label>Дата конца</label>
-                    <input type="date" id="salEnd">
-                </div>
-                <button class="btn btn-success" style="height: 44px; color:#000;" onclick="generateSalaryReport()"><i class="fas fa-calculator"></i> Посчитать ЗП</button>
-            </div>
-            <div style="overflow-x:auto;">
-                <table class="rep-table" id="tableSalary"></table>
-            </div>
-        </div>
-
-        <div class="report-section" style="margin-top: 20px;">
-            <h3 style="color:var(--primary); margin-top:0; border-bottom: 1px dashed var(--border); padding-bottom: 10px; margin-bottom: 20px;">Управление штрафами</h3>
-            
-            <div style="background:#1a1a1a; border:1px solid var(--border); padding:15px; border-radius:12px; margin-bottom:20px;">
-                <form method="POST" style="display:flex; flex-wrap:wrap; gap:10px; align-items:flex-end;">
-                    <input type="hidden" name="action" value="add_fine">
-                    <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:150px;">
-                        <label>Дата</label>
-                        <input type="date" name="date" required>
-                    </div>
-                    <div style="flex:1; min-width:150px;">
-                        <label>Сумма</label>
-                        <input type="number" name="amount" required min="0" step="0.01">
-                    </div>
-                    <div style="flex:2; min-width:200px;">
-                        <label>Причина</label>
-                        <input type="text" name="reason" required placeholder="Причина штрафа">
-                    </div>
-                    <button type="submit" class="btn btn-danger" style="height: 44px; white-space: nowrap;"><i class="fas fa-plus"></i> Добавить штраф</button>
-                </form>
-            </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;">
+                <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>
+            </form>
             <div style="overflow-x:auto;">
                 <table class="rep-table">
                     <tr><th>Дата</th><th>Сотрудник</th><th>Причина</th><th>Сумма</th><th>Действие</th></tr>
@@ -1271,12 +1239,12 @@ SALARY_TEMPLATE = '''
                             {% endfor %}
                         </td>
                         <td>{{ fine.reason }}</td>
-                        <td style="color:var(--danger); font-weight:bold;">{{ fine.amount }} {{ currency_code }}</td>
+                        <td>{{ fine.amount }} {{ currency_code }}</td>
                         <td>
-                            <form method="POST" style="margin:0;" onsubmit="return confirm('Удалить штраф?');">
+                            <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: 6px 12px;"><i class="fas fa-trash" style="color:var(--danger);"></i></button>
+                                <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>
@@ -1284,10 +1252,29 @@ SALARY_TEMPLATE = '''
                 </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>
+                    <input type="date" id="salStart">
+                </div>
+                <div>
+                    <label>Дата конца</label>
+                    <input type="date" id="salEnd">
+                </div>
+                <button class="btn btn-success" style="height: 44px; color:#000;" onclick="generateSalaryReport()"><i class="fas fa-calculator"></i> Посчитать ЗП</button>
+            </div>
+            <div style="overflow-x:auto;">
+                <table class="rep-table" id="tableSalary"></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 currencyCode = '{{ currency_code }}';
@@ -1302,6 +1289,7 @@ 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();
         }
 
@@ -1310,7 +1298,7 @@ SALARY_TEMPLATE = '''
             const end = document.getElementById('salEnd').value;
             if (!start || !end) return;
 
-            let html = '<tr><th>Сотрудник</th><th>Дней с продажами</th><th>Фикс. ЗП</th><th>Бонусы с продаж</th><th>Штрафы</th><th>Итого ЗП</th></tr>';
+            let html = '<tr><th>Сотрудник</th><th>Дней отработано</th><th>Фикс. ЗП</th><th>Бонусы с продаж</th><th>Штрафы</th><th>Итого ЗП</th></tr>';
             
             let empSales = {};
             allOrders.forEach(o => {
@@ -1321,34 +1309,32 @@ SALARY_TEMPLATE = '''
                     empSales[o.employee_id][oDate] += o.total_price;
                 }
             });
-
-            let empFines = {};
-            fines.forEach(f => {
-                if (f.date >= start && f.date <= end) {
-                    if (!empFines[f.employee_id]) empFines[f.employee_id] = 0;
-                    empFines[f.employee_id] += parseFloat(f.amount);
-                }
-            });
             
             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);
                 
                 while(currDate <= endDate) {
                     const dateStr = getLocalDateStr(currDate);
-                    
                     const dailySales = (empSales[emp.id] && empSales[emp.id][dateStr]) ? empSales[emp.id][dateStr] : 0;
                     
                     if (dailySales > 0) {
                         daysWorked++;
-                        fixedSal += parseFloat(emp.daily_rate || 0);
                         
-                        const target = parseFloat(emp.target_amount || 0);
-                        const pct = parseFloat(emp.bonus_percentage || 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;
                         
                         if (pct > 0 && dailySales > target) {
                             bonusSal += (dailySales - target) * (pct / 100);
@@ -1356,22 +1342,27 @@ 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 totalFines = empFines[emp.id] || 0;
-                const total = fixedSal + bonusSal - totalFines;
-                if (daysWorked > 0 || total > 0 || totalFines > 0) {
+                const total = fixedSal + bonusSal - employeeFines;
+                if (daysWorked > 0 || total !== 0 || employeeFines > 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);">${totalFines.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>
                     </tr>`;
                 }
             });
             
-            if (html === '<tr><th>Сотрудник</th><th>Дней с продажами</th><th>Фикс. ЗП</th><th>Бонусы с продаж</th><th>Штрафы</th><th>Итого ЗП</th></tr>') {
+            if (html === '<tr><th>Сотрудник</th><th>Дней отработано</th><th>Фикс. ЗП</th><th>Бонусы с продаж</th><th>Штрафы</th><th>Итого ЗП</th></tr>') {
                 html += '<tr><td colspan="6">За выбранный период данных нет</td></tr>';
             }
             document.getElementById('tableSalary').innerHTML = html;
@@ -1977,24 +1968,26 @@ def admin_salary():
                 'reason': request.form.get('reason', '')
             })
             save_data(data)
-            return redirect(url_for('admin_salary'))
         elif action == 'delete_fine':
             fine_id = request.form.get('fine_id')
-            data['fines'] = [f for f in data.get('fines', []) if f.get('id') != fine_id]
-            save_data(data)
-            return redirect(url_for('admin_salary'))
+            if 'fines' in data:
+                data['fines'] = [f for f in data['fines'] if f.get('id') != fine_id]
+                save_data(data)
+        return redirect(url_for('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=employees,
         employees_json=json.dumps(employees),
-        fines=fines,
+        workdays_json=json.dumps(workdays),
         fines_json=json.dumps(fines),
+        employees=employees,
+        fines=fines,
         currency_code=CURRENCY_CODE
     )
 
@@ -2023,12 +2016,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', 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
+            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
             
             if emp_name:
                 employees.append({
@@ -2048,12 +2041,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', 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
+                    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
                     break
             data['employees'] = employees
             save_data(data)