From 7ac88bc68951fdc367cef1a72a159bf9320849b7 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 3 Dec 2023 22:06:13 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=20=D0=BF?=
 =?UTF-8?q?=D0=B0=D0=BA=D0=B5=D1=82=D0=B0=20=D0=BE=D0=B4=D0=BD=D0=BE=D0=B9?=
 =?UTF-8?q?=20=D0=BE=D0=BF=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D0=B5=D0=B9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  4 ++-
 src/Repository/Server/ServerCode.java         |  3 ++-
 src/TestingSystem/Common/TestingServer.java   | 26 +++++++++++++++----
 .../DVM/TestsSupervisor_2022.java             |  9 ++++---
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c50bf2e0..1c274460 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,7 +8,9 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/TestsSupervisor_2022.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TestsSupervisor_2022.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Repository/Server/ServerCode.java b/src/Repository/Server/ServerCode.java
index 8a2e5416..11d6b8ef 100644
--- a/src/Repository/Server/ServerCode.java
+++ b/src/Repository/Server/ServerCode.java
@@ -80,6 +80,7 @@ public enum ServerCode {
     GetActualSapforPackageData,
     //--
     PublishObject,
-    PublishObjects
+    PublishObjects,
+    UpdateTestTasks
    // PublishTestProject
 }
diff --git a/src/TestingSystem/Common/TestingServer.java b/src/TestingSystem/Common/TestingServer.java
index b4f29082..a3b38017 100644
--- a/src/TestingSystem/Common/TestingServer.java
+++ b/src/TestingSystem/Common/TestingServer.java
@@ -36,14 +36,11 @@ import Visual_DVM_2021.Passes.Pass_2021;
 import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;
 
-import javax.swing.*;
+import javax.swing.Timer;
 import java.io.File;
 import java.io.Serializable;
 import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.LinkedHashMap;
-import java.util.Vector;
+import java.util.*;
 
 import static Common.Constants.tests_db_name;
 public class TestingServer extends RepositoryServer<TestsDatabase> {
@@ -392,10 +389,29 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 RefreshDVMTests((Account) request.object, Integer.parseInt(request.arg));
                 break;
             //--
+            case UpdateTestTasks:
+                Print("Обновить задачи на компиляцию и запуск");
+                SetCurrentAccountDB(request.arg);
+                UpdateTestTasks();
+                response = new ServerExchangeUnit_2021(ServerCode.OK);
+                break;
             default:
                 throw new RepositoryRefuseException("Неподдерживаемый код: " + code);
         }
     }
+    public void UpdateTestTasks() throws Exception {
+        Vector<TestCompilationTask> compilationTasks = (Vector<TestCompilationTask>) request.object;
+        account_db.BeginTransaction();
+        for (TestCompilationTask compilationTask : compilationTasks) {
+            compilationTask.ChangeDate = new Date().getTime();
+            account_db.Update(compilationTask);
+            for (TestRunTask runTask : compilationTask.runTasks) {
+                compilationTask.ChangeDate = new Date().getTime();
+                account_db.Update(runTask);
+            }
+        }
+        account_db.Commit();
+    }
     //->>
     //->>
     Pair<Group, Vector<File>> ConvertDirectoryToGroup(File src, LanguageName languageName, TestType
diff --git a/src/TestingSystem/DVM/TestsSupervisor_2022.java b/src/TestingSystem/DVM/TestsSupervisor_2022.java
index e8cf5776..23b6f383 100644
--- a/src/TestingSystem/DVM/TestsSupervisor_2022.java
+++ b/src/TestingSystem/DVM/TestsSupervisor_2022.java
@@ -226,7 +226,7 @@ public class TestsSupervisor_2022 {
         for (TestCompilationTask testCompilationTask : compilationTasks) {
             ct_count++;
             if (CheckTask(testCompilationTask)) {
-                planner.UpdateTask(testCompilationTask);
+              //  planner.UpdateTask(testCompilationTask);
                 for (TestRunTask testRunTask : testCompilationTask.runTasks) {
                     rt_count++;
                     testRunTask.compilation_state = testCompilationTask.state;
@@ -237,7 +237,7 @@ public class TestsSupervisor_2022 {
                     } else {
                         CheckTask(testRunTask);
                     }
-                    planner.UpdateTask(testRunTask);
+                   // planner.UpdateTask(testRunTask);
                     if (testRunTask.state.equals(TaskState.Finished)) {
                         //анализ задачи на запуск.
                         List<String> output_lines = Arrays.asList(testRunTask.output.split("\n"));
@@ -287,11 +287,14 @@ public class TestsSupervisor_2022 {
                             }
                         }
                     }
-                    planner.UpdateTask(testRunTask);
+                    //planner.UpdateTask(testRunTask);
                 }
             }
         }
         System.out.println("ct_count=" + ct_count + " rt count=" + rt_count);
+        //теперь обновить их единым списком.
+        planner.ServerCommand(ServerCode.UpdateTestTasks, compilationTasks);
+
     }
     public boolean CheckTask(TestTask testTask) throws Exception {
         if (testTask.state.equals(TaskState.ResultsDownloaded)) {