commit for merging my version with the changes from florent

13 files changed, 71 insertions, 45 deletions

diff --git a/DATABASE b/DATABASE
index 442c665..04bff30 100644
--- a/DATABASE
+++ b/DATABASE
diff --git a/DATABASE2 b/DATABASE2
index 620ce22..60f0676 100644
--- a/DATABASE2
+++ b/DATABASE2
diff --git a/DATABASE3 b/DATABASE3
index dd024fc..0ce335c 100644
--- a/DATABASE3
+++ b/DATABASE3
diff --git a/activity/activity.info b/activity/activity.info
index 6548da7..539a853 100755
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,7 +1,7 @@
 [Activity]
-name = NutriWeb
+name = NutrinoWeb
 activity_version = 1
-service_name = org.laptop.NutriWebActivity
+service_name = org.laptop.NutrinoWebActivity
 icon = activity-NutriWeb
-class = NutriWeb.activity.NutriWebActivity
+class = nutrinoweb.activity.NutrinoWebActivity
 license = gplv3
diff --git a/nutrinoweb/activity.py b/nutrinoweb/activity.py
index 7762250..7722908 100644
--- a/nutrinoweb/activity.py
+++ b/nutrinoweb/activity.py
@@ -43,14 +43,14 @@ class NutrinoWebActivity(run.Server, activity.Activity):
         # ..
         if config.Config().get('activity>use-toolbar', type_=bool):
             self.__init_toolbar()
-        else
+        else:
             pass
         # ...
         self.web_view = WebView()
         self.set_canvas(self.web_view)
         self.web_view.show()
         # ...
-        self.change_screen('nutrinoweb')
+        self.change_screen('main')
 
     def get_toolbox(self):
         return self._toolbox
diff --git a/nutrinoweb/controllers/eating.py b/nutrinoweb/controllers/eating.py
index 24d68e6..0fdeb94 100644
--- a/nutrinoweb/controllers/eating.py
+++ b/nutrinoweb/controllers/eating.py
@@ -30,6 +30,7 @@ def eating():
     _link = 'hidden'
     _scenario = 'rack'
     content = [ ]
+    position = [70, 0]
     # POST
     if request.method == 'POST':
         _aliments = database_manager.aliments()
@@ -56,7 +57,7 @@ def eating():
 			'pathimg': pathi,
                		}
 		content.append(cont)
-	    _content = { 'content': content, }
+	    _content = { 'content': content, 'position': position}
     	    # render result
     	    return render('nutrinoweb/main.html', **_content)
 	elif 'askforaliment' in request.form:
diff --git a/nutrinoweb/controllers/main.py b/nutrinoweb/controllers/main.py
index 62260a0..b4bcd97 100644
--- a/nutrinoweb/controllers/main.py
+++ b/nutrinoweb/controllers/main.py
@@ -14,9 +14,11 @@ IM_PATH = ['../static/images/journal/jauge-energie.png']
 
 @app.route('/main', methods=['GET', 'POST'])
 def main():
+    logger.debug("controllermain: enter")
     # list images
     _images = IM_PATH
     _result = eating.calculateDimension(None, None)
+    position = [70, 0]
     
     if request.method == 'POST':
 	if 'reset' in request.form:
@@ -29,6 +31,7 @@ def main():
 	    _result[5] = 100.0
 	    _result[6] = 100.0
 	    _result[7] = 100.0
+	    position = [70, 0]
     
     contents = [dict(
                 title= _('Hello'),
@@ -44,7 +47,7 @@ def main():
                 )]
 	
     #prepare result
-    _content = { 'content': contents, }
+    _content = { 'content': contents, 'position': position}
     # render result
     return render('nutrinoweb/main.html', **_content)
 
