diff --git a/edge/server/main.js b/edge/server/main.js
index 7d21c88..91c7ea3 100644
--- a/edge/server/main.js
+++ b/edge/server/main.js
@@ -137,6 +137,7 @@ function onInit() {
rpc.register("getPlayerParty");
rpc.register("upsertPlayerParty");
+ rpc.register("getPlayerPartys");
rpc.register("getPlayerPartyTile");
rpc.register("upsertlayerPartyTile");
@@ -324,6 +325,15 @@ async function getPlayerParty(ctx,ids) {
);
return obj[0];
}
+// Repository PlayerPartys
+async function getPlayerPartys(ctx,partyid) {
+ var obj = await store.query(ctx, "PlayerParty",
+
+ {"eq":{ "partyid": partyid }}
+
+ );
+ return obj;
+}
async function upsertPlayerParty(ctx,playerparty) {
var obj = await store.upsert(ctx, "PlayerParty", playerparty);
return obj;
diff --git a/src/app.css b/src/app.css
index 9585e62..8ea294a 100644
--- a/src/app.css
+++ b/src/app.css
@@ -327,7 +327,7 @@
.tile, .tilenone { width: 33.33333333333333333333333% }
.tilenone {border: none;}
-
+.rencontre{border: 1px 5px}
.sortable > span {
-webkit-touch-callout:none;
-ms-touch-action:none; touch-action:none;
diff --git a/src/lib/Tile.svelte b/src/lib/Tile.svelte
index fb5b4f5..092177c 100644
--- a/src/lib/Tile.svelte
+++ b/src/lib/Tile.svelte
@@ -1,15 +1,36 @@
-
{position} = {name}
+
+
+
{name}
+
{position}
+ {#await promise}
+
wainting ...
+ {:then players}
+ {#each players as player}
+ {#if player.tileid == _id }
+
+ {/if}
+ {/each}
+ {:catch err}
+ {err.message}
+
+ {/await}
+
diff --git a/src/routes/game/+page.svelte b/src/routes/game/+page.svelte
index 05bf30b..44d9910 100644
--- a/src/routes/game/+page.svelte
+++ b/src/routes/game/+page.svelte
@@ -98,12 +98,12 @@
}
// Mise à jour de la position du joueur
- data.party.playertile.position=position;
console.log(data.party.playertile.position)
- data.party.playertile = await Edge.Client.rpc("getTilebyorder",data.party.playertile.position).catch(err => console.error(err));
+ data.party.playertile = await Edge.Client.rpc("getTilebyorder",position).catch(err => console.error(err));
console.log(data.party.playertile);
data.party.playerparty.tileid=data.party.playertile._id;
Edge.Client.rpc("upsertPlayerParty",data.party.playerparty);
+ data.party.playertile.position=position;
// temporaire on passe au suivant
//playernext();
@@ -376,78 +376,79 @@
{/if}
+ {#key data.party.playertile.position}
-
+ {/key}
{#if data.party.status==="partyplay" && my._id===data.party.playerid }
diff --git a/src/routes/party/[id]/+page.svelte b/src/routes/party/[id]/+page.svelte
index 7d8624a..e9098f9 100644
--- a/src/routes/party/[id]/+page.svelte
+++ b/src/routes/party/[id]/+page.svelte
@@ -34,14 +34,24 @@
// Si playernb ne depasse pas playernbmax = on affecte le jour à la party
if(data.party.playernb<=data.party.playernbmax&&data.party.status==="playerwait") {
data.party.status="playerwait";
+ data.party.playertile = await Edge.Client.rpc("getTile", 'st').catch(err => console.error(err));
// Submit de la party
let party=await Edge.Client.rpc("upsertParty", data.party).catch(err => console.error(err));
+ data.party._id=party._id;
// On affecte la party au player submiter
data.player.partyid=party._id;
+ let randomColor = Math.floor(Math.random()*16777215).toString(16);
await Edge.Client.rpc("upsertPlayer", data.player).catch(err => console.error(err));
- await Edge.Client.rpc("upsertPlayerParty", { "playerid": data.player._id, "partyid": party._id, "tileid": "st", "cash": 100, "nbhappy": 0}).catch(err => console.error(err));
+
+ // Génération du player party
+ let playerparty = { "playerid": data.player._id, "partyid": party._id, "tileid": "st", "cash": 100, "nbhappy": 0, "player": data.player, "color": "#"+ randomColor}
+ await Edge.Client.rpc("upsertPlayerParty", playerparty).catch(err => console.error(err));
+
+ // Sauvegarde du player party
+ data.party.playerparty=playerparty;
+ await Edge.Client.rpc("upsertParty", data.party).catch(err => console.error(err));
}
// refresh des party