hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix timestamp, remove extra strings in job route info

Browse Source
This commit is contained in:
Vortrex
2023-03-04 23:44:38 -06:00
parent e0ae0793db
commit d8b35d9aa9
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/server/job.js
View File

@@ -4265,11 +4265,11 @@ function getJobRoutesCommand(command, params, client) {
let jobData = getJobData(closestJobLocation.jobIndex); let jobData = getJobData(closestJobLocation.jobIndex);
let jobRoutesList = jobData.routes.map(function (r) { let jobRoutesList = jobData.routes.map(function (r) {
return `{chatBoxListIndex}${r.index}: ${(r.enabled) ? "{softGreen}" : "{softRed}"}${r.name} {ALTCOLOUR}(${r.locations.length} stops, added ${getTimeDifferenceDisplay(getCurrentUnixTimestamp(), r.whenCreated)} ago))`; return `{chatBoxListIndex}${r.index}: ${(r.enabled) ? "{softGreen}" : "{softRed}"}${r.name} {ALTCOLOUR}(${r.locations.length} stops, added ${getTimeDifferenceDisplay(getCurrentUnixTimestamp(), r.whenCreated)} ago)`;
}); });
let chunkedList = splitArrayIntoChunks(jobRoutesList, 4); let chunkedList = splitArrayIntoChunks(jobRoutesList, 2);
messagePlayerNormal(client, makeChatBoxSectionHeader(getLocaleString(client, " ", `${jobData.name}, Location ${closestJobLocation.index}`))); messagePlayerNormal(client, makeChatBoxSectionHeader(getLocaleString(client, "HeaderJobRoutesList", `${jobData.name}, Location ${closestJobLocation.index}`)));
for (let i in chunkedList) { for (let i in chunkedList) {
messagePlayerInfo(client, chunkedList[i].join(", ")); messagePlayerInfo(client, chunkedList[i].join(", "));
} }
@@ -4308,22 +4308,22 @@ function getJobRouteInfoCommand(command, params, client) {
[`Job`, `${jobData.name}`], [`Job`, `${jobData.name}`],
[`Name`, `${jobRouteData.name}`], [`Name`, `${jobRouteData.name}`],
[`Added By`, `${loadAccountFromId(jobRouteData.whoCreated).name}`], [`Added By`, `${loadAccountFromId(jobRouteData.whoCreated).name}`],
[`Added On`, `${new Date(jobRouteData.whenCreated).toLocaleDateString("en-GB")}`], [`Added On`, `${new Date(jobRouteData.whenCreated * 1000).toLocaleDateString("en-GB")}`],
[`Enabled`, `${getYesNoFromBool(jobRouteData.enabled)}`], [`Enabled`, `${getYesNoFromBool(jobRouteData.enabled)}`],
[`Stops`, `${jobRouteData.locations.length}`], [`Stops`, `${jobRouteData.locations.length}`],
[`Pay`, `${jobRouteData.pay}`], [`Pay`, `${getCurrencyString(jobRouteData.pay)}`],
[`Start Message`, `${jobRouteData.startMessage}`], //[`Start Message`, `${jobRouteData.startMessage}`],
[`Finish Message`, `${jobRouteData.finishMessage}`], //[`Finish Message`, `${jobRouteData.finishMessage}`],
[`Location Goto Message`, `${jobRouteData.locationGotoMessage}`], //[`Location Goto Message`, `${jobRouteData.locationGotoMessage}`],
[`Location Arrive Message`, `${jobRouteData.locationArriveMessage}`], //[`Location Arrive Message`, `${jobRouteData.locationArriveMessage}`],
[`Location Arrive Message`, `${jobRouteData.locationArriveMessage}`], //[`Location Arrive Message`, `${jobRouteData.locationArriveMessage}`],
[`Vehicle Colour`, `${getVehicleColourInfoString(jobRouteData.vehicleColour1, false)}, ${getVehicleColourInfoString(jobRouteData.vehicleColour2, false)}`], [`Vehicle Colour`, `${getVehicleColourInfoString(jobRouteData.vehicleColour1, false)}, ${getVehicleColourInfoString(jobRouteData.vehicleColour2, false)}`],
]; ];
let stats = tempStats.map(stat => `{chatBoxListIndex}${stat[0]}: {ALTCOLOUR}${stat[1]}{MAINCOLOUR}`); let stats = tempStats.map(stat => `{chatBoxListIndex}${stat[0]}: {ALTCOLOUR}${stat[1]}{MAINCOLOUR}`);
messagePlayerNormal(client, makeChatBoxSectionHeader(getLocaleString(client, "HeaderJobRouteInfo", `${jobData.name}, Location ${jobRouteData.index}`))); messagePlayerNormal(client, makeChatBoxSectionHeader(getLocaleString(client, "HeaderJobRouteInfo", `${jobData.name}, Location ${jobRouteData.index}`)));
let chunkedList = splitArrayIntoChunks(stats, 3); let chunkedList = splitArrayIntoChunks(stats, 4);
for (let i in chunkedList) { for (let i in chunkedList) {
messagePlayerInfo(client, chunkedList[i].join(", ")); messagePlayerInfo(client, chunkedList[i].join(", "));
} }