diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js index dde8bc823..0cab04359 100644 --- a/app/assets/javascripts/admin.js +++ b/app/assets/javascripts/admin.js @@ -9,6 +9,7 @@ //= require bootstrap-notify //= require jquery.cookie.min //= require select2 +//= require moment.min //= require jquery.cxselect //= require bootstrap-datepicker //= require bootstrap-datetimepicker diff --git a/app/assets/javascripts/admins/competition_settings/index.js b/app/assets/javascripts/admins/competition_settings/index.js index cd10aeb4f..fa533f1d3 100644 --- a/app/assets/javascripts/admins/competition_settings/index.js +++ b/app/assets/javascripts/admins/competition_settings/index.js @@ -9,9 +9,9 @@ $(document).on('turbolinks:load', function(){ }; var timeOptions = { - autoclose: true, + autoclose: 1, language: 'zh-CN', - format: 'yyyy-mm-dd hh:ii:ss', + format: 'yyyy-mm-dd hh:ii', minuteStep: 30 }; @@ -23,18 +23,17 @@ $(document).on('turbolinks:load', function(){ $(element).find('.end-date').datepicker('setStartDate', e.date); }); }; + $(".competition-start-end-date .start-date").datetimepicker(timeOptions); + + $(".competition-start-end-date .end-date").datetimepicker(timeOptions); + + $(".nav-setting-form .enroll_end_time").datetimepicker(timeOptions); - // var defineTimeRangeSelect = function (element) { - // var options = $.extend({inputs: $(element).find('.start-date, .end-date')}, timeOptions); - // $(element).datetimepicker(options); - // - // $(element).find('.start-date').datetimepicker().on('changeDate', function (e) { - // $(element).find('.end-date').datetimepicker('setStartDate', e.date); - // }); - // }; + $(".stage-update-form .section-start-time").datetimepicker(timeOptions); + $(".stage-update-form .section-end-time").datetimepicker(timeOptions); defineDateRangeSelect('.teaching-mode-date'); - defineDateRangeSelect('.competition-start-end-date'); + // defineTimeRangeSelect('.competition-start-end-date'); var $basicForm = $('form.basic-setting-form'); @@ -59,13 +58,13 @@ $(document).on('turbolinks:load', function(){ if ($("input[name='mode']:checked").val() == 2) { var $courseId = $("input[name='course_id'"); - if ($courseId.val() === undefined || $course_id.val().length === 0) { + if ($courseId.val() === undefined || $courseId.val().length === 0) { $courseId.addClass('danger text-danger'); valid = false; } else { $courseId.removeClass('danger text-danger'); } - } else if ($("input[name='mode']:checked").val() == 4) { + } else if ($("input[name='mode']:checked").val() == 3) { var $techStartTime = $("input[name='teach_start_time'"); var $techEndTime = $("input[name='teach_end_time'"); if ($techStartTime.val() === undefined || $techStartTime.val().length === 0) { @@ -81,6 +80,10 @@ $(document).on('turbolinks:load', function(){ } else { $techEndTime.removeClass('danger text-danger'); } + } else { + $("input[name='course_id'").removeClass('danger text-danger'); + $("input[name='teach_start_time'").removeClass('danger text-danger'); + $("input[name='teach_end_time'").removeClass('danger text-danger'); } if (!valid) return; @@ -104,97 +107,614 @@ $(document).on('turbolinks:load', function(){ } }); }); + + var selectOptions = { + theme: 'bootstrap4', + placeholder: '请输入要添加的单位名称', + multiple: true, + minimumInputLength: 1, + ajax: { + delay: 500, + url: '/api/schools/for_option.json', + dataType: 'json', + data: function(params){ + return { keyword: params.term }; + }, + processResults: function(data){ + return { results: data.schools } + } + }, + templateResult: function (item) { + if(!item.id || item.id === '') return item.text; + return item.name || item.text; + }, + templateSelection: function(item){ + return item.name || item.text; + } + }; + + $('.sponsor-select').select2(selectOptions); + $('.allow-school-select').select2(selectOptions); + + + // 排行榜 + //链接 + $(".nav-setting-form").on("click",".add_linkBtn",function () { + var length=$(".nav-setting-form").find(".linkFormItem").length + 1; + var html='