diff --git a/nutrinoweb/controllers/sparetime.py b/nutrinoweb/controllers/sparetime.py
index cea9512..18c3270 100644
--- a/nutrinoweb/controllers/sparetime.py
+++ b/nutrinoweb/controllers/sparetime.py
@@ -20,9 +20,12 @@ def sparetime():
     content = [ ]
     # POST
     if request.method == 'POST':
-        if 'select-item' in request.form:
-	    result = request.form['select-item']
-	    _result = calculateDimension(result, entries)
+        if 'activity' in request.form:
+	    result = request.form['activity']
+	    factor = float(request.form['time'])
+	    position = calculateTime(factor)
+	    pathi = '../../static/images/journal/activities/' + result + '.png'
+	    _result = calculateDimension(factor, result, entries)
 	    cont = {
                	'image': IM_PATH,
 		'water': _result[0],
@@ -33,9 +36,10 @@ def sparetime():
 		'energiestart': _result[5],
 		'vitaminestart': _result[6],
 		'constructionstart': _result[7],
+		'pathimg': pathi,
                	}
 	    content.append(cont)
-	    _content = { 'content': content, }
+	    _content = { 'content': content, 'result' : result, 'position': position }
     	    # render result
     	    return render('nutrinoweb/main.html', **_content)
 
@@ -49,12 +53,25 @@ def sparetime():
     _content = {
                 'title': _('What do you want to play?'),
                 'activities': entries,
-		'result': _result
+		'result': _result,
                 }
     # render result
     return render('nutrinoweb/sparetime.html', **_content)
 
-def calculateDimension(result, entries):
+def calculateTime(f):
+    if f == 15.0:
+	position = [60 , 5]
+    elif f == 30.0:
+	position = [50 , 10]
+    elif f == 45.0:
+	position = [40 , 15]
+    elif f == 60.0:
+	position = [30 , 20]
+    else:
+	pass
+    return position
+
+def calculateDimension(factor, result, entries):
     water = None
     energie = None
     vitamine = None
@@ -66,14 +83,12 @@ def calculateDimension(result, entries):
        eng = instance.load_status()
        for entry in entries:
 	   if result in entry['title']:
-
-	      factor =  1
 	      #part water
-	      _water = controllValue(((factor*calculateWater(float(entry['water']))) / 2) - float(eng['water']))
+	      _water = controllValue(float(eng['water']) - ((factor*calculateWater(float(entry['water']))) / 2))
 	      water = calculateHeight(_water)
 	      
 	      #part energie               
-	      _energie = controllValue((factor*calculateEnergie(float(entry['energie']))) - float(eng['energie']))
+	      _energie = controllValue(float(eng['energie']) - (factor*calculateEnergie(float(entry['energie']))))
 	      energie = calculateHeight(_energie)    
 	      
 	      #part vitamine
@@ -81,7 +96,7 @@ def calculateDimension(result, entries):
 	      vitamine = calculateHeight(_vitamine[0])  
 
 	      #part construction
-	      _construction = controllValue((factor*calculateConstruction(float(entry['protein']))) - float(eng['construction']))
+	      _construction = controllValue(float(eng['construction']) - (factor*calculateConstruction(float(entry['protein']))))
 	      construction = calculateHeight(_construction)
 	   	
 	      status = instance.save_status(str(_water), str(_energie), str(_vitamine[1]), str(_vitamine[2]),str(_vitamine[3]),str(_vitamine[4]),str(_vitamine[5]),str(_vitamine[6]),str(_vitamine[7]),str(_vitamine[8]),str(_vitamine[9]),str(_vitamine[10]),str(_vitamine[11]),str(_vitamine[12]),str(_vitamine[13]),str(_vitamine[14]),str(_vitamine[15]),str(_vitamine[16]),str(_vitamine[17]),str(_vitamine[18]), str(_vitamine[19]), str(_vitamine[0]), str(_construction))
