diff --git a/Helpers/share_price_change.py b/Helpers/share_price_change.py index b2033c9..8eb8008 100755 --- a/Helpers/share_price_change.py +++ b/Helpers/share_price_change.py @@ -6,32 +6,32 @@ django.setup() from SellBuy.models import Share, SharePrice -from WallStreetML.wallstreet import sharePrice +# from WallStreetML.wallstreet import sharePrice def share_price_update(): share_obj = Share.objects.all() for share in share_obj: - # # Changing each share price - # old_share_price = share.current_price - # new_share_price = (old_share_price) * (random.uniform(0.7, 1.3)) - # if new_share_price < 1000: - # new_share_price = (new_share_price)*(random.uniform(1.1, 1.3)) - # elif new_share_price > random.randint(50000,60000): - # new_share_price = (new_share_price)*(random.uniform(0.7, 0.9)) - # new_share_price = round(new_share_price, 2) - # new_share = SharePrice.objects.create(share=share, price=new_share_price) - # new_share.save() - # share.current_price = new_share_price - # share.previous_price = old_share_price - # share.save() + # Changing each share price old_share_price = share.current_price - new_share_price = sharePrice(share.name, old_share_price) + new_share_price = (old_share_price) * (random.uniform(0.7, 1.3)) + if new_share_price < 1000: + new_share_price = (new_share_price)*(random.uniform(1.1, 1.3)) + elif new_share_price > random.randint(50000,60000): + new_share_price = (new_share_price)*(random.uniform(0.7, 0.9)) new_share_price = round(new_share_price, 2) new_share = SharePrice.objects.create(share=share, price=new_share_price) new_share.save() share.current_price = new_share_price share.previous_price = old_share_price share.save() + # old_share_price = share.current_price + # new_share_price = sharePrice(share.name, old_share_price) + # new_share_price = round(new_share_price, 2) + # new_share = SharePrice.objects.create(share=share, price=new_share_price) + # new_share.save() + # share.current_price = new_share_price + # share.previous_price = old_share_price + # share.save() print("Share price changed") return True diff --git a/LoginRegister/views.py b/LoginRegister/views.py index c686ac9..cca5f0a 100755 --- a/LoginRegister/views.py +++ b/LoginRegister/views.py @@ -60,13 +60,15 @@ def register_post(request): current_user_holding.save() shares = Share.objects.all() + user_share_quantity_list = [] for share in shares: - user_share_quantity = UserShareQuantity.objects.create( + user_share_quantity = UserShareQuantity( share=share, user=user, quantity=0 ) - user_share_quantity.save() + user_share_quantity_list.append(user_share_quantity) + UserShareQuantity.objects.bulk_create(user_share_quantity_list) response = { 'success' : True, diff --git a/WallStreet18/settings.py b/WallStreet18/settings.py index c897e11..66bdb91 100755 --- a/WallStreet18/settings.py +++ b/WallStreet18/settings.py @@ -10,7 +10,7 @@ https://docs.djangoproject.com/en/1.11/ref/settings/ """ -import os +import os # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -78,17 +78,17 @@ # https://docs.djangoproject.com/en/1.11/ref/settings/#databases DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), - } -# 'default': { -# 'ENGINE': 'django.db.backends.mysql', -# 'NAME': 'newtest', -# 'USER': 'wallstreet', -# 'PASSWORD': 'wallstreet', -# 'HOST': 'localhost', -# } + # 'default': { + # 'ENGINE': 'django.db.backends.sqlite3', + # 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + # } + 'default': { + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'NAME': 'wallstreet', + 'USER': 'wallstreet', + 'PASSWORD': 'wallstreet', + 'HOST': 'localhost', + } } @@ -110,6 +110,23 @@ }, ] +# LOGGING = { +# 'version': 1, +# 'handlers': { +# 'console': { +# 'level': 'DEBUG', +# 'class': 'logging.StreamHandler' +# }, +# }, +# 'loggers': { +# 'gunicorn.access' : { +# 'level': 'DEBUG', +# 'handlers': ['console'], +# 'propagate':False +# } +# } +# } + # Internationalization # https://docs.djangoproject.com/en/1.11/topics/i18n/ diff --git a/db.sqlite3 b/db.sqlite3 index 76511df..86e5b72 100755 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/templates/LoginRegister/login.html b/templates/LoginRegister/login.html index d858fc2..e2a33cb 100755 --- a/templates/LoginRegister/login.html +++ b/templates/LoginRegister/login.html @@ -7,7 +7,7 @@ - Login | WallStreet '18 + Login | WallStreet '19 diff --git a/templates/LoginRegister/register.html b/templates/LoginRegister/register.html index 3636d5d..6941621 100755 --- a/templates/LoginRegister/register.html +++ b/templates/LoginRegister/register.html @@ -7,7 +7,7 @@ - Register | WallStreet '18 + Register | WallStreet '19 @@ -73,7 +73,7 @@
Logo not available!
-
Wallstreet'18
+
Wallstreet'19

Register a new account

diff --git a/templates/SellBuy/dashboard.html b/templates/SellBuy/dashboard.html index 9af0de3..3108793 100755 --- a/templates/SellBuy/dashboard.html +++ b/templates/SellBuy/dashboard.html @@ -8,7 +8,7 @@ --> - Dashboard | WallStreet '18 + Dashboard | WallStreet '19 diff --git a/templates/index.html b/templates/index.html index 0871cb1..b62475d 100755 --- a/templates/index.html +++ b/templates/index.html @@ -8,7 +8,7 @@ --> - Wallstreet '18 + Wallstreet '19