mirror of
https://gitlab.com/mbugroup/lti-web-client.git
synced 2026-05-20 13:32:00 +00:00
Merge branch 'fix/daily-checklist' into 'development'
[FIX/FE] Daily Checklist See merge request mbugroup/lti-web-client!485
This commit is contained in:
@@ -184,6 +184,11 @@ export function DailyChecklistContent() {
|
|||||||
const [emptyKandangEndDateError, setEmptyKandangEndDateError] =
|
const [emptyKandangEndDateError, setEmptyKandangEndDateError] =
|
||||||
useState<string>('');
|
useState<string>('');
|
||||||
|
|
||||||
|
const [preloadedKandang, setPreloadedKandang] = useState<{
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
} | null>(null);
|
||||||
|
|
||||||
const [existingDocuments, setExistingDocuments] = useState<Document[]>([]);
|
const [existingDocuments, setExistingDocuments] = useState<Document[]>([]);
|
||||||
const [documents, setDocuments] = useState<File[]>([]);
|
const [documents, setDocuments] = useState<File[]>([]);
|
||||||
const [deletedDocumentIds, setDeletedDocumentIds] = useState<number[]>([]);
|
const [deletedDocumentIds, setDeletedDocumentIds] = useState<number[]>([]);
|
||||||
@@ -228,7 +233,11 @@ export function DailyChecklistContent() {
|
|||||||
const rawDate = data.date || '';
|
const rawDate = data.date || '';
|
||||||
setDate(rawDate.length > 10 ? rawDate.slice(0, 10) : rawDate);
|
setDate(rawDate.length > 10 ? rawDate.slice(0, 10) : rawDate);
|
||||||
skipKandangClearRef.current = true;
|
skipKandangClearRef.current = true;
|
||||||
setKandangId(String(data.kandang?.id || ''));
|
const loadedKandangId = String(data.kandang?.id || '');
|
||||||
|
setKandangId(loadedKandangId);
|
||||||
|
if (data.kandang?.name) {
|
||||||
|
setPreloadedKandang({ id: loadedKandangId, name: data.kandang.name });
|
||||||
|
}
|
||||||
|
|
||||||
const isEmptyKandang =
|
const isEmptyKandang =
|
||||||
!!data.empty_kandang || data.category === 'empty_kandang';
|
!!data.empty_kandang || data.category === 'empty_kandang';
|
||||||
@@ -1162,9 +1171,17 @@ export function DailyChecklistContent() {
|
|||||||
<SelectValue placeholder='Pilih kandang' />
|
<SelectValue placeholder='Pilih kandang' />
|
||||||
</SelectTrigger>
|
</SelectTrigger>
|
||||||
<SelectContent onScroll={handleKandangScroll}>
|
<SelectContent onScroll={handleKandangScroll}>
|
||||||
{kandangOptions.map((kandang) => (
|
{preloadedKandang &&
|
||||||
|
!kandangOptions.some(
|
||||||
|
(k) => String(k.value) === preloadedKandang.id
|
||||||
|
) && (
|
||||||
|
<SelectItem value={preloadedKandang.id}>
|
||||||
|
{preloadedKandang.name}
|
||||||
|
</SelectItem>
|
||||||
|
)}
|
||||||
|
{kandangOptions.map((kandang, kandangIdx) => (
|
||||||
<SelectItem
|
<SelectItem
|
||||||
key={kandang.value}
|
key={`${kandang.value}-${kandangIdx}`}
|
||||||
value={String(kandang.value)}
|
value={String(kandang.value)}
|
||||||
>
|
>
|
||||||
{kandang.label}
|
{kandang.label}
|
||||||
|
|||||||
Reference in New Issue
Block a user