Added rule groups

This commit is contained in:
M66B
2023-04-01 18:46:05 +02:00
parent f62fa2ee4c
commit 920fb87dbf
8 changed files with 3079 additions and 2 deletions

View File

@@ -92,6 +92,7 @@ public class EntityRule {
public Long folder;
@NonNull
public String name;
public String group;
@NonNull
public int order;
@NonNull
@@ -1388,6 +1389,7 @@ public class EntityRule {
return Objects.equals(this.uuid, other.uuid) &&
this.folder.equals(other.folder) &&
this.name.equals(other.name) &&
Objects.equals(this.group, other.group) &&
this.order == other.order &&
this.enabled == other.enabled &&
this.daily == other.daily &&
@@ -1440,6 +1442,7 @@ public class EntityRule {
json.put("id", id);
json.put("uuid", uuid);
json.put("name", name);
json.put("group", group);
json.put("order", order);
json.put("enabled", enabled);
json.put("daily", daily);
@@ -1457,6 +1460,7 @@ public class EntityRule {
if (json.has("uuid"))
rule.uuid = json.getString("uuid");
rule.name = json.getString("name");
rule.group = json.getString("group");
rule.order = json.getInt("order");
rule.enabled = json.getBoolean("enabled");
rule.daily = json.optBoolean("daily");