промежуточный. прописал для планировщиков общий класс-предок
This commit is contained in:
@@ -53,8 +53,7 @@ public class AddDVMPackage extends AddObjectPass<DVMPackage> {
|
||||
}
|
||||
//--
|
||||
target = new DVMPackage();
|
||||
target.genName();
|
||||
|
||||
target.id = Constants.Nan;
|
||||
//-
|
||||
target.sender_name=Current.getAccount().name;
|
||||
target.sender_address = Current.getAccount().email;
|
||||
@@ -72,11 +71,13 @@ public class AddDVMPackage extends AddObjectPass<DVMPackage> {
|
||||
target.needsEmail = Global.properties.EmailOnTestingProgress ? 1 : 0;
|
||||
//--
|
||||
target.package_json = new DVMPackage_json();
|
||||
//Utils.CheckAndCleanDirectory(target.getLocalWorkspace());
|
||||
//target.saveJson();
|
||||
//--
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@Override
|
||||
protected void body() throws Exception {
|
||||
//черновик не вставляется в бд.
|
||||
Global.testingServer.db.dvmPackages.Data.put(target.id, target);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -145,7 +145,7 @@ public class AddTasksToDVMPackage extends Pass_2021<DVMPackage> {
|
||||
return UI.Question("Будет добавлено " + tasks_count + " задач. Продолжить");
|
||||
}
|
||||
//
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
@Override
|
||||
protected void body() throws Exception {
|
||||
|
||||
36
src/Visual_DVM_2021/Passes/All/DeleteDVMPackage.java
Normal file
36
src/Visual_DVM_2021/Passes/All/DeleteDVMPackage.java
Normal file
@@ -0,0 +1,36 @@
|
||||
package Visual_DVM_2021.Passes.All;
|
||||
import Common.Global;
|
||||
import Common.UI.UI;
|
||||
import TestingSystem.Common.TestingServer;
|
||||
import TestingSystem.DVM.DVMPackage.DVMPackage;
|
||||
import TestingSystem.DVM.TasksPackage.TasksPackageState;
|
||||
import Visual_DVM_2021.Passes.DeleteServerObjects;
|
||||
public class DeleteDVMPackage extends DeleteServerObjects<TestingServer, DVMPackage> {
|
||||
public DeleteDVMPackage() {
|
||||
super(Global.testingServer, DVMPackage.class);
|
||||
}
|
||||
//---
|
||||
public boolean checkActivity() {
|
||||
/*
|
||||
for (Object key : target) {
|
||||
DVMPackage tasksPackage = server.db.dvmPackages.get(key);
|
||||
if (!tasksPackage.state.equals(TasksPackageState.Done) &&
|
||||
!tasksPackage.state.equals(TasksPackageState.Aborted)
|
||||
) {
|
||||
Log.Writeln_("Нельзя удалить активный пакет " + key + " !");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
*/
|
||||
return true;
|
||||
}
|
||||
@Override
|
||||
protected boolean canStart(Object... args) throws Exception {
|
||||
return super.canStart(args) && checkActivity();
|
||||
}
|
||||
@Override
|
||||
protected void showPreparation() throws Exception {
|
||||
UI.getMainWindow().getTestingWindow().DropTestRunTasksComparison();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user