Изменён тип поля completed на status в классе Task для использования перечисления TaskStatus. Добавлены методы для изменения статуса задачи: markCompleted, markInProgress и markCanceled. Обновлён класс TaskPrinter для отображения статуса задачи. Изменены методы в классе TodoApp для работы с новым статусом задач. Улучшена читаемость кода и логика управления задачами.

2025-05-20 20:17:46 +03:00
parent 1932cdb297
commit 2db26eb77a
3 changed files with 129 additions and 79 deletions
@@ -14,11 +14,7 @@ public class TodoApp {
        TodoApp app = new TodoApp();
        taskManager = app.new TaskManager();

-        TaskStatus status = TaskStatus.valueOf("NEW");
-
-        System.out.println(status.getDescription());
-
-        // app.run();
+        app.run();

    }

@@ -73,14 +69,32 @@ public class TodoApp {
    }

    private static void displayTask(Task task) {
-        task.printInfo(true);
-        String firstOption = task.getCompleted() ? "[1]Не выполнено" : "[1]Выполнено";
-        int input = requestIntFromInput(firstOption + " [0]Главное меню\n\nВвод:",
-                new int[] { 0, 1 });
-        if (input == 1) {
-            task.toggleCompleted();
-            displayTask(task);
+        Task.TaskPrinter.print(task);
+
+        String firstOption = switch (task.getStatus()) {
+            case NEW, CANCELLED -> "Начать";
+            case IN_PROGRESS -> "Выполнено";
+            case COMPLETED -> "Доделать";
+        };
+
+        int input = requestIntFromInput("[1]" + firstOption + " [2]Отменить [0]Главное меню\n\nВвод:",
+                new int[] { 0, 1, 2 });
+
+        switch (input) {
+            case 0:
+                return;
+            case 1: {
+                switch (task.getStatus()) {
+                    case NEW, CANCELLED, COMPLETED -> taskManager.markInProgress(task.getId());
+                    case IN_PROGRESS -> taskManager.markCompleted(task.getId());
+                }
+                break;
+            }
+            case 2:
+                taskManager.markCanceled(task.getId());
        }
+
+        displayTask(task);
    }

    private static void displayTasks() {
@@ -106,7 +120,7 @@ public class TodoApp {

                """);

-        printAll(tasks);
+        taskManager.printTasks();

        int[] variantsInput = new int[tasksCounter + 1];
        for (int i = 0; i < tasksCounter; i++)
@@ -154,46 +168,83 @@ public class TodoApp {
        } while (true);
    }

-    private static void printAll(Task... tasks) {
-        for (Task t : tasks)
-            if (t != null)
-                t.printInfo();
-    }
-
-    private static boolean markTaskCompletedById(Task[] tasks, int id) {
-        for (Task t : tasks)
-            if (t != null && t.getId() == id) {
-                if (!t.getCompleted())
-                    t.toggleCompleted();
-                return true;
-            }
-        return false;
-    }
-
    private class TaskManager {
        void addTask(Task task) {
            tasks[tasksCounter++] = task;
        }

-        void markCompleted(int id) {
-            markTaskCompletedById(tasks, id);
+        boolean markCompleted(int id) {
+            for (int i = 0; i < tasksCounter; i++)
+                if (tasks[i].getId() == id) {
+                    TaskAction action = new TaskAction() {
+                        @Override
+                        public void execute(Task task) {
+                            task.markCompleted();
+                        }
+                    };
+                    action.execute(tasks[i]);
+                    return true;
+                }
+            return false;
+        }
+
+        boolean markInProgress(int id) {
+            for (int i = 0; i < tasksCounter; i++)
+                if (tasks[i].getId() == id) {
+                    TaskAction action = new TaskAction() {
+                        @Override
+                        public void start(Task task) {
+                            task.markInProgress();
+                        }
+                    };
+                    action.start(tasks[i]);
+                    return true;
+                }
+            return false;
+        }
+
+        boolean markCanceled(int id) {
+            for (int i = 0; i < tasksCounter; i++)
+                if (tasks[i].getId() == id) {
+                    TaskAction action = new TaskAction() {
+                        @Override
+                        public void cancel(Task task) {
+                            task.markCanceled();
+                        }
+                    };
+                    action.cancel(tasks[i]);
+                    return true;
+                }
+            return false;
        }

        void printTasks() {
            class ShortTaskPrinter {
                void print(Task task) {
-                    System.out.printf("%-3s | %s\n", task.getId(), task.getTitle());
+                    int id = task.getId();
+                    String title = task.getTitle();
+                    TaskStatus status = task.getStatus();
+
+                    String stringCompleted = status.getColorCode() + status.getDescription() + "\u001B[0m";
+                    System.out.printf("%-3d | %-20s | %s\n", id, title, stringCompleted);
                }
            }

-            ShortTaskPrinter p = new ShortTaskPrinter();
+            ShortTaskPrinter printer = new ShortTaskPrinter();
            for (int i = 0; i < Task.taskCount; i++)
-                p.print(tasks[i]);
+                printer.print(tasks[i]);
        }

    }

    interface TaskAction {
-        void execute(Task task);
+        default void execute(Task task) {
+        };
+
+        default void start(Task task) {
+        };
+
+        default void cancel(Task task) {
+        };
    }
 }