Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
8093eb8b72 | ||
|
af1ea1b5fd | ||
|
a4650f8710 | ||
|
4b25f97314 |
@@ -46,7 +46,7 @@
|
|||||||
|
|
||||||
<div class="dropdown-divider"></div>
|
<div class="dropdown-divider"></div>
|
||||||
@if ($user->switched)
|
@if ($user->switched)
|
||||||
<a href="{{ url('/admin/switch/stop') }}" class="dropdown-item" id="switch">
|
<a href="{{ url('/admin/switch/stop') }}" class="dropdown-item">
|
||||||
<i class="fas fa-sign-out-alt mr-2"></i> {{ trans('adminlte_lang::message.switchoff') }}
|
<i class="fas fa-sign-out-alt mr-2"></i> {{ trans('adminlte_lang::message.switchoff') }}
|
||||||
</a>
|
</a>
|
||||||
@else
|
@else
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
<aside class="main-sidebar sidebar-dark-primary elevation-4 d-print-none">
|
<aside class="main-sidebar sidebar-dark-primary elevation-4 d-print-none">
|
||||||
<!-- Brand Logo -->
|
<!-- Brand Logo -->
|
||||||
<a href="{{ url('home') }}" class="brand-link">
|
<a href="{{ url('home') }}" class="brand-link">
|
||||||
<img src="{{ asset('img/logo.png') }}" alt="Logo" class="brand-image img-circle elevation-3" style="opacity: .8">
|
<img src="{{ asset('img/logo.png') }}" alt="Logo" class="brand-image">
|
||||||
<span class="brand-text font-weight-light">{!! config('app.name_html_long','<b>App</b>Name') !!}</span>
|
<span class="brand-text font-weight-light">{!! config('app.name_html_long','<b>App</b>Name') !!}</span>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
|
@@ -15,15 +15,38 @@ class Carbon extends CarbonBase
|
|||||||
|
|
||||||
public function __get($name)
|
public function __get($name)
|
||||||
{
|
{
|
||||||
switch (true) {
|
switch ($name) {
|
||||||
case $name === 'half':
|
case 'half':
|
||||||
return (int) ceil($this->month / static::MONTHS_PER_HALF);
|
return (int) ceil($this->month / static::MONTHS_PER_HALF);
|
||||||
|
|
||||||
|
case 'quarter_string':
|
||||||
|
return sprintf('%dQ%d',$this->year,$this->quarter);
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return parent::__get($name);
|
return parent::__get($name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function addHalf(): self
|
||||||
|
{
|
||||||
|
return $this->addHalves(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function addHalves(int $unit): self
|
||||||
|
{
|
||||||
|
return $this->addQuarters(2*$unit);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function subHalf(): self
|
||||||
|
{
|
||||||
|
return $this->subHalves(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function subHalves(int $unit): self
|
||||||
|
{
|
||||||
|
return $this->subQuarters(2*$unit);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Modify to the first occurrence of a given day of the week
|
* Modify to the first occurrence of a given day of the week
|
||||||
* in the current quarter. If no dayOfWeek is provided, modify to the
|
* in the current quarter. If no dayOfWeek is provided, modify to the
|
||||||
|
Reference in New Issue
Block a user