UPDATE COLOR

dev
Aji Kamaludin 11 months ago
parent ac85c4c9e4
commit e07fc8bd1f
No known key found for this signature in database
GPG Key ID: 19058F67F0083AD3

@ -42,7 +42,7 @@ class Document extends Model
'due_date' => 'datetime:Y-m-d'
];
protected $appends = ['due_status'];
protected $appends = ['due_status', 'due_status_color'];
public function creator()
{
@ -67,33 +67,63 @@ class Document extends Model
protected function dueStatus(): Attribute
{
return Attribute::make(
get: function() {
$diff = $this->category->duration;
get: function () {
$maxMonthDiff = 3;
$maxDayDiff = 30; //$this->category->duration;
if ($this->due_date == null) {
return '';
}
if (now()->toDateString() == $this->due_date->toDateString()) {
return "hari ini jatuh tempo";
}
$date = now()->diffInDays($this->due_date, false) + 1;
$diffMonth = now()->diffInMonths($this->due_date, true);
if ($maxMonthDiff >= $diffMonth && $diffMonth > 0) {
return $diffMonth . " bulan mendekati jatuh tempo";
}
$diffDays = now()->diffInDays($this->due_date, false);
if ($diff >= $date && $date > 0) {
return $date . " hari mendekati jatuh tempo";
if ($maxDayDiff >= $diffDays && $diffDays > 0) {
return $diffDays . " hari mendekati jatuh tempo";
}
if ($date <= 0) {
if ($diffDays <= 0) {
return "jatuh tempo";
}
},
}
);
}
protected function dueStatusColor(): Attribute
{
return Attribute::make(
get: function () {
$maxMonthDiff = 3;
$diffMonth = now()->diffInMonths($this->due_date, true);
if ($maxMonthDiff >= $diffMonth && $diffMonth > 0) {
return [
1 => '#dc2626',
2 => '#facc15',
3 => '#4ade80',
][$diffMonth];
}
return '#dc2626';
}
);
}
protected function isCloseDue(): Attribute
{
return Attribute::make(
get: function() {
$diff = $this->category->duration;
get: function () {
$maxMonthDiff = 3;
$diff = 30; //$this->category->duration;
if ($this->due_date == null) {
return 0;
@ -103,12 +133,19 @@ class Document extends Model
return 0;
}
$date = now()->diffInDays($this->due_date, false) + 1;
$diffMonth = now()->diffInMonths($this->due_date, true);
if ($diff >= $date && $date > 0) {
return $date;
if ($maxMonthDiff >= $diffMonth && $diffMonth > 0) {
return $diffMonth;
}
if ($date <= 0) {
$diffDays = now()->diffInDays($this->due_date, false) + 1;
if ($diff >= $diffDays && $diffDays > 0) {
return $diffDays;
}
if ($diffDays <= 0) {
return 0;
}
@ -117,11 +154,12 @@ class Document extends Model
);
}
public function scopeCloseToExpired($query) {
public function scopeCloseToExpired($query)
{
$ids = collect();
$categories = Category::all();
foreach($categories as $category) {
foreach($category->documents as $docs) {
foreach ($categories as $category) {
foreach ($category->documents as $docs) {
if ($docs->is_close_due != 0) {
$ids->add($docs->id);
}

@ -39,6 +39,19 @@ services:
networks:
monitordoc:
ipv4_address: 10.4.0.99
nodejs:
image: node:16-alpine
container_name: monitordoc-node
ports:
- 5173:5173
volumes:
- ./:/var/www
working_dir: /var/www
entrypoint: ["npm","run", "dev"]
networks:
monitordoc:
ipv4_address: 10.4.0.100
networks:
monitordoc:
driver: bridge

@ -1,7 +1,7 @@
{
"private": true,
"scripts": {
"dev": "vite",
"dev": "vite --host 0.0.0.0",
"build": "vite build"
},
"devDependencies": {
@ -29,4 +29,4 @@
"react-toastify": "^9.0.8",
"react-use": "^17.4.0"
}
}
}

@ -15,7 +15,7 @@ import ModalImport from './ModalImport'
export default function Document(props) {
const { data: docs, links } = props.docs
const [search, setSearch] = useState({q: '', status: 0})
const [search, setSearch] = useState({ q: '', status: 0 })
const preValue = usePrevious(search)
const importModal = useModalState(false)
@ -28,7 +28,7 @@ export default function Document(props) {
const onDelete = () => {
const doc = confirmModal.data
if(doc != null) {
if (doc != null) {
router.delete(route('docs.destroy', doc), {
onSuccess: () => toast.success('The Data has been deleted'),
})
@ -46,20 +46,16 @@ export default function Document(props) {
setSearch({
...search,
sortBy: key,
sortRule: search.sortRule == 'asc' ? 'desc' : 'asc'
sortRule: search.sortRule == 'asc' ? 'desc' : 'asc',
})
}
useEffect(() => {
if (preValue) {
router.get(
route(route().current()),
search,
{
replace: true,
preserveState: true,
}
)
router.get(route(route().current()), search, {
replace: true,
preserveState: true,
})
}
}, [search])
@ -81,51 +77,130 @@ export default function Document(props) {
<div className="card bg-base-100 w-full">
<div className="card-body">
<div className="flex flex-col md:flex-row w-full mb-4 justify-between space-y-1 md:space-y-0">
<div className='flex flex-row gap-2'>
{canCreate && (
<Link
className="btn btn-neutral"
href={route('docs.create')}
>
Tambah
</Link>
)}
{canImport && (
<div className='btn btn-outline' onClick={importModal.toggle}>
Import
</div>
)}
<div className="flex flex-row gap-2">
{canCreate && (
<Link
className="btn btn-neutral"
href={route('docs.create')}
>
Tambah
</Link>
)}
{canImport && (
<div
className="btn btn-outline"
onClick={importModal.toggle}
>
Import
</div>
)}
</div>
<div className='flex md:flex-row flex-col gap-2'>
<div className="flex md:flex-row flex-col gap-2">
<div className="form-control w-full">
<input
type="text"
className="input input-bordered"
value={search.q}
onChange={(e) =>
handleFilter({q: e.target.value})
handleFilter({ q: e.target.value })
}
placeholder="Search"
/>
</div>
<div className='flex flex-row gap-2'>
<div className="flex flex-row gap-2">
<div className="dropdown dropdown-end">
<label tabIndex={0} className="btn btn-outline">Filter</label>
<ul tabIndex={0} className="dropdown-content menu p-2 shadow bg-base-100 rounded-box w-52">
<li><div onClick={() => handleFilter({status: 0})}>Semua</div></li>
<li><div onClick={() => handleFilter({status: 1})}>Jatuh Tempo</div></li>
<li><div onClick={() => handleFilter({status: 2})}>Mendekati Jatuh Tempo</div></li>
<label
tabIndex={0}
className="btn btn-outline"
>
Filter
</label>
<ul
tabIndex={0}
className="dropdown-content menu p-2 shadow bg-base-100 rounded-box w-52"
>
<li>
<div
onClick={() =>
handleFilter({
status: 0,
})
}
>
Semua
</div>
</li>
<li>
<div
onClick={() =>
handleFilter({
status: 1,
})
}
>
Jatuh Tempo
</div>
</li>
<li>
<div
onClick={() =>
handleFilter({
status: 2,
})
}
>
Mendekati Jatuh Tempo
</div>
</li>
</ul>
</div>
{canExport && (
<div className="dropdown dropdown-end">
<label tabIndex={0} className="btn btn-outline">Export</label>
<ul tabIndex={0} className="dropdown-content menu p-2 shadow bg-base-100 rounded-box w-52">
<li><a href={route('docs.export', {type: 'excel'})} target='_blank'>XLSX</a></li>
<li><a href={route('docs.export', {type: 'pdf'})} target='_blank'>PDF</a></li>
<li><a href={route('docs.export', {type: ''})} target='_blank'>Print</a></li>
</ul>
</div>
<div className="dropdown dropdown-end">
<label
tabIndex={0}
className="btn btn-outline"
>
Export
</label>
<ul
tabIndex={0}
className="dropdown-content menu p-2 shadow bg-base-100 rounded-box w-52"
>
<li>
<a
href={route(
'docs.export',
{ type: 'excel' }
)}
target="_blank"
>
XLSX
</a>
</li>
<li>
<a
href={route(
'docs.export',
{ type: 'pdf' }
)}
target="_blank"
>
PDF
</a>
</li>
<li>
<a
href={route(
'docs.export',
{ type: '' }
)}
target="_blank"
>
Print
</a>
</li>
</ul>
</div>
)}
</div>
</div>
@ -135,12 +210,32 @@ export default function Document(props) {
<thead>
<tr>
<th>Perusahaan</th>
<th className='hover:underline' onClick={() => sort('type_id')}>Jenis</th>
<th className='hover:underline' onClick={() => sort('category_id')}>Ketegori</th>
<th
className="hover:underline"
onClick={() => sort('type_id')}
>
Jenis
</th>
<th
className="hover:underline"
onClick={() => sort('category_id')}
>
Ketegori
</th>
<th>No Dokumen</th>
<th>Nama Dokumen</th>
<th className='hover:underline' onClick={() => sort('publish_date')}>Tanggal Terbit</th>
<th className='hover:underline' onClick={() => sort('due_date')}>Tanggal Berakhir</th>
<th
className="hover:underline"
onClick={() => sort('publish_date')}
>
Tanggal Terbit
</th>
<th
className="hover:underline"
onClick={() => sort('due_date')}
>
Tanggal Berakhir
</th>
<th>Catatan</th>
<th></th>
</tr>
@ -148,33 +243,79 @@ export default function Document(props) {
<tbody>
{docs?.map((doc) => (
<tr key={doc.id}>
<td>{doc.company.short} ({doc.company.region.name})</td>
<td>
{doc.company.short} (
{doc.company.region.name})
</td>
<td>{doc.variety.name}</td>
<td>{doc.category.name}</td>
<td>{doc.no_doc}</td>
<td>{doc.name}</td>
<td>
{doc.publish_date !== null ? formatDate(doc.publish_date) : ''}
{doc.publish_date !== null
? formatDate(
doc.publish_date
)
: ''}
</td>
<td>
{doc.due_date !== null ? formatDate(doc.due_date) : ''}
{doc.due_date !== null
? formatDate(doc.due_date)
: ''}
</td>
<th>{doc.due_status}</th>
<td className='text-right w-1/8'>
<th
style={{
color: doc.due_status_color,
}}
>
{doc.due_status}
</th>
<td className="text-right w-1/8">
<div className="dropdown dropdown-left">
<label tabIndex={0} className="btn btn-sm m-1 px-1"><IconMenu/></label>
<ul tabIndex={0} className="dropdown-content menu p-2 shadow bg-base-100 rounded-box w-52">
<label
tabIndex={0}
className="btn btn-sm m-1 px-1"
>
<IconMenu />
</label>
<ul
tabIndex={0}
className="dropdown-content menu p-2 shadow bg-base-100 rounded-box w-52"
>
<li>
<Link href={route('docs.show', doc)}>Detail</Link>
<Link
href={route(
'docs.show',
doc
)}
>
Detail
</Link>
</li>
{canUpdate && (
<li>
<Link href={route('docs.edit', doc)}>Edit</Link>
<Link
href={route(
'docs.edit',
doc
)}
>
Edit
</Link>
</li>
)}
{canDelete && (
<li onClick={() => handleDelete(doc)} className="bg-error ">
<div>Delete</div>
<li
onClick={() =>
handleDelete(
doc
)
}
className="bg-error "
>
<div>
Delete
</div>
</li>
)}
</ul>
@ -184,23 +325,20 @@ export default function Document(props) {
))}
</tbody>
</table>
<div className='w-full flex justify-center'>
<Pagination links={links} params={search}/>
<div className="w-full flex justify-center">
<Pagination links={links} params={search} />
</div>
</div>
</div>
</div>
</div>
<ModalConfirm
isOpen={confirmModal.isOpen}
toggle={confirmModal.toggle}
onConfirm={onDelete}
/>
<ModalImport
modalState={importModal}
/>
<ModalImport modalState={importModal} />
</AuthenticatedLayout>
)
}
}

Loading…
Cancel
Save