- Coselmar-commits - mailman.cloud.codelutin.com

branch develop updated (64b9409 -> aba84cc)
by codelutin.com scm 10 Dec '14

10 Dec '14

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 64b9409 add tooltip in questions list new c88a0b0 add question view page new a515fab fixes #6019 participants on the question can add new documents in it new a5b20ba prepare full edit of question new 349b65c prepare full edit of question new dfe0dab fix question edit mode new e3b0a23 add filter on users during question edition new 88130f2 manage some restriction on question content new aa7617e add information when question is not available new 66df66b filter questions list with privacy for an expert user new aba84cc Merge branch 'feature/6017-edit-question' into develop The 10 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 aba84cc0d06c13274dd9a4bc0b40dd4abdc5aea8 Merge: 64b9409 66df66b Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Dec 10 19:12:48 2014 +0100 Merge branch 'feature/6017-edit-question' into develop commit 66df66b1695b14075986e840fa33b5356c274cb5 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Dec 10 19:12:14 2014 +0100 filter questions list with privacy for an expert user commit aa7617eaf99c9b9f9f47cab7c359f2aacbc0d6fc Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Dec 10 18:44:06 2014 +0100 add information when question is not available commit 88130f2c7e9b86bbdc7ac7659730e96972829a6b Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Dec 10 18:38:58 2014 +0100 manage some restriction on question content commit e3b0a235757decb746b3ff011c28d31b05d5a96d Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Dec 10 17:42:47 2014 +0100 add filter on users during question edition commit dfe0dab0b637e914b2e9ebca53557c57f16dd056 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Dec 10 16:11:20 2014 +0100 fix question edit mode commit 349b65cf339f83d0436baa217614de7e90ef448d Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Dec 10 12:12:08 2014 +0100 prepare full edit of question commit a5b20ba0ab8753ea6133750b37f2a26f4aad3091 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Dec 10 10:58:13 2014 +0100 prepare full edit of question commit a515fab40bd481eee110db24c4a9ac1a319d6406 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Tue Dec 9 16:12:44 2014 +0100 fixes #6019 participants on the question can add new documents in it commit c88a0b07c6a348bb6bd94c314bc3523e7741c6d3 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Mon Dec 8 17:25:01 2014 +0100 add question view page Summary of changes: .../coselmar/persistence/SearchRequestBean.java | 55 +++ .../persistence/entity/CoselmarUserTopiaDao.java | 37 +- .../persistence/entity/QuestionTopiaDao.java | 35 ++ .../src/main/xmi/coselmar-model.properties | 3 +- .../src/main/xmi/coselmar-model.zargo | Bin 9735 -> 9741 bytes .../fr/ifremer/coselmar/beans/QuestionBean.java | 10 + .../fr/ifremer/coselmar/beans/UserSearchBean.java | 76 ++++ .../coselmar/converter/BeanEntityConverter.java | 44 ++- .../services/CoselmarRestApplicationListener.java | 4 +- .../coselmar/services/v1/QuestionsWebService.java | 393 ++++++++++++++++++++- .../coselmar/services/v1/UsersWebService.java | 16 +- coselmar-rest/src/main/resources/mapping | 6 +- .../src/main/webapp/js/coselmar-controllers.js | 348 ++++++++++++++---- .../main/webapp/js/coselmar-questions-services.js | 30 +- coselmar-ui/src/main/webapp/js/coselmar.js | 6 +- .../main/webapp/views/questions/editquestion.html | 28 +- .../webapp/views/questions/newDocumentsPart.html | 38 ++ .../main/webapp/views/questions/newquestion.html | 14 +- .../src/main/webapp/views/questions/question.html | 59 ++++ .../views/questions/viewRestrictedQuestion.html | 15 + .../main/webapp/views/questions/viewquestion.html | 151 ++++++++ 21 files changed, 1247 insertions(+), 121 deletions(-) create mode 100644 coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/SearchRequestBean.java create mode 100644 coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/QuestionTopiaDao.java create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserSearchBean.java create mode 100644 coselmar-ui/src/main/webapp/views/questions/newDocumentsPart.html create mode 100644 coselmar-ui/src/main/webapp/views/questions/question.html create mode 100644 coselmar-ui/src/main/webapp/views/questions/viewRestrictedQuestion.html create mode 100644 coselmar-ui/src/main/webapp/views/questions/viewquestion.html -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 10

branch develop updated (05f4622 -> 64b9409)
by codelutin.com scm 08 Dec '14

08 Dec '14

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 05f4622 list questions, can delete them new 418722a fix usage of date in js : convert it to timestamps before server call new 64b9409 add tooltip in questions list 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 64b94092ccf6f12b72351e2abb756baa98c8bf7e Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Mon Dec 8 11:26:48 2014 +0100 add tooltip in questions list commit 418722afa6ce244220fea91f9260de397799905c Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Mon Dec 8 09:49:30 2014 +0100 fix usage of date in js : convert it to timestamps before server call Summary of changes: .../fr/ifremer/coselmar/beans/QuestionBean.java | 10 ++--- .../coselmar/converter/BeanEntityConverter.java | 2 +- .../coselmar/services/v1/DocumentsWebService.java | 1 - .../coselmar/services/v1/QuestionsWebService.java | 2 +- .../src/main/webapp/js/coselmar-controllers.js | 43 +++++++++++++++++++--- .../main/webapp/views/questions/editquestion.html | 4 +- .../src/main/webapp/views/questions/questions.html | 22 +++++++++-- 7 files changed, 65 insertions(+), 19 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (aac2c1f -> 05f4622)
by codelutin.com scm 05 Dec '14

05 Dec '14

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 aac2c1f Merge branch 'develop' of https://git.codelutin.com/coselmar into develop new 89abcfe fixes #6016 add entry in application to add question new 05f4622 list questions, can delete them 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 05f46225810fb69fa65dceafe37bc8427d13b0c1 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Fri Dec 5 18:16:27 2014 +0100 list questions, can delete them commit 89abcfe0aefe5f76ce4d62b4f76a4d5de52fa8a1 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Fri Dec 5 11:21:53 2014 +0100 fixes #6016 add entry in application to add question Summary of changes: .../fr/ifremer/coselmar/beans/QuestionBean.java | 50 +++++++++ .../coselmar/converter/BeanEntityConverter.java | 92 +++++++++++++++++ .../coselmar/services/v1/DocumentsWebService.java | 2 +- .../coselmar/services/v1/QuestionsWebService.java | 113 +++++++++++++++++++-- coselmar-rest/src/main/resources/mapping | 8 +- coselmar-ui/pom.xml | 20 ++-- coselmar-ui/src/main/webapp/index.html | 8 +- .../src/main/webapp/js/coselmar-controllers.js | 31 +++++- .../main/webapp/js/coselmar-questions-services.js | 9 ++ coselmar-ui/src/main/webapp/js/coselmar.js | 6 +- .../main/webapp/views/questions/editquestion.html | 2 +- .../main/webapp/views/questions/newquestion.html | 7 +- .../src/main/webapp/views/questions/questions.html | 47 +++++++++ 13 files changed, 367 insertions(+), 28 deletions(-) create mode 100644 coselmar-ui/src/main/webapp/views/questions/questions.html -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (15ec2ea -> aac2c1f)
by codelutin.com scm 05 Dec '14

05 Dec '14

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 15ec2ea tidy poms adds 0f5aa27 add question in entities model adds 7998ad3 prepare web service to add question adds 30703a4 prepare page form for questions adds 2c4c138 Fix initialisation : account lambda expert has no password new 74d3dc1 manage users (experts, clients and supervisors) in Question creation UI with auto-search new 27fa957 can add existing documents in questions new f7060c2 add modal for document creation during question edit new d21577d from question edit, can create a document to attach it on question : request on service returns the document new 5f2069c #6016 can create new question new 58ade4f Merge branch 'feature/6016-add-question' into develop new aac2c1f Merge branch 'develop' of https://git.codelutin.com/coselmar into develop The 7 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 aac2c1ffb77d83dc70d5d40f77e6a29eb42d7220 Merge: 58ade4f 15ec2ea Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Fri Dec 5 11:14:09 2014 +0100 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop Conflicts: coselmar-ui/src/main/webapp/css/coselmar.css coselmar-ui/src/main/webapp/index.html commit 58ade4f032622eedf21df74b4de4dc394a757ee1 Merge: 533dc4f 5f2069c Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Fri Dec 5 11:04:14 2014 +0100 Merge branch 'feature/6016-add-question' into develop commit 5f2069c3bfb78d3134e831a6d52072c614b005e0 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Fri Dec 5 11:03:49 2014 +0100 #6016 can create new question commit d21577dcbd5610154880ab9dc637d254d62350ba Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Dec 4 18:24:21 2014 +0100 from question edit, can create a document to attach it on question : request on service returns the document commit f7060c24edbf0cb3870a0d02f299dd7718d6f248 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Dec 4 17:41:19 2014 +0100 add modal for document creation during question edit commit 27fa957f3263c14ac4eb532c53e9a4b313807a67 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Dec 4 16:16:01 2014 +0100 can add existing documents in questions commit 74d3dc1a7bdb5860163e2b6b9070a8d5154a6a7f Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Dec 3 17:49:23 2014 +0100 manage users (experts, clients and supervisors) in Question creation UI with auto-search Summary of changes: .../persistence/entity/CoselmarUserTopiaDao.java | 86 +++++++ .../persistence/entity/DocumentTopiaDao.java | 4 +- .../src/main/xmi/coselmar-model.zargo | Bin 6557 -> 9735 bytes .../fr/ifremer/coselmar/beans/QuestionBean.java | 188 +++++++++++++++ .../coselmar/converter/BeanEntityConverter.java | 16 ++ .../services/CoselmarRestApplicationListener.java | 4 +- .../services/CoselmarWebServiceSupport.java | 22 ++ .../coselmar/services/v1/DocumentsWebService.java | 16 +- .../services/v1/InitialisationService.java | 16 +- .../coselmar/services/v1/QuestionsWebService.java | 216 +++++++++++++++++ .../coselmar/services/v1/UsersWebService.java | 8 +- coselmar-rest/src/main/resources/mapping | 11 +- coselmar-ui/pom.xml | 6 + coselmar-ui/src/main/webapp/css/coselmar.css | 5 + coselmar-ui/src/main/webapp/index.html | 6 + .../src/main/webapp/js/coselmar-controllers.js | 200 +++++++++++++++- .../main/webapp/js/coselmar-questions-services.js | 41 ++++ .../src/main/webapp/js/coselmar-services.js | 1 - coselmar-ui/src/main/webapp/js/coselmar.js | 10 + .../webapp/views/documents/modalDocumentEdit.html | 198 ++++++++++++++++ .../views/documents/modalDocumentSearch.html | 45 ++++ .../main/webapp/views/questions/editquestion.html | 257 +++++++++++++++++++++ .../main/webapp/views/questions/newquestion.html | 11 + pom.xml | 10 +- 24 files changed, 1354 insertions(+), 23 deletions(-) create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionBean.java create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java create mode 100644 coselmar-ui/src/main/webapp/js/coselmar-questions-services.js create mode 100644 coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html create mode 100644 coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html create mode 100644 coselmar-ui/src/main/webapp/views/questions/editquestion.html create mode 100644 coselmar-ui/src/main/webapp/views/questions/newquestion.html -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 7

branch feature/6016-add-question created (now 2c4c138)
by codelutin.com scm 03 Dec '14

03 Dec '14

This is an automated email from the git hooks/post-receive script. New change to branch feature/6016-add-question in repository coselmar. See http://git.codelutin.com/coselmar.git at 2c4c138 Fix initialisation : account lambda expert has no password This branch includes the following new commits: new 0f5aa27 add question in entities model new 7998ad3 prepare web service to add question new 30703a4 prepare page form for questions new 2c4c138 Fix initialisation : account lambda expert has no password 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 2c4c138450a699f748dc35c2aa852d9dd44e41a3 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Dec 3 10:24:39 2014 +0100 Fix initialisation : account lambda expert has no password commit 30703a4e386ae534260ebf3c60d429848abbee50 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Tue Dec 2 18:03:53 2014 +0100 prepare page form for questions commit 7998ad35c062f3f5d163265499a87650ef8263fa Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Mon Dec 1 17:51:36 2014 +0100 prepare web service to add question commit 0f5aa2792adf5f66515d7077a05ddf742ac27f95 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Mon Dec 1 15:41:48 2014 +0100 add question in entities model -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch develop updated (d2753fa -> 15ec2ea)
by codelutin.com scm 03 Dec '14

03 Dec '14

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 d2753fa Css changes for display update new 15ec2ea tidy poms The 1 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 15ec2ea4f3f8fe3075e78326e07123331696dc3e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Dec 3 14:40:37 2014 +0100 tidy poms Summary of changes: coselmar-bundle/pom.xml | 8 ++++---- coselmar-persistence/pom.xml | 1 - coselmar-rest/pom.xml | 8 +------- coselmar-ui/pom.xml | 3 --- pom.xml | 49 ++------------------------------------------ 5 files changed, 7 insertions(+), 62 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (533dc4f -> d2753fa)
by codelutin.com scm 03 Dec '14

