X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=public%2Fjavascripts%2Fcomponents%2Fproblems.js;h=53077049d12dc61bd071fa2160e38c67c86cba08;hp=60aa9c430833caa145aa522d7060a9e6e3a9d91b;hb=fd08ab2c5b8931bb8c95cf7e9f2f95122647f991;hpb=a9f262f38d7ae9ea4c935c549309bd2f773aa6c2 diff --git a/public/javascripts/components/problems.js b/public/javascripts/components/problems.js index 60aa9c43..53077049 100644 --- a/public/javascripts/components/problems.js +++ b/public/javascripts/components/problems.js @@ -1,11 +1,17 @@ Vue.component('my-problems', { data: function () { return { + userId: user.id, problems: [], //oldest first - myProblems: [], //same - curProblems: [], //assigned to either of the ones above - curIdx: 0, //index in (current) problems array - newProblem: { + myProblems: [], //same, but only mine + singletons: [], //requested problems (using #num) + display: "others", //or "mine" + curProb: null, //(reference to) current displayed problem (if any) + showSolution: false, + pbNum: 0, //to navigate directly to some problem + // New problem (to upload), or existing problem to edit: + modalProb: { + id: 0, //defined if it's an edit fen: "", instructions: "", solution: "", @@ -16,217 +22,295 @@ Vue.component('my-problems', { template: `
- - -
- --> OK, mais ces flèches n'ont pas la même action selon les vues - --> fetchN si liste, problème suivant/précédent sinon - - -board qui bouge et activé que si #hash donnant numéro du problème -deux listes : tous les problèmes sauf les miens - + les miens - - -//TODO: filter "my problems" ==> liste séparée (lors de la requête serveur) ---> bouton plutôt sous l'échiquier après soluce (sauf si anonymous) ---> puis dans la vue "my problems (listing échiquier gauche / instrus + soluce cachée à droite -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 ! - - +
+
+

+ {{ curProb.instructions }} +

+
+ + +
+

+ {{ translations["Show solution"] }} +

+

+ {{ curProb.solution }} +

+
+ +
+
+ + +
+ + - 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 } - } - ) - ] - ) - ); - } - - -
-
- -

{{ translate("Add a problem") }}

-
+ +
+
+ +

+ {{ translate("Add a problem") }} +

+
-
-

{{ translate("Safe HTML tags allowed") }}

- - - - - +

+ {{ translate("Safe HTML tags allowed") }} +

+ + + + +
-
- - +
+ + +
- - + +
+ +
+
+ +

+ {{ nomoreMessage }} +

+
+
`, - computed: { - sortedProblems: function() { - // Newest problem first - }, - }, created: function() { - // Analyse URL: if a single problem required, show it. Otherwise, - // TODO: fetch most recent problems from server - // If the requested problem is in the list, just show it - this.tryNavigate(); + if (location.hash.length > 0) + this.showProblem(location.hash.slice(1)); + else + this.firstFetch(); }, methods: { + firstFetch: function() { + // Fetch most recent problems from server, for both lists + this.fetchProblems("others", "bacwkard"); + this.fetchProblems("mine", "bacwkard"); + this.listsInitialized = true; + }, + showProblem: function(num) { + const pid = num || this.pbNum; + location.hash = "#" + pid; + const pIdx = this.singletons.findIndex(p => p.id == pid); + if (pIdx >= 0) + curProb = this.singletons[pIdx]; + else + { + // Cannot find problem in current set; get from server, and add to singletons. + ajax( + "/problems/" + variant.name + "/" + pid, //TODO: use variant._id ? + "GET", + response => { + if (!!response.problem) + { + this.singletons.push(response.problem); + this.curProb = response.problem; + } + else + this.noMoreProblems("Sorry, problem " + pid + " does not exist"); + } + ); + } + }, translate: function(text) { return translations[text]; }, - // 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"; + curProblems: function() { + switch (this.display) + { + case "others": + return this.problems; + case "mine": + return this.myProblems; + } }, - showPreviousProblem: function() { - if (this.curIdx == 0) - this.fetchProblems("backward"); - else - this.curIdx--; + // TODO?: get 50 from server but only show 10 at a time (for example) + showNext: function(direction) { + if (!this.curProb) + return this.fetchProblems(this.display, direction); + // Show next problem (older or newer): + let curProbs = this.curProblems(); + // Try to find a neighbour problem in the direction, among current set + const neighbor = this.findClosestNeighbor(this.curProb, curProbs, direction); + if (!!neighbor) + { + this.curProb = neighbor; + return; + } + // Boundary case: nothing in current set, need to fetch from server + const curSize = curProbs.length; + this.fetchProblems(this.display, direction); + const newSize = curProbs.length; + if (curSize == newSize) //no problems found + return this.noMoreProblems("No more problems in this direction"); + // Ok, found something: + this.curProb = this.findClosestNeighbor(this.curProb, curProbs, direction); }, - showNextProblem: function() { - if (this.curIdx == this.problems.length - 1) - this.fetchProblems("forward"); - else - this.curIdx++; + findClosestNeighbor: function(problem, probList, direction) { + let neighbor = undefined; + let smallestDistance = Number.MAX_SAFE_INTEGER; + for (let prob of probList) + { + const delta = Math.abs(prob.id - problem.id); + if (delta < smallestDistance && + ((direction == "backward" && prob.id < problem.id) + || (direction == "forward" && prob.id > problem.id))) + { + neighbor = prob; + smallestDistance = delta; + } + } + return neighbor; + }, + noMoreProblems: function(message) { + this.nomoreMessage = message; + let modalNomore = document.getElementById("modalNomore"); + modalNomore.checked = true; + setTimeout(() => modalNomore.checked = false, 2000); + }, + displayList: function() { + this.curProb = null; + location.hash = ""; + // Fetch problems if first call (if #num, and then lists) + if (!this.listsInitialized) + this.firstFetch(); }, - // TODO: modal "no more problems" - fetchProblems: function(direction) { - if (this.problems.length == 0) - return; //what could we do?! - // Search for newest date (or oldest) - let last_dt = this.problems[0].added; - for (let i=0; i 0) { - if ((direction == "forward" && this.problems[i].added > last_dt) || - (direction == "backward" && this.problems[i].added < last_dt)) + // Search for newest date (or oldest) + last_dt = problems[0].added; + for (let i=1; i last_dt) || + (direction == "backward" && this.problems[i].added < last_dt)) + { + last_dt = this.problems[i].added; + } } } - ajax("/problems/" + variant.name, "GET", { //TODO: use variant._id ? - direction: direction, - last_dt: last_dt, - }, response => { - if (response.problems.length > 0) + ajax( + "/problems/" + variant.name, //TODO: use variant._id ? + "GET", { - this.problems = response.problems - .sort((p1,p2) => { return p1.added - p2.added; }); - this.curIdx = response.problems.length - 1; + type: type, + direction: direction, + last_dt: last_dt, + }, + response => { + if (response.problems.length > 0) + { + Array.prototype.push.apply(problems, + response.problems.sort((p1,p2) => { return p1.added - p2.added; })); + // If one list is empty but not the other, show the non-empty + const otherArray = (type == "mine" ? this.problems : this.myProblems); + if (problems.length > 0 && otherArray.length == 0) + this.display = type; + } } - }); - }, - showNewproblemModal: function() { - document.getElementById("modal-newproblem").checked = true; + ); }, - previewNewProblem: function() { + previewProblem: function() { if (!V.IsGoodFen(this.newProblem.fen)) 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"; + this.modalProb.preview = true; }, - sendNewProblem: function() { + editProblem: function(prob) { + this.modalProb = prob; + document.getElementById("modal-newproblem").checked = true; + }, + deleteProblem: function(pid) { + ajax( + "/problems/" + variant.name + "/" + pid, //TODO: with variant.id ? + "DELETE", + response => { + // Delete problem from the list on client side + let problems = this.curProblems(); + const pIdx = problems.findIndex(p => p.id == pid); + problems.splice(pIdx, 1); + } + ); + }, + sendProblem: function() { // Send it to the server and close modal - ajax("/problems/" + variant.name, "POST", { //TODO: with variant._id ? - fen: this.newProblem.fen, - instructions: this.newProblem.instructions, - solution: this.newProblem.solution, - }, response => { - this.newProblem.added = Date.now(); - this.problems.push(JSON.parse(JSON.stringify(this.newProblem))); - document.getElementById("modal-newproblem").checked = false; - this.newProblem.stage = "nothing"; - }); + ajax( + "/problems/" + variant.name, //TODO: with variant.id ? + (this.modalProb.id > 0 ? "PUT" : "POST"), + this.modalProb, + response => { + document.getElementById("modal-newproblem").checked = false; + if (this.modalProb.id == 0) + { + this.modalProb.added = Date.now(); + this.modalProb.preview = false; + this.myProblems.push(JSON.parse(JSON.stringify(this.modalProb))); + } + else + this.modalProb.id = 0; + } + ); }, }, }) - -// TODO: -// possibilité de supprimer / éditer si peer ID reconnu comme celui du probleme (champ "uploader")