diff --git a/CHANGELOG.md b/CHANGELOG.md index bfa8475..45b382a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,19 +1,29 @@ +# Version 1.4.2 + +- Added diff support in Member- and User-client to see additions, deletions and modifications from current to previous revisions +- Bugfixes & design improvements +- Updated outdated packages + + # Version 1.4.1 - - Added Email Notification to all Members when Review is started (and not pending anymore) - - Added q14 (Custom Files) - - Added Password Generation on Cover Sheet - - bugfixes & style improvements - - Added Debugging for SMTP Connection - ->>>>>>> Stashed changes + +- Added Email Notification to all Members when Review is started (and not pending anymore) +- Added q14 (Custom Files) +- Added Password Generation on Cover Sheet +- Bugfixes & style improvements +- Added Debugging for SMTP Connection + + # Version 1.4.0 - - Added Reminder Email to be sent out after 7 days of inactivity with still pending reviews. - - Added Revision Number on Output Documents - - Functionality for user to revert Document to Draft Phase after it was already approved (for fixing typos etc.) - - Added downloadable How-To Guide - - Added Cover Sheet Generation - - Status now explicitly listed on Status Overview Page - - various bugfixes + +- Added Reminder Email to be sent out after 7 days of inactivity with still pending reviews. +- Added Revision Number on Output Documents +- Functionality for user to revert Document to Draft Phase after it was already approved (for fixing typos etc.) +- Added downloadable How-To Guide +- Added Cover Sheet Generation +- Status now explicitly listed on Status Overview Page +- Various bugfixes + # Version 1.0 - - Initial App \ No newline at end of file +- Initial App diff --git a/LICENSE b/LICENSE index a296536..f65d16a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2017 Sitcom Lab +Copyright (c) 2018 Institute for Geoinformatics, Münster Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 8f3ba2a..32c1ef0 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,10 @@ # Ethics-app +[![License](https://img.shields.io/badge/License-MIT-green.svg)]() +[![Status](https://img.shields.io/badge/Status-maintained-green.svg)]() +[![Slack channel](https://img.shields.io/badge/Slack-channel-e6186d.svg)](https://ethics-app.slack.com/) + Ethics-application for the approval of user-studies ### Background diff --git a/bower.json b/bower.json index 593a532..93065a9 100644 --- a/bower.json +++ b/bower.json @@ -1,33 +1,33 @@ { - "name": "ethics-app", - "version": "0.0.1", - "authors": [ - "Nicholas Schiestel " - ], - "description": "Ethics-App for the Institute for Geoinformatics, Münster", - "license": "MIT", - "private": true, - "dependencies": { - "angular": "1.6.4", - "angular-momentjs": "^0.2.2", - "angular-route": "1.6.4", - "angular-sanitize": "1.6.4", - "angular-translate": "^2.11.1", - "bootstrap": "v4.0.0-alpha.6", - "font-awesome": "^4.6.3", - "jquery": "^3.1.0", - "moment": "^2.14.1", - "tether": "^1.3.7", - "flag-icon-css": "^2.0.0", - "underscore": "^1.8.3", - "angular-underscore-module": "^1.0.3", - "angucomplete-alt": "^3.0.0", - "angular-upload": "^1.0.12" - }, - "resolutions": { - "angular": "1.6.4", - "angular-route": "1.6.4", - "angular-sanitize": "1.6.4", - "bootstrap": "v4.0.0-alpha.6" - } -} + "name": "ethics-app", + "version": "1.4.2", + "authors": [ + "Nicholas Schiestel " + ], + "description": "Application for the approval of user-studies", + "license": "MIT", + "private": true, + "dependencies": { + "angular": "1.6.4", + "angular-momentjs": "^0.2.2", + "angular-route": "1.6.4", + "angular-sanitize": "1.6.4", + "angular-translate": "^2.11.1", + "bootstrap": "v4.0.0-alpha.6", + "font-awesome": "^4.6.3", + "jquery": "^3.1.0", + "moment": "^2.14.1", + "tether": "^1.3.7", + "flag-icon-css": "^2.0.0", + "underscore": "^1.8.3", + "angular-underscore-module": "^1.0.3", + "angucomplete-alt": "^3.0.0", + "angular-upload": "^1.0.12" + }, + "resolutions": { + "angular": "1.6.4", + "angular-route": "1.6.4", + "angular-sanitize": "1.6.4", + "bootstrap": "v4.0.0-alpha.6" + } +} \ No newline at end of file diff --git a/package.json b/package.json index db71ef1..bb193a4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ethics-app", - "version": "1.4.1", + "version": "1.4.2", "description": "Application for the approval of user-studies", "main": "server.js", "repository": { diff --git a/public/config.js b/public/config.js index faf8c33..a6957cd 100644 --- a/public/config.js +++ b/public/config.js @@ -8,7 +8,7 @@ app.constant("config", { member_client: "Ethics-app | Committee", }, appGithub: "https://github.com/sitcomlab/Ethics-app", - appVersion: "v1.0", + appVersion: "1.4.2", appLanguage: 'en_US', appYear: moment().format("YYYY"), timeZone: "Europe/Berlin", diff --git a/public/member-client/js/controllers/document/overviewController.js b/public/member-client/js/controllers/document/overviewController.js index 6fdf842..5d1d763 100644 --- a/public/member-client/js/controllers/document/overviewController.js +++ b/public/member-client/js/controllers/document/overviewController.js @@ -258,8 +258,8 @@ app.controller("documentOverviewController", function($scope, $rootScope, $route descriptions: { language: { en: true, - de: false, - pt: false + de: $scope.latest_revision.descriptions.de_used, + pt: $scope.latest_revision.descriptions.pt_used }, history: { en: { diff --git a/public/member-client/js/controllers/document/reviewController.js b/public/member-client/js/controllers/document/reviewController.js index ca3addd..370376b 100644 --- a/public/member-client/js/controllers/document/reviewController.js +++ b/public/member-client/js/controllers/document/reviewController.js @@ -282,8 +282,8 @@ app.controller("documentReviewController", function($scope, $rootScope, $routePa descriptions: { language: { en: true, - de: false, - pt: false + de: $scope.latest_revision.descriptions.de_used, + pt: $scope.latest_revision.descriptions.pt_used }, history: { en: { diff --git a/public/member-client/js/templates/account/edit.html b/public/member-client/js/templates/account/edit.html index ea4dcee..9704214 100644 --- a/public/member-client/js/templates/account/edit.html +++ b/public/member-client/js/templates/account/edit.html @@ -16,7 +16,7 @@
@@ -52,7 +52,7 @@
@@ -130,7 +130,7 @@
@@ -186,7 +186,7 @@
@@ -265,7 +265,7 @@
@@ -295,7 +295,7 @@
@@ -379,7 +379,7 @@
@@ -416,7 +416,7 @@
@@ -455,7 +455,7 @@ required> - {{ 'FALSE' | translate }} (d) + {{ 'FALSE' | translate }} ({{ 'DEFAULT' | translate }}) @@ -476,7 +476,7 @@
@@ -515,7 +515,7 @@ required> - {{ 'FALSE' | translate }} (d) + {{ 'FALSE' | translate }} ({{ 'DEFAULT' | translate }}) @@ -536,7 +536,7 @@
@@ -557,7 +557,7 @@ required> - {{ 'TRUE' | translate }} (d) + {{ 'TRUE' | translate }} ({{ 'DEFAULT' | translate }}) @@ -593,14 +593,6 @@
-
-
- - * {{ 'REQUIRED' | translate }}  |  d {{ 'DEFAULT' | translate }} - -
-
-
@@ -838,12 +900,43 @@
 v{{revision.version}}
