This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit c88a0b07c6a348bb6bd94c314bc3523e7741c6d3 Author: Yannick Martel <martel@©odelutin.com> Date: Mon Dec 8 17:25:01 2014 +0100 add question view page --- .../src/main/xmi/coselmar-model.properties | 3 +- .../coselmar/services/v1/QuestionsWebService.java | 41 ++++++ coselmar-rest/src/main/resources/mapping | 2 +- .../src/main/webapp/js/coselmar-controllers.js | 42 +++++- .../main/webapp/js/coselmar-questions-services.js | 5 + coselmar-ui/src/main/webapp/js/coselmar.js | 4 + .../main/webapp/views/questions/editquestion.html | 4 +- .../src/main/webapp/views/questions/question.html | 30 ++++ .../main/webapp/views/questions/viewquestion.html | 151 +++++++++++++++++++++ 9 files changed, 278 insertions(+), 4 deletions(-) diff --git a/coselmar-persistence/src/main/xmi/coselmar-model.properties b/coselmar-persistence/src/main/xmi/coselmar-model.properties index 1835e8e..6f8eef4 100644 --- a/coselmar-persistence/src/main/xmi/coselmar-model.properties +++ b/coselmar-persistence/src/main/xmi/coselmar-model.properties @@ -27,4 +27,5 @@ package.fr.ifremer.coselmar.persistence.entity.stereotype=entity model.tagvalue.useEnumerationName=true # Text -fr.ifremer.coselmar.persistence.entity.Document.attribute.summary.tagValue.hibernateAttributeType=text \ No newline at end of file +fr.ifremer.coselmar.persistence.entity.Document.attribute.summary.tagValue.hibernateAttributeType=text +fr.ifremer.coselmar.persistence.entity.Question.attribute.summary.tagValue.hibernateAttributeType=text \ No newline at end of file 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 adb7cbb..13939d0 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 @@ -264,6 +264,47 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { commit(); } + public QuestionBean getQuestion(String questionId) throws InvalidCredentialException, UnauthorizedException { + + // Check authentication + String authorization = getContext().getHeader("Authorization"); + UserWebToken userWebToken = checkAuthentication(authorization); + + // Only Supervisor can add question + String userRole = userWebToken.getRole(); + + if (!StringUtils.equalsIgnoreCase(CoselmarUserRole.SUPERVISOR.name(), userRole) + && StringUtils.equalsIgnoreCase(CoselmarUserRole.ADMIN.name(), userRole)) { + String message = String.format("User %s %s ('%s') is not allowed to delete question", + userWebToken.getFirstName(), userWebToken.getLastName(), userWebToken.getUserId()); + if (log.isWarnEnabled()) { + log.warn(message); + } + throw new UnauthorizedException(message); + + } + + String fullUserId = getFullIdFromShort(CoselmarUser.class, userWebToken.getUserId()); + + try { + getCoselmarUserDao().forTopiaIdEquals(fullUserId).findUnique(); + } catch (TopiaNoResultException tnre) { + // Should not happened, cause user are not really deleted + String message = String.format("Logged user ('%s') does not exist.", fullUserId); + if (log.isErrorEnabled()) { + log.error(message); + } + throw new InvalidCredentialException(message); + } + + // Retrieve Question + String fullQuestionId = getFullIdFromShort(Question.class, questionId); + Question question = getQuestionDao().forTopiaIdEquals(fullQuestionId).findUnique(); + + QuestionBean result = BeanEntityConverter.toBean(getPersistenceContext().getTopiaIdFactory(), question); + return result; + } + //////////////////////////////////////////////////////////////////////////// /////////////////////// Internal Parts ///////////////////////////// diff --git a/coselmar-rest/src/main/resources/mapping b/coselmar-rest/src/main/resources/mapping index 173dc88..fe16e65 100644 --- a/coselmar-rest/src/main/resources/mapping +++ b/coselmar-rest/src/main/resources/mapping @@ -46,7 +46,7 @@ DELETE /v1/users/{userId} UsersWebService.deleteUser # Questions Api GET /v1/questions QuestionsWebService.getQuestions -#GET /v1/questions/{questionId} QuestionsWebService.getQuestion +GET /v1/questions/{questionId} QuestionsWebService.getQuestion #POST /v1/questions/{questionId} QuestionsWebService.saveQuestion #POST /v1/questions/{questionId}/documents QuestionsWebService.addDocuments POST /v1/questions QuestionsWebService.addQuestion diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index 0d03c42..13e9f77 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -373,7 +373,7 @@ coselmarControllers.controller("NewQuestionCtrl", ['$scope', '$route', '$locatio }]); -// Controller for All User View +// Controller for All Question View coselmarControllers.controller("QuestionsCtrl", ['$scope', '$route', '$routeParams', '$location', 'questionsService', function($scope, $route, $routeParams, $location, questionsService){ @@ -422,6 +422,46 @@ coselmarControllers.controller("QuestionsCtrl", ['$scope', '$route', '$routePara }]); +// Controller for All User View +coselmarControllers.controller("QuestionViewCtrl", ['$scope', '$route', '$routeParams', '$location', 'questionsService', + function($scope, $route, $routeParams, $location, questionsService){ + + $scope.editMode = $routeParams.edit ? $routeParams.edit : false; + + $scope.edit = function() { + $location.search("edit"); + } + + questionsService.getQuestion($routeParams.questionId, + function(question) { + // success : just get the questions + $scope.question = question; + + }, function(error) { + // Fail function : TODO + console.log("error during request"); + console.log(error); + }); + + + $scope.saveQuestion = function(isValidForm){ + console.log($scope.question); + }; + + $scope.deleteQuestion = function(){ + questionsService.deleteQuestion($routeParams.questionId, function() { + // success : goto questions list + $location('#/questions'); + + }, function(error) { + // Fail function : TODO + console.log(error); + }); + }; + + +}]); + coselmarControllers.controller('ModalSearchDocumentsCtrl', function ($scope, $modalInstance, documentService) { $scope.searchKeywords = []; diff --git a/coselmar-ui/src/main/webapp/js/coselmar-questions-services.js b/coselmar-ui/src/main/webapp/js/coselmar-questions-services.js index 2675751..60c219f 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-questions-services.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-questions-services.js @@ -47,4 +47,9 @@ function Question(resource, config){ var questionResource = resource(baseURL + "/" + questionId); questionResource.delete().$promise.then(successFunction, failFunction); } + + this.getQuestion = function(questionId, successFunction, failFunction) { + var questionResource = resource(baseURL + "/" + questionId); + questionResource.get().$promise.then(successFunction, failFunction); + } }; \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/js/coselmar.js b/coselmar-ui/src/main/webapp/js/coselmar.js index 15fe537..38b2605 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar.js +++ b/coselmar-ui/src/main/webapp/js/coselmar.js @@ -60,6 +60,10 @@ coselmarApp.config(['$routeProvider', function($routeProvider) { controller : 'NewQuestionCtrl', templateUrl : 'views/questions/newquestion.html' + }).when('/questions/:questionId', { + controller : 'QuestionViewCtrl', + templateUrl : 'views/questions/question.html' + }).otherwise({ redirectTo: '/', diff --git a/coselmar-ui/src/main/webapp/views/questions/editquestion.html b/coselmar-ui/src/main/webapp/views/questions/editquestion.html index 745cc33..c43759d 100644 --- a/coselmar-ui/src/main/webapp/views/questions/editquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/editquestion.html @@ -239,7 +239,9 @@ <td>{{document.ownerName}}</td> <td><span ng-repeat="keyword in document.keywords">{{keyword}}, </span></td> <td>{{document.depositDate | date:'mediumDate'}}</td> - <td><a class="btn fa fa-minus" title="Remove document" ng-click="removeDocument(document)"/></td> + <td><a class="btn fa fa-minus" title="Remove document" + ng-click="removeDocument(document)" + ng-if="currentUser.role == 'SUPERVISOR'"/></td> </tr> </table> </div> diff --git a/coselmar-ui/src/main/webapp/views/questions/question.html b/coselmar-ui/src/main/webapp/views/questions/question.html new file mode 100644 index 0000000..33225d5 --- /dev/null +++ b/coselmar-ui/src/main/webapp/views/questions/question.html @@ -0,0 +1,30 @@ +<div style="padding: 0px 0px 0px 30px"> + <div class="page-header" style="margin: 0"> + <h2>{{question.title}} + <a class="btn btn-action btn-edit pull-right" ng-click="edit()" ng-if="editMode != true"> + <span class="fa fa-edit" aria-hidden="true"></span>Edit + </a></h2> + </div> + + <div style="padding-bottom: 50px" ng-include="src='views/questions/viewquestion.html'" ng-if="editMode == false"> + </div> + + <div class="text-center" ng-if="question.closingDate"> + Closed on {{question.closingDate}}. + </div> + + <div class="text-center" ng-if="!question.closingDate && currentUser.role == 'SUPERVISOR'"> + <a class="btn btn-action btn-success" ng-click="closeQuestion()"> + <span class="fa fa-check-square-o" aria-hidden="true"></span>Close + </a> + - + <a class="btn btn-action btn-edit" ng-click="adjournQuestion()"> + <span class="fa fa-edit" aria-hidden="true"></span>Adjourn + </a> + - + <a class="btn btn-action btn-disable" ng-click="deleteQuestion()"> + <span class="fa fa-remove" aria-hidden="true"></span>Delete + </a> + </div> + +</div> \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/views/questions/viewquestion.html b/coselmar-ui/src/main/webapp/views/questions/viewquestion.html new file mode 100644 index 0000000..69e088c --- /dev/null +++ b/coselmar-ui/src/main/webapp/views/questions/viewquestion.html @@ -0,0 +1,151 @@ + +<div class=""> + + <div class="form-group col-md-12"> + <div class="col-md-3"> + <dl> + <dt>Question Type</dt> + <dd>{{question.type}}</dd> + </dl> + </div> + <div class="col-md-3"> + <dl> + <dt>Privacy</dt> + <dd>{{question.privacy | lowercase}}</dd> + </dl> + </div> + <div class="col-md-3"> + <dl> + <dt>Submission Date</dt> + <dd>{{question.submissionDate | date:'mediumDate'}}</dd> + </dl> + </div> + <div class="col-md-3" ng-if="question.deadline"> + <dl> + <dt>Deadline</dt> + <dd>{{question.deadline | date:'mediumDate'}}</dd> + </dl> + </div> + </div> + + <div class="form-group col-md-12"> + <div class="col-md-12" > + <dl> + <dt>Summary</dt> + <dd>{{question.summary}}</dd> + </dl> + </div> + </div> + + <div class="form-group col-md-12"> + <div class="col-md-4"> + <dl> + <dt>Themes</dt> + <dd> + <ul> + <li ng-if="question.themes" ng-repeat="theme in question.themes"> + {{theme}} + </li> + </ul> + </dd> + </dl> + </div> + + <div class="col-md-4"> + <dl> + <dt>Supervisors</dt> + <dd> + <ul> + <li ng-if="question.supervisors" ng-repeat="supervisor in question.supervisors"> + <a href="#/users/{{supervisor.id}}" target="_blank">{{supervisor.firstName}} {{supervisor.name}} ({{supervisor.organization}})</a> + </li> + </ul> + </dd> + </dl> + </div> + + <div class="cold-md-4"> + <dl> + <dt>Status</dt> + <dd>{{question.status}}</dd> + </dl> + </div> + </div> + + <div class="form-group col-md-12"> + <div class="col-md-4"> + <dl> + <dt>Experts</dt> + <dd> + <ul> + <li ng-if="question.participants" ng-repeat="participant in question.participants"> + <a href="#/users/{{participant.id}}" target="_blank">{{participant.firstName}} {{participant.name}} ({{participant.organization}})</a> + </li> + <li ng-if="question.externalExperts" ng-repeat="participant in question.externalExperts"> + {{participant}} + </ul> + </dd> + </dl> + </div> + + <div class="col-md-4"> + <dl> + <dt>Clients</dt> + <dd> + <ul> + <li ng-if="question.clients" ng-repeat="client in question.clients"> + <a href="#/users/{{client.id}}" target="_blank">{{client.firstName}} {{client.name}} ({{client.organization}})</a> + </li> + </ul> + </dd> + </dl> + </div> + + <div class="col-md-4"> + <dl> + <dt>Contributors</dt> + <dd> + <ul> + <li ng-if="question.contributors" ng-repeat="contributor in question.contributors"> + <a href="#/users/{{contributor.id}}" target="_blank">{{contributor.firstName}} {{contributor.name}} ({{contributor.organization}})</a> + </li> + </ul> + </dd> + </dl> + </div> + </div> + + <div class="form-group col-md-12" + ng-if="currentUser.role == 'SUPERVISOR' || currentUser.role == 'EXPERT'"> + + <dl> + <dt>Related Documents</dt> + + <dd> + <table class="table table-bordered table-condensed"> + <tr> + <th>Name</th> + <th>Owner</th> + <th>Keywords</th> + <th>Deposit Date</th> + </tr> + <tr ng-repeat="document in question.relatedDocuments"> + <td><a href="#/documents/{{document.id}}" target="_blank">{{document.name}}</a></td> + <td>{{document.ownerName}}</td> + <td><span ng-repeat="keyword in document.keywords">{{keyword}}, </span></td> + <td>{{document.depositDate | date:'mediumDate'}}</td> + </tr> + </table> + </dd> + </dl> + + </div> + + <!-- TODO ymartel 20141208 : manage parents and children + <div class="form-group col-md-12"> + <div class="col-md-6">TODO Parents</div> + <div class="col-md-6">TODO Children</div> + </div> + --> + +</div> \ No newline at end of file -- 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 develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit a5b20ba0ab8753ea6133750b37f2a26f4aad3091 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Dec 10 10:58:13 2014 +0100 prepare full edit of question --- .../coselmar/services/v1/QuestionsWebService.java | 5 + .../src/main/webapp/js/coselmar-controllers.js | 140 +++++++++++++++++++-- .../main/webapp/js/coselmar-questions-services.js | 4 +- .../main/webapp/views/questions/editquestion.html | 9 +- .../main/webapp/views/questions/newquestion.html | 6 + .../src/main/webapp/views/questions/question.html | 10 +- 6 files changed, 154 insertions(+), 20 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 61e1b2e..e00230c 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 @@ -346,6 +346,11 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { // Retrieve all documents Collection<Document> questionDocuments = question.getRelatedDocuments(); if (documents != null && documents.length > 0) { + // now with expert documents, question is in progress + if (question.getStatus() == Status.OPEN) { + question.setStatus(Status.IN_PROGRESS); + } + List<Document> documentEntities = retrieveDocuments(Lists.newArrayList(documents)); // Manage restriction list for document with Privacy.RESTRICTED for (Document document : documentEntities) { diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index 0150ba5..793cd38 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -430,25 +430,103 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam $scope.isCurrentParticipant = false; $scope.question = { 'newRelatedDocuments': []}; + //to enter in edit mode from view $scope.edit = function() { $location.search("edit"); } + // Participants, clients and supervisors management for ui-select + $scope.participantsIndex = {}; + $scope.clientsIndex = {}; + $scope.supervisorsIndex = {}; + + $scope.users = { 'participants' : [], 'clients': [], 'supervisors' : []}; + + $scope.refreshExperts = function(searchKeyword) { + + questionsService.findUsers({'role': 'EXPERT', 'active': 'true'}, searchKeyword, function(users) { + $scope.users.participants = users; + $scope.participantsIndex = {}; + angular.forEach($scope.users.participants, function(participant) { + $scope.participantsIndex[participant.id] = participant; + }); + bindUsers($scope.question.participants, $scope.participantsIndex); + }); + } + + $scope.refreshClients = function(searchKeyword) { + + questionsService.findUsers({'role': 'CLIENT', 'active': 'true'}, searchKeyword, function(users) { + $scope.users.clients = users; + $scope.clientsIndex = {}; + angular.forEach($scope.users.clients, function(client) { + $scope.clientsIndex[client.id] = client; + }); + bindUsers($scope.question.clients, $scope.clientsIndex); + }); + } + + $scope.refreshSupervisors = function(searchKeyword) { + + questionsService.findUsers({'role': 'SUPERVISOR', 'active': 'true'}, searchKeyword, function(users) { + $scope.users.supervisors = users; + $scope.supervisorsIndex = {}; + angular.forEach($scope.users.supervisors, function(supervisor) { + $scope.supervisorsIndex[supervisor.id] = supervisor; + }); + bindUsers($scope.question.supervisors, $scope.supervisorsIndex); + }); + } + + // call refresh for init + $scope.refreshExperts(""); + $scope.refreshClients(""); + $scope.refreshSupervisors(""); + + // function to be sure to have same user objects in list + var bindUsers = function(toDeal, index) { + if (toDeal) { + for(var i = 0; i < toDeal.length; i++) { + var user = toDeal[i]; + if (index[user.id]) { + toDeal[i] = index[user.id]; + } + } + } + + }; + + questionsService.getQuestion($routeParams.questionId, function(question) { // success : just get the questions $scope.question = question; // update scope about current user : if he is participant, more option enable in ui - for (var i = 0; i < $scope.question.participants.length; i++) { - if ($scope.question.participants[i].id == $scope.currentUser.userId) { - $scope.isCurrentParticipant = true; - // Should be able to put new documents in question - $scope.question.newRelatedDocuments = []; - break; + if ($scope.question.participants) { + for (var i = 0; i < $scope.question.participants.length; i++) { + if ($scope.question.participants[i].id == $scope.currentUser.userId) { + $scope.isCurrentParticipant = true; + // Should be able to put new documents in question + $scope.question.newRelatedDocuments = []; + break; + } } } + if (question.participants) { + $scope.users.participants = question.participants; + bindUsers($scope.question.participants, $scope.participantsIndex); + } + if (question.clients) { + $scope.users.clients = question.clients; + bindUsers($scope.question.clients, $scope.clientsIndex); + } + if (question.supervisors) { + $scope.users.supervisors = question.supervisors; + bindUsers($scope.question.supervisors, $scope.supervisorsIndex); + } + }, function(error) { // Fail function : TODO console.log("error during request"); @@ -468,7 +546,42 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam }; $scope.saveQuestion = function(isValidForm){ - //TODO + if (angular.isDate($scope.question.deadline)) { + $scope.question.deadline = $scope.question.deadline.getTime(); + } + + // Call service to create a new user + if(isValidForm) { +// questionsService.saveQuestion($scope.question, function() { + $location.search(""); +// },function(error) { +// //TODO ymartel 20141118 : deal with error.status or statusText +// console.log("error occurs"); +// console.log(error.s); +// }); + } + }; + + $scope.closeQuestion = function(){ + $scope.question.status = "CLOSED"; + questionsService.saveQuestion($scope.question, function() { + $location.search(""); + },function(error) { + //TODO ymartel 20141118 : deal with error.status or statusText + console.log("error occurs"); + console.log(error.s); + }); + }; + + $scope.adjournQuestion = function(){ + $scope.question.status = "ADJOURNED"; + questionsService.saveQuestion($scope.question, function() { + $location.search(""); + },function(error) { + //TODO ymartel 20141118 : deal with error.status or statusText + console.log("error occurs"); + console.log(error.s); + }); }; // New documents added @@ -487,6 +600,19 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam } }; + $scope.addTheme = function(theme) { + if (theme && $scope.question.themes.indexOf(theme) == -1) { + $scope.question.themes.push(theme); + } + } + + $scope.removeTheme = function(theme) { + var position = $scope.question.themes.indexOf(theme); + if (theme && position != -1) { + $scope.question.themes.splice(position, 1); + } + } + // Modals part for documents $scope.modalSearchDocuments = function (documentList) { diff --git a/coselmar-ui/src/main/webapp/js/coselmar-questions-services.js b/coselmar-ui/src/main/webapp/js/coselmar-questions-services.js index 5aa3448..873c215 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-questions-services.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-questions-services.js @@ -32,8 +32,8 @@ function Question(resource, config){ questionResource.save(null, formData, successFunction, failFunction); }; - this.findUsers = function(example, successFunction) { - var userResource = resource(usersURL, {'like': example}); + this.findUsers = function(example, searchKeyword, successFunction) { + var userResource = resource(usersURL, {'like': example, 'fullSearch': searchKeyword}); userResource.query(successFunction); }; diff --git a/coselmar-ui/src/main/webapp/views/questions/editquestion.html b/coselmar-ui/src/main/webapp/views/questions/editquestion.html index c42e8e2..b8e5f70 100644 --- a/coselmar-ui/src/main/webapp/views/questions/editquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/editquestion.html @@ -131,7 +131,9 @@ </ui-select-match> <ui-select-choices - repeat="expert in users.participants track by expert.id | propsFilter: {name: $select.search, firstName: $select.search, organization: $select.search}"> + repeat="expert in users.participants track by expert.id | propsFilter: {name: $select.search, firstName: $select.search, organization: $select.search}" + refresh="refreshExperts($select.search)" + refresh-delay="1000"> {{expert.firstName}} {{expert.name}} ({{expert.organization}}) </ui-select-choices> </ui-select> @@ -250,10 +252,5 @@ <!-- End Line with Related Document --> - <div class="form-group" ng-if="questionForm.$valid && question.themes.length > 0"> - <div style="padding-left: 200px"> - <input type="submit" value="Validate" class="btn btn-primary" ng-click="saveQuestion(questionForm.$valid)"/> - </div> - </div> </form> </div> \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/views/questions/newquestion.html b/coselmar-ui/src/main/webapp/views/questions/newquestion.html index b05689b..7518ede 100644 --- a/coselmar-ui/src/main/webapp/views/questions/newquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/newquestion.html @@ -5,6 +5,12 @@ <div style="padding-bottom: 50px" ng-include="src='views/questions/editquestion.html'" ng-if="currentUser.role == 'SUPERVISOR'"> + + <div class="form-group" ng-if="questionForm.$valid && question.themes.length > 0"> + <div style="padding-left: 200px"> + <input type="submit" value="Validate" class="btn btn-primary" ng-click="saveQuestion(questionForm.$valid)"/> + </div> + </div> </div> <div style="padding-bottom: 50px" ng-if="currentUser.role != 'SUPERVISOR'"> diff --git a/coselmar-ui/src/main/webapp/views/questions/question.html b/coselmar-ui/src/main/webapp/views/questions/question.html index d5e53b8..28351c4 100644 --- a/coselmar-ui/src/main/webapp/views/questions/question.html +++ b/coselmar-ui/src/main/webapp/views/questions/question.html @@ -2,9 +2,9 @@ <div class="page-header" style="margin: 0"> <h2> {{question.title}} - <!--<a class="btn btn-action btn-edit pull-right" ng-click="edit()" ng-if="editMode != true">--> - <!--<span class="fa fa-edit" aria-hidden="true"></span>Edit--> - <!--</a>--> + <a class="btn btn-action btn-edit pull-right" ng-click="edit()" ng-if="editMode != true"> + <span class="fa fa-edit" aria-hidden="true"></span>Edit + </a> </h2> </div> @@ -15,8 +15,8 @@ <div style="padding-bottom: 50px" ng-if="editMode == true"> <div ng-include="src='views/questions/editquestion.html'"></div> - <div><a class="btn btn-action btn-success" ng-click="saveQuestion()"> - <span class="fa fa-check-square-o" aria-hidden="true"></span>Close + <div class="form-group"><a class="btn btn-action btn-success" ng-click="saveQuestion()"> + <span class="fa fa-check-square-o" aria-hidden="true"></span>Validate changes </a></div> </div> -- 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 develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit dfe0dab0b637e914b2e9ebca53557c57f16dd056 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Dec 10 16:11:20 2014 +0100 fix question edit mode --- .../coselmar/services/v1/QuestionsWebService.java | 24 +++- .../src/main/webapp/js/coselmar-controllers.js | 158 +++++++-------------- coselmar-ui/src/main/webapp/js/coselmar.js | 2 +- .../main/webapp/views/questions/editquestion.html | 8 +- .../src/main/webapp/views/questions/question.html | 8 +- 5 files changed, 84 insertions(+), 116 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 661775c..d2c900b 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 @@ -434,7 +434,18 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { // On creation, Status is Open if (inEdition) { - questionEntity.setStatus(question.getStatus() != null ? Status.valueOf(question.getStatus().toUpperCase()) : Status.OPEN); + String status = question.getStatus(); + questionEntity.setStatus(status != null ? Status.valueOf(status.toUpperCase()) : Status.OPEN); + + // If it is a close or adjourn update, put a closing date, if it is a reopen, remove closing date + if (Lists.newArrayList(Status.CLOSED.name(), Status.ADJOURNED.name()).contains(status) && questionEntity.getClosingDate() == null) { + questionEntity.setClosingDate(new Date()); + + // it could be a reopen ... + } else if (questionEntity.getClosingDate() != null && !Lists.newArrayList(Status.CLOSED.name(), Status.ADJOURNED.name()).contains(status)) { + questionEntity.setClosingDate(null); + } + } else { questionEntity.setStatus(Status.OPEN); } @@ -462,6 +473,7 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { // Retrieve the clients Set<UserBean> clients = question.getClients(); + questionEntity.clearClients(); if (clients != null && !clients.isEmpty()) { Set<CoselmarUser> clientEntities = retrieveUsers(clients); questionEntity.addAllClients(clientEntities); @@ -488,6 +500,8 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { participantGroup.clearMembers(); participantGroup.addAllMembers(expertEntities); + } else { + participantGroup.clearMembers(); } } else { @@ -504,6 +518,7 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { // Retrieve the supervisor Set<UserBean> supervisors = question.getSupervisors(); + questionEntity.clearSupervisors(); if (supervisors != null && !supervisors.isEmpty()) { Set<CoselmarUser> supervisorEntities = retrieveUsers(supervisors); questionEntity.addAllSupervisors(supervisorEntities); @@ -517,7 +532,11 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { Set<QuestionBean> parents = question.getParents(); if (parents != null && !parents.isEmpty()) { Set<Question> questions = retrieveQuestions(parents); + questionEntity.addAllParents(questions); + + } else if(inEdition) { + questionEntity.clearParents(); } @@ -532,7 +551,10 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { } } + questionEntity.clearRelatedDocuments(); questionEntity.addAllRelatedDocuments(documents); + } else if (inEdition) { + questionEntity.clearRelatedDocuments(); } commit(); diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index 993e497..d063fac 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -270,109 +270,6 @@ coselmarControllers.controller("UserViewCtrl", //////////// Questions Part /////////////////// ///////////////////////////////////////////////// -// Controller for new question View -coselmarControllers.controller("NewQuestionCtrl", ['$scope', '$route', '$location', '$modal', - 'questionsService', 'userService', 'documentService', - function($scope, $route, $location, $modal, - questionsService, userService, documentService){ - - $scope.question = {'privacy' : 'PUBLIC', - 'themes' : [], 'participants' : [], 'externalExperts' : [], - 'clients' : [], 'relatedDocuments': [] }; - - $scope.users = { 'participants' : [], 'clients': [], 'supervisors' : []}; - questionsService.findUsers({'role': 'EXPERT', 'active': 'true'}, '', function(users) { - $scope.users.participants = users; - }); - questionsService.findUsers({'role': 'CLIENT', 'active': 'true'}, '', function(users) { - $scope.users.clients = users; - }); - questionsService.findUsers({'role': 'SUPERVISOR', 'active': 'true'}, '', function(users) { - $scope.users.supervisors = users; - }); - - $scope.saveQuestion = function(isValidForm){ - - if (angular.isDate($scope.question.deadline)) { - $scope.question.deadline = $scope.question.deadline.getTime(); - } - - // Call service to create a new user - if(isValidForm) { - questionsService.saveQuestion($scope.question, function() { - $location.path("/questions"); - },function(error) { - //TODO ymartel 20141118 : deal with error.status or statusText - console.log("error occurs"); - console.log(error.s); - }); - } - } - - $scope.addTheme = function(theme) { - if (theme && $scope.question.themes.indexOf(theme) == -1) { - $scope.question.themes.push(theme); - } - } - - $scope.removeTheme = function(theme) { - var position = $scope.question.themes.indexOf(theme); - if (theme && position != -1) { - $scope.question.themes.splice(position, 1); - } - } - - $scope.searchDocuments = function () { - - var modalInstance = $modal.open({ - templateUrl: 'views/documents/modalDocumentSearch.html', - controller: 'ModalSearchDocumentsCtrl', - size: 'lg' - }); - - modalInstance.result.then(function (selectedDocument) { - var already = false; - for (var i = 0; i < $scope.question.relatedDocuments.length; i++) { - if ($scope.question.relatedDocuments[i].id == selectedDocument.id) { - already = true - } - } - if (!already) { - $scope.question.relatedDocuments.push(selectedDocument); - } - }); - }; - - $scope.createDocument = function () { - - var modalInstance = $modal.open({ - templateUrl: 'views/documents/modalDocumentEdit.html', - controller: 'ModalCreateDocumentsCtrl', - size: 'lg' - }); - - modalInstance.result.then(function (selectedDocument) { - var already = false; - for (var i = 0; i < $scope.question.relatedDocuments.length; i++) { - if ($scope.question.relatedDocuments[i].id == selectedDocument.id) { - already = true - } - } - if (!already) { - $scope.question.relatedDocuments.push(selectedDocument); - } - }); - }; - - $scope.removeDocument = function(document) { - var position = $scope.question.relatedDocuments.indexOf(document); - if (document && position != -1) { - $scope.question.relatedDocuments.splice(position, 1); - } - } - -}]); - // Controller for All Question View coselmarControllers.controller("QuestionsCtrl", ['$scope', '$route', '$routeParams', '$location', 'questionsService', function($scope, $route, $routeParams, $location, questionsService){ @@ -428,7 +325,10 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam $scope.editMode = $routeParams.edit ? $routeParams.edit : false; $scope.isCurrentParticipant = false; - $scope.question = { 'newRelatedDocuments': []}; + + $scope.question = {'privacy' : 'PUBLIC', + 'themes' : [], 'participants' : [], 'externalExperts' : [], + 'clients' : [], 'relatedDocuments': [], 'newRelatedDocuments' : [] }; //to enter in edit mode from view $scope.edit = function() { @@ -496,9 +396,9 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam }; - - questionsService.getQuestion($routeParams.questionId, - function(question) { + if ($routeParams.questionId) { + questionsService.getQuestion($routeParams.questionId, + function(question) { // success : just get the questions $scope.question = question; @@ -514,6 +414,10 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam } } + if(!question.relatedDocuments) { + $scope.question.relatedDocuments = []; + } + if (question.participants) { $scope.users.participants = question.participants; bindUsers($scope.question.participants, $scope.participantsIndex); @@ -531,7 +435,8 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam // Fail function : TODO console.log("error during request"); console.log(error); - }); + }); + }; //Deletion $scope.deleteQuestion = function(){ @@ -560,10 +465,43 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam }); }; + $scope.saveQuestion = function(isValidForm){ + + if (angular.isDate($scope.question.deadline)) { + $scope.question.deadline = $scope.question.deadline.getTime(); + } + + // Call service to create a new user + if(isValidForm) { + questionsService.saveQuestion($scope.question, function() { + if ($routeParams.questionId) { + $location.search(""); + } else { + $location.path("/questions"); + } + },function(error) { + //TODO ymartel 20141118 : deal with error.status or statusText + console.log("error occurs"); + console.log(error.s); + }); + } + } + $scope.closeQuestion = function(){ $scope.question.status = "CLOSED"; questionsService.saveQuestion($scope.question, function() { - $location.search(""); + $route.reload(); + },function(error) { + //TODO ymartel 20141118 : deal with error.status or statusText + console.log("error occurs"); + console.log(error.s); + }); + }; + + $scope.reopenQuestion = function(){ + $scope.question.status = "IN_PROGRESS"; + questionsService.saveQuestion($scope.question, function() { + $route.reload(); },function(error) { //TODO ymartel 20141118 : deal with error.status or statusText console.log("error occurs"); @@ -574,7 +512,7 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam $scope.adjournQuestion = function(){ $scope.question.status = "ADJOURNED"; questionsService.saveQuestion($scope.question, function() { - $location.search(""); + $route.reload(); },function(error) { //TODO ymartel 20141118 : deal with error.status or statusText console.log("error occurs"); diff --git a/coselmar-ui/src/main/webapp/js/coselmar.js b/coselmar-ui/src/main/webapp/js/coselmar.js index cf7cd2f..208594c 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar.js +++ b/coselmar-ui/src/main/webapp/js/coselmar.js @@ -57,7 +57,7 @@ coselmarApp.config(['$routeProvider', function($routeProvider) { templateUrl : 'views/questions/questions.html' }).when('/questions/new', { - controller : 'NewQuestionCtrl', + controller : 'QuestionCtrl', templateUrl : 'views/questions/newquestion.html' }).when('/questions/:questionId', { diff --git a/coselmar-ui/src/main/webapp/views/questions/editquestion.html b/coselmar-ui/src/main/webapp/views/questions/editquestion.html index f58aedb..4a95d72 100644 --- a/coselmar-ui/src/main/webapp/views/questions/editquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/editquestion.html @@ -228,8 +228,10 @@ <th>Keywords</th> <th>Deposit Date</th> <th> - <a class="btn fa fa-search" title="Search document" ng-click="searchDocuments()" /> - <a class="btn fa fa-plus" title="Add new Document" ng-click="createDocument()"/> + <a class="btn fa fa-search" title="Search document" + ng-click="modalSearchDocuments(question.relatedDocuments)" /> + <a class="btn fa fa-plus" title="Add new Document" + ng-click="modalCreateDocument(question.relatedDocuments)"/> </th> </tr> <tr ng-repeat="document in question.relatedDocuments"> @@ -238,7 +240,7 @@ <td><span ng-repeat="keyword in document.keywords">{{keyword}}, </span></td> <td>{{document.depositDate | date:'mediumDate'}}</td> <td><a class="btn fa fa-minus" title="Remove document" - ng-click="removeDocument(document)" + ng-click="removeDocument(document, question.relatedDocuments)" ng-if="currentUser.role == 'SUPERVISOR'"/></td> </tr> </table> diff --git a/coselmar-ui/src/main/webapp/views/questions/question.html b/coselmar-ui/src/main/webapp/views/questions/question.html index b0d5ab5..dcf238c 100644 --- a/coselmar-ui/src/main/webapp/views/questions/question.html +++ b/coselmar-ui/src/main/webapp/views/questions/question.html @@ -16,7 +16,7 @@ <div style="padding-bottom: 50px" ng-if="editMode == true"> <form name="questionForm" class="form-horizontal" role="form"> <div ng-include="src='views/questions/editquestion.html'"></div> - <div class="form-group" style="padding-left: 200px"><a class="btn btn-action btn-success" ng-click="saveQuestion()"> + <div class="form-group" style="padding-left: 200px"><a class="btn btn-action btn-success" ng-click="saveQuestion(true)"> <span class="fa fa-check-square-o" aria-hidden="true"></span>Validate changes </a></div> </form> @@ -26,6 +26,12 @@ Closed on {{question.closingDate | date:'medium' }}. </div> + <div class="text-center" ng-if="question.closingDate && currentUser.role == 'SUPERVISOR' && editMode == false"> + <a class="btn btn-action btn-success" ng-click="reopenQuestion()"> + <span class="fa fa-check-square-o" aria-hidden="true"></span>Reopen + </a> + </div> + <div class="text-center" ng-if="!question.closingDate && currentUser.role == 'SUPERVISOR' && editMode == false"> <a class="btn btn-action btn-success" ng-click="closeQuestion()"> <span class="fa fa-check-square-o" aria-hidden="true"></span>Close -- 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 develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 88130f2c7e9b86bbdc7ac7659730e96972829a6b Author: Yannick Martel <martel@©odelutin.com> Date: Wed Dec 10 18:38:58 2014 +0100 manage some restriction on question content --- .../fr/ifremer/coselmar/beans/QuestionBean.java | 10 ++ .../coselmar/converter/BeanEntityConverter.java | 41 ++++++++ .../coselmar/services/v1/QuestionsWebService.java | 103 ++++++++++++++++++--- 3 files changed, 143 insertions(+), 11 deletions(-) diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionBean.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionBean.java index 3cab9f2..ff9e9d2 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionBean.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionBean.java @@ -42,6 +42,9 @@ public class QuestionBean implements Serializable { protected Set<String> externalExperts; + protected Boolean isRestricted; + + public String getId() { return id; } @@ -235,4 +238,11 @@ public class QuestionBean implements Serializable { this.externalExperts = externalExperts; } + public Boolean getIsRestricted() { + return isRestricted; + } + + public void setRestricted(boolean isRestricted) { + this.isRestricted = isRestricted; + } } //Question diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/BeanEntityConverter.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/BeanEntityConverter.java index 5f20852..1875092 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/BeanEntityConverter.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/BeanEntityConverter.java @@ -191,4 +191,45 @@ public class BeanEntityConverter { return result; } + public static QuestionBean toLightBean(TopiaIdFactory idFactory, Question question) { + QuestionBean result = new QuestionBean(); + result.setId(idFactory.getRandomPart(question.getTopiaId())); + + result.setTitle(question.getTitle()); + result.setSummary(question.getSummary()); + result.setType(question.getType()); + result.setPrivacy(question.getPrivacy().name()); + result.setStatus(question.getStatus().name()); + + Collection<String> theme = question.getTheme(); + if (theme != null && !theme.isEmpty()) { + result.setThemes(new HashSet(theme)); + } + + Date submissionDate = question.getSubmissionDate(); + if (submissionDate != null){ + result.setSubmissionDate(new Date(submissionDate.getTime())); + } + + Date deadline = question.getDeadline(); + if (deadline != null){ + result.setDeadline(new Date(deadline.getTime())); + } + + Date closingDate = question.getClosingDate(); + if (closingDate != null){ + result.setClosingDate(new Date(closingDate.getTime())); + } + + Collection<Question> parents = question.getParents(); + if (parents != null && !parents.isEmpty()) { + for (Question parent : parents) { + QuestionBean questionBean = toBean(idFactory, parent); + result.addParent(questionBean); + } + } + + return result; + } + } 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 d2c900b..f10b8a3 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 @@ -38,6 +38,8 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { private static final Log log = LogFactory.getLog(QuestionsWebService.class); + protected static final List<String> RESTRICTED_ACCESS_USERS = Lists.newArrayList(CoselmarUserRole.CLIENT.name(), CoselmarUserRole.MEMBER.name()); + public void addQuestion(QuestionBean question) throws InvalidCredentialException, UnauthorizedException { // Check authentication @@ -194,6 +196,10 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { } else if (StringUtils.equalsIgnoreCase(CoselmarUserRole.MEMBER.name(), currentUserRole)) { questionList = getQuestionDao().forPrivacyEquals(Privacy.PUBLIC).findAll(); + } else if (StringUtils.equalsIgnoreCase(CoselmarUserRole.EXPERT.name(), currentUserRole)) { + questionList = getQuestionDao().findAll(); + //TODO ymartel : manage privacy for experts + } else if (StringUtils.equalsIgnoreCase(CoselmarUserRole.CLIENT.name(), currentUserRole)) { questionList = getQuestionDao().forClientsContains(currentUser).findAll(); } else { @@ -208,7 +214,15 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { for (Question question : questionList) { TopiaIdFactory topiaIdFactory = getPersistenceContext().getTopiaIdFactory(); - QuestionBean questionBean = BeanEntityConverter.toBean(topiaIdFactory, question); + + QuestionBean questionBean; + if (RESTRICTED_ACCESS_USERS.contains(currentUserRole)) { + questionBean = BeanEntityConverter.toLightBean(topiaIdFactory, question); + + } else { + questionBean = BeanEntityConverter.toBean(topiaIdFactory, question); + } + result.add(questionBean); } @@ -221,7 +235,7 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { String authorization = getContext().getHeader("Authorization"); UserWebToken userWebToken = checkAuthentication(authorization); - // Only Supervisor can add question + // Only Supervisor can delete question String userRole = userWebToken.getRole(); if (!StringUtils.equalsIgnoreCase(CoselmarUserRole.SUPERVISOR.name(), userRole) @@ -271,12 +285,14 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { String authorization = getContext().getHeader("Authorization"); UserWebToken userWebToken = checkAuthentication(authorization); - // Only Supervisor can add question + // Supervisor can get all the question elements + // Expert can get all the question elements if public or if he is participant of the question + // Client can get the question (not the documents) if he is client of the question. String userRole = userWebToken.getRole(); if (!StringUtils.equalsIgnoreCase(CoselmarUserRole.SUPERVISOR.name(), userRole) && StringUtils.equalsIgnoreCase(CoselmarUserRole.ADMIN.name(), userRole)) { - String message = String.format("User %s %s ('%s') is not allowed to delete question", + String message = String.format("User %s %s ('%s') is not allowed to view question", userWebToken.getFirstName(), userWebToken.getLastName(), userWebToken.getUserId()); if (log.isWarnEnabled()) { log.warn(message); @@ -287,8 +303,9 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { String fullUserId = getFullIdFromShort(CoselmarUser.class, userWebToken.getUserId()); + CoselmarUser currentUser; try { - getCoselmarUserDao().forTopiaIdEquals(fullUserId).findUnique(); + currentUser = getCoselmarUserDao().forTopiaIdEquals(fullUserId).findUnique(); } catch (TopiaNoResultException tnre) { // Should not happened, cause user are not really deleted String message = String.format("Logged user ('%s') does not exist.", fullUserId); @@ -302,7 +319,30 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { String fullQuestionId = getFullIdFromShort(Question.class, questionId); Question question = getQuestionDao().forTopiaIdEquals(fullQuestionId).findUnique(); - QuestionBean result = BeanEntityConverter.toBean(getPersistenceContext().getTopiaIdFactory(), question); + // Check client authorization on the document + checkIsClient(question, currentUser); + + QuestionBean result = BeanEntityConverter.toBean(getPersistenceContext().getTopiaIdFactory(), question);; + + // Client is not allowed to see documents + if (CoselmarUserRole.CLIENT == currentUser.getRole()) { + result.setRelatedDocuments(null); + + // If document is private, only participants could check it + } else if (CoselmarUserRole.EXPERT == currentUser.getRole() && question.getPrivacy() == Privacy.PRIVATE) { + CoselmarUserGroup participants = question.getParticipants(); + if (participants == null || !participants.getMembers().contains(currentUser)) { + result = new QuestionBean(); + result.setTitle(question.getTitle()); + result.setPrivacy(question.getPrivacy().name()); + result.setRestricted(true); + for (Question parent : question.getParents()) { + result.addParent(BeanEntityConverter.toLightBean(getPersistenceContext().getTopiaIdFactory(), parent)); + } + //TODO ymartel : manager children + } + } + return result; } @@ -312,12 +352,14 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { String authorization = getContext().getHeader("Authorization"); UserWebToken userWebToken = checkAuthentication(authorization); - // Only Supervisor can add question + // Only Supervisor can add documents String userRole = userWebToken.getRole(); if (!StringUtils.equalsIgnoreCase(CoselmarUserRole.SUPERVISOR.name(), userRole) - && StringUtils.equalsIgnoreCase(CoselmarUserRole.ADMIN.name(), userRole)) { - String message = String.format("User %s %s ('%s') is not allowed to delete question", + && !StringUtils.equalsIgnoreCase(CoselmarUserRole.ADMIN.name(), userRole) + && !StringUtils.equalsIgnoreCase(CoselmarUserRole.EXPERT.name(), userRole)) { + + String message = String.format("User %s %s ('%s') is not allowed to add document", userWebToken.getFirstName(), userWebToken.getLastName(), userWebToken.getUserId()); if (log.isWarnEnabled()) { log.warn(message); @@ -328,8 +370,9 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { String fullUserId = getFullIdFromShort(CoselmarUser.class, userWebToken.getUserId()); + CoselmarUser currentUser; try { - getCoselmarUserDao().forTopiaIdEquals(fullUserId).findUnique(); + currentUser = getCoselmarUserDao().forTopiaIdEquals(fullUserId).findUnique(); } catch (TopiaNoResultException tnre) { // Should not happened, cause user are not really deleted String message = String.format("Logged user ('%s') does not exist.", fullUserId); @@ -343,6 +386,10 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { String fullQuestionId = getFullIdFromShort(Question.class, questionId); Question question = getQuestionDao().forTopiaIdEquals(fullQuestionId).findUnique(); + // Check expert authorization on the document + checkIsParticipant(question, currentUser); + + // Retrieve all documents Collection<Document> questionDocuments = question.getRelatedDocuments(); if (documents != null && documents.length > 0) { @@ -372,7 +419,7 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { String authorization = getContext().getHeader("Authorization"); UserWebToken userWebToken = checkAuthentication(authorization); - // Only Supervisor can add question + // Only Supervisor can save question String userRole = userWebToken.getRole(); if (!StringUtils.equalsIgnoreCase(CoselmarUserRole.SUPERVISOR.name(), userRole)) { @@ -566,6 +613,40 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { //////////////////////////////////////////////////////////////////////////// + protected void checkIsParticipant(Question question, CoselmarUser currentUser) throws UnauthorizedException { + String userRole = currentUser.getRole().name(); + Set<CoselmarUser> questionsParticipants = question.getParticipants().getMembers(); + + if (StringUtils.equalsIgnoreCase(CoselmarUserRole.EXPERT.name(), userRole) + && !questionsParticipants.contains(currentUser)) { + + String message = String.format("Expert %s %s ('%s') is not allowed to add document", + currentUser.getFirstname(), currentUser.getName(), currentUser.getTopiaId()); + if (log.isWarnEnabled()) { + log.warn(message); + } + throw new UnauthorizedException(message); + + } + } + + protected void checkIsClient(Question question, CoselmarUser currentUser) throws UnauthorizedException { + String userRole = currentUser.getRole().name(); + Set<CoselmarUser> questionsClients = question.getClients(); + + if (StringUtils.equalsIgnoreCase(CoselmarUserRole.CLIENT.name(), userRole) + && !questionsClients.contains(currentUser)) { + + String message = String.format("Client %s %s ('%s') is not allowed to access question %s", + currentUser.getFirstname(), currentUser.getName(), currentUser.getTopiaId(), question.getTopiaId()); + if (log.isWarnEnabled()) { + log.warn(message); + } + throw new UnauthorizedException(message); + + } + } + protected Set<CoselmarUser> retrieveUsers(Collection<UserBean> userBeans) { Function<UserBean, String> getIds = new Function<UserBean, String>() { @Override -- 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 develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 66df66b1695b14075986e840fa33b5356c274cb5 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Dec 10 19:12:14 2014 +0100 filter questions list with privacy for an expert user --- .../persistence/entity/QuestionTopiaDao.java | 35 ++++++++++++++++++++++ .../coselmar/services/v1/QuestionsWebService.java | 2 +- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/QuestionTopiaDao.java b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/QuestionTopiaDao.java new file mode 100644 index 0000000..0d01ed1 --- /dev/null +++ b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/QuestionTopiaDao.java @@ -0,0 +1,35 @@ +package fr.ifremer.coselmar.persistence.entity; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import fr.ifremer.coselmar.persistence.DaoUtils; + +public class QuestionTopiaDao extends AbstractQuestionTopiaDao<Question> { + + public List<Question> findForExpert(CoselmarUser expert) { + + StringBuilder hqlBuilder = new StringBuilder("SELECT Q FROM " + Question.class.getName() + " Q " + + " INNER JOIN Q.participants CUG "); + + Map<String, Object> args = new HashMap<>(); + + String publicCondition = DaoUtils.getQueryForAttributeEquals("Q", Question.PROPERTY_PRIVACY, args, Privacy.PUBLIC, ""); + + hqlBuilder.append(" WHERE (" + publicCondition + " ) "); + + String privateCondition = DaoUtils.getQueryForAttributeEquals("Q", Question.PROPERTY_PRIVACY, args, Privacy.PRIVATE, ""); + + hqlBuilder.append(" OR (" + privateCondition); + + String userCondition = DaoUtils.andAttributeContains("CUG", CoselmarUserGroup.PROPERTY_MEMBERS, args, expert); + + hqlBuilder.append(userCondition + ")"); + + List<Question> questions = forHql(hqlBuilder.toString(), args).findAll(); + + return questions; + } + +} //QuestionTopiaDao 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 f10b8a3..92706ff 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 @@ -197,7 +197,7 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { questionList = getQuestionDao().forPrivacyEquals(Privacy.PUBLIC).findAll(); } else if (StringUtils.equalsIgnoreCase(CoselmarUserRole.EXPERT.name(), currentUserRole)) { - questionList = getQuestionDao().findAll(); + questionList = getQuestionDao().findForExpert(currentUser); //TODO ymartel : manage privacy for experts } else if (StringUtils.equalsIgnoreCase(CoselmarUserRole.CLIENT.name(), currentUserRole)) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.