diff --git a/bin/test.sh b/bin/test.sh index 26a63d9..67d6ad1 100644 --- a/bin/test.sh +++ b/bin/test.sh @@ -2,5 +2,5 @@ cd $(dirname "$0")/.. -#testcafe firefox test/test.testcafe.js --debug-on-fail -node bin/testcafe.js; \ No newline at end of file +testcafe firefox test/test.testcafe.js --debug-on-fail +#node bin/testcafe.js; \ No newline at end of file diff --git a/orga/test.sql b/orga/test.sql index ef28ad0..8a40972 100644 --- a/orga/test.sql +++ b/orga/test.sql @@ -55,7 +55,6 @@ ALTER TABLE Rating ADD CONSTRAINT FK_D1189E24D9801611 FOREIGN KEY (levelId) REFE ALTER TABLE Rating ADD CONSTRAINT FK_D1189E24A1F3197E FOREIGN KEY (authTokenId) REFERENCES AuthToken (id); ALTER TABLE Word ADD used TINYINT(1) NOT NULL; - INSERT INTO Role (name, beschreibung) VALUES ('gast', 'Kein aktives oder eingeloggtes Mitglied'); -- 1 INSERT INTO Role (name, beschreibung) VALUES ('user', 'Normales Mitglied'); -- 2 INSERT INTO Role (name, beschreibung) VALUES ('admin', 'Admin, darf alles'); -- 3 @@ -72,20 +71,21 @@ INSERT INTO RoleAccess(RoleId, AccessId) VALUES (2,2); -- user - online INSERT INTO RoleAccess(RoleId, AccessId) VALUES (2,3); -- user - default INSERT INTO `RoleAccess` (`RoleId`, `AccessId`) VALUES (3, 4); -- admin - admin - - INSERT INTO `Level` (`id`, `words`, `positions`, `renderer`, `lastUpdated`, `lang`, `deleted`, `difficulty`) VALUES +(67,'["AHNUNG","AUSBAU"]','[0,0,1]',20,'2018-10-10 00:00:00',1,0,1), (15, '["ARCHIV","CHARME"]', '[1,1,3]', 20, '2018-07-14 17:01:18', 1, 0, 2), (26, '["BRAUEREI","THERAPIE"]', '[3,2,0,1]', 40, '2018-07-14 17:01:18', 1, 0, 40), (217, '["ZEITSTRAFE","HOCHSAISON"]', '[1,0,3,3,1]', 60, '2018-07-14 17:01:18', 1, 0, 60), -(220, '["FEINGUSS","RÜCKFALL","PHYSIKER","RESIDENZ","BERATUNG","KOCHTOPF"]', '[2,0,0,1,2,2,3,3,2,1,1,2,0,0]', 100, '2018-07-14 17:01:18', 1, 0, 100), -(24, '["BETONUNG","ANBETUNG","ALLERGIE","BAUMHAUS"]', '[0,3,1,1,3,1,2,0,0,0]', 120, '2018-07-14 17:01:18', 1, 0, 120), -(62, '["FEHLPROGNOSE","GEISTESKRAFT","ARBEITSPAUSE","BEREITSCHAFT","MOSAIKARBEIT","INFRAROTFILM"]', '[0,3,0,1,0,3,2,3,1,2,3,1,2,2,0,2,3,0,2,1,1]', 140, '2018-07-14 17:01:18', 1, 0, 140), -(260, '["SCHREIBTISCH","URHEBERRECHT","PFLANZENKOST","OPERNKONZERT"]', '[1,3,2,1,3,0,1,2,3,0,2,0,1,0,0]', 160, '2018-07-14 17:01:18', 1, 0, 160), -(67,'["AHNUNG","AUSBAU"]','[0,0,1]',20,'2018-10-10 00:00:00',1,0,1), -(341,'["NACHLASS","BUSLINIE","REITBAHN","LAUFGANG","KASCHMIR","BADETUCH"]','[1,3,0,2,3,0,1,0,0,0,3,1,0,0]',100,'2018-04-15 12:22:11',1,0,90), (1921,'["HACKBRATEN","FLÜCHTLING","HOFTHEATER","KIELWASSER"]','[3,1,3,0,0,1,3,0,1,0,1]',81,'2018-11-06 17:08:37',1,0,70), (2270,'["AUFKLÄRUNG","FALTENROCK","HERZFEHLER","RESTAURANT"]','[0,0,0,2,0,1,0,3,2,1,3]',80,'2018-11-06 17:08:50',1,0,80), (2266,'["SPRÜHREGEN","SITZKISSEN","FÜHRERHAUS","NAVIGATION"]','[3,1,1,2,1,3,3,3,2,1,3]',82,'2018-11-06 17:08:50',1,0,81), -(2265,'["ZINSESZINS","TISCHLAMPE","ABSPALTUNG","BRANDWUNDE"]','[2,3,3,2,2,3,0,1,0,1,2]',83,'2018-11-06 17:08:50',1,0,82) +(2265,'["ZINSESZINS","TISCHLAMPE","ABSPALTUNG","BRANDWUNDE"]','[2,3,3,2,2,3,0,1,0,1,2]',83,'2018-11-06 17:08:50',1,0,82), +(341,'["NACHLASS","BUSLINIE","REITBAHN","LAUFGANG","KASCHMIR","BADETUCH"]','[1,3,0,2,3,0,1,0,0,0,3,1,0,0]',100,'2018-04-15 12:22:11',1,0,90), +(220, '["FEINGUSS","RÜCKFALL","PHYSIKER","RESIDENZ","BERATUNG","KOCHTOPF"]', '[2,0,0,1,2,2,3,3,2,1,1,2,0,0]', 100, '2018-07-14 17:01:18', 1, 0, 100), +(2492,'["WAHLAUFRUF","DUNSTHAUBE","WASSERFLOH","PARKKRALLE"]','[3,1,1,2,0,2,0,0,0,3,2,1]',110,'2018-11-12 19:07:04',1,0,110), +(2552,'["HOLZPFLOCK","WIRTSCHAFT","STANDESAMT","BÜGELFALTE"]','[0,0,3,0,3,3,0,3,3,1,3,0]',111,'2018-11-12 19:07:04',1,0,111), +(2604,'["WOHNZIMMER","TODESANGST","POLIERTUCH","ZUNGENLAUT"]','[2,1,1,1,1,2,1,0,1,3,2,0]',112,'2018-11-12 19:07:04',1,0,112), +(24, '["BETONUNG","ANBETUNG","ALLERGIE","BAUMHAUS"]', '[0,3,1,1,3,1,2,0,0,0]', 120, '2018-07-14 17:01:18', 1, 0, 120), +(62, '["FEHLPROGNOSE","GEISTESKRAFT","ARBEITSPAUSE","BEREITSCHAFT","MOSAIKARBEIT","INFRAROTFILM"]', '[0,3,0,1,0,3,2,3,1,2,3,1,2,2,0,2,3,0,2,1,1]', 140, '2018-07-14 17:01:18', 1, 0, 140), +(260, '["SCHREIBTISCH","URHEBERRECHT","PFLANZENKOST","OPERNKONZERT"]', '[1,3,2,1,3,0,1,2,3,0,2,0,1,0,0]', 160, '2018-07-14 17:01:18', 1, 0, 160) ; \ No newline at end of file diff --git a/orga/updateOrder.sql b/orga/updateOrder.sql index 365eb5b..b2fb2f6 100644 --- a/orga/updateOrder.sql +++ b/orga/updateOrder.sql @@ -6,7 +6,7 @@ UPDATE Level SET difficulty = 80 WHERE id in ( SELECT * FROM (SELECT id FROM Lev UPDATE Level SET difficulty = 80 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 82 AND difficulty = 1000 LIMIT 8) temp); UPDATE Level SET difficulty = 80 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 83 AND difficulty = 1000 LIMIT 7) temp); -UPDATE Level SET deleted = 0, difficulty = 1000 WHERE id in (SELECT * FROM (SELECT id FROM Level WHERE renderer = 82 AND deleted = 1 LIMIT 14) temp); +UPDATE Level SET deleted = 0, difficulty = 1000 WHERE id in (SELECT * FROM (SELECT id FROM Level WHERE renderer = 82 AND deleted = 1 LIMIT 15) temp); UPDATE Level SET difficulty = 90 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 80 AND difficulty = 1000 LIMIT 4) temp); UPDATE Level SET difficulty = 90 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 81 AND difficulty = 1000 LIMIT 4) temp); @@ -14,7 +14,7 @@ UPDATE Level SET difficulty = 90 WHERE id in ( SELECT * FROM (SELECT id FROM Lev UPDATE Level SET difficulty = 90 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 83 AND difficulty = 1000 LIMIT 4) temp); UPDATE Level SET difficulty = 90 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 100 AND difficulty = 1000 LIMIT 5) temp); -UPDATE Level SET deleted = 0, difficulty = 1000 WHERE id in (SELECT * FROM (SELECT id FROM Level WHERE renderer = 81 AND deleted = 1 LIMIT 10) temp); +UPDATE Level SET deleted = 0, difficulty = 1000 WHERE id in (SELECT * FROM (SELECT id FROM Level WHERE renderer = 81 AND deleted = 1 LIMIT 11) temp); UPDATE Level SET difficulty = 100 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 80 AND difficulty = 1000 LIMIT 2) temp); UPDATE Level SET difficulty = 100 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 81 AND difficulty = 1000 LIMIT 2) temp); @@ -22,7 +22,8 @@ UPDATE Level SET difficulty = 100 WHERE id in ( SELECT * FROM (SELECT id FROM Le UPDATE Level SET difficulty = 100 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 83 AND difficulty = 1000 LIMIT 3) temp); UPDATE Level SET difficulty = 100 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 100 AND difficulty = 1000 LIMIT 10) temp); -UPDATE Level SET deleted = 0, difficulty = 1000 WHERE id in (SELECT * FROM (SELECT id FROM Level WHERE renderer = 80 AND deleted = 1 LIMIT 9) temp); +UPDATE Level SET deleted = 0, difficulty = 1000 WHERE id in (SELECT * FROM (SELECT id FROM Level WHERE renderer = 80 AND deleted = 1 LIMIT 10) temp); +UPDATE Level SET deleted = 0, difficulty = 1000 WHERE id in (SELECT * FROM (SELECT id FROM Level WHERE renderer = 83 AND deleted = 1 LIMIT 1) temp); UPDATE Level SET words = REPLACE(words, "\\u00fc", "Ü"); UPDATE Level SET words = REPLACE(words, "\\u00dc", "Ü"); @@ -45,37 +46,86 @@ UPDATE Level SET difficulty = 120 WHERE id in ( SELECT * FROM (SELECT id FROM Le UPDATE Level SET difficulty = 120 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 82 AND difficulty = 1000 LIMIT 1) temp); UPDATE Level SET difficulty = 120 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 83 AND difficulty = 1000 LIMIT 1) temp); UPDATE Level SET difficulty = 120 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 100 AND difficulty = 1000 LIMIT 10) temp); -UPDATE Level SET difficulty = 120 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 110 AND difficulty = 1000 LIMIT 5) temp); - - +UPDATE Level SET difficulty = 120 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 110 AND difficulty = 1000 LIMIT 2) temp); +UPDATE Level SET difficulty = 120 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 111 AND difficulty = 1000 LIMIT 2) temp); +UPDATE Level SET difficulty = 120 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 112 AND difficulty = 1000 LIMIT 1) temp); UPDATE Level SET difficulty = 130 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 80 AND difficulty = 1000 LIMIT 1) temp); UPDATE Level SET difficulty = 130 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 81 AND difficulty = 1000 LIMIT 1) temp); UPDATE Level SET difficulty = 130 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 82 AND difficulty = 1000 LIMIT 2) temp); UPDATE Level SET difficulty = 130 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 83 AND difficulty = 1000 LIMIT 1) temp); UPDATE Level SET difficulty = 130 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 100 AND difficulty = 1000 LIMIT 10) temp); +UPDATE Level SET difficulty = 130 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 110 AND difficulty = 1000 LIMIT 5) temp); +UPDATE Level SET difficulty = 130 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 111 AND difficulty = 1000 LIMIT 5) temp); +UPDATE Level SET difficulty = 130 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 112 AND difficulty = 1000 LIMIT 5) temp); UPDATE Level SET difficulty = 140 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 80 AND difficulty = 1000 LIMIT 2) temp); UPDATE Level SET difficulty = 140 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 81 AND difficulty = 1000 LIMIT 1) temp); UPDATE Level SET difficulty = 140 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 82 AND difficulty = 1000 LIMIT 1) temp); UPDATE Level SET difficulty = 140 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 83 AND difficulty = 1000 LIMIT 1) temp); UPDATE Level SET difficulty = 140 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 100 AND difficulty = 1000 LIMIT 5) temp); +UPDATE Level SET difficulty = 140 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 110 AND difficulty = 1000 LIMIT 5) temp); +UPDATE Level SET difficulty = 140 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 111 AND difficulty = 1000 LIMIT 5) temp); +UPDATE Level SET difficulty = 140 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 112 AND difficulty = 1000 LIMIT 5) temp); +UPDATE Level SET difficulty = 140 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 120 AND difficulty = 1000 LIMIT 5) temp); UPDATE Level SET difficulty = 150 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 80 AND difficulty = 1000 LIMIT 1) temp); UPDATE Level SET difficulty = 150 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 81 AND difficulty = 1000 LIMIT 1) temp); UPDATE Level SET difficulty = 150 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 82 AND difficulty = 1000 LIMIT 1) temp); UPDATE Level SET difficulty = 150 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 83 AND difficulty = 1000 LIMIT 2) temp); UPDATE Level SET difficulty = 150 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 100 AND difficulty = 1000 LIMIT 5) temp); - +UPDATE Level SET difficulty = 150 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 110 AND difficulty = 1000 LIMIT 3) temp); +UPDATE Level SET difficulty = 150 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 111 AND difficulty = 1000 LIMIT 3) temp); +UPDATE Level SET difficulty = 150 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 112 AND difficulty = 1000 LIMIT 4) temp); +UPDATE Level SET difficulty = 150 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 120 AND difficulty = 1000 LIMIT 20) temp); UPDATE Level SET difficulty = 160 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 80 AND difficulty = 1000 LIMIT 1) temp); UPDATE Level SET difficulty = 160 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 81 AND difficulty = 1000 LIMIT 1) temp); UPDATE Level SET difficulty = 160 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 82 AND difficulty = 1000 LIMIT 1) temp); UPDATE Level SET difficulty = 160 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 83 AND difficulty = 1000 LIMIT 2) temp); UPDATE Level SET difficulty = 160 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 100 AND difficulty = 1000 LIMIT 5) temp); +UPDATE Level SET difficulty = 160 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 110 AND difficulty = 1000 LIMIT 2) temp); +UPDATE Level SET difficulty = 160 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 111 AND difficulty = 1000 LIMIT 1) temp); +UPDATE Level SET difficulty = 160 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 112 AND difficulty = 1000 LIMIT 2) temp); +UPDATE Level SET difficulty = 160 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 120 AND difficulty = 1000 LIMIT 20) temp); +UPDATE Level SET difficulty = 160 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 140 AND difficulty = 1000 LIMIT 5) temp); UPDATE Level SET difficulty = 170 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 80 AND difficulty = 1000 LIMIT 1) temp); UPDATE Level SET difficulty = 170 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 81 AND difficulty = 1000 LIMIT 1) temp); UPDATE Level SET difficulty = 170 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 82 AND difficulty = 1000 LIMIT 1) temp); UPDATE Level SET difficulty = 170 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 100 AND difficulty = 1000 LIMIT 10) temp); +UPDATE Level SET difficulty = 170 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 110 AND difficulty = 1000 LIMIT 4) temp); +UPDATE Level SET difficulty = 170 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 111 AND difficulty = 1000 LIMIT 4) temp); +UPDATE Level SET difficulty = 170 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 112 AND difficulty = 1000 LIMIT 4) temp); +UPDATE Level SET difficulty = 170 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 120 AND difficulty = 1000 LIMIT 15) temp); +UPDATE Level SET difficulty = 170 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 140 AND difficulty = 1000 LIMIT 20) temp); +UPDATE Level SET difficulty = 180 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 81 AND difficulty = 1000 LIMIT 1) temp); +UPDATE Level SET difficulty = 180 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 82 AND difficulty = 1000 LIMIT 1) temp); +UPDATE Level SET difficulty = 180 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 83 AND difficulty = 1000 LIMIT 1) temp); +UPDATE Level SET difficulty = 180 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 100 AND difficulty = 1000 LIMIT 5) temp); +UPDATE Level SET difficulty = 180 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 110 AND difficulty = 1000 LIMIT 2) temp); +UPDATE Level SET difficulty = 180 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 111 AND difficulty = 1000 LIMIT 3) temp); +UPDATE Level SET difficulty = 180 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 112 AND difficulty = 1000 LIMIT 2) temp); +UPDATE Level SET difficulty = 180 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 120 AND difficulty = 1000 LIMIT 10) temp); +UPDATE Level SET difficulty = 180 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 140 AND difficulty = 1000 LIMIT 35) temp); + +UPDATE Level SET difficulty = 190 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 80 AND difficulty = 1000 LIMIT 1) temp); +UPDATE Level SET difficulty = 190 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 81 AND difficulty = 1000 LIMIT 1) temp); +UPDATE Level SET difficulty = 190 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 100 AND difficulty = 1000 LIMIT 5) temp); +UPDATE Level SET difficulty = 190 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 110 AND difficulty = 1000 LIMIT 2) temp); +UPDATE Level SET difficulty = 190 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 111 AND difficulty = 1000 LIMIT 2) temp); +UPDATE Level SET difficulty = 190 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 112 AND difficulty = 1000 LIMIT 2) temp); +UPDATE Level SET difficulty = 190 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 120 AND difficulty = 1000 LIMIT 7) temp); +UPDATE Level SET difficulty = 190 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 140 AND difficulty = 1000 LIMIT 20) temp); +UPDATE Level SET difficulty = 190 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 160 AND difficulty = 1000 LIMIT 5) temp); + +UPDATE Level SET difficulty = 200 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 82 AND difficulty = 1000 LIMIT 1) temp); +UPDATE Level SET difficulty = 200 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 83 AND difficulty = 1000 LIMIT 1) temp); +UPDATE Level SET difficulty = 200 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 100 AND difficulty = 1000 LIMIT 3) temp); +UPDATE Level SET difficulty = 200 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 110 AND difficulty = 1000 LIMIT 2) temp); +UPDATE Level SET difficulty = 200 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 111 AND difficulty = 1000 LIMIT 1) temp); +UPDATE Level SET difficulty = 200 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 112 AND difficulty = 1000 LIMIT 2) temp); +UPDATE Level SET difficulty = 200 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 120 AND difficulty = 1000 LIMIT 5) temp); +UPDATE Level SET difficulty = 200 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 140 AND difficulty = 1000 LIMIT 12) temp); +UPDATE Level SET difficulty = 200 WHERE id in ( SELECT * FROM (SELECT id FROM Level WHERE renderer = 160 AND difficulty = 1000 LIMIT 13) temp); diff --git a/public/js/app.js b/public/js/app.js index 3beeb0b..3481ae6 100755 --- a/public/js/app.js +++ b/public/js/app.js @@ -6548,73 +6548,8 @@ class BigSegmentsLevels extends Level{ class SimpleFourWordsLevel extends BigSegmentsLevels{ constructor(templateContainer, wordLength, bigSegmentPosition) { - console.log(bigSegmentPosition, "P"); - super(templateContainer, wordLength, [bigSegmentPosition, 3]); + super(templateContainer, wordLength, [bigSegmentPosition]); } - - // createSegments() { - // if (this.words.length >= 4 && - // this.words[0].length >= this.wordLength && - // this.words[1].length >= this.wordLength && - // this.words[2].length >= this.wordLength && - // this.words[3].length >= this.wordLength && - // this.wordLength >= 4 - // ) { - // let leafsWords = []; - // leafsWords[0] = Level._createLeafsForWord(this.words[0], this.templateContainer.copyLeafTemplate()); - // leafsWords[1] = Level._createLeafsForWord(this.words[1], this.templateContainer.copyLeafTemplate()); - // leafsWords[2] = Level._createLeafsForWord(this.words[2], this.templateContainer.copyLeafTemplate()); - // leafsWords[3] = Level._createLeafsForWord(this.words[3], this.templateContainer.copyLeafTemplate()); - // - // let rootSegment = new RowSegment(this.templateContainer.copyRowTemplate()); - // for (let i = 0; i < this.wordLength / 2; i++) { - // let parents = []; - // parents[0] = new ParentSegment(this.templateContainer.copyParentTemplate()); - // parents[1] = new ParentSegment(this.templateContainer.copyParentTemplate()); - // - // parents[0].addChild(leafsWords[0][2 * i]); - // parents[0].addChild(leafsWords[0][2 * i + 1]); - // parents[0].addChild(leafsWords[1][2 * i]); - // parents[0].addChild(leafsWords[1][2 * i + 1]); - // - // parents[1].addChild(leafsWords[2][2 * i]); - // parents[1].addChild(leafsWords[2][2 * i + 1]); - // parents[1].addChild(leafsWords[3][2 * i]); - // parents[1].addChild(leafsWords[3][2 * i + 1]); - // - // let parentSegment =null; - // if (i === this.bigSegmentPosition){ - // parents[2] = new ParentSegment(this.templateContainer.copyParentTemplate()); - // parents[3] = new ParentSegment(this.templateContainer.copyParentTemplate()); - // - // parents[2].addChild(leafsWords[0][2 * i + 2]); - // parents[2].addChild(leafsWords[0][2 * i + 3]); - // parents[2].addChild(leafsWords[1][2 * i + 2]); - // parents[2].addChild(leafsWords[1][2 * i + 3]); - // - // parents[3].addChild(leafsWords[2][2 * i + 2]); - // parents[3].addChild(leafsWords[2][2 * i + 3]); - // parents[3].addChild(leafsWords[3][2 * i + 2]); - // parents[3].addChild(leafsWords[3][2 * i + 3]); - // - // parentSegment = new ParentSegment(this.templateContainer.copyParentTemplate()); - // parentSegment.addChild(parents[0]); - // parentSegment.addChild(parents[2]); - // parentSegment.addChild(parents[1]); - // parentSegment.addChild(parents[3]); - // i++; - // } - // else{ - // parentSegment = new ColumnSegment(this.templateContainer.copyColumnTemplate()); - // parentSegment.addChild(parents[0]); - // parentSegment.addChild(parents[1]); - // } - // - // rootSegment.addChild(parentSegment); - // } - // this.setRootSegment(rootSegment) - // } - // } } class SimpleFourWordsLevel10_0 extends SimpleFourWordsLevel{ @@ -6641,6 +6576,24 @@ class SimpleFourWordsLevel10_3 extends SimpleFourWordsLevel{ } } +class TwoSegmentFourWordsLevel10_0_3 extends BigSegmentsLevels{ + constructor(templateContainer) { + super(templateContainer, 10, [0,3]); + } +} + +class TwoSegmentFourWordsLevel10_1_3 extends BigSegmentsLevels{ + constructor(templateContainer) { + super(templateContainer, 10, [1,3]); + } +} + +class TwoSegmentFourWordsLevel10_0_2 extends BigSegmentsLevels{ + constructor(templateContainer) { + super(templateContainer, 10, [0,2]); + } +} + class LevelHelper { static setLevelType(typeId, level) { LevelHelper.types[typeId] = level; @@ -6675,6 +6628,9 @@ LevelHelper.types = { 82: SimpleFourWordsLevel10_2, 83: SimpleFourWordsLevel10_3, 100: SixWordsRowLevel8, + 110: TwoSegmentFourWordsLevel10_0_3, + 111: TwoSegmentFourWordsLevel10_1_3, + 112: TwoSegmentFourWordsLevel10_0_2, 120: FourWordsLevel8, 140: SixWordsRowLevel12, 160: FourWordsLevel12, @@ -6931,7 +6887,7 @@ class LevelSite extends WordRotatorBaseSite { return this.nextLevel(); } - startEndSite(){ + startEndSite() { this.startSite(EndSite); this.finish(); } @@ -6944,7 +6900,7 @@ class LevelSite extends WordRotatorBaseSite { const db = await WordRotatorDb.getInstance(); const nextLevelJson = await db.loadNextLevel(LevelSite.RENDERER_TYPES); - console.log("nextLevelJson", nextLevelJson); + console.log("nextLevelJson", nextLevelJson); if (nextLevelJson === null) { this.startEndSite(); return; @@ -7174,7 +7130,7 @@ class LevelSite extends WordRotatorBaseSite { break; } - default:{ + default: { this._siteContent.classList.remove("tutorial"); } } @@ -7204,7 +7160,7 @@ class LevelSite extends WordRotatorBaseSite { scaleHelper.scaleToFull(textElem, textElem.parentElement, null, true, 1, 2); break; } - default:{ + default: { this._siteContent.classList.remove("tutorial"); } } @@ -7244,14 +7200,15 @@ class LevelSite extends WordRotatorBaseSite { break; } - default:{ + default: { this._siteContent.classList.remove("tutorial"); } } } } } -LevelSite.RENDERER_TYPES = [20, 40, 60, 80, 81, 82, 83, 100, 120, 140, 160]; + +LevelSite.RENDERER_TYPES = [20, 40, 60, 80, 81, 82, 83, 100, 110, 111, 112, 120, 140, 160]; LevelSite.TUTORIAL = { FIRST_LEVEL: 67, SECOND_LEVEL: 15, diff --git a/test/test.testcafe.js b/test/test.testcafe.js index a67b82a..5b320a4 100644 --- a/test/test.testcafe.js +++ b/test/test.testcafe.js @@ -1,7 +1,7 @@ import {Selector} from 'testcafe'; import {ClientFunction} from 'testcafe'; -let isLocal = false; +let isLocal = true; let isMobile = false; const checkMatrix = async (matrixStringSelector, shouldValues, timeout) => { @@ -118,7 +118,7 @@ const SEGMENT = { TWENTYONE: 20 }; -test('Play', async t => { +test.only('Play', async t => { let levelNumber = 1; await waitForMainMenu(t); @@ -378,6 +378,102 @@ test('Play', async t => { levelNumber++; + //5. Level + await t.expect(Selector('#level-number').textContent).eql("" + levelNumber) + .expect(Selector('.segment-parent').nth(SEGMENT.ONE).textContent).eql("WADUHLNSWAPASSRK") + .drag(Selector('.segment-parent').nth(SEGMENT.ONE), dragDimen, 3, { + offsetX: 10, + offsetY: dragDimen / 5 + }) + .click(Selector('.segment-parent').nth(SEGMENT.TWO)) + .click(Selector('.segment-parent').nth(SEGMENT.ELEVEN)) + .click(Selector('.segment-parent').nth(SEGMENT.TWELVE)) + .click(Selector('.segment-parent').nth(SEGMENT.THREE)) + .click(Selector('.segment-parent').nth(SEGMENT.FOUR)) + .click(Selector('.segment-parent').nth(SEGMENT.TWELVE)) + .click(Selector('.segment-parent').nth(SEGMENT.SIX)) + .click(Selector('.segment-parent').nth(SEGMENT.TWO)) + .click(Selector('.segment-parent').nth(SEGMENT.THREE)) + .click(Selector('.segment-parent').nth(SEGMENT.TEN)) + .click(Selector('.segment-parent').nth(SEGMENT.ELEVEN)) + .click(Selector('.segment-parent').nth(SEGMENT.SIX)) + .click(Selector('.segment-parent').nth(SEGMENT.FOUR)) + .click(Selector('.segment-parent').nth(SEGMENT.THREE)) + .click(Selector('.segment-parent').nth(SEGMENT.TWELVE)) + .click(Selector('.segment-parent').nth(SEGMENT.TWO)) + .expect(Selector('#won-text').visible).eql(true) + .expect(Selector('#continue-button').visible).eql(true) + .click(Selector('#continue-button')) + .expect(Selector('.coin-counter').innerText).contains("" + (coinsPerLevel * levelNumber + extraCoins - helpCost)); + levelNumber++; + + //5. Level + await t.expect(Selector('#level-number').textContent).eql("" + levelNumber) + .drag(Selector('.segment-parent').nth(SEGMENT.THREE), dragDimen, 3, { + offsetX: 10, + offsetY: dragDimen / 5 + }) + .drag(Selector('.segment-parent').nth(SEGMENT.EIGHT), dragDimen, 3, { + offsetX: 10, + offsetY: dragDimen / 5 + }) + .click(Selector('.segment-parent').nth(SEGMENT.TEN)) + .click(Selector('.segment-parent').nth(SEGMENT.FIVE)) + .click(Selector('.segment-parent').nth(SEGMENT.SIX)) + .click(Selector('.segment-parent').nth(SEGMENT.TEN)) + .click(Selector('.segment-parent').nth(SEGMENT.NINE)) + .click(Selector('.segment-parent').nth(SEGMENT.ELEVEN)) + .click(Selector('.segment-parent').nth(SEGMENT.TEN)) + .expect(Selector('#won-text').visible).eql(true) + .expect(Selector('#continue-button').visible).eql(true) + .click(Selector('#continue-button')) + .expect(Selector('.coin-counter').innerText).contains("" + (coinsPerLevel * levelNumber + extraCoins - helpCost)); + levelNumber++; + + await t.expect(Selector('#level-number').textContent).eql("" + levelNumber) + .drag(Selector('.segment-parent').nth(SEGMENT.ONE), dragDimen, 3, { + offsetX: 10, + offsetY: dragDimen / 5 + }) + .drag(Selector('.segment-parent').nth(SEGMENT.SIX), dragDimen, 3, { + offsetX: 10, + offsetY: dragDimen / 5 + }) + .click(Selector('.segment-parent').nth(SEGMENT.FIVE)) + .click(Selector('.segment-parent').nth(SEGMENT.SEVEN)) + .click(Selector('.segment-parent').nth(SEGMENT.NINE)) + .click(Selector('.segment-parent').nth(SEGMENT.TWO)) + .click(Selector('.segment-parent').nth(SEGMENT.ELEVEN)) + .click(Selector('.segment-parent').nth(SEGMENT.THREE)) + .click(Selector('.segment-parent').nth(SEGMENT.NINE)) + .click(Selector('.segment-parent').nth(SEGMENT.FOUR)) + .click(Selector('.segment-parent').nth(SEGMENT.FIVE)) + .click(Selector('.segment-parent').nth(SEGMENT.TWO)) + .click(Selector('.segment-parent').nth(SEGMENT.THREE)) + .click(Selector('.segment-parent').nth(SEGMENT.SEVEN)) + .click(Selector('.segment-parent').nth(SEGMENT.NINE)) + .click(Selector('.segment-parent').nth(SEGMENT.TEN)) + .click(Selector('.segment-parent').nth(SEGMENT.FIVE)) + .click(Selector('.segment-parent').nth(SEGMENT.FOUR)) + .click(Selector('.segment-parent').nth(SEGMENT.TWO)) + .click(Selector('.segment-parent').nth(SEGMENT.THREE)) + .click(Selector('.segment-parent').nth(SEGMENT.SEVEN)) + .click(Selector('.segment-parent').nth(SEGMENT.FOUR)) + .click(Selector('.segment-parent').nth(SEGMENT.ELEVEN)) + .drag(Selector('.segment-parent').nth(SEGMENT.ONE), dragDimen, 3, { + offsetX: 10, + offsetY: dragDimen / 5 + }) + .drag(Selector('.segment-parent').nth(SEGMENT.SIX), dragDimen, 3, { + offsetX: 10, + offsetY: dragDimen / 5 + }) + .expect(Selector('#won-text').visible).eql(true) + .expect(Selector('#continue-button').visible).eql(true) + .click(Selector('#continue-button')) + .expect(Selector('.coin-counter').innerText).contains("" + (coinsPerLevel * levelNumber + extraCoins - helpCost)); + levelNumber++; + //5. Level await t.expect(Selector('#level-number').textContent).eql("" + levelNumber) .expect(Selector('.segment-parent').nth(SEGMENT.ONE).textContent).eql("BEANTOBEALBALEUM") @@ -388,7 +484,7 @@ test('Play', async t => { .click(Selector('.segment-parent').nth(SEGMENT.THREE)) .click(Selector('.segment-parent').nth(SEGMENT.FOUR)) .click(Selector('.segment-parent').nth(SEGMENT.TWO)) - .drag(Selector('.segment-parent').nth(SEGMENT.SIX).find('div').withText('U'), 3, dragDimen, { + .drag(Selector('.segment-parent').nth(SEGMENT.SIX), 3, dragDimen, { offsetX: 10, offsetY: dragDimen / 5 })