Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
atlas
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dataplatform
atlas
Commits
a70d73f8
Commit
a70d73f8
authored
6 years ago
by
pratik24mac
Committed by
nixonrodrigues
6 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-2528 : UI : Allow user to empty date for validity period.
Signed-off-by:
nixonrodrigues
<
nixon@apache.org
>
parent
5bccaa64
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
67 additions
and
20 deletions
+67
-20
AddTimezoneView_tmpl.html
...boardv2/public/js/templates/tag/AddTimezoneView_tmpl.html
+7
-3
AddTimezoneItemView.js
dashboardv2/public/js/views/tag/AddTimezoneItemView.js
+60
-17
No files found.
dashboardv2/public/js/templates/tag/AddTimezoneView_tmpl.html
View file @
a70d73f8
...
...
@@ -15,9 +15,13 @@
* limitations under the License.
-->
<div
class=
"form-group clearfix"
>
<div
class=
"col-sm-8"
>
<label
for=
""
>
Start Time - End Time
</label>
<input
type=
"text"
class=
"form-control"
name=
"timeInterval"
data-id=
"timeInterval"
readonly=
"true"
/>
<div
class=
"col-sm-4"
>
<label
for=
""
>
Start Time
</label>
<input
type=
"text"
class=
"form-control"
name=
"startTime"
data-id=
"startTime"
readonly
/>
</div>
<div
class=
"col-sm-4"
>
<label
for=
""
>
End Time
</label>
<input
type=
"text"
class=
"form-control"
name=
"endTime"
data-id=
"endTime"
readonly
/>
</div>
<div
class=
"col-sm-3"
>
<label
for=
""
>
TimeZone
</label>
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/tag/AddTimezoneItemView.js
View file @
a70d73f8
...
...
@@ -36,14 +36,20 @@ define(['require',
/** ui selector cache */
ui
:
{
close
:
"[data-id='close']"
,
timeInterval
:
'input[name="timeInterval"]'
,
startTime
:
'[data-id="startTime"]'
,
endTime
:
'[data-id="endTime"]'
,
timeZone
:
'[data-id="timeZone"]'
},
/** ui events hash */
events
:
function
()
{
var
events
=
{},
that
=
this
;
events
[
"change "
+
this
.
ui
.
timeInterval
]
=
function
(
e
)
{
events
[
"change "
+
this
.
ui
.
startTime
]
=
function
(
e
)
{
this
.
model
.
set
({
"startTime"
:
this
.
ui
.
startTime
.
val
()
});
this
.
buttonActive
({
isButtonActive
:
true
});
};
events
[
"change "
+
this
.
ui
.
endTime
]
=
function
(
e
)
{
this
.
model
.
set
({
"endTime"
:
this
.
ui
.
endTime
.
val
()
});
this
.
buttonActive
({
isButtonActive
:
true
});
};
events
[
"change "
+
this
.
ui
.
timeZone
]
=
function
(
e
)
{
...
...
@@ -63,36 +69,62 @@ define(['require',
},
onRender
:
function
()
{
var
that
=
this
,
dateObj
=
{
tzstr
=
'<option selected="selected" disabled="disabled">-- Select Timezone --</option>'
,
dateConfig
=
{
"singleDatePicker"
:
true
,
"showDropdowns"
:
true
,
"timePicker"
:
true
,
"timePicker24Hour"
:
true
,
"timePickerSeconds"
:
true
,
"startDate"
:
new
Date
(),
"autoApply"
:
true
,
"autoUpdateInput"
:
false
,
"locale"
:
{
format
:
'YYYY/MM/DD h:mm A'
format
:
'YYYY/MM/DD hh:mm:ss'
,
cancelLabel
:
'Clear'
},
"alwaysShowCalendars"
:
true
},
tzstr
=
'<option selected="selected" disabled="disabled">-- Select Timezone --</option>'
;
startDateObj
=
_
.
extend
({},
dateConfig
),
endDateObj
=
_
.
extend
({},
dateConfig
);
this
.
ui
.
timeZone
.
html
(
tzstr
);
this
.
ui
.
timeZone
.
select2
({
allowClear
:
true
,
data
:
moment
.
tz
.
names
()
});
if
(
this
.
model
.
get
(
'startTime'
)
!==
""
)
{
dateObj
[
"startDate"
]
=
this
.
model
.
get
(
'startTime'
);
dateObj
[
"endDate"
]
=
this
.
model
.
get
(
'endTime'
);
if
(
!
_
.
isEmpty
(
this
.
model
.
get
(
'startTime'
))
||
!
_
.
isEmpty
(
this
.
model
.
get
(
'endTime'
))
||
!
_
.
isEmpty
(
this
.
model
.
get
(
'timeZone'
)))
{
if
(
_
.
isEmpty
(
this
.
model
.
get
(
'startTime'
)))
{
startDateObj
[
"autoUpdateInput"
]
=
false
;
}
else
{
startDateObj
[
"autoUpdateInput"
]
=
true
;
startDateObj
[
"startDate"
]
=
this
.
model
.
get
(
'startTime'
);
}
if
(
_
.
isEmpty
(
this
.
model
.
get
(
'endTime'
)))
{
endDateObj
[
"autoUpdateInput"
]
=
false
;
endDateObj
[
"minDate"
]
=
this
.
model
.
get
(
'startTime'
);
}
else
{
endDateObj
[
"autoUpdateInput"
]
=
true
;
endDateObj
[
"minDate"
]
=
this
.
model
.
get
(
'startTime'
);
endDateObj
[
"startDate"
]
=
this
.
model
.
get
(
'endTime'
);
}
this
.
ui
.
timeZone
.
val
(
this
.
model
.
get
(
'timeZone'
)).
trigger
(
"change"
,
{
'manual'
:
true
});
}
else
{
this
.
ui
.
timeZone
.
html
(
tzstr
);
this
.
model
.
set
(
'startTime'
,
moment
(
dateObj
.
startDate
).
format
(
'YYYY/MM/DD h:mm A'
));
this
.
model
.
set
(
'endTime'
,
moment
(
dateObj
.
startDate
).
format
(
'YYYY/MM/DD h:mm A'
));
this
.
model
.
set
(
'startTime'
,
that
.
ui
.
startTime
.
val
());
this
.
model
.
set
(
'endTime'
,
that
.
ui
.
endTime
.
val
());
}
this
.
ui
.
timeInterval
.
daterangepicker
(
dateObj
).
on
(
'apply.daterangepicker'
,
function
(
ev
,
picker
)
{
that
.
model
.
set
(
'startTime'
,
picker
.
startDate
.
format
(
'YYYY/MM/DD h:mm A'
));
that
.
model
.
set
(
'endTime'
,
picker
.
endDate
.
format
(
'YYYY/MM/DD h:mm A'
));
this
.
ui
.
startTime
.
daterangepicker
(
startDateObj
).
on
(
'apply.daterangepicker'
,
function
(
ev
,
picker
)
{
that
.
ui
.
startTime
.
val
(
picker
.
startDate
.
format
(
'YYYY/MM/DD hh:mm:ss'
));
_
.
extend
(
endDateObj
,
{
"minDate"
:
that
.
ui
.
startTime
.
val
()
})
that
.
endDateInitialize
(
endDateObj
);
that
.
model
.
set
(
'startTime'
,
that
.
ui
.
startTime
.
val
());
}).
on
(
'cancel.daterangepicker'
,
function
(
ev
,
picker
)
{
that
.
ui
.
startTime
.
val
(
''
);
delete
endDateObj
.
minDate
;
that
.
endDateInitialize
(
endDateObj
);
that
.
model
.
set
(
'startTime'
,
that
.
ui
.
startTime
.
val
());
});
$
(
'[name="daterangepicker_start"]'
).
attr
(
'readonly'
,
true
);
$
(
'[name="daterangepicker_end"]'
).
attr
(
'readonly'
,
true
);
this
.
endDateInitialize
(
endDateObj
);
},
buttonActive
:
function
(
option
)
{
var
that
=
this
;
...
...
@@ -110,6 +142,16 @@ define(['require',
this
.
parentView
.
ui
.
checkTimeZone
.
prop
(
'checked'
,
false
);
this
.
parentView
.
modal
.
$el
.
find
(
'button.ok'
).
attr
(
"disabled"
,
true
);
}
},
endDateInitialize
:
function
(
option
)
{
var
that
=
this
;
this
.
ui
.
endTime
.
daterangepicker
(
option
).
on
(
'apply.daterangepicker'
,
function
(
ev
,
picker
)
{
that
.
ui
.
endTime
.
val
(
picker
.
startDate
.
format
(
'YYYY/MM/DD hh:mm:ss'
));
that
.
model
.
set
(
'endTime'
,
that
.
ui
.
endTime
.
val
());
}).
on
(
'cancel.daterangepicker'
,
function
(
ev
,
picker
)
{
that
.
ui
.
endTime
.
val
(
''
);
that
.
model
.
set
(
'endTime'
,
that
.
ui
.
endTime
.
val
());
});
}
});
});
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment