Skip to content

Commit 83190ca

Browse files
nicho90nicho90
committed
Implemented #52
- Added missing German and Portuguese entries in templates - Bug-fixes in controllers - Small design improvements
1 parent ec85e2a commit 83190ca

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1710
-654
lines changed

‎CHANGELOG.md

+25-15
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,29 @@
1+
# Version 1.4.2
2+
3+
- Added diff support in Member- and User-client to see additions, deletions and modifications from current to previous revisions
4+
- Bugfixes & design improvements
5+
- Updated outdated packages
6+
7+
18
# Version 1.4.1
2-
- Added Email Notification to all Members when Review is started (and not pending anymore)
3-
- Added q14 (Custom Files)
4-
- Added Password Generation on Cover Sheet
5-
- bugfixes & style improvements
6-
- Added Debugging for SMTP Connection
7-
8-
>>>>>>> Stashed changes
9+
10+
- Added Email Notification to all Members when Review is started (and not pending anymore)
11+
- Added q14 (Custom Files)
12+
- Added Password Generation on Cover Sheet
13+
- Bugfixes & style improvements
14+
- Added Debugging for SMTP Connection
15+
16+
917
# Version 1.4.0
10-
- Added Reminder Email to be sent out after 7 days of inactivity with still pending reviews.
11-
- Added Revision Number on Output Documents
12-
- Functionality for user to revert Document to Draft Phase after it was already approved (for fixing typos etc.)
13-
- Added downloadable How-To Guide
14-
- Added Cover Sheet Generation
15-
- Status now explicitly listed on Status Overview Page
16-
- various bugfixes
18+
19+
- Added Reminder Email to be sent out after 7 days of inactivity with still pending reviews.
20+
- Added Revision Number on Output Documents
21+
- Functionality for user to revert Document to Draft Phase after it was already approved (for fixing typos etc.)
22+
- Added downloadable How-To Guide
23+
- Added Cover Sheet Generation
24+
- Status now explicitly listed on Status Overview Page
25+
- Various bugfixes
26+
1727

1828
# Version 1.0
19-
- Initial App
29+
- Initial App

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2017 Sitcom Lab
3+
Copyright (c) 2018 Institute for Geoinformatics, Münster
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
# Ethics-app
44

5+
[![License](https://img.shields.io/badge/License-MIT-green.svg)]()
6+
[![Status](https://img.shields.io/badge/Status-maintained-green.svg)]()
7+
[![Slack channel](https://img.shields.io/badge/Slack-channel-e6186d.svg)](https://ethics-app.slack.com/)
8+
59
Ethics-application for the approval of user-studies
610

711
### Background

‎bower.json

+32-32
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
{
2-
"name": "ethics-app",
3-
"version": "0.0.1",
4-
"authors": [
5-
"Nicholas Schiestel <[email protected]>"
6-
],
7-
"description": "Ethics-App for the Institute for Geoinformatics, Münster",
8-
"license": "MIT",
9-
"private": true,
10-
"dependencies": {
11-
"angular": "1.6.4",
12-
"angular-momentjs": "^0.2.2",
13-
"angular-route": "1.6.4",
14-
"angular-sanitize": "1.6.4",
15-
"angular-translate": "^2.11.1",
16-
"bootstrap": "v4.0.0-alpha.6",
17-
"font-awesome": "^4.6.3",
18-
"jquery": "^3.1.0",
19-
"moment": "^2.14.1",
20-
"tether": "^1.3.7",
21-
"flag-icon-css": "^2.0.0",
22-
"underscore": "^1.8.3",
23-
"angular-underscore-module": "^1.0.3",
24-
"angucomplete-alt": "^3.0.0",
25-
"angular-upload": "^1.0.12"
26-
},
27-
"resolutions": {
28-
"angular": "1.6.4",
29-
"angular-route": "1.6.4",
30-
"angular-sanitize": "1.6.4",
31-
"bootstrap": "v4.0.0-alpha.6"
32-
}
33-
}
2+
"name": "ethics-app",
3+
"version": "1.4.2",
4+
"authors": [
5+
"Nicholas Schiestel <[email protected]>"
6+
],
7+
"description": "Application for the approval of user-studies",
8+
"license": "MIT",
9+
"private": true,
10+
"dependencies": {
11+
"angular": "1.6.4",
12+
"angular-momentjs": "^0.2.2",
13+
"angular-route": "1.6.4",
14+
"angular-sanitize": "1.6.4",
15+
"angular-translate": "^2.11.1",
16+
"bootstrap": "v4.0.0-alpha.6",
17+
"font-awesome": "^4.6.3",
18+
"jquery": "^3.1.0",
19+
"moment": "^2.14.1",
20+
"tether": "^1.3.7",
21+
"flag-icon-css": "^2.0.0",
22+
"underscore": "^1.8.3",
23+
"angular-underscore-module": "^1.0.3",
24+
"angucomplete-alt": "^3.0.0",
25+
"angular-upload": "^1.0.12"
26+
},
27+
"resolutions": {
28+
"angular": "1.6.4",
29+
"angular-route": "1.6.4",
30+
"angular-sanitize": "1.6.4",
31+
"bootstrap": "v4.0.0-alpha.6"
32+
}
33+
}

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ethics-app",
3-
"version": "1.4.1",
3+
"version": "1.4.2",
44
"description": "Application for the approval of user-studies",
55
"main": "server.js",
66
"repository": {

‎public/config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ app.constant("config", {
88
member_client: "Ethics-app | Committee",
99
},
1010
appGithub: "https://github.com/sitcomlab/Ethics-app",
11-
appVersion: "v1.0",
11+
appVersion: "1.4.2",
1212
appLanguage: 'en_US',
1313
appYear: moment().format("YYYY"),
1414
timeZone: "Europe/Berlin",

‎public/member-client/js/controllers/document/overviewController.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,8 @@ app.controller("documentOverviewController", function($scope, $rootScope, $route
258258
descriptions: {
259259
language: {
260260
en: true,
261-
de: false,
262-
pt: false
261+
de: $scope.latest_revision.descriptions.de_used,
262+
pt: $scope.latest_revision.descriptions.pt_used
263263
},
264264
history: {
265265
en: {

‎public/member-client/js/controllers/document/reviewController.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,8 @@ app.controller("documentReviewController", function($scope, $rootScope, $routePa
282282
descriptions: {
283283
language: {
284284
en: true,
285-
de: false,
286-
pt: false
285+
de: $scope.latest_revision.descriptions.de_used,
286+
pt: $scope.latest_revision.descriptions.pt_used
287287
},
288288
history: {
289289
en: {

‎public/member-client/js/templates/account/edit.html

+16-24
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<div class="card-block">
1818
<label>
19-
<b>{{ 'USERNAME' | translate }}*</b>
19+
<b>{{ 'USERNAME' | translate }}</b> <sup class="text-danger">*</sup>
2020
</label>
2121
<div class="form-group" ng-class="{'has-danger': editMemberForm.email_address.$invalid && !editMemberForm.email_address.$pristine}">
2222
<div class="input-group">
@@ -52,7 +52,7 @@
5252
<div class="row">
5353
<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
5454
<label>
55-
<b>{{ 'NEW_PASSWORD' | translate }}*</b>
55+
<b>{{ 'NEW_PASSWORD' | translate }}</b> <sup class="text-danger">*</sup>
5656
<small>
5757
<a href="" ng-click="changePassword()">
5858
<span ng-if="!updated_member.new_password">{{ 'CHANGE_PASSWORD' | translate }}</span>
@@ -94,7 +94,7 @@
9494
</div>
9595
<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
9696
<label>
97-
<b>{{ 'NEW_REPEATED_PASSWORD' | translate }}*</b>
97+
<b>{{ 'NEW_REPEATED_PASSWORD' | translate }}</b> <sup class="text-danger">*</sup>
9898
</label>
9999
<div class="form-group" ng-class="{'has-danger': editMemberForm.repeated_password.$invalid && !editMemberForm.repeated_password.$pristine}">
100100
<div class="input-group">
@@ -130,7 +130,7 @@
130130
</div>
131131
<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
132132
<label>
133-
<b>{{ 'OLD_PASSWORD' | translate }}*</b>
133+
<b>{{ 'OLD_PASSWORD' | translate }}</b> <sup class="text-danger">*</sup>
134134
</label>
135135
<div class="form-group" ng-class="{'has-danger': editMemberForm.old_password.$invalid && !editMemberForm.old_password.$pristine}">
136136
<div class="input-group">
@@ -186,7 +186,7 @@
186186
</div>
187187
<div class="col-xs-12 col-sm-12 col-md-5 col-lg-5">
188188
<label>
189-
<b>{{ 'FIRST_NAME' | translate }}*</b>
189+
<b>{{ 'FIRST_NAME' | translate }}</b> <sup class="text-danger">*</sup>
190190
</label>
191191
<div class="form-group" ng-class="{'has-danger': editMemberForm.first_name.$invalid && !editMemberForm.first_name.$pristine }">
192192
<input
@@ -209,7 +209,7 @@
209209
</div>
210210
<div class="col-xs-12 col-sm-12 col-md-5 col-lg-5">
211211
<label>
212-
<b>{{ 'LAST_NAME' | translate }}*</b>
212+
<b>{{ 'LAST_NAME' | translate }}</b> <sup class="text-danger">*</sup>
213213
</label>
214214
<div class="form-group" ng-class="{'has-danger': editMemberForm.last_name.$invalid && !editMemberForm.last_name.$pristine }">
215215
<input
@@ -235,7 +235,7 @@
235235
<div class="row">
236236
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-4">
237237
<label>
238-
<b>{{ 'UNIVERSITY' | translate }}*</b>
238+
<b>{{ 'UNIVERSITY' | translate }}</b> <sup class="text-danger">*</sup>
239239
</label>
240240
<div class="form-group" ng-class="{'has-danger': editMemberForm.university_id.$invalid && !editMemberForm.university_id.$pristine }">
241241
<div class="input-group">
@@ -265,7 +265,7 @@
265265
</div>
266266
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-4">
267267
<label>
268-
<b>{{ 'INSTITUTE' | translate }}*</b>
268+
<b>{{ 'INSTITUTE' | translate }}</b> <sup class="text-danger">*</sup>
269269
</label>
270270
<div class="form-group" ng-class="{'has-danger': editMemberForm.institute_id.$invalid && !editMemberForm.institute_id.$pristine }">
271271
<div class="input-group">
@@ -295,7 +295,7 @@
295295
</div>
296296
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-4">
297297
<label>
298-
<b>{{ 'WORKING_GROUP' | translate }}*</b>
298+
<b>{{ 'WORKING_GROUP' | translate }}</b> <sup class="text-danger">*</sup>
299299
</label>
300300
<div class="form-group" ng-class="{'has-danger': editMemberForm.institute_id.$invalid && !editMemberForm.institute_id.$pristine }">
301301
<div class="input-group">
@@ -379,7 +379,7 @@
379379
</div>
380380
<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
381381
<label>
382-
<b>{{ 'OFFICE_EMAIL_ADDRESS' | translate }}*</b>
382+
<b>{{ 'OFFICE_EMAIL_ADDRESS' | translate }}</b> <sup class="text-danger">*</sup>
383383
</label>
384384
<div class="form-group" ng-class="{'has-danger': editMemberForm.office_email_address.$invalid && !editMemberForm.office_email_address.$pristine }">
385385
<div class="input-group">
@@ -416,7 +416,7 @@
416416

417417

418418
<label>
419-
<b>{{ 'ADMIN_ROLE' | translate }}*</b>
419+
<b>{{ 'ADMIN_ROLE' | translate }}</b> <sup class="text-danger">*</sup>
420420
</label>
421421
<div class="row">
422422
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
@@ -455,7 +455,7 @@
455455
required>
456456
<span class="custom-control-indicator"></span>
457457
<span class="custom-control-description">
458-
{{ 'FALSE' | translate }} <small class="text muted">(d)</small>
458+
{{ 'FALSE' | translate }} <small class="text muted">({{ 'DEFAULT' | translate }})</small>
459459
</span>
460460
</label>
461461
</span>
@@ -476,7 +476,7 @@
476476
</div>
477477

478478
<label>
479-
<b>{{ 'FORMER_STATUS' | translate }}*</b>
479+
<b>{{ 'FORMER_STATUS' | translate }}</b> <sup class="text-danger">*</sup>
480480
</label>
481481
<div class="row">
482482
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
@@ -515,7 +515,7 @@
515515
required>
516516
<span class="custom-control-indicator"></span>
517517
<span class="custom-control-description">
518-
{{ 'FALSE' | translate }} <small class="text muted">(d)</small>
518+
{{ 'FALSE' | translate }} <small class="text muted">({{ 'DEFAULT' | translate }})</small>
519519
</span>
520520
</label>
521521
</span>
@@ -536,7 +536,7 @@
536536
</div>
537537

538538
<label>
539-
<b>{{ 'SUBSCRIBED_STATUS' | translate }}*</b>
539+
<b>{{ 'SUBSCRIBED_STATUS' | translate }}</b> <sup class="text-danger">*</sup>
540540
</label>
541541
<div class="row">
542542
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
@@ -557,7 +557,7 @@
557557
required>
558558
<span class="custom-control-indicator"></span>
559559
<span class="custom-control-description">
560-
{{ 'TRUE' | translate }} <small class="text muted">(d)</small>
560+
{{ 'TRUE' | translate }} <small class="text muted">({{ 'DEFAULT' | translate }})</small>
561561
</span>
562562
</label>
563563
</span>
@@ -593,14 +593,6 @@
593593
</div>
594594
</div>
595595

596-
<div class="row">
597-
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 text-muted right">
598-
<small>
599-
* {{ 'REQUIRED' | translate }}&nbsp;&nbsp;|&nbsp;&nbsp;d {{ 'DEFAULT' | translate }}
600-
</small>
601-
</div>
602-
</div>
603-
604596
</div>
605597
<div class="card-footer right">
606598
<button class="btn btn-success" role="submit">

0 commit comments

Comments
 (0)