Implemented #52

- Added missing German and Portuguese entries in templates - Bug-fixes in controllers - Small design improvements
sitcomlab · Jul 4, 2018 · 83190ca · 83190ca
1 parent ec85e2a
commit 83190ca
Show file tree

Hide file tree

Showing 45 changed files with 1,710 additions and 654 deletions.
diff --git 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
+- Initial App
diff --git 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
@@ -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
@@ -1,33 +1,33 @@
 {
-  "name": "ethics-app",
-  "version": "0.0.1",
-  "authors": [
-    "Nicholas Schiestel <[email protected]>"
-  ],
-  "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 <[email protected]>"
+    ],
+    "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"
+    }
+}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -16,7 +16,7 @@
 
         <div class="card-block">
             <label>
-                <b>{{ 'USERNAME' | translate }}*</b>
+                <b>{{ 'USERNAME' | translate }}</b> <sup class="text-danger">*</sup>
             </label>
             <div class="form-group" ng-class="{'has-danger': editMemberForm.email_address.$invalid && !editMemberForm.email_address.$pristine}">
                 <div class="input-group">
@@ -52,7 +52,7 @@
             <div class="row">
                 <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
                     <label>
-                        <b>{{ 'NEW_PASSWORD' | translate }}*</b>
+                        <b>{{ 'NEW_PASSWORD' | translate }}</b> <sup class="text-danger">*</sup>
                         <small>
                             <a href="" ng-click="changePassword()">
                                 <span ng-if="!updated_member.new_password">{{ 'CHANGE_PASSWORD' | translate }}</span>
@@ -94,7 +94,7 @@
                 </div>
                 <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
                     <label>
-                        <b>{{ 'NEW_REPEATED_PASSWORD' | translate }}*</b>
+                        <b>{{ 'NEW_REPEATED_PASSWORD' | translate }}</b> <sup class="text-danger">*</sup>
                     </label>
                     <div class="form-group" ng-class="{'has-danger': editMemberForm.repeated_password.$invalid && !editMemberForm.repeated_password.$pristine}">
                         <div class="input-group">
@@ -130,7 +130,7 @@
                 </div>
                 <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
                     <label>
-                        <b>{{ 'OLD_PASSWORD' | translate }}*</b>
+                        <b>{{ 'OLD_PASSWORD' | translate }}</b> <sup class="text-danger">*</sup>
                     </label>
                     <div class="form-group" ng-class="{'has-danger': editMemberForm.old_password.$invalid && !editMemberForm.old_password.$pristine}">
                         <div class="input-group">
@@ -186,7 +186,7 @@
                 </div>
                 <div class="col-xs-12 col-sm-12 col-md-5 col-lg-5">
                     <label>
-                        <b>{{ 'FIRST_NAME' | translate }}*</b>
+                        <b>{{ 'FIRST_NAME' | translate }}</b> <sup class="text-danger">*</sup>
                     </label>
                     <div class="form-group" ng-class="{'has-danger': editMemberForm.first_name.$invalid && !editMemberForm.first_name.$pristine }">
                         <input
@@ -209,7 +209,7 @@
                 </div>
                 <div class="col-xs-12 col-sm-12 col-md-5 col-lg-5">
                     <label>
-                        <b>{{ 'LAST_NAME' | translate }}*</b>
+                        <b>{{ 'LAST_NAME' | translate }}</b> <sup class="text-danger">*</sup>
                     </label>
                     <div class="form-group" ng-class="{'has-danger': editMemberForm.last_name.$invalid && !editMemberForm.last_name.$pristine }">
                         <input
@@ -235,7 +235,7 @@
             <div class="row">
                 <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4">
                     <label>
-                        <b>{{ 'UNIVERSITY' | translate }}*</b>
+                        <b>{{ 'UNIVERSITY' | translate }}</b> <sup class="text-danger">*</sup>
                     </label>
                     <div class="form-group" ng-class="{'has-danger': editMemberForm.university_id.$invalid && !editMemberForm.university_id.$pristine }">
                         <div class="input-group">
