feat: Implement timesheets and pending payments in bank UI
All checks were successful
Build / Build (push) Successful in 28s
All checks were successful
Build / Build (push) Successful in 28s
This commit introduces the timesheet submission feature and displays pending payments in the bank UI. The following changes were made: - Added a "Submit Timesheet" action tile to the bank UI. - Implemented the `handleTimesheet` function in `script.js` to handle timesheet submissions. - Updated the UI to display pending payments based on player rating and a server-side multiplier. - Modified server-side event handling to process timesheet submissions and calculate payments. - Added a refresh timer to update player data every 30 seconds. - Updated the player load event to include the player's rating.
This commit is contained in:
parent
94684cb120
commit
f8391463b2
@ -70,7 +70,7 @@ function requestPaygradeData() {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Set up a timer to periodically refresh player data
|
* Set up a timer to periodically refresh player data
|
||||||
* Ensures the admin panel shows up-to-date information
|
* Ensures the UI is updated with the latest information
|
||||||
*/
|
*/
|
||||||
function setupRefreshTimer() {
|
function setupRefreshTimer() {
|
||||||
setInterval(requestPlayerData, 30000); // Refresh every 30 seconds
|
setInterval(requestPlayerData, 30000); // Refresh every 30 seconds
|
||||||
|
@ -5,7 +5,8 @@
|
|||||||
}, {
|
}, {
|
||||||
private _bank = GETVAR(player,FORGE_Bank,0);
|
private _bank = GETVAR(player,FORGE_Bank,0);
|
||||||
private _cash = GETVAR(player,FORGE_Cash,0);
|
private _cash = GETVAR(player,FORGE_Cash,0);
|
||||||
|
private _rating = GETVAR(player,FORGE_Rating,0);
|
||||||
private _uid = getPlayerUID player;
|
private _uid = getPlayerUID player;
|
||||||
|
|
||||||
["forge_server_bank_handleEvents", ["BANK::HANDLE::PLAYER::LOAD", [_uid, _bank, _cash]]] call CFUNC(serverEvent);
|
["forge_server_bank_handleEvents", ["BANK::HANDLE::PLAYER::LOAD", [_uid, _bank, _cash, _rating]]] call CFUNC(serverEvent);
|
||||||
}] call CFUNC(waitUntilAndExecute);
|
}] call CFUNC(waitUntilAndExecute);
|
@ -3,7 +3,7 @@
|
|||||||
[QGVAR(handleEvents), {
|
[QGVAR(handleEvents), {
|
||||||
params ["_control", "_isConfirmDialog", "_message"];
|
params ["_control", "_isConfirmDialog", "_message"];
|
||||||
|
|
||||||
diag_log text format ["[FORGE::Client::Bank::XEH_postInit] Received event: '%1'", _message];
|
diag_log text format ["[FORGE::Client::Bank::XEH_postInit::handleEvents] Received event: '%1'", _message];
|
||||||
|
|
||||||
_message = fromJSON _message;
|
_message = fromJSON _message;
|
||||||
private _event = _message get "event";
|
private _event = _message get "event";
|
||||||
@ -15,11 +15,11 @@
|
|||||||
private _playerList = [];
|
private _playerList = [];
|
||||||
|
|
||||||
{
|
{
|
||||||
private _player = _x;
|
private _uid = getPlayerUID _x;
|
||||||
private _uid = getPlayerUID _player;
|
private _name = name _x;
|
||||||
private _name = name _player;
|
private _funds = GETVAR(_x,FORGE_Bank,0); //TODO: Implement funds from server
|
||||||
private _funds = GETVAR(_player,FORGE_Bank,0); //TODO: Implement funds from server
|
private _cash = GETVAR(_x,FORGE_Cash,0); //TODO: Implement cash from server
|
||||||
private _cash = GETVAR(_player,FORGE_Cash,0); //TODO: Implement cash from server
|
|
||||||
private _playerInfo = createHashMapFromArray [
|
private _playerInfo = createHashMapFromArray [
|
||||||
["uid", _uid],
|
["uid", _uid],
|
||||||
["name", _name],
|
["name", _name],
|
||||||
@ -35,52 +35,63 @@
|
|||||||
};
|
};
|
||||||
case "REQUEST::PLAYER::FUNDS": {
|
case "REQUEST::PLAYER::FUNDS": {
|
||||||
private _playerData = createHashMap;
|
private _playerData = createHashMap;
|
||||||
private _uid = getPlayerUID player;
|
private _balance = GETVAR(player,FORGE_Bank,0); //TODO: Implement balance from server
|
||||||
private _balance = GETVAR(_player,FORGE_Bank,0); //TODO: Implement balance from server
|
private _cash = GETVAR(player,FORGE_Cash,0); //TODO: Implement cash from server
|
||||||
private _cash = GETVAR(_player,FORGE_Cash,0); //TODO: Implement cash from server
|
|
||||||
|
private _payMultiplier = "MULTIPLYR" call BFUNC(getParamValue);
|
||||||
|
private _rating = rating player; //TODO: Implement rating from server
|
||||||
|
private _pending = _rating * _payMultiplier; //TODO: Implement pending from server
|
||||||
|
|
||||||
private _playerData = createHashMapFromArray [
|
private _playerData = createHashMapFromArray [
|
||||||
["balance", _balance],
|
["balance", _balance],
|
||||||
["cash", _cash]
|
["cash", _cash],
|
||||||
|
["pending", _pending]
|
||||||
];
|
];
|
||||||
|
|
||||||
_control ctrlWebBrowserAction ["ExecJS", format ["handlePlayerFundsRequest(%1)", (toJSON _playerData)]];
|
_control ctrlWebBrowserAction ["ExecJS", format ["handlePlayerFundsRequest(%1)", (toJSON _playerData)]];
|
||||||
};
|
};
|
||||||
case "REQUEST::TRANSACTION::HISTORY": {
|
case "REQUEST::TRANSACTION::HISTORY": {
|
||||||
private _uid = getPlayerUID player;
|
|
||||||
private _history = []; //TODO: Implement history from server
|
private _history = []; //TODO: Implement history from server
|
||||||
private _historyData = createHashMapFromArray [["history", _history]];
|
private _historyData = createHashMapFromArray [["history", _history]];
|
||||||
|
|
||||||
_control ctrlWebBrowserAction ["ExecJS", format ["handleTransactionHistoryRequest(%1)", (toJSON _historyData)]];
|
_control ctrlWebBrowserAction ["ExecJS", format ["handleTransactionHistoryRequest(%1)", (toJSON _historyData)]];
|
||||||
};
|
};
|
||||||
case "DEPOSIT::FUNDS": {
|
case "DEPOSIT::FUNDS": {
|
||||||
_data params ["_amount"];
|
_data params [["_amount", 0, [0]]];
|
||||||
|
|
||||||
if (_amount <= 0) exitWith { systemChat "Invalid amount, must be greater than 0!"; false };
|
if (_amount <= 0) exitWith { systemChat "Invalid amount, must be greater than 0!"; false };
|
||||||
|
|
||||||
["forge_server_bank_handleEvents", ["BANK::DEPOSIT", [getPlayerUID player, _amount]]] call CFUNC(serverEvent);
|
["forge_server_bank_handleEvents", ["BANK::DEPOSIT", [getPlayerUID player, _amount]]] call CFUNC(serverEvent);
|
||||||
|
|
||||||
true
|
true
|
||||||
};
|
};
|
||||||
case "WITHDRAW::FUNDS": {
|
case "SUBMIT::TIMESHEET": {
|
||||||
_data params ["_amount"];
|
private _rating = rating player;
|
||||||
|
private _uid = getPlayerUID player;
|
||||||
|
|
||||||
if (_amount <= 0) exitWith { systemChat "Invalid amount, must be greater than 0!"; false };
|
["forge_server_bank_handleEvents", ["BANK::SUBMIT::TIMESHEET", [_uid, _rating]]] call CFUNC(serverEvent);
|
||||||
|
|
||||||
["forge_server_bank_handleEvents", ["BANK::WITHDRAW", [getPlayerUID player, _amount]]] call CFUNC(serverEvent);
|
player addRating -_rating;
|
||||||
|
|
||||||
true
|
true
|
||||||
};
|
};
|
||||||
case "TRANSFER::FUNDS": {
|
case "TRANSFER::FUNDS": {
|
||||||
_data params ["_amount", "_toUid"];
|
_data params [["_uid", "", [""]], ["_amount", 0, [0]]];
|
||||||
|
|
||||||
if ((_amount <= 0) || {_toUid isEqualTo ""}) exitWith { systemChat "Invalid UID or amount, UID cannot be empty and amount must be greater than 0!"; false };
|
if ({_uid isEqualTo ""} || _amount <= 0) exitWith { systemChat "Invalid UID or amount, UID cannot be empty and amount must be greater than 0!"; false };
|
||||||
|
["forge_server_bank_handleEvents", ["BANK::TRANSFER", [getPlayerUID player, _uid, _amount]]] call CFUNC(serverEvent);
|
||||||
|
|
||||||
["forge_server_bank_handleEvents", ["BANK::TRANSFER", [getPlayerUID player, _toUid, _amount]]] call CFUNC(serverEvent);
|
true
|
||||||
|
};
|
||||||
|
case "WITHDRAW::FUNDS": {
|
||||||
|
_data params [["_amount", 0, [0]]];
|
||||||
|
|
||||||
|
if (_amount <= 0) exitWith { systemChat "Invalid amount, amount must be greater than 0!"; false };
|
||||||
|
["forge_server_bank_handleEvents", ["BANK::WITHDRAW", [getPlayerUID player, _amount]]] call CFUNC(serverEvent);
|
||||||
|
|
||||||
true
|
true
|
||||||
};
|
};
|
||||||
default {
|
default {
|
||||||
diag_log format ["[FORGE::Client::Bank::XEH_postInit] Unhandled event: %1", _event];
|
diag_log format ["[FORGE::Client::Bank::XEH_postInit::handleEvents] Unhandled event: %1", _event];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}] call CFUNC(addEventHandler);
|
}] call CFUNC(addEventHandler);
|
@ -17,13 +17,11 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
private _amount = parseNumber (ctrlText IDC_AMOUNTINPUT);
|
private _amount = parseNumber (ctrlText IDC_AMOUNTINPUT);
|
||||||
private _uid = getPlayerUID player;
|
|
||||||
|
|
||||||
private _messageData = createHashMapFromArray [
|
private _messageData = createHashMapFromArray [
|
||||||
["event", "DEPOSIT::FUNDS"],
|
["event", "DEPOSIT::FUNDS"],
|
||||||
["data", createHashMapFromArray [
|
["data", createHashMapFromArray [
|
||||||
["amount", _amount],
|
["amount", _amount]
|
||||||
["uid", _uid]
|
|
||||||
]]
|
]]
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -19,19 +19,24 @@
|
|||||||
* Public: Yes
|
* Public: Yes
|
||||||
*/
|
*/
|
||||||
|
|
||||||
private _bank = GETVAR(player,FORGE_Bank,0); //TODO: Implement balance from server
|
|
||||||
private _payMultiplyer = "MULTIPLYR" call BFUNC(getParamValue);
|
private _payMultiplyer = "MULTIPLYR" call BFUNC(getParamValue);
|
||||||
private _plyscore = rating player; //TODO: Implement rating from server
|
private _plyscore = rating player; //TODO: Implement rating from server
|
||||||
private _multiplyer = _plyscore * _payMultiplyer;
|
private _multiplyer = _plyscore * _payMultiplyer;
|
||||||
|
|
||||||
_bank = _bank + _multiplyer;
|
_bank = _bank + _multiplyer;
|
||||||
|
|
||||||
player addRating - _plyscore;
|
private _formattedRating = _bank call EFUNC(misc,formatNumber);
|
||||||
SETPVAR(player,FORGE_Bank,_bank);
|
private _messageData = createHashMapFromArray [
|
||||||
SETPVAR(player,FORGE_Rating,0);
|
["event", "SUBMIT::TIMESHEET"],
|
||||||
|
["data", []]
|
||||||
|
];
|
||||||
|
|
||||||
|
private _response = ["forge_client_bank_handleEvents", (toJSON _messageData)] call CFUNC(localEvent);
|
||||||
|
|
||||||
|
if (_response) then {
|
||||||
|
[format ["Submitted timesheet! Received $%1 based on rating of %2", _formattedRating, _plyscore], "info", 3, "right"] call EFUNC(misc,notify);
|
||||||
|
} else {
|
||||||
|
[format ["Timesheet submission failed"], "warning", 3, "right"] call EFUNC(misc,notify);
|
||||||
|
};
|
||||||
|
|
||||||
[] call FUNC(refresh);
|
[] call FUNC(refresh);
|
||||||
|
|
||||||
private _formattedRating = _bank call EFUNC(misc,formatNumber);
|
|
||||||
|
|
||||||
[format ["Timesheet submitted! Received $%1 based on rating of %2", _formattedRating, _plyscore], "info", 3, "right"] call EFUNC(misc,notify);
|
|
@ -24,15 +24,12 @@ private _amount = parseNumber (ctrlText _input);
|
|||||||
private _selectedTarget = lbCurSel _dropdown;
|
private _selectedTarget = lbCurSel _dropdown;
|
||||||
private _selectedTargetData = _dropdown lbData _selectedTarget;
|
private _selectedTargetData = _dropdown lbData _selectedTarget;
|
||||||
private _target = objectFromNetId _selectedTargetData;
|
private _target = objectFromNetId _selectedTargetData;
|
||||||
|
private _uid = getPlayerUID _target;
|
||||||
private _fromUid = getPlayerUID player;
|
|
||||||
private _toUid = getPlayerUID _target;
|
|
||||||
|
|
||||||
private _messageData = createHashMapFromArray [
|
private _messageData = createHashMapFromArray [
|
||||||
["event", "TRANSFER::FUNDS"],
|
["event", "TRANSFER::FUNDS"],
|
||||||
["data", createHashMapFromArray [
|
["data", createHashMapFromArray [
|
||||||
["fromUid", _fromUid],
|
["uid", _uid],
|
||||||
["toUid", _toUid],
|
|
||||||
["amount", _amount]
|
["amount", _amount]
|
||||||
]]
|
]]
|
||||||
];
|
];
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
|
|
||||||
<head>
|
<head>
|
||||||
<!--
|
<!--
|
||||||
Dynamic Resource Loading
|
Dynamic Resource Loading
|
||||||
@ -28,6 +29,7 @@
|
|||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<header>
|
<header>
|
||||||
<div class="header-content">
|
<div class="header-content">
|
||||||
@ -88,13 +90,9 @@
|
|||||||
<!-- Submit Timesheet -->
|
<!-- Submit Timesheet -->
|
||||||
<div class="action-tile">
|
<div class="action-tile">
|
||||||
<h2>Submit Timesheet</h2>
|
<h2>Submit Timesheet</h2>
|
||||||
<div class="form-group">
|
<div class="pending-amount">
|
||||||
<label for="hoursWorked">Hours Worked</label>
|
<div class="amount-label">Pending Payment</div>
|
||||||
<input type="number" id="hoursWorked" min="1" step="0.5" required>
|
<div class="amount-value" id="pending">$0</div>
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="hourlyRate">Hourly Rate</label>
|
|
||||||
<input type="number" id="hourlyRate" min="1" step="1" required>
|
|
||||||
</div>
|
</div>
|
||||||
<button type="button" class="submit-btn" onclick="handleTimesheet()">Submit Timesheet</button>
|
<button type="button" class="submit-btn" onclick="handleTimesheet()">Submit Timesheet</button>
|
||||||
</div>
|
</div>
|
||||||
@ -109,4 +107,5 @@
|
|||||||
</section>
|
</section>
|
||||||
</main>
|
</main>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
@ -14,10 +14,13 @@
|
|||||||
let bankState = {
|
let bankState = {
|
||||||
wallet: 0,
|
wallet: 0,
|
||||||
account: 0,
|
account: 0,
|
||||||
|
pending: 0,
|
||||||
players: [],
|
players: [],
|
||||||
transactions: []
|
transactions: []
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// #endregion
|
||||||
|
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
// #region INITIALIZATION AND DATA REQUESTS
|
// #region INITIALIZATION AND DATA REQUESTS
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
@ -69,6 +72,16 @@ function requestTransactionHistory() {
|
|||||||
A3API.SendAlert(JSON.stringify(message));
|
A3API.SendAlert(JSON.stringify(message));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set up a timer to refresh player data every 30 seconds
|
||||||
|
* Ensures the UI is updated with the latest information
|
||||||
|
*/
|
||||||
|
function setupRefreshTimer() {
|
||||||
|
setInterval(requestPlayerData, 30000); // Refresh every 30 seconds
|
||||||
|
}
|
||||||
|
|
||||||
|
// #endregion
|
||||||
|
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
// #region DATA HANDLERS
|
// #region DATA HANDLERS
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
@ -102,6 +115,7 @@ function handlePlayerFundsRequest(data) {
|
|||||||
// Ensure we have valid numbers, default to 0 if null
|
// Ensure we have valid numbers, default to 0 if null
|
||||||
bankState.wallet = data.cash !== null ? Number(data.cash) : 0;
|
bankState.wallet = data.cash !== null ? Number(data.cash) : 0;
|
||||||
bankState.account = data.balance !== null ? Number(data.balance) : 0;
|
bankState.account = data.balance !== null ? Number(data.balance) : 0;
|
||||||
|
bankState.pending = data.pending !== null ? Number(data.pending) : 0;
|
||||||
updateBalanceDisplays();
|
updateBalanceDisplays();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -127,6 +141,8 @@ function handleTransactionHistoryRequest(data) {
|
|||||||
updateTransactionHistory();
|
updateTransactionHistory();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// #endregion
|
||||||
|
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
// #region UI UPDATES AND DISPLAY
|
// #region UI UPDATES AND DISPLAY
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
@ -137,10 +153,12 @@ function handleTransactionHistoryRequest(data) {
|
|||||||
function updateBalanceDisplays() {
|
function updateBalanceDisplays() {
|
||||||
const walletElement = document.getElementById('walletBalance');
|
const walletElement = document.getElementById('walletBalance');
|
||||||
const accountElement = document.getElementById('accountBalance');
|
const accountElement = document.getElementById('accountBalance');
|
||||||
|
const pendingElement = document.getElementById('pending');
|
||||||
|
|
||||||
if (walletElement && accountElement) {
|
if (walletElement && accountElement && pendingElement) {
|
||||||
walletElement.textContent = `$${(bankState.wallet || 0).toLocaleString()}`;
|
walletElement.textContent = `$${(bankState.wallet || 0).toLocaleString()}`;
|
||||||
accountElement.textContent = `$${(bankState.account || 0).toLocaleString()}`;
|
accountElement.textContent = `$${(bankState.account || 0).toLocaleString()}`;
|
||||||
|
pendingElement.textContent = `$${(bankState.pending || 0).toLocaleString()}`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -218,6 +236,8 @@ function formatTransactionType(type) {
|
|||||||
return types[type] || type;
|
return types[type] || type;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// #endregion
|
||||||
|
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
// #region ACTION HANDLERS
|
// #region ACTION HANDLERS
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
@ -228,23 +248,15 @@ function formatTransactionType(type) {
|
|||||||
function handleTransfer() {
|
function handleTransfer() {
|
||||||
const amount = parseInt(document.getElementById('transferAmount').value);
|
const amount = parseInt(document.getElementById('transferAmount').value);
|
||||||
const transferType = document.getElementById('transferType').value;
|
const transferType = document.getElementById('transferType').value;
|
||||||
|
|
||||||
if (amount <= 0) {
|
|
||||||
alert('Amount must be greater than 0');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const event = transferType === 'to_wallet' ? 'WITHDRAW::FUNDS' : 'DEPOSIT::FUNDS';
|
const event = transferType === 'to_wallet' ? 'WITHDRAW::FUNDS' : 'DEPOSIT::FUNDS';
|
||||||
|
|
||||||
const message = {
|
const message = {
|
||||||
event: event,
|
event: event,
|
||||||
data: {
|
data: [amount]
|
||||||
amount: amount
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
A3API.SendAlert(JSON.stringify(message));
|
A3API.SendAlert(JSON.stringify(message));
|
||||||
document.getElementById('transferAmount').value = '';
|
document.getElementById('transferAmount').value = '';
|
||||||
|
setTimeout(requestPlayerFunds, 500);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -253,54 +265,31 @@ function handleTransfer() {
|
|||||||
function handlePlayerTransfer() {
|
function handlePlayerTransfer() {
|
||||||
const amount = parseInt(document.getElementById('playerTransferAmount').value);
|
const amount = parseInt(document.getElementById('playerTransferAmount').value);
|
||||||
const playerUid = document.getElementById('playerSelect').value;
|
const playerUid = document.getElementById('playerSelect').value;
|
||||||
|
|
||||||
if (amount <= 0) {
|
|
||||||
alert('Amount must be greater than 0');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!playerUid) {
|
|
||||||
alert('Please select a player');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const message = {
|
const message = {
|
||||||
event: 'TRANSFER::FUNDS',
|
event: 'TRANSFER::FUNDS',
|
||||||
data: {
|
data: [amount, playerUid]
|
||||||
amount: amount,
|
|
||||||
uid: playerUid
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
A3API.SendAlert(JSON.stringify(message));
|
A3API.SendAlert(JSON.stringify(message));
|
||||||
document.getElementById('playerTransferAmount').value = '';
|
document.getElementById('playerTransferAmount').value = '';
|
||||||
|
setTimeout(requestPlayerFunds, 500);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handle timesheet submission
|
* Handle timesheet submission
|
||||||
*/
|
*/
|
||||||
function handleTimesheet() {
|
function handleTimesheet() {
|
||||||
const hours = parseFloat(document.getElementById('hoursWorked').value);
|
|
||||||
const rate = parseInt(document.getElementById('hourlyRate').value);
|
|
||||||
const amount = Math.floor(hours * rate);
|
|
||||||
|
|
||||||
if (amount <= 0) {
|
|
||||||
alert('Invalid timesheet amount');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const message = {
|
const message = {
|
||||||
event: 'DEPOSIT::FUNDS',
|
event: 'SUBMIT::TIMESHEET',
|
||||||
data: {
|
data: {}
|
||||||
amount: amount
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
A3API.SendAlert(JSON.stringify(message));
|
A3API.SendAlert(JSON.stringify(message));
|
||||||
document.getElementById('hoursWorked').value = '';
|
setTimeout(requestPlayerFunds, 500);
|
||||||
document.getElementById('hourlyRate').value = '';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// #endregion
|
||||||
|
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
// #region INITIALIZATION
|
// #region INITIALIZATION
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
@ -308,4 +297,9 @@ function handleTimesheet() {
|
|||||||
/**
|
/**
|
||||||
* Initialize when DOM is loaded
|
* Initialize when DOM is loaded
|
||||||
*/
|
*/
|
||||||
document.addEventListener('DOMContentLoaded', initializeBank);
|
document.addEventListener('DOMContentLoaded', () => {
|
||||||
|
initializeBank()
|
||||||
|
setupRefreshTimer();
|
||||||
|
});
|
||||||
|
|
||||||
|
// #endregion
|
@ -30,44 +30,42 @@ body {
|
|||||||
color: var(--text-primary);
|
color: var(--text-primary);
|
||||||
}
|
}
|
||||||
|
|
||||||
.container {
|
|
||||||
max-width: 1280px;
|
|
||||||
margin: 0 auto;
|
|
||||||
padding: 0 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
header {
|
header {
|
||||||
background-color: var(--header-bg);
|
background-color: var(--header-bg);
|
||||||
color: var(--header-text);
|
color: var(--header-text);
|
||||||
padding: 1rem 0;
|
padding: 1rem 0;
|
||||||
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
|
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
|
||||||
}
|
|
||||||
|
|
||||||
.header-content {
|
h1 {
|
||||||
|
font-size: 1.75rem;
|
||||||
|
font-weight: 600;
|
||||||
|
letter-spacing: -0.025em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-content {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
max-width: 1280px;
|
max-width: 1280px;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
padding: 0 1rem;
|
padding: 0 1rem;
|
||||||
}
|
|
||||||
|
|
||||||
header h1 {
|
.balance-display {
|
||||||
font-size: 1.75rem;
|
|
||||||
font-weight: 600;
|
|
||||||
letter-spacing: -0.025em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.balance-display {
|
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
margin-left: auto;
|
margin-left: auto;
|
||||||
background: rgba(255, 255, 255, 0.05);
|
background: rgba(255, 255, 255, 0.05);
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
border: 1px solid rgba(255, 255, 255, 0.1);
|
border: 1px solid rgba(255, 255, 255, 0.1);
|
||||||
}
|
|
||||||
|
|
||||||
.balance-item {
|
.balance-divider {
|
||||||
|
width: 1px;
|
||||||
|
height: 24px;
|
||||||
|
background: rgba(255, 255, 255, 0.1);
|
||||||
|
margin: 0 0.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.balance-item {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 0.75rem;
|
gap: 0.75rem;
|
||||||
@ -75,46 +73,39 @@ header h1 {
|
|||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
transition: all 0.2s ease-in-out;
|
transition: all 0.2s ease-in-out;
|
||||||
min-width: 140px;
|
min-width: 140px;
|
||||||
}
|
|
||||||
|
|
||||||
.balance-item:hover {
|
&:hover {
|
||||||
background: rgba(255, 255, 255, 0.1);
|
background: rgba(255, 255, 255, 0.1);
|
||||||
}
|
}
|
||||||
|
|
||||||
.balance-icon {
|
.balance-info {
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
width: 24px;
|
|
||||||
height: 24px;
|
|
||||||
font-size: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.balance-info {
|
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
gap: 0.125rem;
|
gap: 0.125rem;
|
||||||
}
|
|
||||||
|
|
||||||
.balance-label {
|
.balance-label {
|
||||||
font-size: 0.75rem;
|
font-size: 0.75rem;
|
||||||
color: rgba(255, 255, 255, 0.7);
|
color: rgba(255, 255, 255, 0.7);
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
letter-spacing: 0.025em;
|
letter-spacing: 0.025em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.balance-amount {
|
.balance-amount {
|
||||||
font-size: 0.875rem;
|
font-size: 0.875rem;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
color: var(--header-text);
|
color: var(--header-text);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.balance-divider {
|
.container {
|
||||||
width: 1px;
|
max-width: 1280px;
|
||||||
height: 24px;
|
margin: 0 auto;
|
||||||
background: rgba(255, 255, 255, 0.1);
|
padding: 0 1rem;
|
||||||
margin: 0 0.25rem;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.actions-grid {
|
.actions-grid {
|
||||||
@ -122,9 +113,8 @@ header h1 {
|
|||||||
grid-template-columns: repeat(auto-fill, minmax(320px, 1fr));
|
grid-template-columns: repeat(auto-fill, minmax(320px, 1fr));
|
||||||
gap: 1.5rem;
|
gap: 1.5rem;
|
||||||
margin-top: 1.5rem;
|
margin-top: 1.5rem;
|
||||||
}
|
|
||||||
|
|
||||||
.action-tile {
|
.action-tile {
|
||||||
background-color: var(--card-background);
|
background-color: var(--card-background);
|
||||||
border-radius: 12px;
|
border-radius: 12px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
@ -136,38 +126,37 @@ header h1 {
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
gap: 1.5rem;
|
gap: 1.5rem;
|
||||||
aspect-ratio: 1 / 1;
|
aspect-ratio: 1 / 1;
|
||||||
}
|
|
||||||
|
|
||||||
.action-tile:hover {
|
&:hover {
|
||||||
box-shadow: 0 8px 16px rgba(0, 0, 0, 0.1);
|
box-shadow: 0 8px 16px rgba(0, 0, 0, 0.1);
|
||||||
transform: translateY(-4px);
|
transform: translateY(-4px);
|
||||||
}
|
}
|
||||||
|
|
||||||
.action-tile:active {
|
&:active {
|
||||||
transform: translateY(-2px);
|
transform: translateY(-2px);
|
||||||
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
|
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
|
||||||
}
|
}
|
||||||
|
|
||||||
.action-tile h2 {
|
h2 {
|
||||||
font-size: 1.25rem;
|
font-size: 1.25rem;
|
||||||
color: var(--text-primary);
|
color: var(--text-primary);
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
}
|
}
|
||||||
|
|
||||||
.form-group {
|
.form-group {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
gap: 0.5rem;
|
gap: 0.5rem;
|
||||||
margin-bottom: 1rem;
|
margin-bottom: 1rem;
|
||||||
}
|
|
||||||
|
|
||||||
.form-group label {
|
label {
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
color: var(--text-secondary);
|
color: var(--text-secondary);
|
||||||
font-size: 0.875rem;
|
font-size: 0.875rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.form-group input, .form-group select {
|
input,
|
||||||
|
select {
|
||||||
padding: 0.75rem 1rem;
|
padding: 0.75rem 1rem;
|
||||||
border: 1px solid var(--border-color);
|
border: 1px solid var(--border-color);
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
@ -175,19 +164,39 @@ header h1 {
|
|||||||
color: var(--text-primary);
|
color: var(--text-primary);
|
||||||
background-color: var(--card-background);
|
background-color: var(--card-background);
|
||||||
transition: all 0.2s ease-in-out;
|
transition: all 0.2s ease-in-out;
|
||||||
}
|
|
||||||
|
|
||||||
.form-group input:focus, .form-group select:focus {
|
&:focus {
|
||||||
outline: none;
|
outline: none;
|
||||||
border-color: var(--primary-color);
|
border-color: var(--primary-color);
|
||||||
box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
|
box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
|
||||||
}
|
}
|
||||||
|
|
||||||
.form-group input:hover, .form-group select:hover {
|
&:hover {
|
||||||
border-color: var(--primary-color);
|
border-color: var(--primary-color);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.submit-btn {
|
.pending-amount {
|
||||||
|
background: rgba(59, 130, 246, 0.1);
|
||||||
|
padding: 1rem;
|
||||||
|
border-radius: 8px;
|
||||||
|
text-align: center;
|
||||||
|
|
||||||
|
.amount-label {
|
||||||
|
font-size: 0.875rem;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
margin-bottom: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.amount-value {
|
||||||
|
font-size: 2rem;
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--primary-color);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.submit-btn {
|
||||||
background-color: var(--primary-color);
|
background-color: var(--primary-color);
|
||||||
color: white;
|
color: white;
|
||||||
border: none;
|
border: none;
|
||||||
@ -199,18 +208,20 @@ header h1 {
|
|||||||
transition: all 0.2s ease-in-out;
|
transition: all 0.2s ease-in-out;
|
||||||
opacity: 0.9;
|
opacity: 0.9;
|
||||||
margin-top: auto;
|
margin-top: auto;
|
||||||
}
|
|
||||||
|
|
||||||
.submit-btn:hover {
|
&:hover {
|
||||||
background-color: var(--primary-hover);
|
background-color: var(--primary-hover);
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
transform: translateY(-2px);
|
transform: translateY(-2px);
|
||||||
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
|
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
|
||||||
}
|
}
|
||||||
|
|
||||||
.submit-btn:active {
|
&:active {
|
||||||
transform: translateY(0);
|
transform: translateY(0);
|
||||||
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
|
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.history-section {
|
.history-section {
|
||||||
@ -227,26 +238,25 @@ header h1 {
|
|||||||
height: auto;
|
height: auto;
|
||||||
max-height: calc(100vw / 3);
|
max-height: calc(100vw / 3);
|
||||||
margin-top: 1.5rem;
|
margin-top: 1.5rem;
|
||||||
}
|
|
||||||
|
|
||||||
.history-section:hover {
|
&:hover {
|
||||||
box-shadow: 0 8px 16px rgba(0, 0, 0, 0.1);
|
box-shadow: 0 8px 16px rgba(0, 0, 0, 0.1);
|
||||||
transform: translateY(-4px);
|
transform: translateY(-4px);
|
||||||
}
|
}
|
||||||
|
|
||||||
.history-section:active {
|
&:active {
|
||||||
transform: translateY(-2px);
|
transform: translateY(-2px);
|
||||||
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
|
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
|
||||||
}
|
}
|
||||||
|
|
||||||
.history-section h2 {
|
h2 {
|
||||||
font-size: 1.25rem;
|
font-size: 1.25rem;
|
||||||
color: var(--text-primary);
|
color: var(--text-primary);
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
margin-bottom: 0.5rem;
|
margin-bottom: 0.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.history-list {
|
.history-list {
|
||||||
list-style: none;
|
list-style: none;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
@ -255,28 +265,26 @@ header h1 {
|
|||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
gap: 0.5rem;
|
gap: 0.5rem;
|
||||||
}
|
|
||||||
|
|
||||||
/* Customize scrollbar for webkit browsers */
|
&::-webkit-scrollbar {
|
||||||
.history-list::-webkit-scrollbar {
|
|
||||||
width: 6px;
|
width: 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.history-list::-webkit-scrollbar-track {
|
&::-webkit-scrollbar-track {
|
||||||
background: transparent;
|
background: transparent;
|
||||||
margin: 0.5rem;
|
margin: 0.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.history-list::-webkit-scrollbar-thumb {
|
&::-webkit-scrollbar-thumb {
|
||||||
background-color: rgba(0, 0, 0, 0.1);
|
background-color: rgba(0, 0, 0, 0.1);
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
}
|
|
||||||
|
|
||||||
.history-list::-webkit-scrollbar-thumb:hover {
|
&:hover {
|
||||||
background-color: rgba(0, 0, 0, 0.2);
|
background-color: rgba(0, 0, 0, 0.2);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.history-item {
|
.history-item {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
@ -286,51 +294,43 @@ header h1 {
|
|||||||
transition: all 0.2s ease-in-out;
|
transition: all 0.2s ease-in-out;
|
||||||
border: none;
|
border: none;
|
||||||
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
|
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
|
||||||
}
|
|
||||||
|
|
||||||
.history-item:last-child {
|
.transaction-type {
|
||||||
|
font-weight: 500;
|
||||||
|
color: var(--text-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.transaction-details {
|
||||||
|
color: var(--text-secondary);
|
||||||
|
font-size: 0.875rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.amount {
|
||||||
|
&.amount-positive {
|
||||||
|
color: var(--success-color);
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.amount-negative {
|
||||||
|
color: var(--error-color);
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&:last-child {
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.history-item:hover {
|
&:hover {
|
||||||
background-color: var(--tile-hover);
|
background-color: var(--tile-hover);
|
||||||
box-shadow: 0 4px 6px var(--shadow-color);
|
box-shadow: 0 4px 6px var(--shadow-color);
|
||||||
transform: translateY(-2px);
|
transform: translateY(-2px);
|
||||||
}
|
}
|
||||||
|
|
||||||
.history-item:active {
|
&:active {
|
||||||
transform: translateY(0);
|
transform: translateY(0);
|
||||||
box-shadow: 0 2px 4px var(--shadow-color);
|
box-shadow: 0 2px 4px var(--shadow-color);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
.transaction-type {
|
}
|
||||||
font-weight: 500;
|
|
||||||
color: var(--text-primary);
|
|
||||||
}
|
|
||||||
|
|
||||||
.transaction-details {
|
|
||||||
color: var(--text-secondary);
|
|
||||||
font-size: 0.875rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.amount-positive {
|
|
||||||
color: var(--success-color);
|
|
||||||
font-weight: 500;
|
|
||||||
}
|
|
||||||
|
|
||||||
.amount-negative {
|
|
||||||
color: var(--error-color);
|
|
||||||
font-weight: 500;
|
|
||||||
}
|
|
||||||
|
|
||||||
.error-message {
|
|
||||||
color: var(--error-color);
|
|
||||||
font-size: 0.875rem;
|
|
||||||
margin-top: 0.25rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.success-message {
|
|
||||||
color: var(--success-color);
|
|
||||||
font-size: 0.875rem;
|
|
||||||
margin-top: 0.25rem;
|
|
||||||
}
|
}
|
@ -37,7 +37,7 @@ if (_data isEqualTo [""]) then {
|
|||||||
|
|
||||||
switch (_key) do {
|
switch (_key) do {
|
||||||
case "reputation": {
|
case "reputation": {
|
||||||
SETPVAR(player,Reputation,_value);
|
SETPVAR(player,FORGE_Rating,_value);
|
||||||
player addRating _value;
|
player addRating _value;
|
||||||
};
|
};
|
||||||
case "loadout": {
|
case "loadout": {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user