diff --git a/analysismonth.py b/analisys/analysismonth.py similarity index 100% rename from analysismonth.py rename to analisys/analysismonth.py diff --git a/analysistoday.py b/analisys/analysistoday.py similarity index 98% rename from analysistoday.py rename to analisys/analysistoday.py index 4809492..9b2b2dc 100644 --- a/analysistoday.py +++ b/analisys/analysistoday.py @@ -4,7 +4,7 @@ import matplotlib.pyplot as plt import locales import datetime import currencyes -from analysismonth import have_in_vals +from analisys.analysismonth import have_in_vals def analysis_today(message): diff --git a/analysisyear.py b/analisys/analysisyear.py similarity index 98% rename from analysisyear.py rename to analisys/analysisyear.py index 6ffab4f..a1c0716 100644 --- a/analysisyear.py +++ b/analisys/analysisyear.py @@ -3,7 +3,7 @@ from database.models import Transaction, User import locales import matplotlib.pyplot as plt import datetime -from analysismonth import have_in_vals +from analisys.analysismonth import have_in_vals import currencyes diff --git a/diagrams/month/rmanalysismonth.png b/diagrams/month/rmanalysismonth.png index d60b2c9..667d4d7 100644 Binary files a/diagrams/month/rmanalysismonth.png and b/diagrams/month/rmanalysismonth.png differ diff --git a/diagrams/today/diagramalltoday.png b/diagrams/today/diagramalltoday.png index 78d5f96..5d6808b 100644 Binary files a/diagrams/today/diagramalltoday.png and b/diagrams/today/diagramalltoday.png differ diff --git a/main.py b/main.py index 03c3aab..9adf307 100644 --- a/main.py +++ b/main.py @@ -6,9 +6,9 @@ from changelocale import change_locale from database.models import User, Transaction from currencyes import currensyes from multiprocessing import Process -from analysismonth import analysis_month, analysis_month_rm, analysis_month_add -from analysisyear import analysis_year, analysis_year_rm, analysis_year_add -from analysistoday import analysis_today, analysis_today_rm, analysis_today_add +from analisys.analysismonth import analysis_month, analysis_month_rm, analysis_month_add +from analisys.analysisyear import analysis_year, analysis_year_rm, analysis_year_add +from analisys.analysistoday import analysis_today, analysis_today_rm, analysis_today_add # функция ограничения количества знаков после запятой