Flaschengeist/flaschengeist
Flaschengeist
/
flaschengeist
7
0
Fork 0
Code Issues 20 Pull Requests Packages Projects Releases 2 Wiki Activity
110 Commits 12 Branches 5 Tags 2.5 MiB
Commit Graph

110 Commits

Author SHA1 Message Date
Tim Gröger 5835cec4a4 Merge branch 'feature/jobkind' into develop 2020-06-04 13:20:45 +02:00
Tim Gröger fd2c9a2a7e diensteinladung und übertragung fertig. User können leute einladen, sich austragen, jobs abgeben usw. 
user können sehen, wenn es neue nachrichten gibt und sehen ob die einladung bzw. anfrage gesehen wurde.
 2020-06-04 13:19:00 +02:00
Tim Gröger b0f09969a5 user kann jobrequest updaten, erstellen oder löschen 2020-06-02 23:24:17 +02:00
Tim Gröger dcc9c5ee14 fix, dass keine job_kinddates gespeichert werden, wo kein job_kind existiert. 2020-05-27 15:05:19 +02:00
Tim Gröger efa0257cd0 user können sich einladen, und austragen, jobinvites können geupdated werden 2020-05-27 12:10:51 +02:00
Tim Gröger 7bd7acc6bf routes für user erweitert, sodass sich der user in einen bestimmten dienst einschreiben kann. 2020-05-24 22:12:46 +02:00
Tim Gröger 2ef50fbefd vorstand can set job_kinds for day with max persons 
extern user can be set
if job_kind is delete, all jobs are deleted for this date and job_kind
 2020-05-22 21:55:14 +02:00
Tim Gröger 7ce8fef278 vorstand can change the group for jobkind 2020-05-17 21:18:56 +02:00
Tim Gröger 04d6254262 vorstand can create, edit or delete job_kinds 2020-05-17 20:21:22 +02:00
Tim Gröger 41b6a2e530 Merge branch 'feature/workgroups' into develop 2020-05-17 13:48:04 +02:00
Tim Gröger 27981efedf finished ##247 and ##253 
fixed bug that user can't add negative amount.
 2020-05-17 13:35:33 +02:00
Tim Gröger c9fe61b1dc finished ##250 and ##249 2020-05-16 23:25:44 +02:00
Tim Gröger 381cc1c028 add some gitignore 2020-05-15 12:56:22 +02:00
Tim Gröger caee854c48 Merge branch 'feature/lockbar' into develop 2020-05-15 12:52:08 +02:00
Tim Gröger 3752026e22 fixed bugs 
send not absolute values in baruser
set lockedbar is not an array
 2020-05-11 23:07:26 +02:00
Tim Gröger 987487d3c4 add routes to valid barlock 2020-03-17 20:37:01 +01:00
Tim Gröger 25059064ee Merge branch 'servicemanagement' into develop 2020-03-13 19:08:20 +02:00
Tim Gröger 2f756983c2 add route for user for ##222 2020-03-13 19:06:24 +02:00
Tim Gröger b4d648530e fixed ##225 and ##226 2020-03-12 10:16:50 +01:00
Tim Gröger cc692bb82c add route /sm/getUsers 
updatet usercontroller for getUsers
updatet getLockedDay -> only the day what requestet will be locked (if nessecerie)
 2020-03-11 18:32:57 +01:00
Tim Gröger 8900367a3e Merge branch 'feature/logging' into develop 2020-03-10 19:24:07 +01:00
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