This is an automated email from the git hooks/post-receive script. New change to branch feature/7894-affichage-hierarchie-projet in repository coselmar. See http://git.codelutin.com/coselmar.git from 42e7902 refs-80 #7894 prepare add first draw of hierarchy graph new bc41aae fix tooltip in questions list new e2e1949 refs #7894 add links on hierarchy graph nodes The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit e2e19491cc45be4f372ea1e3c940c69cfa1f5097 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Jan 12 17:54:51 2016 +0100 refs #7894 add links on hierarchy graph nodes commit bc41aaeeba401f31bb109ed5e6ec5ab5155ab197 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Jan 12 17:54:22 2016 +0100 fix tooltip in questions list Summary of changes: .../coselmar/services/v1/QuestionsWebService.java | 4 +-- .../src/main/webapp/css/d3-collapsible-tree.css | 32 +++++++++++----------- .../src/main/webapp/js/coselmar-controllers.js | 15 ++++++++-- .../src/main/webapp/js/d3-2waytree-graph.js | 10 +++++-- .../src/main/webapp/views/questions/questions.html | 8 +++--- 5 files changed, 41 insertions(+), 28 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7894-affichage-hierarchie-projet in repository coselmar. See http://git.codelutin.com/coselmar.git commit bc41aaeeba401f31bb109ed5e6ec5ab5155ab197 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Jan 12 17:54:22 2016 +0100 fix tooltip in questions list --- coselmar-ui/src/main/webapp/views/questions/questions.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coselmar-ui/src/main/webapp/views/questions/questions.html b/coselmar-ui/src/main/webapp/views/questions/questions.html index 15373f3..a812631 100644 --- a/coselmar-ui/src/main/webapp/views/questions/questions.html +++ b/coselmar-ui/src/main/webapp/views/questions/questions.html @@ -50,7 +50,7 @@ <tr ng-repeat="question in questions" > <td ng-if="context.currentUser.role != 'MEMBER'"> <span class="status-{{question.status|lowercase}}" title="{{question.status | translate}}"></span> - <a href="#/questions/{{question.id}}" class="paddingLeft10" tooltip-placement="bottom" tooltip-html-unsafe="{{question.summary}}">{{question.title}}</a> + <a href="#/questions/{{question.id}}" class="paddingLeft10" tooltip-placement="bottom" uib-tooltip="{{question.summary}}">{{question.title}}</a> </td> <td ng-if="context.currentUser.role == 'MEMBER'">{{question.title}}</td> @@ -62,19 +62,19 @@ <!-- clients : we use ng-if for better tooltip management --> <td ng-if="question.clients && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'"> - <span tooltip-placement="bottom" tooltip-html-unsafe="{{getUserNames(question.clients)}}" >{{question.clients.length}}</span> + <span tooltip-placement="bottom" uib-tooltip="{{getUserNames(question.clients)}}" >{{question.clients.length}}</span> </td> <td ng-if="!question.clients && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'">0</td> <!-- participants --> <td ng-if="question.participants && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'"> - <span tooltip-placement="bottom" tooltip-html-unsafe="{{getUserNames(question.participants)}}" >{{question.participants.length}}</span> + <span tooltip-placement="bottom" uib-tooltip="{{getUserNames(question.participants)}}" >{{question.participants.length}}</span> </td> <td ng-if="!question.participants && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'">0</td> <!-- related documents --> <td ng-if="question.relatedDocuments && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'"> - <span tooltip-placement="bottom" tooltip-html-unsafe="{{getDocumentTitles(question.relatedDocuments)}}" tooltip-trigger="mouseenter" >{{question.relatedDocuments.length}}</span> + <span tooltip-placement="bottom" uib-tooltip="{{getDocumentTitles(question.relatedDocuments)}}" tooltip-trigger="mouseenter" >{{question.relatedDocuments.length}}</span> </td> <td ng-if="!question.relatedDocuments && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'">0</td> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7894-affichage-hierarchie-projet in repository coselmar. See http://git.codelutin.com/coselmar.git commit e2e19491cc45be4f372ea1e3c940c69cfa1f5097 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Jan 12 17:54:51 2016 +0100 refs #7894 add links on hierarchy graph nodes --- .../coselmar/services/v1/QuestionsWebService.java | 4 +-- .../src/main/webapp/css/d3-collapsible-tree.css | 32 +++++++++++----------- .../src/main/webapp/js/coselmar-controllers.js | 15 ++++++++-- .../src/main/webapp/js/d3-2waytree-graph.js | 10 +++++-- 4 files changed, 37 insertions(+), 24 deletions(-) diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java index 90f3333..ab44a86 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java @@ -1312,7 +1312,7 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { for (Question parent : parents) { QuestionTreeNode ancestor = new QuestionTreeNode(); String parentId = parent.getTopiaId(); - ancestor.setId(parentId); + ancestor.setId(getShortIdFromFull(parentId)); ancestor.setTitle(parent.getTitle()); ancestor.setThemes(Sets.newHashSet(parent.getTheme())); Date deadline = parent.getDeadline(); @@ -1355,7 +1355,7 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { for (Question child : children) { QuestionTreeNode descendant = new QuestionTreeNode(); String parentId = child.getTopiaId(); - descendant.setId(parentId); + descendant.setId(getShortIdFromFull(parentId)); descendant.setTitle(child.getTitle()); descendant.setThemes(Sets.newHashSet(child.getTheme())); Date deadline = child.getDeadline(); diff --git a/coselmar-ui/src/main/webapp/css/d3-collapsible-tree.css b/coselmar-ui/src/main/webapp/css/d3-collapsible-tree.css index ff67aeb..c951a95 100644 --- a/coselmar-ui/src/main/webapp/css/d3-collapsible-tree.css +++ b/coselmar-ui/src/main/webapp/css/d3-collapsible-tree.css @@ -91,19 +91,19 @@ a:hover { color: #999; } - .node circle { - cursor: pointer; - fill: #fff; - stroke: steelblue; - stroke-width: 1.5px; - } - - .node text { - font-size: 11px; - } - - path.link { - fill: none; - stroke: #ccc; - stroke-width: 1.5px; - } \ No newline at end of file +.node circle { + cursor: pointer; + fill: #fff; + stroke: steelblue; + stroke-width: 1.5px; +} + +.node text { + font-size: 11px; +} + +path.link { + fill: none; + stroke: #ccc; + stroke-width: 1.5px; +} \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index d830f2e..621a56e 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -1625,7 +1625,10 @@ coselmarControllers.controller('ModalQuestionHierarchyCtrl', function ($scope, $ $scope.depth = 2; $scope.ancestors = []; $scope.descendants = []; - $scope.hierarchyTree = { name : $scope.question.title, parents : [], children : [] }; + $scope.hierarchyTree = { name : $scope.question.title, + url : "#/questions/" + $scope.question.id, + tooltip : $scope.question.themes.join(), + parents : [], children : [] }; $scope.ancestorsReady = false; $scope.descendantsReady = false; @@ -1645,7 +1648,10 @@ coselmarControllers.controller('ModalQuestionHierarchyCtrl', function ($scope, $ $scope.ancestors = ancestors; // load parents angular.forEach($scope.ancestors, function(value, key) { - var parent = { name : value.title, isparent: true }; + var parent = { name : value.title, + url : "#/questions/" + value.id, + tooltip : value.themes.join(), + isparent: true }; var subParents = loadParents(value, $scope.depth - 1); if (subParents.length > 0) { parent.parents = subParents; @@ -1663,7 +1669,10 @@ coselmarControllers.controller('ModalQuestionHierarchyCtrl', function ($scope, $ $scope.descendants = descendants; // load children angular.forEach($scope.descendants, function(value, key) { - var child = { name : value.title, isparent: false }; + var child = { name : value.title, + url : "#/questions/" + value.id, + tooltip : value.themes.join(), + isparent: false }; var subChildren = loadChildren(value, $scope.depth); if (subChildren.length > 0) { child.children = subChildren; diff --git a/coselmar-ui/src/main/webapp/js/d3-2waytree-graph.js b/coselmar-ui/src/main/webapp/js/d3-2waytree-graph.js index 56e44e0..ea2d66b 100644 --- a/coselmar-ui/src/main/webapp/js/d3-2waytree-graph.js +++ b/coselmar-ui/src/main/webapp/js/d3-2waytree-graph.js @@ -26,7 +26,6 @@ var CollapsibleTree = function(elt) { // .attr("transform", "translate(" + m[0] + "," + m[3] + ")"); // top-bottom .attr("transform", "translate(0,"+h/2+")"); // bidirectional-tree - var that = { init: function(data) { var that = this; @@ -94,11 +93,16 @@ var CollapsibleTree = function(elt) { return "rotate(45)"; } else { return "rotate(45)"; - } + } } }) + .style("fill-opacity", 1e-6) + .append("svg:a") + .attr("xlink:href", function (d) { return d.url; }) + .attr("target", "_blank") + .attr("uib-tooltip", function(d) { return d.tooltip}) .text(function(d) { return d.name; }) - .style("fill-opacity", 1e-6); + ; // Transition nodes to their new position. var nodeUpdate = node.transition() -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm