Compare commits

...

4 Commits

Author SHA1 Message Date
Deon George
8093eb8b72 Remove id from <a>, not required 2021-10-18 12:55:17 +11:00
Deon George
af1ea1b5fd Add addHalf()/subHalf() functions 2021-10-12 14:40:34 +11:00
Deon George
a4650f8710 Add Carbon::quarter_string 2021-08-23 15:22:51 +10:00
Deon George
4b25f97314 Remove classes for logo image 2021-08-04 17:30:24 +10:00
3 changed files with 29 additions and 6 deletions

View File

@@ -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

View File

@@ -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>

View File

@@ -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