2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Show ticket ID and name on results screen

Browse source 
* Fixes issue #58
This commit is contained in:
2Shirt 2019-02-26 21:49:42 -07:00
parent 054cf25811
commit bc4fa92e16
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
.bin/Scripts/functions/hw_diags.py
View file

@ -552,6 +552,7 @@ class State():
'Objects': [], 'Objects': [],
}, },
}) })
self.ticket_name = None
self.ticket_id = None self.ticket_id = None
def init(self): def init(self):
@ -1058,9 +1059,9 @@ def run_hw_tests(state):
tmux_kill_pane(*state.panes.values()) tmux_kill_pane(*state.panes.values())
return return
# Get ticket_number # Get ticket ID and name
if not state.ost.disabled: 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) # Run disk safety checks (if necessary)
_disk_tests_enabled = False _disk_tests_enabled = False
@ -1679,9 +1680,15 @@ def show_report(report, log_report=False):
def show_results(state): def show_results(state):
"""Show results for all tests.""" """Show results for all tests."""
clear_screen() clear_screen()
tmux_update_pane( if state.ticket_id and state.ticket_name:
state.panes['Top'], tmux_update_pane(
text='{}\nResults'.format(TOP_PANE_TEXT)) 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 # CPU tests
_enabled = False _enabled = False

8
.bin/Scripts/functions/osticket.py
View file

@ -391,8 +391,9 @@ class osTicket():
# Done # Done
return name return name
def get_ticket_number(self): def get_ticket_details(self):
"""Get ticket number and confirm with name from osTicket DB.""" """Get ticket number and name from osTicket DB, returns tuple."""
ticket_name = None
ticket_number = None ticket_number = None
# Connect # Connect
@ -436,11 +437,12 @@ class osTicket():
print_standard('You have selected ticket #{} {}'.format( print_standard('You have selected ticket #{} {}'.format(
_input, _name)) _input, _name))
if ask('Is this correct?'): if ask('Is this correct?'):
ticket_name = _name
ticket_number = _input ticket_number = _input
# Done # Done
self.disconnect() self.disconnect()
return ticket_number return (ticket_number, ticket_name)
def post_device_results(self, dev, ticket_id): def post_device_results(self, dev, ticket_id):
"""Generate osTicket friendly report and post as response to ticket.""" """Generate osTicket friendly report and post as response to ticket."""