Skip to content
Snippets Groups Projects
Commit f84dde2c authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch 'Bugfix' into 'master'

Formatierungen geändert



See merge request !152
parents bb11e0a3 1f405dc7
Branches
No related tags found
1 merge request!1365Resolve "Filter Options for MetaGer"
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
<th>Datum</th> <th>Datum</th>
<th>Suchanfragen zur gleichen Zeit</th> <th>Suchanfragen zur gleichen Zeit</th>
<th>Suchanfragen insgesamt</th> <th>Suchanfragen insgesamt</th>
<th>Mittelwert</th> <th>Mittelwert (bis zum jeweiligen Tag zurück)</th>
</tr> </tr>
@if( isset($today) ) @if( isset($today) )
<tr> <tr>
<td>{{ date(DATE_RFC822, mktime(date("H"),date("i"), date("s"), date("m"), date("d"), date("Y"))) }}</td> <td>{{ date("D, d M y", mktime(date("H"),date("i"), date("s"), date("m"), date("d"), date("Y"))) }}</td>
<td>{{ $today }}</td> <td>{{ $today }}</td>
<td>???</td> <td>???</td>
<td>???</td> <td>???</td>
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
@endif @endif
@foreach($oldLogs as $key => $value) @foreach($oldLogs as $key => $value)
<tr> <tr>
<td>{{ date(DATE_RFC822, mktime(date("H"),date("i"), date("s"), date("m"), date("d")-$key, date("Y"))) }}</td> <td>{{ date("D, d M y", mktime(date("H"),date("i"), date("s"), date("m"), date("d")-$key, date("Y"))) }}</td>
<td>{{ $value['sameTime'] }}</td> <td>{{ $value['sameTime'] }}</td>
<td>{{ $value['insgesamt'] }}</td> <td>{{ $value['insgesamt'] }}</td>
<td>{{ $value['median'] }}</td> <td>{{ $value['median'] }}</td>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment