Commit d01792c6 by Иван Кубота

push 1

parent d1246d9b
Pipeline #559 failed with stage
...@@ -444,7 +444,7 @@ data = {tags:[], connections:[], more:[], standardQuestions: {}, standardAnswers ...@@ -444,7 +444,7 @@ data = {tags:[], connections:[], more:[], standardQuestions: {}, standardAnswers
var tid = 1, cid = 1; var tid = 1, cid = 1;
var tagsHash = {}; var tagsHash = {};
data.more = data.more.concat([ data.more = data.more.concat([
{p: '1cards.csv', i: '1components.csv'}, {p: '1cards_2020_02_28.csv', i: '1components.csv'},
{q: '2questions.csv', a: '2answers.csv', c: '2cards_2020_2_21.csv'}, {q: '2questions.csv', a: '2answers.csv', c: '2cards_2020_2_21.csv'},
{q: '3questions.csv', a: '3answers.csv', c: '3cards.csv'}, {q: '3questions.csv', a: '3answers.csv', c: '3cards.csv'},
{q: '4questions.csv', a: '4answers.csv', c: '4cards.csv'} {q: '4questions.csv', a: '4answers.csv', c: '4cards.csv'}
...@@ -523,7 +523,9 @@ data = {tags:[], connections:[], more:[], standardQuestions: {}, standardAnswers ...@@ -523,7 +523,9 @@ data = {tags:[], connections:[], more:[], standardQuestions: {}, standardAnswers
postProcess: (a, inc) => { postProcess: (a, inc) => {
a.iID = inc() a.iID = inc()
a.id = adishen+a.id; a.id = adishen+a.id;
data.products[a.id].items.push(a); if(a.id in data.products){
data.products[ a.id ].items.push( a );
}
}, },
index: 'iID' index: 'iID'
......
...@@ -51,7 +51,7 @@ quizTypes.radio = [ ...@@ -51,7 +51,7 @@ quizTypes.radio = [
return `Какое из этих описаний относится к продукту ${lapk(income.correct.title)}` return `Какое из этих описаний относится к продукту ${lapk(income.correct.title)}`
}, },
answer( income, log ){ answer( income, log ){
//debugger
return shuffle( return shuffle(
[new Answer.Correct(textFormat(income.correct.description))] [new Answer.Correct(textFormat(income.correct.description))]
.concat( .concat(
......
...@@ -126,7 +126,7 @@ const quizGenerator = function(type, photo, subType) { ...@@ -126,7 +126,7 @@ const quizGenerator = function(type, photo, subType) {
} }
let answers = shuffle(cfg.answer.call(cfg, source, log)); let answers = shuffle(cfg.answer.call(cfg, source, log));
if(answers === false){ if(answers === false || answers.length === 1){
// давай по новой // давай по новой
return _quizGenerator( type, photo, subType, attempt + 1 ); return _quizGenerator( type, photo, subType, attempt + 1 );
} }
......
...@@ -116,7 +116,7 @@ view.page.Products = function() { ...@@ -116,7 +116,7 @@ view.page.Products = function() {
on: { click: tableAction } on: { click: tableAction }
}, '←' ), }, '←' ),
item.image && (D.img({attr:{src: item.image, height: '60px'}})), item.image && (D.img({attr:{src: item.image, height: '60px'}, on: {click: ()=>{}}})),
span( { span( {
......
...@@ -61,9 +61,9 @@ data.after = function(inComeData, skipInit){ ...@@ -61,9 +61,9 @@ data.after = function(inComeData, skipInit){
let cmp = inComeData.products[i]; let cmp = inComeData.products[i];
subcats[ normalizeText( cmp.title ) ] = cmp.subcat; subcats[ normalizeText( cmp.title ) ] = cmp.subcat;
} }
//ctx.setData(inComeData); ctx.setData(theData=inComeData);
standardQuestions = inComeData.standardQuestions; standardQuestions = inComeData.standardQuestions;
firstRequest(); //firstRequest();
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment