Sova

Running

App Files Files Community

Kgshop commited on 26 days ago

Commit

dce317c

verified ·

1 Parent(s): a38605a

Update app.py

Browse files

Files changed (1) hide show

app.py +103 -103

app.py CHANGED Viewed

@@ -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 not os.path.exists(DATA_FILE):
         try:
@@ -1171,7 +1171,7 @@ SALARY_TEMPLATE = '''
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover">
-    <title>Отчет по ЗП</title>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
     <style>
         :root { --primary: #D4AF37; --bg: #000000; --surface: #111111; --border: #333333; --danger: #ff4757; --success: #2ed573; --info: #D4AF37; --warning: #ffa502; --text: #ffffff; --text-muted: #888888; }
@@ -1184,14 +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-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="number"], input[type="text"] { 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 { 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; }
@@ -1212,6 +1213,64 @@ SALARY_TEMPLATE = '''
         </div>
         <div class="report-section">
             <div class="form-row" style="margin-bottom: 20px; align-items: flex-end;">
                 <div>
                     <label>Дата начала</label>
@@ -1227,49 +1286,13 @@ SALARY_TEMPLATE = '''
                 <table class="rep-table" id="tableSalary"></table>
             </div>
         </div>
-        <div class="report-section" style="margin-top:20px;">
-            <h2 style="color:var(--primary); margin-top:0;">Штрафы</h2>
-            <div style="background:var(--surface); border:1px solid var(--border); padding:15px; border-radius:10px; margin-bottom:20px;">
-                <h3 style="margin-top:0; color:var(--danger);">Добавить штраф</h3>
-                <form method="POST" style="display:flex; flex-wrap:wrap; gap:10px;">
-                    <input type="hidden" name="action" value="add_fine">
-                    <div style="flex:1; min-width:150px;">
-                        <label>Сотрудник</label>
-                        <select name="employee_id" required style="width:100%; padding:12px; border:1px solid var(--border); border-radius:10px; background:#1a1a1a; color:var(--text); outline:none;">
-                            {% 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 id="fineDateInput">
-                    </div>
-                    <div style="flex:1; min-width:100px;">
-                        <label>Сумма</label>
-                        <input type="number" name="amount" required>
-                    </div>
-                    <div style="flex:2; min-width:200px;">
-                        <label>Причина</label>
-                        <input type="text" name="reason" required autocomplete="off">
-                    </div>
-                    <button type="submit" class="btn" style="background:var(--danger); color:#fff; width:100%; margin-top:10px;"><i class="fas fa-plus"></i> Назначить штраф</button>
-                </form>
-            </div>
-            <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 allFines = {{ fines_json|safe }};
         const currencyCode = '{{ currency_code }}';
         function getLocalDateStr(d) {
@@ -1282,7 +1305,8 @@ SALARY_TEMPLATE = '''
             const firstDay = new Date(today.getFullYear(), today.getMonth(), 1);
             document.getElementById('salStart').value = getLocalDateStr(firstDay);
             document.getElementById('salEnd').value = todayStr;
-            document.getElementById('fineDateInput').value = todayStr;
             generateSalaryReport();
         }
@@ -1291,7 +1315,7 @@ SALARY_TEMPLATE = '''
             const end = document.getElementById('salEnd').value;
             if (!start || !end) return;
-            let html = '<tr><th>Сотрудник</th><th>Дней (продажи > 0)</th><th>Фикс. ЗП</th><th>Бонусы с продаж</th><th>Штрафы</th><th>Итого ЗП</th></tr>';
             let empSales = {};
             allOrders.forEach(o => {
@@ -1307,13 +1331,14 @@ SALARY_TEMPLATE = '''
                 let daysWorked = 0;
                 let fixedSal = 0;
                 let bonusSal = 0;
-                let fineSal = 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) {
@@ -1329,58 +1354,30 @@ SALARY_TEMPLATE = '''
                     }
                     currDate.setDate(currDate.getDate() + 1);
                 }
-                allFines.forEach(f => {
                     if (f.employee_id === emp.id && f.date >= start && f.date <= end) {
-                        fineSal += parseFloat(f.amount);
                     }
                 });
-                const total = fixedSal + bonusSal - fineSal;
-                if (daysWorked > 0 || total !== 0 || fineSal > 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);">${fineSal.toFixed(2)} ${currencyCode}</td>
                         <td style="font-weight:bold; color:var(--success);">${total.toFixed(2)} ${currencyCode}</td>
                     </tr>`;
                 }
             });
-            if (html === '<tr><th>Сотрудник</th><th>Дней (продажи > 0)</th><th>Фикс. ЗП</th><th>Бонусы с продаж</th><th>Штрафы</th><th>Итого ЗП</th></tr>') {
                 html += '<tr><td colspan="6">За выбранный период данных нет</td></tr>';
             }
             document.getElementById('tableSalary').innerHTML = html;
-            renderFinesTable(start, end);
-        }
-        function renderFinesTable(start, end) {
-            let html = '<tr><th>Дата</th><th>Сотрудник</th><th>Сумма</th><th>Причина</th><th>Действие</th></tr>';
-            let found = false;
-            allFines.forEach(f => {
-                if (f.date >= start && f.date <= end) {
-                    found = true;
-                    const emp = employees.find(e => e.id === f.employee_id);
-                    const empName = emp ? emp.name : 'Удален';
-                    html += `<tr>
-                        <td>${f.date}</td>
-                        <td>${empName}</td>
-                        <td style="color:var(--danger);">${f.amount} ${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" style="background:var(--danger); color:#fff; border:none; padding:5px 10px; border-radius:5px; cursor:pointer;"><i class="fas fa-trash"></i></button>
-                            </form>
-                        </td>
-                    </tr>`;
-                }
-            });
-            if (!found) html += '<tr><td colspan="5">Штрафов за период нет</td></tr>';
-            document.getElementById('tableFines').innerHTML = html;
         }
         window.onload = () => {
@@ -1530,9 +1527,9 @@ ADMIN_TEMPLATE = '''
                     <form method="POST" style="display:flex; flex-wrap:wrap; gap:10px;">
                         <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="0" required></div>
                         <div style="flex:1; min-width:100px;"><label>Бонус (%)</label><input type="number" name="bonus_percentage" value="10" 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>
@@ -1546,7 +1543,7 @@ ADMIN_TEMPLATE = '''
                             <input type="hidden" name="action" value="edit_employee">
                             <input type="hidden" name="employee_id" value="{{ emp.id }}">
                             <div style="flex:1; min-width:150px;"><label>Имя</label><input type="text" name="name" value="{{ emp.name }}" required></div>
-                            <div style="flex:1; min-width:100px;"><label>PIN</label><input type="text" name="pin" value="{{ emp.pin }}" pattern="\d{4}" required></div>
                             <div style="flex:1; min-width:100px;"><label>Ставка</label><input type="number" name="daily_rate" value="{{ emp.daily_rate }}" required></div>
                             <div style="flex:1; min-width:100px;"><label>Цель (n)</label><input type="number" name="target_amount" value="{{ emp.target_amount }}" required></div>
                             <div style="flex:1; min-width:100px;"><label>Бонус %</label><input type="number" name="bonus_percentage" value="{{ emp.bonus_percentage }}" step="0.1" required></div>
@@ -1969,40 +1966,43 @@ def admin_reports():
 @app.route('/admin/salary', methods=['GET', 'POST'])
 def admin_salary():
     data = load_data()
-    orders = data.get('orders', {})
-    employees = data.get('employees', [])
-    workdays = data.get('workdays', {})
-    fines = data.get('fines', [])
     if request.method == 'POST':
         action = request.form.get('action')
         if action == 'add_fine':
             emp_id = request.form.get('employee_id')
-            fine_date = request.form.get('date')
             amount = float(request.form.get('amount', 0))
-            reason = request.form.get('reason', '').strip()
-            fines.append({
                 'id': uuid4().hex,
                 'employee_id': emp_id,
-                'date': fine_date,
                 'amount': amount,
                 'reason': reason
             })
-            data['fines'] = fines
             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 fines if f.get('id') != fine_id]
             save_data(data)
             return redirect(url_for('admin_salary'))
     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(data.get('fines', [])),
         employees=employees,
         currency_code=CURRENCY_CODE
     )
@@ -2033,11 +2033,11 @@ def admin():
             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
             if emp_name:
                 employees.append({
@@ -2058,11 +2058,11 @@ def admin():
                     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
                     break
             data['employees'] = employees
             save_data(data)
@@ -2239,4 +2239,4 @@ if __name__ == '__main__':
         threading.Thread(target=periodic_backup, daemon=True).start()
     port = int(os.environ.get('PORT', 7860))
-    app.run(host='0.0.0.0', port=port)

     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 not os.path.exists(DATA_FILE):
         try:
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover">
+    <title>Отчет по ЗП и Штрафам</title>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
     <style>
         :root { --primary: #D4AF37; --bg: #000000; --surface: #111111; --border: #333333; --danger: #ff4757; --success: #2ed573; --info: #D4AF37; --warning: #ffa502; --text: #ffffff; --text-muted: #888888; }
         .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); }
         .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="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; }
         </div>
         <div class="report-section">
+            <h2 style="margin-top:0; color:var(--primary); font-size:1.2rem; margin-bottom: 15px;">Управление штрафами</h2>
+            <form method="POST" style="display:flex; gap:10px; flex-wrap:wrap; 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:120px;">
+                    <label>Дата</label>
+                    <input type="date" name="date" required id="fineDate">
+                </div>
+                <div style="flex:1; min-width:120px;">
+                    <label>Сумма</label>
+                    <input type="number" name="amount" required step="1" min="0">
+                </div>
+                <div style="flex:2; min-width:150px;">
+                    <label>Причина</label>
+                    <input type="text" name="reason" required autocomplete="off">
+                </div>
+                <button type="submit" class="btn btn-danger" style="height:44px; color:#fff;"><i class="fas fa-plus"></i> Добавить штраф</button>
+            </form>
+            <h3 style="margin-top:25px; margin-bottom:10px; font-size:1.1rem; color:var(--primary);">История штрафов</h3>
+            <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 %}
+                    <tr>
+                        <td>
+                            {% for emp in employees %}
+                                {% if emp.id == fine.employee_id %}{{ emp.name }}{% endif %}
+                            {% endfor %}
+                        </td>
+                        <td>{{ fine.date }}</td>
+                        <td>{{ fine.reason }}</td>
+                        <td style="color:var(--danger); font-weight:bold;">-{{ fine.amount }} {{ currency_code }}</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="{{ fine.id }}">
+                                <button type="submit" class="btn btn-dark" style="padding:5px 10px; border-color:var(--danger); color:var(--danger);"><i class="fas fa-trash"></i></button>
+                            </form>
+                        </td>
+                    </tr>
+                    {% endfor %}
+                    {% if not fines %}
+                    <tr><td colspan="5" style="text-align:center; padding:15px; color:var(--text-muted);">Нет штрафов</td></tr>
+                    {% endif %}
+                </table>
+            </div>
+        </div>
+        <div class="report-section">
+            <h2 style="margin-top:0; color:var(--primary); font-size:1.2rem; margin-bottom: 15px;">Генерация Зарплаты</h2>
             <div class="form-row" style="margin-bottom: 20px; align-items: flex-end;">
                 <div>
                     <label>Дата начала</label>
                 <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 }}';
         function getLocalDateStr(d) {
             const firstDay = new Date(today.getFullYear(), today.getMonth(), 1);
             document.getElementById('salStart').value = getLocalDateStr(firstDay);
             document.getElementById('salEnd').value = todayStr;
+            const fineDateInput = document.getElementById('fineDate');
+            if(fineDateInput) { fineDateInput.value = todayStr; }
             generateSalaryReport();
         }
             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 empSales = {};
             allOrders.forEach(o => {
                 let daysWorked = 0;
                 let fixedSal = 0;
                 let bonusSal = 0;
+                let totalFines = 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) {
                     }
                     currDate.setDate(currDate.getDate() + 1);
                 }
+                fines.forEach(f => {
                     if (f.employee_id === emp.id && f.date >= start && f.date <= end) {
+                        totalFines += parseFloat(f.amount);
                     }
                 });
+                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);">-${totalFines.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>') {
                 html += '<tr><td colspan="6">За выбранный период данных нет</td></tr>';
             }
             document.getElementById('tableSalary').innerHTML = html;
         }
         window.onload = () => {
                     <form method="POST" style="display:flex; flex-wrap:wrap; gap:10px;">
                         <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>
                         <button type="submit" class="btn btn-dark" style="width:100%; margin-top:10px;"><i class="fas fa-plus"></i> Добавить</button>
                     </form>
                             <input type="hidden" name="action" value="edit_employee">
                             <input type="hidden" name="employee_id" value="{{ emp.id }}">
                             <div style="flex:1; min-width:150px;"><label>Имя</label><input type="text" name="name" value="{{ emp.name }}" required></div>
+                            <div style="flex:1; min-width:100px;"><label>PIN</label><input type="text" name="pin" value="{{ emp.pin }}" pattern="\\d{4}" required></div>
                             <div style="flex:1; min-width:100px;"><label>Ставка</label><input type="number" name="daily_rate" value="{{ emp.daily_rate }}" required></div>
                             <div style="flex:1; min-width:100px;"><label>Цель (n)</label><input type="number" name="target_amount" value="{{ emp.target_amount }}" required></div>
                             <div style="flex:1; min-width:100px;"><label>Бонус %</label><input type="number" name="bonus_percentage" value="{{ emp.bonus_percentage }}" step="0.1" required></div>
 @app.route('/admin/salary', methods=['GET', 'POST'])
 def admin_salary():
     data = load_data()
     if request.method == 'POST':
         action = request.form.get('action')
         if action == 'add_fine':
             emp_id = request.form.get('employee_id')
+            date_fine = request.form.get('date')
             amount = float(request.form.get('amount', 0))
+            reason = request.form.get('reason', '')
+            data.setdefault('fines', []).append({
                 'id': uuid4().hex,
                 'employee_id': emp_id,
+                'date': date_fine,
                 'amount': amount,
                 'reason': 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'))
+    orders = data.get('orders', {})
+    employees = data.get('employees', [])
+    workdays = data.get('workdays', {})
+    fines = data.get('fines', [])
+    fines = sorted(fines, key=lambda x: x.get('date', ''), reverse=True)
     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),
+        fines=fines,
         employees=employees,
         currency_code=CURRENCY_CODE
     )
             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 = 230000
             try: target_amount = float(request.form.get('target_amount', 0))
+            except: target_amount = 1500000
             try: bonus_percentage = float(request.form.get('bonus_percentage', 0))
+            except: bonus_percentage = 10
             if emp_name:
                 employees.append({
                     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'] = 230000
                     try: e['target_amount'] = float(request.form.get('target_amount', 0))
+                    except: e['target_amount'] = 1500000
                     try: e['bonus_percentage'] = float(request.form.get('bonus_percentage', 0))
+                    except: e['bonus_percentage'] = 10
                     break
             data['employees'] = employees
             save_data(data)
         threading.Thread(target=periodic_backup, daemon=True).start()
     port = int(os.environ.get('PORT', 7860))
+    app.run(host='0.0.0.0', port=port)