anima/timetrack
1
1
Fork 0
Code Issues 18 Projects 2 Releases 4 Wiki Activity

change all userinputs to new function

Browse Source
This commit is contained in:
Schreiner Pascal
2021-06-09 23:10:22 +02:00
parent c081f519dd
commit 7fbad1ee4a
1 changed files with 32 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
timeTrack.py
View File

@@ -3,7 +3,7 @@
#
# timeTrack.py
# by 4nima
# v.2.1.0
# v.2.1.1
#
#########################
# simple time tracking with database
@@ -418,30 +418,24 @@ class TimeTrack:
logging.debug('Event younger than 1 day')
print('Vergangene Zeit: >{} Stunden'.format(int(elapsed.seconds/3600)))
userinput = 0
while not 0 < int(userinput) < 4:
print('Soll das Event fortgesetzt oder gelöscht werden?')
print('[1] für fortsetzen')
print('[2] für löschen')
print('[3] für abbrechen')
userinput = input('Aktion: ')
logging.debug('User input: {}'.format(userinput))
try:
int(userinput)
except ValueError:
userinput = 0
printtext = [
'Wie soll mit dem Event verfahren werden?',
'[1] fortsetzen',
'[2] löschen',
'[0] abbrechen'
]
userinput = self.userchoise(printtext, 3)
self.clear_screen()
if userinput == "1":
if userinput == 1:
logging.debug('Event should be continued')
self.time_stop()
elif userinput == "2":
elif userinput == 2:
logging.info('Event should be deleted (eventid: {})'.format(data[0]))
self.delete_event(data[0])
self.time_start()
else:
logging.debug('Terminated by the user')
exit()
self.start_interactive_mode()
else:
logging.debug('Event continues (eventid{})'.format(data[0]))
@@ -454,21 +448,16 @@ class TimeTrack:
logging.debug('Event stop progess is started')
if data:
self.clear_screen()
userinput = 0
while not 0 < int(userinput) < 4:
print('Event von {} Uhr beenden?'.format(data[1].strftime("%H:%M")))
print('[1] für beenden')
print('[2] für löschen')
print('[3] für abbrechen')
userinput = input('Aktion: ')
logging.debug('User input: {}'.format(userinput))
try:
int(userinput)
except ValueError:
userinput = 0
printtext = [
'Event von {} Uhr beenden?'.format(data[1].strftime("%H:%M")),
'[1] für beenden',
'[2] für löschen',
'[0] für abbrechen'
]
userinput = self.userchoise(printtext, 3)
self.clear_screen()
if userinput == "1":
if userinput == 1:
logging.debug('Event is ended')
print('Eingabe beenden mittels doppelter Leerzeile.')
print('Durchgeführte Tätigkeiten:')
@@ -510,30 +499,24 @@ class TimeTrack:
self.clear_screen()
self.print_time_entry(STARTTIME=data[1], ENDTIME=endtime, ACTIVITY=action)
print('Zeiteintrag wurde gespeichert.')
userinput = 0
while not 0 < int(userinput) < 3:
print('Nächsten Zeiteintrag beginnen ?')
print('[1] Ja')
print('[2] Nein')
userinput = input('Aktion: ')
logging.debug('User input: {}'.format(userinput))
try:
int(userinput)
except ValueError:
userinput = 0
printtext = [
'Nächsten Zeiteintrag beginnen ?',
'[1] Ja',
'[0] Nein'
]
userinput = self.userchoise(printtext)
self.clear_screen()
if userinput == "1":
if userinput == 1:
self.time_start()
else:
self.start_interactive_mode()
elif userinput == "2":
elif userinput == 2:
logging.info('Event should be deleted (eventid: {})'.format(data[0]))
self.delete_event(data[0])
else:
logging.debug('Terminated by the user')
exit()
self.start_interactive_mode()
## Interactive mode
#==================