4
0
Fork 0
Wiki Issues 6 Projects Code Pull Requests Releases Activity
Browse Source

Редактирование проекта

test_bot
Alexei 2 years ago
parent
08aa545101
commit
fee99906ea
1 changed files with 179 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 198
      bot_modules/projects.py

198
bot_modules/projects.py
Unescape View File

@ -17,6 +17,12 @@ class FSMCreateProject(StatesGroup):
prjPhoto = State()
prjName = State()
prjDesc = State()
class FSMEditProject(StatesGroup):
prjID = State()
prjPhoto = State()
prjName = State()
prjDesc = State()
# ---------------------------------------------------------
# БД
@ -67,10 +73,48 @@ project_create_message_3 = '''
Введите описание проекта:
'''
project_cancel_create_message = 'Создание проекта отменено'
project_success_create_message = 'Проект успешно добавлен!'
project_success_delete_message = 'Проект успешно удалён!'
project_success_edit_message = 'Проект успешно отредактирован!'
project_create_message_0= '''
Редактирование проекта.
project_cancel_create_message = 'Действие отменено'
Пожалуйста, выберите проект:
'''
project_edit_message_1 = '''
Редактирование проекта. Шаг №1
Загрузите новую обложку для проекта (Фото):
Она будет отображаться в его описании.
'''
project_edit_message_2 = '''
Редактирование проекта. Шаг №2
Текущее название проекта:
@proj_name
Введите новое название проекта:
'''
project_edit_message_3 = '''
Редактирование проекта. Шаг №3
Текущее описание проекта:
@proj_desc
Введите новое описание проекта:
'''
project_cancel_edit_message = 'Редактирование проекта отменено'
project_select_to_edit_message = '''
Выберите проект, который вы хотите отредактировать.
'''
project_select_to_delete_message = '''
@ -79,29 +123,33 @@ project_select_to_delete_message = '''
'''
projects_button_name = "📰 Проекты"
list_project_button_name = "📰 Список проектов"
add_project_button_name = "📰 Добавить проект"
del_project_button_name = "📰 Удалить проект"
edit_project_button_name = "📰 Редактировать проект"
projects_canсel_button_name = "📰 Отменить"
projects_skip_button_name = "📰 Пропустить"
# Префиксы
select_project_callback_prefix = 'sel_project:'
delete_project_callback_prefix = 'del_project:'
select_to_edit_project_callback_prefix = 'sel_to_edit_project:'
# ---------------------------------------------------------
# Работа с кнопками
def GetEditProjectKeyboardButtons(a_UserAccess):
proj_buttons = [add_project_button_name, del_project_button_name, edit_project_button_name]
proj_buttons = [list_project_button_name, add_project_button_name, del_project_button_name, edit_project_button_name]
mods = [start]
return keyboard.MakeKeyboard(keyboard.GetButtons(mods, a_UserAccess) + proj_buttons)
def GetCancelKeyboardButtons(a_UserAccess):
# return keyboard.MakeKeyboardRemove()
return keyboard.MakeKeyboard([projects_canсel_button_name])
def GetSkipAndCancelKeyboardButtons(a_UserAccess):
return keyboard.MakeKeyboard([projects_skip_button_name, projects_canсel_button_name])
def GetProjectsListKeyboardButtons(a_UserAccess, a_Prefix):
projects = GetProjectList()
projects_button_list = []
@ -115,25 +163,37 @@ def GetUserAccess(a_UserID):
# ---------------------------------------------------------
# Обработка сообщений
# Отображение всех проектов без родителя
# Отображение всех проектов
async def ProjectsOpen(a_Message : types.message):
user_access = GetUserAccess(a_Message.from_user.id)
await bot.send_message(a_Message.from_user.id, base_project_message, reply_markup = GetEditProjectKeyboardButtons(user_access))
await bot.send_message(a_Message.from_user.id, select_project_message, reply_markup = GetProjectsListKeyboardButtons(user_access, select_project_callback_prefix))
def GetProjectData(a_ProjectID):
project = GetProject(a_ProjectID)
if len(project) < 1:
log.Error(f'Проект не найден {project_id}')
msg = error_find_proj_message.replace('@project_id', project_id)
return msg, '', '', ''
p = project[0]
return '', p[0], p[1], p[2]
async def ShowProject(a_CallbackQuery : types.CallbackQuery):
project_id = str(a_CallbackQuery.data).replace(select_project_callback_prefix, '')
user_access = GetUserAccess(a_CallbackQuery.from_user.id)
project = GetProject(project_id)
if len(project) != 1:
log.Error(f'Проект не найден {project_id}')
msg = Ошибка.replace('@project_id', project_id)
msg, photo_id, name, desc = GetProjectData(project_id)
if msg != '':
await bot.send_message(a_CallbackQuery.from_user.id, msg, reply_markup = GetEditProjectKeyboardButtons(user_access))
return
p = project[0]
msg = project_open_message.replace('@proj_name', p[1]).replace('@proj_desk', p[2])
await bot.send_photo(a_CallbackQuery.from_user.id, p[0], msg, reply_markup = GetEditProjectKeyboardButtons(user_access))
msg = project_open_message.replace('@proj_name', name).replace('@proj_desk', desc)
if photo_id == '0':
await bot.send_message(a_CallbackQuery.from_user.id, msg, reply_markup = GetEditProjectKeyboardButtons(user_access))
else:
await bot.send_photo(a_CallbackQuery.from_user.id, photo_id, msg, reply_markup = GetEditProjectKeyboardButtons(user_access))
# Создание нового проекта
async def ProjectCreateCancel(a_Message : types.message, state : FSMContext):
user_access = GetUserAccess(a_Message.from_user.id)
@ -143,21 +203,27 @@ async def ProjectCreateCancel(a_Message : types.message, state : FSMContext):
async def ProjectCreate(a_Message : types.message):
user_access = GetUserAccess(a_Message.from_user.id)
await FSMCreateProject.prjPhoto.set()
await a_Message.answer(project_create_message_1, reply_markup = GetCancelKeyboardButtons(user_access))
await a_Message.answer(project_create_message_1, reply_markup = GetSkipAndCancelKeyboardButtons(user_access))
async def ProjectPhotoLoad(a_Message : types.message, state : FSMContext):
async def PhotoLoad(a_Message : types.message, state : FSMContext, a_FileID):
user_access = GetUserAccess(a_Message.from_user.id)
async with state.proxy() as prjData:
prjData['photo'] = a_Message.photo[0].file_id
prjData['photo'] = a_FileID
await FSMCreateProject.next()
await a_Message.answer(project_create_message_2, reply_markup = GetCancelKeyboardButtons(user_access))
async def ProjectPhotoLoad(a_Message : types.message, state : FSMContext):
await PhotoLoad(a_Message, state, a_Message.photo[0].file_id)
async def ProjectPhotoSkip(a_Message : types.message, state : FSMContext):
await PhotoLoad(a_Message, state, 0)
async def ProjectNameLoad(a_Message : types.message, state : FSMContext):
user_access = GetUserAccess(a_Message.from_user.id)
async with state.proxy() as prjData:
prjData['name'] = a_Message.text
await FSMCreateProject.next()
await a_Message.answer(project_create_message_3, reply_markup = GetCancelKeyboardButtons(user_access))
await FSMCreateProject.next()
await a_Message.answer(project_create_message_3, reply_markup = GetCancelKeyboardButtons(user_access))
async def ProjectDescLoad(a_Message : types.message, state : FSMContext):
user_access = GetUserAccess(a_Message.from_user.id)
@ -171,6 +237,77 @@ async def ProjectDescLoad(a_Message : types.message, state : FSMContext):
await state.finish()
await a_Message.answer(project_success_create_message, reply_markup = GetEditProjectKeyboardButtons(user_access))
# Редактирование проекта
async def ProjectSelectForEdit(a_Message : types.message):
user_access = GetUserAccess(a_Message.from_user.id)
await bot.send_message(a_Message.from_user.id, project_select_to_edit_message, reply_markup = GetProjectsListKeyboardButtons(user_access, select_to_edit_project_callback_prefix))
async def ProjectEditCancel(a_Message : types.message, state : FSMContext):
user_access = GetUserAccess(a_Message.from_user.id)
await state.finish()
await a_Message.answer(project_cancel_edit_message, reply_markup = GetEditProjectKeyboardButtons(user_access))
async def ProjectEdit(a_CallbackQuery : types.CallbackQuery, state : FSMContext):
user_access = GetUserAccess(a_CallbackQuery.from_user.id)
await FSMEditProject.prjID.set()
prjID = str(a_CallbackQuery.data).replace(select_to_edit_project_callback_prefix, '')
async with state.proxy() as prjData:
prjData['prjID'] = prjID
await FSMEditProject.next()
await bot.send_message(a_CallbackQuery.from_user.id, project_edit_message_1, reply_markup = GetSkipAndCancelKeyboardButtons(user_access))
async def PhotoEditLoad(a_Message : types.message, state : FSMContext, a_FileID):
user_access = GetUserAccess(a_Message.from_user.id)
project_id = 0
async with state.proxy() as prjData:
prjData['photo'] = a_FileID
project_id = prjData['prjID']
await FSMEditProject.next()
msg, photo_id, name, desc = GetProjectData(project_id)
if msg != '':
await bot.send_message(a_Message.from_user.id, msg, reply_markup = GetEditProjectKeyboardButtons(user_access))
return
await a_Message.answer(project_edit_message_2.replace('@proj_name', name), reply_markup = GetSkipAndCancelKeyboardButtons(user_access))
async def ProjectEditPhotoLoad(a_Message : types.message, state : FSMContext):
await PhotoEditLoad(a_Message, state, a_Message.photo[0].file_id)
async def ProjectEditPhotoSkip(a_Message : types.message, state : FSMContext):
project_id = 0
async with state.proxy() as prjData:
project_id = prjData['prjID']
msg, photo_id, name, desc = GetProjectData(project_id)
if msg != '':
await bot.send_message(a_Message.from_user.id, msg, reply_markup = GetEditProjectKeyboardButtons(user_access))
return
await PhotoEditLoad(a_Message, state, photo_id)
async def EditNameSkip(a_Message : types.message, state : FSMContext, a_Name):
user_access = GetUserAccess(a_Message.from_user.id)
async with state.proxy() as prjData:
prjData['name'] = a_Name
await FSMEditProject.next()
await a_Message.answer(project_edit_message_3, reply_markup = GetSkipAndCancelKeyboardButtons(user_access))
async def ProjectEditNameLoad(a_Message : types.message, state : FSMContext):
await EditNameSkip(a_Message, state, a_Message.text)
async def ProjectEditDescLoad(a_Message : types.message, state : FSMContext):
user_access = GetUserAccess(a_Message.from_user.id)
async with state.proxy() as prjData:
prjData['desc'] = a_Message.text
project_id = prjData['prjID']
prjPhoto = prjData['photo']
prjName = prjData['name']
prjDesc = prjData['desc']
EditProject(project_id, prjPhoto, prjName, prjDesc)
log.Success(f'Изменён проект {prjName} пользователем {a_Message.from_user.id}.')
await state.finish()
await a_Message.answer(project_success_edit_message, reply_markup = GetEditProjectKeyboardButtons(user_access))
# Удаление проекта
async def ProjectDelete(a_Message : types.message):
user_access = GetUserAccess(a_Message.from_user.id)
await bot.send_message(a_Message.from_user.id, project_select_to_delete_message, reply_markup = GetProjectsListKeyboardButtons(user_access, delete_project_callback_prefix))
@ -179,7 +316,7 @@ async def prjDelete(a_CallbackQuery : types.CallbackQuery):
user_access = GetUserAccess(a_CallbackQuery.from_user.id)
projectID = str(a_CallbackQuery.data).replace(delete_project_callback_prefix, '')
DelProject(projectID)
log.Success(f'Проект №{projectID} был удален пользователем {a_CallbackQuery.from_user.id}.')
log.Success(f'Проект №{projectID} был удалён пользователем {a_CallbackQuery.from_user.id}.')
await bot.send_message(a_CallbackQuery.from_user.id, project_success_delete_message, reply_markup = GetEditProjectKeyboardButtons(user_access))
# ---------------------------------------------------------
@ -210,11 +347,19 @@ def AddProject(a_prjPhoto, a_prjName, a_prjDesc):
db.close()
return
def EditProject(a_ProjectID, a_prjPhoto, a_prjName, a_prjDesc):
db = sqlite3.connect(bot_bd.GetBDFileName())
cursor = db.cursor()
cursor.execute('UPDATE projects SET projectPhoto = ?, projectName = ?, projectDesc = ? WHERE projectID = ?', (a_prjPhoto, a_prjName, a_prjDesc, a_ProjectID))
db.commit()
cursor.close()
db.close()
return
def DelProject(a_ProjectID):
db = sqlite3.connect(bot_bd.GetBDFileName())
cursor = db.cursor()
cursor.execute('DELETE FROM projects WHERE projectID = ?', ([a_ProjectID]))
#cursor.execute('DELETE FROM tasks WHERE projectID = ?', ([a_ProjectID]))
db.commit()
db.close()
return
@ -232,14 +377,29 @@ def GetButtonNames(a_UserAccess):
# Обработка кнопок
def RegisterHandlers(dp : Dispatcher):
# Список проектов
dp.register_message_handler(ProjectsOpen, text = projects_button_name)
dp.register_message_handler(ProjectsOpen, text = list_project_button_name)
dp.register_callback_query_handler(ShowProject, lambda x: x.data.startswith(select_project_callback_prefix))
# Добавление проекта
dp.register_message_handler(ProjectCreate, text = add_project_button_name)
dp.register_message_handler(ProjectPhotoSkip, text = projects_skip_button_name, state = FSMCreateProject.prjPhoto)
dp.register_message_handler(ProjectCreateCancel, text = projects_canсel_button_name, state = FSMCreateProject.prjPhoto)
dp.register_message_handler(ProjectCreateCancel, text = projects_canсel_button_name, state = FSMCreateProject.prjName)
dp.register_message_handler(ProjectCreateCancel, text = projects_canсel_button_name, state = FSMCreateProject.prjDesc)
dp.register_message_handler(ProjectPhotoLoad, content_types = ['photo'], state = FSMCreateProject.prjPhoto)
dp.register_message_handler(ProjectNameLoad, state = FSMCreateProject.prjName)
dp.register_message_handler(ProjectDescLoad, state = FSMCreateProject.prjDesc)
# Редактирование проекта
dp.register_message_handler(ProjectSelectForEdit, text = edit_project_button_name)
dp.register_callback_query_handler(ProjectEdit, lambda x: x.data.startswith(select_to_edit_project_callback_prefix))
dp.register_message_handler(ProjectEditPhotoSkip, text = projects_skip_button_name, state = FSMEditProject.prjPhoto)
dp.register_message_handler(ProjectEditCancel, text = projects_canсel_button_name, state = FSMEditProject.prjPhoto)
dp.register_message_handler(ProjectEditCancel, text = projects_canсel_button_name, state = FSMEditProject.prjName)
dp.register_message_handler(ProjectEditCancel, text = projects_canсel_button_name, state = FSMEditProject.prjDesc)
dp.register_message_handler(ProjectEditPhotoLoad, content_types = ['photo'], state = FSMEditProject.prjPhoto)
dp.register_message_handler(ProjectEditNameLoad, state = FSMEditProject.prjName)
dp.register_message_handler(ProjectEditDescLoad, state = FSMEditProject.prjDesc)
# Удаление проекта
dp.register_message_handler(ProjectDelete, text = del_project_button_name)
dp.register_callback_query_handler(prjDelete, lambda x: x.data.startswith(delete_project_callback_prefix))

Write Preview
Loading…
Cancel
Save