From a129a3fe16d7f1dc2a8887b21bc11c933db87200 Mon Sep 17 00:00:00 2001
From: Meghan-Rossi <56671765+Meghan-Rossi@users.noreply.github.com>
Date: Thu, 26 Mar 2020 03:03:42 +0000
Subject: [PATCH] Fix: only being able to go on-duty as a job's main title

We need to know the jobs main title to look up the access.  Tweaks the ui to keep track of it
---
 code/game/machinery/computer/timeclock_vr.dm | 12 ++++++------
 nano/templates/timeclock_vr.tmpl             | 10 ++++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/code/game/machinery/computer/timeclock_vr.dm b/code/game/machinery/computer/timeclock_vr.dm
index 06adffb5c28..32912763ac3 100644
--- a/code/game/machinery/computer/timeclock_vr.dm
+++ b/code/game/machinery/computer/timeclock_vr.dm
@@ -118,11 +118,11 @@
 				card = I
 		update_icon()
 		return 1
-	if(href_list["switch-to-onduty"])
+	if(href_list["switch-to-onduty-rank"])
 		if(card)
 			if(checkFace())
 				if(checkCardCooldown())
-					makeOnDuty(href_list["switch-to-onduty"])
+					makeOnDuty(href_list["switch-to-onduty-rank"], href_list["switch-to-onduty-assignment"])
 					usr.put_in_hands(card)
 					card = null
 		update_icon()
@@ -143,16 +143,16 @@
 	for(var/datum/job/job in job_master.occupations)
 		if(job && job.is_position_available() && !job.whitelist_only && !jobban_isbanned(user,job.title) && job.player_old_enough(user.client))
 			if(job.pto_type == department && !job.disallow_jobhop && job.timeoff_factor > 0)
-				available_jobs += job.title
+				available_jobs[job.title] = list(job.title)
 				if(job.alt_titles)
 					for(var/alt_job in job.alt_titles)
 						if(alt_job != job.title)
-							available_jobs += alt_job
+							available_jobs[job.title] += alt_job
 	return available_jobs
 
-/obj/machinery/computer/timeclock/proc/makeOnDuty(var/newassignment)
+/obj/machinery/computer/timeclock/proc/makeOnDuty(var/newrank, var/newassignment)
 	var/datum/job/oldjob = job_master.GetJob(card.rank)
-	var/datum/job/newjob = job_master.GetJob(newassignment)
+	var/datum/job/newjob = job_master.GetJob(newrank)
 	if(!newassignment in getOpenOnDutyJobs(usr, oldjob.pto_type))
 		return
 	if(newjob && card)
diff --git a/nano/templates/timeclock_vr.tmpl b/nano/templates/timeclock_vr.tmpl
index 13045e1364e..cc070c771d6 100644
--- a/nano/templates/timeclock_vr.tmpl
+++ b/nano/templates/timeclock_vr.tmpl
@@ -69,12 +69,14 @@
 				<span class='bad'>Insufficent Time Off Accrued</span>
 			{{/if}}
 		{{else (data.job_datum.timeoff_factor < 0) }}
-			{{props data.job_choices }}
-				<div class='itemLabelWide'>{{:value}}</div>
-				<div class='itemContentMedium'>{{:helper.link("Go On-Duty", 'suitcase', {'switch-to-onduty' : value})}}</div>
+			{{props data.job_choices :alt_titles:job }}
+				{{props alt_titles :alt_title:alt_title_index }}
+					<div class='itemLabelWide'>{{:alt_title}}</div>
+					<div class='itemContentMedium'>{{:helper.link("Go On-Duty", 'suitcase', {'switch-to-onduty-rank' : job,'switch-to-onduty-assignment' : alt_title})}}</div>
+				{{/props}}
 			{{empty}}
 				<div class='notice'>No Open Positions - See Head of Personnel</div>
-			{{/for}}
+			{{/props}}
 		{{/if}}
 	</div>
 </div>