Private GIT
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
centreon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
vlbox
centreon
Commits
f3f9a99c
Commit
f3f9a99c
authored
Mar 14, 2018
by
Stephane Chapron
Committed by
sc979
Mar 23, 2018
Browse files
Options
Downloads
Patches
Plain Diff
feat(date): Formatting date in Reporting Dashboard ServiceGroup DatepickerResult
parent
d1ad2110
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
www/include/reporting/dashboard/template/viewServicesGroupLog.ihtml
+6
-3
6 additions, 3 deletions
...e/reporting/dashboard/template/viewServicesGroupLog.ihtml
www/include/reporting/dashboard/viewServicesGroupLog.php
+2
-2
2 additions, 2 deletions
www/include/reporting/dashboard/viewServicesGroupLog.php
with
8 additions
and
5 deletions
www/include/reporting/dashboard/template/viewServicesGroupLog.ihtml
+
6
−
3
View file @
f3f9a99c
...
@@ -15,8 +15,9 @@
...
@@ -15,8 +15,9 @@
<!-- servicegroup selection -->
<!-- servicegroup selection -->
<form {$formItem.attributes} style="margin:0px;padding:0px;">
<form {$formItem.attributes} style="margin:0px;padding:0px;">
{$formItem.item.label}: {$formItem.item.html}{$formItem.hidden}
{$formItem.item.label}: {$formItem.item.html}{$formItem.hidden}
{if $date_start != 0}
{if $date_start != 0} {$period_name}
{$period_name} {$date_start} {$to} {$date_end}
<!-- using a span to add a class to format the timestamp -->
<span class="isTimestamp isDate">{$date_start} </span> {$to} <span class="isTimestamp isDate"> {$date_end}</span>
{/if}
{/if}
</form>
</form>
</td>
</td>
...
@@ -158,8 +159,10 @@
...
@@ -158,8 +159,10 @@
</tr>
</tr>
</table>
</table>
<script>
{literal}
{literal}
<script>
//formatting the tags containing a class isTimestamp
formatDateMoment();
jQuery("#StartDate").datepicker({
jQuery("#StartDate").datepicker({
maxDate: '-1',
maxDate: '-1',
...
...
This diff is collapsed.
Click to expand it.
www/include/reporting/dashboard/viewServicesGroupLog.php
+
2
−
2
View file @
f3f9a99c
...
@@ -119,9 +119,9 @@ if (isset($id) && $id != "NULL") {
...
@@ -119,9 +119,9 @@ if (isset($id) && $id != "NULL") {
$tpl
->
assign
(
"components"
,
$servicesgroupFinalStats
);
$tpl
->
assign
(
"components"
,
$servicesgroupFinalStats
);
$tpl
->
assign
(
'period_name'
,
_
(
"From"
));
$tpl
->
assign
(
'period_name'
,
_
(
"From"
));
$tpl
->
assign
(
'date_start'
,
date
(
_
(
"d/m/Y H:i"
),
$start_date
)
)
;
$tpl
->
assign
(
'date_start'
,
$start_date
);
$tpl
->
assign
(
'to'
,
_
(
"to"
));
$tpl
->
assign
(
'to'
,
_
(
"to"
));
$tpl
->
assign
(
'date_end'
,
date
(
_
(
"d/m/Y H:i"
),
$end_date
)
)
;
$tpl
->
assign
(
'date_end'
,
$end_date
);
$tpl
->
assign
(
'period'
,
$period
);
$tpl
->
assign
(
'period'
,
$period
);
$formPeriod
->
setDefaults
(
array
(
'period'
=>
$period
));
$formPeriod
->
setDefaults
(
array
(
'period'
=>
$period
));
$tpl
->
assign
(
'id'
,
$id
);
$tpl
->
assign
(
'id'
,
$id
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment