branch develop updated (a6fe9d1 -> 18e9db9)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from a6fe9d1 fixes #6502 : Change menu order new efe50d4 create some predefined document types new d844843 manage new predefined document type new a34520d fixes #6431 Merge branch 'feature/6431-document-type-as-defined-list' into develop new 18e9db9 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop The 4 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 18e9db9dee9b09f36e6e2bb2e5b77e809330ced7 Merge: a34520d a6fe9d1 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Jan 27 14:52:24 2015 +0100 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop commit a34520d3956c9a7b7469953ef719e8a32a6ea83e Merge: 93c275a d844843 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Jan 27 14:51:41 2015 +0100 fixes #6431 Merge branch 'feature/6431-document-type-as-defined-list' into develop commit d8448436787384f0c3cd4626ce52bbb889e5f284 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Jan 27 14:51:32 2015 +0100 manage new predefined document type commit efe50d4f2ac976cdb9e9e9f667fb96cab5a89eec Author: Yannick Martel <martel@©odelutin.com> Date: Mon Jan 26 17:53:02 2015 +0100 create some predefined document types Summary of changes: coselmar-ui/src/main/webapp/i18n/en.js | 14 ++++++++++++++ coselmar-ui/src/main/webapp/i18n/fr.js | 14 ++++++++++++++ coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 4 ++-- .../src/main/webapp/views/documents/editDocument.html | 16 ++++++++++++++-- .../main/webapp/views/documents/modalDocumentEdit.html | 16 ++++++++++++++-- .../src/main/webapp/views/documents/newdocument.html | 16 ++++++++++++++-- .../src/main/webapp/views/documents/viewDocument.html | 16 ++++++++++++++-- 7 files changed, 86 insertions(+), 10 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 develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit efe50d4f2ac976cdb9e9e9f667fb96cab5a89eec Author: Yannick Martel <martel@©odelutin.com> Date: Mon Jan 26 17:53:02 2015 +0100 create some predefined document types --- coselmar-ui/src/main/webapp/i18n/en.js | 13 +++++++++++++ coselmar-ui/src/main/webapp/i18n/fr.js | 13 +++++++++++++ .../src/main/webapp/views/documents/editDocument.html | 11 ++++++++--- .../src/main/webapp/views/documents/newdocument.html | 16 ++++++++++++++-- 4 files changed, 48 insertions(+), 5 deletions(-) diff --git a/coselmar-ui/src/main/webapp/i18n/en.js b/coselmar-ui/src/main/webapp/i18n/en.js index 5cda814..ba11b59 100644 --- a/coselmar-ui/src/main/webapp/i18n/en.js +++ b/coselmar-ui/src/main/webapp/i18n/en.js @@ -73,6 +73,19 @@ var translateEN = { "document.metadata.relatedQuestions" : "Related Questions", "document.metadata.view.relatedQuestions" : "Questions with this document", "document.metadata.type" : "Type", +"document.metadata.type.publication" : "Publication", +"document.metadata.type.meetingPublication" : "Publication in meeting or symposium", +"document.metadata.type.periodicalPublication" : "Publication in periodical", +"document.metadata.type.thesis" : "Thesis", +"document.metadata.type.report" : "Report", +"document.metadata.type.scientificReport" : "Scientific report", +"document.metadata.type.scientificWork" : "Scientific work", +"document.metadata.type.chapterWork" : "Work chapter", +"document.metadata.type.contractReport" : "Contract report", +"document.metadata.type.expertise" : "Expertise/Opinion", +"document.metadata.type.poster" : "Poster", +"document.metadata.type.conferenceArticle" : "Conference article", +"document.metadata.type.conferenceSummary" : "Conference summary", "document.metadata.file" : "File", "document.metadata.externalUrl" : "External URL", "document.metadata.copyright" : "Copyright", diff --git a/coselmar-ui/src/main/webapp/i18n/fr.js b/coselmar-ui/src/main/webapp/i18n/fr.js index 9400af0..62b4204 100644 --- a/coselmar-ui/src/main/webapp/i18n/fr.js +++ b/coselmar-ui/src/main/webapp/i18n/fr.js @@ -73,6 +73,19 @@ var translateFR = { "document.metadata.relatedQuestions" : "Questions relatives", "document.metadata.view.relatedQuestions" : "Questions utilisant ce document", "document.metadata.type" : "Type", +"document.metadata.type.publication" : "Publication", +"document.metadata.type.meetingPublication" : "Publication dans des colloques ou séminaires", +"document.metadata.type.periodicalPublication" : "Publication dans une revue", +"document.metadata.type.thesis" : "Thèse", +"document.metadata.type.report" : "Rapport", +"document.metadata.type.scientificReport" : "Rapport scientifique", +"document.metadata.type.scientificWork" : "Ouvrage scientifique", +"document.metadata.type.chapterWork" : "Chapitre d'ouvrage", +"document.metadata.type.contractReport" : "Rapport de contrat", +"document.metadata.type.expertise" : "Expertise/Avis", +"document.metadata.type.poster" : "Poster", +"document.metadata.type.conferenceArticle" : "Acte de colloque", +"document.metadata.type.conferenceSummary" : "Communication sans actes", "document.metadata.file" : "Fichier", "document.metadata.externalUrl" : "URL externe", "document.metadata.copyright" : "Copyright", diff --git a/coselmar-ui/src/main/webapp/views/documents/editDocument.html b/coselmar-ui/src/main/webapp/views/documents/editDocument.html index 99c62e1..daed34c 100644 --- a/coselmar-ui/src/main/webapp/views/documents/editDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/editDocument.html @@ -50,9 +50,14 @@ ng-class="{'has-error' : documentForm.type.$invalid && !documentForm.type.$pristine}"> <label class="col-md-1 control-label">{{ 'document.metadata.type' | translate }} *</label> - <div class="col-md-2"> - <input type="text" class="form-control" name="type" - data-ng-model="document.type" list="existingTypes" required/> + <select class="form-control" name="type" ng-model="document.type" required> + <option value="Publication">{{ 'document.metadata.type.publication' | translate }}</option> + <option value="Report">{{ 'document.metadata.type.report' | translate }}</option> + <option value="Scientific report">{{ 'document.metadata.type.scientificReport' | translate }}</option> + <option value="Contract report">{{ 'document.metadata.type.contractReport' | translate }}</option> + <option value="Poster">{{ 'document.metadata.type.poster' | translate }}</option> + <option value="Conference Article">{{ 'document.metadata.type.conferenceArticle' | translate }}</option> + </select> <p ng-show="documentForm.type.$invalid && !documentForm.type.$pristine" class="help-block">{{ 'document.message.requiredType' | translate }}</p> diff --git a/coselmar-ui/src/main/webapp/views/documents/newdocument.html b/coselmar-ui/src/main/webapp/views/documents/newdocument.html index 05cc70b..1334a3b 100644 --- a/coselmar-ui/src/main/webapp/views/documents/newdocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/newdocument.html @@ -59,8 +59,20 @@ <label class="col-md-1 control-label">{{ 'document.metadata.type' | translate }} *</label> <div class="col-md-2"> - <input type="text" class="form-control" name="type" - data-ng-model="document.type" list="existingTypes" required/> + <select class="form-control" name="type" ng-model="document.type" required> + <option value="MEETING_PUBLICATION">{{ 'document.metadata.type.meetingPublication' | translate }}</option> + <option value="PERIODICAL_PUBLICATION">{{ 'document.metadata.type.periodicalPublication' | translate }}</option> + <option value="THESIS">{{ 'document.metadata.type.thesis' | translate }}</option> + <option value="REPORT">{{ 'document.metadata.type.report' | translate }}</option> + <option value="SCIENTIFIC_REPORT">{{ 'document.metadata.type.scientificReport' | translate }}</option> + <option value="SCIENTIFIC_WORK">{{ 'document.metadata.type.scientificWork' | translate }}</option> + <option value="CHAPTER_WORK">{{ 'document.metadata.type.chapterWork' | translate }}</option> + <option value="CONTRACT_REPORT">{{ 'document.metadata.type.contractReport' | translate }}</option> + <option value="EXPERTISE">{{ 'document.metadata.type.expertise' | translate }}</option> + <option value="POSTER">{{ 'document.metadata.type.poster' | translate }}</option> + <option value="CONFERENCE_ARTICLE">{{ 'document.metadata.type.conferenceArticle' | translate }}</option> + <option value="CONFERENCE_SUMMARY">{{ 'document.metadata.type.conferenceSummary' | translate }}</option> + </select> <p ng-show="documentForm.type.$invalid && !documentForm.type.$pristine" class="help-block">{{ 'document.message.requiredType' | translate }}</p> -- 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 d8448436787384f0c3cd4626ce52bbb889e5f284 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Jan 27 14:51:32 2015 +0100 manage new predefined document type --- coselmar-ui/src/main/webapp/i18n/en.js | 1 + coselmar-ui/src/main/webapp/i18n/fr.js | 1 + .../src/main/webapp/js/coselmar-controllers.js | 4 ++-- .../src/main/webapp/views/documents/editDocument.html | 19 +++++++++++++------ .../webapp/views/documents/modalDocumentEdit.html | 16 ++++++++++++++-- .../src/main/webapp/views/documents/newdocument.html | 2 +- .../src/main/webapp/views/documents/viewDocument.html | 16 ++++++++++++++-- 7 files changed, 46 insertions(+), 13 deletions(-) diff --git a/coselmar-ui/src/main/webapp/i18n/en.js b/coselmar-ui/src/main/webapp/i18n/en.js index ba11b59..2d07673 100644 --- a/coselmar-ui/src/main/webapp/i18n/en.js +++ b/coselmar-ui/src/main/webapp/i18n/en.js @@ -87,6 +87,7 @@ var translateEN = { "document.metadata.type.conferenceArticle" : "Conference article", "document.metadata.type.conferenceSummary" : "Conference summary", "document.metadata.file" : "File", +"document.metadata.mimetype" : "Mime Type", "document.metadata.externalUrl" : "External URL", "document.metadata.copyright" : "Copyright", "document.metadata.licence" : "Licence", diff --git a/coselmar-ui/src/main/webapp/i18n/fr.js b/coselmar-ui/src/main/webapp/i18n/fr.js index 62b4204..ff664f6 100644 --- a/coselmar-ui/src/main/webapp/i18n/fr.js +++ b/coselmar-ui/src/main/webapp/i18n/fr.js @@ -87,6 +87,7 @@ var translateFR = { "document.metadata.type.conferenceArticle" : "Acte de colloque", "document.metadata.type.conferenceSummary" : "Communication sans actes", "document.metadata.file" : "Fichier", +"document.metadata.mimetype" : "Type Mime", "document.metadata.externalUrl" : "URL externe", "document.metadata.copyright" : "Copyright", "document.metadata.licence" : "License", diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index 154fd7e..ca3aff5 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -134,7 +134,7 @@ coselmarControllers.controller("DocumentsCtrl", ['$scope', '$route', '$routePara // Controller for new document View coselmarControllers.controller("NewDocumentCtrl", ['$scope', '$location', 'documentService', function($scope, $location, documentService){ - $scope.document = {'privacy': 'PUBLIC', 'keywords': []}; + $scope.document = {'type' : 'PERIODICAL_PUBLICATION', 'privacy': 'PUBLIC', 'keywords': []}; $scope.upload = {}; $scope.existing = {'types' : [], 'keywords' : []}; @@ -955,7 +955,7 @@ coselmarControllers.controller('ModalSearchDocumentsCtrl', function ($scope, $mo coselmarControllers.controller('ModalSearchQuestionsCtrl', function ($scope, $modalInstance, currentQuestionId, questionsService) { $scope.searchKeywords = []; - $scope.searchOptions = { 'privacy' : '', 'status' : '', 'keywords' : []}; + $scope.searchOptions = { 'type' : 'PERIODICAL_PUBLICATION', 'privacy' : '', 'status' : '', 'keywords' : []}; $scope.currentQuestionId = currentQuestionId; questionsService.getQuestions($scope.searchOptions, function(questions) { diff --git a/coselmar-ui/src/main/webapp/views/documents/editDocument.html b/coselmar-ui/src/main/webapp/views/documents/editDocument.html index daed34c..64c296b 100644 --- a/coselmar-ui/src/main/webapp/views/documents/editDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/editDocument.html @@ -50,13 +50,20 @@ ng-class="{'has-error' : documentForm.type.$invalid && !documentForm.type.$pristine}"> <label class="col-md-1 control-label">{{ 'document.metadata.type' | translate }} *</label> + <div class="col-md-2"> <select class="form-control" name="type" ng-model="document.type" required> - <option value="Publication">{{ 'document.metadata.type.publication' | translate }}</option> - <option value="Report">{{ 'document.metadata.type.report' | translate }}</option> - <option value="Scientific report">{{ 'document.metadata.type.scientificReport' | translate }}</option> - <option value="Contract report">{{ 'document.metadata.type.contractReport' | translate }}</option> - <option value="Poster">{{ 'document.metadata.type.poster' | translate }}</option> - <option value="Conference Article">{{ 'document.metadata.type.conferenceArticle' | translate }}</option> + <option value="PERIODICAL_PUBLICATION">{{ 'document.metadata.type.periodicalPublication' | translate }}</option> + <option value="MEETING_PUBLICATION">{{ 'document.metadata.type.meetingPublication' | translate }}</option> + <option value="THESIS">{{ 'document.metadata.type.thesis' | translate }}</option> + <option value="REPORT">{{ 'document.metadata.type.report' | translate }}</option> + <option value="SCIENTIFIC_REPORT">{{ 'document.metadata.type.scientificReport' | translate }}</option> + <option value="SCIENTIFIC_WORK">{{ 'document.metadata.type.scientificWork' | translate }}</option> + <option value="CHAPTER_WORK">{{ 'document.metadata.type.chapterWork' | translate }}</option> + <option value="CONTRACT_REPORT">{{ 'document.metadata.type.contractReport' | translate }}</option> + <option value="EXPERTISE">{{ 'document.metadata.type.expertise' | translate }}</option> + <option value="POSTER">{{ 'document.metadata.type.poster' | translate }}</option> + <option value="CONFERENCE_ARTICLE">{{ 'document.metadata.type.conferenceArticle' | translate }}</option> + <option value="CONFERENCE_SUMMARY">{{ 'document.metadata.type.conferenceSummary' | translate }}</option> </select> <p ng-show="documentForm.type.$invalid && !documentForm.type.$pristine" diff --git a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html index 668f4bc..71a85fb 100644 --- a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html +++ b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html @@ -55,8 +55,20 @@ <label class="col-md-2 control-label">{{ 'document.metadata.type' | translate }} *</label> <div class="col-md-4"> - <input type="text" class="form-control" name="type" - data-ng-model="document.type" list="modalExistingTypes" required/> + <select class="form-control" name="type" ng-model="document.type" required> + <option value="PERIODICAL_PUBLICATION">{{ 'document.metadata.type.periodicalPublication' | translate }}</option> + <option value="MEETING_PUBLICATION">{{ 'document.metadata.type.meetingPublication' | translate }}</option> + <option value="THESIS">{{ 'document.metadata.type.thesis' | translate }}</option> + <option value="REPORT">{{ 'document.metadata.type.report' | translate }}</option> + <option value="SCIENTIFIC_REPORT">{{ 'document.metadata.type.scientificReport' | translate }}</option> + <option value="SCIENTIFIC_WORK">{{ 'document.metadata.type.scientificWork' | translate }}</option> + <option value="CHAPTER_WORK">{{ 'document.metadata.type.chapterWork' | translate }}</option> + <option value="CONTRACT_REPORT">{{ 'document.metadata.type.contractReport' | translate }}</option> + <option value="EXPERTISE">{{ 'document.metadata.type.expertise' | translate }}</option> + <option value="POSTER">{{ 'document.metadata.type.poster' | translate }}</option> + <option value="CONFERENCE_ARTICLE">{{ 'document.metadata.type.conferenceArticle' | translate }}</option> + <option value="CONFERENCE_SUMMARY">{{ 'document.metadata.type.conferenceSummary' | translate }}</option> + </select> <p ng-show="documentForm.type.$invalid && !documentForm.type.$pristine" class="help-block">{{ 'document.message.requiredType' | translate }}</p> diff --git a/coselmar-ui/src/main/webapp/views/documents/newdocument.html b/coselmar-ui/src/main/webapp/views/documents/newdocument.html index 1334a3b..3fd948f 100644 --- a/coselmar-ui/src/main/webapp/views/documents/newdocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/newdocument.html @@ -60,8 +60,8 @@ <div class="col-md-2"> <select class="form-control" name="type" ng-model="document.type" required> - <option value="MEETING_PUBLICATION">{{ 'document.metadata.type.meetingPublication' | translate }}</option> <option value="PERIODICAL_PUBLICATION">{{ 'document.metadata.type.periodicalPublication' | translate }}</option> + <option value="MEETING_PUBLICATION">{{ 'document.metadata.type.meetingPublication' | translate }}</option> <option value="THESIS">{{ 'document.metadata.type.thesis' | translate }}</option> <option value="REPORT">{{ 'document.metadata.type.report' | translate }}</option> <option value="SCIENTIFIC_REPORT">{{ 'document.metadata.type.scientificReport' | translate }}</option> diff --git a/coselmar-ui/src/main/webapp/views/documents/viewDocument.html b/coselmar-ui/src/main/webapp/views/documents/viewDocument.html index 8f36a0b..7287fbb 100644 --- a/coselmar-ui/src/main/webapp/views/documents/viewDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/viewDocument.html @@ -40,7 +40,19 @@ </tr> <tr> <td>{{ 'document.metadata.type' | translate }}</td> - <td>{{document.type}}</td> + <!-- Manage translation of document type --> + <td ng-if="document.type == 'PERIODICAL_PUBLICATION'">{{ 'document.metadata.type.periodicalPublication' | translate }}</td> + <td ng-if="document.type == 'MEETING_PUBLICATION'">{{ 'document.metadata.type.meetingPublication' | translate }}</td> + <td ng-if="document.type == 'THESIS'">{{ 'document.metadata.type.thesis' | translate }}</td> + <td ng-if="document.type == 'REPORT'">{{ 'document.metadata.type.report' | translate }}</td> + <td ng-if="document.type == 'SCIENTIFIC_REPORT'">{{ 'document.metadata.type.scientificReport' | translate }}</td> + <td ng-if="document.type == 'SCIENTIFIC_WORK'">{{ 'document.metadata.type.scientificWork' | translate }}</td> + <td ng-if="document.type == 'CHAPTER_WORK'">{{ 'document.metadata.type.chapterWork' | translate }}</td> + <td ng-if="document.type == 'CONTRACT_REPORT'">{{ 'document.metadata.type.contractReport' | translate }}</td> + <td ng-if="document.type == 'EXPERTISE'">{{ 'document.metadata.type.expertise' | translate }}</td> + <td ng-if="document.type == 'POSTER'">{{ 'document.metadata.type.poster' | translate }}</td> + <td ng-if="document.type == 'CONFERENCE_ARTICLE'">{{ 'document.metadata.type.conferenceArticle' | translate }}</td> + <td ng-if="document.type == 'CONFERENCE_SUMMARY'">{{ 'document.metadata.type.conferenceSummary' | translate }}</td> </tr> <tr> <td>{{ 'document.metadata.keywords' | translate }}</td> @@ -79,7 +91,7 @@ <td>{{document.publicationDate | date:'mediumDate'}}</td> </tr> <tr> - <td>{{ 'document.metadata.type' | translate }}</td> + <td>{{ 'document.metadata.mimetype' | translate }}</td> <td ng-if="document.withFile">{{document.mimeType}}</td> <td ng-if="!document.withFile">{{ 'document.metadata.externalLink' | translate }}</td> </tr> -- 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 a34520d3956c9a7b7469953ef719e8a32a6ea83e Merge: 93c275a d844843 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Jan 27 14:51:41 2015 +0100 fixes #6431 Merge branch 'feature/6431-document-type-as-defined-list' into develop coselmar-ui/src/main/webapp/i18n/en.js | 14 ++++++++++++++ coselmar-ui/src/main/webapp/i18n/fr.js | 14 ++++++++++++++ coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 4 ++-- .../src/main/webapp/views/documents/editDocument.html | 16 ++++++++++++++-- .../main/webapp/views/documents/modalDocumentEdit.html | 16 ++++++++++++++-- .../src/main/webapp/views/documents/newdocument.html | 16 ++++++++++++++-- .../src/main/webapp/views/documents/viewDocument.html | 16 ++++++++++++++-- 7 files changed, 86 insertions(+), 10 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 develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 18e9db9dee9b09f36e6e2bb2e5b77e809330ced7 Merge: a34520d a6fe9d1 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Jan 27 14:52:24 2015 +0100 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop coselmar-ui/src/main/webapp/index.html | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm