aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix report

Browse Source
This commit is contained in:
hydrant
2019-09-03 20:15:46 +02:00
parent 616516fa3a
commit bda4342076
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ReallifeGamemode.Client/Player/reportmenu.ts
View File

@@ -96,21 +96,13 @@ export default function reportList(globalData: GlobalData) {
var types = ["Quick Report", "Ticket Report"]; var types = ["Quick Report", "Ticket Report"];
reportMenu = new Menu("QuickReport/Ticket", "", new Point(50, 50), null, null); reportMenu = new Menu("QuickReport/Ticket", "", new Point(50, 50), null, null);
var typesItem = new UIMenuListItem("Typ", "", new ItemsCollection(types));
reportMenu.AddItem(new UIMenuListItem("Typ", "", new ItemsCollection(types))); reportMenu.AddItem(typesItem);
reportMenu.AddItem(sendItem); reportMenu.AddItem(sendItem);
reportMenu.AddItem(cancelItem); reportMenu.AddItem(cancelItem);
reportMenu.Visible = true; reportMenu.Visible = true;
reportMenu.ListChange.on((item, index) => {
switch (item.Text) {
case "Absenden":
type = String(item.SelectedItem.DisplayText);
break;
}
});
reportMenu.ItemSelect.on((item) => { reportMenu.ItemSelect.on((item) => {
if (item.Text === "Absenden") { if (item.Text === "Absenden") {
@@ -118,7 +110,12 @@ export default function reportList(globalData: GlobalData) {
ticketContentBox.show(); ticketContentBox.show();
ticketContentBox.getValue(data => { ticketContentBox.getValue(data => {
var content = data; var type = typesItem.SelectedItem.DisplayText;
var content = JSON.stringify(data);
mp.gui.chat.push(content);
mp.gui.chat.push(type);
mp.events.callRemote("requestReport", type, content); mp.events.callRemote("requestReport", type, content);
mp.events.call("SERVER:CloseReportMenu"); mp.events.call("SERVER:CloseReportMenu");

7
ReallifeGamemode.Server/Report/Report.cs
View File

@@ -165,6 +165,7 @@ namespace ReallifeGamemode.Server.Report
[RemoteEvent("requestReport")] [RemoteEvent("requestReport")]
public void RequestReport(Client user, string type, string data) public void RequestReport(Client user, string type, string data)
{ {
string text = JsonConvert.DeserializeObject<string>(data);
if (type == "Ticket Report") if (type == "Ticket Report")
{ {
ReportManage temp = null; ReportManage temp = null;
@@ -184,12 +185,12 @@ namespace ReallifeGamemode.Server.Report
} }
ChatService.SendMessage(user, "!{#addc8d}Dein Ticket wurde abgeschickt"); ChatService.SendMessage(user, "!{#addc8d}Dein Ticket wurde abgeschickt");
ChatService.SendMessage(user, "!{#addc8d}Momentan sind " + UserHelper.dutyAdmins.Count + " Admins verfügbar"); ChatService.SendMessage(user, "!{#addc8d}Momentan sind " + UserHelper.dutyAdmins.Count + " Admins verfügbar");
ChatService.BroadcastDutyAdmin("!{#008fff}[TICKET]!{#FFFFFF} Eingehendes Ticket von~y~ " + user.Name + ": " + data + " (Benutze /showtickets)"); ChatService.BroadcastDutyAdmin("!{#008fff}[TICKET]!{#FFFFFF} Eingehendes Ticket von~y~ " + user.Name + ": " + text + " (Benutze /showtickets)");
ReportManage ticket = new ReportManage(user.Name, data); ReportManage ticket = new ReportManage(user.Name, text);
listReports.Add(ticket); listReports.Add(ticket);
} }
if (type == "Quick Report") if (type == "Quick Report")
ChatService.BroadcastAdmin("!{#008fff}[QR] ~y~" + user.Name + "~w~: " + data, AdminLevel.SUPPORTER); ChatService.BroadcastAdmin("!{#008fff}[QR] ~y~" + user.Name + "~w~: " + text, AdminLevel.SUPPORTER);
} }
[RemoteEvent("deleteReport")] [RemoteEvent("deleteReport")]