X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=public%2Fjavascripts%2Fcomponents%2Fproblems.js;h=00cb944d62dc6e6e9c08a26104773af0f9ebc3b3;hp=9288a393a6f9135cd325273cc36a3a30c775d7db;hb=8d7e2786f5a67a1b9a77c742d7951e0efbe8747d;hpb=247356cde3f4e36004942c5f57187d667f7ef27c

diff --git a/public/javascripts/components/problems.js b/public/javascripts/components/problems.js
index 9288a393..00cb944d 100644
--- a/public/javascripts/components/problems.js
+++ b/public/javascripts/components/problems.js
@@ -1,62 +1,121 @@
 Vue.component('my-problems', {
 	data: function () {
 		return {
-			problems: problemArray, //initial value
+			problems: [], //oldest first
+			curIdx: 0, //index in problems array
+			stage: "nothing", //or "preview" after new problem is filled
 			newProblem: {
 				fen: "",
 				instructions: "",
 				solution: "",
-				stage: "nothing", //or "preview" after new problem is filled
 			},
 		};
 	},
 	template: `
 		<div class="col-sm-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
 			<div id="problemControls" class="button-group">
-				<button :aria-label='translate("Load previous problems")' class="tooltip"
-						@click="fetchProblems('backward')">
+				<button :aria-label='translate("Load previous problem")' class="tooltip"
+						@click="showPreviousProblem()">
 					<i class="material-icons">skip_previous</i>
 				</button>
 				<button :aria-label='translate("Add a problem")' class="tooltip"
 						@click="showNewproblemModal">
 					{{ translate("New") }}
 				</button>
-				<button :aria-label='translate("Load next problems")' class="tooltip"
-						@click="fetchProblems('forward')">
+				<button :aria-label='translate("Load next problem")' class="tooltip"
+						@click="showNextProblem()">
 					<i class="material-icons">skip_next</i>
 				</button>
 			</div>
-			<my-problem-summary v-on:show-problem="bubbleUp(p)"
-				v-for="(p,idx) in sortedProblems"
+		
+
+
+			if (this.mode == "problem")
+			{
+				// Show problem instructions
+				elementArray.push(
+					h('div',
+						{
+							attrs: { id: "instructions-div" },
+							"class": {
+								"clearer": true,
+								"section-content": true,
+							},
+						},
+						[
+							h('p',
+								{
+									attrs: { id: "problem-instructions" },
+									domProps: { innerHTML: this.problem.instructions }
+								}
+							)
+						]
+					)
+				);
+			}
+
+
+			// TODO ici :: instrus + diag interactif + solution
+			my-board + pilotage via movesList + VariantRules !
+			
+			<my-problem-preview v-show="stage=='preview'"
+				v-for="(p,idx) in problems"
 				v-bind:prob="p" v-bind:preview="false" v-bind:key="idx">
 			</my-problem-summary>
+			if (this.mode == "problem")
+			{
+				// Show problem solution (on click)
+				elementArray.push(
+					h('div',
+						{
+							attrs: { id: "solution-div" },
+							"class": { "section-content": true },
+						},
+						[
+							h('h3',
+								{
+									"class": { clickable: true },
+									domProps: { innerHTML: translations["Show solution"] },
+									on: { click: this.toggleShowSolution },
+								}
+							),
+							h('p',
+								{
+									attrs: { id: "problem-solution" },
+									domProps: { innerHTML: this.problem.solution }
+								}
+							)
+						]
+					)
+				);
+			}
+			
 			<input type="checkbox" id="modal-newproblem" class="modal">
 			<div role="dialog" aria-labelledby="newProblemTxt">
-				<div v-show="newProblem.stage=='nothing'" class="card newproblem-form">
+				<div v-show="stage=='nothing'" class="card newproblem-form">
 					<label for="modal-newproblem" class="modal-close"></label>
 					<h3 id="newProblemTxt">{{ translate("Add a problem") }}</h3>
 					<form @submit.prevent="previewNewProblem">
 						<fieldset>
 							<label for="newpbFen">FEN</label>
 							<input id="newpbFen" type="text" v-model="newProblem.fen"
-								:placeholder='translate("Full FEN string")'/>
+								:placeholder='translate("Full FEN description")'/>
 						</fieldset>
 						<fieldset>
 							<p class="emphasis">{{ translate("Safe HTML tags allowed") }}</p>
 							<label for="newpbInstructions">{{ translate("Instructions") }}</label>
 							<textarea id="newpbInstructions" v-model="newProblem.instructions"
-								placeholder="Explain the problem here"></textarea>
+								:placeholder='translate("Describe the problem goal")'></textarea>
 							<label for="newpbSolution">{{ translate("Solution") }}</label>
 							<textarea id="newpbSolution" v-model="newProblem.solution"
-								placeholder="How to solve the problem?"></textarea>
+								:placeholder='translate("How to solve the problem?")'></textarea>
 							<button class="center-btn">{{ translate("Preview") }}</button>
 						</fieldset>
 					</form>
 				</div>
-				<div v-show="newProblem.stage=='preview'" class="card newproblem-preview">
+				<div v-show="stage=='preview'" class="card newproblem-preview">
 					<label for="modal-newproblem" class="modal-close"></label>
-					<my-problem-summary v-bind:prob="newProblem" v-bind:preview="true">
-					</my-problem-summary>
+					<my-problem-preview v-bind:prob="newProblem"></my-problem-summary>
 					<div class="button-group">
 						<button @click="newProblem.stage='nothing'">{{ translate("Cancel") }}</button>
 						<button @click="sendNewProblem()">{{ translate("Send") }}</button>
@@ -68,17 +127,41 @@ Vue.component('my-problems', {
 	computed: {
 		sortedProblems: function() {
 			// Newest problem first
-			return this.problems.sort((p1,p2) => { return p2.added - p1.added; });
 		},
 	},
+	created: function() {
+		// Analyse URL: if a single problem required, show it. Otherwise,
+		// TODO: fetch most recent problems from server
+	},
 	methods: {
 		translate: function(text) {
 			return translations[text];
 		},
-		// Propagate "show problem" event to parent component (my-variant)
-		bubbleUp: function(problem) {
-			this.$emit('show-problem', JSON.stringify(problem));
+		// TODO: obsolete:
+//		// Propagate "show problem" event to parent component (my-variant)
+//		bubbleUp: function(problem) {
+//			this.$emit('show-problem', JSON.stringify(problem));
+//		},
+		toggleShowSolution: function() {
+			let problemSolution = document.getElementById("problem-solution");
+			problemSolution.style.display =
+				!problemSolution.style.display || problemSolution.style.display == "none"
+					? "block"
+					: "none";
 		},
+		showPreviousProblem: function() {
+			if (this.curIdx == 0)
+				this.fetchProblems("backward");
+			else
+				this.curIdx--;
+		},
+		showNextProblem: function() {
+			if (this.curIdx == this.problems.length - 1)
+				this.fetchProblems("forward");
+			else
+				this.curIdx++;
+		},
+		// TODO: modal "no more problems"
 		fetchProblems: function(direction) {
 			if (this.problems.length == 0)
 				return; //what could we do?!
@@ -92,12 +175,16 @@ Vue.component('my-problems', {
 					last_dt = this.problems[i].added;
 				}
 			}
-			ajax("/problems/" + variant, "GET", {
+			ajax("/problems/" + variant.name, "GET", { //TODO: use variant._id ?
 				direction: direction,
 				last_dt: last_dt,
 			}, response => {
 				if (response.problems.length > 0)
-					this.problems = response.problems;
+				{
+					this.problems = response.problems
+						.sort((p1,p2) => { return p1.added - p2.added; });
+					this.curIdx = response.problems.length - 1;
+				}
 			});
 		},
 		showNewproblemModal: function() {
@@ -105,16 +192,16 @@ Vue.component('my-problems', {
 		},
 		previewNewProblem: function() {
 			if (!V.IsGoodFen(this.newProblem.fen))
-				return alert("Bad FEN string");
-			if (this.newProblem.instructions.length == 0)
-				return alert("Empty instructions");
-			if (this.newProblem.solution.length == 0)
-				return alert("Empty solution");
+				return alert(translations["Bad FEN description"]);
+			if (this.newProblem.instructions.trim().length == 0)
+				return alert(translations["Empty instructions"]);
+			if (this.newProblem.solution.trim().length == 0)
+				return alert(translations["Empty solution"]);
 			this.newProblem.stage = "preview";
 		},
 		sendNewProblem: function() {
 			// Send it to the server and close modal
-			ajax("/problems/" + variant, "POST", {
+			ajax("/problems/" + variant.name, "POST", { //TODO: with variant._id ?
 				fen: this.newProblem.fen,
 				instructions: this.newProblem.instructions,
 				solution: this.newProblem.solution,
@@ -127,3 +214,8 @@ Vue.component('my-problems', {
 		},
 	},
 })
+
+// TODO:
+// possibilité de supprimer / éditer si peer ID reconnu comme celui du probleme (champ "uploader")
+// --> côté serveur on vérifie un certain "secret"
+// --> filtre possible "mes problèmes"