03 Dec '14

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 533dc4f just some code format on doucment form new d2753fa Css changes for display update The 1 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 d2753faf564fd618877ff4c3d80ff3cddd303341 Author: Léo Kaufmann <kaufmann(a)codelutin.com> Date: Wed Dec 3 12:49:42 2014 +0100 Css changes for display update Summary of changes: coselmar-ui/src/main/webapp/css/coselmar.css | 128 ++++++++++++++++++--- coselmar-ui/src/main/webapp/index.html | 12 +- .../src/main/webapp/views/documents/document.html | 2 +- .../src/main/webapp/views/documents/documents.html | 4 +- .../main/webapp/views/documents/newdocument.html | 15 ++- coselmar-ui/src/main/webapp/views/home.html | 2 +- .../src/main/webapp/views/users/edituser.html | 2 +- .../src/main/webapp/views/users/newuser.html | 2 +- coselmar-ui/src/main/webapp/views/users/user.html | 2 +- coselmar-ui/src/main/webapp/views/users/users.html | 8 +- 10 files changed, 143 insertions(+), 34 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (2698100 -> 533dc4f)
by codelutin.com scm 01 Dec '14

01 Dec '14

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 2698100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 20128c4 add some validation indicator in user and document form new 533dc4f just some code format on doucment form 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 533dc4f9db76aecd6480e87f4935c5be7ca804fd Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Mon Dec 1 10:51:27 2014 +0100 just some code format on doucment form commit 20128c49143b7d320bc3f96d87e91feb19a1ccd3 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Mon Dec 1 10:50:56 2014 +0100 add some validation indicator in user and document form Summary of changes: coselmar-ui/pom.xml | 7 + coselmar-ui/src/main/webapp/index.html | 1 + .../src/main/webapp/js/coselmar-controllers.js | 65 +++-- coselmar-ui/src/main/webapp/version.txt | 2 +- .../main/webapp/views/documents/newdocument.html | 316 ++++++++++++--------- coselmar-ui/src/main/webapp/views/home.html | 4 +- .../src/main/webapp/views/users/edituser.html | 35 ++- coselmar-ui/src/main/webapp/views/users/users.html | 6 +- 8 files changed, 251 insertions(+), 185 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (d7437ca -> 2698100)
by codelutin.com scm 27 Nov '14

27 Nov '14

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 d7437ca fixes #6193 : make initial users active new 1eca364 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds f9b1cf1 [jgitflow-maven-plugin]updating poms for branch '0.2.1' with snapshot versions new 526c845 release version new ef311c0 [jgitflow-maven-plugin]updating poms for branch'release/0.2.1' with non-snapshot versions new 0f30ad4 release version new efca33e Merge branch 'release/0.2.1' new 6620d6f Merge branch 'master' into develop new 2698100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 7 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 2698100b5bd434fd81b38bbb35336ce4cf425630 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Nov 27 17:09:51 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 6620d6f72b03331d8b8499515de1ea050eff661f Merge: 1eca364 efca33e Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Nov 27 17:09:50 2014 +0000 Merge branch 'master' into develop commit 1eca3642478045fda4d0a0566560e86a0e31a671 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Nov 27 17:09:50 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit efca33eac785800e98ab963ffc56f9bcef884cd5 Merge: 466d5e3 0f30ad4 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Nov 27 17:09:49 2014 +0000 Merge branch 'release/0.2.1' commit 0f30ad427a5015c050902218c0fa152e3aa36669 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Nov 27 17:07:46 2014 +0000 release version commit ef311c01df2699adb33b067cfc2d68f8354dc93d Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Nov 27 17:04:41 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.2.1' with non-snapshot versions commit 526c8454156d3023ecaf991a31bd7a6fe361a20d Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Nov 27 17:04:23 2014 +0000 release version Summary of changes: coselmar-ui/src/main/webapp/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 7

branch release/0.2.1 deleted (was 0f30ad4)
by codelutin.com scm 27 Nov '14

27 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch release/0.2.1 in repository coselmar. See http://git.codelutin.com/coselmar.git was 0f30ad4 release version The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0