Merge pull request 'Zeige Preisentwicklung von Consumables' (#7) from PR_7 into prepare2022

Reviewed-on: http://gitea.lusiardi.de/jlusiardi/rollerverbrauch/pulls/7

app/templates/statistics.html

@@ -164,6 +164,7 @@
                                 <ul id="consumable_{{vehicle.id}}_{{consumable.id}}_tabs" class="nav nav-tabs" data-tabs="tabs">
                                     {{ nav_tab(vehicle.id|string + '_' + consumable.id|string + '_consumption', 'Consumption', true) }}
                                     {{ nav_tab(vehicle.id|string + '_' + consumable.id|string + '_amount', 'Amount', false) }}
+                                    {{ nav_tab(vehicle.id|string + '_' + consumable.id|string + '_price', 'Price', false) }}
                                 </ul>
                                 <div id="consumable_{{vehicle.id}}_{{consumable.id}}_content" class="tab-content ">
                                     {{ tab_pane(
@@ -188,6 +189,17 @@
                                         false
                                         )
                                     }}
+                                    {{ tab_pane(
+                                        vehicle.id|string + '_' + consumable.id|string + '_price',
+                                        chart(
+                                            consumable.price,
+                                            'ref_' + vehicle.id|string + '_' + consumable.id|string + '_price',
+                                            '€ / '+consumable.unit,
+                                            url_for('create_pit_stop_form', vid=vehicle.id, cid=consumable.id)
+                                            ),
+                                        false
+                                        )
+                                    }}
                                 </div>
                                 {{ tab_script('vehicle_' + vehicle.id|string + '_' + consumable.id|string + '_tabs') }}
                             </div>

app/tools.py

@@ -27,6 +27,7 @@ class ConsumableStats:
         self.average_amount_used = 0
         self.average_amount = []
         self.amounts = []
+        self.price = []
 
         pitstops = [
             stop for stop in vehicle.pitstops if stop.consumable_id == consumable.id
@@ -37,6 +38,7 @@ class ConsumableStats:
             for pitstop in pitstops:
                 self.overall_amount += pitstop.amount
                 self.amounts.append(StatsEvent(pitstop.date, pitstop.amount))
+                self.price.append(StatsEvent(pitstop.date, pitstop.costs/pitstop.amount))
             self.average_amount_fuelled = self.overall_amount / pitstop_count
         if pitstop_count > 1:
             overall_distance = (

config.py

@@ -41,8 +41,8 @@ class TestingConfig(Config):
 
 
 class ProductionConfig(Config):
-    SQLALCHEMY_DATABASE_URI = 'mysql+pymysql://root:{h}@database/pitstops'.format(
+    SQLALCHEMY_DATABASE_URI = 'mysql+pymysql://pitstops:{h}@localhost/pitstops'.format(
-        h=os.environ.get('DATABASE_ENV_MYSQL_ROOT_PASSWORD'))
+        h=os.environ.get('MYSQL_PASSWORD'))
 
 
 config = {

requirements.txt

@@ -7,3 +7,4 @@ markdown
 Flask-Limiter
 requests
 email_validator
+gunicorn