gitea-admin/lti-web-client
1
0
Fork 0
mirror of https://gitlab.com/mbugroup/lti-web-client.git synced 2026-05-20 13:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(resolve): fix resolve mismatch conflict path on merge

Browse Source
This commit is contained in:
rstubryan
2025-10-21 15:10:57 +07:00
parent 67b180bf7c
commit 12202c2021
6 changed files with 90 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/flock/recording/add/page.tsx → src/app/production/recording/add/page.tsx
View File
src/app/flock/recording/detail/edit/page.tsx → src/app/production/recording/detail/edit/page.tsx
View File
src/app/flock/recording/detail/layout.tsx → src/app/production/recording/detail/layout.tsx
View File
src/app/flock/recording/detail/page.tsx → src/app/production/recording/detail/page.tsx
View File
src/app/flock/recording/page.tsx → src/app/production/recording/page.tsx
View File
src/components/pages/flock/recording/RecordingTable.tsx
+90 -4
View File
@@ -22,7 +22,90 @@ const dummyRecordings: Recording[] = [
id: 1,
flock: {
id: 1,
name: 'Flock A',
period: 1,
flock: {
id: 1,
name: 'Flock A',
created_at: '2024-01-01',
updated_at: '2024-01-01',
created_user: {
id: 1,
id_user: 1,
email: 'admin@example.com',
name: 'Admin',
},
},
area: {
id: 1,
name: 'Area 1',
created_at: '2024-01-01',
updated_at: '2024-01-01',
created_user: {
id: 1,
id_user: 1,
email: 'admin@example.com',
name: 'Admin',
},
},
fcr: {
id: 1,
name: 'FCR 1.5',
created_at: '2024-01-01',
updated_at: '2024-01-01',
created_user: {
id: 1,
id_user: 1,
email: 'admin@example.com',
name: 'Admin',
},
},
location: {
id: 1,
name: 'Location 1',
address: 'Address 1',
area: {
id: 1,
name: 'Area 1',
},
created_at: '2024-01-01',
updated_at: '2024-01-01',
created_user: {
id: 1,
id_user: 1,
email: 'admin@example.com',
name: 'Admin',
},
},
kandangs: [
{
id: 1,
name: 'Kandang 1',
status: 'ACTIVE',
location: {
id: 1,
name: 'Location 1',
address: 'Address 1',
area: {
id: 1,
name: 'Area 1',
},
},
pic: {
id: 1,
id_user: 1,
email: 'pic@example.com',
name: 'PIC User',
},
created_at: '2024-01-01',
updated_at: '2024-01-01',
created_user: {
id: 1,
id_user: 1,
email: 'admin@example.com',
name: 'Admin',
},
},
],
created_at: '2024-01-01',
updated_at: '2024-01-01',
created_user: {
@@ -53,6 +136,7 @@ const dummyRecordings: Recording[] = [
coop: {
id: 1,
name: 'Coop 1',
status: 'ACTIVE',
location: {
id: 1,
name: 'Location 1',
@@ -206,7 +290,9 @@ const RecordingTable = () => {
const paginatedData = useMemo(() => {
const filteredData = dummyRecordings.filter(
(recording) =>
recording.flock.name.toLowerCase().includes(search.toLowerCase()) ||
recording.flock.flock.name
.toLowerCase()
.includes(search.toLowerCase()) ||
recording.location.name.toLowerCase().includes(search.toLowerCase()) ||
recording.coop.name.toLowerCase().includes(search.toLowerCase())
);
@@ -253,7 +339,7 @@ const RecordingTable = () => {
<div className='flex flex-col gap-2 mb-4'>
<TableToolbar
addButton={{
href: '/flock/recording/add',
href: 'recording/add',
label: 'Tambah Recording',
}}
search={{
@@ -382,7 +468,7 @@ const RecordingTable = () => {
cell: (props) => pageSize * (page - 1) + props.row.index + 1,
},
{
accessorKey: 'flock.name',
accessorKey: 'flock.flock.name',
header: 'Flock',
},
{