Commit

ReallifeGamemode.Client/Player/reportmenu.ts

@@ -0,0 +1,179 @@
+import * as NativeUI from 'NativeUI';
+import jailList from './criminalrelease';
+import InputHelper from '../inputhelper';
+
+const Menu = NativeUI.Menu;
+const UIMenuItem = NativeUI.UIMenuItem;
+const UIMenuListItem = NativeUI.UIMenuListItem;
+const UIMenuCheckboxItem = NativeUI.UIMenuCheckboxItem;
+const BadgeStyle = NativeUI.BadgeStyle;
+const Point = NativeUI.Point;
+const ItemsCollection = NativeUI.ItemsCollection;
+const Color = NativeUI.Color;
+
+let screenRes = mp.game.graphics.getScreenResolution(0, 0);
+
+let deleteItem = new UIMenuItem("Entfernen", "Entfernt das Ticket aus der Liste");
+deleteItem.BackColor = new Color(42, 46, 49);
+let saveItem = new UIMenuItem("Annehmen", "Starte direkten Chat mit dem User");
+saveItem.BackColor = new Color(13, 71, 161);
+saveItem.HighlightedBackColor = new Color(25, 118, 210);
+
+let sendItem = new UIMenuItem("Annehmen", "Sende Report an alle Admins");
+sendItem.BackColor = new Color(13, 71, 161);
+sendItem.HighlightedBackColor = new Color(25, 118, 210);
+
+let cancelItem = new UIMenuItem("Abbrechen", "");
+cancelItem.BackColor = new Color(213, 0, 0);
+cancelItem.HighlightedBackColor = new Color(229, 57, 53);
+
+export default function reportList(globalData: GlobalData) {
+
+    var reportMenu: NativeUI.Menu;
+
+    var users;
+    var reportTexts;
+
+    var user = "";
+    var reportText = "";
+
+
+    //Weapon Menu
+
+    mp.events.add('showReportMenu', (userTickets, TicketsArr) => {
+        if (!globalData.InMenu) {
+
+            globalData.InMenu = true;
+
+            users = JSON.parse(userTickets);
+            reportTexts = JSON.parse(TicketsArr);
+
+            reportMenu = new Menu("Offene Tickets", "", new Point(50, 50), null, null);
+
+            reportMenu.AddItem(new UIMenuListItem("Ticket", "", new ItemsCollection(reportTexts)));
+
+            reportMenu.AddItem(deleteItem);
+            reportMenu.AddItem(saveItem);
+            reportMenu.AddItem(cancelItem);
+            reportMenu.Visible = true;
+
+            reportMenu.ListChange.on((item, index) => {
+                switch (item.Text) {
+                    case "Spieler":
+                        user = String(item.SelectedItem.DisplayText);                        
+                        break;
+                }
+            });
+
+            reportMenu.ItemSelect.on((item) => {
+                if (item.Text === "Annehmen") {
+                    mp.events.callRemote("acceptReport", user);
+                    reportMenu.Close();
+                    globalData.InMenu = false;
+                } else if (item.Text === "Abbrechen") {
+                    reportMenu.Close();
+                    globalData.InMenu = false;
+                } else if (item.Text === "Entfernen") {
+                    mp.events.callRemote("deleteReport", user);
+                    reportMenu.Close();
+                    globalData.InMenu = false;
+                }
+            });
+
+            reportMenu.MenuClose.on(() => {
+                globalData.InMenu = false;
+            });
+        }
+    });
+
+    mp.events.add('showReportType', () => {
+        if (!globalData.InMenu) {
+
+            var type;
+
+            globalData.InMenu = true;
+            
+            var types = ["Quick Report", "Ticket Report"];
+
+            reportMenu = new Menu("QuickReport/Ticket", "", new Point(50, 50), null, null);
+
+            reportMenu.AddItem(new UIMenuListItem("Anliegen", "", new ItemsCollection(types)));
+
+            reportMenu.AddItem(sendItem);
+            reportMenu.AddItem(cancelItem);
+            reportMenu.Visible = true;
+
+            reportMenu.ListChange.on((item, index) => {
+                switch (item.Text) {
+                    case "Anliegen":
+                        type = String(item.SelectedItem.DisplayText);
+                        break;
+                }
+            });
+
+            reportMenu.ItemSelect.on((item) => {
+                if (item.Text === "Annehmen") {
+
+                    var tickcont;
+                    
+                    mp.events.callRemote("requestReport", "tescht");
+                    var ticketContentBox = new InputHelper("Worin besteht dein Anliegen?", globalData);
+                    ticketContentBox.show();
+                    ticketContentBox.getValue(data => {
+
+                        var content = data;
+
+                        mp.events.callRemote("requestReport", "lold");
+                        mp.events.call("SERVER:CloseReportMenu");
+                        reportMenu.Close();
+                    });
+
+                    var lold = ticketContentBox.test;
+                    mp.events.callRemote("requestReport", lold);
+                    
+
+                    globalData.InMenu = false;
+                } else if (item.Text === "Abbrechen") {
+                    reportMenu.Close();
+                    globalData.InMenu = false;0
+                }
+            });
+
+            reportMenu.MenuClose.on(() => {
+                globalData.InMenu = false;
+            });
+        }
+    });
+
+    var textBoxBrowser: BrowserMp;
+    var loginCam: CameraMp = mp.cameras.new('login', new mp.Vector3(-1883.736, -781.4911, 78.27616), new mp.Vector3(3.185999, 0, -79.59519), 40);
+
+    var localPlayer: PlayerMp = mp.players.local;
+
+    mp.events.add('textbox', () => {
+        mp.gui.cursor.show(true, true);
+        mp.gui.chat.show(false);
+        mp.game.ui.displayHud(false);
+        mp.game.ui.displayRadar(false);
+
+        textBoxBrowser = mp.browsers.new("package://assets/html/SimpleTextBox.html");
+
+        /*
+        loginCam.setActive(true);
+        mp.game.cam.renderScriptCams(true, false, 0, true, false);
+        */
+    });
+
+
+    mp.events.add('report_submitText', (tmp) => {
+        
+        mp.events.callRemote("requestReport", tmp);
+    });
+
+    mp.events.add("SERVER:CloseReportMenu", () => {
+        mp.game.ui.clearHelp(true);
+        if (reportMenu != null) {
+            reportMenu.Close();
+        }
+    });
+}

ReallifeGamemode.Client/assets/html/SimpleTextBox.html

@@ -0,0 +1,23 @@
+<html>
+<head>
+    <link rel="stylesheet" href="package://assets/css/login/style.css" />
+    <link rel="stylesheet" href="package://assets/css/jquery-ui.min.css" />
+    <meta charset="utf-8" />
+</head>
+<body>
+    <form id="form-ticket">
+        <div class="form">
+            <h1 color="white">
+                Worin besteht dein Anliegen?<span class="req"></span>
+            </h1>
+            <input type="text" id="textboxContent" class="input-username" required autocomplete="off" />
+
+            <button type="submit" class="button button-block">Abschicken</button>
+
+        </div> <!-- /form -->
+
+    </form>
+    <script type="text/javascript" src="package://assets/js/jquery-3.3.1.min.js"></script>
+    <script type="text/javascript" src="package://assets/js/jquery-ui.min.js"></script>
+</body>
+</html>

ReallifeGamemode.Client/assets/html/inputhelper/index.html

@@ -17,6 +17,9 @@
             $('#input-value').keydown(function (e) {
                 if (e.keyCode != 13) return;
                 var currentValue = $('#input-value').val();
+
+                mp.trigger('submitText', currentValue);
+                
                 if (currentValue) {
                     mp.trigger('cef_inputhelper_sendvalue', currentValue);
                     console.log("triggered event: " + currentValue);

ReallifeGamemode.Client/assets/html/login/index.html

@@ -24,7 +24,7 @@
             <div id="login">
                 <h1>Wilkommen zurück</h1>
 
-                <form id="form-login">
+                <form id="form-login" >
 
                     <div class="field-wrap">
                         <label>

ReallifeGamemode.Client/assets/js/ticket/script.js

@@ -0,0 +1,14 @@
+var playerName = undefined;
+var errorShown = false;
+
+
+$(document).ready(_ => {
+
+    $('#form-ticket').on('submit', e => {
+
+        e.preventDefault();
+        var content = $("#textboxContent").val();
+        mp.trigger('report_submitText', content);
+    });
+    
+});

ReallifeGamemode.Client/index.ts

@@ -154,4 +154,7 @@ import smoothThrottle from './vehiclesync/smoothtrottle';
 smoothThrottle();
 
 import vehicleIndicators from './vehiclesync/vehicleindicators';
-vehicleIndicators(); 
+vehicleIndicators(); 
+
+import reportList from './Player/reportmenu';
+reportList(globalData);

ReallifeGamemode.Client/inputhelper/index.ts

@@ -4,10 +4,12 @@
     private created: boolean;
     private browser: BrowserMp;
     private data: GlobalData;
+    public test: string;
 
     constructor(title: string, globalData: GlobalData) {
         this.title = title;
         this.data = globalData;
+        this.test = "";
 
         this.cefTitleCall = this.cefTitleCall.bind(this);
         mp.events.add('cef_request_title', this.cefTitleCall);
@@ -15,6 +17,10 @@
         this.cefCallback = this.cefCallback.bind(this);
         mp.events.add('cef_inputhelper_sendvalue', this.cefCallback);
 
+        mp.events.add('submitText', (tmp) => {
+            this.test = tmp;
+        });
+
         this.finish = this.finish.bind(this);
         this.show = this.show.bind(this);
         this.valueGetter = this.valueGetter.bind(this);
@@ -36,6 +42,7 @@
         this.data.InInput = true;
         this.created = true;
         this.browser = mp.browsers.new('package://assets/html/inputhelper/index.html');
+
     }
 
     private finish() {
@@ -74,4 +81,7 @@
     }
 }
 
-exports = InputHelper;
+exports = InputHelper;
+
+
+

ReallifeGamemode.Server/Commands/AdminCommands.cs

@@ -600,6 +600,7 @@ namespace ReallifeGamemode.Server.Commands
 
       ChatService.SendMessage(target, "~r~KICKINFO: ~w~Du wurdest von " + adminPlayername + " vom Server gekickt: " + reason);
       target.Kick();
+
       ChatService.Broadcast("~y~INFO: ~w~" + targetPlayername + " wurde von " + player.GetUser().AdminLevel.GetName() + " " + adminPlayername + " gekickt: " + reason);
     }
 
@@ -2525,8 +2526,6 @@ namespace ReallifeGamemode.Server.Commands
             dbContext.Users.Where(u => u.Id == nearHouse.OwnerId).First().HouseId = null;
           }
 
-          dbContext.SaveChanges();
-
           dbContext.Houses.Remove(nearHouse);
           dbContext.SaveChanges();
 

ReallifeGamemode.Server/Commands/UserCommands.cs

@@ -5,6 +5,7 @@ using ReallifeGamemode.Server.Finance;
 using ReallifeGamemode.Server.Models;
 using ReallifeGamemode.Server.Services;
 using ReallifeGamemode.Server.Util;
+using System;
 using System.Linq;
 using System;
 
@@ -69,5 +70,6 @@ namespace ReallifeGamemode.Server.Commands
         ChatService.SendMessage(client, "~g~[PAYCHECK] -------------------------------------------------------");
       }
     }
+
   }
 }

ReallifeGamemode.Server/Events/Connect.cs

@@ -22,7 +22,8 @@ namespace ReallifeGamemode.Server.Events
       player.SetData("isLoggedIn", false);
       player.Position = new Vector3(-1883.736, -781.4911, -10);
       player.FreezePosition = true;
-
+     
+      
       using (var dbContext = new DatabaseContext())
       {
         if (!dbContext.WhitelistEntries.Any(w => w.SocialClubName.ToLower() == player.SocialClubName.ToLower()))
@@ -38,6 +39,7 @@ namespace ReallifeGamemode.Server.Events
           return;
         }
       }
+      
 
       if (IsPlayerBanned(player)) return;
       player.TriggerEvent("SERVER:Login_ShowBrowser");
@@ -88,4 +90,4 @@ namespace ReallifeGamemode.Server.Events
       }
     }
   }
-}
+}

ReallifeGamemode.Server/Finance/Economy.cs

@@ -168,6 +168,15 @@ namespace ReallifeGamemode.Server.Finance
       Paychecks[user.Id] = paycheck;
       ReleasePayDay(client, paycheck);
     }
