Browse Source

Fix date range js

Julio Montoya 9 years ago
parent
commit
d6ecdfed7b

+ 2 - 2
app/config/assetic.yml

@@ -55,6 +55,7 @@ assetic:
 #                - bundles/chamilocore/components/adminlte/css/iCheck/all.css
 #                - bundles/chamilocore/components/adminlte/css/ionslider/ion.rangeSlider.css
 #                - bundles/chamilocore/components/adminlte/css/timepicker/bootstrap-timepicker.css
+                - bundles/chamilocore/components/bootstrap-daterangepicker/daterangepicker-bs3.css
                 - bundles/chamilocore/components/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.css
                 - bundles/chamilocore/components/adminlte/dist/css/skins/_all-skins.min.css
                 - bundles/chamilocore/components/adminlte/dist/css/AdminLTE.css
@@ -90,8 +91,7 @@ assetic:
                 - bundles/chamilocore/components/jquery-file-upload/js/jquery.fileupload-audio.js
                 - bundles/chamilocore/components/jquery-file-upload/js/jquery.fileupload-video.js
                 - bundles/chamilocore/components/jquery-file-upload/js/jquery.fileupload-validate.js
+                - bundles/chamilocore/components/bootstrap-daterangepicker/daterangepicker.js
                 - bundles/chamilocore/components/adminlte/dist/js/app.js
-#                - bundles/chamilocore/components/adminlte/js/plugins/daterangepicker/daterangepicker.js
-
 
             output: js/chamilo.js

+ 2 - 2
main/calendar/agenda.php

@@ -70,8 +70,8 @@ $actions = $agenda->displayActions('calendar');
 
 if ($type == 'fromjs') {
     $id_list = explode('_', $eventId);
-    $eventId = $id_list[1];
-    $event_type = $id_list[0];
+    $eventId = isset($id_list[1]) ? $id_list[1] : '';
+    $event_type = isset($id_list[0]) ? $id_list[0] : '';
 }
 
 if (!api_is_allowed_to_edit(null, true) && $event_type == 'course') {

+ 24 - 24
main/inc/lib/formvalidator/Element/DateRangePicker.php

@@ -95,31 +95,31 @@ class DateRangePicker extends HTML_QuickForm_text
 
         // timeFormat: 'hh:mm'
         $js .= "<script>
-            $(function() {
-                $('#$id').daterangepicker({
-                    format: '$format',
-                    timePicker: $timePicker,
-                    timePickerIncrement: 30,
-                    timePicker12Hour: false,
-                    $defaultDates
-                    $maxDate
-                    $minDate
-                    ranges: {
-                         '".addslashes(get_lang('Today'))."': [moment(), moment()],
-                         '".addslashes(get_lang('ThisWeek'))."': [moment().weekday(1), moment().weekday(5)],
-                         '".addslashes(get_lang('NextWeek'))."': [moment().weekday(8), moment().weekday(12)]
-                    },
-                    //showDropdowns : true,
-                    separator: ' / ',
-                    locale: {
-                        applyLabel: '".addslashes(get_lang('Ok'))."',
-                        cancelLabel: '".addslashes(get_lang('Cancel'))."',
-                        fromLabel: '".addslashes(get_lang('From'))."',
-                        toLabel: '".addslashes(get_lang('Until'))."',
-                        customRangeLabel: '".addslashes(get_lang('CustomRange'))."',
-                    }
-                });
+        $(function() {
+            $('#$id').daterangepicker({
+                format: '$format',
+                timePicker: $timePicker,
+                timePickerIncrement: 30,
+                timePicker12Hour: false,
+                $defaultDates
+                $maxDate
+                $minDate
+                ranges: {
+                     '".addslashes(get_lang('Today'))."': [moment(), moment()],
+                     '".addslashes(get_lang('ThisWeek'))."': [moment().weekday(1), moment().weekday(5)],
+                     '".addslashes(get_lang('NextWeek'))."': [moment().weekday(8), moment().weekday(12)]
+                },
+                //showDropdowns : true,
+                separator: ' / ',
+                locale: {
+                    applyLabel: '".addslashes(get_lang('Ok'))."',
+                    cancelLabel: '".addslashes(get_lang('Cancel'))."',
+                    fromLabel: '".addslashes(get_lang('From'))."',
+                    toLabel: '".addslashes(get_lang('Until'))."',
+                    customRangeLabel: '".addslashes(get_lang('CustomRange'))."',
+                }
             });
+        });
         </script>";
 
         return $js;