From 50526bc1ca10eae20828aa7bfc087cf3dbe82b8f Mon Sep 17 00:00:00 2001 From: silas Date: Mon, 22 Oct 2018 12:00:08 +0200 Subject: [PATCH] select words angepasst --- .idea/wordRotator.iml | 1 + orga/database.sql | 5 +++++ public/version/2/html/deleteLevels.html | 1 + public/version/2/html/selectWords.html | 1 + src/module/Application/config/routes/routes.index.php | 4 ++-- src/module/Application/pwa/js/site/DeleteWordsSite.js | 2 +- src/module/Application/pwa/js/site/SelectWordsSite.js | 7 ++++--- .../pwa/public/version/{1 => 2}/html/deleteLevels.html | 0 .../pwa/public/version/{1 => 2}/html/selectWords.html | 2 ++ 9 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 public/version/2/html/deleteLevels.html create mode 100644 public/version/2/html/selectWords.html rename src/module/Application/pwa/public/version/{1 => 2}/html/deleteLevels.html (100%) rename src/module/Application/pwa/public/version/{1 => 2}/html/selectWords.html (89%) diff --git a/.idea/wordRotator.iml b/.idea/wordRotator.iml index d89d15e..1cb9668 100755 --- a/.idea/wordRotator.iml +++ b/.idea/wordRotator.iml @@ -3,6 +3,7 @@ + diff --git a/orga/database.sql b/orga/database.sql index d06453c..1811a14 100755 --- a/orga/database.sql +++ b/orga/database.sql @@ -56,3 +56,8 @@ INSERT INTO `RoleAccess` (`RoleId`, `AccessId`) VALUES (3, 4); -- admin - admin ALTER TABLE Word ADD used TINYINT(1) NOT NULL; -- ##################################### + + +insert into `Role` set version=1, name='worker', beschreibung='Ein Mitarbeiter'; +insert into `Access` set version=1, name='select-words', beschreibung='darf wörter aussuchen'; +insert into `RoleAccess` set RoleId=4, AccessId=5; \ No newline at end of file diff --git a/public/version/2/html/deleteLevels.html b/public/version/2/html/deleteLevels.html new file mode 100644 index 0000000..0b1d2fb --- /dev/null +++ b/public/version/2/html/deleteLevels.html @@ -0,0 +1 @@ +
id:
words:
rotations:
 
:
\ No newline at end of file diff --git a/public/version/2/html/selectWords.html b/public/version/2/html/selectWords.html new file mode 100644 index 0000000..41eb80f --- /dev/null +++ b/public/version/2/html/selectWords.html @@ -0,0 +1 @@ +
Noch nicht geprüft:
Gecheckt:
Unsicher:
Gelöscht:
Unbenutzt:


\ No newline at end of file diff --git a/src/module/Application/config/routes/routes.index.php b/src/module/Application/config/routes/routes.index.php index e50150d..001c8c8 100755 --- a/src/module/Application/config/routes/routes.index.php +++ b/src/module/Application/config/routes/routes.index.php @@ -17,7 +17,7 @@ return array( 'defaults' => [ 'controller' => IndexController::class, 'action' => 'selectWords', - 'resource' => 'admin', + 'resource' => 'select-words', ], ], ], @@ -28,7 +28,7 @@ return array( 'defaults' => [ 'controller' => IndexController::class, 'action' => 'changeChecked', - 'resource' => 'admin', + 'resource' => 'select-words', ], ], ], diff --git a/src/module/Application/pwa/js/site/DeleteWordsSite.js b/src/module/Application/pwa/js/site/DeleteWordsSite.js index 2377722..cb3b0ef 100644 --- a/src/module/Application/pwa/js/site/DeleteWordsSite.js +++ b/src/module/Application/pwa/js/site/DeleteWordsSite.js @@ -4,7 +4,7 @@ import {DataManager} from "../../../../../js/lib/pwa-core"; export class DeleteWordsSite extends UserSite { constructor(siteManager) { - super(siteManager, "version/1/html/deleteLevels.html", null, "admin"); + super(siteManager, "version/2/html/deleteLevels.html", null, "admin"); } async onConstruct(args) { diff --git a/src/module/Application/pwa/js/site/SelectWordsSite.js b/src/module/Application/pwa/js/site/SelectWordsSite.js index 08d61cd..ffafec2 100644 --- a/src/module/Application/pwa/js/site/SelectWordsSite.js +++ b/src/module/Application/pwa/js/site/SelectWordsSite.js @@ -5,13 +5,14 @@ import {DataManager} from "../../../../../js/lib/pwa-core"; export class SelectWordsSite extends UserSite{ constructor(siteManager) { - super(siteManager, "version/1/html/selectWords.html", null, "admin"); + super(siteManager, "version/2/html/selectWords.html", null, "select-words"); } async onConstruct(args) { let res = await super.onConstruct(args); this.stats = (await DataManager.load("words"))["result"]; this.words = this.stats["wordsToCheck"]; + console.log(this.stats); return res; } @@ -21,6 +22,7 @@ export class SelectWordsSite extends UserSite{ this.findBy("#checked").appendChild(document.createTextNode(this.stats["wordsChecked"])); this.findBy("#not-sure").appendChild(document.createTextNode(this.stats["wordsUnsure"])); this.findBy("#deleted").appendChild(document.createTextNode(this.stats["wordsDeleted"])); + this.findBy("#unused").appendChild(document.createTextNode(this.stats["wordsNotUsed"])); let template = this.findBy("#word-template"); template.id = null; @@ -62,7 +64,6 @@ export class SelectWordsSite extends UserSite{ } setWord(wordElement, word){ - console.log(wordElement, word); wordElement.querySelector(".word").removeAllChildren().appendChild(document.createTextNode(word["word"])); wordElement.dataset["id"] = word["id"]; } @@ -71,5 +72,5 @@ export class SelectWordsSite extends UserSite{ InitPromise.addPromise(app => { app.addDefaultAction(new UserAction("select-words", () => { app.startSite(SelectWordsSite); - }, null, null, "admin")); + }, null, null, "select-words")); }); \ No newline at end of file diff --git a/src/module/Application/pwa/public/version/1/html/deleteLevels.html b/src/module/Application/pwa/public/version/2/html/deleteLevels.html similarity index 100% rename from src/module/Application/pwa/public/version/1/html/deleteLevels.html rename to src/module/Application/pwa/public/version/2/html/deleteLevels.html diff --git a/src/module/Application/pwa/public/version/1/html/selectWords.html b/src/module/Application/pwa/public/version/2/html/selectWords.html similarity index 89% rename from src/module/Application/pwa/public/version/1/html/selectWords.html rename to src/module/Application/pwa/public/version/2/html/selectWords.html index 65d1b26..584c0a1 100644 --- a/src/module/Application/pwa/public/version/1/html/selectWords.html +++ b/src/module/Application/pwa/public/version/2/html/selectWords.html @@ -8,6 +8,8 @@
Gelöscht:
+
Unbenutzt:
+