+    
+    private static int GetRentalFees(Client client)
+    {
+      using (var dbContext = new DatabaseContext())
+      {
+        User user = client.GetUser();
+        return dbContext.HouseRentals.Where(h => h.UserId == user.Id).Include(h => h.House).Sum(h => h.House.RentalFee);
+      }
+    }
 
     private static int GetRentalFees(Client client)
     {

ReallifeGamemode.Server/ReallifeGamemode.Server.csproj

@@ -9,6 +9,10 @@
     <Configurations>Debug;Release;ServerBuild</Configurations>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="Migrations\20190721184931_FactionWeaponsRemovedHash.cs" />
+    <Compile Remove="Migrations\20190721184931_FactionWeaponsRemovedHash.Designer.cs" />
+  </ItemGroup>
   <ItemGroup>
     <Content Include="meta.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -37,6 +41,6 @@
     </Reference>
   </ItemGroup>
  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(ConfigurationName)' != 'ServerBuild'">
-    <Exec Command="powershell.exe .\Scripts\moveItems.ps1 -outDir $(OutDir) -outFile $(TargetFileName)" />
+    <Exec Command="powershell.exe -executionpolicy bypass .\Scripts\moveItems.ps1 -outDir $(OutDir) -outFile $(TargetFileName)" />
   </Target>
 </Project>

ReallifeGamemode.Server/Report/Report.cs

@@ -0,0 +1,120 @@
+using GTANetworkAPI;
+using ReallifeGamemode.Server.Entities;
+using ReallifeGamemode.Server.Extensions;
+using ReallifeGamemode.Server.Finance;
+using ReallifeGamemode.Server.Models;
+using ReallifeGamemode.Server.Services;
+using ReallifeGamemode.Server.Util;
+using System;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace ReallifeGamemode.Server.Report
+{
+  class Report : Script
+  {
+    public static List<ReportManage> listReports = new List<ReportManage>();
+
+    [Command("report", "~m~Benutzung: ~s~/report")]
+    public void CmdUserReport(Client client, String message)
+    {
+      User user = client.GetUser();
+
+      client.TriggerEvent("showReportType");
+      //ChatService.BroadcastAdmin("Eingehendes Ticket von " + client.Name + ": " + message + " (Benutze /showtickets)", AdminLevel.ADMIN);
+      ReportManage ticket = new ReportManage(client.Name, message);
+      listReports.Add(ticket);
+    }
+
+    [Command("showtickets", "~m~Benutzung: ~s~/showtickets")]
+    public void CmdAdminShowtickets(Client client)
+    {
+      if (!client.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
+      {
+        ChatService.NotAuthorized(client);
+        return;
+      }
+
+      if (listReports.Count == 0)
+      {
+        return;
+      }
+      User user = client.GetUser();
+      List<String> listPlayers = new List<string>();
+      List<String> listTicketnames = new List<string>();
+
+      for (int a=0; a< listReports.Count; a++)
+      {
+        ReportManage temp = listReports[a];
+
+        listPlayers.Add(temp.getUser());
+        listTicketnames.Add(temp.getReporttext());
+      }
+      //ChatService.SendMessage(client, JsonConvert.SerializeObject(listPlayers));
+      client.TriggerEvent("showReportMenu", JsonConvert.SerializeObject(listPlayers), JsonConvert.SerializeObject(listTicketnames));
+
+    }
+
+
+    [RemoteEvent("acceptReport")]
+    public void AcceptReport(Client admin, string client)
+    {
+      Client player = ClientService.GetClientByNameOrId(client);
+      if (player == null)
+        return;
+      
+      ChatService.SendMessage(player, "Admin " + admin.Name + " hat dein Ticket angenommen!");
+      ChatService.BroadcastAdmin(admin.Name + " hat das Ticket von " + player.Name + " angenommen", AdminLevel.ADMIN);
+
+      for (int a = 0; a < listReports.Count; a++)
+      {
+        ReportManage temp = listReports[a];
+        if (temp.getUser().Equals(player.Name))
+        {
+          listReports[a].setAdmin(admin.Name);
+        }
+      }
+    }
+
+    [RemoteEvent("requestReport")]
+    public void RequestReport(Client user, dynamic data)
+    {
+      ChatService.BroadcastAdmin("JA MAN!" + ", " + data, AdminLevel.ADMIN);
+    }
+
+    [RemoteEvent("sendReport")]
+    public void SendReport(Client user, string type)
+    {
+      if (type.Equals("Quick Report"))
+      {
+        ChatService.BroadcastAdmin("Quick Report von " + user.Name, AdminLevel.ADMIN);
+      } else if (type.Equals("Ticket Report"))
+      {
+        ChatService.BroadcastAdmin("Ticket Report von " + user.Name, AdminLevel.ADMIN);
+        user.TriggerEvent("textbox");
+      } 
+    }
+
+    [RemoteEvent("deleteReport")]
+    public void DeleteReport(Client user, string name)
+    {
+      Client player = ClientService.GetClientByNameOrId(name);
+      if (player == null)
+        return;
+      
+      for (int a = 0; a < listReports.Count; a++)
+      {
+        ReportManage temp = listReports[a];
+
+        if (temp.getUser().Equals(player.Name))
+        {
+          ChatService.Broadcast("Ticket von " + player.Name + " gelöscht!");
+          listReports.Remove(temp);
+        }
+      }
+      ChatService.BroadcastAdmin(user.Name + " hat das Ticket von " + player.Name + " gelöscht", AdminLevel.ADMIN);
+    }
+  }
+}

ReallifeGamemode.Server/Report/ReportManage.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ReallifeGamemode.Server.Report
+{
+  class ReportManage
+  {
+    private String user;
+    private String admin;
+    private String reportText;
+
+    public ReportManage (String nUser, string nReportText)
+    {
+      this.user = nUser;
+      this.admin = "N/A";
+      this.reportText = nReportText;
+    }
+
+    public void setAdmin(String nAdmin)
+    {
+      this.admin = nAdmin;
+    }
+
+    public String getUser()
+    {
+      return this.user;
+    }
+    public String getReporttext()
+    {
+      return this.reportText;
+    }
+  }
+}