From 151572fd8226c85f55f2f2bd2f63610c51fb2883 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 10 Sep 2024 01:50:44 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9.=20=D1=85=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=BD=D1=84=D1=8B=20?=
 =?UTF-8?q?=D0=BE=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D0=B0=D1=85,=20?=
 =?UTF-8?q?=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D0=B0=D1=85=20=D0=B8=20=D1=82?=
 =?UTF-8?q?=D0=B5=D1=81=D1=82=D0=B0=D1=85=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82?=
 =?UTF-8?q?=D0=B0.=D0=BF=D0=BE=D0=BA=D0=B0=20=D0=BE=D1=82=D0=BB=D0=B0?=
 =?UTF-8?q?=D0=B6=D0=B8=D0=B2=D0=B0=D0=B5=D1=82=D1=81=D1=8F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  21 +++-
 properties                                    |   6 +-
 src/Common/GlobalProperties.java              |   5 +-
 .../Menus_2023/MainMenuBar/MainMenuBar.java   |   2 +
 .../VisualiserSettingsMenu.java               |   1 +
 src/Common/Utils/Utils.java                   |  27 ++++-
 src/GlobalData/FileObject/DirInfo.java        |  19 ++--
 .../FileObject/DirInfosDataSet.java           |   4 +-
 src/GlobalData/FileObject/DirInfosFields.form |   2 +-
 src/GlobalData/FileObject/DirInfosFields.java |   2 +-
 src/GlobalData/Settings/SettingName.java      |   3 +
 src/GlobalData/Settings/SettingsDBTable.java  |   1 +
 src/Repository/Component/Visualiser.java      |   2 +-
 .../Common/TestingPackage/TestingPackage.java | 103 ++++++++++++++++++
 src/TestingSystem/Common/TestsDatabase.java   |   5 +
 .../DVM/DVMPackage/DVMPackageDBTable.java     |  25 +++++
 .../DVM/DVMPackage/DVMPackage_json.java       |   7 +-
 .../Passes/All/AddTasksToDVMPackage.java      |  23 +++-
 .../All/DeleteDownloadedBugReports.java       |  42 ++++---
 .../Passes/All/GetOldBugReports.java          |  21 ++--
 .../Passes/All/UpdateSetting.java             |   7 ++
 21 files changed, 274 insertions(+), 54 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f4c3b378..65f038c2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,9 +8,26 @@
   <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/GlobalData/FileObject/FileObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/FileObject/FileObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/FileObject/FileObjectsDataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/FileObject/FileObjectsDataSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/GlobalProperties.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" 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/GlobalData/FileObject/DirInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/FileObject/DirInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/FileObject/DirInfosDataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/FileObject/DirInfosDataSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/FileObject/DirInfosFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/FileObject/DirInfosFields.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/FileObject/DirInfosFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/FileObject/DirInfosFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Settings/SettingName.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Settings/SettingName.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Settings/SettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Settings/SettingsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.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/DVM/DVMPackage/DVMPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateSetting.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index d752dace..b9ac4e15 100644
--- a/properties
+++ b/properties
@@ -2,15 +2,15 @@
   "Mode": "Normal",
   "ServerAddress": "alex-freenas.ddns.net",
   "ServerUserName": "testuser",
-  "ServerUserSHHPort": 2000,
+  "ServerUserSHHPort": 23,
   "ComponentsServerPort": 7995,
-  "TestingServerPort": 7998,
+  "TestingServerPort": 7996,
   "SocketTimeout": 5000,
   "OldServer": false,
   "SMTPHost": "smtp.mail.ru",
   "SMTPPort": 465,
   "MailSocketPort": 465,
-  "collapseCredentials": true,
+  "collapseCredentials": false,
   "collapseFileGraphs": false,
   "collapseFileMessages": false,
   "collapseProjectTrees": false,
diff --git a/src/Common/GlobalProperties.java b/src/Common/GlobalProperties.java
index d7cd6898..ed1ed5eb 100644
--- a/src/Common/GlobalProperties.java
+++ b/src/Common/GlobalProperties.java
@@ -120,12 +120,11 @@ public class GlobalProperties extends Properties {
         return Paths.get(System.getProperty("user.dir"), "properties").toFile();
     }
     //--
