From 5cb60679e008ace25d76be086844a225006e7402 Mon Sep 17 00:00:00 2001 From: oliver Date: Thu, 20 Aug 2015 13:20:49 +0200 Subject: [PATCH] add support for moodpic sources and revamp moodpic integration a little bit --- agents/intermediate/AchievementsAgent.inc | 24 ++--- agents/intermediate/CharactergroupsAgent.inc | 40 ++++----- .../CharactergroupsquestsAgent.inc | 24 ++--- agents/intermediate/CharactersAgent.inc | 24 ++--- agents/intermediate/CharactertypesAgent.inc | 16 ++-- agents/intermediate/LibraryAgent.inc | 24 ++--- agents/intermediate/MapAgent.inc | 6 +- agents/intermediate/QuestgroupsAgent.inc | 28 +++--- agents/intermediate/QuestsAgent.inc | 36 ++++---- agents/intermediate/SeminariesAgent.inc | 27 +++++- agents/intermediate/XplevelsAgent.inc | 4 +- controllers/MoodpicController.inc | 88 +++++++++++++++++-- controllers/QuestgroupsController.inc | 44 ---------- controllers/QuestsController.inc | 21 ----- db/create.sql | 5 +- models/MediaModel.inc | 2 +- views/html/moodpic/index.tpl | 10 +-- views/html/moodpic/questgroup.tpl | 20 +++++ views/html/moodpic/seminary.tpl | 20 +++++ views/html/questgroups/create.tpl | 6 -- views/html/questgroups/delete.tpl | 6 -- views/html/questgroups/edit.tpl | 6 -- views/html/questgroups/edittexts.tpl | 6 -- views/html/questgroups/movedown.tpl | 6 -- views/html/questgroups/moveup.tpl | 6 -- views/html/questgroups/questgroup.tpl | 6 -- views/html/quests/create.tpl | 6 -- views/html/quests/delete.tpl | 6 -- views/html/quests/edit.tpl | 6 -- views/html/quests/edittask.tpl | 6 -- views/html/quests/edittexts.tpl | 6 -- views/html/quests/quest.tpl | 6 -- views/html/quests/submission.tpl | 6 -- views/html/quests/submissions.tpl | 6 -- views/html/seminaries/create.tpl | 4 +- views/html/seminaries/index.tpl | 4 +- www/css/desktop.css | 2 + 37 files changed, 271 insertions(+), 292 deletions(-) create mode 100644 views/html/moodpic/questgroup.tpl create mode 100644 views/html/moodpic/seminary.tpl diff --git a/agents/intermediate/AchievementsAgent.inc b/agents/intermediate/AchievementsAgent.inc index 93685f54..24593c01 100644 --- a/agents/intermediate/AchievementsAgent.inc +++ b/agents/intermediate/AchievementsAgent.inc @@ -31,8 +31,8 @@ */ public function index(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } @@ -44,8 +44,8 @@ */ public function create(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } @@ -57,8 +57,8 @@ */ public function edit(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } @@ -70,8 +70,8 @@ */ public function manage(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } @@ -83,8 +83,8 @@ */ public function conditions(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(1)); } @@ -96,8 +96,8 @@ */ public function delete(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } } diff --git a/agents/intermediate/CharactergroupsAgent.inc b/agents/intermediate/CharactergroupsAgent.inc index 9fa2713a..30164865 100644 --- a/agents/intermediate/CharactergroupsAgent.inc +++ b/agents/intermediate/CharactergroupsAgent.inc @@ -31,8 +31,8 @@ */ public function index(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } @@ -44,8 +44,8 @@ */ public function groupsgroup(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } @@ -57,8 +57,8 @@ */ public function creategroupsgroup(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } @@ -70,8 +70,8 @@ */ public function editgroupsgroup(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } @@ -83,8 +83,8 @@ */ public function deletegroupsgroup(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } @@ -96,8 +96,8 @@ */ public function group(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } @@ -109,8 +109,8 @@ */ public function creategroup(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } @@ -122,8 +122,8 @@ */ public function managegroup(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } @@ -135,8 +135,8 @@ */ public function editgroup(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } @@ -148,8 +148,8 @@ */ public function deletegroup(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } } diff --git a/agents/intermediate/CharactergroupsquestsAgent.inc b/agents/intermediate/CharactergroupsquestsAgent.inc index 550ece4a..1d4d8c50 100644 --- a/agents/intermediate/CharactergroupsquestsAgent.inc +++ b/agents/intermediate/CharactergroupsquestsAgent.inc @@ -31,8 +31,8 @@ */ public function index(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', 'charactergroups'); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), 'charactergroups'); } @@ -44,8 +44,8 @@ */ public function quest(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', 'charactergroups'); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), 'charactergroups'); } @@ -57,8 +57,8 @@ */ public function create(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', 'charactergroups'); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), 'charactergroups'); } @@ -70,8 +70,8 @@ */ public function manage(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', 'charactergroups'); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), 'charactergroups'); } @@ -83,8 +83,8 @@ */ public function edit(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', 'charactergroups'); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), 'charactergroups'); } @@ -96,8 +96,8 @@ */ public function delete(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', 'charactergroups'); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), 'charactergroups'); } } diff --git a/agents/intermediate/CharactersAgent.inc b/agents/intermediate/CharactersAgent.inc index d1c787ea..1ba9bf4e 100644 --- a/agents/intermediate/CharactersAgent.inc +++ b/agents/intermediate/CharactersAgent.inc @@ -31,8 +31,8 @@ */ public function index(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3)); } @@ -44,8 +44,8 @@ */ public function character(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3)); } @@ -57,8 +57,8 @@ */ public function register(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3)); } @@ -70,8 +70,8 @@ */ public function manage(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3)); } @@ -83,8 +83,8 @@ */ public function edit(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3)); } @@ -96,8 +96,8 @@ */ public function delete(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3)); } } diff --git a/agents/intermediate/CharactertypesAgent.inc b/agents/intermediate/CharactertypesAgent.inc index 8fd21fee..61083255 100644 --- a/agents/intermediate/CharactertypesAgent.inc +++ b/agents/intermediate/CharactertypesAgent.inc @@ -31,8 +31,8 @@ */ public function index(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } @@ -44,8 +44,8 @@ */ public function create(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } @@ -57,8 +57,8 @@ */ public function edit(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } @@ -70,8 +70,8 @@ */ public function delete(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } } diff --git a/agents/intermediate/LibraryAgent.inc b/agents/intermediate/LibraryAgent.inc index 0d9d14ee..ec6d703a 100644 --- a/agents/intermediate/LibraryAgent.inc +++ b/agents/intermediate/LibraryAgent.inc @@ -31,8 +31,8 @@ */ public function index(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } @@ -44,8 +44,8 @@ */ public function create(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } @@ -57,8 +57,8 @@ */ public function topic(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } @@ -70,8 +70,8 @@ */ public function manage(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } @@ -83,8 +83,8 @@ */ public function edit(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } @@ -96,8 +96,8 @@ */ public function delete(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } } diff --git a/agents/intermediate/MapAgent.inc b/agents/intermediate/MapAgent.inc index a861e801..d0e9cbdc 100644 --- a/agents/intermediate/MapAgent.inc +++ b/agents/intermediate/MapAgent.inc @@ -31,7 +31,8 @@ */ public function index(\nre\core\Request $request, \nre\core\Response $response) { - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } @@ -43,7 +44,8 @@ */ public function edit(\nre\core\Request $request, \nre\core\Response $response) { - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } } diff --git a/agents/intermediate/QuestgroupsAgent.inc b/agents/intermediate/QuestgroupsAgent.inc index 88683432..e30e2a55 100644 --- a/agents/intermediate/QuestgroupsAgent.inc +++ b/agents/intermediate/QuestgroupsAgent.inc @@ -31,8 +31,8 @@ */ public function questgroup(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4)); // Add Questgroups hierarchy path $this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4)); @@ -47,8 +47,8 @@ */ public function create(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3)); } @@ -60,8 +60,8 @@ */ public function edit(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4)); // Add Questgroups hierarchy path $this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4)); @@ -76,8 +76,8 @@ */ public function edittexts(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4)); // Add Questgroups hierarchy path $this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4)); @@ -92,8 +92,8 @@ */ public function moveup(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4)); // Add Questgroups hierarchy path $this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4)); @@ -108,8 +108,8 @@ */ public function movedown(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4)); // Add Questgroups hierarchy path $this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4)); @@ -124,8 +124,8 @@ */ public function delete(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4)); // Add Questgroups hierarchy path $this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4)); diff --git a/agents/intermediate/QuestsAgent.inc b/agents/intermediate/QuestsAgent.inc index 3c854fa9..9e1950ed 100644 --- a/agents/intermediate/QuestsAgent.inc +++ b/agents/intermediate/QuestsAgent.inc @@ -31,8 +31,8 @@ */ public function index(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3)); } @@ -44,8 +44,8 @@ */ public function quest(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4)); // Add Questgroups hierarchy path $this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4), true); @@ -60,8 +60,8 @@ */ public function submissions(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4)); // Add Questgroups hierarchy path $this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4), true); @@ -76,8 +76,8 @@ */ public function submission(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4)); // Add Questgroups hierarchy path $this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4), true); @@ -92,8 +92,8 @@ */ public function create(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4)); // Add Questgroups hierarchy path $this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4), true); @@ -108,8 +108,8 @@ */ public function edit(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4)); // Add Questgroups hierarchy path $this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4), true); @@ -124,8 +124,8 @@ */ public function edittask(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4)); // Add Questgroups hierarchy path $this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4), true); @@ -140,8 +140,8 @@ */ public function edittexts(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4)); // Add Questgroups hierarchy path $this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4), true); @@ -156,8 +156,8 @@ */ public function delete(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4)); // Add Questgroups hierarchy path $this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4), true); diff --git a/agents/intermediate/SeminariesAgent.inc b/agents/intermediate/SeminariesAgent.inc index 12c274eb..aecb054b 100644 --- a/agents/intermediate/SeminariesAgent.inc +++ b/agents/intermediate/SeminariesAgent.inc @@ -31,6 +31,8 @@ */ public function index(\nre\core\Request $request, \nre\core\Response $response) { + // Add Moodpic + $this->addSubAgent('Moodpic', 'index'); } @@ -42,7 +44,21 @@ */ public function seminary(\nre\core\Request $request, \nre\core\Response $response) { - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3)); + } + + + /** + * Action: create. + * + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response + */ + public function create(\nre\core\Request $request, \nre\core\Response $response) + { + // Add Moodpic + $this->addSubAgent('Moodpic', 'index'); } @@ -54,7 +70,8 @@ */ public function edit(\nre\core\Request $request, \nre\core\Response $response) { - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } @@ -66,7 +83,8 @@ */ public function copy(\nre\core\Request $request, \nre\core\Response $response) { - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } @@ -78,7 +96,8 @@ */ public function delete(\nre\core\Request $request, \nre\core\Response $response) { - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1)); } } diff --git a/agents/intermediate/XplevelsAgent.inc b/agents/intermediate/XplevelsAgent.inc index 19242e53..e810d4e8 100644 --- a/agents/intermediate/XplevelsAgent.inc +++ b/agents/intermediate/XplevelsAgent.inc @@ -31,8 +31,8 @@ */ public function manage(\nre\core\Request $request, \nre\core\Response $response) { - // Add (default) Moodpic - $this->addSubAgent('Moodpic', 'index', $request->getParam(1)); + // Add Moodpic + $this->addSubAgent('Moodpic', 'seminary', $request->getParam(3)); } } diff --git a/controllers/MoodpicController.inc b/controllers/MoodpicController.inc index 59512c7d..2d88aca7 100644 --- a/controllers/MoodpicController.inc +++ b/controllers/MoodpicController.inc @@ -24,25 +24,101 @@ * * @var array */ - public $models = array(); + public $models = array('seminaries', 'questgroups', 'media'); /** * Action: index. + * + * Show the moodpic of a Seminary Agent. + * + * @param string $agentName Name of the Seminary Agent to show moodpic of */ public function index($agentName) { - // Seminary moodpic - $seminary = SeminaryController::$seminary; + } + + + /** + * Action: seminary. + * + * Show moodpic of a Seminary. + * + * @param string $seminaryUrl URL of Seminary to show moodpic of + */ + public function seminary($seminaryUrl, $agentName=null) + { + // Get Seminary + if(property_exists('\hhu\z\controllers\SeminaryController', 'seminary') && !empty(SeminaryController::$seminary) && SeminaryController::$seminary['url'] == $seminaryUrl) { + $seminary = SeminaryController::$seminary; + } + else { + $seminary = $this->Seminaries->getSeminaryByUrl($seminaryUrl); + } + + // Get medium + $medium = null; + // Agent medium $seminaryMoodpicIndex = sprintf('%s_seminarymedia_id', $agentName); + if(array_key_exists($seminaryMoodpicIndex, $seminary) && !is_null($seminary[$seminaryMoodpicIndex])) + { + $medium = $this->Media->getSeminaryMediaById($seminary[$seminaryMoodpicIndex]); + $medium['url'] = $this->linker->link(array('media', 'seminarymoodpic', $seminary['url'], $agentName)); + } + // Seminary medium + elseif(!is_null($seminary['seminarymedia_id'])) + { + $medium = $this->Media->getSeminaryMediaById($seminary['seminarymedia_id']); + $medium['url'] = $this->linker->link(array('media', 'seminarymoodpic', $seminary['url'])); + } // Pass data to view - $this->set('seminary', $seminary); - $this->set('seminaryMoodpicIndex', $seminaryMoodpicIndex); - $this->set('agentName', $agentName); + $this->set('medium', $medium); + } + + + /** + * Action: questgroup. + * + * Show moodpic of a Questgroup. + * + * @param string $seminaryUrl URL of Seminary + * @param string $quesgroupUrl URL of Questgroup to show moodpic of + */ + public function questgroup($seminaryUrl, $questgroupUrl) + { + // Get Seminary + if(property_exists('\hhu\z\controllers\SeminaryController', 'seminary') && !empty(SeminaryController::$seminary) && SeminaryController::$seminary['url'] == $seminaryUrl) { + $seminary = SeminaryController::$seminary; + } + else { + $seminary = $this->Seminaries->getSeminaryByUrl($seminaryUrl); + } + + // Get Questgroup + $questgroup = $this->Questgroups->getQuestgroupByUrl($seminary['id'], $questgroupUrl); + + // Get medium + $medium = null; + // Questgroup medium + if(!is_null($questgroup['questgroupspicture_id'])) + { + $medium = $this->Media->getSeminaryMediaById($questgroup['questgroupspicture_id']); + $medium['url'] = $this->linker->link(array('media', 'seminary', $seminary['url'], $medium['url'])); + } + // Seminary medium + elseif(!is_null($seminary['seminarymedia_id'])) + { + $medium = $this->Media->getSeminaryMediaById($seminary['seminarymedia_id']); + $medium['url'] = $this->linker->link(array('media', 'seminarymoodpic', $seminary['url'])); + } + + + // Pass data to view + $this->set('medium', $medium); } } diff --git a/controllers/QuestgroupsController.inc b/controllers/QuestgroupsController.inc index b4ea02ac..a696ba61 100644 --- a/controllers/QuestgroupsController.inc +++ b/controllers/QuestgroupsController.inc @@ -164,14 +164,6 @@ // Get texts $questgroupTexts = $this->Questgrouptexts->getQuestgroupTexts($questgroup['id']); - // Media - $picture = null; - if(!is_null($questgroup['questgroupspicture_id'])) - { - $picture = $this->Media->getSeminaryMediaById($questgroup['questgroupspicture_id']); - } - - // Get Quests $quests = array(); if(count($childQuestgroupshierarchy) == 0) @@ -231,7 +223,6 @@ $this->set('questgroup', $questgroup); $this->set('childquestgroupshierarchy', $childQuestgroupshierarchy); $this->set('texts', $questgroupTexts); - $this->set('picture', $picture); $this->set('quests', $quests); } @@ -471,12 +462,6 @@ } } - // Media - $picture = null; - if(!is_null($questgroup['questgroupspicture_id'])) { - $picture = $this->Media->getSeminaryMediaById($questgroup['questgroupspicture_id']); - } - // Get validation settings $validationSettings = array(); foreach($fields as &$field) { @@ -491,7 +476,6 @@ // Pass data to view $this->set('seminary', $seminary); $this->set('questgroup', $questgroup); - $this->set('picture', $picture); $this->set('title', $title); $this->set('mimetypes', $mimetypes); $this->set('validation', $validation); @@ -557,12 +541,6 @@ $this->redirect($this->linker->link(array('questgroup', $seminary['url'], $questgroup['url']), 1)); } - // Media - $picture = null; - if(!is_null($questgroup['questgroupspicture_id'])) { - $picture = $this->Media->getSeminaryMediaById($questgroup['questgroupspicture_id']); - } - // Set titile $this->addTitleLocalized('Edit Questgroup texts'); @@ -572,7 +550,6 @@ $this->set('seminary', $seminary); $this->set('questgroup', $questgroup); $this->set('questgrouptexts', $questgroupTexts); - $this->set('picture', $picture); $this->set('mimetypes', $mimetypes); } @@ -619,12 +596,6 @@ $this->redirect($this->linker->link(array('seminaries', 'seminary', $seminary['url']))); } - // Media - $picture = null; - if(!is_null($questgroup['questgroupspicture_id'])) { - $picture = $this->Media->getSeminaryMediaById($questgroup['questgroupspicture_id']); - } - // Set titile $this->addTitleLocalized('Move Questgroup'); @@ -632,7 +603,6 @@ // Show confirmation $this->set('seminary', $seminary); $this->set('questgroup', $questgroup); - $this->set('picture', $picture); } @@ -678,12 +648,6 @@ $this->redirect($this->linker->link(array('seminaries', 'seminary', $seminary['url']))); } - // Media - $picture = null; - if(!is_null($questgroup['questgroupspicture_id'])) { - $picture = $this->Media->getSeminaryMediaById($questgroup['questgroupspicture_id']); - } - // Set titile $this->addTitleLocalized('Move Questgroup'); @@ -691,7 +655,6 @@ // Show confirmation $this->set('seminary', $seminary); $this->set('questgroup', $questgroup); - $this->set('picture', $picture); } @@ -752,12 +715,6 @@ $this->redirect($this->linker->link(array('questgroup', $seminary['url'], $questgroup['url']), 1)); } - // Media - $picture = null; - if(!is_null($questgroup['questgroupspicture_id'])) { - $picture = $this->Media->getSeminaryMediaById($questgroup['questgroupspicture_id']); - } - // Set titile $this->addTitleLocalized('Delete Questgroup'); @@ -765,7 +722,6 @@ // Show confirmation $this->set('seminary', $seminary); $this->set('questgroup', $questgroup); - $this->set('picture', $picture); } } diff --git a/controllers/QuestsController.inc b/controllers/QuestsController.inc index 041b0abe..33d78b04 100644 --- a/controllers/QuestsController.inc +++ b/controllers/QuestsController.inc @@ -383,12 +383,6 @@ // Get Quest $quest = $this->Quests->getQuestByUrl($seminary['id'], $questgroup['id'], $questUrl); - // Media - $questmedia = null; - if(!is_null($quest['questsmedia_id'])) { - $questmedia = $this->Media->getSeminaryMediaById($quest['questsmedia_id']); - } - // Get submitted Character submissions waiting for approval $submittedSubmissionCharacters = $this->Characters->getCharactersSubmittedQuest($quest['id']); @@ -408,7 +402,6 @@ $this->set('seminary', $seminary); $this->set('questgroup', $questgroup); $this->set('quest', $quest); - $this->set('media', $questmedia); $this->set('submittedSubmissionCharacters', $submittedSubmissionCharacters); $this->set('unsolvedSubmissionCharacters', $unsolvedSubmissionCharacters); $this->set('solvedSubmissionCharacters', $solvedSubmissionCharacters); @@ -442,12 +435,6 @@ // Character $character = $this->Characters->getCharacterByUrl($seminary['id'], $characterUrl); - // Media - $questmedia = null; - if(!is_null($quest['questsmedia_id'])) { - $questmedia = $this->Media->getSeminaryMediaById($quest['questsmedia_id']); - } - // Questtype $questtype = $this->Questtypes->getQuesttypeById($quest['questtype_id']); @@ -465,7 +452,6 @@ $this->set('questgroup', $questgroup); $this->set('quest', $quest); $this->set('character', $character); - $this->set('media', $questmedia); $this->set('output', $output); } @@ -821,12 +807,6 @@ // Get Quest $quest = $this->Quests->getQuestByUrl($seminary['id'], $questgroup['id'], $questUrl); - // Get Quest media - $questmedia = null; - if(!is_null($quest['questsmedia_id'])) { - $questmedia = $this->Media->getSeminaryMediaById($quest['questsmedia_id']); - } - // Render editing task $task = null; $questtype = $this->Questtypes->getQuesttypeById($quest['questtype_id']); @@ -843,7 +823,6 @@ $this->set('seminary', $seminary); $this->set('questgroup', $questgroup); $this->set('quest', $quest); - $this->set('media', $questmedia); $this->set('task', $task); } diff --git a/db/create.sql b/db/create.sql index 72a9a103..9fbed69f 100644 --- a/db/create.sql +++ b/db/create.sql @@ -1854,7 +1854,10 @@ CREATE TABLE `seminarymedia` ( `seminary_id` int(11) NOT NULL, `name` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL, `url` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL, + `title` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, `description` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL, + `sourcelabel` varchar(128) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `sourceurl` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL, `mimetype` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `seminary_id_2` (`seminary_id`,`name`), @@ -2188,4 +2191,4 @@ DELIMITER ; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2015-08-19 22:23:25 +-- Dump completed on 2015-08-20 13:14:00 diff --git a/models/MediaModel.inc b/models/MediaModel.inc index 7efa6eab..5b5d1813 100644 --- a/models/MediaModel.inc +++ b/models/MediaModel.inc @@ -121,7 +121,7 @@ public function getSeminaryMediaById($mediaId) { $data = $this->db->query( - 'SELECT id, name, url, description, mimetype '. + 'SELECT id, name, url, title, description, sourcelabel, sourceurl, mimetype '. 'FROM seminarymedia '. 'WHERE id = ?', 'i', diff --git a/views/html/moodpic/index.tpl b/views/html/moodpic/index.tpl index 6eb56bc7..82c893f0 100644 --- a/views/html/moodpic/index.tpl +++ b/views/html/moodpic/index.tpl @@ -1,9 +1,5 @@
- - - - - - - +
+ +
diff --git a/views/html/moodpic/questgroup.tpl b/views/html/moodpic/questgroup.tpl new file mode 100644 index 00000000..20f91170 --- /dev/null +++ b/views/html/moodpic/questgroup.tpl @@ -0,0 +1,20 @@ +
+
+ + title="" alt=""/> + + + + : + + + + + + + + + + +
+
diff --git a/views/html/moodpic/seminary.tpl b/views/html/moodpic/seminary.tpl new file mode 100644 index 00000000..20f91170 --- /dev/null +++ b/views/html/moodpic/seminary.tpl @@ -0,0 +1,20 @@ +
+
+ + title="" alt=""/> + + + + : + + + + + + + + + + +
+
diff --git a/views/html/questgroups/create.tpl b/views/html/questgroups/create.tpl index 8f4f9530..000a9068 100644 --- a/views/html/questgroups/create.tpl +++ b/views/html/questgroups/create.tpl @@ -1,10 +1,4 @@ - -
- -
- -