KIT_NK/telegram-bot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

еще попытка сортировки

Browse Source
This commit is contained in:
Professional 2025-03-19 23:06:45 +07:00
parent c106e1cac3
commit e808cae59c
1 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
Program.cs
View File

@ -562,9 +562,9 @@ class Program
{ {
await connection.OpenAsync(); await connection.OpenAsync();
var command = connection.CreateCommand(); var command = connection.CreateCommand();
command.CommandText = "SELECT Id, Description, Status, Priority FROM Reports WHERE Status != 'закрыта' ORDER BY CASE Priority WHEN 'высокий' THEN 1 WHEN 'средний' THEN 2 ELSE 3 END"; command.CommandText = "SELECT Id, Description, Status, Priority FROM Reports WHERE Status != 'закрыта'";
var buttons = new List<InlineKeyboardButton[]>(); var reports = new List<(long Id, string Description, string Status, string Priority)>();
using (var reader = await command.ExecuteReaderAsync()) using (var reader = await command.ExecuteReaderAsync())
{ {
@ -574,18 +574,29 @@ class Program
string description = reader.GetString(1).Substring(0, Math.Min(20, reader.GetString(1).Length)); string description = reader.GetString(1).Substring(0, Math.Min(20, reader.GetString(1).Length));
string status = reader.GetString(2); string status = reader.GetString(2);
string priority = reader.GetString(3); string priority = reader.GetString(3);
string statusEmoji = GetStatusEmoji(status);
string priorityMarker = priority.ToLower() == "высокий" ? "⚠️" : "";
buttons.Add(new[] reports.Add((id, description, status, priority));
{
InlineKeyboardButton.WithCallbackData(
$"{priorityMarker} #{id} - {statusEmoji} {status} - {description}...",
$"report_{id}")
});
} }
} }
// Сортируем заявки по приоритету
reports.Sort((x, y) => string.Compare(y.Priority, x.Priority, StringComparison.Ordinal));
var buttons = new List<InlineKeyboardButton[]>();
foreach (var report in reports)
{
string statusEmoji = GetStatusEmoji(report.Status);
string priorityMarker = report.Priority.ToLower() == "высокий" ? "⚠️" : "";
buttons.Add(new[]
{
InlineKeyboardButton.WithCallbackData(
$"{priorityMarker} #{report.Id} - {statusEmoji} {report.Status} - {report.Description}...",
$"report_{report.Id}")
});
}
// Добавляем кнопки навигации // Добавляем кнопки навигации
buttons.Add(new[] buttons.Add(new[]
{ {
@ -611,6 +622,7 @@ class Program
private static async Task ViewArchivedReports(ITelegramBotClient botClient, long chatId) private static async Task ViewArchivedReports(ITelegramBotClient botClient, long chatId)
{ {
string connectionString = "Data Source=bot.db"; string connectionString = "Data Source=bot.db";
@ -621,9 +633,9 @@ class Program
{ {
await connection.OpenAsync(); await connection.OpenAsync();
var command = connection.CreateCommand(); var command = connection.CreateCommand();
command.CommandText = "SELECT Id, Description, Status, Priority FROM Reports WHERE Status = 'закрыта' ORDER BY CASE Priority WHEN 'высокий' THEN 1 WHEN 'средний' THEN 2 ELSE 3 END"; command.CommandText = "SELECT Id, Description, Status, Priority FROM Reports WHERE Status = 'закрыта'";
var buttons = new List<InlineKeyboardButton[]>(); var reports = new List<(long Id, string Description, string Status, string Priority)>();
using (var reader = await command.ExecuteReaderAsync()) using (var reader = await command.ExecuteReaderAsync())
{ {
@ -633,18 +645,29 @@ class Program
string description = reader.GetString(1).Substring(0, Math.Min(20, reader.GetString(1).Length)); string description = reader.GetString(1).Substring(0, Math.Min(20, reader.GetString(1).Length));
string status = reader.GetString(2); string status = reader.GetString(2);
string priority = reader.GetString(3); string priority = reader.GetString(3);
string statusEmoji = GetStatusEmoji(status);
string priorityMarker = priority.ToLower() == "высокий" ? "⚠️" : "";
buttons.Add(new[] reports.Add((id, description, status, priority));
{
InlineKeyboardButton.WithCallbackData(
$"{priorityMarker} #{id} - {statusEmoji} {status} - {description}...",
$"report_{id}")
});
} }
} }
// Сортируем заявки по приоритету
reports.Sort((x, y) => string.Compare(y.Priority, x.Priority, StringComparison.Ordinal));
var buttons = new List<InlineKeyboardButton[]>();
foreach (var report in reports)
{
string statusEmoji = GetStatusEmoji(report.Status);
string priorityMarker = report.Priority.ToLower() == "высокий" ? "⚠️" : "";
buttons.Add(new[]
{
InlineKeyboardButton.WithCallbackData(
$"{priorityMarker} #{report.Id} - {statusEmoji} {report.Status} - {report.Description}...",
$"report_{report.Id}")
});
}
// Добавляем кнопки навигации // Добавляем кнопки навигации
buttons.Add(new[] buttons.Add(new[]
{ {
@ -669,6 +692,7 @@ class Program
private static async Task ShowReportDetails(ITelegramBotClient botClient, long chatId, long reportId, int messageId) private static async Task ShowReportDetails(ITelegramBotClient botClient, long chatId, long reportId, int messageId)
{ {
try try