-    public GlobalProperties(){
-
+    public GlobalProperties() {
     }
     public GlobalProperties(GlobalProperties p) {
         super();
-        Mode=p.Mode;
+        Mode = p.Mode;
         ServerAddress = p.ServerAddress;
         ServerUserName = p.ServerUserName;
         ServerUserSHHPort = p.ServerUserSHHPort;
diff --git a/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java b/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java
index 30666802..95022f6f 100644
--- a/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java
+++ b/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java
@@ -56,6 +56,7 @@ public class MainMenuBar extends VisualiserMenuBar {
         setPreferredSize(new Dimension(0, 30));
         //---
 
+        /*
         add(new MenuBarButton() {
             {
                 setIcon("/icons/Apply.png");
@@ -65,6 +66,7 @@ public class MainMenuBar extends VisualiserMenuBar {
                 });
             }
         });
+         */
         ShowProject(false);
     }
     public void ShowUpdatesIcon() {
diff --git a/src/Common/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java b/src/Common/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
index 872e803e..7b6759f7 100644
--- a/src/Common/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
+++ b/src/Common/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
@@ -37,5 +37,6 @@ public class VisualiserSettingsMenu extends VisualiserMenu {
                 SettingName.ComparsionDiffMergeOn
         ));
         add(Global.db.settings.get(SettingName.Workspace).getMenuItem());
+        add(Global.db.settings.get(SettingName.BugReportsAgeLimit).getMenuItem());
     }
 }
diff --git a/src/Common/Utils/Utils.java b/src/Common/Utils/Utils.java
index ef40667d..199fd6bc 100644
--- a/src/Common/Utils/Utils.java
+++ b/src/Common/Utils/Utils.java
@@ -1280,11 +1280,36 @@ public class Utils {
     }
     public static long getNewestFileDate(File dir){
         Vector<Long> dates = new Vector<>();
-        dates.add(dir.lastModified());
         get_newest_file_date_r(dir, dates);
         Collections.sort(dates);
+        if (dates.isEmpty()) {
+            dates.add(dir.lastModified());
+        }
         System.out.println(new Date(dates.lastElement()));
         return dates.firstElement();
     }
+    //------------------------------------------------------->>>
+    public static Vector<Integer> unpack(String packed){
+        Vector<Integer> ids = new Vector<>();
+        String[] data = packed.split("\n");
+        if (data.length > 0) {
+            for (String s: data) {
+                if (!s.isEmpty())
+                    ids.add(Integer.parseInt(s));
+            }
+        }
+        return ids;
+    }
+    public static Vector<String> unpack_s(String packed){
+        Vector<String> ids = new Vector<>();
+        String[] data = packed.split("\n");
+        if (data.length > 0) {
+            for (String s: data) {
+                if (!s.isEmpty())
+                ids.add(s);
+            }
+        }
+        return ids;
+    }
 }
 
diff --git a/src/GlobalData/FileObject/DirInfo.java b/src/GlobalData/FileObject/DirInfo.java
index 1335dfcc..0eed69f4 100644
--- a/src/GlobalData/FileObject/DirInfo.java
+++ b/src/GlobalData/FileObject/DirInfo.java
@@ -3,16 +3,21 @@ import Common.Database.DBObject;
 
 import java.io.File;
 import java.util.Date;
-public class FileObject extends DBObject {
-    File file;
-    public FileObject(File file_in){
-        file=file_in;
+public class DirInfo extends DBObject {
+    File dir;
+    long mdate;
+    public DirInfo(File dir_in, long mdate_in) {
+        dir = dir_in;
+        mdate = mdate_in;
     }
     @Override
     public Object getPK() {
-        return file.getName();
+        return dir.getName();
     }
-    public Date getDate(){
-        return new Date(file.lastModified());
+    public Date getDate() {
+        return new Date(mdate);
+    }
+    public File getFile(){
+        return dir;
     }
 }
diff --git a/src/GlobalData/FileObject/DirInfosDataSet.java b/src/GlobalData/FileObject/DirInfosDataSet.java
index 905daeba..f3068221 100644
--- a/src/GlobalData/FileObject/DirInfosDataSet.java
+++ b/src/GlobalData/FileObject/DirInfosDataSet.java
@@ -3,8 +3,8 @@ import Common.Database.DataSet;
 import Common.UI.DataSetControlForm;
 
 import static Common.UI.Tables.TableRenderers.*;
-public class FileObjectsDataSet extends DataSet<String, DirInfo> {
-    public FileObjectsDataSet() {
+public class DirInfosDataSet extends DataSet<String, DirInfo> {
+    public DirInfosDataSet() {
         super(String.class, DirInfo.class);
     }
     @Override
diff --git a/src/GlobalData/FileObject/DirInfosFields.form b/src/GlobalData/FileObject/DirInfosFields.form
index bac93afc..b904d4c6 100644
--- a/src/GlobalData/FileObject/DirInfosFields.form
+++ b/src/GlobalData/FileObject/DirInfosFields.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="GlobalData.FileObject.FileObjectsFields">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="GlobalData.FileObject.DirInfosFields">
   <grid id="27dc6" binding="content" layout-manager="BorderLayout" hgap="0" vgap="0">
     <constraints>
       <xy x="20" y="20" width="500" height="400"/>
diff --git a/src/GlobalData/FileObject/DirInfosFields.java b/src/GlobalData/FileObject/DirInfosFields.java
index 3c0ca468..000ee689 100644
--- a/src/GlobalData/FileObject/DirInfosFields.java
+++ b/src/GlobalData/FileObject/DirInfosFields.java
@@ -3,7 +3,7 @@ import Common.UI.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
 import java.awt.*;
-public class FileObjectsFields implements DialogFields {
+public class DirInfosFields implements DialogFields {
     public JPanel content;
     @Override
     public Component getContent() {
diff --git a/src/GlobalData/Settings/SettingName.java b/src/GlobalData/Settings/SettingName.java
index 579359dc..903bc6c4 100644
--- a/src/GlobalData/Settings/SettingName.java
+++ b/src/GlobalData/Settings/SettingName.java
@@ -41,6 +41,7 @@ public enum SettingName {
     Email, //для тестирования. потом.
     Pause, //стоит ли тестрование на паузе.
     Queue, //хз нужна ли. будет пересказ пакета в проходе.
+    BugReportsAgeLimit,
     //---
     DVMPackageMaxId,
     SAPFORPackageId,
@@ -77,6 +78,8 @@ public enum SettingName {
     }
     public String getDescription() {
         switch (this) {
+            case BugReportsAgeLimit:
+                return "Срок хранения отчетов об ошибках (месяцы)";
             case SaveModifications:
                 return "Сохранять копию исходной версии при преобразованиях";
             case ComparsionDiffMergeOn:
diff --git a/src/GlobalData/Settings/SettingsDBTable.java b/src/GlobalData/Settings/SettingsDBTable.java
index 32602678..2b9cc3d4 100644
--- a/src/GlobalData/Settings/SettingsDBTable.java
+++ b/src/GlobalData/Settings/SettingsDBTable.java
@@ -85,6 +85,7 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
         AddSetting(new DBSetting(SettingName.FortranWrapsOn, 1, SettingType.SapforFlag, ComponentType.ComparsionOptions));
         AddSetting(new DBSetting(SettingName.ComparsionDiffMergeOn, 0, SettingType.SapforFlag, ComponentType.ComparsionOptions));
         //</editor-fold>
+        AddSetting(new DBSetting(SettingName.BugReportsAgeLimit, 2, SettingType.IntField, ComponentType.Visualiser));
     }
     public Vector<DBSetting> getSettingsByOwner(ComponentType owner) {
         return Data.values().stream().filter(setting -> setting.Owner.equals(owner)).collect(Collectors.toCollection(Vector::new));
diff --git a/src/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index cd1e1045..f888f9fb 100644
--- a/src/Repository/Component/Visualiser.java
+++ b/src/Repository/Component/Visualiser.java
@@ -62,7 +62,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = 1114;
+        version = 1115;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());
diff --git a/src/TestingSystem/Common/TestingPackage/TestingPackage.java b/src/TestingSystem/Common/TestingPackage/TestingPackage.java
index cba46571..324e68f9 100644
--- a/src/TestingSystem/Common/TestingPackage/TestingPackage.java
+++ b/src/TestingSystem/Common/TestingPackage/TestingPackage.java
@@ -2,11 +2,16 @@ package TestingSystem.Common.TestingPackage;
 import Common.Constants;
 import Common.Database.DBObject;
 import Common.Database.riDBObject;
+import Common.Global;
 import Common.Utils.Utils;
+import TestingSystem.Common.Group.Group;
 import TestingSystem.Common.TasksPackageState;
+import TestingSystem.Common.Test.Test;
+import TestingSystem.DVM.Configuration.Configuration;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.io.File;
+import java.util.Vector;
 public abstract class TestingPackage<J> extends riDBObject {
     public String PID = "";
     public int tasksCount = 0; //Общее число задач
@@ -22,6 +27,14 @@ public abstract class TestingPackage<J> extends riDBObject {
     public long ChangeDate = 0;
     @Description("DEFAULT 0")
     public int connectionErrosCount = 0;
+    //--
+    @Description("DEFAULT ''")
+    public String packedConfigurations = "";
+    @Description("DEFAULT ''")
+    public String packedGroups = "";
+    @Description("DEFAULT ''")
+    public String packedTests = "";
+    //--
     public TasksPackageState state = TasksPackageState.Draft;
     //--
     @Override
@@ -72,4 +85,94 @@ public abstract class TestingPackage<J> extends riDBObject {
     public void destructor() {
         package_json = null;
     }
+    public Vector<Configuration> getConfigurations() {
+        Vector<Configuration> res = new Vector<>();
+        for (int o_id : Utils.unpack(packedConfigurations))
+            if (Global.testingServer.db.configurations.containsKey(o_id))
+                res.add(Global.testingServer.db.configurations.get(o_id));
+        return res;
+    }
+    public Vector<Group> getGroups() {
+        Vector<Group> res = new Vector<>();
+        for (int o_id : Utils.unpack(packedGroups))
+            if (Global.testingServer.db.groups.containsKey(o_id))
+                res.add(Global.testingServer.db.groups.get(o_id));
+        return res;
+    }
+    public Vector<Test> getTests() {
+        Vector<Test> res = new Vector<>();
+        for (int o_id : Utils.unpack(packedTests))
+            if (Global.testingServer.db.tests.containsKey(o_id))
+                res.add(Global.testingServer.db.tests.get(o_id));
+        return res;
+    }
+    public void printCGT() {
+        try {
+            System.out.println("package="+id);
+            Vector<Configuration> configurations = getConfigurations();
+            System.out.println("+");
+
+            Vector<Group> groups = getGroups();
+            Vector<Test> tests = getTests();
+            Vector<String> res = new Vector<>();
+            res.add("конфигурации: " + configurations.size());
+            for (Configuration configuration : configurations)
+                res.add(configuration.description);
+
+            res.add("группы: " + groups.size());
+            for (Group group : groups)
+                res.add(group.description);
+            //--
+            res.add("тесты: " + tests.size());
+            for (Test test : tests)
+                res.add(test.description);
+            //--
+            res.add("-------");
+            System.out.println(String.join("\n", res));
+        }
+        catch (Exception ex){
+            System.out.println("```");
+            ex.printStackTrace();
+        }
+    }
+    public void addConfigurations(Vector<Configuration> new_configurations){
+        Vector<String> res= Utils.unpack_s(packedConfigurations);
+        //---
+        System.out.println("old_configs "+res.size());
+        for(String id_: res){
+            System.out.println(Utils.Brackets(id_));
+        }
+        //---
+        for (Configuration configuration: new_configurations){
+            String id_ = String.valueOf(configuration.id);
+            if (!res.contains(id_))
+                res.add(id_);
+        }
+        packedConfigurations= String.join("\n", res );
+        System.out.println("new_configs="+res.size());
+        for(String id_: res){
+            System.out.println(Utils.Brackets(id_));
+        }
+    }
+    public void addGroups(Vector<Group> new_groups){
+        Vector<String> res= Utils.unpack_s(packedGroups);
+        //---
+        for (Group group: new_groups){
+            String id_ = String.valueOf(group.id);
+            if (!res.contains(id_))
+                res.add(id_);
+        }
+        packedGroups= String.join("\n", res );
+    }
+    public void addTests(Vector<Test> new_tests){
+        Vector<String> res= Utils.unpack_s(packedTests);
+        //---
+        for (Test test: new_tests){
+            String id_ = String.valueOf(test.id);
+            if (!res.contains(id_))
+                res.add(id_);
+        }
+        packedTests= String.join("\n", res );
+    }
+    //------------------------------------------------------->>>
 }
diff --git a/src/TestingSystem/Common/TestsDatabase.java b/src/TestingSystem/Common/TestsDatabase.java
index 14c35ea6..97ef61af 100644
--- a/src/TestingSystem/Common/TestsDatabase.java
+++ b/src/TestingSystem/Common/TestsDatabase.java
@@ -303,4 +303,9 @@ public class TestsDatabase extends SQLiteDatabase {
         }
         return false;
     }
+    public void UnselectAllGTC(){
+        groups.CheckAll(false);
+        tests.CheckAll(false);
+        configurations.CheckAll(false);
+    }
 }
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java b/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
index 4923da47..003aecd3 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
@@ -4,6 +4,8 @@ import Common.Database.*;
 import Common.Global;
 import Common.UI.DataSetControlForm;
 import Common.UI.UI;
+import TestingSystem.DVM.DVMTasks.DVMCompilationTask;
+import TestingSystem.DVM.DVMTasks.DVMRunTask;
 import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 
 import java.util.Comparator;
@@ -45,14 +47,37 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
             @Override
             public void ShowCurrentObject() throws Exception {
                 super.ShowCurrentObject();
+                //--
                 Global.testingServer.db.dvmRunTasks.ShowDVMPackage(getCurrent());
                 UI.getMainWindow().getTestingWindow().DropTestRunTasksComparison();
+                //--
+                System.out.println("show dvmpackage");
+                if (getCurrent().package_json!=null){
+                    getCurrent().printCGT();
+                }
+              //  Global.testingServer.db.UnselectAllGTC();
+                //отметить все группы, тесты, конфигурации, что относятся к пакету.
+
+/*
+                if (getCurrent().package_json != null) {
+                    for (DVMCompilationTask compilationTask : getCurrent().package_json.compilationTasks) {
+                        for (DVMRunTask runTask : compilationTask.runTasks) {
+                            Data.put(runTask.id, runTask);
+                        }
+                    }
+                    ShowUI();
+                    //--
+                }
+ */
             }
             @Override
             public void ShowNoCurrentObject() throws Exception {
                 super.ShowNoCurrentObject();
                 Global.testingServer.db.dvmRunTasks.ShowNoPackage();
                 UI.getMainWindow().getTestingWindow().DropTestRunTasksComparison();
+                //--
+                System.out.println("show no dvmpackage");
+               // Global.testingServer.db.UnselectAllGTC();
             }
         };
     }
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java b/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java
index 926cc036..82e57a45 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java
@@ -1,4 +1,9 @@
 package TestingSystem.DVM.DVMPackage;
+import Common.Constants;
+import Common.Global;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.Common.Test.Test;
+import TestingSystem.DVM.Configuration.Configuration;
 import TestingSystem.DVM.DVMTasks.DVMCompilationTask;
 import com.google.gson.annotations.Expose;
 
@@ -10,7 +15,7 @@ public class DVMPackage_json implements Serializable {
     public int max_task_id = 0;
     @Expose
     public List<DVMCompilationTask> compilationTasks = new Vector<>();
-    public int getMaxTaskId(){
+    public int getMaxTaskId() {
         return max_task_id++;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java b/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java
index 89b2a479..1af591c8 100644
--- a/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java
@@ -4,18 +4,21 @@ import Common.Global;
 import Common.UI.UI;
 import Common.Utils.Utils;
 import TestingSystem.Common.Group.Group;
+import TestingSystem.Common.TasksPackageState;
 import TestingSystem.Common.Test.Test;
 import TestingSystem.DVM.Configuration.Configuration;
 import TestingSystem.DVM.DVMPackage.DVMPackage;
 import TestingSystem.DVM.DVMPackage.DVMPackage_json;
 import TestingSystem.DVM.DVMTasks.DVMCompilationTask;
 import TestingSystem.DVM.DVMTasks.DVMRunTask;
-import TestingSystem.Common.TasksPackageState;
 import Visual_DVM_2021.Passes.Pass_2021;
 
 import java.util.Vector;
 public class AddTasksToDVMPackage extends Pass_2021<DVMPackage> {
     Vector<DVMCompilationTask> tasks;
+    Vector<Configuration> configurations;
+    Vector<Group> groups;
+    Vector<Test> tests;
     int tasks_count;
     @Override
     public String getIconPath() {
@@ -102,6 +105,9 @@ public class AddTasksToDVMPackage extends Pass_2021<DVMPackage> {
             }
             //---
             tasks = new Vector<>();
+            configurations = new Vector<>();
+            groups = new Vector<>();
+            tests = new Vector<>();
             tasks_count = 0;
             //-----------
             //1, Проверяем выбраны ли конфиги.
@@ -112,6 +118,7 @@ public class AddTasksToDVMPackage extends Pass_2021<DVMPackage> {
             if (Global.testingServer.db.groups.getCheckedCount() > 0) {
                 //2 Проверяем выбраны ли группы.
                 for (TestingSystem.DVM.Configuration.Configuration configuration : Global.testingServer.db.configurations.getCheckedItems()) {
+                    configurations.add(configuration);
                     for (Group group : Global.testingServer.db.groups.getCheckedItems()) {
                         Vector<Test> groupTests = new Vector<>();
                         Vector<Test> checkedGroupTests = new Vector<>();
@@ -123,15 +130,20 @@ public class AddTasksToDVMPackage extends Pass_2021<DVMPackage> {
                             }
                         }
                         if (!groupTests.isEmpty()) {
+                            groups.add(group);
                             if (checkedGroupTests.isEmpty()) {
-                                for (Test test : groupTests)
+                                for (Test test : groupTests) {
                                     tasks.addAll(createTasksCGT(configuration, group, test));
+                                    tests.add(test);
+                                }
                             } else {
                                 //добавляем только отмеченные.
                                 for (Test test : checkedGroupTests) {
                                     tasks.addAll(createTasksCGT(configuration, group, test));
+                                    tests.add(test);
                                 }
                             }
+                            //--
                         }
                     }
                 }
@@ -161,8 +173,15 @@ public class AddTasksToDVMPackage extends Pass_2021<DVMPackage> {
             }
         }
         json.compilationTasks.addAll(tasks);
+        //--
+        target.addConfigurations(configurations);
+        target.addGroups(groups);
+        target.addTests(tests);
+        //--
         target.tasksCount += tasks_count;
         Global.testingServer.db.Update(target);
+        //--
+        target.printCGT();
     }
     @Override
     protected void showDone() throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java b/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java
index 687c51ec..1f0bd0ea 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java
@@ -1,40 +1,36 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Common.Global;
-import Common.UI.UI;
 import Common.UI.Windows.Dialog.Dialog;
 import Common.Utils.Utils;
-import GlobalData.FileObject.FileObject;
-import GlobalData.FileObject.FileObjectsDataSet;
-import GlobalData.FileObject.FileObjectsFields;
+import GlobalData.FileObject.DirInfo;
+import GlobalData.FileObject.DirInfosDataSet;
+import GlobalData.FileObject.DirInfosFields;
+import GlobalData.Settings.SettingName;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
-import Visual_DVM_2021.Passes.UI.CopyProjectFields;
 
 import javax.swing.*;
 import java.io.File;
-import java.nio.file.Paths;
 import java.util.*;
-public class DeleteDownloadedBugReports extends Pass_2021<Vector<File>> {
+public class DeleteDownloadedBugReports extends Pass_2021<DirInfosDataSet> {
     @Override
     protected boolean needsAnimation() {
         return true;
     }
     @Override
-    public boolean needsConfirmations() {
-        return true;
-    }
-    @Override
     protected boolean canStart(Object... args) throws Exception {
         target = null;
         if (passes.get(PassCode_2021.GetOldBugReports).Do()){
-            target = (Vector<File>) passes.get(PassCode_2021.GetOldBugReports).target;
-            FileObjectsDataSet set = new FileObjectsDataSet();
-            for (File file: target){
-                set.put(file.getName(),new FileObject(file));
+            target = (DirInfosDataSet) passes.get(PassCode_2021.GetOldBugReports).target;
+            if (target.Data.isEmpty()){
+                Log.Writeln_("Не найдено отчетов, не использовавшихся " +
+                       Global.getSetting(SettingName.BugReportsAgeLimit).toInt32() +
+                        " месяцев и более!");
+                return false;
             }
             //-
-            Dialog<Object, FileObjectsFields> dialog = new Dialog<Object, FileObjectsFields>(FileObjectsFields.class) {
+            Dialog<Object, DirInfosFields> dialog = new Dialog<Object, DirInfosFields>(DirInfosFields.class) {
                 @Override
                 public int getDefaultHeight() {
                     return 300;
@@ -45,14 +41,16 @@ public class DeleteDownloadedBugReports extends Pass_2021<Vector<File>> {
                 }
                 @Override
                 public void Init(Object... params) {
-                    set.mountUI((JPanel) content);
-                    set.ShowUI();
+                    target.mountUI((JPanel) content);
+                    target.ShowUI();
                 }
                 @Override
                 public void validateFields() {
                 }
             };
-            if (dialog.ShowDialog("Найдено "+target.size()+" загруженных проектов. Удалить?")) {
+            if (dialog.ShowDialog("Найдено "+target.size()+" отчетов, не использовавшихся " +
+                    Global.getSetting(SettingName.BugReportsAgeLimit).toInt32()+
+                    " месяцев и более. Удалить?")) {
                 return true;
             }
         }
@@ -65,9 +63,9 @@ public class DeleteDownloadedBugReports extends Pass_2021<Vector<File>> {
     }
     @Override
     protected void body() throws Exception {
-        for (File file : target) {
-            ShowMessage1(file.getName());
-            Utils.forceDeleteWithCheck(file);
+        for (DirInfo dir : target.Data.values()) {
+            ShowMessage1(dir.getPK().toString());
+            Utils.forceDeleteWithCheck(dir.getFile());
         }
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java b/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java
index f4209fe3..33a4ef91 100644
--- a/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java
+++ b/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java
@@ -1,16 +1,20 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Global;
 import Common.Utils.Utils;
+import GlobalData.FileObject.DirInfo;
+import GlobalData.FileObject.DirInfosDataSet;
+import GlobalData.Settings.SettingName;
 import Visual_DVM_2021.Passes.Pass_2021;
 
 import java.io.File;
-import java.util.*;
-public class GetOldBugReports extends Pass_2021<Vector<File>> {
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+public class GetOldBugReports extends Pass_2021<DirInfosDataSet> {
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        target = new Vector<>();
+        target = new DirInfosDataSet();
         return true;
-
     }
     @Override
     protected boolean needsAnimation() {
@@ -24,16 +28,17 @@ public class GetOldBugReports extends Pass_2021<Vector<File>> {
             //---
             Calendar c = new GregorianCalendar();
             c.setTimeInMillis(System.currentTimeMillis());
-            c.add(Calendar.MONTH, -2);
+            c.add(Calendar.MONTH, -Global.getSetting(SettingName.BugReportsAgeLimit).toInt32());
             Date date = c.getTime();
             System.out.println(date);
             long border = date.getTime();
             //--
-            for (File file: files){
+            for (File file : files) {
                 ShowMessage2(file.getName());
                 long mdate = Utils.getNewestFileDate(file);
-                if (mdate<=border){
-                    target.add(file);
+                if (mdate <= border) {
+                    DirInfo d = new DirInfo(file, mdate);
+                    target.put(d.getPK(), d);
                 }
             }
         }
diff --git a/src/Visual_DVM_2021/Passes/All/UpdateSetting.java b/src/Visual_DVM_2021/Passes/All/UpdateSetting.java
index 833406ee..ea786b4d 100644
--- a/src/Visual_DVM_2021/Passes/All/UpdateSetting.java
+++ b/src/Visual_DVM_2021/Passes/All/UpdateSetting.java
@@ -78,6 +78,13 @@ public class UpdateSetting extends Pass_2021<DBSetting> {
                             if (f_.ShowDialog(target.Name.getDescription()))
                                 NewValue = String.valueOf(f_.Result);
                             break;
+                        case BugReportsAgeLimit:
+                            min = 1;
+                            max = 12;
+                            SliderNumberForm fffff = new SliderNumberForm();
+                            if (fffff.ShowDialog(target.Name.getDescription(), target.toInt32(), min, max))
+                                NewValue = String.valueOf(fffff.Result);
+                            break;
                         case FastAccessPassesCount:
                             min = 5;
                             max = 15;