diff --git a/nutrinoweb/controllers/status.txt b/nutrinoweb/controllers/status.txt
index 51792ad..074328b 100644
--- a/nutrinoweb/controllers/status.txt
+++ b/nutrinoweb/controllers/status.txt
@@ -1 +1 @@
-|9.47985714286|20.14|7.5|49.6|15.7142857143|7.5|26.5161290323|1.75257731959|6.25|30.6086956522|9.35294117648|10.5416666667|78.9545454546|15.1115384616|4.45|15.4705882353|8.57142857143|0.0|100.0|6.8|0.0|20.7733892781|13.3023255814
\ No newline at end of file
+|13.9147142857|28.23|9.72222222222|55.2|24.2857142857|11.5|45.6129032259|2.98969072165|8.75|61.2173913044|17.8235294117|14.2083333333|86.7727272728|21.203846154|6.85|20.6470588235|11.4285714286|0.0|100.0|13.6|0.0|26.9374730623|20.0930232558
\ No newline at end of file
diff --git a/static/css/style.css b/static/css/style.css
index 0bf37dc..8c80bfb 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -46,3 +46,6 @@ h2                  {font-size: 1.2em;}
 .reset         {margin-left: 580px; width: 10px;}
 .sun           {float: left; margin-top: 0px; margin-left: 0px; width: 628px; height: 150px; }
 .sun img       {margin-top: 70px; width: 90px; height: 90px;}
+
+.acitivities   {overflow: auto;}
+.timediv       {margin-left: 120px;}
diff --git a/templates/nutrinoweb/addentry.html b/templates/nutrinoweb/addentry.html
index 5e91527..24e6c6d 100644
--- a/templates/nutrinoweb/addentry.html
+++ b/templates/nutrinoweb/addentry.html
@@ -22,65 +22,66 @@
    <div class=div1>
       <dl>
 	</br>
-        <dt>water (g/100g):
+	<dt style="color: #808080">values are per 100g <br />or 1 minute:<br /><br /><br />
+        <dt>water (g):
         <dd><input type=text size=5 name=water value={{entry[1]}}>
-        <dt>sugar (g/100g) :
+        <dt>sugar (g) :
         <dd><input type=text size=5 name=energie value={{entry[2]}}>
-        <dt>protein (g/100g):
+        <dt>protein (g):
         <dd><input type=text size=5 name=protein value={{entry[22]}}>
       </dl>
     </div>
     <div class=div2>
       <dl>
-        <dt>calcium (mg/100g):
+        <dt>calcium (mg):
         <dd><input type=text size=5 name=calcium value={{entry[3]}}>
-        <dt>iron (mg/100g):
+        <dt>iron (mg):
         <dd><input type=text size=5 name=iron value={{entry[4]}}>
-        <dt>magnesium (mg/100g):
+        <dt>magnesium (mg):
         <dd><input type=text size=5 name=magnesium value={{entry[5]}}>
-        <dt>phosphorus (mg/100g):
+        <dt>phosphorus (mg):
         <dd><input type=text size=5 name=phosphorus value={{entry[6]}}>
-        <dt>potassium (mg/100g):
+        <dt>potassium (mg):
         <dd><input type=text size=5 name=potassium value={{entry[7]}}>
       </dl>
     </div>
     <div class=div3>
       <dl>
-        <dt>sodium (mg/100g):
+        <dt>sodium (mg):
         <dd><input type=text size=5 name=sodium value={{entry[8]}}>
-        <dt>zinc (mg/100g):
+        <dt>zinc (mg):
         <dd><input type=text size=5 name=zinc value={{entry[9]}}>
-        <dt>copper (mg/100g):
+        <dt>copper (mg):
         <dd><input type=text size=5 name=copper value={{entry[10]}}>
-        <dt>vitamine C (mg/100g):
+        <dt>vitamine C (mg):
         <dd><input type=text size=5 name=vit_c value={{entry[11]}}>
-        <dt>thiamin (mg/100g):
+        <dt>thiamin (mg):
         <dd><input type=text size=5 name=thiamin value={{entry[12]}}>
       </dl>
     </div>
     <div class=div4>
       <dl>
-        <dt>riboflavin (mg/100g):
+        <dt>riboflavin (mg):
         <dd><input type=text size=5 name=riboflavin value={{entry[13]}}>
-        <dt>niacin (mg/100):
+        <dt>niacin (mg):
         <dd><input type=text size=5 name=niacin value={{entry[14]}}>
-        <dt>pantoacid (mg/100g):
+        <dt>pantoacid (mg):
         <dd><input type=text size=5 name=panto_acid value={{entry[15]}}>
-        <dt>vitamine B6 (mg/100g):
+        <dt>vitamine B6 (mg):
         <dd><input type=text size=5 name=vit_b6 value={{entry[16]}}>
-        <dt>folate (μg/100g):
+        <dt>folate (μg):
         <dd><input type=text size=5 name=folate_tot value={{entry[17]}}>
       </dl>
     </div>
     <div class=div5>
       <dl>
-        <dt>vitamine B12 (μg/100g):
+        <dt>vitamine B12 (μg):
         <dd><input type=text size=5 name=vit_b12 value={{entry[18]}}>
-        <dt>vitamine A (μ/100g):
+        <dt>vitamine A (μ):
         <dd><input type=text size=5 name=vit_a value={{entry[19]}}>
-        <dt>vitamine E (μg/100g):
+        <dt>vitamine E (μg):
         <dd><input type=text size=5 name=vit_e value={{entry[20]}}>
-        <dt>vitamine D (μg/100g):
+        <dt>vitamine D (μg):
         <dd><input type=text size=5 name=vit_d value={{entry[21]}}>
         <dt>Choose a category:
 	<select name="scenario">
diff --git a/templates/nutrinoweb/main.html b/templates/nutrinoweb/main.html
index d822f2f..8694901 100644
--- a/templates/nutrinoweb/main.html
+++ b/templates/nutrinoweb/main.html
@@ -24,7 +24,7 @@
 		$(".vitamine-value").animate({height: '{{cont.vitamine}}%'}, {duration: 2500, easing: "linear"})
 		$(".construction-value").css({ height:'{{cont.constructionstart}}%'});
 		$(".construction-value").animate({height:'{{cont.construction}}%'}, {duration: 2500, easing: "linear"})
-		$("img.sun").animate({marginTop:  '60px', marginLeft: '0px'}, {duration: 2500, easing: "swing"})
+		$("img.sun").animate({marginTop:  '{{ position[0] }}', marginLeft: '{{ position[1] }}'}, {duration: 2500, easing: "swing"})
         </script>
 	{% endfor %}
      </div>
diff --git a/templates/nutrinoweb/sparetime.html b/templates/nutrinoweb/sparetime.html
index 8fb44e3..768747f 100644
--- a/templates/nutrinoweb/sparetime.html
+++ b/templates/nutrinoweb/sparetime.html
@@ -5,11 +5,14 @@
 
 <form action="/sparetime" method="post">
     <div class=activities>
-	<ul>
+	<table width="600" height="200" border="0" align="center" cellpadding="10" cellspacing="10">
+	   <tr>
 	  {% for activity in activities %}
-	   <li><img src="../../static/images/journal/activities/{{ activity.title }}.png">{{ activity.title.lower() }}</li>
+	    		<td width="100" align="center"><input type="image" name='activity' src="../../static/images/journal/activities/{{ activity.title }}.png" value={{ activity.title }}><br />{{ activity.title.lower() }}<br /></td>
 	  {% endfor %}
-	</ul>
+	   </tr>
+	</table>
+	<div class=timediv><input type="radio" name="time" value="15" checked>15 minutes<input type="radio" name="time" value="30">30 minutes<input type="radio" name="time" value="45">45 minutes<input type="radio" name="time" value="60">60 minutes</div>
     </div>
 </form>