diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py index 5ffb0f48..2b16854b 100644 --- a/.bin/Scripts/functions/hw_diags.py +++ b/.bin/Scripts/functions/hw_diags.py @@ -552,6 +552,7 @@ class State(): 'Objects': [], }, }) + self.ticket_name = None self.ticket_id = None def init(self): @@ -1058,9 +1059,9 @@ def run_hw_tests(state): tmux_kill_pane(*state.panes.values()) return - # Get ticket_number + # Get ticket ID and name if not state.ost.disabled: - state.ticket_id = state.ost.get_ticket_number() + state.ticket_id, state.ticket_name = state.ost.get_ticket_details() # Run disk safety checks (if necessary) _disk_tests_enabled = False @@ -1679,9 +1680,15 @@ def show_report(report, log_report=False): def show_results(state): """Show results for all tests.""" clear_screen() - tmux_update_pane( - state.panes['Top'], - text='{}\nResults'.format(TOP_PANE_TEXT)) + if state.ticket_id and state.ticket_name: + tmux_update_pane( + state.panes['Top'], + text='{}\nResults for #{} {}'.format( + TOP_PANE_TEXT, state.ticket_id, state.ticket_name)) + else: + tmux_update_pane( + state.panes['Top'], + text='{}\nResults'.format(TOP_PANE_TEXT)) # CPU tests _enabled = False diff --git a/.bin/Scripts/functions/osticket.py b/.bin/Scripts/functions/osticket.py index ca7cf153..0186f11a 100644 --- a/.bin/Scripts/functions/osticket.py +++ b/.bin/Scripts/functions/osticket.py @@ -391,8 +391,9 @@ class osTicket(): # Done return name - def get_ticket_number(self): - """Get ticket number and confirm with name from osTicket DB.""" + def get_ticket_details(self): + """Get ticket number and name from osTicket DB, returns tuple.""" + ticket_name = None ticket_number = None # Connect @@ -436,11 +437,12 @@ class osTicket(): print_standard('You have selected ticket #{} {}'.format( _input, _name)) if ask('Is this correct?'): + ticket_name = _name ticket_number = _input # Done self.disconnect() - return ticket_number + return (ticket_number, ticket_name) def post_device_results(self, dev, ticket_id): """Generate osTicket friendly report and post as response to ticket."""