Compare commits
5 Commits
v.2.0.0a
...
58d0e6191c
| Author | SHA1 | Date | |
|---|---|---|---|
| 58d0e6191c | |||
| 3d9d1a1d5f | |||
| a5cde65967 | |||
| 6834469b62 | |||
| 28bc3b319e |
4
.gitignore
vendored
Normal file
4
.gitignore
vendored
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
*.log
|
||||||
|
*.conf
|
||||||
|
*.db
|
||||||
|
.vscode
|
||||||
BIN
ERD_TimeTrack_Database.eddx
Normal file
BIN
ERD_TimeTrack_Database.eddx
Normal file
Binary file not shown.
BIN
Mindmap_TimeTrack.emmx
Normal file
BIN
Mindmap_TimeTrack.emmx
Normal file
Binary file not shown.
BIN
PAP_TimeTrack.eddx
Normal file
BIN
PAP_TimeTrack.eddx
Normal file
Binary file not shown.
234
timeTrack.py
234
timeTrack.py
@@ -1,9 +1,9 @@
|
|||||||
#!/bin/python3
|
#!/usr/bin/env python3
|
||||||
#########################
|
#########################
|
||||||
#
|
#
|
||||||
# timeTrack.py
|
# timeTrack.py
|
||||||
# by 4nima
|
# by 4nima
|
||||||
# v.2.0.0
|
# v.2.0.4
|
||||||
#
|
#
|
||||||
#########################
|
#########################
|
||||||
# simple time tracking with database
|
# simple time tracking with database
|
||||||
@@ -24,6 +24,7 @@ class TimeTrack:
|
|||||||
self.USERNAME = ''
|
self.USERNAME = ''
|
||||||
self.OLDEVENT = 2
|
self.OLDEVENT = 2
|
||||||
self.LOGFILE = 'timetrack.log'
|
self.LOGFILE = 'timetrack.log'
|
||||||
|
self.DBCON = sqlite3.connect(self.DATABASE, detect_types=sqlite3.PARSE_DECLTYPES | sqlite3.PARSE_COLNAMES)
|
||||||
logging.basicConfig(
|
logging.basicConfig(
|
||||||
filename=self.LOGFILE,
|
filename=self.LOGFILE,
|
||||||
level=logging.DEBUG,
|
level=logging.DEBUG,
|
||||||
@@ -33,6 +34,9 @@ class TimeTrack:
|
|||||||
self.db_setup()
|
self.db_setup()
|
||||||
self.load_config()
|
self.load_config()
|
||||||
|
|
||||||
|
def __del__(self):
|
||||||
|
self.DBCON.close()
|
||||||
|
|
||||||
## Prepartation
|
## Prepartation
|
||||||
### Check OS and clear screen
|
### Check OS and clear screen
|
||||||
def clear_screen(self):
|
def clear_screen(self):
|
||||||
@@ -95,22 +99,19 @@ class TimeTrack:
|
|||||||
)
|
)
|
||||||
""")
|
""")
|
||||||
|
|
||||||
connect = sqlite3.connect(self.DATABASE)
|
|
||||||
cursor = connect.cursor()
|
|
||||||
logging.debug('Create initial database tables')
|
logging.debug('Create initial database tables')
|
||||||
for SQL in sql:
|
try:
|
||||||
try:
|
with self.DBCON as con:
|
||||||
cursor.execute(SQL)
|
for SQL in sql:
|
||||||
except:
|
con.execute(SQL)
|
||||||
logging.error('Table could not be created')
|
except sqlite3.Error as err:
|
||||||
logging.debug(SQL)
|
logging.error('Table could not be created')
|
||||||
print('TimeTrack wird beendet: Fehler bei Datanbank Setup')
|
logging.debug(sql)
|
||||||
quit()
|
logging.error('SQLError: {}'.format(err))
|
||||||
else:
|
print('TimeTrack wird beendet: Fehler bei Datanbank Setup')
|
||||||
logging.debug('Table was created successfully or already exists')
|
quit()
|
||||||
|
else:
|
||||||
connect.commit()
|
logging.debug('Table was created successfully or already exists')
|
||||||
connect.close()
|
|
||||||
|
|
||||||
### Loads or creates a config file
|
### Loads or creates a config file
|
||||||
def load_config(self):
|
def load_config(self):
|
||||||
@@ -160,21 +161,16 @@ class TimeTrack:
|
|||||||
|
|
||||||
logging.debug('Accepted username: {}'.format(username))
|
logging.debug('Accepted username: {}'.format(username))
|
||||||
|
|
||||||
connect = sqlite3.connect(self.DATABASE)
|
|
||||||
cursor = connect.cursor()
|
|
||||||
|
|
||||||
sql = "INSERT INTO users ( name ) values ( ? )"
|
sql = "INSERT INTO users ( name ) values ( ? )"
|
||||||
|
|
||||||
try:
|
try:
|
||||||
cursor.execute(sql, [username])
|
with self.DBCON as con:
|
||||||
except:
|
con.execute(sql, [username])
|
||||||
|
except sqlite3.Error as err:
|
||||||
logging.error('User could not be saved in database')
|
logging.error('User could not be saved in database')
|
||||||
logging.debug(sql)
|
logging.debug(sql)
|
||||||
|
logging.error('SQLError: {}'.format(err))
|
||||||
else:
|
else:
|
||||||
logging.info('User was saved successfully')
|
logging.info('User was saved successfully')
|
||||||
connect.commit()
|
|
||||||
|
|
||||||
connect.close()
|
|
||||||
|
|
||||||
### Outputs existing users from the DB
|
### Outputs existing users from the DB
|
||||||
def get_users(self, UID=0, NAME=''):
|
def get_users(self, UID=0, NAME=''):
|
||||||
@@ -191,25 +187,23 @@ class TimeTrack:
|
|||||||
data = ''
|
data = ''
|
||||||
sql = "SELECT * FROM users"
|
sql = "SELECT * FROM users"
|
||||||
|
|
||||||
connect = sqlite3.connect(self.DATABASE)
|
|
||||||
cursor = connect.cursor()
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if data:
|
with self.DBCON as con:
|
||||||
cursor.execute(sql, [data])
|
cur = con.cursor()
|
||||||
else:
|
if data:
|
||||||
cursor.execute(sql)
|
cur.execute(sql, [data])
|
||||||
except:
|
else:
|
||||||
|
cur.execute(sql)
|
||||||
|
data = cur.fetchall()
|
||||||
|
except sqlite3.Error as err:
|
||||||
logging.error('Could not get user')
|
logging.error('Could not get user')
|
||||||
logging.debug(sql)
|
logging.debug(sql)
|
||||||
|
logging.error('SQLError: {}'.format(err))
|
||||||
print('Fehler beim Zugriff auf die Benutzer Datenbank')
|
print('Fehler beim Zugriff auf die Benutzer Datenbank')
|
||||||
return 1
|
return 1
|
||||||
else:
|
else:
|
||||||
logging.debug('User database read out successfully')
|
logging.debug('User database read out successfully')
|
||||||
connect.commit()
|
|
||||||
|
|
||||||
data = cursor.fetchall()
|
|
||||||
connect.close()
|
|
||||||
return data
|
return data
|
||||||
|
|
||||||
### Defines a user for the session
|
### Defines a user for the session
|
||||||
@@ -231,23 +225,22 @@ class TimeTrack:
|
|||||||
def save_event(self, TIME=datetime.datetime.now()):
|
def save_event(self, TIME=datetime.datetime.now()):
|
||||||
if not self.get_event(USERID=self.USERID):
|
if not self.get_event(USERID=self.USERID):
|
||||||
logging.debug('No active events found for the user: {}'.format(self.USERID))
|
logging.debug('No active events found for the user: {}'.format(self.USERID))
|
||||||
connect = sqlite3.connect(self.DATABASE)
|
|
||||||
cursor = connect.cursor()
|
|
||||||
sql = "INSERT INTO active_events ( starttime, user_id ) VALUES ( ?, ? )"
|
|
||||||
|
|
||||||
|
sql = "INSERT INTO active_events ( starttime, user_id ) VALUES ( ?, ? )"
|
||||||
try:
|
try:
|
||||||
cursor.execute(sql, [TIME, self.USERID])
|
with self.DBCON as con:
|
||||||
except:
|
con.execute(sql, [TIME, self.USERID])
|
||||||
|
except sqlite3.Error as err:
|
||||||
logging.error('Event could not be created')
|
logging.error('Event could not be created')
|
||||||
logging.debug(sql)
|
logging.debug(sql)
|
||||||
|
logging.error('SQLError: {}'.format(err))
|
||||||
print('Event konnte nicht gespeichert werden.')
|
print('Event konnte nicht gespeichert werden.')
|
||||||
return False
|
return False
|
||||||
else:
|
else:
|
||||||
logging.info('Event was created successfully')
|
logging.info('Event was created successfully')
|
||||||
connect.commit()
|
|
||||||
|
|
||||||
connect.close()
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
else:
|
else:
|
||||||
logging.warning('Active events found for the user, new event could not be created')
|
logging.warning('Active events found for the user, new event could not be created')
|
||||||
return False
|
return False
|
||||||
@@ -267,20 +260,16 @@ class TimeTrack:
|
|||||||
print('Keine angabe was gelöscht werden soll')
|
print('Keine angabe was gelöscht werden soll')
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
connect = sqlite3.connect(self.DATABASE, detect_types=sqlite3.PARSE_DECLTYPES | sqlite3.PARSE_COLNAMES)
|
|
||||||
cursor = connect.cursor()
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
cursor.execute(sql, [data])
|
with self.DBCON as con:
|
||||||
except:
|
con.execute(sql, [data])
|
||||||
|
except sqlite3.Error as err:
|
||||||
logging.error('Event could not be deleted')
|
logging.error('Event could not be deleted')
|
||||||
logging.debug(sql)
|
logging.debug(sql)
|
||||||
|
logging.error('SQLError: {}'.format(err))
|
||||||
print('Fehler beim löschen des Events.')
|
print('Fehler beim löschen des Events.')
|
||||||
else:
|
else:
|
||||||
logging.debug('Event was successfully deleted')
|
logging.debug('Event was successfully deleted')
|
||||||
connect.commit()
|
|
||||||
|
|
||||||
connect.close()
|
|
||||||
|
|
||||||
### Get an active event based on a user or event ID
|
### Get an active event based on a user or event ID
|
||||||
def get_event(self, ENTRYID='', USERID=''):
|
def get_event(self, ENTRYID='', USERID=''):
|
||||||
@@ -296,29 +285,30 @@ class TimeTrack:
|
|||||||
sql = "SELECT * FROM active_events"
|
sql = "SELECT * FROM active_events"
|
||||||
data = ''
|
data = ''
|
||||||
|
|
||||||
connect = sqlite3.connect(self.DATABASE, detect_types=sqlite3.PARSE_DECLTYPES | sqlite3.PARSE_COLNAMES)
|
|
||||||
cursor = connect.cursor()
|
|
||||||
try:
|
try:
|
||||||
if data:
|
with self.DBCON as con:
|
||||||
logging.debug('Search event')
|
cur = con.cursor()
|
||||||
cursor.execute(sql, [data])
|
if data:
|
||||||
else:
|
logging.debug('Search event')
|
||||||
logging.debug('Get all Events')
|
cur.execute(sql, [data])
|
||||||
cursor.execute(sql)
|
else:
|
||||||
except:
|
logging.debug('Get all Events')
|
||||||
|
cur.execute(sql)
|
||||||
|
data = cur.fetchall()
|
||||||
|
except sqlite3.Error as err:
|
||||||
logging.error('Events could not be read')
|
logging.error('Events could not be read')
|
||||||
logging.debug(sql)
|
logging.debug(sql)
|
||||||
|
logging.error('SQLError: {}'.format(err))
|
||||||
print('Fehler beim auslesen der aktiven Events')
|
print('Fehler beim auslesen der aktiven Events')
|
||||||
else:
|
else:
|
||||||
logging.debug('Events could be read out successfully')
|
logging.debug('Events could be read out successfully')
|
||||||
data = cursor.fetchall()
|
|
||||||
connect.close()
|
if data == []:
|
||||||
if data == []:
|
logging.debug('No active events found')
|
||||||
logging.debug('No active events found')
|
return 0
|
||||||
return 0
|
else:
|
||||||
else:
|
logging.debug('{} events found'.format(len(data)))
|
||||||
logging.debug('{} events found'.format(len(data)))
|
return data[0]
|
||||||
return data[0]
|
|
||||||
|
|
||||||
def time_start(self, AUTOFORWARD=True):
|
def time_start(self, AUTOFORWARD=True):
|
||||||
self.clear_screen()
|
self.clear_screen()
|
||||||
@@ -348,24 +338,24 @@ class TimeTrack:
|
|||||||
logging.debug('Event younger than 1 day')
|
logging.debug('Event younger than 1 day')
|
||||||
print('Vergangene Zeit: >{} Stunden'.format(int(elapsed.seconds/3600)))
|
print('Vergangene Zeit: >{} Stunden'.format(int(elapsed.seconds/3600)))
|
||||||
|
|
||||||
userinput = ''
|
userinput = 0
|
||||||
while True:
|
while not 0 < int(userinput) < 4:
|
||||||
if userinput == "F" or userinput == "f" or userinput == "1" \
|
|
||||||
or userinput == "L" or userinput == "l" or userinput == "2" \
|
|
||||||
or userinput == "A" or userinput == "a" or userinput == "3":
|
|
||||||
break
|
|
||||||
print('Soll das Event fortgesetzt oder gelöscht werden?')
|
print('Soll das Event fortgesetzt oder gelöscht werden?')
|
||||||
print('[1/F/f] für fortsetzen')
|
print('[1] für fortsetzen')
|
||||||
print('[2/L/l] für löschen')
|
print('[2] für löschen')
|
||||||
print('[3/A/a] für abbrechen')
|
print('[3] für abbrechen')
|
||||||
userinput = input('Aktion: ')
|
userinput = input('Aktion: ')
|
||||||
logging.debug('User input: {}'.format(userinput))
|
logging.debug('User input: {}'.format(userinput))
|
||||||
|
try:
|
||||||
|
int(userinput)
|
||||||
|
except ValueError:
|
||||||
|
userinput = 0
|
||||||
self.clear_screen()
|
self.clear_screen()
|
||||||
|
|
||||||
if userinput == "F" or userinput == "f" or userinput == "1":
|
if userinput == "1":
|
||||||
logging.debug('Event should be continued')
|
logging.debug('Event should be continued')
|
||||||
self.time_stop()
|
self.time_stop()
|
||||||
elif userinput == "L" or userinput == "l" or userinput == "2":
|
elif userinput == "2":
|
||||||
logging.info('Event should be deleted (eventid: {})'.format(data[0]))
|
logging.info('Event should be deleted (eventid: {})'.format(data[0]))
|
||||||
self.delete_event(data[0])
|
self.delete_event(data[0])
|
||||||
self.time_start()
|
self.time_start()
|
||||||
@@ -383,21 +373,21 @@ class TimeTrack:
|
|||||||
logging.debug('Event stop progess is started')
|
logging.debug('Event stop progess is started')
|
||||||
if data:
|
if data:
|
||||||
self.clear_screen()
|
self.clear_screen()
|
||||||
userinput = ''
|
userinput = 0
|
||||||
while True:
|
while not 0 < int(userinput) < 4:
|
||||||
if userinput == "B" or userinput == "b" or userinput == "1" \
|
|
||||||
or userinput == "L" or userinput == "l" or userinput == "2" \
|
|
||||||
or userinput == "A" or userinput == "a" or userinput == "3":
|
|
||||||
break
|
|
||||||
print('Event von {} Uhr beenden?'.format(data[1].strftime("%H:%M")))
|
print('Event von {} Uhr beenden?'.format(data[1].strftime("%H:%M")))
|
||||||
print('[1/B/b] für beenden')
|
print('[1] für beenden')
|
||||||
print('[2/L/l] für löschen')
|
print('[2] für löschen')
|
||||||
print('[3/A/a] für abbrechen')
|
print('[3] für abbrechen')
|
||||||
userinput = input('Aktion: ')
|
userinput = input('Aktion: ')
|
||||||
logging.debug('User input: {}'.format(userinput))
|
logging.debug('User input: {}'.format(userinput))
|
||||||
|
try:
|
||||||
|
int(userinput)
|
||||||
|
except ValueError:
|
||||||
|
userinput = 0
|
||||||
self.clear_screen()
|
self.clear_screen()
|
||||||
|
|
||||||
if userinput == "B" or userinput == "b" or userinput == "1":
|
if userinput == "1":
|
||||||
logging.debug('Event is ended')
|
logging.debug('Event is ended')
|
||||||
print('Eingabe beenden mittels doppelter Leerzeile.')
|
print('Eingabe beenden mittels doppelter Leerzeile.')
|
||||||
print('Durchgeführte Tätigkeiten:')
|
print('Durchgeführte Tätigkeiten:')
|
||||||
@@ -421,44 +411,43 @@ class TimeTrack:
|
|||||||
|
|
||||||
endtime = datetime.datetime.now()
|
endtime = datetime.datetime.now()
|
||||||
logging.debug('Event end process start at {}'.format(endtime))
|
logging.debug('Event end process start at {}'.format(endtime))
|
||||||
connect = sqlite3.connect(self.DATABASE)
|
|
||||||
cursor = connect.cursor()
|
|
||||||
sql = "INSERT INTO time_entries ( starttime, endtime, user_id, activity ) VALUES ( ?, ?, ?, ? )"
|
|
||||||
|
|
||||||
|
sql = "INSERT INTO time_entries ( starttime, endtime, user_id, activity ) VALUES ( ?, ?, ?, ? )"
|
||||||
try:
|
try:
|
||||||
cursor.execute(sql, [data[1], endtime, self.USERID, action])
|
with self.DBCON as con:
|
||||||
except:
|
con.execute(sql, [data[1], endtime, self.USERID, action])
|
||||||
|
except sqlite3.Error as err:
|
||||||
logging.error('Time entry could not be created')
|
logging.error('Time entry could not be created')
|
||||||
logging.debug(sql)
|
logging.debug(sql)
|
||||||
|
logging.error('SQLError: {}'.format(err))
|
||||||
print('Zeiteintrag konnte nicht gespeichert werden.')
|
print('Zeiteintrag konnte nicht gespeichert werden.')
|
||||||
return False
|
return False
|
||||||
else:
|
else:
|
||||||
logging.info('Time entry was created successfully')
|
logging.info('Time entry was created successfully')
|
||||||
connect.commit()
|
|
||||||
self.delete_event(data[0])
|
|
||||||
self.print_time_entry(STARTTIME=data[1], ENDTIME=endtime, ACTIVITY=action)
|
|
||||||
print('Zeiteintrag wurde gespeichert.')
|
|
||||||
while True:
|
|
||||||
if userinput == "J" or userinput == "j" or userinput == "1" \
|
|
||||||
or userinput == "N" or userinput == "n" or userinput == "2":
|
|
||||||
break
|
|
||||||
print('Nächsten Zeiteintrag begrinnen ?')
|
|
||||||
print('[1/J/j] Ja')
|
|
||||||
print('[2/N/n] Nein')
|
|
||||||
userinput = input('Aktion: ')
|
|
||||||
logging.debug('User input: {}'.format(userinput))
|
|
||||||
self.clear_screen()
|
|
||||||
|
|
||||||
if userinput == "J" or userinput == "j" or userinput == "1":
|
|
||||||
self.time_start()
|
|
||||||
else:
|
|
||||||
logging.debug('Terminated by the user')
|
|
||||||
exit()
|
|
||||||
|
|
||||||
|
|
||||||
connect.close()
|
self.delete_event(data[0])
|
||||||
|
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
|
||||||
|
self.clear_screen()
|
||||||
|
|
||||||
elif userinput == "L" or userinput == "l" or userinput == "2":
|
if userinput == "1":
|
||||||
|
self.time_start()
|
||||||
|
else:
|
||||||
|
logging.debug('Terminated by the user')
|
||||||
|
exit()
|
||||||
|
|
||||||
|
elif userinput == "2":
|
||||||
logging.info('Event should be deleted (eventid: {})'.format(data[0]))
|
logging.info('Event should be deleted (eventid: {})'.format(data[0]))
|
||||||
self.delete_event(data[0])
|
self.delete_event(data[0])
|
||||||
else:
|
else:
|
||||||
@@ -469,6 +458,7 @@ class TimeTrack:
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
def print_time_entry(self, STARTTIME='', ENDTIME='', ACTIVITY=''):
|
def print_time_entry(self, STARTTIME='', ENDTIME='', ACTIVITY=''):
|
||||||
|
self.clear_screen()
|
||||||
s = (ENDTIME - STARTTIME).seconds
|
s = (ENDTIME - STARTTIME).seconds
|
||||||
hours, remainder = divmod(s, 3600)
|
hours, remainder = divmod(s, 3600)
|
||||||
minutes, seconds = divmod(remainder, 60)
|
minutes, seconds = divmod(remainder, 60)
|
||||||
@@ -482,5 +472,7 @@ class TimeTrack:
|
|||||||
print(ACTIVITY)
|
print(ACTIVITY)
|
||||||
print(50*"-")
|
print(50*"-")
|
||||||
|
|
||||||
test = TimeTrack()
|
if __name__ == "__main__":
|
||||||
test.time_start()
|
test = TimeTrack()
|
||||||
|
test.time_start()
|
||||||
|
test.DBCON.close()
|
||||||
540
timeTrack.sh
Normal file
540
timeTrack.sh
Normal file
@@ -0,0 +1,540 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
#==========
|
||||||
|
#
|
||||||
|
# timeTrack.sh
|
||||||
|
# by 4nima
|
||||||
|
# v.1.5.0
|
||||||
|
#
|
||||||
|
#==========
|
||||||
|
# Einfaches Erfassen von Zeiten mit einer SQLDB (SQLite, kein Server)
|
||||||
|
#==========
|
||||||
|
|
||||||
|
|
||||||
|
# Variablen Definieren
|
||||||
|
#=====================
|
||||||
|
# Pfad zur Datenbank (Vollständiger Pfad benutzen!)
|
||||||
|
DBDIR="/root/time/work/.timeTrack.db"
|
||||||
|
DB="timeTrack"
|
||||||
|
|
||||||
|
## Verfügbare Kategorien (0 = Default)
|
||||||
|
### ACHTUNG: in der DB werden die IDs gespeichert, verändern der Rheinfolge verfälscht Reports
|
||||||
|
# Alternativ neben Kategorien noch Tags oder Projekte anbieten
|
||||||
|
declare -a categories
|
||||||
|
categories[0]="Junk"
|
||||||
|
categories+=("Kunden")
|
||||||
|
categories+=("Internes")
|
||||||
|
categories+=("Meetings")
|
||||||
|
categories+=("Schulung")
|
||||||
|
categories+=("Pause")
|
||||||
|
categories+=("Sonstiges")
|
||||||
|
categories+=("Privates")
|
||||||
|
|
||||||
|
# Funktionen
|
||||||
|
#===========
|
||||||
|
## DB
|
||||||
|
### Erstellt eine Datenbank Datei
|
||||||
|
function createDB {
|
||||||
|
sqlite3 $DBDIR "
|
||||||
|
CREATE TABLE IF NOT EXISTS $DB (
|
||||||
|
id INTEGER PRIMARY KEY,
|
||||||
|
date INTEGER,
|
||||||
|
day INTEGER,
|
||||||
|
kw INTEGER,
|
||||||
|
task TEXT,
|
||||||
|
category INTEGER,
|
||||||
|
worktime INTEGER
|
||||||
|
);
|
||||||
|
"
|
||||||
|
}
|
||||||
|
|
||||||
|
### Fügt einen Task in die DB ein
|
||||||
|
function insertTask {
|
||||||
|
sqlite3 $DBDIR "
|
||||||
|
INSERT INTO $DB (
|
||||||
|
date,
|
||||||
|
day,
|
||||||
|
kw,
|
||||||
|
task,
|
||||||
|
category,
|
||||||
|
worktime
|
||||||
|
) VALUES (
|
||||||
|
'$(date +%s)',
|
||||||
|
'$(date +%u)',
|
||||||
|
'$(date +%V)',
|
||||||
|
'$1',
|
||||||
|
'$2',
|
||||||
|
'$3'
|
||||||
|
);
|
||||||
|
"
|
||||||
|
}
|
||||||
|
|
||||||
|
### Eintrag aus der Datenbank löschen
|
||||||
|
function eraseTask {
|
||||||
|
echo "<================================================>"
|
||||||
|
sqlite3 $DBDIR "
|
||||||
|
DELETE
|
||||||
|
FROM $DB
|
||||||
|
WHERE id = $DBID
|
||||||
|
"
|
||||||
|
echo "Task wurde gelöscht"
|
||||||
|
echo "<================================================>"
|
||||||
|
}
|
||||||
|
|
||||||
|
### Suche
|
||||||
|
#### Anhand der ID
|
||||||
|
function searchById {
|
||||||
|
echo "<================================================>"
|
||||||
|
sqlite3 $DBDIR -column -header "
|
||||||
|
SELECT *
|
||||||
|
FROM $DB
|
||||||
|
WHERE id = $DBID
|
||||||
|
"
|
||||||
|
echo "<================================================>"
|
||||||
|
}
|
||||||
|
|
||||||
|
#### Anhand eines Strings (in Tasks)
|
||||||
|
function searchByString {
|
||||||
|
echo "<================================================>"
|
||||||
|
sqlite3 $DBDIR -column -header "
|
||||||
|
SELECT *
|
||||||
|
FROM $DB
|
||||||
|
WHERE task LIKE '%$SEARCH%'
|
||||||
|
"
|
||||||
|
echo "<================================================>"
|
||||||
|
}
|
||||||
|
|
||||||
|
### Updates
|
||||||
|
#### Datum
|
||||||
|
function updateDate {
|
||||||
|
echo "<================================================>"
|
||||||
|
sqlite3 $DBDIR "
|
||||||
|
UPDATE $DB
|
||||||
|
SET date = '$UPDATEVALUE'
|
||||||
|
WHERE id = $DBID
|
||||||
|
"
|
||||||
|
echo "Datum geupdatet"
|
||||||
|
echo "<================================================>"
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateTask {
|
||||||
|
echo "<================================================>"
|
||||||
|
sqlite3 $DBDIR "
|
||||||
|
UPDATE $DB
|
||||||
|
SET task = '$UPDATEVALUE'
|
||||||
|
WHERE id = $DBID
|
||||||
|
"
|
||||||
|
echo "Task geupdatet"
|
||||||
|
echo "<================================================>"
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateCategory {
|
||||||
|
echo "<================================================>"
|
||||||
|
sqlite3 $DBDIR "
|
||||||
|
UPDATE $DB
|
||||||
|
SET category = '$UPDATEVALUE'
|
||||||
|
WHERE id = $DBID
|
||||||
|
"
|
||||||
|
echo "Kategorie geupdatet"
|
||||||
|
echo "<================================================>"
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateWorktime {
|
||||||
|
echo "<================================================>"
|
||||||
|
sqlite3 $DBDIR "
|
||||||
|
UPDATE $DB
|
||||||
|
SET worktime = '$UPDATEVALUE'
|
||||||
|
WHERE id = $DBID
|
||||||
|
"
|
||||||
|
echo " Arbeitszeit geupdatet"
|
||||||
|
echo "<================================================>"
|
||||||
|
}
|
||||||
|
|
||||||
|
### Reports
|
||||||
|
#### Auslesen aller Heutigen Tasks
|
||||||
|
function dailyReport {
|
||||||
|
echo "<================================================>"
|
||||||
|
day=$(convertDay $(date +%u))
|
||||||
|
echo "Daly Report vom $day - KW $(date +%V)"
|
||||||
|
sqlite3 $DBDIR -column -header "
|
||||||
|
SELECT
|
||||||
|
count(id) AS 'Tasks',
|
||||||
|
time(sum(worktime), 'unixepoch') AS 'Arbeitszeit'
|
||||||
|
FROM $DB
|
||||||
|
WHERE kw = '$(date +%V)'
|
||||||
|
AND day = '$(date +%u)'
|
||||||
|
"
|
||||||
|
echo
|
||||||
|
}
|
||||||
|
|
||||||
|
function weeklyReport {
|
||||||
|
echo "<================================================>"
|
||||||
|
echo "Weekly Report vom KW $(date +%V)"
|
||||||
|
sqlite3 $DBDIR -column -header "
|
||||||
|
SELECT
|
||||||
|
count(id) AS 'Tasks',
|
||||||
|
time(sum(worktime), 'unixepoch') AS 'Arbeitszeit'
|
||||||
|
FROM $DB
|
||||||
|
WHERE kw = '$(date +%V)'
|
||||||
|
"
|
||||||
|
echo
|
||||||
|
}
|
||||||
|
|
||||||
|
function dailyCategoryReport {
|
||||||
|
day=$(convertDay $(date +%u))
|
||||||
|
for i in ${!categories[@]}; do
|
||||||
|
echo "<================================================>"
|
||||||
|
echo "Report für Kategorie: ${categories[i]}"
|
||||||
|
echo "Für $day in KW: $(date +%V)"
|
||||||
|
sqlite3 $DBDIR -column -header "
|
||||||
|
SELECT
|
||||||
|
count(id) AS 'Tasks',
|
||||||
|
time(sum(worktime), 'unixepoch') AS 'Arbeitszeit'
|
||||||
|
FROM $DB
|
||||||
|
WHERE kw = '$(date +%V)'
|
||||||
|
AND day = '$(date +%u)'
|
||||||
|
AND category = '$i'
|
||||||
|
"
|
||||||
|
echo
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
function weeklyCategoryReport {
|
||||||
|
week=$(convertDay $(date +%u))
|
||||||
|
for i in ${!categories[@]}; do
|
||||||
|
echo "<================================================>"
|
||||||
|
echo "Report für Kategorie: ${categories[i]}"
|
||||||
|
echo "In KW: $(date +%V)"
|
||||||
|
sqlite3 $DBDIR -column -header "
|
||||||
|
SELECT
|
||||||
|
count(id) AS 'Tasks',
|
||||||
|
time(sum(worktime), 'unixepoch') AS 'Arbeitszeit'
|
||||||
|
FROM $DB
|
||||||
|
WHERE kw = '$(date +%V)'
|
||||||
|
AND category = '$i'
|
||||||
|
"
|
||||||
|
echo
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
## Abläufe
|
||||||
|
### Prüft ob SQLite3 installiert ist und erstellt eine Datenbank wenn nicht schon vorhanden
|
||||||
|
function checkRequirements {
|
||||||
|
dpkg -l sqlite3
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
echo "Bitte sqlite3 installieren!"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -d $DIR ];then
|
||||||
|
mkdir -r $DIR
|
||||||
|
fi
|
||||||
|
createDB
|
||||||
|
}
|
||||||
|
|
||||||
|
### Start des Trackings und Tätigkeits Abfrage
|
||||||
|
function startTracking {
|
||||||
|
starttime=$(date +%s)
|
||||||
|
echo "<================================================>"
|
||||||
|
echo "Time Tracking gestartet um: $(date +%H:%M)"
|
||||||
|
IFS= read -a doingwords -p "Tätigkeit? `echo $'\n> '`"
|
||||||
|
doing=${doingwords[0]}
|
||||||
|
}
|
||||||
|
|
||||||
|
### Beendet das Tacking und Kategorie Abfrage
|
||||||
|
function endTracking {
|
||||||
|
for i in ${!categories[@]}; do
|
||||||
|
echo "$i. ${categories[i]}"
|
||||||
|
done
|
||||||
|
IFS= read -p "Kategorie? `echo $'\n> '`" category
|
||||||
|
endtime=$(date +%s)
|
||||||
|
worktime=$(($endtime - $starttime))
|
||||||
|
}
|
||||||
|
|
||||||
|
### Erstellt eine Zusammenfassung zu dem eben Bearbeiteten Task
|
||||||
|
#### Verbesserung: Möglichkeit auch Tasks aus der DB erneut auszugeben
|
||||||
|
function printTask {
|
||||||
|
echo "<================================================>"
|
||||||
|
echo "Time Tracking beendet um $(date +%H:%M) - $outputtime"
|
||||||
|
echo "<================================================>"
|
||||||
|
echo "Du hast $outputtime in ${categories[$category]} investiert"
|
||||||
|
echo "<================================================>"
|
||||||
|
echo "Task: $doing"
|
||||||
|
echo "<================================================>"
|
||||||
|
}
|
||||||
|
|
||||||
|
### Aufruf bei -D(atenbank)
|
||||||
|
function showDB {
|
||||||
|
sqlite3 $DBDIR -column -header "SELECT * from $DB"
|
||||||
|
}
|
||||||
|
|
||||||
|
### Aufruf bei -c(onfig) [/path/to/config.file]
|
||||||
|
function config {
|
||||||
|
if [ -f $OPTARG ];then
|
||||||
|
config=$OPTARG
|
||||||
|
echo $config
|
||||||
|
# Datei einlesen; Prüfung was angepasst wurde (DB / DB file / Kategorien); validieren; weiter oder exit.
|
||||||
|
else
|
||||||
|
echo "Dieses Konfigfile existiert nicht"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
### Aufruf bei -e(rase) [DB ID]
|
||||||
|
function erase {
|
||||||
|
if [[ $OPTARG =~ ^[0-9]+$ ]]; then
|
||||||
|
DBID=$OPTARG
|
||||||
|
searchById
|
||||||
|
IFS= read -p "Diesen Eintrag löschen?(y/n) `echo $'\n> '`" DELIT
|
||||||
|
if [ $DELIT == "Y" ] || [ $DELIT == "y" ]; then
|
||||||
|
eraseTask
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "Gib die ID des zu löschenden Tasks ein"
|
||||||
|
echo "Mit '-s' kannst du eine Suche starten"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
### Aufruf bei -h(elp)
|
||||||
|
function printHelp {
|
||||||
|
echo '
|
||||||
|
Benutzung: ./timeTrack.sh [option [argument]]
|
||||||
|
|
||||||
|
Ohne Option wird das Skript für eine Zeitmessung ausgeführt und dann beendet.
|
||||||
|
|
||||||
|
Optionen:
|
||||||
|
-D # Listet die Tabelle der Datenbank auf
|
||||||
|
-c [arg] # Konfigurationsdatei
|
||||||
|
-e [DB ID] # Eintrag aus Tabelle löschen (Siehe -s)
|
||||||
|
-h # Zeigt diese Hilfe
|
||||||
|
-H [option] # Zeigt Detail Hilfe zu der Option
|
||||||
|
-i # Startet eine Aufgaben speicherung mit eigenen Zeiteingaben
|
||||||
|
-l # Startet das Skript im Loop (abbrechen mit Strg + C)
|
||||||
|
-r [type] # Zeigt Reports für [day / week / month / category / ...]
|
||||||
|
-s [string] # Sucht in der Datenbank nach [string] (nur im Aufgaben Feld)
|
||||||
|
-u [DB ID] # Update für bereits vorhandene Einträge in der Datenbank (Siehe -s)
|
||||||
|
'
|
||||||
|
}
|
||||||
|
|
||||||
|
### Aufrug bei -H(elp) [option]
|
||||||
|
function helpTo {
|
||||||
|
case $1 in
|
||||||
|
c)
|
||||||
|
echo '
|
||||||
|
Benutzung: ./timeTrack.sh -c /path/to/my.conf
|
||||||
|
|
||||||
|
Mit der Option -c kann ein eine Konigurationsdatei angegeben werden.
|
||||||
|
In der Konfigurationsdatei können individuelle Parameter übergeben werden:
|
||||||
|
Pfad zur Datenbankdatei:
|
||||||
|
DBDIR="/path/to/file.db" # Vollständigen Pfad angeben
|
||||||
|
|
||||||
|
In der Datenbankdatei die Tabelle festlegen:
|
||||||
|
DB="myTable" # Keine Sonder- oder Leerzeichen
|
||||||
|
|
||||||
|
Eigene Kategorien:
|
||||||
|
categories[0]="Default") # Standard Kategorie
|
||||||
|
categories+=("newCategory") # Hinzufügen einer Kategorie (wiederholbar)
|
||||||
|
'
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
exit
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
### Aufruf bei -i(nsert)
|
||||||
|
function insert {
|
||||||
|
IFS= read -p "Tätigkeit? `echo $'\n> '`" TASK
|
||||||
|
IFS= read -p "Dauer? `echo $'\n> '`" WORKTIME
|
||||||
|
IFS= read -p "Endzeit? `echo $'\n> '`" ENDDATE
|
||||||
|
IFS= read -p "Kategorie? `echo $'\n> '`" CATEGORY
|
||||||
|
}
|
||||||
|
|
||||||
|
### Aufruf bei -r(eport) [Ansicht...]
|
||||||
|
function report {
|
||||||
|
REPORT=$OPTARG
|
||||||
|
clear
|
||||||
|
case $REPORT in
|
||||||
|
day|daily)
|
||||||
|
dailyReport
|
||||||
|
dailyCategoryReport
|
||||||
|
;;
|
||||||
|
week|weekly)
|
||||||
|
weeklyReport
|
||||||
|
weeklyCategoryReport
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
dailyReport
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
### Standard Aufruf
|
||||||
|
function default {
|
||||||
|
checkRequirements
|
||||||
|
clear
|
||||||
|
startTracking
|
||||||
|
endTracking
|
||||||
|
calcWorktime $worktime
|
||||||
|
insertTask "$doing" "$category" "$worktime"
|
||||||
|
clear
|
||||||
|
printTask
|
||||||
|
}
|
||||||
|
|
||||||
|
### Aufruf bei -s(earch) [Suchstring]
|
||||||
|
function search {
|
||||||
|
# Optionen ob damit was gemacht werden soll (Update / Löschen)
|
||||||
|
SEARCH=$OPTARG
|
||||||
|
searchByString
|
||||||
|
}
|
||||||
|
|
||||||
|
### Aufruf bei -u(pdate) [DB ID]
|
||||||
|
function update {
|
||||||
|
# Prüfung ob angaben stimmen, weitere eingaben ändern
|
||||||
|
DBID=$OPTARG
|
||||||
|
searchById
|
||||||
|
echo "
|
||||||
|
1. Datum
|
||||||
|
2. Task
|
||||||
|
3. Kategorie
|
||||||
|
4. Arbeitszeit
|
||||||
|
"
|
||||||
|
IFS= read -p "Was soll geupdatet werden? `echo $'\n> '`" UPDATETYPE
|
||||||
|
IFS= read -p "Was soll eingetragen werden? `echo $'\n> '`" UPDATEVALUE
|
||||||
|
case $UPDATETYPE in
|
||||||
|
1|Datum)
|
||||||
|
updateDate
|
||||||
|
;;
|
||||||
|
2|Task)
|
||||||
|
updateTask
|
||||||
|
;;
|
||||||
|
3|Kategorie)
|
||||||
|
updateCategory
|
||||||
|
;;
|
||||||
|
4|Arbeitszeit)
|
||||||
|
updateWorktime
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Falsche angabe"
|
||||||
|
exit
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
## Umwandlung / Umrechnung
|
||||||
|
### Rechnet die Sekunden in Stunden und Minuten um
|
||||||
|
function calcWorktime {
|
||||||
|
if [ $1 -ge 3600 ]; then
|
||||||
|
hworktime=$((worktime / 3600))
|
||||||
|
mworktime=$(((worktime % 3600) / 60))
|
||||||
|
gmworktime=$((worktime / 60))
|
||||||
|
outputtime="$gmworktime min ($hworktime:$mworktime H)"
|
||||||
|
else
|
||||||
|
gmworktime=$((worktime / 60))
|
||||||
|
outputtime="$gmworktime min"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
function convertDay {
|
||||||
|
case $1 in
|
||||||
|
1)
|
||||||
|
echo "Montag"
|
||||||
|
;;
|
||||||
|
2)
|
||||||
|
echo "Dienstag"
|
||||||
|
;;
|
||||||
|
3)
|
||||||
|
echo "Mittwoch"
|
||||||
|
;;
|
||||||
|
4)
|
||||||
|
echo "Donnerstag"
|
||||||
|
;;
|
||||||
|
5)
|
||||||
|
echo "Freitag"
|
||||||
|
;;
|
||||||
|
6)
|
||||||
|
echo "Samstag"
|
||||||
|
;;
|
||||||
|
7)
|
||||||
|
echo "Sonntag"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
# Argumente auslesen
|
||||||
|
#===============================
|
||||||
|
while getopts "Dc:e:hH:ilr:s:Tu:" opt; do
|
||||||
|
case $opt in
|
||||||
|
D)
|
||||||
|
showDB
|
||||||
|
exit
|
||||||
|
;;
|
||||||
|
c)
|
||||||
|
config
|
||||||
|
exit
|
||||||
|
;;
|
||||||
|
e)
|
||||||
|
erase
|
||||||
|
exit
|
||||||
|
;;
|
||||||
|
h)
|
||||||
|
printHelp
|
||||||
|
exit
|
||||||
|
;;
|
||||||
|
H)
|
||||||
|
helpTo $OPTARG
|
||||||
|
exit
|
||||||
|
;;
|
||||||
|
i)
|
||||||
|
insert
|
||||||
|
exit
|
||||||
|
;;
|
||||||
|
l)
|
||||||
|
while true; do
|
||||||
|
default
|
||||||
|
done
|
||||||
|
;;
|
||||||
|
r)
|
||||||
|
report
|
||||||
|
exit
|
||||||
|
;;
|
||||||
|
s)
|
||||||
|
search
|
||||||
|
exit
|
||||||
|
;;
|
||||||
|
T)
|
||||||
|
# Testing
|
||||||
|
results=($(sqlite3 $DBDIR "
|
||||||
|
SELECT *
|
||||||
|
FROM $DB
|
||||||
|
"))
|
||||||
|
|
||||||
|
#for i in ${!results[@]}; do
|
||||||
|
for i in "${!results[@]}"; do
|
||||||
|
echo "<================================================>"
|
||||||
|
echo "Test für: ${results[i]}"
|
||||||
|
|
||||||
|
echo "Record No. $i: ${results[$i]}"
|
||||||
|
|
||||||
|
|
||||||
|
fieldA=${results[0]};
|
||||||
|
fieldB=${results[1]};
|
||||||
|
fieldC=${results[2]};
|
||||||
|
fieldD=${results[3]};
|
||||||
|
|
||||||
|
done
|
||||||
|
|
||||||
|
echo $fieldA $fieldB $fieldC $fieldD
|
||||||
|
exit
|
||||||
|
;;
|
||||||
|
u)
|
||||||
|
update
|
||||||
|
exit
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
exit
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
default
|
||||||
Reference in New Issue
Block a user