bofh/baroness
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
55 Commits 1 Branch 0 Tags
042d0c86fa891c5ab747654e126f3f07d77ef402
Commit Graph

55 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ulrich Knechtelsdorfer
042d0c86fa - add: support for multible rfid tags 2016-05-28 17:10:07 +02:00
Bernhard Stampfer
33676b6c94 - new: 3d printable case 2016-05-26 16:10:42 +02:00
Bernhard Stampfer
ccb505c771 - fix: missing fridges template 2016-05-07 21:09:45 +02:00
Bernhard Stampfer
eff47b8c42 - removed ipdb from imports 2016-05-07 21:03:57 +02:00
Bernhard Stampfer
5e581293a6 Merge branch 'master' of https://github.com/ulrichknecht/baroness 2016-05-07 20:52:09 +02:00
Bernhard Stampfer
54ce22c0c1 add: log messages woth python module 'logging' instead of print 2016-05-07 20:51:06 +02:00
Bernhard Stampfer
d124755c88 add: fridges view, fridge+sensor class, plot function, generator for test data 2016-05-07 20:48:31 +02:00
Bernhard Stampfer
fba306db5a fix: viewport for mobile devices, resizing of bierliste image for mobile view 2016-05-07 19:53:27 +02:00
Martin Mosbeck
3948404fc1 TODO updated with Berni & Minor fix in send_email.py 2016-05-07 18:08:02 +02:00
Bernhard Stampfer
2f4ddc84a5 fix: remember: always call wx stuff from wx main thread (with wx.CallAfter) 2016-04-17 21:01:39 +02:00
Bernhard Stampfer
99257f87ee - fix: bug in views(billing_personal) and plot (min width) 2016-04-10 20:44:20 +02:00
Bernhard Stampfer
0afba6bcd6 Merge branch 'master' of https://github.com/ulrichknecht/baroness 2016-04-10 19:51:02 +02:00
Bernhard Stampfer
e80fdeec05 - some changes in the plot, removed todo messages in web if 2016-04-10 19:48:35 +02:00
Bernhard Stampfer
f55fa181ba - added RFID tag reading with the MFRC522 lib 2016-04-10 19:46:20 +02:00
Ulrich Knechtelsdorfer
65c51e2b71 - add autoblack 2016-04-08 20:23:47 +02:00
Ulrich Knechtelsdorfer
9cf32cc82a - add paying 2016-04-06 23:38:48 +02:00
Ulrich Knechtelsdorfer
10f6eea47a - fix: rename wx.Color to Colour because of new wx version 2016-04-06 22:47:40 +02:00
Ulrich Knechtelsdorfer
024d38bad6 merge email sending 
Merge branch 'master' of https://github.com/ulrichknecht/baroness
 2016-04-06 22:39:48 +02:00
Ulrich Knechtelsdorfer
0bd185482d - add sending of emails (works except dept) 2016-04-06 22:38:56 +02:00
Bernhard Stampfer
cd38d16430 - added: database: get_debt(name) and views for it 2016-03-26 21:09:17 +01:00
Bernhard Stampfer
8469f00884 - Gui: take settings from settings file, show pictures of drinks 2016-03-26 21:01:47 +01:00
Bernhard Stampfer
d7e2a0d29d - added a settings file, the settings are a python class 2016-03-09 22:51:34 +01:00
Bernhard Stampfer
d0ba8d12f8 - fix: GUI image 1px shifted 2016-02-28 23:17:07 +01:00
Bernhard Stampfer
2ee9089583 - added deposits 2016-02-26 18:07:31 +01:00
Bernhard Stampfer
70774e892b - added product photos, some stuff on personal page 2016-02-26 17:22:17 +01:00
Bernhard Stampfer
c0d9cf8ff0 - added lists on personal page 2016-02-26 14:24:46 +01:00
Ulrich Knechtelsdorfer
c241e4d244 - add billing pages without function 
only the blank html pages were added and the path was set in views.py
 the actual email functionality has to be added
 2016-02-24 00:15:13 +01:00
Bernhard Stampfer
0dd059d627 - plots generated in sperate thread, gui slightly altered 2016-02-23 19:25:48 +01:00
Bernhard Stampfer
960af54b0d - decreased # of DB queries for plotting 2016-02-23 16:04:21 +01:00
Bernhard Stampfer
4491c0d749 - modified GUI, added 'sorry bro' page, moved gui PNGs 2016-02-23 16:03:03 +01:00
Bernhard Stampfer
9b8da27c61 - fix: replaced EVT_BUTTON with EVT_LEFT_DOWN for touchscreen performance 2016-02-23 15:02:36 +01:00
Bernhard Stampfer
2782207c4c - updated todo.md 2016-02-22 00:40:53 +01:00
Bernhard Stampfer
63dc812096 - web-if and gui now respect isshown and isblack flags 2016-02-20 19:03:31 +01:00
Bernhard Stampfer
2ad94b8753 - added stylesheet entries for tables/forms, small changes to templates 2016-02-20 18:32:33 +01:00
Bernhard Stampfer
c51340fa6e - added password salt/hash with python-bcrypt (install it!), updated database 2016-02-18 17:28:22 +01:00
Bernhard Stampfer
eed21dd917 - bugfix in plot.py current day was not plotted 2016-02-18 15:44:25 +01:00
Bernhard Stampfer
be95db1823 - modified web interface: added stylesheet, personal page and divs; 2016-02-18 15:18:11 +01:00
Bernhard Stampfer
476d1b1273 - extended the gui implementation 2016-02-17 17:09:39 +01:00
Bernhard Stampfer
0812abf766 Merge branch 'master' of https://github.com/ulrichknecht/baroness 
Conflicts:
	test/database.db
 2016-02-16 21:35:34 +01:00
Bernhard Stampfer
ae1dafc67b - database with many test consumptions and users 2016-02-16 21:29:37 +01:00
Bernhard Stampfer
63d49396b2 - added beer diagram, generatiors for test consumtions 2016-02-16 21:28:45 +01:00
MartinMosbeck
63338e8447 Removed not implemented isadmin in Users 
Signed-off-by: MartinMosbeck <martin.mosbeck@gmx.at>
 2016-02-16 12:30:47 +01:00
MartinMosbeck
5712fbeb52 Database clean up and documentation 
Made database.txt to database.sql with sql comments
Now the database.sql can be used to create a database
Added more documentation in database.sql
Simplified test data for inserts
Clean style for SQL commands
Added Foreign Key Constraints

Question: table Users: isbaron & isadmin same? or 2 columns needed?

Signed-off-by: MartinMosbeck <martin.mosbeck@gmx.at>
 2016-02-16 11:25:55 +01:00
Ulrich Knechtelsdorfer
dc129b04ee - add pdf file with gui sketches 2016-02-15 22:01:03 +01:00
Ulrich Knechtelsdorfer
f349bfd6d6 - add static/*.png to .gitignore 2016-02-15 21:40:02 +01:00
Ulrich Knechtelsdorfer
7d921cbf2b Merge branch 'master' of https://github.com/ulrichknecht/baroness 2016-02-15 21:38:17 +01:00
Ulrich Knechtelsdorfer
19da96a05c - add: isshown to test database 2016-02-15 21:34:39 +01:00
MartinMosbeck
06df4d8daa Changes to .gitignore 
pyc files are now ignored
deleted the files from project

Signed-off-by: MartinMosbeck <martin.mosbeck@gmx.at>
 2016-02-15 21:30:26 +01:00
Ulrich Knechtelsdorfer
1263750a99 - add TODO.md 
- add some README
 2016-02-15 21:08:53 +01:00
ulrichknecht
b56488e7fe Merge pull request #1 from bernis/master 
- add: Beer plot over time
 2016-02-15 20:35:47 +01:00