IDSolutions/client
2
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases 28 Wiki Activity

feat: Implement timesheets and pending payments in bank UI
All checks were successful
Build / Build (push) Successful in 28s
Details

Browse Source 
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:
Jacob Schmidt 2025-05-11 01:19:44 -05:00
parent 94684cb120
commit f8391463b2
10 changed files with 382 additions and 377 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
addons/admin/ui/_site/script.js
View File

@ -49,7 +49,7 @@ function requestPlayerData() {
event: "REQUEST::PLAYER::DATA", event: "REQUEST::PLAYER::DATA",
data: {} data: {}
}; };
// Send request to the game engine // Send request to the game engine
A3API.SendAlert(JSON.stringify(message)); A3API.SendAlert(JSON.stringify(message));
} }
@ -63,14 +63,14 @@ function requestPaygradeData() {
event: "REQUEST::PAYGRADE::DATA", event: "REQUEST::PAYGRADE::DATA",
data: {} data: {}
}; };
// Send request to the game engine // Send request to the game engine
A3API.SendAlert(JSON.stringify(message)); A3API.SendAlert(JSON.stringify(message));
} }
/** /**
* 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
@ -95,14 +95,14 @@ function handlePaygradeDataRequest(paygradeList) {
paygradeList.forEach(item => { paygradeList.forEach(item => {
paygradeMap[item.paygrade] = item.bonus; paygradeMap[item.paygrade] = item.bonus;
}); });
adminData.paydayAmounts = paygradeMap; adminData.paydayAmounts = paygradeMap;
// Update the player list if we already have player data // Update the player list if we already have player data
if (adminData.players.length > 0) { if (adminData.players.length > 0) {
updatePlayerList(); updatePlayerList();
} }
console.log("Paygrade data updated successfully"); console.log("Paygrade data updated successfully");
} catch (error) { } catch (error) {
console.error("Error updating paygrade data:", error); console.error("Error updating paygrade data:", error);
@ -134,7 +134,7 @@ function handlePlayerDataRequest(playerList) {
function updateStats() { function updateStats() {
const onlinePlayers = adminData.players.length; const onlinePlayers = adminData.players.length;
const onlineStaff = adminData.players.filter(p => p.paygrade !== "E1").length; const onlineStaff = adminData.players.filter(p => p.paygrade !== "E1").length;
document.getElementById('playerCount').textContent = onlinePlayers; document.getElementById('playerCount').textContent = onlinePlayers;
document.getElementById('staffCount').textContent = onlineStaff; document.getElementById('staffCount').textContent = onlineStaff;
} }
@ -145,7 +145,7 @@ function updateStats() {
*/ */
function setupFilterListeners() { function setupFilterListeners() {
const filterButtons = document.querySelectorAll('.filter-btn'); const filterButtons = document.querySelectorAll('.filter-btn');
// Set up filter button click handlers // Set up filter button click handlers
filterButtons.forEach(button => { filterButtons.forEach(button => {
button.addEventListener('click', () => { button.addEventListener('click', () => {
@ -171,7 +171,7 @@ function setupFilterListeners() {
*/ */
function filterPlayers(filter, searchTerm = '') { function filterPlayers(filter, searchTerm = '') {
let filteredPlayers = adminData.players; let filteredPlayers = adminData.players;
// Apply category filter // Apply category filter
if (filter === 'staff') { if (filter === 'staff') {
filteredPlayers = filteredPlayers.filter(p => p.paygrade !== "E1"); filteredPlayers = filteredPlayers.filter(p => p.paygrade !== "E1");
@ -184,15 +184,15 @@ function filterPlayers(filter, searchTerm = '') {
} else if (filter === 'civilian') { } else if (filter === 'civilian') {
filteredPlayers = filteredPlayers.filter(p => p.side === "CIV"); filteredPlayers = filteredPlayers.filter(p => p.side === "CIV");
} }
// Apply search filter // Apply search filter
if (searchTerm) { if (searchTerm) {
const term = searchTerm.toLowerCase(); const term = searchTerm.toLowerCase();
filteredPlayers = filteredPlayers.filter(p => filteredPlayers = filteredPlayers.filter(p =>
p.name.toLowerCase().includes(term) p.name.toLowerCase().includes(term)
); );
} }
updatePlayerList(filteredPlayers); updatePlayerList(filteredPlayers);
} }
@ -207,7 +207,7 @@ function updatePlayerList(players = adminData.players) {
playerList.innerHTML = players.map(player => { playerList.innerHTML = players.map(player => {
const paydayAmount = adminData.paydayAmounts[player.paygrade] || 1000; const paydayAmount = adminData.paydayAmounts[player.paygrade] || 1000;
const rankClass = getRankClass(player.paygrade); const rankClass = getRankClass(player.paygrade);
return ` return `
<div class="player-item" data-id="${player.uid}"> <div class="player-item" data-id="${player.uid}">
<div class="player-info"> <div class="player-info">
@ -243,11 +243,11 @@ function getRankClass(paygrade) {
return 'enlisted'; return 'enlisted';
} else if (paygrade.startsWith('WO')) { } else if (paygrade.startsWith('WO')) {
return 'warrant'; return 'warrant';
} else if (paygrade.startsWith('O') || } else if (paygrade.startsWith('O') ||
paygrade.startsWith('1') || paygrade.startsWith('1') ||
paygrade.startsWith('2') || paygrade.startsWith('2') ||
paygrade.startsWith('C') || paygrade.startsWith('C') ||
paygrade.startsWith('M')) { paygrade.startsWith('M')) {
return 'officer'; return 'officer';
} else { } else {
return 'enlisted'; // Default return 'enlisted'; // Default
@ -269,13 +269,13 @@ function getRankClass(paygrade) {
function updatePaygrade(uid, isPromotion) { function updatePaygrade(uid, isPromotion) {
const player = adminData.players.find(p => p.uid === uid); const player = adminData.players.find(p => p.uid === uid);
if (!player) return; if (!player) return;
// Use the paygrades from the configuration // Use the paygrades from the configuration
const paygrades = Object.keys(adminData.paydayAmounts); const paygrades = Object.keys(adminData.paydayAmounts);
paygrades.sort((a, b) => adminData.paydayAmounts[a] - adminData.paydayAmounts[b]); // Sort by payment amount paygrades.sort((a, b) => adminData.paydayAmounts[a] - adminData.paydayAmounts[b]); // Sort by payment amount
const currentIndex = paygrades.indexOf(player.paygrade); const currentIndex = paygrades.indexOf(player.paygrade);
let newPaygrade; let newPaygrade;
if (isPromotion && currentIndex < paygrades.length - 1) { if (isPromotion && currentIndex < paygrades.length - 1) {
newPaygrade = paygrades[currentIndex + 1]; newPaygrade = paygrades[currentIndex + 1];
@ -284,14 +284,14 @@ function updatePaygrade(uid, isPromotion) {
} else { } else {
return; // Can't promote/demote further return; // Can't promote/demote further
} }
const message = { const message = {
event: "UPDATE::PAYGRADE", event: "UPDATE::PAYGRADE",
data: [uid, newPaygrade] data: [uid, newPaygrade]
}; };
A3API.SendAlert(JSON.stringify(message)); A3API.SendAlert(JSON.stringify(message));
// Optimistic update // Optimistic update
player.paygrade = newPaygrade; player.paygrade = newPaygrade;
updatePlayerList(); updatePlayerList();
@ -346,7 +346,7 @@ function giveAllMoney() {
} }
A3API.SendAlert(JSON.stringify(message)); A3API.SendAlert(JSON.stringify(message));
// Request updated player data after giving money to all players // Request updated player data after giving money to all players
setTimeout(requestPlayerData, 500); // Short delay to allow server processing setTimeout(requestPlayerData, 500); // Short delay to allow server processing
} }
@ -374,7 +374,7 @@ function handleTransferFunds(condition, amount, uid) {
event: "HANDLE::TRANSFER", event: "HANDLE::TRANSFER",
data: [condition, amount, uid] data: [condition, amount, uid]
}; };
A3API.SendAlert(JSON.stringify(message)); A3API.SendAlert(JSON.stringify(message));
// Optimistic update // Optimistic update
@ -428,7 +428,7 @@ function sendPlayerMessage() {
event: "SEND::MESSAGE", event: "SEND::MESSAGE",
data: [selectedPlayerId, message] data: [selectedPlayerId, message]
}; };
A3API.SendAlert(JSON.stringify(messageData)); A3API.SendAlert(JSON.stringify(messageData));
closeMessageModal(); closeMessageModal();
} }
@ -444,7 +444,7 @@ function broadcastMessage() {
event: "BROADCAST::MESSAGE", event: "BROADCAST::MESSAGE",
data: ["", message] data: ["", message]
}; };
A3API.SendAlert(JSON.stringify(messageData)); A3API.SendAlert(JSON.stringify(messageData));
document.getElementById('broadcastMessage').value = ''; document.getElementById('broadcastMessage').value = '';
} }
@ -466,7 +466,7 @@ function Payday() {
}; };
A3API.SendAlert(JSON.stringify(message)); A3API.SendAlert(JSON.stringify(message));
// Request updated player data after payday // Request updated player data after payday
setTimeout(requestPlayerData, 500); // Short delay to allow server processing setTimeout(requestPlayerData, 500); // Short delay to allow server processing
} }

3
addons/bank/XEH_postInit.sqf
View File

@ -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);

53
addons/bank/XEH_postInit_client.sqf
View File

@ -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);

4
addons/bank/functions/fnc_deposit.sqf
View File

@ -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]
]] ]]
]; ];

21
addons/bank/functions/fnc_submit.sqf
View File

@ -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;
SETPVAR(player,FORGE_Bank,_bank);
SETPVAR(player,FORGE_Rating,0);
[] call FUNC(refresh);
private _formattedRating = _bank call EFUNC(misc,formatNumber); private _formattedRating = _bank call EFUNC(misc,formatNumber);
private _messageData = createHashMapFromArray [
["event", "SUBMIT::TIMESHEET"],
["data", []]
];
[format ["Timesheet submitted! Received $%1 based on rating of %2", _formattedRating, _plyscore], "info", 3, "right"] call EFUNC(misc,notify); 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);

7
addons/bank/functions/fnc_transfer.sqf
View File

@ -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]
]] ]]
]; ];

15
addons/bank/ui/_site/index.html
View File

@ -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>

112
addons/bank/ui/_site/script.js
View File

@ -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
//============================================================================= //=============================================================================
@ -41,7 +44,7 @@ function requestPlayerFunds() {
event: "REQUEST::PLAYER::FUNDS", event: "REQUEST::PLAYER::FUNDS",
data: {} data: {}
}; };
A3API.SendAlert(JSON.stringify(message)); A3API.SendAlert(JSON.stringify(message));
} }
@ -53,7 +56,7 @@ function requestPlayerData() {
event: "REQUEST::PLAYER::DATA", event: "REQUEST::PLAYER::DATA",
data: {} data: {}
}; };
A3API.SendAlert(JSON.stringify(message)); A3API.SendAlert(JSON.stringify(message));
} }
@ -65,10 +68,20 @@ function requestTransactionHistory() {
event: "REQUEST::TRANSACTION::HISTORY", event: "REQUEST::TRANSACTION::HISTORY",
data: {} data: {}
}; };
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
//============================================================================= //=============================================================================
@ -88,7 +101,7 @@ function handlePlayerDataRequest(data) {
*/ */
function handlePlayerFundsRequest(data) { function handlePlayerFundsRequest(data) {
console.log('Received funds data:', data); console.log('Received funds data:', data);
// Parse the data if it's a string // Parse the data if it's a string
if (typeof data === 'string') { if (typeof data === 'string') {
try { try {
@ -98,10 +111,11 @@ function handlePlayerFundsRequest(data) {
return; return;
} }
} }
// 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();
} }
@ -111,7 +125,7 @@ function handlePlayerFundsRequest(data) {
*/ */
function handleTransactionHistoryRequest(data) { function handleTransactionHistoryRequest(data) {
console.log('Received transaction history:', data); console.log('Received transaction history:', data);
// Parse the data if it's a string // Parse the data if it's a string
if (typeof data === 'string') { if (typeof data === 'string') {
try { try {
@ -121,12 +135,14 @@ function handleTransactionHistoryRequest(data) {
return; return;
} }
} }
// Initialize empty array if history is null // Initialize empty array if history is null
bankState.transactions = []; bankState.transactions = [];
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()}`;
} }
} }
@ -150,7 +168,7 @@ function updateBalanceDisplays() {
function populatePlayerList() { function populatePlayerList() {
const playerSelect = document.getElementById('playerSelect'); const playerSelect = document.getElementById('playerSelect');
playerSelect.innerHTML = '<option value="" disabled selected>Select Player</option>'; playerSelect.innerHTML = '<option value="" disabled selected>Select Player</option>';
bankState.players.forEach(player => { bankState.players.forEach(player => {
const option = document.createElement('option'); const option = document.createElement('option');
option.value = player.uid; option.value = player.uid;
@ -165,7 +183,7 @@ function populatePlayerList() {
function updateTransactionHistory() { function updateTransactionHistory() {
const historyList = document.getElementById('transactionHistory'); const historyList = document.getElementById('transactionHistory');
if (!historyList) return; if (!historyList) return;
historyList.innerHTML = ''; historyList.innerHTML = '';
if (!Array.isArray(bankState.transactions)) { if (!Array.isArray(bankState.transactions)) {
@ -183,21 +201,21 @@ function updateTransactionHistory() {
bankState.transactions.forEach(transaction => { bankState.transactions.forEach(transaction => {
if (!transaction) return; if (!transaction) return;
const li = document.createElement('li'); const li = document.createElement('li');
li.className = 'history-item'; li.className = 'history-item';
const isNegative = ['transfer_out', 'to_wallet'].includes(transaction.type); const isNegative = ['transfer_out', 'to_wallet'].includes(transaction.type);
const amountClass = isNegative ? 'amount-negative' : 'amount-positive'; const amountClass = isNegative ? 'amount-negative' : 'amount-positive';
const amountPrefix = isNegative ? '-' : '+'; const amountPrefix = isNegative ? '-' : '+';
const amount = Math.abs(Number(transaction.amount) || 0); const amount = Math.abs(Number(transaction.amount) || 0);
li.innerHTML = ` li.innerHTML = `
<span class="transaction-type">${formatTransactionType(transaction.type)}</span> <span class="transaction-type">${formatTransactionType(transaction.type)}</span>
<span class="transaction-details">${transaction.details || ''}</span> <span class="transaction-details">${transaction.details || ''}</span>
<span class="amount ${amountClass}">${amountPrefix}$${amount.toLocaleString()}</span> <span class="amount ${amountClass}">${amountPrefix}$${amount.toLocaleString()}</span>
`; `;
historyList.appendChild(li); historyList.appendChild(li);
}); });
} }
@ -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

486
addons/bank/ui/_site/styles.css
View File

@ -30,187 +30,198 @@ 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);
h1 {
font-size: 1.75rem;
font-weight: 600;
letter-spacing: -0.025em;
}
.header-content {
display: flex;
justify-content: space-between;
align-items: center;
max-width: 1280px;
margin: 0 auto;
padding: 0 1rem;
.balance-display {
display: flex;
align-items: center;
margin-left: auto;
background: rgba(255, 255, 255, 0.05);
border-radius: 8px;
border: 1px solid rgba(255, 255, 255, 0.1);
.balance-divider {
width: 1px;
height: 24px;
background: rgba(255, 255, 255, 0.1);
margin: 0 0.25rem;
}
.balance-item {
display: flex;
align-items: center;
gap: 0.75rem;
padding: 0.5rem 0.75rem;
border-radius: 6px;
transition: all 0.2s ease-in-out;
min-width: 140px;
&:hover {
background: rgba(255, 255, 255, 0.1);
}
.balance-info {
display: flex;
flex-direction: column;
gap: 0.125rem;
.balance-label {
font-size: 0.75rem;
color: rgba(255, 255, 255, 0.7);
font-weight: 500;
text-transform: uppercase;
letter-spacing: 0.025em;
}
.balance-amount {
font-size: 0.875rem;
font-weight: 600;
color: var(--header-text);
}
}
}
}
}
} }
.header-content { .container {
display: flex;
justify-content: space-between;
align-items: center;
max-width: 1280px; max-width: 1280px;
margin: 0 auto; margin: 0 auto;
padding: 0 1rem; padding: 0 1rem;
} }
header h1 {
font-size: 1.75rem;
font-weight: 600;
letter-spacing: -0.025em;
}
.balance-display {
display: flex;
align-items: center;
margin-left: auto;
background: rgba(255, 255, 255, 0.05);
border-radius: 8px;
border: 1px solid rgba(255, 255, 255, 0.1);
}
.balance-item {
display: flex;
align-items: center;
gap: 0.75rem;
padding: 0.5rem 0.75rem;
border-radius: 6px;
transition: all 0.2s ease-in-out;
min-width: 140px;
}
.balance-item:hover {
background: rgba(255, 255, 255, 0.1);
}
.balance-icon {
display: flex;
align-items: center;
justify-content: center;
width: 24px;
height: 24px;
font-size: 1rem;
}
.balance-info {
display: flex;
flex-direction: column;
gap: 0.125rem;
}
.balance-label {
font-size: 0.75rem;
color: rgba(255, 255, 255, 0.7);
font-weight: 500;
text-transform: uppercase;
letter-spacing: 0.025em;
}
.balance-amount {
font-size: 0.875rem;
font-weight: 600;
color: var(--header-text);
}
.balance-divider {
width: 1px;
height: 24px;
background: rgba(255, 255, 255, 0.1);
margin: 0 0.25rem;
}
.actions-grid { .actions-grid {
display: grid; display: grid;
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;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
transition: all 0.3s ease-in-out; transition: all 0.3s ease-in-out;
border: none; border: none;
padding: 1.5rem; padding: 1.5rem;
display: flex; display: flex;
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,
padding: 0.75rem 1rem; select {
border: 1px solid var(--border-color); padding: 0.75rem 1rem;
border-radius: 8px; border: 1px solid var(--border-color);
font-size: 1rem; border-radius: 8px;
color: var(--text-primary); font-size: 1rem;
background-color: var(--card-background); color: var(--text-primary);
transition: all 0.2s ease-in-out; background-color: var(--card-background);
} 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-color: var(--primary-color); background: rgba(59, 130, 246, 0.1);
color: white; padding: 1rem;
border: none; border-radius: 8px;
border-radius: 8px; text-align: center;
padding: 0.75rem 1.5rem;
font-size: 1rem;
font-weight: 500;
cursor: pointer;
transition: all 0.2s ease-in-out;
opacity: 0.9;
margin-top: auto;
}
.submit-btn:hover { .amount-label {
background-color: var(--primary-hover); font-size: 0.875rem;
opacity: 1; color: var(--text-secondary);
transform: translateY(-2px); margin-bottom: 0.5rem;
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); }
}
.submit-btn:active { .amount-value {
transform: translateY(0); font-size: 2rem;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); font-weight: 600;
color: var(--primary-color);
}
}
.submit-btn {
background-color: var(--primary-color);
color: white;
border: none;
border-radius: 8px;
padding: 0.75rem 1.5rem;
font-size: 1rem;
font-weight: 500;
cursor: pointer;
transition: all 0.2s ease-in-out;
opacity: 0.9;
margin-top: auto;
&:hover {
background-color: var(--primary-hover);
opacity: 1;
transform: translateY(-2px);
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
}
&:active {
transform: translateY(0);
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
}
}
}
} }
.history-section { .history-section {
@ -227,110 +238,99 @@ 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;
padding-right: 0.5rem; padding-right: 0.5rem;
margin-right: -0.5rem; margin-right: -0.5rem;
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;
padding: 1rem; padding: 1rem;
background-color: var(--card-background); background-color: var(--card-background);
border-radius: 8px; border-radius: 8px;
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 {
margin-bottom: 0; font-weight: 500;
} color: var(--text-primary);
}
.history-item:hover { .transaction-details {
background-color: var(--tile-hover); color: var(--text-secondary);
box-shadow: 0 4px 6px var(--shadow-color); font-size: 0.875rem;
transform: translateY(-2px); }
}
.history-item:active { .amount {
transform: translateY(0); &.amount-positive {
box-shadow: 0 2px 4px var(--shadow-color); color: var(--success-color);
} font-weight: 500;
}
.transaction-type { &.amount-negative {
font-weight: 500; color: var(--error-color);
color: var(--text-primary); font-weight: 500;
} }
}
.transaction-details { &:last-child {
color: var(--text-secondary); margin-bottom: 0;
font-size: 0.875rem; }
}
.amount-positive { &:hover {
color: var(--success-color); background-color: var(--tile-hover);
font-weight: 500; box-shadow: 0 4px 6px var(--shadow-color);
} transform: translateY(-2px);
}
.amount-negative { &:active {
color: var(--error-color); transform: translateY(0);
font-weight: 500; box-shadow: 0 2px 4px var(--shadow-color);
} }
}
.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;
}

2
addons/init/functions/fnc_handlePlayerLoad.sqf
View File

@ -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": {