]> rtime.felk.cvut.cz Git - coffee/coffee-flask.git/log
coffee/coffee-flask.git
5 years agoAttempt to sanitize the JS code + fix few bugs
Michal Sojka [Tue, 14 Aug 2018 22:38:17 +0000 (00:38 +0200)]
Attempt to sanitize the JS code + fix few bugs

The problems solved by this commit:

- When another user logs in during logout timeout, he was logged out
  automatically, even before choosing a coffee.

- Logout timer was not shown always when it should. After choosing a
  coffee, the timer was shown for a while. Then, after the user page
  was reloaded from the server, the timer disappeared and after an
  elapsed second, the timer was shown again.

- Local debug area was not shown and hidden consistently.

The first problem was resolved by canceling the logout timer after
login. The last two problems were fixed by centralizing of the UI
updates to a single function, which does the update based on the value
of state variables.

5 years agoRemove unnecessary condition
Michal Sojka [Tue, 14 Aug 2018 21:54:01 +0000 (23:54 +0200)]
Remove unnecessary condition

The same condition is already in addCoffee()

5 years agoSimplify timer-triggered logout call
Michal Sojka [Tue, 14 Aug 2018 21:28:34 +0000 (23:28 +0200)]
Simplify timer-triggered logout call

5 years agoUnify logout button spelling and layout
Michal Sojka [Tue, 14 Aug 2018 21:25:04 +0000 (23:25 +0200)]
Unify logout button spelling and layout

Changes:

- Logout button text is always in small caps (both initial value from
  HTML and modified value from JavaScript).
- Position of the "logout" text is always the same - when we add a
  line with seconds counter below, we have to add also a line above.

5 years agoAdd function automatic logout
Tomas Prochazka [Tue, 14 Aug 2018 07:47:57 +0000 (09:47 +0200)]
Add function automatic logout

If the user makes a coffee, the user will logout automatically in 10 second.

5 years agoDo not show zeros in the taste graph
Michal Sojka [Fri, 10 Aug 2018 11:56:56 +0000 (13:56 +0200)]
Do not show zeros in the taste graph

5 years agoReformat
Michal Sojka [Fri, 10 Aug 2018 11:50:13 +0000 (13:50 +0200)]
Reformat

5 years agoShowing the total number different coffee flavor in chart
Tomas Prochazka [Fri, 10 Aug 2018 11:40:29 +0000 (13:40 +0200)]
Showing the total number different coffee flavor in chart

5 years agoFix axis-Y only integer numbers show
Tomas Prochazka [Fri, 10 Aug 2018 10:35:48 +0000 (12:35 +0200)]
Fix axis-Y only integer numbers show

5 years agoReformat with autopep8
Michal Sojka [Fri, 10 Aug 2018 09:04:21 +0000 (11:04 +0200)]
Reformat with autopep8

5 years agoFix color graph history for different flavors coffee
Tomas Prochazka [Fri, 10 Aug 2018 07:02:37 +0000 (09:02 +0200)]
Fix color graph history for different flavors coffee

5 years agoPlot x axis labels in local variable
Jiri Hubacek [Fri, 10 Aug 2018 08:58:56 +0000 (08:58 +0000)]
Plot x axis labels in local variable

5 years agoIncrease the size of the logout button
Jiri Hubacek [Thu, 9 Aug 2018 14:09:51 +0000 (14:09 +0000)]
Increase the size of the logout button

5 years agoUse day abbreviations instead of numbers for days
Jiri Hubacek [Thu, 9 Aug 2018 13:26:20 +0000 (13:26 +0000)]
Use day abbreviations instead of numbers for days

The originally meant x axis description may be accomplished by using

    plt.xticks(range(len(days)), days)

instead of

    plt.xticks(range(len(days)), xdays)

5 years agoMake on-screen buttons work only once after card swipe
Michal Sojka [Wed, 8 Aug 2018 11:36:32 +0000 (13:36 +0200)]
Make on-screen buttons work only once after card swipe

Now, even if a user does not log out, there is no way for somebody
else to charge coffees on their behalf.

5 years agoBetter guidance for users
Michal Sojka [Wed, 8 Aug 2018 07:58:39 +0000 (09:58 +0200)]
Better guidance for users

5 years agoDeploy without pushing to central server
Michal Sojka [Wed, 8 Aug 2018 11:11:59 +0000 (13:11 +0200)]
Deploy without pushing to central server

This makes testing easier.

5 years agoShow public address of git repository
Michal Sojka [Wed, 8 Aug 2018 07:47:08 +0000 (09:47 +0200)]
Show public address of git repository

5 years agoUpdate 'Hack me' section
Michal Sojka [Tue, 7 Aug 2018 13:27:50 +0000 (15:27 +0200)]
Update 'Hack me' section

5 years agoAdd Makefile with deploy target
Michal Sojka [Tue, 7 Aug 2018 13:26:18 +0000 (15:26 +0200)]
Add Makefile with deploy target

5 years agoUpdate html
Michal Sojka [Tue, 7 Aug 2018 13:23:52 +0000 (15:23 +0200)]
Update html

5 years agoMake figures fit on screen
Michal Sojka [Tue, 7 Aug 2018 13:23:30 +0000 (15:23 +0200)]
Make figures fit on screen

5 years agoUpdate web pages a bit
Michal Sojka [Tue, 7 Aug 2018 13:07:11 +0000 (15:07 +0200)]
Update web pages a bit

5 years agoOlder sqlite complains about 'true' in expressions - don't use it
Michal Sojka [Tue, 7 Aug 2018 13:05:24 +0000 (15:05 +0200)]
Older sqlite complains about 'true' in expressions - don't use it

5 years agoFix type errors when drawing bar graph
Michal Sojka [Tue, 7 Aug 2018 13:03:09 +0000 (15:03 +0200)]
Fix type errors when drawing bar graph

DB returns strings as day numbers, but matplotlib seems to want integers.

5 years agoMake un run under WSGI
Michal Sojka [Tue, 7 Aug 2018 11:17:51 +0000 (13:17 +0200)]
Make un run under WSGI

5 years agoclean slate
Jiří Matěják [Thu, 24 May 2018 22:59:17 +0000 (00:59 +0200)]
clean slate