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

промежуточный. загрузка адресатов для багов без наличия их в бд.

Browse Source
This commit is contained in:
02090095
2025-02-19 22:47:56 +03:00
parent 7a9c70f396
commit 4e3597ba7a
40 changed files with 234 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountDialog.java
View File

@@ -24,7 +24,7 @@ public class UserAccountDialog extends DBObjectDialog<UserAccount, UserAccountFi
Utils_.validateEmail(fields.tfAddress.getText(), Log);
if (fields.tfAddress.getText().isEmpty())
Log.Writeln_("Адрес электронной почты не может быть пустым");
if (!title_text.equals("Регистрация") && (fields.tfAddress.isEditable() && Global.componentsServer.db.subscribers.Data.containsKey(fields.tfAddress.getText()))) {
if (!title_text.equals("Регистрация") && (fields.tfAddress.isEditable() && Global.componentsServer.credentials_db.userAccounts.Data.containsKey(fields.tfAddress.getText()))) {
Log.Writeln_("Адрес электронной почты " + Utils_.Brackets(fields.tfAddress.getText()) + " уже есть в списке.");
}
}

29
src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java
View File

@@ -1,9 +1,19 @@
package _VisualDVM.ComponentsServer.UserAccount;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm;
import _VisualDVM.ComponentsServer.Recipient.Json.RecipientJson;
import _VisualDVM.ComponentsServer.Recipient.Json.RecipientsJson;
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
import _VisualDVM.ComponentsServer.UserAccount.UI.UserAccountsForm;
import javax.swing.*;
import java.util.LinkedHashMap;
import java.util.Vector;
public class UserAccountsDBTable extends iDBTable<UserAccount> {
public UserAccountsDBTable() {
super(UserAccount.class);
@@ -34,4 +44,23 @@ public class UserAccountsDBTable extends iDBTable<UserAccount> {
public String getPluralDescription() {
return "учётные записи";
}
@Override
public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
//-
res.put(SubscriberWorkspace.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
return res;
}
public String getPackedActiveRecipients(){
RecipientsJson res = new RecipientsJson();
Vector<String> active = new Vector<>();
for (UserAccount userAccount: Data.values()){
if ((userAccount.subscribe_active!=0) && !active.contains(userAccount.email)){
active.add(userAccount.email);
res.values.add(new RecipientJson(userAccount.email, userAccount.name));
}
}
return Utils_.gson.toJson(res);
}
}