Compare commits

..

7 Commits

Author SHA1 Message Date
dependabot[bot]
8f3f4d7b49 Bump @angular/material from 13.3.6 to 14.2.2 in /frontend
Bumps [@angular/material](https://github.com/angular/components) from 13.3.6 to 14.2.2.
- [Release notes](https://github.com/angular/components/releases)
- [Changelog](https://github.com/angular/components/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/components/compare/13.3.6...14.2.2)

---
updated-dependencies:
- dependency-name: "@angular/material"
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-15 09:44:46 +00:00
Florian Kaiser
594b532fe7 Update dependabot.yml 2022-05-18 13:02:08 +02:00
Florian Kellermann
fb8922f06a Merge pull request #196 from WebEngineering2/bot
NoneType Fix
2022-05-13 12:33:11 +02:00
Florian Kellermann
aadfba74f0 Merge branch 'main' into bot 2022-05-13 12:32:58 +02:00
Kellermann
e06c43b762 Working 2022-05-13 12:28:22 +02:00
Kellermann
6586ac2bfe Fixed 2022-05-13 12:25:56 +02:00
Florian Kellermann
56bb9908d1 Quick fix NoneType 2022-05-13 11:59:11 +02:00
6 changed files with 39 additions and 41 deletions

View File

@@ -10,8 +10,6 @@ updates:
directory: "/api"
schedule:
interval: "daily"
assignees:
- "H4CK3R-01"
open-pull-requests-limit: 100
# Bot
@@ -19,10 +17,6 @@ updates:
directory: "/telegram_bot"
schedule:
interval: "daily"
assignees:
- "NormalParameter"
- "Rripped"
- "FlorianKellermann"
open-pull-requests-limit: 100
# Frontend
@@ -30,6 +24,4 @@ updates:
directory: "/frontend"
schedule:
interval: "daily"
assignees:
- "kevinpauer"
open-pull-requests-limit: 100

View File

@@ -4,7 +4,7 @@ uwsgi==2.0.20
Flask_SQLAlchemy==2.5.1
python-dotenv==0.20.0
pymysql==1.0.2
pyjwt==2.4.0
pyjwt==2.3.0
apiflask==1.0.0
flask-cors==3.0.10
bcrypt==3.2.2

View File

@@ -14,7 +14,7 @@
"@angular/compiler": "~13.2.0",
"@angular/core": "~13.2.0",
"@angular/forms": "~13.2.0",
"@angular/material": "^13.3.6",
"@angular/material": "^14.2.2",
"@angular/platform-browser": "~13.2.0",
"@angular/platform-browser-dynamic": "~13.2.0",
"@angular/router": "~13.2.0",
@@ -679,19 +679,19 @@
}
},
"node_modules/@angular/material": {
"version": "13.3.6",
"resolved": "https://registry.npmjs.org/@angular/material/-/material-13.3.6.tgz",
"integrity": "sha512-V+3Fs9JK+7KlcdJG/Oa/IQuLHC8WYzuL8ffH1Q06ANSzGxSjsAHs4FZQpKUpVBoL3E+p9Yz+zkKe91k5L62VoQ==",
"version": "14.2.2",
"resolved": "https://registry.npmjs.org/@angular/material/-/material-14.2.2.tgz",
"integrity": "sha512-jVCaESSTTkLjRvMzSQj294s0Lz1YMVFkl0svrMtWgkUMXHEfx2Vjw6FXdrVrBXlxEIrpfhkTEXVN2DC1kkAkQw==",
"dependencies": {
"tslib": "^2.3.0"
},
"peerDependencies": {
"@angular/animations": "^13.0.0 || ^14.0.0-0",
"@angular/cdk": "13.3.6",
"@angular/common": "^13.0.0 || ^14.0.0-0",
"@angular/core": "^13.0.0 || ^14.0.0-0",
"@angular/forms": "^13.0.0 || ^14.0.0-0",
"@angular/platform-browser": "^13.0.0 || ^14.0.0-0",
"@angular/animations": "^14.0.0 || ^15.0.0",
"@angular/cdk": "14.2.2",
"@angular/common": "^14.0.0 || ^15.0.0",
"@angular/core": "^14.0.0 || ^15.0.0",
"@angular/forms": "^14.0.0 || ^15.0.0",
"@angular/platform-browser": "^14.0.0 || ^15.0.0",
"rxjs": "^6.5.3 || ^7.4.0"
}
},
@@ -14440,9 +14440,9 @@
}
},
"@angular/material": {
"version": "13.3.6",
"resolved": "https://registry.npmjs.org/@angular/material/-/material-13.3.6.tgz",
"integrity": "sha512-V+3Fs9JK+7KlcdJG/Oa/IQuLHC8WYzuL8ffH1Q06ANSzGxSjsAHs4FZQpKUpVBoL3E+p9Yz+zkKe91k5L62VoQ==",
"version": "14.2.2",
"resolved": "https://registry.npmjs.org/@angular/material/-/material-14.2.2.tgz",
"integrity": "sha512-jVCaESSTTkLjRvMzSQj294s0Lz1YMVFkl0svrMtWgkUMXHEfx2Vjw6FXdrVrBXlxEIrpfhkTEXVN2DC1kkAkQw==",
"requires": {
"tslib": "^2.3.0"
}

View File

@@ -18,7 +18,7 @@
"@angular/compiler": "~13.2.0",
"@angular/core": "~13.2.0",
"@angular/forms": "~13.2.0",
"@angular/material": "^13.3.6",
"@angular/material": "^14.2.2",
"@angular/platform-browser": "~13.2.0",
"@angular/platform-browser-dynamic": "~13.2.0",
"@angular/router": "~13.2.0",

View File

@@ -208,7 +208,7 @@ def send_status(message):
bot.reply_to(message, "bot is running")
@bot.message_handler(commands=['portfolio', 'Portfolio']) # /update -> update shares
@bot.message_handler(commands=['portfolio', 'Portfolio']) # /portfolio -> print all owned shares
def update_for_user(message):
p_user_id = int(message.from_user.id)
p_my_handler = api_handler

View File

@@ -63,8 +63,13 @@ def update_crontab(p_my_handler):
global user_crontab
global user_ids
all_users = p_my_handler.get_all_users() # get all users so crontabs can update for everybody
all_users = p_my_handler.get_all_users() # get all users so crontabs can update for everybody
if all_users == None:
print("No users found, trying again.")
update_crontab(p_my_handler)
return
user_ids = []
user_crontab = []
@@ -75,10 +80,9 @@ def update_crontab(p_my_handler):
user_ids.append(int(element["telegram_user_id"]))
try:
user_crontab.append(str(element["cron"]))
except:
user_ids.pop() # if something goes wrong with cron I have to delete matching user id
except:
continue
except:
user_ids.pop() # if something goes wrong with cron I have to delete matching user id
except: continue
print(user_ids)
@@ -130,21 +134,23 @@ def update_for_user(p_user_id, p_my_handler):
"""
share_symbols = []
share_amounts = []
my_portfolio = p_my_handler.get_user_portfolio(p_user_id) # get all existing shares for user
my_portfolio = p_my_handler.get_user_portfolio(p_user_id) # get all existing shares for user
for element in my_portfolio:
if element["count"] != '' and element["isin"] != '':
print(element["count"], element["isin"])
share_symbols.append(element["isin"])
share_amounts.append(element["count"])
if my_portfolio!=None:
for element in my_portfolio:
if element["count"] != '' and element["isin"] != '':
print(element["count"], element["isin"])
share_symbols.append(element["isin"])
share_amounts.append(element["count"])
my_user = p_my_handler.get_user(p_user_id)
send_to_user("Hello %s this is your share update for today:" % str(my_user["username"]), pUser_id=p_user_id)
send_to_user("Hello %s this is your update for today:"%str(my_user["username"]), pUser_id=p_user_id)
shares = p_my_handler.get_user_shares(p_user_id) # all interest shares
if len(share_symbols) != 0: # iterate through all shares
shares = p_my_handler.get_user_shares(p_user_id) # all interest shares
if len(share_symbols) != 0: # iterate through all shares
for i in range(len(share_symbols)):
my_price = share_fetcher.get_share_price_no_currency(share_symbols[i])
my_update_message = f'{share_fetcher.get_share_information_markdown(share_symbols[i])}\ncount: {hf.make_markdown_proof(share_amounts[i])}\nTotal: {hf.make_markdown_proof(round(float(my_price) * float(share_amounts[i]), 2))} EUR'