Skip to content
Snippets Groups Projects
Commit 11db8893 authored by Mamadu-lamarana Bah's avatar Mamadu-lamarana Bah :speech_balloon:
Browse files

gestion de la fin de l'nchère

parent d3387290
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 16 additions and 32 deletions
encheres/client/src/scripts/auctioneer.js
+ 9
− 1
View file @ 11db8893
...@@ -49,7 +49,8 @@ function startEnchere() { ...@@ -49,7 +49,8 @@ function startEnchere() {
function saleProduct() { function saleProduct() {
ident.textContent = `Fin de l'enchère. Un ${inputName.value} à ${prixActuel.textContent}`; ident.textContent = `Fin de l'enchère. Un ${inputName.value} à ${prixActuel.textContent}`;
socket.emit("adjuge"); socket.emit("adjuge");
waitForNewEnchere(false); waitForNewEnchere(true);
resetProd();
} }
function updatePrix(nouveauPrix, sock) { function updatePrix(nouveauPrix, sock) {
...@@ -62,6 +63,13 @@ function waitForNewEnchere(disabled) { ...@@ -62,6 +63,13 @@ function waitForNewEnchere(disabled) {
inputName.disabled = disabled; inputName.disabled = disabled;
inputValue.disabled = disabled; inputValue.disabled = disabled;
buttonStart.disabled = disabled; buttonStart.disabled = disabled;
buttonSale.disabled = disabled;
}
function resetProd() {
inputName.value = "";
inputName.disabled = false;
inputValue.disabled = false;
} }
encheres/client/src/scripts/bidder.js
+ 0
− 1
View file @ 11db8893
...@@ -57,7 +57,6 @@ function finishEnchere() { ...@@ -57,7 +57,6 @@ function finishEnchere() {
} }
function win() { function win() {
console.log("ici");
ident.textContent = `Enchères terminé, vous avez remporté l'enchère`; ident.textContent = `Enchères terminé, vous avez remporté l'enchère`;
displayButton("none"); displayButton("none");
} }
......
encheres/server/controllers/ioController.js
+ 2
− 5
View file @ 11db8893
...@@ -17,10 +17,8 @@ export default class IOController { ...@@ -17,10 +17,8 @@ export default class IOController {
socket.on( 'infos', (name, value) => this.transmitName(name, value) ); socket.on( 'infos', (name, value) => this.transmitName(name, value) );
socket.on("prixActuel", (prixActuel) => this.transmitPrixActuel(prixActuel, socket.id)); socket.on("prixActuel", (prixActuel) => this.transmitPrixActuel(prixActuel, socket.id));
socket.on( 'disconnect' , () => this.leave(socket) ); socket.on( 'disconnect' , () => this.leave(socket) );
socket.on("adjuge", ()=> { socket.on("adjuge", ()=> this.saleProduct());
this.saleProduct(); socket.on("encherisseur", () => this.registerBidder(socket));
});
socket.on("encherisseur", () => {this.registerBidder(socket)});
} }
registerAuctioneer(socket) { registerAuctioneer(socket) {
...@@ -58,5 +56,4 @@ export default class IOController { ...@@ -58,5 +56,4 @@ export default class IOController {
} }
} }
const randInt = max => Math.floor( Math.random() * max );
\ No newline at end of file
encheres/server/public/html/auctioneer.html
+ 1
− 5
View file @ 11db8893
...@@ -6,11 +6,7 @@ ...@@ -6,11 +6,7 @@
<title>Server</title> <title>Server</title>
<link href="./style/style.css" rel="stylesheet" type="text/css"/> <link href="./style/style.css" rel="stylesheet" type="text/css"/>
<script src="/socket.io/socket.io.js"></script> <script src="/socket.io/socket.io.js"></script>
<<<<<<< HEAD <script defer src="../scripts/auctioneer-bundle.js?05145e7089dd37c57a3c"></script></head>
<script defer src="../scripts/auctioneer-bundle.js?e6b51a291c1b05a49e07"></script></head>
=======
<script defer src="../scripts/auctioneer-bundle.js?e95509bbcceaa6519514"></script></head>
>>>>>>> 29cf1795ccc17a2dac99f0a0c8902d166b27de95
<body> <body>
<h1>Comissaire-priseur</h1> <h1>Comissaire-priseur</h1>
......
encheres/server/public/html/bidder.html
+ 1
− 5
View file @ 11db8893
...@@ -6,11 +6,7 @@ ...@@ -6,11 +6,7 @@
<title>Server</title> <title>Server</title>
<link href="./style/style.css" rel="stylesheet" type="text/css"/> <link href="./style/style.css" rel="stylesheet" type="text/css"/>
<script src="/socket.io/socket.io.js"></script> <script src="/socket.io/socket.io.js"></script>
<<<<<<< HEAD <script defer src="../scripts/bidder-bundle.js?05145e7089dd37c57a3c"></script></head>
<script defer src="../scripts/bidder-bundle.js?e6b51a291c1b05a49e07"></script></head>
=======
<script defer src="../scripts/bidder-bundle.js?e95509bbcceaa6519514"></script></head>
>>>>>>> 29cf1795ccc17a2dac99f0a0c8902d166b27de95
<body> <body>
<h1>Enchérisseur</h1> <h1>Enchérisseur</h1>
......
encheres/server/public/index.html
+ 1
− 5
View file @ 11db8893
...@@ -7,11 +7,7 @@ ...@@ -7,11 +7,7 @@
<title>server</title> <title>server</title>
<link href="./style/style.css" rel="stylesheet" type="text/css"/> <link href="./style/style.css" rel="stylesheet" type="text/css"/>
<<<<<<< HEAD <script defer src="scripts/main-bundle.js?05145e7089dd37c57a3c"></script></head>
<script defer src="scripts/main-bundle.js?e6b51a291c1b05a49e07"></script></head>
=======
<script defer src="scripts/main-bundle.js?e95509bbcceaa6519514"></script></head>
>>>>>>> 29cf1795ccc17a2dac99f0a0c8902d166b27de95
<body> <body>
<h1>Enchères</h1> <h1>Enchères</h1>
......
encheres/server/public/scripts/auctioneer-bundle.js
+ 1
− 5
View file @ 11db8893
This diff is collapsed.
encheres/server/public/scripts/bidder-bundle.js
+ 1
− 5
View file @ 11db8893
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment