Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
c36c158b
Commit
c36c158b
authored
Oct 18, 2016
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Reimplement DateTimeField
parent
05675f47
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
318 additions
and
247 deletions
+318
-247
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_datetimefield_html.html
...m/web_page_module/rjs_gadget_erp5_datetimefield_html.html
+2
-2
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_datetimefield_html.xml
...em/web_page_module/rjs_gadget_erp5_datetimefield_html.xml
+4
-4
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_datetimefield_js.js
...eItem/web_page_module/rjs_gadget_erp5_datetimefield_js.js
+283
-237
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_datetimefield_js.xml
...Item/web_page_module/rjs_gadget_erp5_datetimefield_js.xml
+2
-2
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.css
...emplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.css
+12
-0
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.xml
...emplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.xml
+2
-2
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/erp5css.less.txt
...teItem/portal_skins/erp5_web_renderjs_ui/erp5css.less.txt
+13
-0
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_datetimefield_html.html
View file @
c36c158b
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<head>
<head>
<meta
http-equiv=
"Content-type"
content=
"text/html; charset=utf-8"
/>
<meta
http-equiv=
"Content-type"
content=
"text/html; charset=utf-8"
/>
<meta
name=
"viewport"
content=
"width=device-width, user-scalable=no"
/>
<meta
name=
"viewport"
content=
"width=device-width, user-scalable=no"
/>
<title>
ERP5
Float
field
</title>
<title>
ERP5
Datetime
field
</title>
<!-- renderjs -->
<!-- renderjs -->
<script
src=
"rsvp.js"
type=
"text/javascript"
></script>
<script
src=
"rsvp.js"
type=
"text/javascript"
></script>
...
@@ -13,6 +13,6 @@
...
@@ -13,6 +13,6 @@
</head>
</head>
<body>
<body>
<
input
type=
"date"
/
>
<
div
class=
"datetimefield"
></div
>
</body>
</body>
</html>
</html>
\ No newline at end of file
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_datetimefield_html.xml
View file @
c36c158b
...
@@ -220,7 +220,7 @@
...
@@ -220,7 +220,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
actor
</string>
</key>
<key>
<string>
actor
</string>
</key>
<value>
<string>
romain
</string>
</value>
<value>
<string>
zope
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
comment
</string>
</key>
<key>
<string>
comment
</string>
</key>
...
@@ -234,7 +234,7 @@
...
@@ -234,7 +234,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
40.50766.7916.3167
5
</string>
</value>
<value>
<string>
9
54.44229.8719.2283
5
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -252,8 +252,8 @@
...
@@ -252,8 +252,8 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14
23235572.23
</float>
<float>
14
76776016.7
</float>
<string>
GMT
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
</object>
</object>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_datetimefield_js.js
View file @
c36c158b
/*global window, rJS, RSVP
, document, loopEventListener
*/
/*global window, rJS, RSVP*/
/*jslint indent: 2 */
/*jslint indent: 2
, maxlen: 80
*/
(
function
(
window
,
rJS
,
RSVP
,
document
,
loopEventListener
)
{
(
function
(
window
,
rJS
,
RSVP
)
{
"
use strict
"
;
"
use strict
"
;
var
ZONE_LIST
=
[
[
"
GMT-12
"
,
"
-1200
"
],
[
"
GMT-11
"
,
"
-1100
"
],
[
"
GMT-10
"
,
"
-1000
"
],
[
"
GMT-9
"
,
"
-0900
"
],
[
"
GMT-8
"
,
"
-0800
"
],
[
"
GMT-7
"
,
"
-0700
"
],
[
"
GMT-6
"
,
"
-0600
"
],
[
"
GMT-5
"
,
"
-0500
"
],
[
"
GMT-4
"
,
"
-0400
"
],
[
"
GMT-3
"
,
"
-0300
"
],
[
"
GMT-2
"
,
"
-0200
"
],
[
"
GMT-1
"
,
"
-0100
"
],
[
"
GMT
"
,
"
+0000
"
],
[
"
GMT+1
"
,
"
+0100
"
],
[
"
GMT+2
"
,
"
+0200
"
],
[
"
GMT+3
"
,
"
+0300
"
],
[
"
GMT+4
"
,
"
+0400
"
],
[
"
GMT+5
"
,
"
+0500
"
],
[
"
GMT+6
"
,
"
+0600
"
],
[
"
GMT+7
"
,
"
+0700
"
],
[
"
GMT+8
"
,
"
+0800
"
],
[
"
GMT+9
"
,
"
+0900
"
],
[
"
GMT+10
"
,
"
+1000
"
],
[
"
GMT+11
"
,
"
+1100
"
],
[
"
GMT+12
"
,
"
+1200
"
]
];
rJS
(
window
)
rJS
(
window
)
.
ready
(
function
(
gadget
)
{
return
gadget
.
getElement
()
.
push
(
function
(
element
)
{
gadget
.
element
=
element
;
gadget
.
props
=
{};
});
})
.
declareAcquiredMethod
(
"
notifyInvalid
"
,
"
notifyInvalid
"
)
.
declareAcquiredMethod
(
"
notifyValid
"
,
"
notifyValid
"
)
.
declareMethod
(
'
getTextContent
'
,
function
()
{
return
this
.
element
.
querySelector
(
'
input
'
).
getAttribute
(
'
value
'
)
||
""
;
})
.
declareMethod
(
'
render
'
,
function
(
options
)
{
.
declareMethod
(
'
render
'
,
function
(
options
)
{
var
input
=
this
.
element
.
querySelector
(
'
input
'
),
var
field_json
=
options
.
field_json
||
{},
state_dict
=
{
value
:
field_json
.
value
||
field_json
.
default
||
""
,
editable
:
field_json
.
editable
,
required
:
field_json
.
required
,
name
:
field_json
.
key
,
key
:
field_json
.
key
,
title
:
field_json
.
title
,
timezone_style
:
field_json
.
timezone_style
,
date_only
:
field_json
.
date_only
,
hide_day
:
field_json
.
hide_day
,
allow_empty_time
:
field_json
.
allow_empty_time
,
ampm_time_style
:
field_json
.
ampm_time_style
,
subfield_ampm_key
:
field_json
.
subfield_ampm_key
,
subfield_hour_key
:
field_json
.
subfield_hour_key
,
subfield_minute_key
:
field_json
.
subfield_minute_key
,
hidden_day_is_last_day
:
field_json
.
hidden_day_is_last_day
,
subfield_year_key
:
field_json
.
subfield_year_key
,
subfield_month_key
:
field_json
.
subfield_month_key
,
subfield_day_key
:
field_json
.
subfield_day_key
,
subfield_timezone_key
:
field_json
.
subfield_timezone_key
,
start_datetime
:
field_json
.
start_datetime
,
end_datetime
:
field_json
.
end_datetime
};
return
this
.
changeState
(
state_dict
);
})
.
onStateChange
(
function
(
modification_dict
)
{
var
element
=
this
.
element
.
querySelector
(
'
.datetimefield
'
),
gadget
=
this
,
date
,
date
,
tmp
,
tmp
,
timezone
,
timezone
,
...
@@ -25,41 +72,85 @@
...
@@ -25,41 +72,85 @@
tmp_date
,
tmp_date
,
tmp_hour
,
tmp_hour
,
tmp_minute
,
tmp_minute
,
select
,
leap_year
,
time
=
""
,
time
=
""
,
leapyear
,
last_month_date
=
[
i
,
[
31
,
28
,
31
,
30
,
31
,
30
,
31
,
31
,
30
,
31
,
30
,
31
],
field_json
=
options
.
field_json
||
{},
[
31
,
29
,
31
,
30
,
31
,
30
,
31
,
31
,
30
,
31
,
30
,
31
]
lastDateOfMonth
=
[[
31
,
28
,
31
,
30
,
31
,
30
,
31
,
31
,
30
,
31
,
30
,
31
],
],
//leapyear
[
31
,
29
,
31
,
30
,
31
,
30
,
31
,
31
,
30
,
31
,
30
,
31
]],
//leapyear
queue
=
new
RSVP
.
Queue
(),
select_options
=
[
"
GMT-12
"
,
"
GMT-11
"
,
"
GMT-10
"
,
"
GMT-9
"
,
"
GMT-8
"
,
"
GMT-7
"
,
"
GMT-6
"
,
promise_list
,
"
GMT-5
"
,
"
GMT-4
"
,
"
GMT-3
"
,
"
GMT-2
"
,
"
GMT-1
"
,
"
GMT
"
,
"
GMT+1
"
,
input_state
=
{
"
GMT+2
"
,
"
GMT+3
"
,
"
GMT+4
"
,
"
GMT+5
"
,
"
GMT+6
"
,
"
GMT+7
"
,
"
GMT+8
"
,
name
:
gadget
.
state
.
key
+
'
_input
'
,
"
GMT+9
"
,
"
GMT+10
"
,
"
GMT+11
"
,
"
GMT+12
"
],
editable
:
gadget
.
state
.
editable
,
select_option
,
required
:
gadget
.
state
.
required
,
value
=
field_json
.
value
||
field_json
.
default
||
""
;
type
:
gadget
.
state
.
date_only
?
"
date
"
:
"
datetime-local
"
this
.
props
.
field_json
=
field_json
;
},
select_state
=
{
name
:
gadget
.
state
.
key
+
'
_select
'
,
value
:
"
+0000
"
,
item_list
:
ZONE_LIST
,
editable
:
gadget
.
state
.
editable
,
required
:
gadget
.
state
.
required
// name: field_json.key,
// title: field_json.title
},
p_state
=
{
tag
:
"
p
"
};
if
(
field_json
.
timezone_style
)
{
// Create or fetch sub gadgets
//change date to local
if
(
modification_dict
.
hasOwnProperty
(
'
editable
'
)
||
select
=
document
.
createElement
(
"
select
"
);
modification_dict
.
hasOwnProperty
(
'
timezone_style
'
))
{
for
(
i
=
0
;
i
<
select_options
.
length
;
i
+=
1
)
{
if
(
gadget
.
state
.
editable
)
{
select_option
=
document
.
createElement
(
"
option
"
);
promise_list
=
[
select_option
.
value
=
select_options
[
i
];
gadget
.
declareGadget
(
'
gadget_html5_input.html
'
,
{
scope
:
'
INPUT
'
})
select_option
.
innerHTML
=
select_options
[
i
];
];
select
.
appendChild
(
select_option
);
if
(
gadget
.
state
.
timezone_style
)
{
}
promise_list
.
push
(
gadget
.
declareGadget
(
'
gadget_html5_select.html
'
,
select
.
setAttribute
(
"
class
"
,
"
gmt_select
"
);
{
scope
:
'
SELECT
'
}));
select
.
selectedIndex
=
12
;
}
this
.
element
.
appendChild
(
select
);
}
else
{
}
promise_list
=
[
if
(
field_json
.
date_only
===
0
)
{
gadget
.
declareGadget
(
'
gadget_html5_element.html
'
,
{
scope
:
'
P
'
})
input
.
setAttribute
(
"
type
"
,
"
datetime-local
"
);
];
}
queue
.
push
(
function
()
{
return
RSVP
.
all
(
promise_list
);
})
.
push
(
function
(
result_list
)
{
// Clear first to DOM, append after to reduce flickering/manip
while
(
element
.
firstChild
)
{
element
.
removeChild
(
element
.
firstChild
);
}
var
i
;
for
(
i
=
0
;
i
<
result_list
.
length
;
i
+=
1
)
{
element
.
appendChild
(
result_list
[
i
].
element
);
}
return
result_list
;
});
}
else
{
if
(
gadget
.
state
.
editable
)
{
promise_list
=
[
gadget
.
getDeclaredGadget
(
'
INPUT
'
)
];
if
(
gadget
.
state
.
timezone_style
)
{
promise_list
.
push
(
gadget
.
getDeclaredGadget
(
'
SELECT
'
));
}
}
}
else
{
promise_list
=
[
gadget
.
getDeclaredGadget
(
'
P
'
)];
}
queue
.
push
(
function
()
{
return
RSVP
.
all
(
promise_list
);
});
}
// Calculate sub gadget states
//Change type to datetime/datetime local if configured in the field
//Change type to datetime/datetime local if configured in the field
if
(
value
!==
""
)
{
if
(
gadget
.
state
.
value
)
{
tmp
=
new
Date
(
value
);
tmp
=
new
Date
(
gadget
.
state
.
value
);
//get date without timezone
//get date without timezone
tmp_date
=
tmp
.
getUTCDate
();
tmp_date
=
tmp
.
getUTCDate
();
tmp_month
=
tmp
.
getUTCMonth
()
+
1
;
tmp_month
=
tmp
.
getUTCMonth
()
+
1
;
...
@@ -70,12 +161,13 @@
...
@@ -70,12 +161,13 @@
//timezone required
//timezone required
//convert time to GMT
//convert time to GMT
timezone
=
parseInt
(
value
.
slice
(
-
5
),
10
)
/
100
;
timezone
=
parseInt
(
gadget
.
state
.
value
.
slice
(
-
5
),
10
)
/
100
;
if
(
field_json
.
timezone_style
)
{
if
(
gadget
.
state
.
timezone_style
)
{
select
.
selectedIndex
=
timezone
+
12
;
select
_state
.
value
=
ZONE_LIST
[
timezone
+
12
][
1
]
;
}
}
leapyear
=
(
tmp_year
%
4
===
0
&&
tmp_year
%
100
!==
0
)
?
1
:
0
;
leap_year
=
(
tmp_year
%
4
===
0
&&
tmp_year
%
100
!==
0
)
?
1
:
0
;
if
(
timezone
!==
0
)
{
if
(
timezone
!==
0
)
{
tmp_hour
+=
timezone
;
tmp_hour
+=
timezone
;
if
(
tmp_hour
<
0
)
{
if
(
tmp_hour
<
0
)
{
...
@@ -87,12 +179,12 @@
...
@@ -87,12 +179,12 @@
tmp_month
=
12
;
tmp_month
=
12
;
tmp_year
-=
1
;
tmp_year
-=
1
;
}
}
tmp_date
=
last
DateOfMonth
[
leap
year
][
tmp_month
-
1
];
tmp_date
=
last
_month_date
[
leap_
year
][
tmp_month
-
1
];
}
}
}
else
if
(
tmp_hour
>
23
)
{
}
else
if
(
tmp_hour
>
23
)
{
tmp_hour
-=
24
;
tmp_hour
-=
24
;
tmp_date
+=
1
;
tmp_date
+=
1
;
if
(
tmp_date
>
last
DateOfMonth
[
leap
year
][
tmp_month
-
1
])
{
if
(
tmp_date
>
last
_month_date
[
leap_
year
][
tmp_month
-
1
])
{
tmp_date
=
1
;
tmp_date
=
1
;
tmp_month
+=
1
;
tmp_month
+=
1
;
if
(
tmp_month
>
12
)
{
if
(
tmp_month
>
12
)
{
...
@@ -102,87 +194,108 @@
...
@@ -102,87 +194,108 @@
}
}
}
}
}
}
if
(
field_json
.
date_only
===
0
)
{
time
=
"
T
"
+
Math
.
floor
(
tmp_hour
/
10
)
+
tmp_hour
%
10
+
"
:
"
+
Math
.
floor
(
tmp_minute
/
10
)
+
(
tmp_minute
%
10
)
+
"
:00
"
;
}
date
=
tmp_year
+
"
-
"
+
Math
.
floor
(
tmp_month
/
10
)
+
(
tmp_month
%
10
)
+
"
-
"
+
Math
.
floor
(
tmp_date
/
10
)
+
(
tmp_date
%
10
);
input
.
setAttribute
(
if
(
!
gadget
.
state
.
date_only
)
{
'
value
'
,
time
=
"
T
"
+
Math
.
floor
(
tmp_hour
/
10
)
+
tmp_hour
%
10
+
"
:
"
+
date
+
time
Math
.
floor
(
tmp_minute
/
10
)
+
(
tmp_minute
%
10
)
+
"
:00
"
;
);
}
}
input
.
setAttribute
(
'
name
'
,
field_json
.
key
);
date
=
tmp_year
+
"
-
"
+
Math
.
floor
(
tmp_month
/
10
)
+
input
.
setAttribute
(
'
title
'
,
field_json
.
title
);
(
tmp_month
%
10
)
+
"
-
"
+
if
(
field_json
.
required
===
1
)
{
Math
.
floor
(
tmp_date
/
10
)
+
(
tmp_date
%
10
);
input
.
setAttribute
(
'
required
'
,
'
required
'
);
input_state
.
value
=
date
+
time
;
}
}
if
(
field_json
.
editable
!==
1
)
{
input
.
setAttribute
(
'
readonly
'
,
'
readonly
'
);
// Render
input
.
setAttribute
(
'
data-wrapper-class
'
,
'
ui-state-disabled ui-state-readonly
'
);
if
(
gadget
.
state
.
editable
)
{
input
.
setAttribute
(
'
disabled
'
,
'
disabled
'
);
queue
.
push
(
function
(
gadget_list
)
{
promise_list
=
[
gadget_list
[
0
].
render
(
input_state
)
];
if
(
gadget
.
state
.
timezone_style
)
{
promise_list
.
push
(
gadget_list
[
1
].
render
(
select_state
));
}
return
RSVP
.
all
(
promise_list
);
});
}
else
{
queue
.
push
(
function
(
gadget_list
)
{
p_state
.
text_content
=
gadget
.
state
.
value
;
return
gadget_list
[
0
].
render
(
p_state
);
});
}
}
return
queue
;
})
})
.
declareMethod
(
'
getContent
'
,
function
(
options
)
{
.
declareMethod
(
'
getContent
'
,
function
(
options
)
{
var
input
=
this
.
element
.
querySelector
(
'
input
'
)
,
var
gadget
=
this
,
result
=
{},
result
=
{},
select
,
promise_list
;
if
(
gadget
.
state
.
editable
)
{
promise_list
=
[
gadget
.
getDeclaredGadget
(
'
INPUT
'
)];
if
(
gadget
.
state
.
timezone_style
)
{
promise_list
.
push
(
gadget
.
getDeclaredGadget
(
'
SELECT
'
));
}
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
return
RSVP
.
all
(
promise_list
);
})
.
push
(
function
(
result_list
)
{
var
i
;
promise_list
=
[];
for
(
i
=
0
;
i
<
result_list
.
length
;
i
+=
1
)
{
promise_list
.
push
(
result_list
[
i
].
getContent
());
}
return
RSVP
.
all
(
promise_list
);
})
.
push
(
function
(
result_list
)
{
var
value
=
result_list
[
0
][
gadget
.
state
.
key
+
'
_input
'
],
timezone
=
"
+0000
"
,
year
,
year
,
month
,
month
,
field_json
=
this
.
props
.
field_json
,
date
,
date
,
hour
,
hour
,
minute
,
minute
,
timezone
,
j
;
zone_list
=
{
"
GMT-12
"
:
"
-1200
"
,
"
GMT-11
"
:
"
-1100
"
,
if
(
gadget
.
state
.
timezone_style
)
{
"
GMT-9
"
:
"
-0900
"
,
"
GMT-8
"
:
"
-0800
"
,
timezone
=
result_list
[
1
][
gadget
.
state
.
key
+
'
_select
'
];
"
GMT-7
"
:
"
-0700
"
,
"
GMT-6
"
:
"
-0600
"
,
}
"
GMT-5
"
:
"
-0500
"
,
"
GMT-4
"
:
"
-0400
"
,
"
GMT-3
"
:
"
-0300
"
,
"
GMT-2
"
:
"
-0200
"
,
"
GMT-1
"
:
"
-0100
"
,
"
GMT
"
:
"
+0000
"
,
"
GMT+1
"
:
"
+0100
"
,
"
GMT+2
"
:
"
+0200
"
,
"
GMT+3
"
:
"
+0300
"
,
"
GMT+4
"
:
"
+0400
"
,
"
GMT+5
"
:
"
+0500
"
,
"
GMT+6
"
:
"
+0600
"
,
"
GMT+7
"
:
"
+0700
"
,
"
GMT+8
"
:
"
+0800
"
,
"
GMT+9
"
:
"
+0900
"
,
"
GMT+10
"
:
"
+1000
"
,
"
GMT+11
"
:
"
+1100
"
,
"
GMT+12
"
:
"
+1200
"
},
value
=
input
.
value
;
if
(
options
===
undefined
||
options
.
format
===
"
erp5
"
)
{
if
(
options
===
undefined
||
options
.
format
===
"
erp5
"
)
{
if
(
value
!==
""
)
{
if
(
value
!==
""
)
{
if
(
field_json
.
date_only
===
0
)
{
if
(
gadget
.
state
.
date_only
===
0
)
{
value
+=
"
+0000
"
;
value
+=
"
+0000
"
;
}
}
value
=
new
Date
(
value
);
value
=
new
Date
(
value
);
year
=
value
.
getUTCFullYear
();
year
=
value
.
getUTCFullYear
();
month
=
value
.
getUTCMonth
()
+
1
;
month
=
value
.
getUTCMonth
()
+
1
;
date
=
value
.
getUTCDate
();
date
=
value
.
getUTCDate
();
if
(
field_json
.
hide_day
===
1
)
{
if
(
gadget
.
state
.
hide_day
===
1
)
{
date
=
1
;
date
=
1
;
}
}
//get time
//get time
if
(
field_json
.
date_only
===
0
)
{
if
(
gadget
.
state
.
date_only
===
0
)
{
if
(
field_json
.
allow_empty_time
===
1
)
{
if
(
gadget
.
state
.
allow_empty_time
===
1
)
{
hour
=
0
;
hour
=
0
;
minute
=
0
;
minute
=
0
;
}
else
{
}
else
{
hour
=
value
.
getUTCHours
();
hour
=
value
.
getUTCHours
();
minute
=
value
.
getUTCMinutes
();
minute
=
value
.
getUTCMinutes
();
}
}
if
(
field_json
.
ampm_time_style
===
1
)
{
if
(
gadget
.
state
.
ampm_time_style
===
1
)
{
if
(
hour
>
12
)
{
if
(
hour
>
12
)
{
result
[
field_json
.
subfield_ampm_key
]
=
"
pm
"
;
result
[
gadget
.
state
.
subfield_ampm_key
]
=
"
pm
"
;
hour
-=
12
;
hour
-=
12
;
}
else
{
}
else
{
result
[
field_json
.
subfield_ampm_key
]
=
"
am
"
;
result
[
gadget
.
state
.
subfield_ampm_key
]
=
"
am
"
;
}
}
}
}
result
[
field_json
.
subfield_hour_key
]
=
hour
;
result
[
gadget
.
state
.
subfield_hour_key
]
=
hour
;
result
[
field_json
.
subfield_minute_key
]
=
minute
;
result
[
gadget
.
state
.
subfield_minute_key
]
=
minute
;
}
}
if
(
field_json
.
hidden_day_is_last_day
===
1
)
{
if
(
gadget
.
state
.
hidden_day_is_last_day
===
1
)
{
if
(
month
===
12
)
{
if
(
month
===
12
)
{
year
+=
1
;
year
+=
1
;
month
=
1
;
month
=
1
;
...
@@ -190,120 +303,53 @@
...
@@ -190,120 +303,53 @@
month
+=
1
;
month
+=
1
;
}
}
}
}
result
[
field_json
.
subfield_year_key
]
=
year
;
result
[
gadget
.
state
.
subfield_year_key
]
=
year
;
result
[
field_json
.
subfield_month_key
]
=
month
;
result
[
gadget
.
state
.
subfield_month_key
]
=
month
;
result
[
field_json
.
subfield_day_key
]
=
date
;
result
[
gadget
.
state
.
subfield_day_key
]
=
date
;
if
(
field_json
.
timezone_style
)
{
if
(
gadget
.
state
.
timezone_style
)
{
//set timezone
//set timezone
select
=
this
.
element
.
querySelector
(
"
select
"
);
for
(
j
=
0
;
j
<
ZONE_LIST
.
length
;
j
+=
1
)
{
result
[
field_json
.
subfield_timezone_key
]
=
select
.
options
[
select
.
selectedIndex
].
value
;
if
(
timezone
===
ZONE_LIST
[
j
][
1
])
{
result
[
gadget
.
state
.
subfield_timezone_key
]
=
ZONE_LIST
[
j
][
0
];
}
}
}
}
}
else
{
}
else
{
//if no value, return empty data
//if no value, return empty data
if
(
field_json
.
date_only
===
0
)
{
if
(
gadget
.
state
.
date_only
===
0
)
{
result
[
field_json
.
subfield_hour_key
]
=
""
;
result
[
gadget
.
state
.
subfield_hour_key
]
=
""
;
result
[
field_json
.
subfield_minute_key
]
=
""
;
result
[
gadget
.
state
.
subfield_minute_key
]
=
""
;
}
}
result
[
field_json
.
subfield_year_key
]
=
""
;
result
[
gadget
.
state
.
subfield_year_key
]
=
""
;
result
[
field_json
.
subfield_month_key
]
=
""
;
result
[
gadget
.
state
.
subfield_month_key
]
=
""
;
result
[
field_json
.
subfield_day_key
]
=
""
;
result
[
gadget
.
state
.
subfield_day_key
]
=
""
;
}
}
return
result
;
return
result
;
}
}
if
(
field_json
.
date_only
)
{
if
(
gadget
.
state
.
date_only
)
{
value
+=
"
T00:00
"
;
value
+=
"
T00:00
"
;
}
}
if
(
field_json
.
timezone_style
)
{
result
[
gadget
.
state
.
key
]
=
value
+
timezone
;
//set timezone
select
=
this
.
element
.
querySelector
(
"
select
"
);
timezone
=
select
.
options
[
select
.
selectedIndex
].
value
;
}
else
{
timezone
=
"
GMT
"
;
}
result
[
field_json
.
key
]
=
value
+
zone_list
[
timezone
];
return
result
;
return
result
;
})
});
.
declareMethod
(
'
checkValidity
'
,
function
()
{
var
gadget
=
this
,
valide
=
true
,
start_datetime
=
false
,
end_datetime
=
false
,
datetime_string
,
select
=
gadget
.
element
.
querySelector
(
"
select
"
),
datetime
,
input
=
gadget
.
element
.
querySelector
(
'
input
'
),
field_json
=
gadget
.
props
.
field_json
;
if
(
!
input
.
checkValidity
())
{
return
false
;
}
}
return
new
RSVP
.
Queue
()
return
result
;
.
push
(
function
()
{
return
gadget
.
notifyValid
();
})
})
.
push
(
function
()
{
return
gadget
.
getContent
();
.
declareMethod
(
'
getTextContent
'
,
function
()
{
return
this
.
state
.
value
||
""
;
})
})
.
declareMethod
(
'
checkValidity
'
,
function
()
{
var
gadget
=
this
;
if
(
gadget
.
state
.
editable
)
{
return
gadget
.
getDeclaredGadget
(
'
INPUT
'
)
.
push
(
function
(
result
)
{
.
push
(
function
(
result
)
{
datetime_string
=
result
[
field_json
.
subfield_month_key
];
return
result
.
checkValidity
();
datetime_string
+=
"
,
"
+
result
[
field_json
.
subfield_day_key
];
datetime_string
+=
"
,
"
+
result
[
field_json
.
subfield_year_key
];
if
(
field_json
.
date_only
===
0
)
{
if
(
result
[
field_json
.
subfield_ampm_key
]
===
"
pm
"
)
{
result
[
field_json
.
subfield_hour_key
]
+=
12
;
}
datetime_string
+=
"
"
+
result
[
field_json
.
subfield_hour_key
];
datetime_string
+=
"
:
"
+
result
[
field_json
.
subfield_minute_key
]
+
"
:00
"
;
datetime_string
+=
"
+0000
"
;
}
if
(
datetime_string
.
indexOf
(
"
NaN
"
)
!==
-
1
)
{
valide
=
false
;
return
gadget
.
notifyInvalid
(
"
Invalide DateTime
"
);
}
if
(
field_json
.
start_datetime
)
{
start_datetime
=
Date
.
parse
(
field_json
.
start_datetime
);
}
if
(
field_json
.
end_datetime
)
{
end_datetime
=
Date
.
parse
(
field_json
.
end_datetime
);
}
if
((
start_datetime
===
false
)
&&
(
end_datetime
===
false
))
{
return
;
}
datetime
=
Date
.
parse
(
datetime_string
);
datetime
-=
(
select
.
selectedIndex
-
12
)
*
60
*
60
*
1000
;
if
(
start_datetime
)
{
if
(
start_datetime
>
datetime
)
{
valide
=
false
;
return
gadget
.
notifyInvalid
(
"
The date and time you entered earlier than the start time
"
);
}
}
if
(
end_datetime
)
{
if
(
end_datetime
<=
datetime
)
{
valide
=
false
;
return
gadget
.
notifyInvalid
(
"
The date and time you entered later than the end time
"
);
}
}
})
.
push
(
function
()
{
return
valide
;
});
});
})
.
declareService
(
function
()
{
////////////////////////////////////
// Inform when the field input is invalid
////////////////////////////////////
var
field_gadget
=
this
;
function
notifyInvalid
(
evt
)
{
return
field_gadget
.
notifyInvalid
(
evt
.
target
.
validationMessage
);
}
}
return
true
;
// Listen to input change
return
loopEventListener
(
field_gadget
.
element
.
querySelector
(
'
input
'
),
'
invalid
'
,
false
,
notifyInvalid
);
});
});
}(
window
,
rJS
,
RSVP
,
document
,
loopEventListener
));
}(
window
,
rJS
,
RSVP
));
\ No newline at end of file
\ No newline at end of file
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_datetimefield_js.xml
View file @
c36c158b
...
@@ -224,7 +224,7 @@
...
@@ -224,7 +224,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
95
2.4467.13140.2589
0
</string>
</value>
<value>
<string>
95
4.44614.5572.2804
0
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -242,7 +242,7 @@
...
@@ -242,7 +242,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14
66755364.27
</float>
<float>
14
76799333.29
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.css
View file @
c36c158b
...
@@ -1025,6 +1025,18 @@ div[data-gadget-scope='header'] .ui-header ul a {
...
@@ -1025,6 +1025,18 @@ div[data-gadget-scope='header'] .ui-header ul a {
background-color
:
#2b2b2b
;
background-color
:
#2b2b2b
;
}
}
/**********************************************
/**********************************************
* Gadget: datetime field
**********************************************/
.datetimefield
{
display
:
flex
;
}
.datetimefield
div
[
data-gadget-scope
=
INPUT
]
{
flex
:
2
;
}
.datetimefield
div
[
data-gadget-scope
=
SELECT
]
{
flex
:
1
;
}
/**********************************************
* Listbox
* Listbox
**********************************************/
**********************************************/
div
[
data-gadget-scope
=
'erp5_searchfield'
]
.ui-input-text
{
div
[
data-gadget-scope
=
'erp5_searchfield'
]
.ui-input-text
{
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.xml
View file @
c36c158b
...
@@ -236,7 +236,7 @@
...
@@ -236,7 +236,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
954.
22971.45413.40994
</string>
</value>
<value>
<string>
954.
44246.45584.9130
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -254,7 +254,7 @@
...
@@ -254,7 +254,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
147
5501272.94
</float>
<float>
147
6777160.07
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/erp5css.less.txt
View file @
c36c158b
...
@@ -1197,6 +1197,19 @@ div[data-gadget-scope='header'] .ui-header {
...
@@ -1197,6 +1197,19 @@ div[data-gadget-scope='header'] .ui-header {
}
}
}
}
/**********************************************
* Gadget: datetime field
**********************************************/
.datetimefield {
display: flex;
div[data-gadget-scope=INPUT] {
flex: 2;
}
div[data-gadget-scope=SELECT] {
flex: 1;
}
}
/**********************************************
/**********************************************
* Listbox
* Listbox
**********************************************/
**********************************************/
...
...
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