Commit Graph

239 Commits

Author SHA1 Message Date
Tim Gröger 804eba1abd finished ##215
only database controlle is left for debugging
2020-03-10 19:23:52 +01:00
Gröger f029aa6096 replace string with '{{}}' to '{{ {} }}' for logging
fixed missing values (bugs that crash)
2020-03-10 11:08:24 +01:00
Tim Gröger ba5f033981 new logger implementet -- not ready
logger dont create folder to log
model and controller (except userController) not ready
2020-03-10 09:19:11 +01:00
Tim Gröger 57f0f17a90 add new logger 2020-03-09 19:54:51 +01:00
Tim Gröger 39095af891 finished ##218 2020-03-07 14:56:44 +01:00
Tim Gröger 0d1c116da7 fixed bug that deleteWorker has access from `vorstand` 2020-03-05 21:24:32 +01:00
Tim Gröger e0c3581a4c fixed ##193 2020-03-04 21:38:21 +01:00
Tim Gröger abe081c589 finished ##213 2020-03-04 21:11:41 +01:00
Tim Gröger 068da1e57b finished ##208 2020-03-03 22:33:47 +01:00
Tim Gröger 708ecb1aa6 fixed bug ##206 bug fix that the 2020-03-01 21:44:38 +01:00
Tim Gröger c52eca58c5 Merge branch 'feature/pricelist' into develop 2020-03-01 20:07:10 +01:00
Tim Gröger 71c850c8c6 finished ##172
add, edit, delete drinks in pricelist

add, edit, delete drinkTypes
2020-03-01 19:20:47 +01:00
Tim Gröger 3e61893baf finished ##203 2020-02-27 21:55:00 +01:00
Tim Gröger f296986924 finished ##201
api that user can storno transaction
2020-02-27 15:53:49 +01:00
Tim Gröger fcc76a639f Merge branch 'feature/ssl_email' into develop 2020-02-27 15:05:35 +01:00
Tim Gröger f3e2ef2515 finished ##171 2020-02-27 15:01:41 +01:00
Tim Gröger 11dcffd3f3 Merge branch 'feature/ssl_email' into develop 2020-02-26 23:08:46 +01:00
Tim Gröger ff2df817a3 finished ##179 2020-02-26 23:03:02 +01:00
Tim Gröger 358826e8c4 try to update userdata in database from ldap when getAllUsersFromDB is executed 2020-02-26 22:49:23 +01:00
Tim Gröger 80fbe2b759 finished ##177 2020-02-26 22:13:44 +01:00
Tim Gröger 89ad67de39 Merge branch 'feature/serviceMangement' into develop 2020-02-26 20:14:03 +01:00
Tim Gröger 90d503f6aa finished ##169 and ##170 (without config.yml) 2020-02-25 22:50:32 +01:00
Tim Gröger 4e91587731 finished ##193
route for user to delete job, but only if day not locked
fixed a bug, that the month start on the first wednesday in month and ended in first tuesday in nextmonth
2020-02-24 18:55:57 +01:00
Tim Gröger 61b9f7001a finished ##187 2020-02-24 12:19:52 +01:00
Tim Gröger 12ca655d02 finished ##185 2020-02-23 22:31:22 +01:00
Tim Gröger 65d09225b1 finished ##189
it test if the date is lower or equal then date now
if true the month will be locked in soft mode
if one day exists in database the status of locked will not change
2020-02-23 21:27:03 +01:00
Tim Gröger 576002a95c fixed ##190 2020-02-23 11:46:38 +01:00
Tim Gröger e00f93881f Merge remote-tracking branch 'origin/feature/serviceMangement' into feature/serviceMangement 2020-02-23 11:21:58 +01:00
Tim Gröger 9a5c7e8366 finished ##188
update routes in vorstand and user. You have to Parse day, month, and year. Datetime ist set to 12 o'clock
2020-02-23 11:21:09 +01:00
Tim Gröger 77931a48c6 finished ##188
for sm only send year, month, day. But you have to decrement month to send, because month starts with 0.
Also you have to increment month to get.
2020-02-23 11:18:54 +01:00
Tim Gröger e3bf18a927 finished ##168 2020-02-22 11:15:20 +01:00
Tim Gröger e1b0d46771 Merge branch 'feature/storno' into develop 2020-02-19 23:15:21 +01:00
Tim Gröger 7038928e49 route for baruser to storno, ##164 2020-02-19 23:13:13 +01:00
Tim Gröger 0035a2517d fixed ##178, no strange symbol in emails 2020-02-19 23:10:19 +01:00
Tim Gröger ee65f12d7e fixed ##86, no strange symbol in emails 2020-02-19 21:47:44 +01:00
Tim Gröger 69c4c98192 required libs for backend in required.txt 2020-01-29 23:24:02 +01:00
Tim Gröger 0ab9da4736 Merge branch 'feature/ldap' into develop 2020-01-27 20:18:24 +01:00
Tim Gröger 3dca45f12e add new route for user, so he can see, when he has jobs 2020-01-27 20:16:04 +01:00
Tim Gröger ca1f2259c5 better return value when change ldap entrys 2020-01-26 23:54:18 +01:00
Tim Gröger 16521a60c2 added ldap modifying for users 2020-01-26 23:31:22 +01:00
Tim Gröger c76ed6d6da pushup 2020-01-23 23:27:26 +01:00
Tim Gröger 59a6440c31 added flask ldapconn, fixed bug in login 2020-01-21 06:54:35 +01:00
Tim Gröger f7d3b17680 Merge branch 'feature/dienstverwaltung' into develop 2020-01-19 21:33:58 +01:00
Tim Gröger 635051d615 change database controller without multithreading 2020-01-19 21:32:58 +01:00
Tim Gröger f782be934d added decoratos for connected in database and login_requird in routes 2020-01-19 09:07:45 +01:00
Tim Gröger 29f20b2327 fixed imports, bugfix that accLifetime will load from config file 2020-01-19 00:37:40 +01:00
Tim Gröger 754f373cb0 add addWorker and deletWorker 2020-01-18 23:31:49 +01:00
Tim Gröger d61a97387c Merge branch 'feature/user' into develop 2020-01-17 22:15:30 +01:00
Tim Gröger 7794910754 add certs for ssl in development mode 2020-01-17 22:12:08 +01:00
Tim Gröger 214f389fe2 added normal user 2020-01-17 01:05:58 +01:00