diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
index d7d1dee90c..083d214773 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
@@ -3,6 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
xmlns:at="clr-namespace:Content.Client.Administration.UI.Tabs.AdminTab"
+ xmlns:wd="clr-namespace:Content.Client._White.Administration"
Margin="4"
MinSize="50 50">
@@ -18,7 +19,7 @@
-
+
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/HoursPanel.xaml b/Content.Client/_White/Administration/HoursPanel.xaml
similarity index 56%
rename from Content.Client/Administration/UI/Tabs/AdminTab/HoursPanel.xaml
rename to Content.Client/_White/Administration/HoursPanel.xaml
index 75587a5a68..6ea7218d98 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/HoursPanel.xaml
+++ b/Content.Client/_White/Administration/HoursPanel.xaml
@@ -1,7 +1,7 @@
+ Title="Накрутка времени" MinSize="300 500">
@@ -17,5 +17,13 @@
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/HoursPanel.xaml.cs b/Content.Client/_White/Administration/HoursPanel.xaml.cs
similarity index 84%
rename from Content.Client/Administration/UI/Tabs/AdminTab/HoursPanel.xaml.cs
rename to Content.Client/_White/Administration/HoursPanel.xaml.cs
index 9b63043ebd..c51cedc28d 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/HoursPanel.xaml.cs
+++ b/Content.Client/_White/Administration/HoursPanel.xaml.cs
@@ -8,7 +8,7 @@ using Robust.Client.UserInterface.XAML;
using Robust.Shared.Prototypes;
using static Robust.Client.UserInterface.Controls.LineEdit;
-namespace Content.Client.Administration.UI.Tabs.AdminTab;
+namespace Content.Client._White.Administration;
[GenerateTypedNameReferences]
[UsedImplicitly]
@@ -24,21 +24,23 @@ public sealed partial class HoursPanel : DefaultWindow
MinutesLine.OnTextChanged += UpdateButtonsText;
RoleOption.OnItemSelected += args => RoleOption.SelectId(args.Id);
SubmitButton.OnPressed += _ => OnSubmitButtonOnPressed(roles);
+ SaveButton.OnPressed += _ => OnSaveButtonOnPressed();
OnNamesChanged();
InitRoleList(roles);
+
}
- private void InitRoleList(Dictionary Roles)
+ private void InitRoleList(Dictionary roles)
{
var roleInd = 0;
RoleOption.AddItem("общее", roleInd);
- Roles.Add(roleInd, "Overall");
+ roles.Add(roleInd, "Overall");
roleInd++;
foreach (var dep in IoCManager.Resolve().EnumeratePrototypes())
{
foreach (var role in dep.Roles)
{
RoleOption.AddItem(Loc.GetString($"Job{role.Id}"), roleInd);
- Roles.Add(roleInd, $"Job{role.Id}");
+ roles.Add(roleInd, $"Job{role.Id}");
roleInd++;
}
}
@@ -53,21 +55,21 @@ public sealed partial class HoursPanel : DefaultWindow
private void AddMinutes(uint add)
{
- OnNamesChanged();
if (!TryGetMinutes(MinutesLine.Text, out var minutes))
minutes = 0;
MinutesLine.Text = $"{minutes + add}";
UpdateButtons(minutes + add);
+ OnNamesChanged();
}
private void UpdateButtonsText(LineEditEventArgs obj)
{
- OnNamesChanged();
if (!TryGetMinutes(obj.Text, out var minutes))
return;
UpdateButtons(minutes);
+ OnNamesChanged();
}
private void UpdateButtons(uint minutes)
@@ -90,5 +92,13 @@ public sealed partial class HoursPanel : DefaultWindow
{
IoCManager.Resolve().ExecuteCommand(
$"playtime_addrole {PlayerNameLine.Text} {roles[RoleOption.SelectedId]} {MinutesLine.Text}");
+ SaveButton.Disabled = false;
+ }
+
+ private void OnSaveButtonOnPressed()
+ {
+ IoCManager.Resolve().ExecuteCommand(
+ $"playtime_save {PlayerNameLine.Text}");
+ SaveButton.Disabled = true;
}
}
diff --git a/Content.Server/Administration/Commands/PlayTimeCommands.cs b/Content.Server/Administration/Commands/PlayTimeCommands.cs
index dd64528a93..5dbbc5b25f 100644
--- a/Content.Server/Administration/Commands/PlayTimeCommands.cs
+++ b/Content.Server/Administration/Commands/PlayTimeCommands.cs
@@ -93,7 +93,7 @@ public sealed class PlayTimeAddRoleCommand : IConsoleCommand
}
_playTimeTracking.AddTimeToTracker(player, role, TimeSpan.FromMinutes(minutes));
- var time = _playTimeTracking.GetOverallPlaytime(player);
+ var time = _playTimeTracking.GetPlayTimeForTracker(player, role);
shell.WriteLine(Loc.GetString("cmd-playtime_addrole-succeed",
("username", userName),
("role", role),
diff --git a/Resources/Locale/ru-RU/job/job-names.ftl b/Resources/Locale/ru-RU/job/job-names.ftl
index bff04d2c20..6c0d39b275 100644
--- a/Resources/Locale/ru-RU/job/job-names.ftl
+++ b/Resources/Locale/ru-RU/job/job-names.ftl
@@ -70,7 +70,7 @@ JobChiefEngineer = старший инженер
JobChiefMedicalOfficer = главный врач
JobClown = клоун
JobDetective = детектив
-JobBrigmedic = Бригмедик
+JobBrigmedic = бригмедик
JobERTEngineer = инженер ОБР
JobERTJanitor = уборщик ОБР
JobERTLeader = лидер ОБР
@@ -108,3 +108,4 @@ JobStationEngineer = инженер
JobTechnicalAssistant = технический ассистент
JobWarden = смотритель
JobZookeeper = зоотехник
+JobVisitor = посетитель
diff --git a/Resources/Locale/ru-RU/players/play-time/play-time-commands.ftl b/Resources/Locale/ru-RU/players/play-time/play-time-commands.ftl
index 427d2702c6..7ab62302b6 100644
--- a/Resources/Locale/ru-RU/players/play-time/play-time-commands.ftl
+++ b/Resources/Locale/ru-RU/players/play-time/play-time-commands.ftl
@@ -6,14 +6,14 @@ parse-session-fail = Не найдена сессия для '{ $username }'
# - playtime_addoverall
cmd-playtime_addoverall-desc = Добавляет указанное число минут к общему игровому времени игрока
cmd-playtime_addoverall-help = Использование: { $command }
-cmd-playtime_addoverall-succeed = Общее игровое время { $username } увеличено на { TOSTRING($time, "dddd\\:hh\\:mm") }.
+cmd-playtime_addoverall-succeed = Общее игровое время { $username } увеличено до { TOSTRING($time, "dddd\\:hh\\:mm") }.
cmd-playtime_addoverall-arg-user =
cmd-playtime_addoverall-arg-minutes =
cmd-playtime_addoverall-error-args = Ожидается ровно два аргумента
# - playtime_addrole
cmd-playtime_addrole-desc = Добавляет указанное число минут к времени игрока на определённой роли
cmd-playtime_addrole-help = Использование: { $command }
-cmd-playtime_addrole-succeed = Игровое время для { $username } / \'{ $role }\' увеличено на { TOSTRING($time, "dddd\\:hh\\:mm") }.
+cmd-playtime_addrole-succeed = Игровое время для { $username } / \'{ $role }\' увеличено до { TOSTRING($time, "dddd\\:hh\\:mm") }.
cmd-playtime_addrole-arg-user =
cmd-playtime_addrole-arg-role =
cmd-playtime_addrole-arg-minutes =
diff --git a/Resources/Locale/ru-RU/ui/misc.ftl b/Resources/Locale/ru-RU/ui/misc.ftl
new file mode 100644
index 0000000000..daae4e3f54
--- /dev/null
+++ b/Resources/Locale/ru-RU/ui/misc.ftl
@@ -0,0 +1 @@
+Filter = Фильтр