Merge branch 'master' into develop

LimeSurvey · Oct 2, 2018 · 61f0f60 · 61f0f60
2 parents 6d9a080 + 30bfe26
commit 61f0f60
Show file tree

Hide file tree

Showing 5 changed files with 9,808 additions and 9,277 deletions.
diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
@@ -1123,7 +1123,8 @@ function do_date($ia)
             'maxdate'                => $maxdate,
             'dateformatdetails'      => $dateformatdetails['dateformat'],
             'dateformatdetailsjs'    => $dateformatdetails['jsdate'],
-            'dateformatdetailsphp'    => $dateformatdetails['phpdate'],
+            'dateformatdetailsphp'   => $dateformatdetails['phpdate'],
+            'minuteStep'             => $aQuestionAttributes['dropdown_dates_minute_step'],
             'goodchars'              => "", // "return window.LS.goodchars(event,'".$goodchars."')", //  This won't work with non-latin keyboards
             'checkconditionFunction' => $checkconditionFunction.'(this.value, this.name, this.type)',
             'language'               => App()->language,

diff --git a/application/helpers/questionHelper.php b/application/helpers/questionHelper.php
@@ -1406,7 +1406,7 @@ public static function getAttributesDefinitions()
             'sortorder'=>100,
             "inputtype"=>"integer",
             'default'=>1,
-            "help"=>gT("Minute step interval when using select boxes"),
+            "help"=>gT("Visual minute step interval"),
             "caption"=>gT("Minute step interval")
         );
 

diff --git a/application/views/survey/questions/answer/date/selector/answer.twig b/application/views/survey/questions/answer/date/selector/answer.twig
@@ -54,6 +54,7 @@
             'format' : dateformatdetailsjs,
             'minDate' : mindate[0] == '{' ? '1900-01-01' : mindate,
             'maxDate' : maxdate[0] == '{' ? '2037-12-31' : maxdate,
+            'stepping' : minuteStep,
             'sideBySide' :  true
         })
     %}