PROD.2024/Travel-Agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Added notes creation, view and deletion, added route planning, added location list with current weather and nearby locations, code improvements and fixes

Browse Source
This commit is contained in:
ITQ
2024-03-26 07:49:50 +03:00
parent 65719a61ef
commit 88dfe1704d
24 changed files with 1571 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/keyboards/travel.py
+133 -10
View File
@@ -3,54 +3,177 @@ __all__ = ("get",)
from aiogram import types
from aiogram.utils.keyboard import InlineKeyboardBuilder
from app.models.travel import Travel
from app.utils.geo import get_location_by_name
from app.utils.map import get_url_map
def get(travel: Travel):
locations = Travel().get_sorted_locations(travel, asc=False)
coordinats = []
for location in locations:
geocode = get_location_by_name(location.location)
coordinats.append(
[geocode[1].raw.get("lat"), geocode[1].raw.get("lon")],
)
def get(travel_id: int):
builder = InlineKeyboardBuilder()
builder.row(
types.InlineKeyboardButton(
text="📝 Change title",
callback_data=f"travel_change_{travel_id}_title",
callback_data=f"travel_change_{travel.id}_title",
),
types.InlineKeyboardButton(
text="ℹ️ Change description",
callback_data=f"travel_change_{travel_id}_description",
callback_data=f"travel_change_{travel.id}_description",
),
)
builder.row(
types.InlineKeyboardButton(
text="🗺️ Locations",
callback_data=f"travel_locations_{travel_id}",
callback_data=f"travel_locations_page_{travel.id}_0",
),
types.InlineKeyboardButton(
text="➕ Add location",
callback_data=f"travel_add_location_{travel_id}",
callback_data=f"travel_add_location_{travel.id}",
),
)
builder.row(
types.InlineKeyboardButton(
text="👤 Users",
callback_data=f"travel_users_{travel_id}",
callback_data=f"travel_users_page_{travel.id}_0",
),
types.InlineKeyboardButton(
text="➕ Add user",
callback_data=f"travel_add_user_{travel_id}",
callback_data=f"travel_add_user_{travel.id}",
),
)
builder.row(
types.InlineKeyboardButton(
text="📝 Notes",
callback_data=f"travel_notes_{travel_id}",
callback_data=f"travel_notes_page_{travel.id}_0",
),
types.InlineKeyboardButton(
text="➕ Add note",
callback_data=f"travel_add_note_{travel_id}",
callback_data=f"travel_add_note_{travel.id}",
),
)
builder.row(
types.InlineKeyboardButton(
text="🗺️ Route by car",
web_app=types.WebAppInfo(
url=get_url_map(
coordinats=coordinats,
profile="car",
),
),
),
)
builder.row(
types.InlineKeyboardButton(
text="🗺️ Route on foot",
web_app=types.WebAppInfo(
url=get_url_map(
coordinats=coordinats,
profile="foot",
),
),
),
)
builder.row(
types.InlineKeyboardButton(
text="🗺️ Route by bike",
web_app=types.WebAppInfo(
url=get_url_map(
coordinats=coordinats,
profile="bike",
),
),
),
)
builder.row(
types.InlineKeyboardButton(
text="❌ Delete travel",
callback_data=f"travel_delete_{travel_id}",
callback_data=f"travel_delete_{travel.id}",
),
)
builder.row(
types.InlineKeyboardButton(
text="⬅️",
callback_data="travels",
),
)
return builder.as_markup()
def get_public(travel: Travel):
locations = Travel().get_sorted_locations(travel, asc=False)
coordinats = []
for location in locations:
geocode = get_location_by_name(location.location)
coordinats.append(
[geocode[1].raw.get("lat"), geocode[1].raw.get("lon")],
)
builder = InlineKeyboardBuilder()
builder.row(
types.InlineKeyboardButton(
text="🗺️ Locations",
callback_data=f"travel_locations_{travel.id}",
),
)
builder.row(
types.InlineKeyboardButton(
text="👤 Users",
callback_data=f"travel_users_{travel.id}",
),
)
builder.row(
types.InlineKeyboardButton(
text="📝 Notes",
callback_data=f"travel_notes_{travel.id}",
),
types.InlineKeyboardButton(
text="➕ Add note",
callback_data=f"travel_add_note_{travel.id}",
),
)
builder.row(
types.InlineKeyboardButton(
text="🗺️ Route by car",
web_app=types.WebAppInfo(
url=get_url_map(
coordinats=coordinats,
profile="car",
),
),
),
)
builder.row(
types.InlineKeyboardButton(
text="🗺️ Route on foot",
web_app=types.WebAppInfo(
url=get_url_map(
coordinats=coordinats,
profile="foot",
),
),
),
)
builder.row(
types.InlineKeyboardButton(
text="🗺️ Route by bike",
web_app=types.WebAppInfo(
url=get_url_map(
coordinats=coordinats,
profile="bike",
),
),
),
)
builder.row(