- {{revision.descriptions.de_study_time}}
- - -   {{revision.comments.de_study_time_comment}} + + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + - + +
+
+ +
+
+
+

+

+ + + + + + + +
+

@@ -864,12 +957,43 @@
 v{{revision.version}}
- {{revision.descriptions.de_purpose}}
- - -   {{revision.comments.de_purpose_comment}} + + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + - + +
+
+ +
+
+
+

+

+ + + + + + + +
+

@@ -890,12 +1014,43 @@
 v{{revision.version}}
- {{revision.descriptions.de_procedure}}
- - -   {{revision.comments.de_procedure_comment}} + + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + - + +
+
+ +
+
+
+

+

+ + + + + + + +
+

@@ -916,12 +1071,43 @@
 v{{revision.version}}
- {{revision.descriptions.de_duration}}
- - -   {{revision.comments.de_duration_comment}} + + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + - + +
+
+ +
+
+
+

+

+ + + + + + + +
+

@@ -942,12 +1128,43 @@
 v{{revision.version}}
- {{revision.descriptions.de_risks}}
- - -   {{revision.comments.de_risks_comment}} + + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + - + +
+
+ +
+
+
+

+

+ + + + + + + +
+

@@ -968,12 +1185,43 @@
 v{{revision.version}}
