-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathbot_polya_backup.py
More file actions
1178 lines (982 loc) · 45 KB
/
Copy pathbot_polya_backup.py
File metadata and controls
1178 lines (982 loc) · 45 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
"""
Полевая учётка — регистрация Фамилия Имя, меню с кнопками,
иерархия локаций (группа: поля/склад → выбор конкретного поля),
кнопка Назад на каждом шаге, команды /today и /my,
права админа на общую статистику, и автоэкспорт Excel на Google Drive
(ежедневно 23:59, файл Reports-YYYY-MM.xlsx).
"""
import asyncio
import csv
import os
import sqlite3
from dataclasses import dataclass
from datetime import date, datetime, timedelta, time
from pathlib import Path
from typing import List, Optional, Tuple
from zoneinfo import ZoneInfo
from aiogram import Bot, Dispatcher, F
from aiogram.client.default import DefaultBotProperties
from aiogram.enums import ParseMode
from aiogram.filters import Command, CommandObject
from aiogram.fsm.context import FSMContext
from aiogram.fsm.state import State, StatesGroup
from aiogram.types import (
CallbackQuery,
InlineKeyboardButton,
InlineKeyboardMarkup,
Message,
)
from dotenv import load_dotenv
APP_VERSION = "build-2025-08-29-menu-back-stats-hours-fix"
# ========== UI helpers: правим одно сообщение вместо новых ==========
from aiogram.exceptions import TelegramBadRequest
async def edit_only(cq: CallbackQuery, text: str, kb: InlineKeyboardMarkup | None = None):
"""
Безопасно редактирует существующее сообщение.
Если текст не менялся — обновляет только клавиатуру.
"""
try:
await cq.message.edit_text(text, reply_markup=kb)
except TelegramBadRequest as e:
if "message is not modified" in str(e).lower():
try:
await cq.message.edit_reply_markup(reply_markup=kb)
except TelegramBadRequest:
pass
else:
raise
finally:
# обязательно отвечаем на callback, чтобы не висела «загрузка»
try:
await cq.answer()
except Exception:
pass
# ===================================================================
dp = Dispatcher()
CFG = None
TZ: ZoneInfo = None
# ---------------- Конфиг ----------------
@dataclass
class Config:
token: str
tz: str
admin_ids: List[int]
admin_usernames: List[str]
sa_json: str
drive_folder_id: str
def _split_csv(env_value: str) -> List[str]:
return [s.strip() for s in (env_value or "").split(",") if s.strip()]
def load_config() -> Config:
load_dotenv()
token = os.getenv("BOT_TOKEN", "").strip()
if not token:
raise RuntimeError("BOT_TOKEN not set in .env")
tz = os.getenv("TZ", "Europe/Moscow").strip()
raw_admins = _split_csv(os.getenv("ADMIN_IDS", ""))
admin_ids: List[int] = []
admin_usernames: List[str] = []
for item in raw_admins:
if item.isdigit():
admin_ids.append(int(item))
else:
admin_usernames.append(item.lstrip("@").lower())
sa_json = os.getenv("GOOGLE_SERVICE_ACCOUNT_JSON", "").strip()
drive_folder_id = os.getenv("DRIVE_FOLDER_ID", "").strip()
return Config(
token=token,
tz=tz,
admin_ids=admin_ids,
admin_usernames=admin_usernames,
sa_json=sa_json,
drive_folder_id=drive_folder_id,
)
def is_admin_user(user_id: int, username: Optional[str], cfg: Config) -> bool:
if user_id in cfg.admin_ids:
return True
if username and username.lower() in cfg.admin_usernames:
return True
return False
# ---------------- БД ----------------
DB_PATH = Path("reports.db")
def _column_exists(conn: sqlite3.Connection, table: str, column: str) -> bool:
cur = conn.cursor()
cur.execute(f"PRAGMA table_info({table})")
return any(r[1] == column for r in cur.fetchall())
def init_db() -> None:
with sqlite3.connect(DB_PATH) as conn:
c = conn.cursor()
c.execute(
"""
CREATE TABLE IF NOT EXISTS reports (
id INTEGER PRIMARY KEY AUTOINCREMENT,
created_at TEXT NOT NULL,
user_id INTEGER NOT NULL,
full_name TEXT,
username TEXT,
location TEXT NOT NULL,
activity TEXT NOT NULL,
work_date TEXT NOT NULL,
hours INTEGER NOT NULL,
chat_id INTEGER NOT NULL
)
"""
)
c.execute(
"""
CREATE TABLE IF NOT EXISTS users (
user_id INTEGER PRIMARY KEY,
full_name TEXT NOT NULL,
username TEXT,
created_at TEXT NOT NULL
)
"""
)
c.execute(
"""
CREATE TABLE IF NOT EXISTS loc_groups (
id INTEGER PRIMARY KEY AUTOINCREMENT,
name TEXT NOT NULL UNIQUE
)
"""
)
c.execute(
"""
CREATE TABLE IF NOT EXISTS locations (
id INTEGER PRIMARY KEY AUTOINCREMENT,
name TEXT NOT NULL,
group_id INTEGER,
FOREIGN KEY (group_id) REFERENCES loc_groups (id)
)
"""
)
c.execute(
"""
CREATE TABLE IF NOT EXISTS activities (
id INTEGER PRIMARY KEY AUTOINCREMENT,
name TEXT NOT NULL,
kind TEXT NOT NULL
)
"""
)
# миграция на случай старой схемы без full_name
if not _column_exists(conn, "reports", "full_name"):
c.execute("ALTER TABLE reports ADD COLUMN full_name TEXT")
# Добавляем базовые группы локаций
c.execute("INSERT OR IGNORE INTO loc_groups (name) VALUES ('поля')")
c.execute("INSERT OR IGNORE INTO loc_groups (name) VALUES ('склад')")
# Добавляем базовые локации
for field in FIELDS:
c.execute("INSERT OR IGNORE INTO locations (name, group_id) VALUES (?, (SELECT id FROM loc_groups WHERE name = 'поля'))", (field,))
# Добавляем базовые виды работ
for activity in TECH_ACTIVITIES:
c.execute("INSERT OR IGNORE INTO activities (name, kind) VALUES (?, 'tech')", (activity,))
for activity in MANUAL_ACTIVITIES:
c.execute("INSERT OR IGNORE INTO activities (name, kind) VALUES (?, 'manual')", (activity,))
conn.commit()
def upsert_user(user_id: int, full_name: str, tz: ZoneInfo, username: Optional[str] = None) -> None:
now = datetime.now(tz).isoformat(timespec="seconds")
with sqlite3.connect(DB_PATH) as conn:
c = conn.cursor()
c.execute(
"""
INSERT INTO users (user_id, full_name, username, created_at)
VALUES (?, ?, ?, ?)
ON CONFLICT(user_id) DO UPDATE SET full_name=excluded.full_name, username=excluded.username
""",
(user_id, full_name, username, now),
)
conn.commit()
def get_registered_name(user_id: int) -> Optional[str]:
with sqlite3.connect(DB_PATH) as conn:
c = conn.cursor()
c.execute("SELECT full_name FROM users WHERE user_id=?", (user_id,))
row = c.fetchone()
return row[0] if row else None
def insert_report(
created_at: str,
user_id: int,
full_name: str,
username: Optional[str],
location: str,
activity: str,
work_date: str,
hours: int,
chat_id: int,
) -> None:
with sqlite3.connect(DB_PATH) as conn:
c = conn.cursor()
c.execute(
"""
INSERT INTO reports
(created_at, user_id, full_name, username, location, activity, work_date, hours, chat_id)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
""",
(created_at, user_id, full_name, username, location, activity, work_date, hours, chat_id),
)
conn.commit()
def fetch_reports_between(
start: date,
end: date,
for_user_id: Optional[int] = None,
) -> List[Tuple[str, str, str, str, str, int]]:
with sqlite3.connect(DB_PATH) as conn:
c = conn.cursor()
sql = """
SELECT work_date, full_name, username, location, activity, hours
FROM reports
WHERE date(work_date) >= date(?) AND date(work_date) <= date(?)
"""
params: List = [start.isoformat(), end.isoformat()]
if for_user_id is not None:
sql += " AND user_id = ?"
params.append(for_user_id)
sql += " ORDER BY work_date ASC, created_at ASC"
c.execute(sql, tuple(params))
return c.fetchall()
# ---------------- Константы локаций ----------------
LOCATION_GROUPS = ["поля", "склад"]
FIELDS = [
"Северное", "Фазенда", "5 га", "58 га", "Фермерское", "Сад",
"Чеки №1", "Чеки №2", "Чеки №3", "Рогачи (б)", "Рогачи(М)",
"Владимирова Аренда", "МТФ"
]
# ---------------- Клавиатуры ----------------
def rows(items: List[InlineKeyboardButton], n: int) -> List[List[InlineKeyboardButton]]:
return [items[i:i + n] for i in range(0, len(items), n)]
def kb_back_cancel() -> InlineKeyboardMarkup:
return InlineKeyboardMarkup(
inline_keyboard=[
[
InlineKeyboardButton(text="⬅️ Назад", callback_data="back"),
InlineKeyboardButton(text="❌ Отмена", callback_data="cancel"),
]
]
)
def main_menu_kb(is_admin: bool) -> InlineKeyboardMarkup:
rows = [
[InlineKeyboardButton(text="🚜 Работа", callback_data="menu:work")],
[InlineKeyboardButton(text="📊 Статистика", callback_data="menu:stats")],
[InlineKeyboardButton(text="✏️ Изменить имя", callback_data="menu:name")],
[InlineKeyboardButton(text="📝 Перепись (24ч)", callback_data="menu:edit24")],
]
if is_admin:
rows.insert(0, [InlineKeyboardButton(text="⚙️ Админ", callback_data="menu:admin")])
return InlineKeyboardMarkup(inline_keyboard=rows)
def admin_keyboard() -> InlineKeyboardMarkup:
rows = [
[InlineKeyboardButton(text="➕ Добавить локацию", callback_data="adm:add_loc")],
[InlineKeyboardButton(text="➖ Удалить локацию", callback_data="adm:del_loc")],
[InlineKeyboardButton(text="➕ Добавить вид работы (Техника)", callback_data="adm:add_act_tech")],
[InlineKeyboardButton(text="➕ Добавить вид работы (Ручная)", callback_data="adm:add_act_manual")],
[InlineKeyboardButton(text="➖ Удалить вид работы", callback_data="adm:del_act")],
[InlineKeyboardButton(text="⬅️ Назад", callback_data="back:menu")],
]
return InlineKeyboardMarkup(inline_keyboard=rows)
async def show_main_menu_cq(cq: CallbackQuery):
await edit_only(
cq,
"Главное меню",
main_menu_kb(is_admin_user(cq.from_user.id, cq.from_user.username, CFG)),
)
@dp.callback_query(F.data == "menu:admin")
async def open_admin(cq: CallbackQuery):
await edit_only(cq, "⚙️ Админ-панель", admin_keyboard())
@dp.callback_query(F.data.startswith("back:"))
async def on_back(cq: CallbackQuery):
dest = cq.data.split(":", 1)[1]
if dest == "menu":
return await show_main_menu_cq(cq)
if dest == "admin":
return await edit_only(cq, "⚙️ Админ-панель", admin_keyboard())
# по умолчанию просто закроем загрузку
await cq.answer("Назад недоступен.", show_alert=True)
import sqlite3
DB_PATH = "reports.db" # если у тебя переменная называется иначе — подставь её
# ——— Удалить локацию
@dp.callback_query(F.data == "adm:del_loc")
async def adm_del_loc(cq: CallbackQuery):
items = db_all_locations()
if not items:
await cq.answer("Список локаций пуст", show_alert=True)
return await edit_only(cq, "⚙️ Админ-панель", admin_keyboard())
# соберём клавиатуру
pairs = [(f"🗑 {title}", f"del_loc:{loc_id}") for loc_id, title in items]
# небольшой универсальный билдер рядов
kb_rows, row, per_row = [], [], 2
for i, (txt, cb) in enumerate(pairs, 1):
row.append(InlineKeyboardButton(text=txt, callback_data=cb))
if i % per_row == 0:
kb_rows.append(row); row = []
if row: kb_rows.append(row)
kb_rows.append([InlineKeyboardButton(text="⬅️ Назад", callback_data="back:admin")])
kb = InlineKeyboardMarkup(inline_keyboard=kb_rows)
await edit_only(cq, "Выберите локацию для удаления:", kb)
@dp.callback_query(F.data.startswith("del_loc:"))
async def _del_loc(cq: CallbackQuery):
loc_id = int(cq.data.split(":", 1)[1])
db_delete_location(loc_id)
await cq.answer("Удалено")
return await adm_del_loc(cq)
# ——— Удалить вид работы
@dp.callback_query(F.data == "adm:del_act")
async def adm_del_act(cq: CallbackQuery):
items = db_all_activities()
if not items:
await cq.answer("Список видов работ пуст", show_alert=True)
return await edit_only(cq, "⚙️ Админ-панель", admin_keyboard())
pairs = [(f"🗑 {title}", f"del_act:{aid}") for aid, title in items]
kb_rows, row, per_row = [], [], 2
for i, (txt, cb) in enumerate(pairs, 1):
row.append(InlineKeyboardButton(text=txt, callback_data=cb))
if i % per_row == 0:
kb_rows.append(row); row = []
if row: kb_rows.append(row)
kb_rows.append([InlineKeyboardButton(text="⬅️ Назад", callback_data="back:admin")])
kb = InlineKeyboardMarkup(inline_keyboard=kb_rows)
await edit_only(cq, "Выберите вид работы для удаления:", kb)
@dp.callback_query(F.data.startswith("del_act:"))
async def _del_act(cq: CallbackQuery):
act_id = int(cq.data.split(":", 1)[1])
db_delete_activity(act_id)
await cq.answer("Удалено")
return await adm_del_act(cq)
# ——— Добавить локацию
@dp.callback_query(F.data == "adm:add_loc")
async def adm_add_loc(cq: CallbackQuery):
kb = InlineKeyboardMarkup(inline_keyboard=[
[
InlineKeyboardButton(text="Поля", callback_data="adm:add_loc_kind:fields"),
InlineKeyboardButton(text="Склад", callback_data="adm:add_loc_kind:storage"),
],
[InlineKeyboardButton(text="⬅️ Назад", callback_data="back:admin")]
])
await edit_only(cq, "Выберите группу для новой локации:", kb)
@dp.callback_query(F.data.startswith("adm:add_loc_kind:"))
async def adm_add_loc_kind(cq: CallbackQuery):
kind = cq.data.split(":", 1)[1]
await cq.message.edit_text(
f"Введите название новой локации (группа: {kind}):",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[
[InlineKeyboardButton(text="⬅️ Назад", callback_data="adm:add_loc")]
])
)
# Здесь нужно добавить состояние для ожидания ввода названия локации
# ——— Добавить вид работы
@dp.callback_query(F.data == "adm:add_act_tech")
async def adm_add_act_tech(cq: CallbackQuery):
await cq.message.edit_text(
"Введите название нового вида работы (техника):",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[
[InlineKeyboardButton(text="⬅️ Назад", callback_data="back:admin")]
])
)
# Здесь нужно добавить состояние для ожидания ввода названия работы
@dp.callback_query(F.data == "adm:add_act_manual")
async def adm_add_act_manual(cq: CallbackQuery):
await cq.message.edit_text(
"Введите название нового вида работы (ручная):",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[
[InlineKeyboardButton(text="⬅️ Назад", callback_data="back:admin")]
])
)
# Здесь нужно добавить состояние для ожидания ввода названия работы
async def send_stats(user_id: Optional[int], message: Message, range_days: int, title: str, is_admin: bool, edit_with_callback: Optional[CallbackQuery] = None):
"""Отправляет статистику, поддерживает как обычные сообщения, так и редактирование через callback."""
today = datetime.now(TZ).date()
if range_days == 1:
start = end = today
else:
start = today - timedelta(days=range_days-1)
end = today
rows = fetch_reports_between(start, end, for_user_id=None if is_admin else user_id)
if not rows:
scope = "всех" if is_admin else "ваши"
text = f"Записей {title} ({scope}) нет."
if edit_with_callback:
await edit_with_callback.message.edit_text(text, reply_markup=kb_stats_menu())
else:
await message.answer(text)
return
total = sum(r[5] for r in rows)
lines = [f"<b>Статистика {title}:</b> всего часов: <b>{total}</b>"]
for i, (wd, reg, uname, loc, act, hrs) in enumerate(rows[:20], 1):
who = reg or (f"@{uname}" if uname else "-")
lines.append(f"{i}. {wd} • {who} • {loc} • {act} — <b>{hrs}</b> ч")
if len(rows) > 20:
lines.append(f"... и ещё {len(rows)-20} записей")
text = "\n".join(lines)
if edit_with_callback:
await edit_with_callback.message.edit_text(text, parse_mode=ParseMode.HTML, reply_markup=kb_stats_menu())
else:
await message.answer(text, parse_mode=ParseMode.HTML)
@dp.callback_query(F.data == "stat:today")
async def stat_today_cq(cq: CallbackQuery):
admin = is_admin_user(cq.from_user.id, cq.from_user.username, CFG)
await send_stats(
user_id=None if admin else cq.from_user.id,
message=cq.message,
range_days=1,
title="Сегодня",
is_admin=admin,
edit_with_callback=cq
)
def db_all_locations() -> list[tuple[int, str]]:
with sqlite3.connect(DB_PATH) as conn:
conn.row_factory = sqlite3.Row
rows = conn.execute("""
SELECT l.id AS id,
COALESCE(g.name || ' · ', '') || l.name AS title
FROM locations l
LEFT JOIN loc_groups g ON g.id = l.group_id
ORDER BY g.name NULLS FIRST, l.name
""").fetchall()
return [(r["id"], r["title"]) for r in rows]
def db_delete_location(loc_id: int) -> None:
with sqlite3.connect(DB_PATH) as conn:
conn.execute("DELETE FROM locations WHERE id=?", (loc_id,))
conn.commit()
def db_all_activities() -> list[tuple[int, str]]:
with sqlite3.connect(DB_PATH) as conn:
conn.row_factory = sqlite3.Row
rows = conn.execute("""
SELECT a.id AS id,
(CASE WHEN a.kind='tech' THEN 'Техника'
WHEN a.kind='manual' THEN 'Ручная'
ELSE 'Другое' END) || ' · ' || a.name AS title
FROM activities a
ORDER BY a.kind, a.name
""").fetchall()
return [(r["id"], r["title"]) for r in rows]
def db_delete_activity(act_id: int) -> None:
with sqlite3.connect(DB_PATH) as conn:
conn.execute("DELETE FROM activities WHERE id=?", (act_id,))
conn.commit()
def add_location(name: str, kind: str):
"""Добавляет новую локацию в базу данных."""
with sqlite3.connect(DB_PATH) as conn:
# Определяем group_id на основе kind
if kind == "fields":
group_name = "поля"
elif kind == "storage":
group_name = "склад"
else:
group_name = kind
# Получаем или создаем group_id
c = conn.cursor()
c.execute("SELECT id FROM loc_groups WHERE name = ?", (group_name,))
result = c.fetchone()
if result:
group_id = result[0]
else:
c.execute("INSERT INTO loc_groups (name) VALUES (?)", (group_name,))
group_id = c.lastrowid
# Добавляем локацию
c.execute("INSERT INTO locations (name, group_id) VALUES (?, ?)", (name, group_id))
conn.commit()
def add_activity(name: str, category: str):
"""Добавляет новый вид работы в базу данных."""
with sqlite3.connect(DB_PATH) as conn:
# Определяем kind на основе category
if category == "tech":
kind = "tech"
elif category == "manual":
kind = "manual"
else:
kind = "other"
c = conn.cursor()
c.execute("INSERT INTO activities (name, kind) VALUES (?, ?)", (name, kind))
conn.commit()
def kb_stats_menu() -> InlineKeyboardMarkup:
return InlineKeyboardMarkup(
inline_keyboard=[
[
InlineKeyboardButton(text="Сегодня", callback_data="stats:today"),
InlineKeyboardButton(text="Неделя", callback_data="stats:week"),
],
*kb_back_cancel().inline_keyboard,
]
)
def kb_work_types() -> InlineKeyboardMarkup:
btns = [
InlineKeyboardButton(text="🚜 техника", callback_data="wtype:техника"),
InlineKeyboardButton(text="🧰 ручная", callback_data="wtype:ручная"),
]
ik = rows(btns, 2)
ik += kb_back_cancel().inline_keyboard
return InlineKeyboardMarkup(inline_keyboard=ik)
TECH_ACTIVITIES = (
"пахота",
"чизелевание",
"дискование",
"культивация сплошная",
"культивация междурядная",
"опрыскивание",
"комбайн уборка",
"сев",
"боронование",
)
MANUAL_ACTIVITIES = ("прополка", "сбор", "полив", "монтаж", "ремонт", "прочее")
def kb_tech_activities() -> InlineKeyboardMarkup:
btns = [InlineKeyboardButton(text=a, callback_data=f"act:{a}") for a in TECH_ACTIVITIES]
ik = rows(btns, 2)
ik += kb_back_cancel().inline_keyboard
return InlineKeyboardMarkup(inline_keyboard=ik)
def kb_manual_activities() -> InlineKeyboardMarkup:
btns = [InlineKeyboardButton(text=a, callback_data=f"act:{a}") for a in MANUAL_ACTIVITIES]
ik = rows(btns, 2)
ik += kb_back_cancel().inline_keyboard
return InlineKeyboardMarkup(inline_keyboard=ik)
def kb_activity_for(wtype: str) -> InlineKeyboardMarkup:
return kb_tech_activities() if wtype == "техника" else kb_manual_activities()
def kb_location_group() -> InlineKeyboardMarkup:
btns = [
[
InlineKeyboardButton(text="поля", callback_data="locgrp:поля"),
InlineKeyboardButton(text="склад", callback_data="locgrp:склад"),
],
*kb_back_cancel().inline_keyboard,
]
return InlineKeyboardMarkup(inline_keyboard=btns)
def kb_location_fields() -> InlineKeyboardMarkup:
btns = [InlineKeyboardButton(text=name, callback_data=f"field:{name}") for name in FIELDS]
ik = rows(btns, 2)
ik += kb_back_cancel().inline_keyboard
return InlineKeyboardMarkup(inline_keyboard=ik)
def human_date_label(d: date, today: date) -> str:
if d == today:
return f"Сегодня ({d.strftime('%d.%m')})"
if d == today - timedelta(days=1):
return f"Вчера ({d.strftime('%d.%m')})"
if d == today + timedelta(days=1):
return f"Завтра ({d.strftime('%d.%m')})"
return d.strftime("%d.%m (%a)")
def kb_dates() -> InlineKeyboardMarkup:
today = datetime.now(TZ).date()
choices = [today + timedelta(days=o) for o in (-2, -1, 0, 1, 2)]
btns = [InlineKeyboardButton(text=human_date_label(d, today), callback_data=f"date:{d.isoformat()}") for d in choices]
ik = rows(btns, 1)
ik += kb_back_cancel().inline_keyboard
return InlineKeyboardMarkup(inline_keyboard=ik)
def kb_hours() -> InlineKeyboardMarkup:
btns = [InlineKeyboardButton(text=str(i), callback_data=f"hrs:{i}") for i in range(1, 25)]
ik = rows(btns, 6)
ik += kb_back_cancel().inline_keyboard
return InlineKeyboardMarkup(inline_keyboard=ik)
# ---------------- FSM ----------------
class ReportStates(StatesGroup):
awaiting_full_name = State()
choosing_work_type = State()
choosing_activity = State()
waiting_activity_text = State()
choosing_location_group = State()
choosing_location = State()
choosing_date = State()
choosing_hours = State()
# ---------------- Меню / регистрация ----------------
async def show_menu(message: Message, reg: str):
await message.answer(
f"Привет! Вы зарегистрированы как: *{reg}*\nВыберите действие:",
reply_markup=main_menu_kb(is_admin_user(message.from_user.id, message.from_user.username, CFG)),
parse_mode=ParseMode.MARKDOWN,
)
async def cmd_start(message: Message, state: FSMContext):
await state.clear()
reg = get_registered_name(message.from_user.id)
if not reg:
await state.set_state(ReportStates.awaiting_full_name)
await message.answer(
"👋 Для начала укажите *Фамилию и Имя* (свободная форма):",
parse_mode=ParseMode.MARKDOWN,
)
return
await show_menu(message, reg)
async def cmd_register(message: Message, state: FSMContext):
await state.set_state(ReportStates.awaiting_full_name)
await message.answer("Введите *Фамилию и Имя* заново:", parse_mode=ParseMode.MARKDOWN)
async def capture_full_name(message: Message, state: FSMContext):
text = (message.text or "").strip()
if len(text) < 3:
await message.answer("Слишком коротко. Укажите *Фамилию и Имя* полностью.", parse_mode=ParseMode.MARKDOWN)
return
upsert_user(message.from_user.id, text, TZ, message.from_user.username)
await message.answer(f"Готово! Вы зарегистрированы как: *{text}*.", parse_mode=ParseMode.MARKDOWN)
await show_menu(message, text)
await state.clear()
async def menu_click(call: CallbackQuery, state: FSMContext):
await call.answer() # не висим
data = call.data.split(":", 1)[1]
reg = get_registered_name(call.from_user.id) or "(не зарегистрирован)"
if data == "work":
await state.set_state(ReportStates.choosing_work_type)
await call.message.edit_text("Выберите *виды работ*:", reply_markup=kb_work_types(), parse_mode=ParseMode.MARKDOWN)
elif data == "stats":
await call.message.edit_text("Статистика:", reply_markup=kb_stats_menu())
# ---------------- Статистика ----------------
async def show_stats(message: Message, tz: ZoneInfo, for_user_id: Optional[int], period: str, as_admin: bool):
today = datetime.now(tz).date()
if period == "today":
start = end = today
title = "за сегодня"
else:
start = today - timedelta(days=6)
end = today
title = "за неделю"
rows = fetch_reports_between(start, end, for_user_id=None if as_admin else for_user_id)
if not rows:
scope = "всех" if as_admin else "ваши"
await message.answer(f"Записей {title} ({scope}) нет.")
return
total = sum(r[5] for r in rows)
lines = [f"<b>Статистика {title}:</b> всего часов: <b>{total}</b>"]
for i, (wd, reg, uname, loc, act, hrs) in enumerate(rows[:20], 1):
who = reg or (f"@{uname}" if uname else "-")
lines.append(f"{i}. {wd} • {who} • {loc} • {act} — <b>{hrs}</b> ч")
if len(rows) > 20:
lines.append(f"... и ещё {len(rows)-20} записей")
await message.answer("\n".join(lines), parse_mode=ParseMode.HTML)
async def cmd_today(message: Message):
await show_stats(
message=message,
tz=TZ,
for_user_id=message.from_user.id,
period="today",
as_admin=is_admin_user(message.from_user.id, message.from_user.username, CFG),
)
async def cmd_my(message: Message):
await show_stats(
message=message,
tz=TZ,
for_user_id=message.from_user.id,
period="week",
as_admin=False,
)
async def stats_click(call: CallbackQuery, state: FSMContext):
"""Обработка кнопок 'Сегодня' / 'Неделя' из меню статистики."""
await call.answer() # сразу отвечаем, чтобы не висело
what = call.data.split(":", 1)[1]
is_admin = is_admin_user(call.from_user.id, call.from_user.username, CFG)
if what == "today":
await show_stats(call.message, TZ, call.from_user.id, "today", is_admin)
else:
await show_stats(call.message, TZ, call.from_user.id, "week", is_admin)
# ---------------- Рабочий поток ----------------
async def handle_work_type(call: CallbackQuery, state: FSMContext):
await call.answer()
wtype = call.data.split(":", 1)[1]
await state.update_data(work_type=wtype)
if wtype == "техника":
await call.message.edit_text("Техника → выберите вид работы:", reply_markup=kb_tech_activities())
else:
await call.message.edit_text("Ручная → выберите вид работы:", reply_markup=kb_manual_activities())
await state.set_state(ReportStates.choosing_activity)
async def handle_activity(call: CallbackQuery, state: FSMContext):
await call.answer()
act = call.data.split(":", 1)[1]
if act == "прочее":
await state.set_state(ReportStates.waiting_activity_text)
await call.message.edit_text("Укажите название работы (произвольный текст):")
return
await state.update_data(activity=act)
await call.message.edit_text(
f"Работа: <b>{act}</b>\nТеперь выберите *место работы*: 'поля' или 'склад'.",
reply_markup=kb_location_group(),
parse_mode=ParseMode.HTML,
)
await state.set_state(ReportStates.choosing_location_group)
async def capture_custom_activity(message: Message, state: FSMContext):
act = (message.text or "").strip()
if not act:
await message.answer("Пустое название, введите ещё раз:")
return
await state.update_data(activity=act)
await message.answer(
f"Работа: <b>{act}</b>\nТеперь выберите *место работы*: 'поля' или 'склад'.",
reply_markup=kb_location_group(),
parse_mode=ParseMode.HTML,
)
await state.set_state(ReportStates.choosing_location_group)
async def on_loc_group(c: CallbackQuery, state: FSMContext):
await c.answer()
grp = c.data.split(":", 1)[1] # "поля" или "склад"
await state.update_data(loc_group=grp)
if grp == "склад":
await state.update_data(location="склад")
await state.set_state(ReportStates.choosing_date)
await c.message.edit_text("Дата: выберите число (±2 дня):", reply_markup=kb_dates())
else:
await state.set_state(ReportStates.choosing_location)
await c.message.edit_text("Выберите локацию (поле):", reply_markup=kb_location_fields())
async def on_field(c: CallbackQuery, state: FSMContext):
await c.answer()
name = c.data.split(":", 1)[1]
await state.update_data(location=name)
await state.set_state(ReportStates.choosing_date)
await c.message.edit_text("Дата: выберите число (±2 дня):", reply_markup=kb_dates())
async def handle_location(call: CallbackQuery, state: FSMContext):
# (не используется в новой логике; оставлено на случай совместимости)
await call.answer()
async def handle_date(call: CallbackQuery, state: FSMContext):
await call.answer()
d = call.data.split(":", 1)[1]
await state.update_data(work_date=d)
await call.message.edit_text(
f"Дата: <b>{d}</b>\nСколько часов отработано?",
parse_mode=ParseMode.HTML,
reply_markup=kb_hours(),
)
await state.set_state(ReportStates.choosing_hours)
async def handle_hours(call: CallbackQuery, state: FSMContext):
await call.answer()
hrs = int(call.data.split(":", 1)[1])
data = await state.get_data()
created_at = datetime.now(TZ).isoformat(timespec="seconds")
full_name = get_registered_name(call.from_user.id) or ""
username = call.from_user.username
insert_report(
created_at=created_at,
user_id=call.from_user.id,
full_name=full_name,
username=username,
location=data["location"],
activity=data["activity"],
work_date=data["work_date"],
hours=hrs,
chat_id=call.message.chat.id,
)
await call.message.edit_text(
"✅ Запись сохранена\n\n"
f"Работник: {full_name or ('@'+(username or ''))}\n"
f"Место: {data.get('loc_group', '-')}; {data['location']}\n"
f"Работа: {data['activity']}\n"
f"Дата: {data['work_date']}\n"
f"Часы: {hrs}",
)
await state.clear()
# ---------------- Назад / Отмена ----------------
async def on_back(call: CallbackQuery, state: FSMContext):
await call.answer()
st = await state.get_state()
data = await state.get_data()
if st == ReportStates.choosing_work_type.state:
reg = get_registered_name(call.from_user.id) or "(не зарегистрирован)"
await call.message.edit_text("Главное меню:", reply_markup=main_menu_kb(is_admin_user(call.from_user.id, call.from_user.username, CFG)))
await state.clear()
return
if st == ReportStates.choosing_activity.state:
await call.message.edit_text("Выберите *виды работ*:", reply_markup=kb_work_types(), parse_mode=ParseMode.MARKDOWN)
await state.set_state(ReportStates.choosing_work_type)
return
if st == ReportStates.waiting_activity_text.state:
await call.message.edit_text("Выберите вид работы (ручная):", reply_markup=kb_manual_activities())
await state.set_state(ReportStates.choosing_activity)
return
if st == ReportStates.choosing_location_group.state:
# назад к выбору активности (с учётом типа работ)
wtype = data.get("work_type", "ручная")
await call.message.edit_text(
"Выберите вид работы:",
reply_markup=kb_activity_for(wtype),
)
await state.set_state(ReportStates.choosing_activity)
return
if st == ReportStates.choosing_location.state:
await call.message.edit_text("Выберите *место работы*:", reply_markup=kb_location_group())
await state.set_state(ReportStates.choosing_location_group)
return
if st == ReportStates.choosing_date.state:
# если был выбран путь через "поля" → вернём список полей, иначе к выбору группы
if data.get("loc_group") == "поля":
await call.message.edit_text("Выберите локацию (поле):", reply_markup=kb_location_fields())
await state.set_state(ReportStates.choosing_location)
else:
await call.message.edit_text("Выберите *место работы*:", reply_markup=kb_location_group())
await state.set_state(ReportStates.choosing_location_group)
return
if st == ReportStates.choosing_hours.state:
await call.message.edit_text("Дата: выберите число (±2 дня):", reply_markup=kb_dates())
await state.set_state(ReportStates.choosing_date)
return
await call.message.answer("Назад недоступен.")
async def on_cancel(call: CallbackQuery, state: FSMContext):
await call.answer("Отменено")
await state.clear()
reg = get_registered_name(call.from_user.id) or "(не зарегистрирован)"
await call.message.edit_text("Главное меню:", reply_markup=main_menu_kb(is_admin_user(call.from_user.id, call.from_user.username, CFG)))
# ---------------- Экспорт CSV ----------------
def export_month_csv(yyyymm: str) -> Path:
year, month = map(int, yyyymm.split("-"))
start = date(year, month, 1)
end = date(year + (month == 12), (month % 12) + 1, 1)
out = Path(f"reports_{yyyymm}.csv")
with sqlite3.connect(DB_PATH) as conn, out.open("w", newline="", encoding="utf-8") as f:
c = conn.cursor()
c.execute(
"""
SELECT created_at, user_id, full_name, username, location, activity, work_date, hours, chat_id
FROM reports
WHERE date(work_date) >= date(?) AND date(work_date) < date(?)
ORDER BY work_date ASC, created_at ASC
""",
(start.isoformat(), end.isoformat()),
)
writer = csv.writer(f)
writer.writerow(["created_at","user_id","full_name","username","location","activity","work_date","hours","chat_id"])
for row in c.fetchall():
writer.writerow(row)
return out
async def cmd_export(message: Message, command: CommandObject):
if not is_admin_user(message.from_user.id, message.from_user.username, CFG):
await message.answer("Команда доступна только админам.")
return
now = datetime.now(TZ)
if command.args:
yyyymm = command.args.strip()
try:
datetime.strptime(yyyymm, "%Y-%m")
except ValueError: