From 9f0b7c720fcb0161c9c06d4e359c998b40283c09 Mon Sep 17 00:00:00 2001 From: mohamed Date: Mon, 20 Mar 2023 21:33:10 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=94Modifications=20du=20model=20de=20l'ap?= =?UTF-8?q?pli=20et=20ajout=20d'un=20stub=20=F0=9F=93=9A,=20avancement.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- R-Dash/assets/images/people.jpg | Bin 0 -> 17475 bytes R-Dash/assets/images/user.jpg | Bin 0 -> 13274 bytes R-Dash/core/Geocalisation.ts | 8 +---- R-Dash/core/Iloader.ts | 7 +++++ R-Dash/core/Lap.ts | 16 +++++----- R-Dash/core/LoadDB.ts | 12 ++++++++ R-Dash/core/LoadXLS.ts | 13 ++++++++ R-Dash/core/Member.ts | 4 +-- R-Dash/core/Owner.ts | 8 +++-- R-Dash/core/Point.ts | 9 +----- R-Dash/core/Session.ts | 15 +++++---- R-Dash/core/StandardSessionBuilder.ts | 4 +-- R-Dash/core/Team.ts | 42 ++++++++++++++------------ R-Dash/core/Track.ts | 8 +---- R-Dash/core/User.ts | 36 ++++++++++------------ R-Dash/core/WaitingMember.ts | 4 +-- R-Dash/stub/stub.tsx | 24 +++++++++++++++ 17 files changed, 128 insertions(+), 82 deletions(-) create mode 100644 R-Dash/assets/images/people.jpg create mode 100644 R-Dash/assets/images/user.jpg create mode 100644 R-Dash/core/LoadDB.ts create mode 100644 R-Dash/stub/stub.tsx diff --git a/R-Dash/assets/images/people.jpg b/R-Dash/assets/images/people.jpg new file mode 100644 index 0000000000000000000000000000000000000000..87ea47a86b29c12631918ae8e6990bd04f861949 GIT binary patch literal 17475 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

JjV(Q;%I@l*4% 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 { + if(user as WaitingMember){ + waitList.concat(user); + } + }); + return waitList; } - setWaitList(waitList: User[]) { - this.waitList = waitList; + addToWaitList(user: User) : boolean{ + if(!this.users.includes(user)){ + this.users.concat(user); + return true; + } + return false; } } \ No newline at end of file diff --git a/R-Dash/core/Track.ts b/R-Dash/core/Track.ts index 6b9d48f..f3555bf 100644 --- a/R-Dash/core/Track.ts +++ b/R-Dash/core/Track.ts @@ -1,16 +1,10 @@ export class Track { - readonly id: number; private name: string; - constructor(id: number, name: string) { - this.id = id; + constructor(name: string) { this.name = name; } - getId() { - return this.id; - } - getName() { return this.name; } diff --git a/R-Dash/core/User.ts b/R-Dash/core/User.ts index b6d5588..4146200 100644 --- a/R-Dash/core/User.ts +++ b/R-Dash/core/User.ts @@ -2,31 +2,35 @@ import { Session } from "./Session"; import { Team } from "./Team"; export abstract class User { - readonly id: number; - private pseudo: string; + private username: string; private password: string; private email: string; private sessions: Session[]; - private team: Team; + private image : HTMLImageElement; - constructor(id: number, pseudo: string, password: string, email: string, sessions: Session[] = null, team: Team = null) { - this.pseudo = pseudo; + constructor(username: string, password: string, email: string, sessions: Session[] = [], image : HTMLImageElement) { + this.username = username; this.password = password; this.email = email; this.sessions = sessions; - this.team = team; + this.image = image; + + } + + getImage(){ + return this.image; } - getId() { - return this.id; + setImage(image: HTMLImageElement){ + this.image = image; } - getPseudo() { - return this.pseudo; + getUsername() { + return this.username; } - setPseudo(pseudo: string) { - this.pseudo = pseudo; + setUsername(username: string) { + this.username = username; } getPassword() { @@ -53,12 +57,4 @@ export abstract class User { this.sessions = sessions; } - getTeam() { - return this.team; - } - - setTeam(team: Team) { - this.team = team; - } - } \ No newline at end of file diff --git a/R-Dash/core/WaitingMember.ts b/R-Dash/core/WaitingMember.ts index 5398a30..e7fbbdc 100644 --- a/R-Dash/core/WaitingMember.ts +++ b/R-Dash/core/WaitingMember.ts @@ -3,7 +3,7 @@ import { Team } from "./Team"; import { User } from "./User"; export class WaitingMember extends User { - constructor(id: number, pseudo: string, password: string, email: string, sessions: Session[], team: Team) { - super(id, pseudo, password, email, sessions, team); + constructor( pseudo: string, password: string, email: string, sessions: Session[],image : HTMLImageElement= require('../assets/images/user.jpg')) { + super(pseudo, password, email, sessions, image); } } \ No newline at end of file diff --git a/R-Dash/stub/stub.tsx b/R-Dash/stub/stub.tsx new file mode 100644 index 0000000..1a1dab9 --- /dev/null +++ b/R-Dash/stub/stub.tsx @@ -0,0 +1,24 @@ +import { Member } from "../core/Member"; +import { Owner } from "../core/Owner"; +import { Team } from "../core/Team"; +import { User } from "../core/User"; +import { WaitingMember } from "../core/WaitingMember"; + +const owner1 = new Owner("eric","PASSWORD123","eric@gmail.com",[]); +const owner2 = new Owner("castor","PASSWORD123","castor@gmail.com",[]); + +export const USERS1 : User[] = [ + new Member("jean","PASSWORD123","jean@gmail.com",[]), + new WaitingMember("anas","PASSWORD123","anas@gmail.com",[]), +] +export const USERS2 : User[] = [ + new Member("stickman","PASSWORD123","stickman@gmail.com",[]), + new Member("crapaud","PASSWORD123","crapaud@gmail.com",[]), + new WaitingMember("mcdo","PASSWORD123","mcdo@gmail.com",[]), + new WaitingMember("bucheron","PASSWORD123","bucheron@gmail.com",[]), +] + +export const TEAMS : Team[] = [ + new Team("La team 1",owner1, USERS1), + new Team("Bat INFO",owner2,USERS2) +] \ No newline at end of file