Skip to content

Moex #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrevis merged 8 commits into from
Jul 12, 2025
Merged

Moex #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
00366f7
poc
andrevis Jul 2, 2025
be45a3d
fixup
andrevis Jul 3, 2025
33e65a5
defaults
andrevis Jul 6, 2025
e276ed5
defaults
andrevis Jul 6, 2025
08192a3
fixup
andrevis Jul 6, 2025
795aa7b
defaults
andrevis Jul 6, 2025
7b1f627
defaults
andrevis Jul 6, 2025
85f0a27
fixup
andrevis Jul 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ jobs:
run: |
python3 -m ensurepip
python3 -m venv /opt/certbot/
pip3 install aiogram tomli certbot
python3 -m pip install --upgrade pip
pip3 install aiogram pandas apscheduler tomli certbot py-postgresql beautifulsoup4 lxml

# - name: Install some html stuff
# run: |
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
token
*.pem
*.toml
*.log
*.log.*

# Byte-compiled / optimized / DLL files
__pycache__/
Expand Down Expand Up @@ -60,7 +62,7 @@ cover/
*.pot

# Django stuff:
*.log

local_settings.py
db.sqlite3
db.sqlite3-journal
Expand Down
18 changes: 14 additions & 4 deletions db/init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,17 @@ db_name=$1
db_user=$2
db_pass=$3

psql -U postgres -c "DROP DATABASE ${db_name};"
psql -U postgres -c "DROP USER ${db_user};"
psql -U postgres -c "CREATE USER ${db_user} PASSWORD '${db_pass}';"
psql -U postgres -c "CREATE DATABASE ${db_name} OWNER=${db_user};"
# psql -U postgres -c "DROP DATABASE ${db_name};"
# psql -U postgres -c "DROP USER ${db_user};"

psql -U postgres ${db_pass} << EOF
CREATE USER ${db_user} PASSWORD '${db_pass}';
CREATE DATABASE ${db_name} OWNER=${db_user};
\c ${db_name};


CREATE TABLE IF NOT EXISTS options (
id SERIAL,
name VARCHAR(100),
value text);
EOF
116 changes: 88 additions & 28 deletions html/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,89 +6,149 @@
<title>JBond telegram web app</title>

<script src="https://telegram.org/js/telegram-web-app.js"></script>

<script src="toml/toml.js"></script>
<script src="nouislider/nouislider.js"></script>

<link rel="stylesheet" href="style.css">
<link rel="stylesheet" href="nouislider/nouislider.css">
</head>
<body>

<div class="wrapper">
<label class=block-name>От срока до погашения, мес</label>
<div class="fields">
<div class="field field-left">
<input type="number" id="duration-from" value="3" min="0" max="120" maxlength="3">
<input type="number" id="redemption-from" value="3" min="0" max="120" maxlength="3">
</div>
<span class="separator">-</span>
<span class="separator block-name">Срок, мес</span>
<div class="field field-right">
<input type="number" id="duration-to" value="36" min="1" max="120" maxlength="3">
<input type="number" id="redemption-to" value="36" min="1" max="120" maxlength="3">
</div>
</div>
<div id="duration-slider" class="slider"></div>
<div id="redemption-slider" class="slider"></div>
</div>

<div class="wrapper">
<label class=block-name>Доходность к погашению, %</label>
<div class="fields">
<div class="field field-left">
<input type="number" id="full-profit-from" value="0.0" min="0.0" max="50.0" maxlength="5">
<input type="number" id="profit-from" value="0.0" min="0.0" max="50.0" maxlength="5">
</div>
<span class="separator">-</span>
<span class="separator block-name">Доходность, %</span>
<div class="field field-right">
<input type="number" id="full-profit-to" value="20.0" min="0.0" max="50.0" maxlength="5">
<input type="number" id="profit-to" value="20.0" min="0.0" max="50.0" maxlength="5">
</div>
</div>
<div id="full-profit-slider" class="slider"></div>
<div id="profit-slider" class="slider"></div>
</div>

<div class="wrapper">
<label class=block-name>Див-доходность к погашению, %</label>
<div class="fields">
<div class="field field-left">
<input type="number" id="div-profit-from" value="0.0" min="0.0" max="50.0" maxlength="5">
<input type="number" id="coupons-from" value="0.0" min="0.0" max="50.0" maxlength="5">
</div>
<span class="separator">-</span>
<span class="separator block-name">Купон, %</span>
<div class="field field-right">
<input type="number" id="div-profit-to" value="20.0" min="0.0" max="50.0" maxlength="5">
<input type="number" id="coupons-to" value="20.0" min="0.0" max="50.0" maxlength="5">
</div>
</div>
<div id="div-profit-slider" class="slider"></div>
<div id="coupons-slider" class="slider"></div>
</div>

<div class="wrapper">
<label class=block-name>Рейтинг не ниже</label>
<div class="fields">
<div class="field field-left">
<input type="text" id="rating-from" minlength="1" maxlength="4">
<input type="number" id="duration-from" value="0" min="0" max="50" maxlength="3">
</div>
<span class="separator block-name">Дюрация, мес</span>
<div class="field field-right">
<input type="number" id="duration-to" value="50" min="0" max="50" maxlength="3">
</div>
</div>
<div id="duration-slider" class="slider"></div>
</div>

<div class="wrapper">
<label class=block-name>Цена, %</label>
<input type="text" id="price-to" class="field field-right" minlength="1" maxlength="3">
<div id="price-slider" class="slider single-slider"></div>
</div>

<div class="wrapper">
<label class=block-name>Рейтинг</label>
<input type="text" id="rating-from" class="field field-right" minlength="1" maxlength="4">
<div id="rating-slider" class="slider single-slider"></div>
</div>

<div class="wrapper">
<div>
<input type="checkbox" id="is_qual" name="qualified" value="no"/> <label class="block-name"> Добавить для квалов </label>
<div class="coupon-period">
<label class="block-name">Купонный период(раз в год)</label>
<div>
<input type="checkbox" class="coupon-period-ckeckbox" value="1" /><label class="block-name">1</label>
<input type="checkbox" class="coupon-period-ckeckbox" value="2" /><label class="block-name">2</label>
<input type="checkbox" class="coupon-period-ckeckbox" value="3" /><label class="block-name">3</label>
<input type="checkbox" class="coupon-period-ckeckbox" value="4" checked/><label class="block-name">4</label>
<input type="checkbox" class="coupon-period-ckeckbox" value="12" checked/><label class="block-name">12</label>
</div>
</div>
<div class="selector">
<label class="block-name"> Квал </label>
<input type="checkbox" class="field-right" id="is_qual" checked/>
</div>
<div>
<label> <input type="checkbox" id="is_amort" name="amortization" value="yes"/><label class="block-name"> Добавить с амортизацией </label>
<div class="selector">
<label class="block-name"> Амортизация </label>
<input type="checkbox" class="field-right" id="is_amort" checked/>
</div>
<div class="selector">
<label class="block-name"> Оферта </label>
<input type="checkbox" class="field-right" id="is_offer"/>
</div>
</div>

<div class="wrapper">
<label class="block-name">Сортировка</label>
<input type="radio" id="order-asc" class="order" name="order" value="asc"/><label for="order-asc" class="order-label">⬇</label>
<input type="radio" id="order-dsc" class="order" name="order" value="desc" checked/><label for="order-dsc" class="order-label">⬆</label>
<fieldset>
<div>
<label class="block-name"> Срок до погашения</label>
<input type="radio" id="sort-redemption" class="sort-by field-right sort-asc" name="sorting" value="DAYSTOREDEMPTION" />
</div>
<div>
<label class="block-name"> По доходности (срвз)</label>
<input type="radio" id="sort-yeild" class="sort-by field-right sort-dsc" name="sorting" value="YIELDATWAP" checked/>
</div>
<div>
<label class="block-name"> По купонной дох.</label>
<input type="radio" id="sort-coupon" class="sort-by field-right sort-dsc" name="sorting" value="COUPONPERCENT" />
</div>
<div>
<label class="block-name"> По дюрации</label>
<input type="radio" id="sort-duration" class="sort-by field-right sort-asc" name="sorting" value="DURATION" />
</div>

</fieldset>
</div>

<div class="wrapper">
<div class="listing">
<label class="block-name">Котировальные списки</label>
<div>
<input type="checkbox" class="listing-ckeckbox" value="1" checked/><label class="block-name">1</label>
<input type="checkbox" class="listing-ckeckbox" value="2" checked/><label class="block-name">2</label>
<input type="checkbox" class="listing-ckeckbox" value="3" /><label class="block-name">3</label>
</div>
</div>
</div>

<p>
<div style="text-align: center;">
<button id="btn_ok">Готово</button>
</div>
</p>

<div><label>Фильтры</label>
<textarea id="filters" name="filters" rows="4" cols="200"></textarea>
<!-- Debug -->
<div style="display: none">
<label>Фильтры</label>
<textarea id="filters" rows="4" cols="100"></textarea>
</div>

<!-- <div><label>Фильтры</label> <input id="filters" type="text" value="" length="100" maxlength="1000"></div> -->

<script src="script.js"></script>
</body>
</html>
Loading
Loading