@@ -265,7 +265,7 @@
                 </div>
                 <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4">
                     <label>
-                        <b>{{ 'INSTITUTE' | translate }}*</b>
+                        <b>{{ 'INSTITUTE' | translate }}</b> <sup class="text-danger">*</sup>
                     </label>
                     <div class="form-group" ng-class="{'has-danger': editMemberForm.institute_id.$invalid && !editMemberForm.institute_id.$pristine }">
                         <div class="input-group">
@@ -295,7 +295,7 @@
                 </div>
                 <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4">
                     <label>
-                        <b>{{ 'WORKING_GROUP' | translate }}*</b>
+                        <b>{{ 'WORKING_GROUP' | translate }}</b> <sup class="text-danger">*</sup>
                     </label>
                     <div class="form-group" ng-class="{'has-danger': editMemberForm.institute_id.$invalid && !editMemberForm.institute_id.$pristine }">
                         <div class="input-group">
@@ -379,7 +379,7 @@
                 </div>
                 <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
                     <label>
-                        <b>{{ 'OFFICE_EMAIL_ADDRESS' | translate }}*</b>
+                        <b>{{ 'OFFICE_EMAIL_ADDRESS' | translate }}</b> <sup class="text-danger">*</sup>
                     </label>
                     <div class="form-group" ng-class="{'has-danger': editMemberForm.office_email_address.$invalid && !editMemberForm.office_email_address.$pristine }">
                         <div class="input-group">
@@ -416,7 +416,7 @@
 
 
             <label>
-                <b>{{ 'ADMIN_ROLE' | translate }}*</b>
+                <b>{{ 'ADMIN_ROLE' | translate }}</b> <sup class="text-danger">*</sup>
             </label>
             <div class="row">
                 <div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
@@ -455,7 +455,7 @@
                                     required>
                                     <span class="custom-control-indicator"></span>
                                     <span class="custom-control-description">
-                                        {{ 'FALSE' | translate }} <small class="text muted">(d)</small>
+                                        {{ 'FALSE' | translate }} <small class="text muted">({{ 'DEFAULT' | translate }})</small>
                                     </span>
                                 </label>
                             </span>
@@ -476,7 +476,7 @@
             </div>
 
             <label>
-                <b>{{ 'FORMER_STATUS' | translate }}*</b>
+                <b>{{ 'FORMER_STATUS' | translate }}</b> <sup class="text-danger">*</sup>
             </label>
             <div class="row">
                 <div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
@@ -515,7 +515,7 @@
                                     required>
                                     <span class="custom-control-indicator"></span>
                                     <span class="custom-control-description">
-                                        {{ 'FALSE' | translate }} <small class="text muted">(d)</small>
+                                        {{ 'FALSE' | translate }} <small class="text muted">({{ 'DEFAULT' | translate }})</small>
                                     </span>
                                 </label>
                             </span>
@@ -536,7 +536,7 @@
             </div>
 
             <label>
-                <b>{{ 'SUBSCRIBED_STATUS' | translate }}*</b>
+                <b>{{ 'SUBSCRIBED_STATUS' | translate }}</b> <sup class="text-danger">*</sup>
             </label>
             <div class="row">
                 <div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
@@ -557,7 +557,7 @@
                                     required>
                                     <span class="custom-control-indicator"></span>
                                     <span class="custom-control-description">
-                                        {{ 'TRUE' | translate }} <small class="text muted">(d)</small>
+                                        {{ 'TRUE' | translate }} <small class="text muted">({{ 'DEFAULT' | translate }})</small>
                                     </span>
                                 </label>
                             </span>
@@ -593,14 +593,6 @@
                 </div>
             </div>
 
-            <div class="row">
-                <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 text-muted right">
-                    <small>
-                        * {{ 'REQUIRED' | translate }}&nbsp;&nbsp;|&nbsp;&nbsp;d {{ 'DEFAULT' | translate }}
-                    </small>
-                </div>
-            </div>
-
         </div>
         <div class="card-footer right">
           <button class="btn btn-success" role="submit">