gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2391 from rahul2240/dates

Browse source 
Remove picktime
This commit is contained in:
Henne Vogelsang 2019-03-14 20:35:57 +01:00 • committed by GitHub
commit 759d0a920a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/osem-datepickers.js
View file

@ -2,7 +2,6 @@
var today = new Date().toISOString().slice(0, 10);
$(function () {
$("input[id^='datetimepicker']").datetimepicker({
pickTime: true,
useCurrent: false,
sideBySide: true,
autoclose: true,
@ -10,14 +9,12 @@ $(function () {
});
$('.datetimepicker').datetimepicker({
pickTime: true,
useCurrent: false,
sideBySide: true,
format: 'YYYY-MM-DD HH:mm'
});
$("#registration-arrival-datepicker").datetimepicker({
pickTime: true,
useCurrent: false,
minuteStepping: 15,
sideBySide: true,
@ -28,7 +25,6 @@ $(function () {
});
$("#registration-departure-datepicker").datetimepicker({
pickTime: true,
useCurrent: false,
minuteStepping: 15,
sideBySide: true,
@ -53,7 +49,6 @@ $(function () {
});
$("#conference-start-datepicker").datetimepicker({
pickTime: false,
useCurrent: false,
format: "YYYY-MM-DD",
// conference-start-day >= Current_date
@ -61,7 +56,6 @@ $(function () {
});
$("#conference-end-datepicker").datetimepicker({
pickTime: false,
useCurrent: false,
format: "YYYY-MM-DD",
});

8
spec/features/conference_spec.rb
View file

@ -50,6 +50,14 @@ feature Conference do
fill_in 'conference_title', with: 'New Con'
fill_in 'conference_short_title', with: ''
day = Time.zone.today + 10
page
.execute_script("$('#conference-start-datepicker').val('" +
"#{day.strftime('%d/%m/%Y')}')")
page
.execute_script("$('#conference-end-datepicker').val('" +
"#{(day + 7).strftime('%d/%m/%Y')}')")
page.accept_alert do
click_button 'Update Conference'
end