This commit is contained in:
2023-12-15 02:34:30 +03:00
parent 106626eb9a
commit fd76843aff
10 changed files with 120 additions and 27 deletions

View File

@@ -0,0 +1,41 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.Common.TasksPackageToKill.TasksPackageToKill;
import TestingSystem.Common.TestingPackageToKill.TestingPackageToKill;
import TestingSystem.DVM.DVMPackage.DVMPackage;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class AbortDVMPackage extends TestingSystemPass<DVMPackage> {
TestingPackageToKill packageToKill = null;
@Override
public String getIconPath() {
return "/icons/Ban.PNG";
}
@Override
public String getButtonText() {
return "";
}
@Override
protected boolean canStart(Object... args) throws Exception {
packageToKill = null;
if (Current.Check(Log, Current.DVMPackage)) {
target = Current.getDVMPackage();
switch (target.state) {
case Done:
case Aborted:
Log.Writeln_("Пакет уже завершен.");
break;
default:
packageToKill = new TestingPackageToKill(target);
return true;
}
}
;
return false;
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.PublishObject, "", packageToKill));
}
}

View File

@@ -20,10 +20,16 @@ public class ActualizeDVMPackages extends TestingSystemPass<Vector<Pair<Integer,
@Override
protected boolean canStart(Object... args) throws Exception {
target = new Vector<>();
System.out.println("active packages");
for (DVMPackage dvmPackage : Global.testingServer.db.dvmPackages.Data.values()) {
if (dvmPackage.state.isActive())
System.out.println(dvmPackage.id+" "+dvmPackage.state);
if (dvmPackage.state.isActive()) {
System.out.println(dvmPackage.state);
target.add(new Pair(dvmPackage.id, dvmPackage.state));
System.out.println(dvmPackage.id);
}
}
System.out.println("found "+target.size());
return !target.isEmpty();
}
@Override
@@ -40,6 +46,6 @@ public class ActualizeDVMPackages extends TestingSystemPass<Vector<Pair<Integer,
}
@Override
protected void showDone() throws Exception {
Global.testingServer.db.dvmPackages.RefreshUI();
Global.testingServer.db.dvmPackages.ShowUI(); ///RefreshUI()
}
}

View File

@@ -7,6 +7,7 @@ import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.Common.TestingServer;
import TestingSystem.DVM.DVMPackage.DVMPackage;
import TestingSystem.DVM.TasksPackage.TasksPackageState;
import Visual_DVM_2021.Passes.Server.PublishServerObject;
import javafx.util.Pair;
public class StartDVMPackage extends PublishServerObject<TestingServer, DVMPackage>{
@@ -36,9 +37,15 @@ public class StartDVMPackage extends PublishServerObject<TestingServer, DVMPacka
if (UI.Question("Будет запущено:\n"
+target.tasksCount + " задач на запуск.\n" +
"Продолжить")) {
target.state = TasksPackageState.Queued;
return true;
}
}
return false;
}
@Override
protected void performDone() throws Exception {
super.performDone();
TestingServer.ResetTimer();
}
}

View File

@@ -313,12 +313,15 @@ public enum PassCode_2021 {
AddTasksToDVMPackage,
StartDVMPackage,
DeleteDVMPackage,
AbortDVMPackage,
//->
TestPass;
public String getDescription() {
switch (this) {
case Undefined:
return "?";
case AbortDVMPackage:
return "Прервать пакет тестирования DVM";
case DeleteDVMPackage:
return "Удалить пакет задач DVM";
case StartDVMPackage: