M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v++

Browse Source 
массовые операции с бд тестирования
This commit is contained in:
02090095
2023-12-06 03:04:26 +03:00
parent 3e5859284f
commit e1da90d705
7 changed files with 58 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.idea/workspace.xml generated
View File

@@ -7,8 +7,13 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<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/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteTasksPackage.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

2
src/Repository/Component/Visualiser.java
View File

@@ -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 = 1043;
version = 1044;
String pattern = "MMM dd yyyy HH:mm:ss";
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
date_text = df.format(getClassBuildTime());

6
src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java
View File

@@ -21,6 +21,10 @@ public class SapforConfigurationCommandsDBTable extends iDBTable<SapforConfigura
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this){
@Override
public boolean hasCheckBox() {
return true;
}
@Override
protected void AdditionalInitColumns() {
//columns.get(0).setVisible(false);
@@ -36,7 +40,7 @@ public class SapforConfigurationCommandsDBTable extends iDBTable<SapforConfigura
@Override
public Object getFieldAt(SapforConfigurationCommand object, int columnIndex) {
switch (columnIndex) {
case 1:
case 2:
return object.passCode.getDescription();
default:
return null;

24
src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java
View File

@@ -28,13 +28,17 @@ public class SapforTasksPackagesDBTable extends DBTable<Long,SapforTasksPackage>
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
protected void AdditionalInitColumns() {
// columns.get(0).setVisible(false);
columns.get(2).setMaxWidth(200);
columns.get(5).setRenderer(RendererDate);
columns.get(3).setMaxWidth(200);
columns.get(6).setRenderer(RendererDate);
columns.get(7).setRenderer(RendererStatusEnum);
columns.get(7).setRenderer(RendererDate);
columns.get(8).setRenderer(RendererStatusEnum);
}
};
}
@@ -53,19 +57,19 @@ public class SapforTasksPackagesDBTable extends DBTable<Long,SapforTasksPackage>
@Override
public Object getFieldAt(SapforTasksPackage object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.sapfor_version;
case 2:
return object.testsNames;
return object.sapfor_version;
case 3:
return object.tasksCount;
return object.testsNames;
case 4:
return object.kernels;
return object.tasksCount;
case 5:
return new Date(object.StartDate);
return object.kernels;
case 6:
return new Date(object.ChangeDate);
return new Date(object.StartDate);
case 7:
return new Date(object.ChangeDate);
case 8:
return object.state;
default:
return null;

4
src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java
View File

@@ -2,8 +2,8 @@ package Visual_DVM_2021.Passes.All;
import Common.Global;
import TestingSystem.Common.TestingServer;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import Visual_DVM_2021.Passes.Server.DeleteServerObject;
public class DeleteSapforConfigurationCommand extends DeleteServerObject<TestingServer, SapforConfigurationCommand> {
import Visual_DVM_2021.Passes.DeleteServerObjects;
public class DeleteSapforConfigurationCommand extends DeleteServerObjects<TestingServer, SapforConfigurationCommand> {
public DeleteSapforConfigurationCommand() {
super(Global.testingServer, SapforConfigurationCommand.class);
}

36
src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java
View File

@@ -1,17 +1,38 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Database.Database;
import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
import TestingSystem.Common.TestingServer;
import TestingSystem.DVM.TasksPackage.TasksPackageState;
import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
import Visual_DVM_2021.Passes.Server.DeleteServerAccountObject;
public class DeleteSapforTasksPackage extends DeleteServerAccountObject<SapforTasksPackage> {
import Visual_DVM_2021.Passes.DeleteServerObjects;
import java.util.Vector;
public class DeleteSapforTasksPackage extends DeleteServerObjects<TestingServer,SapforTasksPackage> {
public DeleteSapforTasksPackage() {
super(SapforTasksPackage.class);
super(Global.testingServer,SapforTasksPackage.class);
}
protected Database getDb() {
return server.account_db;
}
protected String getEmail() {
return Current.getAccount().email;
}
Vector<SapforTasksPackage> to_delete;
//---
public boolean checkActivity() {
if (!target.state.equals(TasksPackageState.Done) && !target.state.equals(TasksPackageState.Aborted)) {
Log.Writeln_("Нельзя удалить активный пакет!");
return false;
to_delete = new Vector<>();
for (Object key : target) {
SapforTasksPackage tasksPackage = server.account_db.sapforTasksPackages.get(key);
if (!tasksPackage.state.equals(TasksPackageState.Done) &&
!tasksPackage.state.equals(TasksPackageState.Aborted)
) {
Log.Writeln_("Нельзя удалить активный пакет " + key + " !");
return false;
}
to_delete.add(tasksPackage);
}
return true;
}
@@ -26,7 +47,8 @@ public class DeleteSapforTasksPackage extends DeleteServerAccountObject<SapforTa
@Override
protected void performDone() throws Exception {
super.performDone();
Utils.delete_with_check(target.getLocalWorkspace());
for (SapforTasksPackage tasksPackage: to_delete)
Utils.delete_with_check(tasksPackage.getLocalWorkspace());
}
}

6
src/Visual_DVM_2021/Passes/All/DeleteTasksPackage.java
View File

@@ -23,12 +23,6 @@ public class DeleteTasksPackage extends DeleteServerObjects<TestingServer, Tasks
TasksPackage tasksPackage = server.account_db.packages.get(key);
if (!tasksPackage.state.equals(TasksPackageState.Done) &&
!tasksPackage.state.equals(TasksPackageState.Aborted)
/*&&
!tasksPackage.state.equals(TasksPackageState.Queued) &&
!tasksPackage.state.equals(TasksPackageState.TestsSynchronize) &&
!tasksPackage.state.equals(TasksPackageState.PackageWorkspaceCreation) &&
!tasksPackage.state.equals(TasksPackageState.PackageStart)
*/
) {
Log.Writeln_("Нельзя удалить активный пакет " + key + " !");
return false;