Skip to content
This repository was archived by the owner on Jul 1, 2025. It is now read-only.

Commit 6fa1511

Browse files
committed
fixed datetimepicker https bug
1 parent e6ab0e0 commit 6fa1511

File tree

7 files changed

+107
-31
lines changed

7 files changed

+107
-31
lines changed

src/main/webapp/WEB-INF/jsp/customer/usagepoints/index.jsp

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,11 @@
5252
</div>
5353
</td></tr></table>
5454
</div>
55+
5556
<script type="text/javascript"
56-
src="http://cdnjs.cloudflare.com/ajax/libs/jquery/1.8.3/jquery.min.js">
57-
</script>
58-
<script type="text/javascript"
59-
src="http://netdna.bootstrapcdn.com/twitter-bootstrap/2.2.2/js/bootstrap.min.js">
60-
</script>
61-
<script type="text/javascript"
62-
src="http://tarruda.github.com/bootstrap-datetimepicker/assets/js/bootstrap-datetimepicker.min.js">
63-
</script>
64-
<script type="text/javascript"
65-
src="http://tarruda.github.com/bootstrap-datetimepicker/assets/js/bootstrap-datetimepicker.pt-BR.js">
57+
src="<c:url value='/resources/bootstrap-datetimepicker-0.0.11/js/bootstrap-datetimepicker.min.js'/> ">
6658
</script>
59+
6760
<script type="text/javascript">
6861
var startDate =
6962
$('#datetimepicker').datetimepicker({

src/main/webapp/WEB-INF/jsp/customer/usagepoints/show.jsp

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,76 @@
2424

2525
<jsp:include page="../../tiles/customer/header.jsp"/>
2626

27+
<div style="margin-left: 40px;">
28+
<table><tr><td>
29+
30+
<a id = "downloadMyData" class="brand" href="<c:url value='/espi/1_1/resource/Batch/RetailCustomer/${currentCustomer.id}/UsagePoint/${displayBag.get("usagePointId")}'/>">
31+
<img src="<c:url value='/resources/img/Green_Download_265.png'/>" width="150"/></a>
32+
&nbsp;&nbsp;</td><td>
33+
34+
Start Date/Time:
35+
<br />
36+
<div id="datetimepicker" class="input-append date" >
37+
Start: <input id="startTime" type="text"></input>
38+
<span class="add-on">
39+
<i data-time-icon="icon-time" data-date-icon="icon-calendar"></i>
40+
</span>
41+
</div>&nbsp;&nbsp;
42+
</td><td>
43+
End Date/Time:
44+
<br />
45+
<div id="datetimepicker1" class="input-append date">
46+
End: <input id="endTime" type="text"></input>
47+
<span class="add-on">
48+
<i data-time-icon="icon-time" data-date-icon="icon-calendar"></i>
49+
</span>
50+
</div>
51+
</td></tr></table>
52+
</div>
53+
54+
<script type="text/javascript"
55+
src="<c:url value='/resources/bootstrap-datetimepicker-0.0.11/js/bootstrap-datetimepicker.min.js'/> ">
56+
</script>
57+
58+
<script type="text/javascript">
59+
var startDate =
60+
$('#datetimepicker').datetimepicker({
61+
format: 'yyyy-MM-dd Thh:mm:ss Z',
62+
language: 'pt-US',
63+
showMeridian: true,
64+
autohide: true,
65+
pickerPosition: "bottom-left"
66+
67+
68+
})
69+
.on('changeDate', function(ev){
70+
var separator = "?";
71+
var temp = ev.date.toISOString();
72+
temp = temp.replace(" T", "T");
73+
temp = temp.replace(" Z", "Z");
74+
if ($('#downloadMyData').attr('href').indexOf("?") != -1) separator = "&";
75+
$('#downloadMyData').attr('href',$('#downloadMyData').attr('href') + separator + 'published-min=' + temp);
76+
});
77+
78+
var endDate =
79+
$('#datetimepicker1').datetimepicker({
80+
format: 'yyyy-MM-dd Thh:mm:ss Z',
81+
language: 'pt-US',
82+
autoclose: true,
83+
showMeridian: true,
84+
pickerPosition: "bottom-left"
85+
})
86+
.on('changeDate', function(ev){
87+
var separator = "?";
88+
var temp = ev.date.toISOString();
89+
temp.replace(" T", "T");
90+
temp.replace(" Z", "Z");
91+
if ($('#downloadMyData').attr('href').indexOf("?") != -1) separator = "&";
92+
$('#downloadMyData').attr('href',$('#downloadMyData').attr('href') + separator + 'published-max=' + temp);
93+
});
94+
95+
</script>
96+
<hr size="4" />
2797
<div class="container">
2898
<div class="row">
2999
<div class="span12">

src/main/webapp/resources/bootstrap-datetimepicker-0.0.11/css/bootstrap-datetimepicker.min.css

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/webapp/resources/bootstrap-datetimepicker-0.0.11/js/bootstrap-datetimepicker.min.js

Lines changed: 26 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/webapp/resources/js/bootstrap-datetimepicker.min.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/main/webapp/resources/js/bootstrap-datetimepicker.pt-BR.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/main/webapp/resources/js/bootstrap-datetimepicker.pt-US.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)