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 7b34e061f40b46c19882e817f918d50af9ce624b Author: Yannick Martel <martel@©odelutin.com> Date: Thu Jan 29 10:39:32 2015 +0100 add related questions in document view --- coselmar-ui/src/main/webapp/i18n/en.js | 5 +++++ coselmar-ui/src/main/webapp/i18n/fr.js | 5 +++++ .../main/webapp/views/documents/viewDocument.html | 24 +++++++++++++++++++--- .../src/main/webapp/views/questions/questions.html | 2 +- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/coselmar-ui/src/main/webapp/i18n/en.js b/coselmar-ui/src/main/webapp/i18n/en.js index 91e9bdb..858dc94 100644 --- a/coselmar-ui/src/main/webapp/i18n/en.js +++ b/coselmar-ui/src/main/webapp/i18n/en.js @@ -260,4 +260,9 @@ var translateEN = { "common.message.mandatoryFieldsInfo" : "Field with <strong><big>*</big></strong> are mandatory.", "common.message.internalError" : "Error during process. If this problem persist, please contact application admin", +"OPEN" : "Opened", +"IN_PROGRESS" : "In progress", +"CLOSED" : "Closed", +"ADJOURNED" : "Adjourned", + } \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/i18n/fr.js b/coselmar-ui/src/main/webapp/i18n/fr.js index fbc9b04..a9663a5 100644 --- a/coselmar-ui/src/main/webapp/i18n/fr.js +++ b/coselmar-ui/src/main/webapp/i18n/fr.js @@ -260,4 +260,9 @@ var translateFR = { "common.message.mandatoryFieldsInfo" : "Les champs avec un <strong><big>*</big></strong> sont obligatoires.", "common.message.internalError" : "Erreur durant le traitement. Si le problème persiste, veuillez contacter l'administrateur de l'application.", +"OPEN" : "Ouverte", +"IN_PROGRESS" : "En cours", +"CLOSED" : "Fermée", +"ADJOURNED" : "Ajournée", + } \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/views/documents/viewDocument.html b/coselmar-ui/src/main/webapp/views/documents/viewDocument.html index 2cced64..d72eb48 100644 --- a/coselmar-ui/src/main/webapp/views/documents/viewDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/viewDocument.html @@ -53,8 +53,8 @@ </dl> <dl> <dt>{{ 'document.metadata.mimetype' | translate }}</dt> - <dd ng-if="document.withFile">{{document.mimeType}}</sd> - <dd ng-if="!document.withFile">{{ 'document.metadata.externalLink' | translate }}</sd> + <dd ng-if="document.withFile">{{document.mimeType}}</dd> + <dd ng-if="!document.withFile">{{ 'document.metadata.externalLink' | translate }}</dd> </dl> <dl ng-if="document.withFile && document.fileName"> <dt>{{ 'document.metadata.fileName' | translate }}</dt> @@ -70,7 +70,25 @@ </dl> <dl> <dt>{{ 'document.metadata.relatedQuestions' | translate }}</dt> - <dd>/* FIXME : add related questions */</dd> + <dd>/* FIXME : add related questions */ + <table class="table table-bordered table-condensed"> + <thead> + <tr> + <th>{{ 'question.metadata.title' | translate }}</th> + <th>{{ 'question.metadata.themes' | translate }}</th> + </tr> + </thead> + <tbody> + <tr ng-repeat="question in document.relatedQuestions"> + <td> + <span class="status-{{question.status|lowercase}}" title="{{question.status| translate}}"></span> + <a href="#/questions/{{question.id}}" class="paddingLeft10" target="_blank">{{question.title}}</a> + </td> + <td><span ng-repeat="theme in question.themes">{{theme}}, </span></td> + </tr> + </tbody> + </table> + </dd> </dl> </div> diff --git a/coselmar-ui/src/main/webapp/views/questions/questions.html b/coselmar-ui/src/main/webapp/views/questions/questions.html index b279f52..fccdd68 100644 --- a/coselmar-ui/src/main/webapp/views/questions/questions.html +++ b/coselmar-ui/src/main/webapp/views/questions/questions.html @@ -62,7 +62,7 @@ <tbody> <tr ng-repeat="question in questions" > <td ng-if="currentUser.role != 'MEMBER'"> - <span class="status-{{question.status|lowercase}}" title="{{question.status}}"></span> + <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> </td> <td ng-if="currentUser.role == 'MEMBER'">{{question.title}}</td> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.