Update to new version 5.4HEADstable/jermamaster

Signed-off-by: Thomas Duval <thomas.duval@orange.com>
Change-Id: Idcd868133d75928a1ffd74d749ce98503e0555ea

6 files changed, 573 insertions, 0 deletions

diff --git a/old/moon_gui/static/app/model/edit/metarules/action/mapping/metarules-add.tpl.html b/old/moon_gui/static/app/model/edit/metarules/action/mapping/metarules-add.tpl.html
new file mode 100755
index 00000000..a721e6d0
--- /dev/null
+++ b/old/moon_gui/static/app/model/edit/metarules/action/mapping/metarules-add.tpl.html
@@ -0,0 +1,50 @@
+<div class="row">
+
+    <form class="form-horizontal" role="form" name="add.form">
+
+        <div class="form-group" ng-class="{'has-error': add.form.name.$invalid && add.form.name.$dirty}">
+
+            <label for="name" class="col-sm-3 control-label" data-translate="moon.model.metarules.add.form.name">Name</label>
+
+            <div class="col-sm-6">
+
+                <input name="name" id="name" class="form-control" type="text" data-ng-model="add.metaRule.name" required />
+
+                <div class="help-block" ng-show="add.form.name.$dirty && add.form.name.$invalid">
+                    <small class="error" ng-show="add.form.name.$error.required" data-translate="moon.model.metarules.add.check.name.required">Name is required</small>
+                </div>
+
+            </div>
+        </div>
+
+        <div class="form-group">
+
+            <label for="description" class="col-sm-3 control-label" data-translate="moon.model.metarules.add.form.description">Description</label>
+            <div class="col-sm-6">
+                <textarea id="description" name="description" class="form-control" data-ng-model="add.metaRule.description"></textarea>
+            </div>
+
+        </div>
+
+
+        <div class="form-group">
+
+            <div class="col-sm-8">
+
+                <div class="pull-right">
+
+                    <a href="" ng-disabled="add.loading" ng-click="add.create()" class="btn btn-warning">
+                        <span class="glyphicon glyphicon-save"></span>
+                        <span data-translate="moon.model.metarules.add.action.create">Create</span>
+                    </a>
+
+                    <moon-loader ng-if="add.loading"></moon-loader>
+
+                </div>
+
+            </div>
+
+        </div>
+    </form>
+
+</div>
diff --git a/old/moon_gui/static/app/model/edit/metarules/action/mapping/metarules-map.tpl.html b/old/moon_gui/static/app/model/edit/metarules/action/mapping/metarules-map.tpl.html
new file mode 100755
index 00000000..1830204b
--- /dev/null
+++ b/old/moon_gui/static/app/model/edit/metarules/action/mapping/metarules-map.tpl.html
@@ -0,0 +1,102 @@
+<div ng-controller="moonMetaRulesMapController as map" class="modal" tabindex="-1" data-role="MapMetaRules">
+
+    <div class="modal-dialog">
+
+        <div class="modal-content">
+
+            <div class="modal-header">
+
+                <button type="button" class="close" ng-click="$hide()">&times;</button>
+                <h4 class="modal-title" data-translate="moon.model.metarules.map.title"></h4>
+
+            </div>
+
+            <div class="modal-body">
+
+                <div class="row">
+
+                    <div class="col-sm-3">
+
+                        <button class="btn btn-primary" style="white-space: normal;" ng-click="map.addMetaRuleToList = !map.addMetaRuleToList">
+
+                            <span ng-if="!map.addMetaRuleToList" data-translate="moon.model.metarules.map.action.new">Add a new Meta Rule</span>
+                            <span ng-if="map.addMetaRuleToList" data-translate="moon.model.metarules.map.action.list">List of Meta Rules</span>
+
+                        </button>
+
+                    </div>
+
+                    <div class="col-sm-9">
+
+                        <form  class="form-horizontal" role="form" name="map.form">
+
+                            <div class="form-group" ng-if="!map.addMetaRuleToList">
+
+                                <label class="col-sm-3 control-label" data-translate="moon.model.metarules.map.form.list">List of Meta Rule</label>
+
+                                <div class="col-sm-9">
+
+                                    <ui-select ng-model="map.selectedMetaRule" name="object">
+
+                                        <ui-select-match placeholder="(None)" ng-bind="$select.selected.name"></ui-select-match>
+                                        <ui-select-choices repeat="ametaRule in map.metaRules">
+                                            <div ng-value="ametaRule" ng-bind="ametaRule.name"></div>
+                                        </ui-select-choices>
+
+                                    </ui-select>
+
+                                </div>
+
+                            </div>
+
+                            <div class="form-group" ng-if="!map.addMetaRuleToList">
+
+                                <moon-loader ng-if="map.metaRulesLoading || map.mappingLoading" ></moon-loader>
+
+                                <div class="col-sm-5">
+                                    <a href="" ng-disabled="map.metaRulesLoading || map.mappingLoading || !map.selectedMetaRule" ng-click="map.deleteMetaRule()" class="btn btn-warning" style="white-space: normal;">
+                                        <span class="glyphicon glyphicon-trash"></span>
+                                        <span data-translate="moon.model.metarules.map.action.delete">Delete the selected Meta Rule</span>
+                                    </a>
+                                </div>
+
+                                <div class="col-sm-5 col-sm-offset-2">
+                                    <a href="" ng-disabled="map.metaRulesLoading || map.mappingLoading || !map.selectedMetaRule" ng-click="map.mapToModel()" class="btn btn-warning" style="white-space: normal;">
+                                        <span class="glyphicon glyphicon-link"></span>
+                                        <span data-translate="moon.model.metarules.map.action.add">Add the selected Meta Rule</span>
+                                    </a>
+                                </div>
+
+                            </div>
+
+                            <div class="form-group" ng-if="map.addMetaRuleToList">
+
+                                <moon-meta-rules-add></moon-meta-rules-add>
+
+                            </div>
+
+                        </form>
+
+                    </div>
+
+                </div>
+
+            </div>
+
+            <div class="modal-footer">
+
+                <div class="btn-toolbar" style="float: right;">
+
+                    <a href="" ng-click="$hide()" class="btn btn-default">
+                        <span data-translate="moon.model.metarules.add.action.cancel">Cancel</span>
+                    </a>
+
+                </div>
+
+            </div>
+
+        </div>
+
+    </div>
+
+</div>
diff --git a/old/moon_gui/static/app/model/edit/metarules/action/mapping/metarules-unmap.tpl.html b/old/moon_gui/static/app/model/edit/metarules/action/mapping/metarules-unmap.tpl.html
new file mode 100755
index 00000000..bb02aba2
--- /dev/null
+++ b/old/moon_gui/static/app/model/edit/metarules/action/mapping/metarules-unmap.tpl.html
@@ -0,0 +1,35 @@
+<div ng-controller="MetaRulesUnMapController as unmap" class="modal" tabindex="-1" data-role="modalUnMapMetaRule">
+
+    <div class="modal-dialog">
+
+        <div class="modal-content">
+
+            <div class="modal-header">
+                <button type="button" class="close" ng-click="$hide()">&times;</button>
+                <h4 class="modal-title" data-translate="moon.model.metarules.unmap.title"></h4>
+            </div>
+
+            <div class="modal-body">
+                <span data-translate="moon.model.metarules.unmap.content" data-translate-values="{ modelName: unmap.model.name, metaRuleName: unmap.metaRule.name }"></span>
+            </div>
+
+            <div class="modal-footer">
+
+                <div class="btn-toolbar" style="float: right;">
+                    <a href="" ng-click="$hide()" class="btn btn-default">
+                        <span data-translate="moon.model.metarules.unmap.action.cancel">Cancel</span>
+                    </a>
+                    <a href="" ng-disabled="unmap.unMappingLoading" ng-click="unmap.unmap()" class="btn btn-warning">
+                        <span class="glyphicon glyphicon-transfer"></span>
+                        <span data-translate="moon.model.metarules.unmap.action.unmap">Unmap</span>
+                    </a>
+                    <moon-loader ng-if="unmap.unMappingLoading" ></moon-loader>
+                </div>
+
+            </div>
+
+        </div>
+
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/old/moon_gui/static/app/model/edit/metarules/action/mapping/metarules.controller.add.js b/old/moon_gui/static/app/model/edit/metarules/action/mapping/metarules.controller.add.js
new file mode 100755
index 00000000..a95951fa
--- /dev/null
+++ b/old/moon_gui/static/app/model/edit/metarules/action/mapping/metarules.controller.add.js
@@ -0,0 +1,99 @@
+(function() {
+
+    'use strict';
+
+    angular
+        .module('moon')
+        .directive('moonMetaRulesAdd', moonMetaRulesAdd);
+
+    moonMetaRulesAdd.$inject = [];
+
+    function moonMetaRulesAdd() {
+
+        return {
+            templateUrl : 'html/model/edit/metarules/action/mapping/metarules-add.tpl.html',
+            bindToController : true,
+            controller : moonMetaRulesAddController,
+            controllerAs : 'add',
+            scope : {
+                metaRules : '='
+            },
+            restrict : 'E',
+            replace : true
+        };
+    }
+
+
+    angular
+        .module('moon')
+        .controller('moonMetaRulesAddController', moonMetaRulesAddController);
+
+    moonMetaRulesAddController.$inject = ['$scope', 'metaRuleService', 'alertService', '$translate', 'formService', 'utilService'];
+
+    function moonMetaRulesAddController($scope, metaRuleService, alertService, $translate, formService, utilService) {
+
+        var add = this;
+
+        /*
+         *
+         */
+
+        add.laoading = false;
+
+        add.form = {};
+
+        add.metaRule = { name: null, description: null, subject_categories : [], object_categories : [], action_categories : [] };
+
+        add.create = createMetaRule;
+
+        activate();
+
+        function activate(){
+
+        }
+
+        function createMetaRule() {
+
+            if(formService.isInvalid(add.form)) {
+
+                formService.checkFieldsValidity(add.form);
+
+            } else {
+
+                add.loading = true;
+
+                metaRuleService.data.create({}, add.metaRule, createSuccess, createError);
+
+            }
+
+            function createSuccess(data) {
+
+                var createdMetaRule = utilService.transformOne(data, 'meta_rules');
+
+                $translate('moon.model.metarules.add.success', { metaRuleName: createdMetaRule.name }).then(function (translatedValue) {
+                    alertService.alertSuccess(translatedValue);
+                });
+
+                add.loading = false;
+
+                $scope.$emit('event:metaRuleCreatedSuccess', createdMetaRule);
+
+            }
+
+            function createError(reason) {
+
+                $translate('moon.model.metarules.add.error', { metaRuleName: add.metaRule.name }).then(function (translatedValue) {
+                    alertService.alertError(translatedValue);
+                });
+
+                add.loading = false;
+
+                $scope.$emit('event:metaRuleCreatedError', add.project);
+
+            }
+
+        }
+
+    }
+
+})();
diff --git a/old/moon_gui/static/app/model/edit/metarules/action/mapping/metarules.map.controller.js b/old/moon_gui/static/app/model/edit/metarules/action/mapping/metarules.map.controller.js
new file mode 100755
index 00000000..cf9ba06c
--- /dev/null
+++ b/old/moon_gui/static/app/model/edit/metarules/action/mapping/metarules.map.controller.js
@@ -0,0 +1,213 @@
+(function() {
+
+    'use strict';
+
+    angular
+        .module('moon')
+        .controller('moonMetaRulesMapController', moonMetaRulesMapController);
+
+    moonMetaRulesMapController.$inject = ['$scope', '$rootScope', 'alertService', '$translate', 'formService', 'metaRuleService', 'modelService', 'utilService'];
+
+    function moonMetaRulesMapController($scope, $rootScope, alertService, $translate, formService, metaRuleService, modelService, utilService ) {
+
+        var map = this;
+
+        /*
+         *
+         */
+
+        map.metaRules = [];
+
+        map.model = $scope.model;
+
+        map.addMetaRuleToList = false;
+
+        map.mapToModel = mapToModel;
+
+        map.deleteMetaRule = deleteMetaRule;
+
+        activate();
+
+        function activate() {
+
+            resolveMetaRules();
+
+        }
+
+        /*
+         * ---- events
+         */
+        var rootListeners = {
+
+            'event:metaRuleCreatedSuccess': $rootScope.$on('event:metaRuleCreatedSuccess', metaRuleCreatedSuccess),
+            'event:metaRuleCreatedError': $rootScope.$on('event:metaRuleCreatedError', metaRuleCreatedError)
+
+        };
+
+        for (var unbind in rootListeners) {
+            $scope.$on('$destroy', rootListeners[unbind]);
+        }
+
+
+        /*
+         *
+         */
+
+        function resolveMetaRules() {
+
+            map.metaRulesLoading = true;
+
+           metaRuleService.findAllWithCallback(
+                function(metaRules){
+                    map.metaRules = metaRules;
+                    map.metaRulesLoading = false;
+                }
+            );
+
+        }
+
+        function mapToModel() {
+
+            if (formService.isInvalid(map.form)) {
+
+                formService.checkFieldsValidity(map.form);
+
+            } else {
+
+                map.mappingLoading = true;
+
+                var modelToSend = angular.copy(map.model);
+
+                modelToSend.meta_rules.push(map.selectedMetaRule.id);
+
+                modelService.update(modelToSend, mapSuccess, mapError);
+
+            }
+
+            function mapSuccess(data) {
+
+                var modelReceived = utilService.transformOne(data, 'models');
+
+                metaRuleService.findSomeWithMetaData(modelReceived.meta_rules).then(function(metaRules){
+
+                    modelReceived.meta_rules_values  = metaRules;
+
+                    $translate('moon.model.metarules.map.success', {
+
+                        modelName: modelReceived.name,
+                        metaRuleName: map.selectedMetaRule.name
+
+                    }).then(function (translatedValue) {
+
+                        alertService.alertSuccess(translatedValue);
+
+                    });
+
+                    map.mappingLoading = false;
+
+                    $scope.$emit('event:metaRuleMapToModelSuccess', modelReceived);
+
+                });
+
+            }
+
+            function mapError(response) {
+
+                $translate('moon.model.metarules.map.error', {
+
+                    modelName: map.model.name,
+                    metaRuleName: map.selectedMetaRule.name
+
+                }).then(function (translatedValue) {
+
+                    alertService.alertError(translatedValue);
+
+                });
+
+                map.mappingLoading = false;
+
+            }
+        }
+
+        function cleanSelectedValue(){
+
+            delete map.selectedMetaRule;
+
+        }
+
+
+        function deleteMetaRule(){
+
+            if(!map.selectedMetaRule){
+
+                return;
+
+            }
+
+            map.mappingLoading = true;
+
+            var metaRuleTodelete = angular.copy(map.selectedMetaRule);
+
+            metaRuleService.delete(metaRuleTodelete, deleteSuccess, deleteError);
+
+            function deleteSuccess(data) {
+
+                $translate('moon.model.metarules.delete.success', { metaRuleName: metaRuleTodelete.name }).then(function (translatedValue) {
+                    alertService.alertSuccess(translatedValue);
+                });
+
+                cleanSelectedValue();
+
+                map.mappingLoading = false;
+
+                resolveMetaRules();
+
+                // later this event will have to be catch, because the model can use the deleted MetaRule
+                $scope.$emit('event:deleteMetaRule', metaRuleTodelete);
+
+            }
+
+            function deleteError(reason) {
+
+                $translate('moon.model.metarules.delete.error', { metaRuleName: metaRuleTodelete.name }).then(function (translatedValue) {
+                    alertService.alertError(translatedValue);
+                });
+
+                map.mappingLoading = false;
+
+            }
+        }
+
+
+
+
+
+
+        /**
+         * This function will add a metaRule to the current list of metaRules
+         * @param event
+         * @param metaRule {...} metaRule to add
+         */
+        function metaRuleCreatedSuccess(event, metaRule) {
+
+            map.metaRules.push(metaRule);
+            showList();
+
+        }
+
+        /**
+         * This function hide the add MetaRule Modal
+         * @param event
+         */
+        function metaRuleCreatedError(event) {
+
+        }
+
+        function showList(){
+            map.addMetaRuleToList = false;
+        }
+
+    }
+
+
+})();
\ No newline at end of file
diff --git a/old/moon_gui/static/app/model/edit/metarules/action/mapping/metarules.unmap.controller.js b/old/moon_gui/static/app/model/edit/metarules/action/mapping/metarules.unmap.controller.js
new file mode 100755
index 00000000..30f32d51
--- /dev/null
+++ b/old/moon_gui/static/app/model/edit/metarules/action/mapping/metarules.unmap.controller.js
@@ -0,0 +1,74 @@
+/**
+ * @author arnaud marhin<arnaud.marhin@orange.com>
+ */
+
+(function() {
+
+    'use strict';
+
+    angular
+        .module('moon')
+        .controller('MetaRulesUnMapController', MetaRulesUnMapController);
+
+    MetaRulesUnMapController.$inject = ['$scope', '$translate', 'alertService', 'modelService'];
+
+    function MetaRulesUnMapController($scope, $translate, alertService, modelService) {
+
+        var unmap = this;
+
+        /*
+         *
+         */
+
+        unmap.model = $scope.model;
+        unmap.metaRule = $scope.metaRule;
+
+        unmap.unMappingLoading = false;
+
+        unmap.unmap = unMapModelToMetaRule;
+
+        /*
+         *
+         */
+
+        function unMapModelToMetaRule() {
+
+            unmap.unMappingLoading = true;
+
+            var modelToUpdate = angular.copy(unmap.model);
+
+            modelToUpdate.meta_rules = _.without(modelToUpdate.meta_rules, unmap.metaRule.id);
+
+            modelService.update(modelToUpdate, unMapSuccess, unMapError);
+
+            function unMapSuccess(data) {
+
+                $translate('moon.model.metarules.unmap.success', { modelName: unmap.model.name, metaRuleName: unmap.metaRule.name })
+                    .then(function (translatedValue) {
+                        alertService.alertSuccess(translatedValue);
+                    });
+
+                unmap.unMappingLoading = false;
+
+                $scope.$emit('event:metaRuleUnMappedToModelSuccess', modelToUpdate);
+
+            }
+
+            function unMapError(reason) {
+
+                $translate('moon.model.metarules.unmap.error', { modelName: unmap.model.name, metaRuleName: unmap.metaRule.name })
+                    .then(function (translatedValue) {
+                        alertService.alertError(translatedValue);
+                    });
+
+                unmap.unMappingLoading = false;
+
+                $scope.$emit('event:metaRuleUnMappedToModelError');
+
+            }
+
+        }
+
+    }
+
+})();