Skip to content
Snippets Groups Projects
Commit b96119e8 authored by Pierre Roussel's avatar Pierre Roussel
Browse files

Data

parent 6682bffc
No related branches found
No related tags found
9 merge requests!104devV2 comm,!53feat : Intégration IHM-Main,!52Dev,!39Sylvain/feature/correction type,!31Daroldju/fix/fix light user class name,!30Get data classes from comm to corecomm interface,!16Merge data classes in comm module,!14Merge Data classes for Comm branch,!12Data
Showing
with 473 additions and 78 deletions
<Application x:Class="Client.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:Client"
StartupUri="MainWindow.xaml">
<Application.Resources>
</Application.Resources>
</Application>
<Application x:Class="Client.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:Client"
StartupUri="MainWindow.xaml">
<Application.Resources>
</Application.Resources>
</Application>
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
using System.Windows;
namespace Client
{
/// <summary>
/// Logique d'interaction pour App.xaml
/// </summary>
public partial class App : Application
{
}
}
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
using System.Windows;
namespace Client
{
/// <summary>
/// Logique d'interaction pour App.xaml
/// </summary>
public partial class App : Application
{
}
}
<Window x:Class="Client.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Client"
mc:Ignorable="d"
Title="MainWindow" Height="450" Width="800">
<Grid>
</Grid>
</Window>
<Window x:Class="Client.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Client"
mc:Ignorable="d"
Title="MainWindow" Height="450" Width="800">
<Grid>
</Grid>
</Window>
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace Client
{
/// <summary>
/// Logique d'interaction pour MainWindow.xaml
/// </summary>
public partial class MainWindow : Window
{
public MainWindow()
{
InitializeComponent();
}
}
}
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace Client
{
/// <summary>
/// Logique d'interaction pour MainWindow.xaml
/// </summary>
public partial class MainWindow : Window
{
public MainWindow()
{
InitializeComponent();
}
}
}
using System;
using System.Collections.Generic;
using System.Data;
namespace Client.Data
{
public class Username
{
private string name;
public Username(string name)
{
this.name = name;
}
public string getUsername()
{
return name;
}
}
public class GameInfo
{
private int id;
private int nbPlayers;
private int nbMaxPlayers;
public GameInfo(int id, int nbPlayers, int nbMaxPlayers)
{
this.id = id;
this.nbPlayers = nbPlayers;
this.nbMaxPlayers = nbMaxPlayers;
}
public int getId()
{
return id;
}
public int getNbPlayers()
{
return nbPlayers;
}
public int getNbMaxPlayers()
{
return nbMaxPlayers;
}
}
public class Comm_calls_Data_Client_impl : Shared.interfaces.Interface_Comm_calls_Data_Client
{
private Username[] users;
private GameInfo[] games;
public Comm_calls_Data_Client_impl(){}
public void setGamesAndUsers(Username[] users, GameInfo[] games)
{
}
}
using System;
namespace Client.Data
{
public class Data_Client
{
private Comm_calls_Data_Client_impl implInterfaceForComm;
public Data_Client()
{
this.implInterfaceForComm = new Comm_calls_Data_Client_impl();
}
public Comm_calls_Data_Client_impl getImplInterfaceForComm()
{
return implInterfaceForComm;
}
public static void Main(string[] args)
{
Data_Client data = new Data_Client();
Comm_calls_Data_Client_impl comm = data.getImplInterfaceForComm();
Username[] users = new Username[2];
users[0] = new Username("KING1");
users[1] = new Username("KING2");
GameInfo[] games = new GameInfo[2];
games[0] = new GameInfo(1, 2, 4);
games[1] = new GameInfo(2, 3, 5);
comm.setGamesAndUsers(users, games);
comm.displayUsers();
comm.displayGames();
}
}
}
using System;
//using user1;
public class IHM_Main_calls_Data_Client_Impl : Data_Client_ctrl
{
public IHM_Main_calls_Data_Client_Impl()
{
}
Boolean authenticate(logint string, passwordt string)
{
int i = 0;
foreach (string line in System.IO.File.ReadLines(@"./user1.txt"))
{
string[] lineArray = line.Split(' '); // si le séparateur est un espace
if ((logint == lineArray[0]) && (passwordt == lineArray[1])) { return True }
else { return False };
}
}
User getLigthUser(logint string)
{
user= getLigthUserdeUser(login)
}
}
using System;
namespace network_test
{
class Program
{
static void Main(string[] args)
{
string choice;
do
{
Console.WriteLine("s : server\nc : client\n");
choice = Console.ReadLine();
} while (choice != "s"
);
if (choice == "s")
{
Console.WriteLine("hello nina ");
}
s
}
}
}
charles
boi
\ No newline at end of file
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Client.ihm_main
{
class Class1
{
}
}
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Client.ihm_main
{
class Class1
{
}
}
......@@ -45,6 +45,8 @@
<ItemGroup>
<Compile Include="comm\Class1.cs" />
<Compile Include="data\Class1.cs" />
<Compile Include="data\Comm_calls_Data_Server_Impl.cs" />
<Compile Include="data\Data_Server_ctrl.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
......
using System;
using System.Collections.Generic;
using System.Data;
namespace Server.Data
{
public class User
{
private string username;
private int idJoueur;
public User(string username,int idJoueur)
{
this.username = username;
this.idJoueur = idJoueur;
}
public string DisplayInfoPlayer()
{
return "Username : " + username + " / " + "IdJoueur : " + idJoueur;
}
public int getIdJoueur()
{
return idJoueur;
}
}
public class Game
{
private string idGame;
private int nbPlayer;
private int nbPlayerMax;
public Game(string idGame, int nbPlayer, int nbPlayerMax)
{
this.idGame = idGame;
this.nbPlayer = nbPlayer;
this.nbPlayerMax = nbPlayerMax;
}
public string DisplayInfoGame()
{
return "IdGame : " + idGame + " / " + "NbPlayer : " + nbPlayer + " / " + "NbPlayerMax : " + nbPlayerMax;
}
}
public class Comm_calls_Data_Server_Impl : Shared.interfaces.Interface_Comm_calls_Data_Server
{
private User user;
private static List<User> users = new List<User>();
private static List<Game> games = new List<Game>();
public Comm_calls_Data_Server_Impl()
{
}
public Comm_calls_Data_Server_Impl(string username, int idJoueur)
{
this.user = new User(username, idJoueur);
registerUser(user);
}
public User getUser()
{
return this.user;
}
public List<User> registerUser(User user)
{
users.Add(user);
return users;
}
public void displayUsers()
{
foreach (User user in users)
{
Console.WriteLine(user.DisplayInfoPlayer());
}
}
public void removeUser(int idJoueur)
{
foreach(User user in users)
{
if(user.getIdJoueur() == idJoueur)
{
users.Remove(user);
break;
}
}
}
//On va juste retourner la liste des games stockés sur le serveur
public List<Game> getGames()
{
return games;
}
public Comm_calls_Data_Server_Impl getCommCallsDataServerImpl()
{
return this;
}
}
}
using System;
public class Class1
{
public Class1()
{
}
}
using System;
using System.Collections.Generic;
using System.Text;
using System.Data;
using Server.Data;
namespace Server.Data
{
public class Data_Serveur_ctrl
{
private Comm_calls_Data_Server_Impl implInterfaceForComm;
public Data_Serveur_ctrl()
{
implInterfaceForComm = new Comm_calls_Data_Server_Impl();
}
public Comm_calls_Data_Server_Impl getImplInterfaceForComm()
{
return implInterfaceForComm;
}
public static void Main(string[] args)
{
Data_Serveur_ctrl data = new Data_Serveur_ctrl();
Comm_calls_Data_Server_Impl comm2 = data.getImplInterfaceForComm();
User user = new User("KING8", 8);
User user2 = new User("KING9", 9);
User user3 = new User("KING10", 4);
comm2.registerUser(user);
comm2.registerUser(user2);
comm2.registerUser(user3);
comm2.displayUsers();
Console.WriteLine("*************************\n");
comm2.removeUser(4);
comm2.displayUsers();
}
}
}
\ No newline at end of file
......@@ -42,7 +42,11 @@
</ItemGroup>
<ItemGroup>
<Compile Include="data\Class1.cs" />
<Compile Include="data\LigthUser.cs" />
<Compile Include="data\User.cs" />
<Compile Include="interfaces\IInterface1.cs" />
<Compile Include="interfaces\Interface_Comm_calls_Data_Client.cs" />
<Compile Include="interfaces\Interface_Comm_calls_Data_Server.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup />
......
using System;
public class LigthUser
{
public int id;
public string userName;// userName et login c'est la même chose
public string image;
public LigthUser(int idt = 1, string userNamet = "usernametest", string imaget = "imagetest")
{
if (idt == 1) { id = idt }
else
{
id = Guid.NewGuid(); // ou Guid.NewGuid().ToString()
}
userName = userNamet;
image = imaget;
}
}
\ No newline at end of file
using System;
using LigthUser;
//à faire hériter de ligth user
public class User : LightUser
{
public login: string
public password: string
public status: enum
public firstname : string
public age: int
public User(int idt = 1, string userNamet = "usernametest", string imaget = "imagetest",string logint, string passwordt, string statust, string firstnamet, int aget)
{
id = idt;
userName = userNamet;
image = imaget;
login = logint;
password = passwordt;
status = statust;
firstname = firstnamet;
age = aget;
}
}
using System;
namespace Shared.interfaces
{
public interface Interface_Comm_calls_Data_Client
{
}
}
using System;
namespace Shared.interfaces
{
public interface Interface_Comm_calls_Data_Server
{
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment