Commit Graph

91 Commits

Author SHA1 Message Date
Johannes Theiner 3e9b38522a Merge remote-tracking branch 'origin/SPM-26' 2019-05-28 16:48:39 +02:00
Johannes Theiner 614f4b29ba merge missed one 2019-05-28 16:42:32 +02:00
Johannes Theiner f15ea28af3 Merge remote-tracking branch 'origin/SPM-24' 2019-05-28 16:40:06 +02:00
Johannes Theiner db3328f704 Merge remote-tracking branch 'origin/SPM-30' 2019-05-28 16:01:14 +02:00
Johannes Theiner 398c54fa8e Merge remote-tracking branch 'origin/SPM-11' 2019-05-28 15:31:31 +02:00
edgar 987d2a84a8 GUI Marketingmaßnahmen 2019-05-28 15:28:05 +02:00
Julian Hinxlage 3e42b63290 ~set color for chart labels to black 2019-05-28 15:22:39 +02:00
Johannes Theiner 005bc14a93 Merge remote-tracking branch 'origin/SPM-31' 2019-05-28 15:13:09 +02:00
Karsten aa0a170ef6 Unused Code removed 2019-05-28 15:10:43 +02:00
Karsten f05c267efc GUI for Shopping Cart Analysis rewritten 2019-05-28 15:08:43 +02:00
Julian Hinxlage 1ae6204a40 ~week-overview proper labeling and scaling 2019-05-28 15:08:39 +02:00
Johannes Theiner cdd93d7e64 merge SPM-14 2019-05-28 14:08:54 +02:00
Johannes Theiner 3fe24bb609 Merge remote-tracking branch 'origin/SPM-10' 2019-05-28 11:54:33 +02:00
Julian Hinxlage c113b9cda7 +cluster table clear before updating 2019-05-27 17:52:25 +02:00
Julian Hinxlage 2f36e1a4d3 +proper layout for Cluster Table 2019-05-27 17:33:56 +02:00
Johannes Theiner a52cbefd9a Revert "+ working version"
This reverts commit b6f02e255f.
2019-05-27 09:36:59 +02:00
Johannes Theiner b6f02e255f + working version
Signed-off-by: Johannes Theiner <j.theiner@live.de>

#SPM-27: add work 6h development
2019-05-27 09:31:35 +02:00
Julian Hinxlage c087ed7706 + table for clusters (gui) 2019-05-27 09:06:04 +02:00
Karsten 1b9e4884dc GUI for Shopping Cart Analysis done 2019-05-26 20:35:50 +02:00
Johannes Theiner 20a3743ec2 working version
Signed-off-by: Johannes Theiner <j.theiner@live.de>
#SPM-26: add work #3h development
2019-05-25 17:10:25 +02:00
Johannes Theiner 160808e10f Merge remote-tracking branch 'origin/SPM-25' 2019-05-25 13:30:48 +02:00
Johannes Theiner 3fa8de6df4 ~ small fixes and code cleanup
Signed-off-by: Johannes Theiner <j.theiner@live.de>

#SPM-31: add work 20m testing
2019-05-24 08:13:30 +02:00
Johannes Theiner 441cf59a4f ~ someone removed the password parameter
Signed-off-by: Johannes Theiner <j.theiner@live.de>

#SPM-25: add work 20m testing
2019-05-24 07:50:49 +02:00
edgar e24a6147a5 Login working and commented.
Logout working and commented but not linked.
Authentication working and commented.
2019-05-23 18:52:38 +02:00
edgar 398909615e Login working and commented.
Logout working and commented but not linked.
Authentication working and commented.
2019-05-23 18:46:34 +02:00
Johannes Theiner f8c1eb9362 Merge branch 'SPM-22' 2019-05-23 15:35:28 +02:00
Johannes Theiner 115950bf23 + readme
+ sonarqube integration
+ removed unnecessary stuff
2019-05-23 15:15:30 +02:00
Julian Hinxlage 243eb1c7f9 + error messages for file upload 2019-05-21 16:55:35 +02:00
Johannes Theiner 6d9aa153fb ~ small changes to look
#SPM-22: add work 20m development
2019-05-21 14:45:20 +02:00
edgar ba1ee2d06c Login 2019-05-20 17:08:47 +02:00
Johannes Theiner 76a54ed93c Working article ranking
Signed-off-by: Johannes Theiner <j.theiner@live.de>

#SPM-22: add work 4h development
2019-05-18 14:56:07 +02:00
Johannes Theiner 0f25f4e2d9 Merge remote-tracking branch 'origin/SPM-28' 2019-05-18 12:39:29 +02:00
Johannes Theiner fb607592a6 Merge remote-tracking branch 'origin/SPM-28' into SPM-22 2019-05-18 12:37:44 +02:00
Johannes Theiner 41ae0c46e7 ~ removed unusable variables 2019-05-16 15:45:58 +02:00
Johannes Theiner ad0e2040ee ~ testing correct stuff again
#SPM-14: add work #20m testing
2019-05-16 15:24:39 +02:00
Julian Hinxlage e6d56675d3 ~changed WeekOverview to use Costumer count instead of Artikel count 2019-05-16 14:56:02 +02:00
Johannes Theiner d58de232f2 ~ colors
#SPM-28: add work 10m development
2019-05-16 14:54:11 +02:00
Johannes Theiner ce5e3a1f27 merge 2019-05-16 13:25:56 +02:00
Johannes Theiner 6f5eb4b24f + add upload date to file selection
+ select latest file if no selection is provided

#SPM-28: add work 1h 20m development
2019-05-16 09:32:58 +02:00
Johannes Theiner e67c305322 + documentation
Signed-off-by: Johannes Theiner <j.theiner@live.de>
#SPM-28: add work 1h documentation
2019-05-15 20:41:09 +02:00
Johannes Theiner d237b78ba1 + working version
#SPM-28: add work 2h development
2019-05-15 15:14:54 +02:00
Johannes Theiner cf7500f472 ~ changed values around
#SPM-18: add work 30m development
2019-05-14 15:30:16 +02:00
Johannes Theiner dd2e5b768c + timeouts for testcases
#SPM-23: add work 30m testing
2019-05-13 18:13:12 +02:00
Johannes Theiner 20f13467c6 + test cases
#SPM-23: add work 20m testing
2019-05-13 16:49:17 +02:00
Johannes Theiner 66305b51d1 + documentation
~ cleanup

Signed-off-by: Johannes Theiner <j.theiner@live.de>

#SPM-18: add work 1h documentation
2019-05-10 20:32:03 +02:00
Johannes Theiner 303fad71d8 + day selector
~correct values for shopping times & week overview
#SPM-18: add work 4h development
2019-05-09 18:14:43 +02:00
Johannes Theiner ee14f2b295 + started work
Signed-off-by: Johannes Theiner <j.theiner@live.de>
#SPM-18: add work 20m development
2019-05-08 21:15:52 +02:00
Johannes Theiner cdb743ca0a Merge branch 'SPM-11' of Studium/Softwareprojektmanagement into master 2019-05-08 16:42:34 +00:00
Johannes Theiner 0b36985e6c + Working WeekOverview
+ Cleanup
+ Documentation

Signed-off-by: Johannes Theiner <j.theiner@live.de>

#SPM-11: add work 2h development
#SPM-11: add work 30m documentation
2019-05-08 14:12:44 +02:00
Johannes Theiner c34639bd3a + working version
Signed-off-by: Johannes Theiner <j.theiner@live.de>
#SPM-11: add work h development
2019-05-07 21:34:59 +02:00