- {{revision.descriptions.de_benefits}}
- - -   {{revision.comments.de_benefits_comment}} + + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + - + +
+
+ +
+
+
+

+

+ + + + + + + +
+

@@ -1044,12 +1292,43 @@
 v{{revision.version}}
- {{revision.descriptions.pt_title}}
- - -   {{revision.comments.pt_title_comment}} + + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + - + +
+
+ +
+
+
+

+

+ + + + + + + +
+

@@ -1070,12 +1349,43 @@
 v{{revision.version}}
- {{revision.descriptions.pt_researcher}}
- - -   {{revision.comments.pt_researcher_comment}} + + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + - + +
+
+ +
+
+
+

+

+ + + + + + + +
+

@@ -1096,12 +1406,43 @@
 v{{revision.version}}
- {{revision.descriptions.pt_study_time}}
- - -   {{revision.comments.pt_study_time_comment}} + + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + - + +
+
+ +
+
+
+

+

+ + + + + + + +
+

@@ -1122,12 +1463,43 @@
 v{{revision.version}}
- {{revision.descriptions.pt_purpose}}
- - -   {{revision.comments.pt_purpose_comment}} + + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + - + +
+
+ +
+
+
+

+

+ + + + + + + +
+

@@ -1148,12 +1520,43 @@
 v{{revision.version}}
- {{revision.descriptions.pt_procedure}}
- - -   {{revision.comments.pt_procedure_comment}} + + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + - + +
+
+ +
+
+
+

+

+ + + + + + + +
+

@@ -1174,12 +1577,43 @@
 v{{revision.version}}
- {{revision.descriptions.pt_duration}}
- - -   {{revision.comments.pt_duration_comment}} + + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + - + +
+
+ +
+
+
+

+

+ + + + + + + +
+

@@ -1200,12 +1634,43 @@
 v{{revision.version}}
- {{revision.descriptions.pt_risks}}
- - -   {{revision.comments.pt_risks_comment}} + + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + - + +
+
+ +
+
+
+

+

+ + + + + + + +
+

@@ -1226,12 +1691,43 @@
 v{{revision.version}}
- {{revision.descriptions.pt_benefits}}
- - -   {{revision.comments.pt_benefits_comment}} + + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + - + +
+
+ +
+
+
+

+

+ + + + + + + +
+

diff --git a/public/member-client/js/templates/institute/create.html b/public/member-client/js/templates/institute/create.html index d63389e..fdd25cc 100644 --- a/public/member-client/js/templates/institute/create.html +++ b/public/member-client/js/templates/institute/create.html @@ -16,7 +16,7 @@
@@ -73,7 +73,7 @@
@@ -107,7 +107,7 @@ ng-value="false" required> - {{ 'FALSE' | translate }} (d) + {{ 'FALSE' | translate }} {{ 'DEFAULT' | translate }}
@@ -126,13 +126,6 @@
-
-
- - * {{ 'REQUIRED' | translate }}  |  d {{ 'DEFAULT' | translate }} - -
-
@@ -65,7 +65,7 @@
@@ -141,7 +141,7 @@
diff --git a/public/user-client/js/templates/document/create.html b/public/user-client/js/templates/document/create.html index 9760d5c..b49a031 100644 --- a/public/user-client/js/templates/document/create.html +++ b/public/user-client/js/templates/document/create.html @@ -16,7 +16,7 @@
@@ -48,7 +48,7 @@
@@ -104,7 +104,7 @@
@@ -155,7 +155,7 @@
@@ -233,7 +233,7 @@
diff --git a/public/user-client/js/templates/document/delete.html b/public/user-client/js/templates/document/delete.html index a8e2fb1..1b62309 100644 --- a/public/user-client/js/templates/document/delete.html +++ b/public/user-client/js/templates/document/delete.html @@ -18,7 +18,7 @@

{{ 'PLEASE_TYPE_IN_THE_ID_OF_THE_DOCUMENT_TO_CONFIRM' | translate }} diff --git a/public/user-client/js/templates/document/edit_settings.html b/public/user-client/js/templates/document/edit_settings.html index dcb73e7..00174bf 100644 --- a/public/user-client/js/templates/document/edit_settings.html +++ b/public/user-client/js/templates/document/edit_settings.html @@ -15,7 +15,7 @@
diff --git a/public/user-client/js/templates/document/revise.html b/public/user-client/js/templates/document/revise.html index 975984d..4b20cd5 100644 --- a/public/user-client/js/templates/document/revise.html +++ b/public/user-client/js/templates/document/revise.html @@ -548,10 +548,8 @@

-
- +
@@ -611,10 +609,8 @@

-
- +
@@ -780,14 +776,27 @@
- - {{revision.descriptions.de_title}}
- - - +
+ + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + + + +
+
+
+ +
@@ -828,14 +837,27 @@
- - {{revision.descriptions.de_researcher}}
- - - +
+ + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + + + +
+
+
+ +
@@ -876,14 +898,27 @@
- - {{revision.descriptions.de_study_time}}
- - - +
+ + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + + + +
+
+
+ +
@@ -924,14 +959,27 @@
- - {{revision.descriptions.de_purpose}}
- - - +
+ + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + + + +
+
+
+ +
@@ -972,14 +1020,27 @@
- - {{revision.descriptions.de_procedure}}
- - - +
+ + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + + + +
+
+
+ +
@@ -1020,14 +1081,27 @@
- - {{revision.descriptions.de_duration}}
- - - +
+ + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + + + +
+
+
+ +
@@ -1068,14 +1142,27 @@
- - {{revision.descriptions.de_risks}}
- - - +
+ + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + + + +
+
+
+ +
@@ -1116,14 +1203,27 @@
- - {{revision.descriptions.de_risks}}
- - - +
+ + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + + + +
+
+
+ +
@@ -1225,14 +1325,27 @@
- - {{revision.descriptions.pt_title}}
- - - +
+ + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + + + +
+
+
+ +
@@ -1273,14 +1386,27 @@
- - {{revision.descriptions.pt_researcher}}
- - - +
+ + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + + + +
+
+
+ +
@@ -1321,14 +1447,27 @@
- - {{revision.descriptions.pt_study_time}}
- - - +
+ + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + + + +
+
+
+ +
@@ -1369,14 +1508,27 @@
- - {{revision.descriptions.pt_purpose}}
- - - +
+ + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + + + +
+
+
+ +
@@ -1417,14 +1569,27 @@
- - {{revision.descriptions.pt_procedure}}
- - - +
+ + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + + + +
+
+
+ +
@@ -1465,14 +1630,27 @@
- - {{revision.descriptions.pt_duration}}
- - - +
+ + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + + + +
+
+
+ +
@@ -1513,14 +1691,27 @@
- - {{revision.descriptions.pt_risks}}
- - - +
+ + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + + + +
+
+
+ +
@@ -1561,14 +1752,27 @@
- - {{revision.descriptions.pt_risks}}
- - - +
+ + + + {{diff.value}} + + + {{diff.value}} + + + {{diff.value}} + + + +
+
+
+ +
@@ -1628,7 +1832,7 @@
- 1. {{ 'CONCERN_1' | translate }}? + 1. {{ 'CONCERN_1' | translate }}? *
@@ -1711,7 +1915,7 @@