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
1b43a570
Commit
1b43a570
authored
Oct 30, 2017
by
Tomas Pettersson
🏸
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
obsdate can now affect start date on period
parent
959af3ad
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
42 additions
and
18 deletions
+42
-18
demo/index.html
demo/index.html
+3
-2
src/components/cards.js
src/components/cards.js
+18
-8
src/components/cards.js.map
src/components/cards.js.map
+1
-1
src/components/cards.ts
src/components/cards.ts
+20
-7
No files found.
demo/index.html
View file @
1b43a570
...
...
@@ -186,11 +186,12 @@
var
oiltypeoptions
=
{};
oiltypeoptions
[
'
type
'
]
=
type
;
oiltypeoptions
[
'
initials
'
]
=
initials
;
// oiltypeoptions['stateofoil'] = false;
// oiltypeoptions['stateofoil'] = false;
var
oiltypeid
=
'
oiltypeCard
'
;
this
.
cardMap
[
oiltypeid
]
=
new
STWkit
.
OilTypeCard
(
oiltypeid
,
'
Type of oil
'
,
this
.
accordionDiv
,
this
.
lang
,
map
,
oiltypeoptions
);
this
.
cardMap
[
periodid
].
addChangeFnListener
(
this
.
cardMap
[
oiltypeid
]);
this
.
cardMap
[
locationid
].
addChangeFnListener
(
this
.
cardMap
[
periodid
]);
super
.
setup
(
map
);
var
chain
=
[];
...
...
src/components/cards.js
View file @
1b43a570
...
...
@@ -488,9 +488,7 @@ var STWkit;
self
.
backwardButton
.
textContent
=
'
Backward
'
;
self
.
forwardButton
.
onclick
=
function
()
{
self
.
forward
=
true
;
var
initDate
=
moment
.
utc
();
if
(
initDate
.
isBefore
(
self
.
minDate
)
||
initDate
.
isAfter
(
self
.
maxDate
))
initDate
=
self
.
minDate
;
var
initDate
=
self
.
getInitDate
();
self
.
from
=
initDate
;
initDate
.
add
(
parseInt
(
self
.
durationHours
.
value
),
'
hours
'
);
self
.
to
=
initDate
;
...
...
@@ -502,8 +500,7 @@ var STWkit;
self
.
backwardButton
.
onclick
=
function
()
{
self
.
forward
=
false
;
var
initDate
=
moment
.
utc
();
if
(
initDate
.
isBefore
(
self
.
minDate
)
||
initDate
.
isAfter
(
self
.
maxDate
))
initDate
=
self
.
minDate
;
var
initDate
=
self
.
getInitDate
();
self
.
to
=
initDate
;
initDate
.
subtract
(
parseInt
(
self
.
durationHours
.
value
),
'
hours
'
);
self
.
from
=
initDate
;
...
...
@@ -602,6 +599,21 @@ 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
'
))
{
self
.
obsdate
=
moment
.
utc
(
changeCard
.
obsDateInput
.
value
+
'
'
+
changeCard
.
obsTimeInput
.
value
,
self
.
datetimeFormat
).
valueOf
();
}
};
PeriodCard
.
prototype
.
isDateValid
=
function
(
date
)
{
var
self
=
this
;
if
(
!
date
.
isValid
())
...
...
@@ -714,9 +726,7 @@ var STWkit;
PeriodCard
.
prototype
.
clear
=
function
()
{
var
self
=
this
;
_super
.
prototype
.
clear
.
call
(
this
);
var
initDate
=
moment
.
utc
();
if
(
initDate
.
isBefore
(
self
.
minDate
)
||
initDate
.
isAfter
(
self
.
maxDate
))
initDate
=
self
.
minDate
;
var
initDate
=
self
.
getInitDate
();
self
.
startDateInput
.
value
=
initDate
.
format
(
self
.
dateFormat
);
self
.
startTimeInput
.
value
=
initDate
.
startOf
(
'
hour
'
).
format
(
self
.
timeFormat
);
self
.
forward
=
true
;
...
...
src/components/cards.js.map
View file @
1b43a570
This source diff could not be displayed because it is too large. You can
view the blob
instead.
src/components/cards.ts
View file @
1b43a570
...
...
@@ -470,6 +470,7 @@ module STWkit {
public
domain
:
string
;
public
forcingmodel
:
string
;
public
ready
:
boolean
;
public
obsdate
:
any
;
constructor
(
id
,
title
,
parentDiv
,
lang
,
map
,
domain
,
forcingmodel
,
options
?)
{
...
...
@@ -539,9 +540,7 @@ module STWkit {
self
.
forwardButton
.
onclick
=
function
()
{
self
.
forward
=
true
;
var
initDate
=
moment
.
utc
();
if
(
initDate
.
isBefore
(
self
.
minDate
)
||
initDate
.
isAfter
(
self
.
maxDate
))
initDate
=
self
.
minDate
;
var
initDate
=
self
.
getInitDate
();
self
.
from
=
initDate
;
initDate
.
add
(
parseInt
(
self
.
durationHours
.
value
),
'
hours
'
);
self
.
to
=
initDate
;
...
...
@@ -554,8 +553,7 @@ module STWkit {
self
.
backwardButton
.
onclick
=
function
()
{
self
.
forward
=
false
;
var
initDate
=
moment
.
utc
();
if
(
initDate
.
isBefore
(
self
.
minDate
)
||
initDate
.
isAfter
(
self
.
maxDate
))
initDate
=
self
.
minDate
;
var
initDate
=
self
.
getInitDate
();
self
.
to
=
initDate
;
initDate
.
subtract
(
parseInt
(
self
.
durationHours
.
value
),
'
hours
'
);
self
.
from
=
initDate
;
...
...
@@ -664,6 +662,22 @@ 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
;
if
((
typeof
changeCard
.
obsDateInput
!==
'
undefined
'
)
&&
(
typeof
changeCard
.
obsTimeInput
!==
'
undefined
'
))
{
self
.
obsdate
=
moment
.
utc
(
changeCard
.
obsDateInput
.
value
+
'
'
+
changeCard
.
obsTimeInput
.
value
,
self
.
datetimeFormat
).
valueOf
();
}
}
private
isDateValid
(
date
)
{
var
self
=
this
;
...
...
@@ -776,8 +790,7 @@ module STWkit {
public
clear
()
{
var
self
=
this
;
super
.
clear
();
var
initDate
=
moment
.
utc
();
if
(
initDate
.
isBefore
(
self
.
minDate
)
||
initDate
.
isAfter
(
self
.
maxDate
))
initDate
=
self
.
minDate
;
var
initDate
=
self
.
getInitDate
();
self
.
startDateInput
.
value
=
initDate
.
format
(
self
.
dateFormat
);
self
.
startTimeInput
.
value
=
initDate
.
startOf
(
'
hour
'
).
format
(
self
.
timeFormat
);
self
.
forward
=
true
;
...
...
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