Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
stwkit
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
stw
stwkit
Commits
ea05d579
Commit
ea05d579
authored
Oct 30, 2017
by
Tomas Pettersson
🏸
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
period fixes
parent
216ab7b8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
69 additions
and
73 deletions
+69
-73
src/components/cards.js
src/components/cards.js
+32
-35
src/components/cards.js.map
src/components/cards.js.map
+1
-1
src/components/cards.ts
src/components/cards.ts
+36
-37
No files found.
src/components/cards.js
View file @
ea05d579
...
...
@@ -488,25 +488,12 @@ var STWkit;
self
.
backwardButton
.
textContent
=
'
Backward
'
;
self
.
forwardButton
.
onclick
=
function
()
{
self
.
forward
=
true
;
var
initDate
=
self
.
getInitDate
();
self
.
from
=
initDate
;
initDate
.
add
(
parseInt
(
self
.
durationHours
.
value
),
'
hours
'
);
self
.
to
=
initDate
;
self
.
adjustDateToRange
();
self
.
updateSlider
();
self
.
validate
();
self
.
updateFromStartDate
();
self
.
fireChangeFn
(
self
);
};
self
.
backwardButton
.
onclick
=
function
()
{
self
.
forward
=
false
;
var
initDate
=
moment
.
utc
();
var
initDate
=
self
.
getInitDate
();
self
.
to
=
initDate
;
initDate
.
subtract
(
parseInt
(
self
.
durationHours
.
value
),
'
hours
'
);
self
.
from
=
initDate
;
self
.
adjustDateToRange
();
self
.
updateSlider
();
self
.
validate
();
self
.
updateFromStartDate
();
self
.
fireChangeFn
(
self
);
};
var
clearDiv
=
L
.
DomUtil
.
create
(
'
div
'
,
'
uk-clearfix
'
,
periodDiv
);
...
...
@@ -599,15 +586,6 @@ var STWkit;
});
return
_this
;
}
PeriodCard
.
prototype
.
getInitDate
=
function
()
{
var
self
=
this
;
var
initDate
=
moment
.
utc
();
if
(
self
.
obsdate
)
initDate
=
self
.
obsdate
;
if
(
initDate
.
isBefore
(
self
.
minDate
)
||
initDate
.
isAfter
(
self
.
maxDate
))
initDate
=
self
.
minDate
;
return
initDate
;
};
PeriodCard
.
prototype
.
changeFn
=
function
(
changeCard
)
{
var
self
=
this
;
if
((
typeof
changeCard
.
obsDateInput
!==
'
undefined
'
)
&&
(
typeof
changeCard
.
obsTimeInput
!==
'
undefined
'
))
{
...
...
@@ -668,8 +646,10 @@ var STWkit;
var
sliderOpt
=
{};
sliderOpt
[
'
from
'
]
=
self
.
from
.
format
(
"
X
"
);
sliderOpt
[
'
to
'
]
=
self
.
to
.
format
(
"
X
"
);
self
.
slider
.
update
(
sliderOpt
);
self
.
validate
();
if
(
self
.
slider
)
{
self
.
slider
.
update
(
sliderOpt
);
self
.
validate
();
}
};
PeriodCard
.
prototype
.
adjustDateToRange
=
function
()
{
var
self
=
this
;
...
...
@@ -725,22 +705,39 @@ var STWkit;
geojson
.
features
[
0
].
properties
[
"
simulation
"
][
"
stopDate
"
]
=
self
.
from
.
valueOf
();
}
};
PeriodCard
.
prototype
.
updateFromStartDate
=
function
()
{
var
self
=
this
;
var
date
=
moment
.
utc
(
self
.
startDateInput
.
value
+
'
'
+
self
.
startTimeInput
.
value
,
self
.
datetimeFormat
);
if
(
self
.
forward
)
{
self
.
from
=
date
.
clone
();
self
.
to
=
date
.
clone
().
add
(
self
.
durationHours
.
value
,
'
hours
'
);
}
else
{
self
.
to
=
date
.
clone
();
self
.
from
=
date
.
clone
().
subtract
(
parseInt
(
self
.
durationHours
.
value
),
'
hours
'
);
}
self
.
adjustDateToRange
();
self
.
updateSlider
();
self
.
validate
();
};
PeriodCard
.
prototype
.
getInitDate
=
function
()
{
var
self
=
this
;
var
initDate
=
moment
.
utc
();
if
(
self
.
obsdate
)
initDate
=
self
.
obsdate
;
if
(
initDate
.
isBefore
(
self
.
minDate
)
||
initDate
.
isAfter
(
self
.
maxDate
))
initDate
=
self
.
minDate
;
return
initDate
;
};
PeriodCard
.
prototype
.
clear
=
function
()
{
var
self
=
this
;
_super
.
prototype
.
clear
.
call
(
this
);
self
.
forward
=
true
;
var
initDate
=
self
.
getInitDate
();
self
.
startDateInput
.
value
=
initDate
.
format
(
self
.
dateFormat
);
self
.
startTimeInput
.
value
=
initDate
.
startOf
(
'
hour
'
).
format
(
self
.
timeFormat
);
self
.
forward
=
true
;
self
.
durationHours
.
value
=
'
0
'
;
self
.
from
=
initDate
.
clone
();
self
.
to
=
initDate
.
clone
().
add
(
self
.
durationHours
.
value
,
'
hours
'
);
if
(
self
.
slider
)
{
var
sliderOpt
=
{};
sliderOpt
[
'
from
'
]
=
self
.
from
.
format
(
"
X
"
);
sliderOpt
[
'
to
'
]
=
self
.
to
.
format
(
"
X
"
);
self
.
slider
.
update
(
sliderOpt
);
}
self
.
updateFromStartDate
();
if
(
document
.
body
.
contains
(
self
.
forwardButton
))
self
.
forwardButton
.
click
();
AccordionCard
.
enableNext
(
self
.
nextButton
,
false
);
...
...
src/components/cards.js.map
View file @
ea05d579
This source diff could not be displayed because it is too large. You can
view the blob
instead.
src/components/cards.ts
View file @
ea05d579
...
...
@@ -540,27 +540,12 @@ module STWkit {
self
.
forwardButton
.
onclick
=
function
()
{
self
.
forward
=
true
;
var
initDate
=
self
.
getInitDate
();
self
.
from
=
initDate
;
initDate
.
add
(
parseInt
(
self
.
durationHours
.
value
),
'
hours
'
);
self
.
to
=
initDate
;
self
.
adjustDateToRange
();
self
.
updateSlider
();
self
.
validate
();
self
.
updateFromStartDate
();
self
.
fireChangeFn
(
self
);
};
self
.
backwardButton
.
onclick
=
function
()
{
self
.
forward
=
false
;
var
initDate
=
moment
.
utc
();
var
initDate
=
self
.
getInitDate
();
self
.
to
=
initDate
;
initDate
.
subtract
(
parseInt
(
self
.
durationHours
.
value
),
'
hours
'
);
self
.
from
=
initDate
;
self
.
adjustDateToRange
();
self
.
updateSlider
();
self
.
validate
();
self
.
updateFromStartDate
();
self
.
fireChangeFn
(
self
);
};
...
...
@@ -663,13 +648,6 @@ module STWkit {
});
}
private
getInitDate
()
{
var
self
=
this
;
var
initDate
=
moment
.
utc
();
if
(
self
.
obsdate
)
initDate
=
self
.
obsdate
;
if
(
initDate
.
isBefore
(
self
.
minDate
)
||
initDate
.
isAfter
(
self
.
maxDate
))
initDate
=
self
.
minDate
;
return
initDate
;
}
public
changeFn
(
changeCard
)
{
var
self
=
this
;
...
...
@@ -731,8 +709,10 @@ module STWkit {
var
sliderOpt
=
{};
sliderOpt
[
'
from
'
]
=
self
.
from
.
format
(
"
X
"
);
sliderOpt
[
'
to
'
]
=
self
.
to
.
format
(
"
X
"
);
self
.
slider
.
update
(
sliderOpt
);
self
.
validate
();
if
(
self
.
slider
)
{
self
.
slider
.
update
(
sliderOpt
);
self
.
validate
();
}
}
...
...
@@ -787,23 +767,42 @@ module STWkit {
geojson
.
features
[
0
].
properties
[
"
simulation
"
][
"
stopDate
"
]
=
self
.
from
.
valueOf
();
}
}
private
updateFromStartDate
()
{
var
self
=
this
;
var
date
=
moment
.
utc
(
self
.
startDateInput
.
value
+
'
'
+
self
.
startTimeInput
.
value
,
self
.
datetimeFormat
)
if
(
self
.
forward
)
{
self
.
from
=
date
.
clone
();
self
.
to
=
date
.
clone
().
add
(
self
.
durationHours
.
value
,
'
hours
'
);
}
else
{
self
.
to
=
date
.
clone
();
self
.
from
=
date
.
clone
().
subtract
(
parseInt
(
self
.
durationHours
.
value
),
'
hours
'
);
}
self
.
adjustDateToRange
();
self
.
updateSlider
();
self
.
validate
();
}
private
getInitDate
()
{
var
self
=
this
;
var
initDate
=
moment
.
utc
();
if
(
self
.
obsdate
)
initDate
=
self
.
obsdate
;
if
(
initDate
.
isBefore
(
self
.
minDate
)
||
initDate
.
isAfter
(
self
.
maxDate
))
initDate
=
self
.
minDate
;
return
initDate
;
}
public
clear
()
{
var
self
=
this
;
super
.
clear
();
self
.
forward
=
true
;
var
initDate
=
self
.
getInitDate
();
self
.
startDateInput
.
value
=
initDate
.
format
(
self
.
dateFormat
);
self
.
startTimeInput
.
value
=
initDate
.
startOf
(
'
hour
'
).
format
(
self
.
timeFormat
);
self
.
forward
=
true
;
self
.
startTimeInput
.
value
=
initDate
.
startOf
(
'
hour
'
).
format
(
self
.
timeFormat
);
self
.
durationHours
.
value
=
'
0
'
;
self
.
from
=
initDate
.
clone
();
self
.
to
=
initDate
.
clone
().
add
(
self
.
durationHours
.
value
,
'
hours
'
);
if
(
self
.
slider
)
{
var
sliderOpt
=
{};
sliderOpt
[
'
from
'
]
=
self
.
from
.
format
(
"
X
"
);
sliderOpt
[
'
to
'
]
=
self
.
to
.
format
(
"
X
"
);
self
.
slider
.
update
(
sliderOpt
);
}
self
.
updateFromStartDate
();
if
(
document
.
body
.
contains
(
self
.
forwardButton
))
self
.
forwardButton
.
click
();
AccordionCard
.
enableNext
(
self
.
nextButton
,
false
);
...
...
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