From 30b51180c4ec7378cf519339808c9c5bf4336251 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 27 Sep 2024 02:01:14 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D1=82=D0=B5=D1=81=D1=82?=
 =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B8=20=D0=B4=D0=B2?=
 =?UTF-8?q?=D0=BC=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B8=20=D1=81=D0=BE?=
 =?UTF-8?q?=D1=80=D1=82=D0=B8=D1=80=D1=83=D1=8E=D1=82=D1=81=D1=8F=20=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BA=20=D1=87=D1=82=D0=BE=20=D0=BE=D1=88=D0=B8=D0=B1?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D1=81=D0=B2=D0=B5=D1=80=D1=85=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  8 +---
 src/Common/Global.java                        |  1 +
 src/TestingSystem/Common/TestingServer.java   | 39 ++++++++++++-------
 .../DVM/DVMPackage/DVMPackageDBTable.java     |  1 +
 .../DVM/DVMTasks/DVMRunTasksSet.java          | 12 ++++++
 5 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 226d4ec4..ee8d8c6d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,14 +8,10 @@
   <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/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.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/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/TestPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/TestPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Global.java b/src/Common/Global.java
index eb1e7609..a88a0dc2 100644
--- a/src/Common/Global.java
+++ b/src/Common/Global.java
@@ -373,6 +373,7 @@ public class Global {
         CreateLogAtComponentsPath();
         testingServer = new TestingServer();
         testingServer.ActivateDB();
+     //   testingServer.PATCH();
         testingServer.Start();
         System.exit(0);
     }
diff --git a/src/TestingSystem/Common/TestingServer.java b/src/TestingSystem/Common/TestingServer.java
index 4e2c76d8..4fdcaa37 100644
--- a/src/TestingSystem/Common/TestingServer.java
+++ b/src/TestingSystem/Common/TestingServer.java
@@ -173,15 +173,15 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 TextLog Log = new TextLog();
                 tryAutoSapforTesting(Log);
                 response = new ServerExchangeUnit_2021(ServerCode.OK);
-                EmailMessage message = Log.isEmpty()?
+                EmailMessage message = Log.isEmpty() ?
                         new EmailMessage(
-                                "Запущено автоматической тестирование версии "+request.arg+" системы SAPFOR",
-                                "", new Vector<>()):
+                                "Запущено автоматической тестирование версии " + request.arg + " системы SAPFOR",
+                                "", new Vector<>()) :
                         new EmailMessage(
-                            "Не удалось запустить автоматическое тестирование версии "+request.arg+" системы SAPFOR",
-                            Log.toString(),
-                            new Vector<>()
-                    );
+                                "Не удалось запустить автоматическое тестирование версии " + request.arg + " системы SAPFOR",
+                                Log.toString(),
+                                new Vector<>()
+                        );
                 Email(message);
                 break;
             case DownloadTest:
@@ -642,14 +642,25 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         //--
     }
     /*
-    public void PATCH(){
-        for (SapforPackage sapforPackage: db.sapforPackages.Data.values()){
+    public void PATCH() {
+        for (DVMPackage testingPackage : db.dvmPackages.Data.values()) {
+            boolean hasErrors = false;
             try {
-                sapforPackage.readJson();
-                sapforPackage.state=sapforPackage.package_json.getState();
-                db.Update(sapforPackage);
-            }
-            catch (Exception ex){
+                testingPackage.readJson();
+                //---------------------------------------------------
+                for (DVMCompilationTask compilationTask : testingPackage.package_json.compilationTasks) {
+                    if (!compilationTask.state.equals(TaskState.Done))
+                        hasErrors = true;
+                    for (DVMRunTask runTask : compilationTask.runTasks) {
+                        if (!runTask.state.equals(TaskState.Done))
+                            hasErrors = true;
+                    }
+                }
+                if (hasErrors)
+                    testingPackage.state = TasksPackageState.DoneWithErrors;
+                //---------------------------------------------------
+                db.Update(testingPackage);
+            } catch (Exception ex) {
                 ex.printStackTrace();
             }
         }
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java b/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
index adee577f..93f56612 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
@@ -66,6 +66,7 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
             public void MouseAction2() throws Exception {
                 Pass_2021.passes.get(PassCode_2021.DownloadDVMPackage).Do();
             }
+
         };
     }
     @Override
diff --git a/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java b/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
index 25d745d0..a5de0d5c 100644
--- a/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
+++ b/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
@@ -7,6 +7,8 @@ import Common.UI.DataSetControlForm;
 import GlobalData.Tasks.TaskState;
 import TestingSystem.DVM.DVMPackage.DVMPackage;
 
+import java.util.Comparator;
+
 import static Common.UI.Tables.TableRenderers.RendererProgress;
 import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
 public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
@@ -150,4 +152,14 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
         Data.clear();
         target = null;
     }
+    @Override
+    public Comparator<DVMRunTask> getComparator() {
+        return new Comparator<DVMRunTask>() {
+            @Override
+            public int compare(DVMRunTask o1, DVMRunTask o2) {
+                return o1.state.ordinal() - o2.state.ordinal();
+            }
+        };
+        // return Comparator.comparingInt(o -> o.).reversed();
+    }
 }