diff --git a/.gitignore b/.gitignore index c23faec..966ab60 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +dump.rdb media/agencymain/* media/agencydata/* !media/default.jpg diff --git a/dump.rdb b/dump.rdb index 617322c..0464ed8 100644 Binary files a/dump.rdb and b/dump.rdb differ diff --git a/timemanagement/templates/timemanagement/realtime_dropdown.html b/timemanagement/templates/timemanagement/realtime_dropdown.html index 19fd610..40c2f60 100644 --- a/timemanagement/templates/timemanagement/realtime_dropdown.html +++ b/timemanagement/templates/timemanagement/realtime_dropdown.html @@ -195,7 +195,8 @@ Gleitzeitkonto: }); } - function endBreak(){ + function endBreak() + { isbreak = false; $("#timemanagement_clock").click(function(e){ e.stopPropagation(); @@ -213,10 +214,10 @@ Gleitzeitkonto: action : "end_break", }, success: function( data ) - { + { + console.log("break end add " + data["actualbreaktime"]); breaktime = data["actualbreaktime"]; $("#breaksum").html(convertMS(data["actualbreaktime"])); - } }); } diff --git a/users/templates/users/base.html b/users/templates/users/base.html index b1d76f7..517f19a 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -357,7 +357,7 @@ Impressum

- Version 1.0.4 + Version 1.0.5