From 60bb98696ee93f979914d8e88ed4708f59fcff9c Mon Sep 17 00:00:00 2001 From: asteroide Date: Fri, 9 Jun 2017 16:18:59 +0200 Subject: Stable version Change-Id: I70001bedbdf1823cb9e8dccd545800387777201b --- .../app/model/edit/metadata/metadata-edit.tpl.html | 2 +- .../app/model/edit/metadata/metadata-list.tpl.html | 488 ++++++++++++++------- .../app/model/edit/metadata/metadata.edit.dir.js | 8 +- .../app/model/edit/metadata/metadata.list.dir.js | 219 ++++----- .../model/edit/metarules/metarules-list.tpl.html | 199 ++++----- .../app/model/edit/metarules/metarules.list.dir.js | 7 +- .../static/app/model/edit/model-edit.tpl.html | 6 +- .../static/app/model/edit/model.controller.edit.js | 10 +- 8 files changed, 553 insertions(+), 386 deletions(-) (limited to 'moonv4/moon_gui/static/app/model/edit') diff --git a/moonv4/moon_gui/static/app/model/edit/metadata/metadata-edit.tpl.html b/moonv4/moon_gui/static/app/model/edit/metadata/metadata-edit.tpl.html index fde6cdb0..2616be1c 100644 --- a/moonv4/moon_gui/static/app/model/edit/metadata/metadata-edit.tpl.html +++ b/moonv4/moon_gui/static/app/model/edit/metadata/metadata-edit.tpl.html @@ -70,7 +70,7 @@
- +
diff --git a/moonv4/moon_gui/static/app/model/edit/metadata/metadata-list.tpl.html b/moonv4/moon_gui/static/app/model/edit/metadata/metadata-list.tpl.html index 35b61f57..30a42dbc 100644 --- a/moonv4/moon_gui/static/app/model/edit/metadata/metadata-list.tpl.html +++ b/moonv4/moon_gui/static/app/model/edit/metadata/metadata-list.tpl.html @@ -1,149 +1,156 @@
-
+ +
-
+
-

List of associated Subject Categories

+
-
+

List of associated Subject Categories

-
+
-
+
- +
-
- - - - - - - +
IdNameDescription
- + + + + + + + + - - - - - - + + + + + + - - + + + - - - - - - - - -
IdNameDescription
+ - - - Remove - +
- + -
+
--> - +
-
+ -
There is no Subjects
+ + + There is no Subjects + + + + + + + + +
-
+
-
+
-
+

Add a Subject Category

-

Add a Subject Category

+
-
+
-
+ - +
-
- -
+
-
+
-

List associated of Object Categories

+

List associated of Object Categories

-
+
-
+
-
+
- +
- - - - - - + + + + + + - - + + - + - + - + - + - + + +
IdNameDescription
IdNameDescription
- + Remove @@ -186,148 +193,299 @@
There is no Objects
- +
-
+
-
+
-
+

Add an Object Category

-

Add an Object Category

+
-
+
-
+ - +
-
+
-
+
-
+

List associated of Action Categories

-

List associated of Action Categories

- -
+
-
+
-
+
- +
- - - - - - - - + + + + + + + + - + - - - - - - + + + + + - - + + + - + - + -
IdNameDescription
IdNameDescription
+
- - - Remove - + + + Remove + - + --> -
+
- + -
+
-
There is no Actions
+ + +
-
+
-
+
-
+

Add an Action Category

-

Add an Action Category

+
-
+
. -
. + - +
+ +
+ +
+ +
+ +
+ +
+ +

List of associated Subject Categories

+ +
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + +
Name
There is no Subjects
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +

List associated of Object Categories

+ +
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + +
Name
There is no Objects
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +

List associated of Action Categories

