From b42d1d2e3a21637403ca6767434657151c6f60b2 Mon Sep 17 00:00:00 2001 From: Elorfin Date: Tue, 29 Sep 2015 14:50:38 +0200 Subject: [PATCH 1/2] merge last modifications --- Controller/Wizard/EditorController.php | 1 + Controller/Wizard/PlayerController.php | 1 + Entity/Step.php | 42 ++++++-- Resources/config/config.yml | 2 +- .../public/js/Path/Controller/PathBaseCtrl.js | 17 +++- Resources/public/js/Path/Partial/edit.html | 17 ++-- Resources/public/js/Path/Partial/show.html | 31 +++--- .../public/js/Path/Service/PathService.js | 2 + ...ationBaseCtrl.js => PathNavigationCtrl.js} | 27 ++--- .../Controller/PathNavigationEditCtrl.js | 15 --- .../Controller/PathNavigationShowCtrl.js | 99 ------------------- ...irective.js => PathNavigationDirective.js} | 8 +- .../Directive/PathNavigationEditDirective.js | 17 ---- .../PathNavigationItemEditDirective.js | 21 ---- .../PathNavigationItemShowDirective.js | 21 ---- .../js/PathNavigation/Partial/edit-item.html | 22 ----- .../js/PathNavigation/Partial/edit.html | 30 ------ .../js/PathNavigation/Partial/show-item.html | 16 +-- .../js/PathNavigation/Partial/show.html | 21 ++-- .../Controller/PathSummaryBaseCtrl.js | 2 +- .../Controller/PathSummaryEditCtrl.js | 3 + .../public/js/PathSummary/Partial/edit.html | 4 +- .../js/PathSummary/Partial/show-item.html | 2 +- .../public/js/PathSummary/Partial/show.html | 8 +- .../js/Resource/Controller/ResourcesCtrl.js | 28 ++++++ .../Controller/ResourcesPrimaryBaseCtrl.js | 15 +-- .../js/ResourcePrimary/Partial/edit.html | 21 ++-- .../Controller/ResourcesSecondaryBaseCtrl.js | 27 ++--- .../js/ResourceSecondary/Partial/edit.html | 2 +- .../public/js/Step/Controller/StepShowCtrl.js | 27 ++++- Resources/public/js/Step/Partial/edit.html | 2 +- Resources/public/js/Step/Partial/show.html | 9 +- .../js/StepConditions/Partial/criterion.html | 2 +- .../Partial/criteriontypechosen.html | 8 +- .../Service/UserProgressionService.js | 3 + Resources/public/less/player.less | 25 +++++ Resources/public/less/step.less | 2 +- Resources/public/less/summary.less | 1 + Resources/translations/path_wizards.en.yml | 9 +- Resources/translations/path_wizards.fr.yml | 9 +- Resources/translations/resource.en.yml | 2 +- Resources/translations/resource.fr.yml | 2 +- Resources/views/Wizard/layout.html.twig | 1 + 43 files changed, 263 insertions(+), 361 deletions(-) rename Resources/public/js/PathNavigation/Controller/{PathNavigationBaseCtrl.js => PathNavigationCtrl.js} (62%) delete mode 100644 Resources/public/js/PathNavigation/Controller/PathNavigationEditCtrl.js delete mode 100644 Resources/public/js/PathNavigation/Controller/PathNavigationShowCtrl.js rename Resources/public/js/PathNavigation/Directive/{PathNavigationShowDirective.js => PathNavigationDirective.js} (69%) mode change 100755 => 100644 delete mode 100644 Resources/public/js/PathNavigation/Directive/PathNavigationEditDirective.js delete mode 100644 Resources/public/js/PathNavigation/Directive/PathNavigationItemEditDirective.js delete mode 100644 Resources/public/js/PathNavigation/Directive/PathNavigationItemShowDirective.js delete mode 100644 Resources/public/js/PathNavigation/Partial/edit-item.html delete mode 100755 Resources/public/js/PathNavigation/Partial/edit.html create mode 100644 Resources/public/js/Resource/Controller/ResourcesCtrl.js diff --git a/Controller/Wizard/EditorController.php b/Controller/Wizard/EditorController.php index 6b81d3c..1fa639e 100755 --- a/Controller/Wizard/EditorController.php +++ b/Controller/Wizard/EditorController.php @@ -99,6 +99,7 @@ public function displayAction(Path $path) return array ( '_resource' => $path, + 'workspace' => $path->getWorkspace(), 'resourceIcons' => $resourceIcons, ); } diff --git a/Controller/Wizard/PlayerController.php b/Controller/Wizard/PlayerController.php index f7b8d98..7a404bb 100755 --- a/Controller/Wizard/PlayerController.php +++ b/Controller/Wizard/PlayerController.php @@ -69,6 +69,7 @@ public function displayAction(Path $path) return array ( '_resource' => $path, + 'workspace' => $path->getWorkspace(), 'userProgression' => $this->pathManager->getUserProgression($path), 'resourceIcons' => $resourceIcons, 'editEnabled' => $this->pathManager->isAllow('EDIT', $path), diff --git a/Entity/Step.php b/Entity/Step.php index 289bae9..0780d4a 100644 --- a/Entity/Step.php +++ b/Entity/Step.php @@ -325,9 +325,9 @@ public function getName() { if (!empty($this->activity)) { return $this->activity->getResourceNode()->getName(); - } else { - return ''; } + + return ''; } /** @@ -338,9 +338,35 @@ public function getDescription() { if (!empty($this->activity) && ' ' != $this->activity->getDescription()) { return $this->activity->getDescription(); - } else { - return ''; } + + return ''; + } + + /** + * Wrapper to access ResourceNode accessibleFrom property + * @return \DateTime + */ + public function getAccessibleFrom() + { + if (!empty($this->activity)) { + return $this->activity->getResourceNode()->getAccessibleFrom(); + } + + return null; + } + + /** + * Wrapper to access ResourceNode accessibleUntil property + * @return \DateTime + */ + public function getAccessibleUntil() + { + if (!empty($this->activity)) { + return $this->activity->getResourceNode()->getAccessibleUntil(); + } + + return null; } /** @@ -509,10 +535,10 @@ public function jsonSerialize() { // Initialize data array $jsonArray = array ( - 'id' => $this->id, // A local ID for the step in the path (reuse step ID) - 'resourceId' => $this->id, // The real ID of the Step into the DB + 'id' => $this->getId(), // A local ID for the step in the path (reuse step ID) + 'resourceId' => $this->getId(), // The real ID of the Step into the DB 'activityId' => null, - 'lvl' => $this->lvl, // The depth of the step in the path structure + 'lvl' => $this->getLvl(), // The depth of the step in the path structure 'name' => $this->getName(), // The name of the linked Activity (used as Step name) 'description' => $this->getDescription(), // The description of the linked Activity (used as Step description) 'primaryResource' => array (), @@ -523,6 +549,8 @@ public function jsonSerialize() 'who' => null, 'where' => null, 'duration' => null, // Duration in seconds + 'accessibleFrom' => $accessibleFrom instanceof \DateTime ? $accessibleFrom->format('Y-m-d H:i:s') : null, + 'accessibleUntil' => $accessibleUntil instanceof \DateTime ? $accessibleUntil->format('Y-m-d H:i:s') : null, 'evaluationType' => null, // automatic/manual ); diff --git a/Resources/config/config.yml b/Resources/config/config.yml index 1b43fbe..96bd419 100755 --- a/Resources/config/config.yml +++ b/Resources/config/config.yml @@ -8,7 +8,7 @@ plugin: is_exportable: true icon: res_file.png actions: - - name: administrate + - name: path_administrate menu_name: administrate widgets: diff --git a/Resources/public/js/Path/Controller/PathBaseCtrl.js b/Resources/public/js/Path/Controller/PathBaseCtrl.js index 51d8e70..0daf1ec 100644 --- a/Resources/public/js/Path/Controller/PathBaseCtrl.js +++ b/Resources/public/js/Path/Controller/PathBaseCtrl.js @@ -14,6 +14,8 @@ var PathBaseCtrl = function PathBaseCtrl($window, $route, $routeParams, PathServ this.currentStep = $routeParams; + this.summaryState = this.pathService.getSummaryState(); + //triggering of promise this.pathService.userteampromise(this.id); @@ -38,4 +40,17 @@ PathBaseCtrl.prototype.path = {}; /** * Current step ID (used to generate edit and preview routes) */ -PathBaseCtrl.prototype.currentStep = {}; \ No newline at end of file +PathBaseCtrl.prototype.currentStep = {}; + +/** + * Current state of the summary + * @type {object} + */ +PathBaseCtrl.prototype.summaryState = {}; + +/** + * Allow toggle Summary + */ +PathBaseCtrl.prototype.toggleSummary = function toggleSummary() { + this.pathService.toggleSummaryState(); +}; \ No newline at end of file diff --git a/Resources/public/js/Path/Partial/edit.html b/Resources/public/js/Path/Partial/edit.html index 2a22a5c..97b4bca 100644 --- a/Resources/public/js/Path/Partial/edit.html +++ b/Resources/public/js/Path/Partial/edit.html @@ -1,17 +1,22 @@
+
- -
- +
diff --git a/Resources/public/js/Path/Partial/show.html b/Resources/public/js/Path/Partial/show.html index 63e9499..fcf183d 100644 --- a/Resources/public/js/Path/Partial/show.html +++ b/Resources/public/js/Path/Partial/show.html @@ -2,20 +2,27 @@ -
-

- - -

-
+
+

+ + - - + {{ pathShowCtrl.path.name }} - +
+ +
+

+ + + +
diff --git a/Resources/public/js/Path/Service/PathService.js b/Resources/public/js/Path/Service/PathService.js index 46d4d42..0dd9ef9 100644 --- a/Resources/public/js/Path/Service/PathService.js +++ b/Resources/public/js/Path/Service/PathService.js @@ -544,6 +544,7 @@ terminated = recursiveLoop(currentStep, currentStep.children[i]); } } + return terminated; } @@ -610,6 +611,7 @@ } } } + return deleted; }); }, diff --git a/Resources/public/js/PathNavigation/Controller/PathNavigationBaseCtrl.js b/Resources/public/js/PathNavigation/Controller/PathNavigationCtrl.js similarity index 62% rename from Resources/public/js/PathNavigation/Controller/PathNavigationBaseCtrl.js rename to Resources/public/js/PathNavigation/Controller/PathNavigationCtrl.js index 0a46b38..4ea646e 100644 --- a/Resources/public/js/PathNavigation/Controller/PathNavigationBaseCtrl.js +++ b/Resources/public/js/PathNavigation/Controller/PathNavigationCtrl.js @@ -1,15 +1,13 @@ /** * Class constructor - * @returns {PathNavigationBaseCtrl} + * @returns {PathNavigationCtrl} * @constructor */ -var PathNavigationBaseCtrl = function PathNavigationBaseCtrl($routeParams, $scope, PathService) { +var PathNavigationCtrl = function PathNavigationCtrl($routeParams, $scope, PathService) { this.pathService = PathService; this.current = $routeParams; - this.summaryState = this.pathService.getSummaryState(); - // Watch the route changes $scope.$watch(function watchCurrentRoute() { return this.current; @@ -27,30 +25,24 @@ var PathNavigationBaseCtrl = function PathNavigationBaseCtrl($routeParams, $scop * Current matched route * @type {object} */ -PathNavigationBaseCtrl.prototype.current = {}; +PathNavigationCtrl.prototype.current = {}; /** * Current displayed step * @type {object} */ -PathNavigationBaseCtrl.prototype.step = {}; +PathNavigationCtrl.prototype.step = {}; /** * Parents of the current step * @type {object} */ -PathNavigationBaseCtrl.prototype.parents = {}; - -/** - * Current state of the summary - * @type {object} - */ -PathNavigationBaseCtrl.prototype.summaryState = {}; +PathNavigationCtrl.prototype.parents = {}; /** * Reload the Step from route params */ -PathNavigationBaseCtrl.prototype.reloadStep = function reloadStep() { +PathNavigationCtrl.prototype.reloadStep = function reloadStep() { this.step = null; // Get step @@ -66,11 +58,4 @@ PathNavigationBaseCtrl.prototype.reloadStep = function reloadStep() { if (angular.isDefined(this.step) && angular.isObject(this.step)) { this.parents = this.pathService.getParents(this.step); } -}; - -/** - * Allow toggle Summary from the current step - */ -PathNavigationBaseCtrl.prototype.toggleSummary = function toggleSummary() { - this.pathService.toggleSummaryState(); }; \ No newline at end of file diff --git a/Resources/public/js/PathNavigation/Controller/PathNavigationEditCtrl.js b/Resources/public/js/PathNavigation/Controller/PathNavigationEditCtrl.js deleted file mode 100644 index 7eb6191..0000000 --- a/Resources/public/js/PathNavigation/Controller/PathNavigationEditCtrl.js +++ /dev/null @@ -1,15 +0,0 @@ -/** - * Class constructor - * @returns {PathNavigationEditCtrl} - * @constructor - */ -var PathNavigationEditCtrl = function PathNavigationEditCtrl($routeParams, $scope, PathService) { - // Call parent constructor - PathNavigationBaseCtrl.apply(this, arguments); - - return this; -}; - -// Extends the base controller -PathNavigationEditCtrl.prototype = Object.create(PathNavigationBaseCtrl.prototype); -PathNavigationEditCtrl.prototype.constructor = PathNavigationEditCtrl; \ No newline at end of file diff --git a/Resources/public/js/PathNavigation/Controller/PathNavigationShowCtrl.js b/Resources/public/js/PathNavigation/Controller/PathNavigationShowCtrl.js deleted file mode 100644 index 7fc7ebd..0000000 --- a/Resources/public/js/PathNavigation/Controller/PathNavigationShowCtrl.js +++ /dev/null @@ -1,99 +0,0 @@ -/** - * Class constructor - * @returns {PathNavigationShowCtrl} - * @constructor - */ -var PathNavigationShowCtrl = function PathNavigationShowCtrl($routeParams, $scope, PathService, UserProgressionService, StepConditionsService, AlertService) { - // Call parent constructor - PathNavigationBaseCtrl.apply(this, arguments); - - this.userProgressionService = UserProgressionService; - this.userProgression = this.userProgressionService.get(); - this.stepConditionsService = StepConditionsService; - this.alertService = AlertService; - return this; -}; - -// Extends the base controller -PathNavigationShowCtrl.prototype = Object.create(PathNavigationBaseCtrl.prototype); -PathNavigationShowCtrl.prototype.constructor = PathNavigationShowCtrl; - -PathNavigationShowCtrl.prototype.goToStep = function goToStep(stepid) { - var step = this.pathService.getStep(stepid); - var curentStepId = step.id; - var rootStep = this.pathService.getRoot(); - - //make sure root is accessible anyways - if (typeof this.userProgression[rootStep.id]=='undefined' - || !angular.isDefined(this.userProgression[rootStep.id].authorized) - || !this.userProgression[rootStep.id].authorized) { - this.userProgressionService.update(rootStep, this.userProgression[rootStep.id].status, 1); //pass 1 (and not "true") to controller : problem in url - } - //previous step exists ? NO : we're on root step => access - if (!angular.isObject(this.pathService.getPrevious(step))) { - this.pathService.goTo(step); - //previous step exists ? YES - } else { - var previousstep = this.pathService.getPrevious(step); - //is there a flag authorized on current step ? YES => access - if (typeof this.userProgression[curentStepId] !== 'undefined' - && angular.isDefined(this.userProgression[curentStepId].authorized) - && this.userProgression[curentStepId].authorized) { - this.pathService.goTo(step); - //is there a flag authorized on current step ? NO (or because the progression is not set) - } else { - //activity has been set for the step : NO => path error - if (!angular.isDefined(previousstep.activityId)) { - this.alertService.addAlert('error', Translator.trans('step_access_denied_no_activity_set', {stepName: step.name}, 'path_wizards')); - //activity has been set for the step : YES - } else { - //is there a flag authorized on previous step ? YES - if (typeof this.userProgression[previousstep.id] !== 'undefined' - && angular.isDefined(this.userProgression[previousstep.id].authorized) - && this.userProgression[previousstep.id].authorized) { - //retrieve user progression - var progression = this.userProgression[step.id]; - var status = (typeof progression == 'undefined') ? "seen" : progression.status; - //is there a condition on previous step ? YES - if (angular.isDefined(previousstep.condition) && angular.isObject(previousstep.condition)) { - //get the promise - var activityEvaluationPromise = this.stepConditionsService.getActivityEvaluation(previousstep.activityId); - activityEvaluationPromise.then( - function (result) { - this.evaluation = result; - // validate condition on previous step ? YES - if (this.stepConditionsService.testCondition(previousstep, this.evaluation)) { - //add flag to current step - var promise = this.userProgressionService.update(step, status, 1); - promise.then(function(result){ - //grant access - this.pathService.goTo(step); - }.bind(this)); //important, to keep the scope - // validate condition on previous step ? NO - } else { - var conditionlist=this.stepConditionsService.getConditionList(); - //display error - this.alertService.addAlert('error', Translator.trans('step_access_denied_condition', {stepName: step.name, conditionList: conditionlist}, 'path_wizards')); - } - }.bind(this), - function (error) { - this.evaluation = null; - }.bind(this)); - //is there a condition on previous step ? NO - } else { - //add flag to current step - var promise = this.userProgressionService.update(step, status, 1); - promise.then(function(result){ - //grant access - this.pathService.goTo(step); - }.bind(this)); - } - //is there a flag authorized on previous step ? NO => no access => message - } else { - //display error - this.alertService.addAlert('error', Translator.trans('step_access_denied', {}, 'path_wizards')); - } - } - } - } -}; \ No newline at end of file diff --git a/Resources/public/js/PathNavigation/Directive/PathNavigationShowDirective.js b/Resources/public/js/PathNavigation/Directive/PathNavigationDirective.js old mode 100755 new mode 100644 similarity index 69% rename from Resources/public/js/PathNavigation/Directive/PathNavigationShowDirective.js rename to Resources/public/js/PathNavigation/Directive/PathNavigationDirective.js index e342c34..27ba383 --- a/Resources/public/js/PathNavigation/Directive/PathNavigationShowDirective.js +++ b/Resources/public/js/PathNavigation/Directive/PathNavigationDirective.js @@ -1,13 +1,13 @@ (function () { 'use strict'; - angular.module('PathNavigationModule').directive('pathNavigationShow', [ - function PathNavigationShowDirective() { + angular.module('PathNavigationModule').directive('pathNavigation', [ + function PathNavigationDirective() { return { restrict: 'E', replace: true, - controller: PathNavigationShowCtrl, - controllerAs: 'pathNavigationShowCtrl', + controller: PathNavigationCtrl, + controllerAs: 'pathNavigationCtrl', templateUrl: AngularApp.webDir + 'bundles/innovapath/js/PathNavigation/Partial/show.html', scope: {}, bindToController: true diff --git a/Resources/public/js/PathNavigation/Directive/PathNavigationEditDirective.js b/Resources/public/js/PathNavigation/Directive/PathNavigationEditDirective.js deleted file mode 100644 index 4e0b434..0000000 --- a/Resources/public/js/PathNavigation/Directive/PathNavigationEditDirective.js +++ /dev/null @@ -1,17 +0,0 @@ -(function () { - 'use strict'; - - angular.module('PathNavigationModule').directive('pathNavigationEdit', [ - function PathNavigationEditDirective() { - return { - restrict: 'E', - replace: true, - controller: PathNavigationEditCtrl, - controllerAs: 'pathNavigationEditCtrl', - templateUrl: AngularApp.webDir + 'bundles/innovapath/js/PathNavigation/Partial/edit.html', - scope: {}, - bindToController: true - }; - } - ]); -})(); \ No newline at end of file diff --git a/Resources/public/js/PathNavigation/Directive/PathNavigationItemEditDirective.js b/Resources/public/js/PathNavigation/Directive/PathNavigationItemEditDirective.js deleted file mode 100644 index 9940b69..0000000 --- a/Resources/public/js/PathNavigation/Directive/PathNavigationItemEditDirective.js +++ /dev/null @@ -1,21 +0,0 @@ -(function () { - 'use strict'; - - angular.module('PathNavigationModule').directive('pathNavigationItemEdit', [ - function PathNavigationEditDirective() { - return { - restrict: 'E', - replace: true, - controller: function PathNavigationItemEditCtrl() {}, - controllerAs: 'pathNavigationItemEditCtrl', - templateUrl: AngularApp.webDir + 'bundles/innovapath/js/PathNavigation/Partial/edit-item.html', - scope: { - parent: '=?', - element: '=', - current: '=' - }, - bindToController: true - }; - } - ]); -})(); \ No newline at end of file diff --git a/Resources/public/js/PathNavigation/Directive/PathNavigationItemShowDirective.js b/Resources/public/js/PathNavigation/Directive/PathNavigationItemShowDirective.js deleted file mode 100644 index b57eced..0000000 --- a/Resources/public/js/PathNavigation/Directive/PathNavigationItemShowDirective.js +++ /dev/null @@ -1,21 +0,0 @@ -(function () { - 'use strict'; - - angular.module('PathNavigationModule').directive('pathNavigationItemShow', [ - function PathNavigationShowDirective() { - return { - restrict: 'E', - replace: true, - controller: PathNavigationShowCtrl, - controllerAs: 'pathNavigationItemShowCtrl', - templateUrl: AngularApp.webDir + 'bundles/innovapath/js/PathNavigation/Partial/show-item.html', - scope: { - parent: '=?', - element: '=', - current: '=' - }, - bindToController: true - }; - } - ]); -})(); \ No newline at end of file diff --git a/Resources/public/js/PathNavigation/Partial/edit-item.html b/Resources/public/js/PathNavigation/Partial/edit-item.html deleted file mode 100644 index d5a65f4..0000000 --- a/Resources/public/js/PathNavigation/Partial/edit-item.html +++ /dev/null @@ -1,22 +0,0 @@ -
  • - -
    - - - {{ pathNavigationItemEditCtrl.element.name | truncate }} - - - {{ pathNavigationItemEditCtrl.element.name | truncate }} - - - - - {{ 'see_step_siblings'|trans:{}:'path_wizards' }} - - -
    • \ No newline at end of file diff --git a/Resources/public/js/PathNavigation/Partial/edit.html b/Resources/public/js/PathNavigation/Partial/edit.html deleted file mode 100755 index 67d8e30..0000000 --- a/Resources/public/js/PathNavigation/Partial/edit.html +++ /dev/null @@ -1,30 +0,0 @@ -
    - - - - -
    diff --git a/Resources/public/js/PathNavigation/Partial/show-item.html b/Resources/public/js/PathNavigation/Partial/show-item.html index e3619ae..2a14f0c 100644 --- a/Resources/public/js/PathNavigation/Partial/show-item.html +++ b/Resources/public/js/PathNavigation/Partial/show-item.html @@ -1,22 +1,22 @@ -
  • +
  • -
    +
    - {{ pathNavigationItemShowCtrl.element.name | truncate }} + {{ pathNavigationItemCtrl.element.name | truncate }} - {{ pathNavigationItemShowCtrl.element.name | truncate }} + {{ pathNavigationItemCtrl.element.name | truncate }} - + {{ 'see_step_siblings'|trans:{}:'path_wizards' }} -
    • diff --git a/Resources/public/js/PathSummary/Controller/PathSummaryBaseCtrl.js b/Resources/public/js/PathSummary/Controller/PathSummaryBaseCtrl.js index f0f04e3..7ce4d57 100644 --- a/Resources/public/js/PathSummary/Controller/PathSummaryBaseCtrl.js +++ b/Resources/public/js/PathSummary/Controller/PathSummaryBaseCtrl.js @@ -17,6 +17,7 @@ var PathSummaryBaseCtrl = function PathSummaryBaseCtrl($routeParams, PathService // Set the structure of the path this.structure = path.steps; } + return this; }; @@ -61,7 +62,6 @@ PathSummaryBaseCtrl.prototype.close = function close() { * Go to a specific Step * @param step */ - PathSummaryBaseCtrl.prototype.goTo = function goTo(step) { this.pathService.goTo(step); }; \ No newline at end of file diff --git a/Resources/public/js/PathSummary/Controller/PathSummaryEditCtrl.js b/Resources/public/js/PathSummary/Controller/PathSummaryEditCtrl.js index 5c79ab8..f1151af 100644 --- a/Resources/public/js/PathSummary/Controller/PathSummaryEditCtrl.js +++ b/Resources/public/js/PathSummary/Controller/PathSummaryEditCtrl.js @@ -33,6 +33,7 @@ var PathSummaryEditCtrl = function PathSummaryEditCtrl($routeParams, PathService this.pathService.reorderSteps(this.structure); }.bind(this) }; + return this; }; @@ -137,6 +138,7 @@ PathSummaryEditCtrl.prototype.removeStep = function (step) { // Need to update preview updatePreview = true; } + // Effective remove this.pathService.removeStep(this.structure, step); @@ -153,6 +155,7 @@ PathSummaryEditCtrl.prototype.removeStep = function (step) { }.bind(this) ); }; + PathSummaryEditCtrl.prototype.goTo = function goTo(step) { //to avoid empty step if (typeof this.current.stepId == 'undefined') { diff --git a/Resources/public/js/PathSummary/Partial/edit.html b/Resources/public/js/PathSummary/Partial/edit.html index e7d9ad2..03a8acb 100755 --- a/Resources/public/js/PathSummary/Partial/edit.html +++ b/Resources/public/js/PathSummary/Partial/edit.html @@ -1,8 +1,8 @@
    - - + + {{ 'sidebar_close'|trans:{}:'path_wizards' }} diff --git a/Resources/public/js/PathSummary/Partial/show-item.html b/Resources/public/js/PathSummary/Partial/show-item.html index 8a1ec32..a67bcc6 100644 --- a/Resources/public/js/PathSummary/Partial/show-item.html +++ b/Resources/public/js/PathSummary/Partial/show-item.html @@ -13,7 +13,7 @@ {{ step.name | truncate }}
    -
    +
    diff --git a/Resources/public/js/PathSummary/Partial/show.html b/Resources/public/js/PathSummary/Partial/show.html index 3f1407b..ab4425d 100755 --- a/Resources/public/js/PathSummary/Partial/show.html +++ b/Resources/public/js/PathSummary/Partial/show.html @@ -1,12 +1,8 @@
    - -
    - - + + {{ 'sidebar_close'|trans:{}:'path_wizards' }} diff --git a/Resources/public/js/Resource/Controller/ResourcesCtrl.js b/Resources/public/js/Resource/Controller/ResourcesCtrl.js new file mode 100644 index 0000000..605a4fe --- /dev/null +++ b/Resources/public/js/Resource/Controller/ResourcesCtrl.js @@ -0,0 +1,28 @@ +/** + * Resources base controller + * @returns {ResourcesCtrl} + * @constructor + */ +var ResourcesCtrl = function ResourcesCtrl() { + return this; +}; + +/** + * List of Resources + * @type {Array} + */ +ResourcesCtrl.prototype.resources = []; + +/** + * Display resource in new window tab + * @param resource + */ +ResourcesCtrl.prototype.showResource = function showResource(resource) { + // Retrieve resource type + var resourceRoute = Routing.generate('claro_resource_open', { + node: resource.resourceId, + resourceType: resource.type + }); + + window.open(resourceRoute, '_blank'); +}; \ No newline at end of file diff --git a/Resources/public/js/ResourcePrimary/Controller/ResourcesPrimaryBaseCtrl.js b/Resources/public/js/ResourcePrimary/Controller/ResourcesPrimaryBaseCtrl.js index 685aaea..d9d7611 100755 --- a/Resources/public/js/ResourcePrimary/Controller/ResourcesPrimaryBaseCtrl.js +++ b/Resources/public/js/ResourcePrimary/Controller/ResourcesPrimaryBaseCtrl.js @@ -1,22 +1,23 @@ /** * Resources primary base controller - * @returns {ResourcesSecondaryBaseCtrl} + * @returns {ResourcesPrimaryBaseCtrl} * @constructor */ var ResourcesPrimaryBaseCtrl = function ResourcesPrimaryBaseCtrl() { + // Call parent constructor + ResourcesCtrl.apply(this, arguments); + this.resourceIcons = AngularApp.resourceIcons; return this; }; +// Extends the base controller +ResourcesPrimaryBaseCtrl.prototype = Object.create(ResourcesCtrl.prototype); +ResourcesPrimaryBaseCtrl.prototype.constructor = ResourcesCtrl; + /** * Icons of the Resources * @type {object} */ ResourcesPrimaryBaseCtrl.prototype.resourceIcons = {}; - -/** - * Resources owned by the Step - * @type {Array} - */ -ResourcesPrimaryBaseCtrl.prototype.resources = []; \ No newline at end of file diff --git a/Resources/public/js/ResourcePrimary/Partial/edit.html b/Resources/public/js/ResourcePrimary/Partial/edit.html index c8aec95..7ca2fe0 100755 --- a/Resources/public/js/ResourcePrimary/Partial/edit.html +++ b/Resources/public/js/ResourcePrimary/Partial/edit.html @@ -9,11 +9,18 @@

    - - {{ 'resources_browse'|trans:{}:'path_wizards' }} - {{ 'resources_replace'|trans:{}:'path_wizards' }} - +
    + + + {{ 'resource_primary_add'|trans:{}:'path_wizards' }} + {{ 'resource_primary_replace'|trans:{}:'path_wizards' }} + + + +

    @@ -27,8 +34,8 @@

    {{ resourcesPrimaryEditCtrl.resources[0].name }}

    -

    diff --git a/Resources/public/js/ResourceSecondary/Controller/ResourcesSecondaryBaseCtrl.js b/Resources/public/js/ResourceSecondary/Controller/ResourcesSecondaryBaseCtrl.js index d7ed2c5..65e6588 100755 --- a/Resources/public/js/ResourceSecondary/Controller/ResourcesSecondaryBaseCtrl.js +++ b/Resources/public/js/ResourceSecondary/Controller/ResourcesSecondaryBaseCtrl.js @@ -4,23 +4,24 @@ * @constructor */ var ResourcesSecondaryBaseCtrl = function ResourcesSecondaryBaseCtrl() { + // Call parent constructor + ResourcesCtrl.apply(this, arguments); + this.resourceIcons = AngularApp.resourceIcons; return this; }; +// Extends the base controller +ResourcesSecondaryBaseCtrl.prototype = Object.create(ResourcesCtrl.prototype); +ResourcesSecondaryBaseCtrl.prototype.constructor = ResourcesCtrl; + /** * Icons of the Resources * @type {object} */ ResourcesSecondaryBaseCtrl.prototype.resourceIcons = {}; -/** - * Resources owned by the Step - * @type {Array} - */ -ResourcesSecondaryBaseCtrl.prototype.resources = []; - /** * Resources inherited from the parents * @type {Array} @@ -32,17 +33,3 @@ ResourcesSecondaryBaseCtrl.prototype.inherited = []; * @type {Array} */ ResourcesSecondaryBaseCtrl.prototype.excluded = []; - -/** - * Display resource in new window tab - * @param resource - */ -ResourcesSecondaryBaseCtrl.prototype.showResource = function showResource(resource) { - // Retrieve resource type - var resourceRoute = Routing.generate('claro_resource_open', { - node: resource.resourceId, - resourceType: resource.type - }); - - window.open(resourceRoute, '_blank'); -}; \ No newline at end of file diff --git a/Resources/public/js/ResourceSecondary/Partial/edit.html b/Resources/public/js/ResourceSecondary/Partial/edit.html index b51e4e1..1dfd410 100755 --- a/Resources/public/js/ResourceSecondary/Partial/edit.html +++ b/Resources/public/js/ResourceSecondary/Partial/edit.html @@ -84,7 +84,7 @@
  • - {{ 'resources_browse'|trans:{}:'path_wizards' }} + {{ 'resource_secondary_add'|trans:{}:'path_wizards' }}
    • \ No newline at end of file diff --git a/Resources/public/js/Step/Controller/StepShowCtrl.js b/Resources/public/js/Step/Controller/StepShowCtrl.js index ea05058..4e62ca8 100644 --- a/Resources/public/js/Step/Controller/StepShowCtrl.js +++ b/Resources/public/js/Step/Controller/StepShowCtrl.js @@ -3,7 +3,7 @@ * @returns {StepShowCtrl} * @constructor */ -var StepShowCtrl = function StepShowCtrl(step, inheritedResources, PathService, $sce, UserProgressionService, StepConditionsService, AlertService) { +var StepShowCtrl = function StepShowCtrl(step, inheritedResources, PathService, $sce, UserProgressionService, StepConditionsService, AlertService, $filter) { StepBaseCtrl.apply(this, arguments); this.userProgressionService = UserProgressionService; @@ -11,6 +11,8 @@ var StepShowCtrl = function StepShowCtrl(step, inheritedResources, PathService, this.stepConditionsService = StepConditionsService; this.alertService = AlertService; + this.filterDate = $filter('date'); + if (angular.isDefined(this.step) && angular.isDefined(this.step.description) && typeof this.step.description == 'string') { // Trust content to allow Cross Sites URL this.step.description = $sce.trustAsHtml(this.step.description); @@ -38,12 +40,35 @@ StepShowCtrl.prototype.constructor = StepShowCtrl; */ StepShowCtrl.prototype.userProgressionService = {}; +StepShowCtrl.prototype.filterDate = {}; + /** * Progression of the User for the current Step (NOT the progression for the whole Path) * @type {null} */ StepShowCtrl.prototype.progression = {}; +StepShowCtrl.prototype.isAccessible = function () { + var now = this.filterDate(new Date(), 'yyyy-MM-dd HH:mm:ss') + + var from = null; + if (this.step.accessibleFrom != null && this.step.accessibleFrom.length !== 0) { + from = this.step.accessibleFrom; + } + + var until = null; + if (this.step.accessibleUntil != null && this.step.accessibleUntil.length !== 0) { + until = this.step.accessibleUntil; + } + + var accessible = false; + if ( (null === from || now >= from) && (null === until || now <= until) ) { + accessible = true; + } + + return accessible; +}; + StepShowCtrl.prototype.updateProgression = function (newStatus) { this.userProgressionService.update(this.step, newStatus); }; diff --git a/Resources/public/js/Step/Partial/edit.html b/Resources/public/js/Step/Partial/edit.html index d7223db..684011b 100644 --- a/Resources/public/js/Step/Partial/edit.html +++ b/Resources/public/js/Step/Partial/edit.html @@ -33,7 +33,7 @@
    diff --git a/Resources/public/js/Step/Partial/show.html b/Resources/public/js/Step/Partial/show.html index 0393686..001e83c 100644 --- a/Resources/public/js/Step/Partial/show.html +++ b/Resources/public/js/Step/Partial/show.html @@ -6,8 +6,15 @@
    + +
    +
    + {{ 'step_not_accessible'|trans:{}:'path_wizards' }} +
    +
    + -
    +
    diff --git a/Resources/public/js/StepConditions/Partial/criterion.html b/Resources/public/js/StepConditions/Partial/criterion.html index 497f313..fb43dfd 100644 --- a/Resources/public/js/StepConditions/Partial/criterion.html +++ b/Resources/public/js/StepConditions/Partial/criterion.html @@ -12,7 +12,7 @@
    - diff --git a/Resources/public/js/StepConditions/Partial/criteriontypechosen.html b/Resources/public/js/StepConditions/Partial/criteriontypechosen.html index f06046c..c111dc1 100644 --- a/Resources/public/js/StepConditions/Partial/criteriontypechosen.html +++ b/Resources/public/js/StepConditions/Partial/criteriontypechosen.html @@ -2,7 +2,7 @@
    - @@ -35,7 +35,7 @@ --> -
    diff --git a/Resources/public/js/UserProgression/Service/UserProgressionService.js b/Resources/public/js/UserProgression/Service/UserProgressionService.js index d8ef698..1e3d3f6 100644 --- a/Resources/public/js/UserProgression/Service/UserProgressionService.js +++ b/Resources/public/js/UserProgression/Service/UserProgressionService.js @@ -63,6 +63,7 @@ if (typeof status !== 'undefined' && null !== status && status.length !== 0) { params.status = status; } + $http .post(Routing.generate('innova_path_progression_create', params)) @@ -90,6 +91,7 @@ */ update: function update(step, status, authorized) { var deferred = $q.defer(); + $http .put(Routing.generate('innova_path_progression_update', { id: step.resourceId, status: status, authorized: authorized })) @@ -101,6 +103,7 @@ progression[response.stepId].status = response.status; progression[response.stepId].authorized = response.authorized; } + deferred.resolve(response.status); }) diff --git a/Resources/public/less/player.less b/Resources/public/less/player.less index 6389e15..46aa02e 100755 --- a/Resources/public/less/player.less +++ b/Resources/public/less/player.less @@ -1,5 +1,30 @@ +/* .btn-path-edit { z-index: 10; position: relative; margin-bottom: 8px; +}*/ + +.path-header { + /*padding: 5px;*/ + /*background: #EEEEEE;*/ + + h1 { + padding: 0; + padding-bottom: 10px; + margin: 0; + margin-bottom: 10px; + font-size: 24px; + font-weight: 600; + + border-bottom: 1px solid #bbb; + + > .btn:last-child { + margin-right: 5px; + } + } + + .path-breadcrumbs { + /*margin-bottom: 0;*/ + } } \ No newline at end of file diff --git a/Resources/public/less/step.less b/Resources/public/less/step.less index 46135d7..8fbb771 100755 --- a/Resources/public/less/step.less +++ b/Resources/public/less/step.less @@ -44,7 +44,7 @@ vertical-align: middle; } - .btn { + .btns { position: absolute; right: 10px; /* Same as `.panel-heading` padding (unfortunately Bootstrap doesn't use var for this value) */ top: 4px; diff --git a/Resources/public/less/summary.less b/Resources/public/less/summary.less index 9e4c331..9871ef4 100755 --- a/Resources/public/less/summary.less +++ b/Resources/public/less/summary.less @@ -10,6 +10,7 @@ height: auto !important; width: inherit; + z-index: 10 !important; /* Sidebar close button */ .ps-close { diff --git a/Resources/translations/path_wizards.en.yml b/Resources/translations/path_wizards.en.yml index bacb4e1..7f8757a 100644 --- a/Resources/translations/path_wizards.en.yml +++ b/Resources/translations/path_wizards.en.yml @@ -107,11 +107,13 @@ step_delete_confirm: Are you sure you want to delete this resource ? step_delete_title: Delete step : <%resourceName%> resource_hide_parent: Hide in this step resource_no_propagate : Make unavailable in children +resource_primary_add: Add resource +resource_primary_delete: Delete +resource_primary_replace: Replace resource_propagate : Make available in children +resource_secondary_add: Secondary resource resource_show: Show resource resource_show_parent: Display in this step -resources_browse: Add resource -resources_replace: Replace root_default_name: untitled # s @@ -122,7 +124,7 @@ see_activity: See activity see_step_siblings: See siblings of the step select_activity: Select existing activity show_path_info: Show information o the Path -sidebar_close: Close +sidebar_close: Hide summary step_access_denied: You didn't pass the previous steps step_access_denied_condition: You didn't match the condition to access this step %stepName% because : %conditionList% step_access_denied_no_activity_set: You can't access the step %stepName% because no activity has been set up for it. Please contact the workspace manager @@ -138,6 +140,7 @@ step_edit: Edit step step_evaluation_type: Evaluation type step_has_duration: step has a duration step_no_resource: There is no resource linked to this step. +step_not_accessible: This step is not accessible for the time being. step_paste: Paste step_to_template: Save as template step_where: Learning place diff --git a/Resources/translations/path_wizards.fr.yml b/Resources/translations/path_wizards.fr.yml index 8f450ee..64f460d 100644 --- a/Resources/translations/path_wizards.fr.yml +++ b/Resources/translations/path_wizards.fr.yml @@ -106,12 +106,14 @@ resource_delete: Supprimer la ressource resource_delete_confirm: Êtes-vous sur de vouloir supprimer cette ressource ? resource_delete_title: Suppression de la ressource : <%resourceName%> resource_hide_parent: Masquer dans cette étape +resource_primary_add: Ajouter une ressource +resource_primary_delete: Supprimer +resource_primary_replace: Remplacer resource_propagate : Rendre disponible dans les étapes enfants resource_no_propagate : Rendre indisponible dans les étapes enfants +resource_secondary_add: Ressource complémentaire resource_show: Voir la ressource resource_show_parent: Afficher dans cette étape -resources_browse: Ajouter une ressource -resources_replace: Remplacer root_default_name: sans nom # s @@ -137,6 +139,7 @@ step_edit: Modifier l'étape step_evaluation_type: Type d'évaluation step_has_duration: l'étape a une durée step_no_resource: Il n'y a aucune ressource rattachée à cette étape. +step_not_accessible: Cette étape n'est pas accessible pour le moment. step_paste: Coller step_to_template: Sauvegarder comme modèle step_who: Modalité de travail @@ -145,7 +148,7 @@ summary: Sommaire # t templates: Modèles -sidebar_close: Fermer +sidebar_close: Cacher le sommaire template_copy: Copier template_edit: Modifier template_delete: Supprimer diff --git a/Resources/translations/resource.en.yml b/Resources/translations/resource.en.yml index 3bccec2..a904225 100755 --- a/Resources/translations/resource.en.yml +++ b/Resources/translations/resource.en.yml @@ -1,2 +1,2 @@ innova_path: Path -administrate: Edit +path_administrate: Edit diff --git a/Resources/translations/resource.fr.yml b/Resources/translations/resource.fr.yml index ea0464a..cda1d19 100755 --- a/Resources/translations/resource.fr.yml +++ b/Resources/translations/resource.fr.yml @@ -1,2 +1,2 @@ innova_path: Parcours -administrate: Editer +path_administrate: Editer diff --git a/Resources/views/Wizard/layout.html.twig b/Resources/views/Wizard/layout.html.twig index d391041..2022f29 100755 --- a/Resources/views/Wizard/layout.html.twig +++ b/Resources/views/Wizard/layout.html.twig @@ -96,6 +96,7 @@ '@InnovaPathBundle/Resources/public/js/StepConditions/Service/*' '@InnovaPathBundle/Resources/public/js/Resource/*' + '@InnovaPathBundle/Resources/public/js/Resource/Controller/*' '@InnovaPathBundle/Resources/public/js/Resource/Service/*' '@InnovaPathBundle/Resources/public/js/ResourcePrimary/*' From c60420b03a3a89a74ac5852294f46983c75a7aff Mon Sep 17 00:00:00 2001 From: Elorfin Date: Wed, 30 Sep 2015 09:36:41 +0200 Subject: [PATCH 2/2] restore user messages in Player --- Resources/public/js/Path/Partial/show.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/public/js/Path/Partial/show.html b/Resources/public/js/Path/Partial/show.html index fcf183d..1f7798d 100644 --- a/Resources/public/js/Path/Partial/show.html +++ b/Resources/public/js/Path/Partial/show.html @@ -20,6 +20,13 @@

    +
    +

    + + +

    +
    +