Commit Graph

72 Commits

Author SHA1 Message Date
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
Tim Gröger e42a97eca4 change return of addAmount in baruser for new frontend 2020-01-14 20:00:37 +01:00
Tim Gröger d0a9345d68 added EmailController
with the emailController you can send automaticly emails, if a user is over the limit or if the finanzer send the emails
the configparser is updated. So you have to set database and ldapconfig. if accestokenlifetime and mailconfig is not set, the parser set default values.
2020-01-05 14:15:02 +01:00
Tim Gröger 9f40d2c93b fixed #107
getUserData "from ldap" is now surrounded with try
2019-12-31 13:06:40 +01:00
Tim Gröger 7a95fb9d32 added a Configparser 2019-12-30 09:22:43 +01:00
Tim Gröger 3a5d7d7d0f fixed that baruser get endsum not only from month 2019-12-29 21:57:59 +01:00
Tim Gröger 16e50ea751 finanzer can add user from LDAP to DB
bug fixes
2019-12-29 21:36:42 +01:00
Tim Gröger 92c2c95a34 update to lock user and if bar user add a locked user, he see it 2019-12-29 17:55:21 +01:00
Tim Gröger 5607ec72f7 update userControler, databaseController, ldapControlle and user for locking user 2019-12-28 23:34:09 +01:00
Tim Gröger 5fd734dc4e update finanzer routes
if finanzer add credit or amount to a user, he get all creditList of all years of the user
2019-12-28 22:40:33 +01:00
Tim Gröger 6ee6c1d44a update for UnitTests
new controller: userController
so routes don't have to import users or creditlist and don't do logics.
2019-12-28 21:52:49 +01:00
Tim Gröger 5b37e3d15b update token validatition
no second thread to validate for token ... only on access it will be validate
2019-12-28 11:31:45 +01:00
Tim Gröger a052add057 Merge branch 'feature/ldap' into develop 2019-12-27 19:54:13 +01:00
Tim Gröger d0f665cc8b first usable site
only 2 groups exists: bar and finanzer
person can be in more than 1 group

site for baruser first try with autocomplete from ldap
site for finanzer ; overview; specialview for 1 Person
2019-12-26 10:28:30 +01:00
Tim Gröger 19ff9db9df Merge branch 'feature/ldap' of 192.168.5.2:newgeruecht into feature/ldap
 Conflicts:
	geruecht/baruser/routes.py
2019-12-22 23:12:31 +01:00
Tim Gröger 589ae3e3a8 ldap search 2019-12-22 23:09:18 +01:00
Tim Gröger 23db38690e fixed #79 and other bugs 2019-12-22 22:27:39 +01:00
Tim Gröger c6508fd516 test with databaseController 2019-12-19 19:46:04 +01:00