mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-24 04:27:35 +01:00
UI cleanup, demote reasons shown in log
This commit is contained in:
Kyep
@@ -621,6 +621,8 @@ SUBSYSTEM_DEF(jobs)
|
||||
for(var/datum/job/job in occupations)
|
||||
if(tgtcard.assignment && tgtcard.assignment == job.title)
|
||||
jobs_to_formats[job.title] = "green" // the job they already have is pre-selected
|
||||
else if(tgtcard.assignment == "Demoted" || tgtcard.assignment == "Terminated")
|
||||
jobs_to_formats[job.title] = "grey"
|
||||
else if(!job.would_accept_job_transfer_from_player(M))
|
||||
jobs_to_formats[job.title] = "grey" // jobs which are karma-locked and not unlocked for this player are discouraged
|
||||
else if((job.title in GLOB.command_positions) && istype(M) && M.client && job.available_in_playtime(M.client))
|
||||
@@ -629,12 +631,21 @@ SUBSYSTEM_DEF(jobs)
|
||||
jobs_to_formats[job.title] = "teal" // jobs with nobody doing them at all are encouraged
|
||||
else if(job.total_positions >= 0 && job.current_positions >= job.total_positions)
|
||||
jobs_to_formats[job.title] = "grey" // jobs that are full (no free positions) are discouraged
|
||||
if(tgtcard.assignment == "Demoted" || tgtcard.assignment == "Terminated")
|
||||
jobs_to_formats["Custom"] = "grey"
|
||||
return jobs_to_formats
|
||||
|
||||
|
||||
|
||||
/datum/controller/subsystem/jobs/proc/log_job_transfer(transferee, oldvalue, newvalue, whodidit)
|
||||
id_change_records["[id_change_counter]"] = list("transferee" = transferee, "oldvalue" = oldvalue, "newvalue" = newvalue, "whodidit" = whodidit, "timestamp" = station_time_timestamp())
|
||||
/datum/controller/subsystem/jobs/proc/log_job_transfer(transferee, oldvalue, newvalue, whodidit, reason)
|
||||
id_change_records["[id_change_counter]"] = list(
|
||||
"transferee" = transferee,
|
||||
"oldvalue" = oldvalue,
|
||||
"newvalue" = newvalue,
|
||||
"whodidit" = whodidit,
|
||||
"timestamp" = station_time_timestamp(),
|
||||
"reason" = reason
|
||||
)
|
||||
id_change_counter++
|
||||
|
||||
/datum/controller/subsystem/jobs/proc/slot_job_transfer(oldtitle, newtitle)
|
||||
@@ -667,43 +678,6 @@ SUBSYSTEM_DEF(jobs)
|
||||
PM.notify("<b>Automated Notification: </b>\"[antext]\" (Unable to Reply)")
|
||||
|
||||
|
||||
/datum/controller/subsystem/jobs/proc/fetch_transfer_record_html(var/centcom)
|
||||
var/record_html = "<TABLE border=\"1\">"
|
||||
|
||||
var/table_headers = list("Crewman", "Old Rank", "New Rank", "Authorized By", "Time")
|
||||
var/hidden_fields = list("deletedby")
|
||||
if(centcom)
|
||||
table_headers += "<span class='bad'>Deleted By</span>"
|
||||
record_html += "<TR>"
|
||||
for(var/thisheader in table_headers)
|
||||
record_html += "<TD><B>[thisheader]</B></TD>"
|
||||
record_html += "</TR>"
|
||||
|
||||
var/visible_record_count = 0
|
||||
for(var/thisid in id_change_records)
|
||||
var/thisrecord = id_change_records[thisid]
|
||||
|
||||
if(thisrecord["deletedby"] && !centcom)
|
||||
continue
|
||||
|
||||
record_html += "<TR>"
|
||||
for(var/lkey in thisrecord)
|
||||
if(lkey in hidden_fields)
|
||||
if(centcom)
|
||||
record_html += "<TD><span class='bad'>[thisrecord[lkey]]<span></TD>"
|
||||
else
|
||||
continue
|
||||
else
|
||||
record_html += "<TD>[thisrecord[lkey]]</TD>"
|
||||
record_html += "</TR>"
|
||||
visible_record_count++
|
||||
|
||||
record_html += "</TABLE>"
|
||||
|
||||
if(!visible_record_count)
|
||||
return "No records on file yet."
|
||||
return record_html
|
||||
|
||||
/datum/controller/subsystem/jobs/proc/format_job_change_records(centcom)
|
||||
var/list/formatted = list()
|
||||
for(var/thisid in id_change_records)
|
||||
|
||||
@@ -292,13 +292,6 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
|
||||
// RECORDS
|
||||
if(is_authenticated(user))
|
||||
data["records"] = SSjobs.format_job_change_records(data["iscentcom"])
|
||||
if(4)
|
||||
// WIP REMOTE DEMOTE FUNCTION -- TODO
|
||||
var/list/titles_supervised = get_subordinates(scan.assignment, FALSE)
|
||||
data["mypeople"] = list()
|
||||
for(var/datum/data/record/R in GLOB.data_core.security)
|
||||
if(R.fields["rank"] in titles_supervised)
|
||||
data["mypeople"] += R.fields["name"]
|
||||
return data
|
||||
|
||||
/obj/machinery/computer/card/proc/regenerate_id_name()
|
||||
@@ -387,9 +380,11 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
|
||||
var/temp_t = sanitize(reject_bad_name(copytext(input("Enter a custom job assignment.", "Assignment"), 1, MAX_MESSAGE_LEN), TRUE))
|
||||
//let custom jobs function as an impromptu alt title, mainly for sechuds
|
||||
if(temp_t && scan && modify)
|
||||
SSjobs.log_job_transfer(modify.registered_name, modify.getRankAndAssignment(), temp_t, scan.registered_name)
|
||||
var/oldrank = modify.getRankAndAssignment()
|
||||
SSjobs.log_job_transfer(modify.registered_name, oldrank, temp_t, scan.registered_name, null)
|
||||
modify.assignment = temp_t
|
||||
log_game("[key_name(usr)] has given \"[modify.registered_name]\" the custom job title \"[temp_t]\".")
|
||||
log_game("[key_name(usr)] has reassigned \"[modify.registered_name]\" from \"[oldrank]\" to \"[temp_t]\".")
|
||||
SSjobs.notify_dept_head(modify.rank, "[scan.registered_name] has transferred \"[modify.registered_name]\" the \"[oldrank]\" to \"[temp_t]\".")
|
||||
else
|
||||
var/list/access = list()
|
||||
if(is_centcom() && islist(get_centcom_access(t1)))
|
||||
@@ -412,7 +407,8 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
|
||||
if(t1 == "Civilian")
|
||||
message_admins("[key_name_admin(usr)] has reassigned \"[modify.registered_name]\" from \"[jobnamedata]\" to \"[t1]\".")
|
||||
|
||||
SSjobs.log_job_transfer(modify.registered_name, jobnamedata, t1, scan.registered_name)
|
||||
SSjobs.log_job_transfer(modify.registered_name, jobnamedata, t1, scan.registered_name, null)
|
||||
SSjobs.notify_dept_head(t1, "[scan.registered_name] has transferred \"[modify.registered_name]\" the \"[jobnamedata]\" to \"[t1]\".")
|
||||
if(modify.owner_uid)
|
||||
SSjobs.slot_job_transfer(modify.rank, t1)
|
||||
|
||||
@@ -448,13 +444,14 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
|
||||
log_game("[key_name(usr)] has demoted \"[modify.registered_name]\" the \"[jobnamedata]\" [m_ckey_text] to \"Civilian (Demoted)\" for: \"[reason]\".")
|
||||
message_admins("[key_name_admin(usr)] has demoted \"[modify.registered_name]\" the \"[jobnamedata]\" [m_ckey_text] to \"Civilian (Demoted)\" for: \"[reason]\".")
|
||||
usr.create_log(MISC_LOG, "demoted \"[modify.registered_name]\" [m_ckey_text] the \"[jobnamedata]\"")
|
||||
SSjobs.log_job_transfer(modify.registered_name, jobnamedata, "Demoted", scan.registered_name)
|
||||
SSjobs.log_job_transfer(modify.registered_name, jobnamedata, "Demoted", scan.registered_name, reason)
|
||||
SSjobs.notify_dept_head(modify.rank, "[scan.registered_name] has demoted \"[modify.registered_name]\" the \"[jobnamedata]\" for \"[reason]\".")
|
||||
modify.access = access
|
||||
modify.rank = "Civilian"
|
||||
modify.assignment = "Demoted"
|
||||
modify.icon_state = "id"
|
||||
regenerate_id_name()
|
||||
return
|
||||
if("make_job_available")
|
||||
// MAKE ANOTHER JOB POSITION AVAILABLE FOR LATE JOINERS
|
||||
if(is_authenticated(usr))
|
||||
@@ -467,7 +464,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
|
||||
to_chat(usr, "Job does not exist")
|
||||
return 0
|
||||
if(can_open_job(j) != 1)
|
||||
to_chat(usr, "Job cannot be opened. [retcode]")
|
||||
to_chat(usr, "Job cannot be opened.")
|
||||
return 0
|
||||
if(opened_positions[edit_job_target] >= 0)
|
||||
GLOB.time_last_changed_position = world.time / 10
|
||||
@@ -475,7 +472,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
|
||||
opened_positions[edit_job_target]++
|
||||
log_game("[key_name(usr)] has opened a job slot for job \"[j]\".")
|
||||
message_admins("[key_name_admin(usr)] has opened a job slot for job \"[j.title]\".")
|
||||
|
||||
return
|
||||
if("make_job_unavailable")
|
||||
// MAKE JOB POSITION UNAVAILABLE FOR LATE JOINERS
|
||||
var/edit_job_target = params["job"]
|
||||
@@ -493,6 +490,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
|
||||
opened_positions[edit_job_target]--
|
||||
log_game("[key_name(usr)] has closed a job slot for job \"[j]\".")
|
||||
message_admins("[key_name_admin(usr)] has closed a job slot for job \"[j.title]\".")
|
||||
return
|
||||
// Everything below here requires a full ID computer (dept consoles do not qualify)
|
||||
if(target_dept)
|
||||
playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
|
||||
@@ -587,7 +585,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
|
||||
log_game("[key_name(usr)] has terminated the employment of \"[modify.registered_name]\" [m_ckey_text] the \"[jobnamedata]\" for: \"[reason]\".")
|
||||
message_admins("[key_name_admin(usr)] has terminated the employment of \"[modify.registered_name]\" [m_ckey_text] the \"[jobnamedata]\" for: \"[reason]\".")
|
||||
usr.create_log(MISC_LOG, "terminated the employment of \"[modify.registered_name]\" [m_ckey_text] the \"[jobnamedata]\"")
|
||||
SSjobs.log_job_transfer(modify.registered_name, jobnamedata, "Terminated", scan.registered_name)
|
||||
SSjobs.log_job_transfer(modify.registered_name, jobnamedata, "Terminated", scan.registered_name, reason)
|
||||
SSjobs.notify_dept_head(modify.rank, "[scan.registered_name] has terminated the employment of \"[modify.registered_name]\" the \"[jobnamedata]\" for \"[reason]\".")
|
||||
modify.assignment = "Terminated"
|
||||
modify.access = list()
|
||||
|
||||
@@ -93,10 +93,18 @@ export const CardComputer = (props, context) => {
|
||||
onClick={() => act("assign", { assign_target: v })} />
|
||||
))}
|
||||
</LabeledList.Item>
|
||||
<LabeledList.Item label="Retirement">
|
||||
<Button
|
||||
selected={"Civilian" === data.modify_rank}
|
||||
key="Civilian" content="Civilian"
|
||||
onClick={() => act("assign",
|
||||
{ assign_target: "Civilian" })} />
|
||||
</LabeledList.Item>
|
||||
<LabeledList.Item label="Demotion">
|
||||
<Button
|
||||
selected={"Demoted" === data.modify_rank}
|
||||
key="Demoted" content="Demote"
|
||||
key="Demoted" content="Demoted"
|
||||
tooltip="Civilian access, 'demoted' title."
|
||||
color="red" icon="times"
|
||||
onClick={() => act("demote")} />
|
||||
</LabeledList.Item>
|
||||
@@ -109,14 +117,18 @@ export const CardComputer = (props, context) => {
|
||||
<Section title="Card Information">
|
||||
<LabeledList.Item label="Registered Name">
|
||||
<Button
|
||||
icon="pencil-alt"
|
||||
icon={!data.modify_owner || data.modify_owner === "Unknown"
|
||||
? "exclamation-triangle"
|
||||
: "pencil-alt"}
|
||||
selected={data.modify_name}
|
||||
content={data.modify_owner}
|
||||
onClick={() => act("reg")} />
|
||||
</LabeledList.Item>
|
||||
<LabeledList.Item label="Account Number">
|
||||
<Button
|
||||
icon="pencil-alt"
|
||||
icon={data.account_number
|
||||
? "pencil-alt"
|
||||
: "exclamation-triangle"}
|
||||
selected={data.account_number}
|
||||
content={data.account_number
|
||||
? data.account_number
|
||||
@@ -210,9 +222,9 @@ export const CardComputer = (props, context) => {
|
||||
)}
|
||||
<LabeledList.Item label="Non-Crew">
|
||||
<Button
|
||||
disabled={"Demoted" === data.modify_rank
|
||||
|| "Terminated" === data.modify_rank}
|
||||
disabled={"Terminated" === data.modify_rank}
|
||||
key="Demoted" content="Demoted"
|
||||
selected={"Demoted" === data.modify_rank}
|
||||
tooltip="Civilian access, 'demoted' title."
|
||||
color="red" icon="times"
|
||||
onClick={() => act("demote")} />
|
||||
@@ -263,41 +275,71 @@ export const CardComputer = (props, context) => {
|
||||
{data.cooldown_time ? data.cooldown_time : "Now"}
|
||||
</Section>
|
||||
<Section title="Job Slots">
|
||||
<LabeledList>
|
||||
|
||||
|
||||
<Table>
|
||||
<Table.Row>
|
||||
<Table.Cell bold textAlign='center'>Title</Table.Cell>
|
||||
<Table.Cell bold textAlign='center'>Used Slots</Table.Cell>
|
||||
<Table.Cell bold textAlign='center'>Total Slots</Table.Cell>
|
||||
<Table.Cell bold textAlign='center'>Free Slots</Table.Cell>
|
||||
<Table.Cell bold textAlign='center'>Close Slot</Table.Cell>
|
||||
<Table.Cell bold textAlign='center'>Open Slot</Table.Cell>
|
||||
<Table.Cell bold textAlign='center'>Priority</Table.Cell>
|
||||
</Table.Row>
|
||||
{data.job_slots.map(slotData => (
|
||||
<LabeledList.Item key={slotData.title} label={slotData.title}>
|
||||
{slotData.current_positions}/{slotData.total_positions}
|
||||
<Button
|
||||
content="-"
|
||||
disabled={data.cooldown_time || !slotData.can_close}
|
||||
onClick={() => act("make_job_unavailable",
|
||||
{ job: slotData.title })} />
|
||||
<Button
|
||||
content="+"
|
||||
disabled={data.cooldown_time || !slotData.can_open}
|
||||
onClick={() => act("make_job_available",
|
||||
{ job: slotData.title })} />
|
||||
{data.target_dept && (
|
||||
<Box>
|
||||
{ data.priority_jobs.indexOf(slotData.title) > -1
|
||||
? "Priorized Job"
|
||||
: ""}
|
||||
</Box>
|
||||
) || (
|
||||
<Table.Row key={slotData.title}>
|
||||
<Table.Cell textAlign='center'>{slotData.title}</Table.Cell>
|
||||
<Table.Cell textAlign='center'>{slotData.current_positions}</Table.Cell>
|
||||
<Table.Cell textAlign='center'>{slotData.total_positions}</Table.Cell>
|
||||
<Table.Cell textAlign='center'>
|
||||
{slotData.total_positions > slotData.current_positions && (
|
||||
<Box color="green">
|
||||
{slotData.total_positions - slotData.current_positions}
|
||||
</Box>
|
||||
) || (
|
||||
<Box color="red">
|
||||
0
|
||||
</Box>
|
||||
)}
|
||||
</Table.Cell>
|
||||
<Table.Cell textAlign='center'>
|
||||
<Button
|
||||
content="Priority"
|
||||
selected={
|
||||
data.priority_jobs.indexOf(slotData.title) > -1
|
||||
}
|
||||
disabled={
|
||||
data.cooldown_time || !slotData.can_prioritize
|
||||
}
|
||||
onClick={() => act("prioritize_job",
|
||||
content="-"
|
||||
disabled={data.cooldown_time || !slotData.can_close}
|
||||
onClick={() => act("make_job_unavailable",
|
||||
{ job: slotData.title })} />
|
||||
)}
|
||||
</LabeledList.Item>
|
||||
</Table.Cell>
|
||||
<Table.Cell textAlign='center'>
|
||||
<Button
|
||||
content="+"
|
||||
disabled={data.cooldown_time || !slotData.can_open}
|
||||
onClick={() => act("make_job_available",
|
||||
{ job: slotData.title })} />
|
||||
</Table.Cell>
|
||||
<Table.Cell textAlign='center'>
|
||||
{data.target_dept && (
|
||||
<Box color="green">
|
||||
{data.priority_jobs.indexOf(slotData.title) > -1
|
||||
? "Yes"
|
||||
: ""}
|
||||
</Box>
|
||||
) || (
|
||||
<Button
|
||||
content="Priority"
|
||||
selected={
|
||||
data.priority_jobs.indexOf(slotData.title) > -1
|
||||
}
|
||||
disabled={
|
||||
data.cooldown_time || !slotData.can_prioritize
|
||||
}
|
||||
onClick={() => act("prioritize_job",
|
||||
{ job: slotData.title })} />
|
||||
)}
|
||||
</Table.Cell>
|
||||
</Table.Row>
|
||||
))}
|
||||
</LabeledList>
|
||||
</Table>
|
||||
</Section>
|
||||
</Fragment>
|
||||
);
|
||||
@@ -312,7 +354,7 @@ export const CardComputer = (props, context) => {
|
||||
);
|
||||
} else if (!data.modify_name) {
|
||||
bodyBlock = (
|
||||
<Section title="Access Modification" color="red">
|
||||
<Section title="Card Missing" color="red">
|
||||
No card to modify.
|
||||
</Section>
|
||||
);
|
||||
@@ -342,6 +384,12 @@ export const CardComputer = (props, context) => {
|
||||
Not logged in.
|
||||
</Section>
|
||||
);
|
||||
} else if (!data.records.length) {
|
||||
bodyBlock = (
|
||||
<Section title="Records">
|
||||
No records.
|
||||
</Section>
|
||||
);
|
||||
} else {
|
||||
bodyBlock = (
|
||||
<Section title="Records" buttons={
|
||||
@@ -360,6 +408,7 @@ export const CardComputer = (props, context) => {
|
||||
<Table.Cell bold>New Rank</Table.Cell>
|
||||
<Table.Cell bold>Authorized By</Table.Cell>
|
||||
<Table.Cell bold>Time</Table.Cell>
|
||||
<Table.Cell bold>Reason</Table.Cell>
|
||||
{!!data.iscentcom && (
|
||||
<Table.Cell bold>
|
||||
Deleted By
|
||||
@@ -373,6 +422,7 @@ export const CardComputer = (props, context) => {
|
||||
<Table.Cell>{record.newvalue}</Table.Cell>
|
||||
<Table.Cell>{record.whodidit}</Table.Cell>
|
||||
<Table.Cell>{record.timestamp}</Table.Cell>
|
||||
<Table.Cell>{record.reason}</Table.Cell>
|
||||
{!!data.iscentcom && (
|
||||
<Table.Cell>
|
||||
{record.deletedby}
|
||||
|
||||
Reference in New Issue
Block a user