+ +
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + +
Name
There is no Actions
+ +
+ +
+ +
+ +
+ +
+
\ No newline at end of file diff --git a/moonv4/moon_gui/static/app/model/edit/metadata/metadata.edit.dir.js b/moonv4/moon_gui/static/app/model/edit/metadata/metadata.edit.dir.js index 2e927c44..10df83b0 100644 --- a/moonv4/moon_gui/static/app/model/edit/metadata/metadata.edit.dir.js +++ b/moonv4/moon_gui/static/app/model/edit/metadata/metadata.edit.dir.js @@ -29,9 +29,11 @@ .module('moon') .controller('moonMetaDataEditController', moonMetaDataEditController); - moonMetaDataEditController.$inject = ['$scope', 'metaDataService', 'META_DATA_CST', 'alertService', '$translate', 'formService', 'metaRuleService', 'utilService']; + moonMetaDataEditController.$inject = ['$scope', 'metaDataService', 'META_DATA_CST', 'alertService', + '$translate', 'formService', 'metaRuleService', 'utilService']; - function moonMetaDataEditController($scope, metaDataService, META_DATA_CST, alertService, $translate, formService, metaRuleService, utilService) { + function moonMetaDataEditController($scope, metaDataService, META_DATA_CST, alertService, + $translate, formService, metaRuleService, utilService) { var edit = this; @@ -86,7 +88,7 @@ function callBackList(list){ - edit.list = list + edit.list = list; } diff --git a/moonv4/moon_gui/static/app/model/edit/metadata/metadata.list.dir.js b/moonv4/moon_gui/static/app/model/edit/metadata/metadata.list.dir.js index c4654be1..beb2ed86 100644 --- a/moonv4/moon_gui/static/app/model/edit/metadata/metadata.list.dir.js +++ b/moonv4/moon_gui/static/app/model/edit/metadata/metadata.list.dir.js @@ -17,7 +17,9 @@ controllerAs : 'list', scope : { metaRule: '=', - editMode : '=' + editMode: '=', + // shortDisplay : boolean value + shortDisplay: '=' }, restrict : 'E', replace : true @@ -36,6 +38,7 @@ list.metaRule = $scope.list.metaRule; list.editMode = $scope.list.editMode; + list.shortDisplay = $scope.list.shortDisplay; list.typeOfSubject = META_DATA_CST.TYPE.SUBJECT; list.typeOfObject = META_DATA_CST.TYPE.OBJECT; @@ -45,9 +48,9 @@ list.unMapObj = unMapObj; list.unMapAct = unMapAct; - list.deleteSub = deleteSub; - list.deleteObj = deleteObj; - list.deleteAct = deleteAct; + // list.deleteSub = deleteSub; + // list.deleteObj = deleteObj; + // list.deleteAct = deleteAct; list.getSubjectCategories = getSubjectCategories; list.getObjectCategories = getObjectCategories; @@ -82,7 +85,7 @@ list.loadingCatSub = true; - metaDataService.subject.findSomeWithCallback(list.metaRule.subject_categories, function(categories){ + metaDataService.subject.findSomeWithCallback(list.metaRule.subject_categories, function(categories){ list.catSub = categories; list.loadingCatSub = false; @@ -229,97 +232,99 @@ } - /** - * Delete - */ - - function deleteSub(subject){ - - subject.loader = true; - - metaDataService.subject.delete(subject, deleteSubSuccess, deleteSubError); - - function deleteSubSuccess(data){ - - $translate('moon.model.metadata.subject.delete.success', { subjectName: subject.name }).then( function(translatedValue) { - alertService.alertSuccess(translatedValue); - }); - - removeSubFromSubList(subject); - - subject.loader = false; - - } - - function deleteSubError(reason){ - - $translate('moon.model.metadata.subject.delete.error', { subjectName: subject.name, reason: reason.message}).then( function(translatedValue) { - alertService.alertError(translatedValue); - }); - - subject.loader = false; - - } - } - - function deleteObj(object){ - - object.loader = true; - - metaDataService.object.delete(object, deleteObjSuccess, deleteObjError); - - function deleteObjSuccess(data){ - - $translate('moon.model.metadata.object.delete.success', { objectName: object.name }).then( function(translatedValue) { - alertService.alertSuccess(translatedValue); - }); - - removeObjFromObjList(object); - list.catSub = metaDataService.subject.findSome(metaRule.subject_categories); - list.catObj = metaDataService.object.findSome(metaRule.object_categories); - list.catAct = metaDataService.action.findSome(metaRule.action_categories); - object.loader = false; - - } - - function deleteObjError(reason){ - - $translate('moon.model.metadata.object.delete.error', { objectName: object.name, reason: reason.message}).then( function(translatedValue) { - alertService.alertError(translatedValue); - }); - - object.loader = false; - } - } - - function deleteAct(action){ - - action.loader = true; - - metaDataService.action.delete(action, deleteActSuccess, deleteActError); - - function deleteActSuccess(data){ - - $translate('moon.model.metadata.action.delete.success', { actionName: action.name }).then( function(translatedValue) { - alertService.alertSuccess(translatedValue); - }); - - removeActFromActList(action); - - action.loader = false; - - } - - function deleteActError(reason){ - - $translate('moon.model.metadata.action.delete.error', { actionName: action.name, reason: reason.message}).then( function(translatedValue) { - alertService.alertError(translatedValue); - }); - - action.loader = false; - - } - } + // /** + // * Delete + // */ + // + // function deleteSub(subject){ + // + // subject.loader = true; + // + // metaDataService.subject.delete(subject, deleteSubSuccess, deleteSubError); + // + // function deleteSubSuccess(data){ + // + // $translate('moon.model.metadata.subject.delete.success', { subjectName: subject.name }).then( function(translatedValue) { + // alertService.alertSuccess(translatedValue); + // }); + // + // removeSubFromSubList(subject); + // + // subject.loader = false; + // + // } + // + // function deleteSubError(reason){ + // + // $translate('moon.model.metadata.subject.delete.error', + // { subjectName: subject.name, reason: reason.message}).then( function(translatedValue) { + // alertService.alertError(translatedValue); + // }); + // + // subject.loader = false; + // + // } + // } + // + // function deleteObj(object){ + // + // object.loader = true; + // + // metaDataService.object.delete(object, deleteObjSuccess, deleteObjError); + // + // function deleteObjSuccess(data){ + // + // $translate('moon.model.metadata.object.delete.success', { objectName: object.name }).then( function(translatedValue) { + // alertService.alertSuccess(translatedValue); + // }); + // + // removeObjFromObjList(object); + // /*list.catSub = metaDataService.subject.findSome(list.metaRule.subject_categories); + // list.catObj = metaDataService.object.findSome(list.metaRule.object_categories); + // list.catAct = metaDataService.action.findSome(list.metaRule.action_categories);*/ + // + // object.loader = false; + // + // } + // + // function deleteObjError(reason){ + // + // $translate('moon.model.metadata.object.delete.error', { objectName: object.name, reason: reason.message}).then( function(translatedValue) { + // alertService.alertError(translatedValue); + // }); + // + // object.loader = false; + // } + // } + // + // function deleteAct(action){ + // + // action.loader = true; + // + // metaDataService.action.delete(action, deleteActSuccess, deleteActError); + // + // function deleteActSuccess(data){ + // + // $translate('moon.model.metadata.action.delete.success', { actionName: action.name }).then( function(translatedValue) { + // alertService.alertSuccess(translatedValue); + // }); + // + // removeActFromActList(action); + // + // action.loader = false; + // + // } + // + // function deleteActError(reason){ + // + // $translate('moon.model.metadata.action.delete.error', { actionName: action.name, reason: reason.message}).then( function(translatedValue) { + // alertService.alertError(translatedValue); + // }); + // + // action.loader = false; + // + // } + // } function getSubjectCategories(){ return list.catSub ? list.catSub : []; @@ -333,17 +338,17 @@ return list.catAct ? list.catAct : []; } - function removeSubFromSubList(subject){ - list.catSub = _.without(list.catSub, subject); - } - - function removeObjFromObjList(object){ - list.catObj = _.without(list.catObj, object); - } - - function removeActFromActList(action){ - list.catAct = _.without(list.catAct, action); - } + // function removeSubFromSubList(subject){ + // list.catSub = _.without(list.catSub, subject); + // } + // + // function removeObjFromObjList(object){ + // list.catObj = _.without(list.catObj, object); + // } + // + // function removeActFromActList(action){ + // list.catAct = _.without(list.catAct, action); + // } function updateMetaRuleCategories( event, metaRule){ diff --git a/moonv4/moon_gui/static/app/model/edit/metarules/metarules-list.tpl.html b/moonv4/moon_gui/static/app/model/edit/metarules/metarules-list.tpl.html index c36700ff..ebe307c3 100644 --- a/moonv4/moon_gui/static/app/model/edit/metarules/metarules-list.tpl.html +++ b/moonv4/moon_gui/static/app/model/edit/metarules/metarules-list.tpl.html @@ -1,149 +1,138 @@
-
-

List of Meta Rules

+

List of Meta Rules

-
- -
- -
- - - - - - - - - - +
+
- + + + + + + + + - + - + - + - + - + - + - - + - + + - - - - - + - + + + + + - - - - - - - -
+
+ + + + + + - + - + + -
-
Name
-
-
Description
- 		+
Name
+ 		-
Number of Subjects
- 		+
Description
+ 		-
Number of Subjects
- 		+
Number of Subjects
+ 		-
Number of Actions
- 		+
Number of Subjects
+ 		-
Actions
-
+
Number of Actions
+
+
Actions
+
There is no Meta Rules
There is no Meta Rules
+
-
+
- +
-
+
-
+
- + + -
+ -
- -
+ +
+
-
- -
- - - Settings - -
- +
+ + + Settings +
diff --git a/moonv4/moon_gui/static/app/model/edit/metarules/metarules.list.dir.js b/moonv4/moon_gui/static/app/model/edit/metarules/metarules.list.dir.js index 8fba0266..120b6a8b 100644 --- a/moonv4/moon_gui/static/app/model/edit/metarules/metarules.list.dir.js +++ b/moonv4/moon_gui/static/app/model/edit/metarules/metarules.list.dir.js @@ -59,6 +59,11 @@ list.edit = { modal: $modal({ template: 'html/model/edit/metarules/action/metarules-edit.tpl.html', show: false }), showModal: showEditModal }; + /*list.edit.modal.result.finally(function(){ + console.log('CATCHING'); + });*/ + + list.map = { modal: $modal({ template: 'html/model/edit/metarules/action/mapping/metarules-map.tpl.html', show: false }), showModal: showMapModal }; @@ -224,8 +229,6 @@ }); - - } function modelUnmappedError(event) { diff --git a/moonv4/moon_gui/static/app/model/edit/model-edit.tpl.html b/moonv4/moon_gui/static/app/model/edit/model-edit.tpl.html index c86d05ec..4955f441 100644 --- a/moonv4/moon_gui/static/app/model/edit/model-edit.tpl.html +++ b/moonv4/moon_gui/static/app/model/edit/model-edit.tpl.html @@ -53,7 +53,11 @@
- +
+ + + +
diff --git a/moonv4/moon_gui/static/app/model/edit/model.controller.edit.js b/moonv4/moon_gui/static/app/model/edit/model.controller.edit.js index f5972052..3e10a533 100644 --- a/moonv4/moon_gui/static/app/model/edit/model.controller.edit.js +++ b/moonv4/moon_gui/static/app/model/edit/model.controller.edit.js @@ -6,9 +6,9 @@ .module('moon') .controller('ModelEditController', ModelEditController); - ModelEditController.$inject = ['$scope', '$rootScope', 'model', '$stateParams']; + ModelEditController.$inject = ['$scope', '$rootScope', 'model', 'metaRuleService']; - function ModelEditController($scope, $rootScope, model, $stateParams) { + function ModelEditController($scope, $rootScope, model, metaRuleService) { var edit = this; @@ -48,6 +48,12 @@ edit.model = model; + metaRuleService.findSomeWithCallback(model.meta_rules, function(metaRules){ + + edit.model.meta_rules_values = metaRules; + + }); + } } -- cgit 1.2.3-korg