itdept/expense
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'branch-jagad' into 'main'

Browse Source 
Branch jagad

See merge request fiqhpratama1/xpendify!38
This commit is contained in:
Jagad Raya
2025-01-19 11:58:22 +00:00
parent 6e8b0b6696 3a07752c0a
commit 132c0f0246
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/layouts/app.blade.php
+5 -5
View File
@@ -35,7 +35,7 @@
</ul> </ul>
<div class="navbar-center text-white m-auto"> <div class="navbar-center text-white m-auto">
<span id="date-time" class="font-weight-bold"></span> {{-- <span id="date-time" class="font-weight-bold"></span> --}}
</div> </div>
<ul class="navbar-nav"> <ul class="navbar-nav">
@@ -117,13 +117,14 @@
{{ auth()->user()->getMyCabangAndRegion()['cabang'] }} {{ auth()->user()->getMyCabangAndRegion()['cabang'] }}
</span> </span>
</a> </a>
@elseif(Auth::guard('admin')->user()->getRoleNames()[0] != 'superadmin') @elseif(Auth::guard('admin')->user()->getRoleNames()[0] != 'Superadmin')
<a class="d-block" style="font-size: 14px;"> <a class="d-block" style="font-size: 14px;">
<span class="badge badge-primary"> <span class="badge badge-primary">
Head Office Head Office
</span> </span>
</a> </a>
@endif @endif
<span id="date-time" class="font-weight-bold" style="font-size: 12px;"></span>
</div> </div>
</div> </div>
@include('layouts.partials.sidebar') @include('layouts.partials.sidebar')
@@ -163,16 +164,15 @@
const options = { const options = {
timeZone: 'Asia/Jakarta', timeZone: 'Asia/Jakarta',
weekday: 'long',
year: 'numeric', year: 'numeric',
month: 'long', month: 'short',
day: 'numeric', day: 'numeric',
hour: '2-digit', hour: '2-digit',
minute: '2-digit', minute: '2-digit',
hour12: false // Use 24-hour format hour12: false // Use 24-hour format
}; };
dateTimeElement.textContent = new Intl.DateTimeFormat('id-ID', options).format(now) + ' WIB'; dateTimeElement.textContent = new Intl.DateTimeFormat('en-US', options).format(now) + ' WIB';
} }
// Update the clock every second // Update the clock every second