coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

restructure application classes

Browse source
This commit is contained in:
coderkun 2014-05-14 18:30:25 +02:00
commit ff849bd72c
29 changed files with 53 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
agents/toplevel/BinaryAgent.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class BinaryAgent extends \hhu\z\ToplevelAgent
class BinaryAgent extends \hhu\z\agents\ToplevelAgent
{

2
agents/toplevel/HtmlAgent.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class HtmlAgent extends \hhu\z\ToplevelAgent
class HtmlAgent extends \hhu\z\agents\ToplevelAgent
{

23
app/QuesttypeAgent.inc → app/agents/QuesttypeAgent.inc
View file

@ -9,7 +9,7 @@
* @link https://bitbucket.org/coderkun/the-legend-of-z
*/
namespace hhu\z;
namespace hhu\z\agents;
/**
@ -107,6 +107,23 @@
}
/**
* Determine the classname for the given Agent name.
*
* @static
* @param string $agentName Agent name to get classname of
* @param string $agentType Agent type of given Agent name
* @return string Classname for the Agent name
*/
/*private static function getClassName($agentName, $agentType)
{
$className = ClassLoader::concatClassNames($agentName, 'agent');
return \nre\configs\AppConfig::$app['namespace']."agents\\$agentType\\$className";
}*/
/**
* Load the class of a QuesttypeAgent.
*
@ -256,10 +273,10 @@
// Load Controller
\hhu\z\QuesttypeController::load($controllerName);
\hhu\z\controllers\QuesttypeController::load($controllerName);
// Construct Controller
$this->controller = QuesttypeController::factory($controllerName, $toplevelAgentName, $action, $this);
$this->controller = \hhu\z\controllers\QuesttypeController::factory($controllerName, $toplevelAgentName, $action, $this);
}
}

2
app/ToplevelAgent.inc → app/agents/ToplevelAgent.inc
View file

@ -9,7 +9,7 @@
* @link https://bitbucket.org/coderkun/the-legend-of-z
*/
namespace hhu\z;
namespace hhu\z\agents;
/**

8
app/QuesttypeController.inc → app/controllers/QuesttypeController.inc
View file

@ -9,7 +9,7 @@
* @link https://bitbucket.org/coderkun/the-legend-of-z
*/
namespace hhu\z;
namespace hhu\z\controllers;
/**
@ -273,11 +273,11 @@
$model = \nre\core\ClassLoader::stripClassType(\nre\core\ClassLoader::stripClassType(\nre\core\ClassLoader::stripNamespace(get_class($this))));
// Load class
QuesttypeModel::load($model);
\hhu\z\models\QuesttypeModel::load($model);
// Construct Model
$modelName = ucfirst(strtolower($model));
$this->$modelName = QuesttypeModel::factory($model);
$this->$modelName = \hhu\z\models\QuesttypeModel::factory($model);
}
@ -300,7 +300,7 @@
// Load view
$this->view = QuesttypeView::loadAndFactory($layoutName, $controllerName, $action);
$this->view = \hhu\z\views\QuesttypeView::loadAndFactory($layoutName, $controllerName, $action);
}
}

2
app/QuesttypeModel.inc → app/models/QuesttypeModel.inc
View file

@ -9,7 +9,7 @@
* @link https://bitbucket.org/coderkun/the-legend-of-z
*/
namespace hhu\z;
namespace hhu\z\models;
/**

2
app/QuesttypeView.inc → app/views/QuesttypeView.inc
View file

@ -9,7 +9,7 @@
* @link https://bitbucket.org/coderkun/the-legend-of-z
*/
namespace hhu\z;
namespace hhu\z\views;
/**

6
controllers/QuestsController.inc
View file

@ -43,7 +43,7 @@
* @var array
*/
public $seminaryPermissions = array(
'index' => array('admin', 'moderator', 'user'),
'index' => array('admin', 'moderator'),
'quest' => array('admin', 'moderator', 'user'),
'submissions' => array('admin', 'moderator'),
'submission' => array('admin', 'moderator'),
@ -813,11 +813,11 @@
private function loadQuesttypeAgent($questtypeClassname, $request, $response)
{
// Load Agent
\hhu\z\QuesttypeAgent::load($questtypeClassname);
\hhu\z\agents\QuesttypeAgent::load($questtypeClassname);
// Construct and return Agent
return \hhu\z\QuesttypeAgent::factory($questtypeClassname, $request, $response);
return \hhu\z\agents\QuesttypeAgent::factory($questtypeClassname, $request, $response);
}

2
questtypes/bossfight/BossfightQuesttypeAgent.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class BossfightQuesttypeAgent extends \hhu\z\QuesttypeAgent
class BossfightQuesttypeAgent extends \hhu\z\agents\QuesttypeAgent
{
}

2
questtypes/bossfight/BossfightQuesttypeController.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class BossfightQuesttypeController extends \hhu\z\QuesttypeController
class BossfightQuesttypeController extends \hhu\z\controllers\QuesttypeController
{
/**
* Required models

2
questtypes/bossfight/BossfightQuesttypeModel.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class BossfightQuesttypeModel extends \hhu\z\QuesttypeModel
class BossfightQuesttypeModel extends \hhu\z\models\QuesttypeModel
{

2
questtypes/choiceinput/ChoiceinputQuesttypeAgent.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class ChoiceinputQuesttypeAgent extends \hhu\z\QuesttypeAgent
class ChoiceinputQuesttypeAgent extends \hhu\z\agents\QuesttypeAgent
{
}

2
questtypes/choiceinput/ChoiceinputQuesttypeController.inc
View file

@ -18,7 +18,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class ChoiceinputQuesttypeController extends \hhu\z\QuesttypeController
class ChoiceinputQuesttypeController extends \hhu\z\controllers\QuesttypeController
{

2
questtypes/choiceinput/ChoiceinputQuesttypeModel.inc
View file

@ -18,7 +18,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class ChoiceinputQuesttypeModel extends \hhu\z\QuesttypeModel
class ChoiceinputQuesttypeModel extends \hhu\z\models\QuesttypeModel
{

2
questtypes/crossword/CrosswordQuesttypeAgent.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class CrosswordQuesttypeAgent extends \hhu\z\QuesttypeAgent
class CrosswordQuesttypeAgent extends \hhu\z\agents\QuesttypeAgent
{
}

2
questtypes/crossword/CrosswordQuesttypeController.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class CrosswordQuesttypeController extends \hhu\z\QuesttypeController
class CrosswordQuesttypeController extends \hhu\z\controllers\QuesttypeController
{

2
questtypes/crossword/CrosswordQuesttypeModel.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class CrosswordQuesttypeModel extends \hhu\z\QuesttypeModel
class CrosswordQuesttypeModel extends \hhu\z\models\QuesttypeModel
{

2
questtypes/dragndrop/DragndropQuesttypeAgent.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class DragndropQuesttypeAgent extends \hhu\z\QuesttypeAgent
class DragndropQuesttypeAgent extends \hhu\z\agents\QuesttypeAgent
{
}

2
questtypes/dragndrop/DragndropQuesttypeController.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class DragndropQuesttypeController extends \hhu\z\QuesttypeController
class DragndropQuesttypeController extends \hhu\z\controllers\QuesttypeController
{
/**
* Required models

2
questtypes/dragndrop/DragndropQuesttypeModel.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class DragndropQuesttypeModel extends \hhu\z\QuesttypeModel
class DragndropQuesttypeModel extends \hhu\z\models\QuesttypeModel
{

2
questtypes/multiplechoice/MultiplechoiceQuesttypeAgent.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class MultiplechoiceQuesttypeAgent extends \hhu\z\QuesttypeAgent
class MultiplechoiceQuesttypeAgent extends \hhu\z\agents\QuesttypeAgent
{
}

2
questtypes/multiplechoice/MultiplechoiceQuesttypeController.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class MultiplechoiceQuesttypeController extends \hhu\z\QuesttypeController
class MultiplechoiceQuesttypeController extends \hhu\z\controllers\QuesttypeController
{

2
questtypes/multiplechoice/MultiplechoiceQuesttypeModel.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class MultiplechoiceQuesttypeModel extends \hhu\z\QuesttypeModel
class MultiplechoiceQuesttypeModel extends \hhu\z\models\QuesttypeModel
{

2
questtypes/submit/SubmitQuesttypeAgent.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class SubmitQuesttypeAgent extends \hhu\z\QuesttypeAgent
class SubmitQuesttypeAgent extends \hhu\z\agents\QuesttypeAgent
{
}

2
questtypes/submit/SubmitQuesttypeController.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class SubmitQuesttypeController extends \hhu\z\QuesttypeController
class SubmitQuesttypeController extends \hhu\z\controllers\QuesttypeController
{
/**
* Required models

2
questtypes/submit/SubmitQuesttypeModel.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class SubmitQuesttypeModel extends \hhu\z\QuesttypeModel
class SubmitQuesttypeModel extends \hhu\z\models\QuesttypeModel
{
/**
* Required models

2
questtypes/textinput/TextinputQuesttypeAgent.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class TextinputQuesttypeAgent extends \hhu\z\QuesttypeAgent
class TextinputQuesttypeAgent extends \hhu\z\agents\QuesttypeAgent
{
}

2
questtypes/textinput/TextinputQuesttypeController.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class TextinputQuesttypeController extends \hhu\z\QuesttypeController
class TextinputQuesttypeController extends \hhu\z\controllers\QuesttypeController
{

2
questtypes/textinput/TextinputQuesttypeModel.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class TextinputQuesttypeModel extends \hhu\z\QuesttypeModel
class TextinputQuesttypeModel extends \hhu\z\models\QuesttypeModel
{