Skip to content

Commit

Permalink
Merge pull request #1015 from compsy/master
Browse files Browse the repository at this point in the history 
Fix hidden items in questionnaire preview + gem updates
  • Loading branch information
@emerencia
emerencia committed Aug 19, 2019
2 parents aa5acef + 0f8802c commit f7b61b1
Show file tree
Hide file tree
Showing 6 changed files with 457 additions and 327 deletions.
51 changes: 51 additions & 0 deletions .zenodo.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"description": "Vroegtijdig School Verlaten Dagboekonderzoek",
"license": "MIT",
"title": "the u-can-act Web-app",
"version": "v1.0",
"upload_type": "software",
"publication_date": "2019-06-15",
"creators": [
{
"affiliation": "University of Groningen",
"name": "A. C. Emerencia"
},
{
"affiliation": "University of Groningen / Researchable",
"name": "F. J. Blaauw"
},
{
"affiliation": "University of Groningen",
"name": "N.R. Snell"
},
{
"affiliation": "Umanise",
"name": "T. Blijlevens"
},
{
"affiliation": "University of Groningen",
"name": "E. S. Kunnen"
},
{
"affiliation": "University of Groningen",
"name": P. de Jonge"
},
{
"affiliation": "University of Groningen",
"name": "Mandy van der Gaag"
}
],
"access_right": "open",
"related_identifiers": [
{
"scheme": "url",
"identifier": "https://github.com/compsy/vsv/tree/v1.0",
"relation": "isSupplementTo"
},
{
"scheme": "doi",
"identifier": "10.5281/zenodo.3246670",
"relation": "isVersionOf"
}
]
}
86 changes: 43 additions & 43 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ GEM
tzinfo (~> 1.1)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
appsignal (2.9.8)
appsignal (2.9.11)
rack
arel (8.0.0)
ast (2.4.0)
Expand All @@ -87,7 +87,7 @@ GEM
bson (4.5.0)
builder (3.2.3)
byebug (11.0.1)
capybara (3.23.0)
capybara (3.28.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
Expand Down Expand Up @@ -128,11 +128,11 @@ GEM
delayed_job (>= 3.0, < 5)
diff-lcs (1.3)
docile (1.3.1)
domain_name (0.5.20180417)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.7.2)
dotenv-rails (2.7.2)
dotenv (= 2.7.2)
dotenv (2.7.5)
dotenv-rails (2.7.5)
dotenv (= 2.7.5)
railties (>= 3.2, < 6.1)
erubi (1.8.0)
erubis (2.7.0)
Expand Down Expand Up @@ -189,7 +189,7 @@ GEM
i18n-js (3.3.0)
i18n (>= 0.6.6)
iban-tools (1.1.0)
jaro_winkler (1.5.2)
jaro_winkler (1.5.3)
jbuilder (2.9.1)
activesupport (>= 4.2.0)
json (2.2.0)
Expand All @@ -206,7 +206,7 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
lograge (0.11.1)
lograge (0.11.2)
actionpack (>= 4)
activesupport (>= 4)
railties (>= 4)
Expand All @@ -217,16 +217,16 @@ GEM
lumberjack (1.0.13)
mail (2.7.1)
mini_mime (>= 0.1.1)
mailgun-ruby (1.1.11)
mailgun-ruby (1.2.0)
rest-client (~> 2.0.2)
materialize-sass (1.0.0)
autoprefixer-rails (>= 6.0.3)
messagebird-rest (1.4.1)
messagebird-rest (1.4.2)
method_source (0.9.2)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.0331)
mini_mime (1.0.1)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
mini_racer (0.2.6)
libv8 (>= 6.9.411)
Expand All @@ -235,14 +235,14 @@ GEM
moneta (1.0.0)
mongo (2.8.0)
bson (>= 4.4.2, < 5.0.0)
mongoid (7.0.3)
mongoid (7.0.4)
activemodel (>= 5.1, < 6.0.0)
mongo (>= 2.5.1, < 3.0.0)
multi_json (1.13.1)
nenv (0.3.0)
netrc (0.11.0)
nio4r (2.3.1)
nokogiri (1.10.3)
nio4r (2.4.0)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
notiffany (0.1.1)
nenv (~> 0.1)
Expand All @@ -259,8 +259,9 @@ GEM
method_source (~> 0.9.0)
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (3.1.0)
puma (3.12.1)
public_suffix (3.1.1)
puma (4.1.0)
nio4r (~> 2.0)
rack (2.0.7)
rack-cors (1.0.3)
rack-proxy (0.6.5)
Expand All @@ -286,7 +287,7 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
rails-html-sanitizer (1.2.0)
loofah (~> 2.2, >= 2.2.2)
rails-i18n (5.1.3)
i18n (>= 0.7, < 2)
Expand All @@ -298,19 +299,19 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (3.0.0)
rake (12.3.2)
rake (12.3.3)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
react-rails (2.5.0)
react-rails (2.6.0)
babel-transpiler (>= 0.7.0)
connection_pool
execjs
railties (>= 3.2)
tilt
react-source (0.13.3)
redis (4.1.2)
regexp_parser (1.5.1)
regexp_parser (1.6.0)
request_store (1.4.1)
rack (>= 1.4)
rest-client (2.0.2)
Expand Down Expand Up @@ -340,19 +341,19 @@ GEM
rspec-support (3.8.2)
rspec_junit_formatter (0.4.1)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (0.71.0)
rubocop (0.74.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.6)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
rubocop-performance (1.3.0)
rubocop (>= 0.68.0)
rubocop-rails (2.0.1)
rubocop-performance (1.4.0)
rubocop (>= 0.71.0)
rubocop-rails (2.3.0)
rack (>= 1.1)
rubocop (>= 0.70.0)
rubocop-rspec (1.33.0)
rubocop (>= 0.72.0)
rubocop-rspec (1.35.0)
rubocop (>= 0.60.0)
ruby-progressbar (1.10.1)
ruby_dep (1.5.0)
Expand All @@ -361,17 +362,17 @@ GEM
rubyzip (1.2.3)
rush (0.6.8)
session
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.7)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sass-rails (6.0.0)
sassc-rails (~> 2.1, >= 2.1.1)
sassc (2.0.1)
ffi (~> 1.9)
rake
sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
selenium-webdriver (3.142.3)
childprocess (>= 0.5, < 2.0)
rubyzip (~> 1.2, >= 1.2.2)
Expand All @@ -385,8 +386,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
snitcher (0.4.1)
spring (2.0.2)
activesupport (>= 4.2)
spring (2.1.0)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
spring-watcher-listen (2.0.1)
Expand All @@ -409,7 +409,7 @@ GEM
tins (1.20.3)
tzinfo (1.2.5)
thread_safe (~> 0.1)
tzinfo-data (1.2019.1)
tzinfo-data (1.2019.2)
tzinfo (>= 1.0.0)
uglifier (4.1.20)
execjs (>= 0.3.0, < 3)
Expand All @@ -422,10 +422,10 @@ GEM
activemodel (>= 5.0)
bindex (>= 0.4.0)
railties (>= 5.0)
webdrivers (4.0.0)
webdrivers (4.1.2)
nokogiri (~> 1.6)
rubyzip (~> 1.0)
selenium-webdriver (~> 3.0)
selenium-webdriver (>= 3.0, < 4.0)
webpacker (4.0.7)
activesupport (>= 4.2)
rack-proxy (>= 0.6.1)
Expand Down Expand Up @@ -508,4 +508,4 @@ RUBY VERSION
ruby 2.6.3p62

BUNDLED WITH
2.0.1
2.0.2
3 changes: 3 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# VSV
Ruby Application for the Vroegtijdig School Verlaten Dagboekonderzoek

[![DOI][zenodo-image]][zenodo-url]
[![Circle CI][circleci-image]][circleci-url]
[![Coverage Status][coveralls-image]][coveralls-url]
[![Dependabot Status][dependabot-image]](dependabot-url)
Expand Down Expand Up @@ -727,6 +728,8 @@ Image can be the URL of an image, or the filename of an image that exists in the

The only optional parameters are `radius` and `density`. They default to 15 and 40, respectively.

[zenodo-image]: https://zenodo.org/badge/84442919.svg
[zenodo-url]: https://zenodo.org/badge/latestdoi/84442919

[circleci-image]: https://circleci.com/gh/compsy/vsv.svg?style=svg&circle-token=482ba30c54a4a181d02f22c3342112d11d6e0e8a
[circleci-url]: https://circleci.com/gh/compsy/vsv
Expand Down
2 changes: 1 addition & 1 deletion app/views/questionnaire/interactive.html.haml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
.row
%button.btn.waves-effect.waves-light{name: 'action', id: 'action'} Submit
%h3.example-title{style: "display: none;"} Example questionnaire
.result
.result.mentor
50 changes: 27 additions & 23 deletions public/javascripts/i18n.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -889,29 +889,30 @@
//
// The accepted formats are:
//
// %a - The abbreviated weekday name (Sun)
// %A - The full weekday name (Sunday)
// %b - The abbreviated month name (Jan)
// %B - The full month name (January)
// %c - The preferred local date and time representation
// %d - Day of the month (01..31)
// %-d - Day of the month (1..31)
// %H - Hour of the day, 24-hour clock (00..23)
// %-H - Hour of the day, 24-hour clock (0..23)
// %I - Hour of the day, 12-hour clock (01..12)
// %-I - Hour of the day, 12-hour clock (1..12)
// %m - Month of the year (01..12)
// %-m - Month of the year (1..12)
// %M - Minute of the hour (00..59)
// %-M - Minute of the hour (0..59)
// %p - Meridian indicator (AM or PM)
// %S - Second of the minute (00..60)
// %-S - Second of the minute (0..60)
// %w - Day of the week (Sunday is 0, 0..6)
// %y - Year without a century (00..99)
// %-y - Year without a century (0..99)
// %Y - Year with century
// %z - Timezone offset (+0545)
// %a - The abbreviated weekday name (Sun)
// %A - The full weekday name (Sunday)
// %b - The abbreviated month name (Jan)
// %B - The full month name (January)
// %c - The preferred local date and time representation
// %d - Day of the month (01..31)
// %-d - Day of the month (1..31)
// %H - Hour of the day, 24-hour clock (00..23)
// %-H - Hour of the day, 24-hour clock (0..23)
// %I - Hour of the day, 12-hour clock (01..12)
// %-I/%l - Hour of the day, 12-hour clock (1..12)
// %m - Month of the year (01..12)
// %-m - Month of the year (1..12)
// %M - Minute of the hour (00..59)
// %-M - Minute of the hour (0..59)
// %p - Meridian indicator (AM or PM)
// %P - Meridian indicator (am or pm)
// %S - Second of the minute (00..60)
// %-S - Second of the minute (0..60)
// %w - Day of the week (Sunday is 0, 0..6)
// %y - Year without a century (00..99)
// %-y - Year without a century (0..99)
// %Y - Year with century
// %z/%Z - Timezone offset (+0545)
//
I18n.strftime = function(date, format) {
var options = this.lookup("date")
Expand Down Expand Up @@ -962,18 +963,21 @@
format = format.replace("%-H", hour);
format = format.replace("%I", padding(hour12));
format = format.replace("%-I", hour12);
format = format.replace("%l", hour12);
format = format.replace("%m", padding(month));
format = format.replace("%-m", month);
format = format.replace("%M", padding(mins));
format = format.replace("%-M", mins);
format = format.replace("%p", meridianOptions[meridian]);
format = format.replace("%P", meridianOptions[meridian].toLowerCase());
format = format.replace("%S", padding(secs));
format = format.replace("%-S", secs);
format = format.replace("%w", weekDay);
format = format.replace("%y", padding(year));
format = format.replace("%-y", padding(year).replace(/^0+/, ""));
format = format.replace("%Y", year);
format = format.replace("%z", timezoneoffset);
format = format.replace("%Z", timezoneoffset);

return format;
};
Expand Down

0 comments on commit f7b61b1

Please sign in to comment.