bivashy/Blitz-Proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #123 from SeyedHashtag/original

Browse Source 
Merge quota and usage display with percentage in web panel
This commit is contained in:
Whispering Wind
2025-04-09 07:24:03 +03:30
committed by GitHub
parent 22d9c99ced f17ab3aa19
commit 124738bc8a
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/scripts/webpanel/routers/user/viewmodel.py
View File

@ -83,12 +83,26 @@ class User(BaseModel):
except ValueError: except ValueError:
pass pass
traffic_used = User.__format_traffic(user_data.get("download_bytes", 0) + user_data.get("upload_bytes", 0)) # Calculate traffic values and percentage
used_bytes = user_data.get("download_bytes", 0) + user_data.get("upload_bytes", 0)
quota_bytes = user_data.get('max_download_bytes', 0)
# Format individual values for combining
used_formatted = User.__format_traffic(used_bytes)
quota_formatted = User.__format_traffic(quota_bytes)
# Calculate percentage if quota is not zero
percentage = 0
if quota_bytes > 0:
percentage = (used_bytes / quota_bytes) * 100
# Combine the values with percentage
traffic_used = f"{used_formatted}/{quota_formatted} ({percentage:.1f}%)"
return { return {
'username': user_data['username'], 'username': user_data['username'],
'status': user_data.get('status', 'Not Active'), 'status': user_data.get('status', 'Not Active'),
'quota': User.__format_traffic(user_data.get('max_download_bytes', 0)), 'quota': User.__format_traffic(quota_bytes),
'traffic_used': traffic_used, 'traffic_used': traffic_used,
'expiry_date': expiry_date, 'expiry_date': expiry_date,
'expiry_days': expiration_days, 'expiry_days': expiration_days,

16
core/scripts/webpanel/templates/users.html
View File

@ -75,8 +75,7 @@
</th> </th>
<th>Status</th> <th>Status</th>
<th>Username</th> <th>Username</th>
<th>Quota</th> <th>Traffic Usage</th>
<th>Used</th>
<th class="text-nowrap">Expiry Date</th> <th class="text-nowrap">Expiry Date</th>
<th class="text-nowrap">Expiry Days</th> <th class="text-nowrap">Expiry Days</th>
<th>Enable</th> <th>Enable</th>
@ -100,7 +99,6 @@
{% endif %} {% endif %}
</td> </td>
<td data-username="{{ user.username }}">{{ user.username }}</td> <td data-username="{{ user.username }}">{{ user.username }}</td>
<td>{{ user.quota }}</td>
<td>{{ user.traffic_used }}</td> <td>{{ user.traffic_used }}</td>
<td>{{ user.expiry_date }}</td> <td>{{ user.expiry_date }}</td>
<td>{{ user.expiry_days }}</td> <td>{{ user.expiry_days }}</td>
@ -501,9 +499,11 @@
const username = $("#originalUsername").val(); const username = $("#originalUsername").val();
const row = $(`td[data-username='${username}']`).closest("tr"); const row = $(`td[data-username='${username}']`).closest("tr");
row.find("td:eq(2)").text($("#editUsername").val()); row.find("td:eq(2)").text($("#editUsername").val());
// Update traffic usage display after edit (note: this is now just one column)
// The backend will format this properly on page reload
row.find("td:eq(3)").text($("#editTrafficLimit").val() + " GB"); row.find("td:eq(3)").text($("#editTrafficLimit").val() + " GB");
row.find("td:eq(6)").text($("#editExpirationDays").val()); row.find("td:eq(5)").text($("#editExpirationDays").val());
row.find("td:eq(7) i") row.find("td:eq(6) i")
.removeClass() .removeClass()
.addClass( .addClass(
$("#editBlocked").prop("checked") $("#editBlocked").prop("checked")
@ -523,9 +523,11 @@
const username = $("#originalUsername").val(); const username = $("#originalUsername").val();
const row = $(`td[data-username='${username}']`).closest("tr"); const row = $(`td[data-username='${username}']`).closest("tr");
row.find("td:eq(2)").text($("#editUsername").val()); row.find("td:eq(2)").text($("#editUsername").val());
// Update traffic usage display after edit (note: this is now just one column)
// The backend will format this properly on page reload
row.find("td:eq(3)").text($("#editTrafficLimit").val() + " GB"); row.find("td:eq(3)").text($("#editTrafficLimit").val() + " GB");
row.find("td:eq(6)").text($("#editExpirationDays").val()); row.find("td:eq(5)").text($("#editExpirationDays").val());
row.find("td:eq(7) i") row.find("td:eq(6) i")
.removeClass() .removeClass()
.addClass( .addClass(
$("#editBlocked").prop("checked") $("#editBlocked").prop("checked")