@ubkinfotech/tecaher-erp 0.1.1 → 0.1.2

package/lib/commonjs/modules/notes/services/notesService.js

@@ -40,14 +40,22 @@ async function fetchNoteDetails(api, args) {
   const res = await api.get(_endpoints.endpoints.notes.details(args));
   return res.data;
 }
-async function uploadNoteFile(api, file) {
+function buildUploadFilePath(relativePath, schoolCode) {
+  const normalized = String(relativePath).replace(/\\/g, '/').replace(/^\/+/, '');
+  if (!schoolCode) {
+    return normalized;
+  }
+  const withoutUploads = normalized.replace(/^uploads\//i, '');
+  return `school_${schoolCode}/${withoutUploads}`;
+}
+async function uploadNoteFile(api, file, schoolCode) {
   const formData = new FormData();
   formData.append('file', {
     uri: file.uri,
     name: file.name,
     type: file.type
   });
-  formData.append('filepath', 'uploads/student/note/');
+  formData.append('filepath', buildUploadFilePath('student/note/', schoolCode));
   const res = await api.post(_endpoints.endpoints.notes.upload, formData, {
     headers: {
       'Content-Type': 'multipart/form-data'

package/lib/module/core/api/endpoints.js

@@ -91,7 +91,7 @@ export const endpoints = {
       return `staff/teacherAPP/attendenceSection/getsectionDropdownforTeacher?class_id=${args.classId}`;
     },
     teacherSubjectsByClass: args => {
-      return `staff/teacherAPP/StaffHomework/getsubjectDropdownByClass?class_id=${args.classId}&session_id=${args.sessionId}`;
+      return `staff/teacherAPP/teacherbasicDetails/getteacherSubjectsaccordingtoClass?session_id=${args.sessionId}&class_id=${args.classId}`;
     },
     details: args => {
       return `staff/teacherAPP/Notes/getNotedatabyID?id=${args.noteId}`;

package/lib/module/modules/assignment/screens/AssignmentScreen.js

@@ -1,7 +1,7 @@
 "use strict";
 
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { Alert, FlatList, Image, Modal, Pressable, SafeAreaView, ScrollView, StyleSheet, Text, TextInput, TouchableOpacity, View } from 'react-native';
+import { Alert, ActivityIndicator, FlatList, Image, Modal, Pressable, SafeAreaView, ScrollView, StyleSheet, Text, TextInput, TouchableOpacity, View } from 'react-native';
 import { useERP } from "../../../core/provider/useERP.js";
 import { EmptyState } from "../../../shared/empty-states/EmptyState.js";
 import { ErrorState } from "../../../shared/empty-states/ErrorState.js";
@@ -126,6 +126,63 @@ function SelectModal({
     })]
   });
 }
+function StatusBanner({
+  text,
+  busy = false,
+  tone = 'info'
+}) {
+  const palette = tone === 'error' ? {
+    backgroundColor: '#FEF2F2',
+    borderColor: '#FECACA',
+    textColor: '#B91C1C',
+    spinnerColor: '#DC2626'
+  } : tone === 'success' ? {
+    backgroundColor: '#ECFDF5',
+    borderColor: '#A7F3D0',
+    textColor: '#047857',
+    spinnerColor: '#059669'
+  } : {
+    backgroundColor: '#EFF6FF',
+    borderColor: '#BFDBFE',
+    textColor: '#1D4ED8',
+    spinnerColor: '#2563EB'
+  };
+  return /*#__PURE__*/_jsxs(View, {
+    style: [styles.statusBanner, {
+      backgroundColor: palette.backgroundColor,
+      borderColor: palette.borderColor
+    }],
+    children: [busy ? /*#__PURE__*/_jsx(ActivityIndicator, {
+      size: "small",
+      color: palette.spinnerColor
+    }) : null, /*#__PURE__*/_jsx(Text, {
+      style: [styles.statusBannerText, {
+        color: palette.textColor
+      }],
+      children: text
+    })]
+  });
+}
+async function uploadAssignmentFilesBatch(args) {
+  const uploaded = [];
+  let failedCount = 0;
+  await Promise.all(args.files.map(async file => {
+    try {
+      const res = await uploadAssignmentFile(args.api, file, args.schoolCode);
+      if (res?.Status === 'Success' && res?.data) {
+        uploaded.push(String(res.data));
+        return;
+      }
+    } catch {
+      // Keep partial success behavior for multi-file uploads.
+    }
+    failedCount += 1;
+  }));
+  return {
+    uploaded,
+    failedCount
+  };
+}
 function resolveFileBaseUrl(args) {
   if (args.fileBaseUrl) {
     return args.fileBaseUrl.endsWith('/') ? args.fileBaseUrl : `${args.fileBaseUrl}/`;
@@ -474,9 +531,14 @@ function resolveUploadUrl(downloadsBaseUrl, rawPath) {
   }
   const cleaned = raw.replace(/\\/g, '/').replace(/^\/+/, '');
   const uploadsRoot = downloadsBaseUrl.replace(/uploads\/?$/i, '');
+  const uploadsBaseIndex = downloadsBaseUrl.toLowerCase().indexOf('uploads/');
+  const uploadsBase = uploadsBaseIndex >= 0 ? downloadsBaseUrl.slice(0, uploadsBaseIndex + 'uploads/'.length) : downloadsBaseUrl;
   if (cleaned.startsWith('uploads/')) {
     return encodeURI(`${uploadsRoot}${cleaned}`);
   }
+  if (cleaned.startsWith('school_')) {
+    return encodeURI(`${uploadsBase}${cleaned}`);
+  }
   if (cleaned.startsWith('student/homework/')) {
     return encodeURI(`${downloadsBaseUrl}${cleaned}`);
   }
@@ -908,6 +970,7 @@ function CreateAssignmentView({
   } = useERP();
   const ImageView = useMemo(() => tryGetImageViewer(), []);
   const Pdf = useMemo(() => tryGetPdf(), []);
+  const Calendar = useMemo(() => tryGetCalendar(), []);
   const RNFS = useMemo(() => tryGetRNFS(), []);
   const FileViewer = useMemo(() => tryGetFileViewer(), []);
   const [viewerOpen, setViewerOpen] = useState(false);
@@ -918,7 +981,11 @@ function CreateAssignmentView({
   const [pdfHeaders, setPdfHeaders] = useState({});
   const [pdfLoading, setPdfLoading] = useState(false);
   const [isDownloading, setIsDownloading] = useState(false);
-  const [busy, setBusy] = useState(false);
+  const [calendarOpen, setCalendarOpen] = useState(false);
+  const [dateMode, setDateMode] = useState('start');
+  const [isUploading, setIsUploading] = useState(false);
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const [uploadStatus, setUploadStatus] = useState('');
   const [title, setTitle] = useState('');
   const [description, setDescription] = useState('');
   const [classOpt, setClassOpt] = useState(null);
@@ -929,6 +996,7 @@ function CreateAssignmentView({
   const [homewDate, setHomewDate] = useState('');
   const [submissionDate, setSubmissionDate] = useState('');
   const [status, setStatus] = useState('publish');
+  const [markedDates, setMarkedDates] = useState({});
   const [fileList, setFileList] = useState([]);
   const [activeFile, setActiveFile] = useState('');
   const [fileError, setFileError] = useState(null);
@@ -1071,20 +1139,28 @@ function CreateAssignmentView({
       type: asset.type ?? 'image/jpeg'
     };
     setFileError(null);
-    setBusy(true);
+    setUploadStatus('Uploading image...');
+    setIsUploading(true);
     try {
-      const uploaded = await uploadAssignmentFile(api, file);
+      const uploaded = await uploadAssignmentFile(api, file, schoolCode);
       if (uploaded?.Status === 'Success' && uploaded.data) {
         const nextPath = String(uploaded.data);
         setFileList(prev => [...prev, nextPath]);
         setActiveFile(prev => prev || nextPath);
+        setUploadStatus('Image uploaded successfully');
       } else {
         setFileError('File upload failed');
+        setUploadStatus('Image upload failed');
+        Alert.alert('Error', String(uploaded?.msg ?? 'File not uploaded'));
       }
+    } catch (error) {
+      setFileError('File upload failed');
+      setUploadStatus('Image upload failed');
+      Alert.alert('Error', String(error?.message ?? 'File not uploaded'));
     } finally {
-      setBusy(false);
+      setIsUploading(false);
     }
-  }, [api]);
+  }, [api, schoolCode]);
   const pickFiles = useCallback(async () => {
     let dp = null;
     try {
@@ -1114,54 +1190,86 @@ function CreateAssignmentView({
       return;
     }
     setFileError(null);
-    setBusy(true);
+    setUploadStatus(`Uploading ${files.length} file(s)...`);
+    setIsUploading(true);
     try {
-      const uploaded = [];
-      for (const f of files) {
-        const res = await uploadAssignmentFile(api, f);
-        if (res?.Status === 'Success' && res.data) {
-          uploaded.push(String(res.data));
-        }
-      }
+      const {
+        uploaded,
+        failedCount
+      } = await uploadAssignmentFilesBatch({
+        api,
+        files,
+        schoolCode
+      });
       if (!uploaded.length) {
         setFileError('File upload failed');
+        setUploadStatus('File upload failed');
+        Alert.alert('Error', 'File not uploaded');
         return;
       }
       setFileList(prev => [...prev, ...uploaded]);
       setActiveFile(prev => prev ? prev : uploaded[0] ?? '');
+      if (failedCount > 0) {
+        setFileError(`${failedCount} file(s) failed to upload`);
+        setUploadStatus(`${uploaded.length} file(s) uploaded, ${failedCount} failed`);
+        Alert.alert('Upload Incomplete', `${uploaded.length} file(s) uploaded and ${failedCount} failed.`);
+        return;
+      }
+      setFileError(null);
+      setUploadStatus(`${uploaded.length} file(s) uploaded successfully`);
+    } catch (error) {
+      setFileError('File upload failed');
+      setUploadStatus('File upload failed');
+      Alert.alert('Error', String(error?.message ?? 'File not uploaded'));
     } finally {
-      setBusy(false);
+      setIsUploading(false);
     }
-  }, [api]);
+  }, [api, schoolCode]);
   const submit = useCallback(async () => {
-    if (!title || !description || !classOpt?.value || !sectionOpt?.value || !subjectOpt?.value || !homewDate || !submissionDate || !fileList.length) {
-      if (!fileList.length) {
-        setFileError('File is required');
-      }
+    const missing = [];
+    const selectedClassId = classOpt?.value;
+    const selectedSectionId = sectionOpt?.value;
+    const selectedSubjectId = subjectOpt?.value;
+    if (!title) missing.push('title');
+    if (!description) missing.push('description');
+    if (!selectedClassId) missing.push('class');
+    if (!selectedSectionId) missing.push('section');
+    if (!selectedSubjectId) missing.push('subject');
+    if (!homewDate) missing.push('homework date');
+    if (!submissionDate) missing.push('submission date');
+    if (missing.length) {
+      Alert.alert('Missing Fields', `Please fill: ${missing.join(', ')}`);
       return;
     }
     const fileCsv = fileList.join(',');
     const payload = {
       title,
       description,
-      class_id: classOpt.value,
-      section_id: sectionOpt.value,
-      sub_id: subjectOpt.value,
+      class_id: selectedClassId,
+      section_id: selectedSectionId,
+      sub_id: selectedSubjectId,
       homew_date: homewDate,
       submission_date: submissionDate,
       status,
       file: fileCsv
     };
-    setBusy(true);
+    setIsSubmitting(true);
     try {
-      await createAssignment(api, payload);
+      const response = await createAssignment(api, payload);
+      if (response?.Status && response.Status !== 'Success') {
+        Alert.alert('Failed', String(response?.msg ?? response?.Status ?? 'Could not create assignment'));
+        return;
+      }
+      Alert.alert('Success', String(response?.msg ?? 'Assignment created Successfully'));
       onDone();
+    } catch (error) {
+      Alert.alert('Failed', String(error?.message ?? 'Could not create assignment'));
     } finally {
-      setBusy(false);
+      setIsSubmitting(false);
     }
   }, [api, classOpt?.value, description, homewDate, onDone, sectionOpt?.value, status, subjectOpt?.value, submissionDate, title, fileList]);
   const canPickSubject = sessionId !== undefined;
-  const canSubmit = canPickSubject && fileList.length > 0 && !busy;
+  const canSubmit = !isSubmitting && !isUploading;
   return /*#__PURE__*/_jsxs(SafeAreaView, {
     style: styles.root,
     children: [/*#__PURE__*/_jsx(View, {
@@ -1219,25 +1327,33 @@ function CreateAssignmentView({
         style: styles.field,
         children: [/*#__PURE__*/_jsx(Text, {
           style: styles.label,
-          children: "Homework Date (YYYY-MM-DD)"
-        }), /*#__PURE__*/_jsx(TextInput, {
-          value: homewDate,
-          onChangeText: setHomewDate,
-          placeholder: "2026-01-31",
-          placeholderTextColor: "#9CA3AF",
-          style: styles.input
+          children: "Homework Date"
+        }), /*#__PURE__*/_jsx(TouchableOpacity, {
+          style: styles.secondaryBtn,
+          onPress: () => {
+            setDateMode('start');
+            setCalendarOpen(true);
+          },
+          children: /*#__PURE__*/_jsx(Text, {
+            style: styles.secondaryBtnText,
+            children: homewDate || 'Select start date'
+          })
         })]
       }), /*#__PURE__*/_jsxs(View, {
         style: styles.field,
         children: [/*#__PURE__*/_jsx(Text, {
           style: styles.label,
-          children: "Submission Date (YYYY-MM-DD)"
-        }), /*#__PURE__*/_jsx(TextInput, {
-          value: submissionDate,
-          onChangeText: setSubmissionDate,
-          placeholder: "2026-02-05",
-          placeholderTextColor: "#9CA3AF",
-          style: styles.input
+          children: "Submission Date"
+        }), /*#__PURE__*/_jsx(TouchableOpacity, {
+          style: styles.secondaryBtn,
+          onPress: () => {
+            setDateMode('end');
+            setCalendarOpen(true);
+          },
+          children: /*#__PURE__*/_jsx(Text, {
+            style: styles.secondaryBtnText,
+            children: submissionDate || 'Select end date'
+          })
         })]
       }), /*#__PURE__*/_jsxs(View, {
         style: styles.field,
@@ -1274,7 +1390,7 @@ function CreateAssignmentView({
             onPress: () => {
               pickFiles().catch(() => {});
             },
-            disabled: busy,
+            disabled: isUploading || isSubmitting,
             children: /*#__PURE__*/_jsx(Text, {
               style: styles.secondaryBtnText,
               children: "Gallery / File"
@@ -1284,13 +1400,19 @@ function CreateAssignmentView({
             onPress: () => {
               pickFromCamera().catch(() => {});
             },
-            disabled: busy,
+            disabled: isUploading || isSubmitting,
             children: /*#__PURE__*/_jsx(Text, {
               style: styles.secondaryBtnText,
               children: "Camera"
             })
           })]
-        }), fileList.length ? /*#__PURE__*/_jsxs(Text, {
+        }), isUploading ? /*#__PURE__*/_jsx(StatusBanner, {
+          text: uploadStatus || 'Uploading file...',
+          busy: true
+        }) : uploadStatus ? /*#__PURE__*/_jsx(StatusBanner, {
+          text: uploadStatus,
+          tone: fileError ? 'error' : 'success'
+        }) : null, fileList.length ? /*#__PURE__*/_jsxs(Text, {
           style: styles.fileSelectedText,
           children: ["Selected: ", fileList.length, " files"]
         }) : null, fileList.length ? /*#__PURE__*/_jsx(View, {
@@ -1437,7 +1559,7 @@ function CreateAssignmentView({
         disabled: !canSubmit,
         children: /*#__PURE__*/_jsx(Text, {
           style: styles.primaryBtnText,
-          children: busy ? 'Please wait...' : 'Submit'
+          children: isSubmitting ? 'Submitting...' : isUploading ? 'Uploading...' : 'Submit'
         })
       }), !canPickSubject ? /*#__PURE__*/_jsx(Text, {
         style: styles.helperText,
@@ -1484,6 +1606,55 @@ function CreateAssignmentView({
           title: "PDF Viewer Missing"
         })]
       })
+    }), /*#__PURE__*/_jsx(Modal, {
+      visible: calendarOpen,
+      transparent: true,
+      animationType: "fade",
+      children: /*#__PURE__*/_jsx(Pressable, {
+        style: styles.modalOverlay,
+        onPress: () => setCalendarOpen(false),
+        children: /*#__PURE__*/_jsxs(Pressable, {
+          style: styles.sheetCard,
+          onPress: () => {},
+          children: [/*#__PURE__*/_jsxs(View, {
+            style: styles.modalHeader,
+            children: [/*#__PURE__*/_jsx(Text, {
+              style: styles.modalHeaderTitle,
+              children: dateMode === 'start' ? 'Select start date' : 'Select end date'
+            }), /*#__PURE__*/_jsx(TouchableOpacity, {
+              onPress: () => setCalendarOpen(false),
+              style: styles.modalClose,
+              children: /*#__PURE__*/_jsx(Text, {
+                style: styles.modalCloseText,
+                children: "Close"
+              })
+            })]
+          }), /*#__PURE__*/_jsx(View, {
+            style: {
+              flex: 1
+            },
+            children: Calendar ? /*#__PURE__*/_jsx(Calendar, {
+              markingType: "period",
+              markedDates: markedDates,
+              onDayPress: day => {
+                const d = String(day?.dateString ?? '');
+                if (!d) return;
+                if (dateMode === 'start') {
+                  setHomewDate(d);
+                  setMarkedDates(rangeMarkedDates(d, submissionDate || d));
+                } else {
+                  setSubmissionDate(d);
+                  setMarkedDates(rangeMarkedDates(homewDate || d, d));
+                }
+                setCalendarOpen(false);
+              }
+            }) : /*#__PURE__*/_jsx(EmptyState, {
+              title: "Calendar missing",
+              message: "Install react-native-calendars to enable date picker"
+            })
+          })]
+        })
+      })
     })]
   });
 }
@@ -1516,6 +1687,9 @@ function EditAssignmentView({
   const [calendarOpen, setCalendarOpen] = useState(false);
   const [dateMode, setDateMode] = useState('start');
   const [isDownloading, setIsDownloading] = useState(false);
+  const [isUploading, setIsUploading] = useState(false);
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const [uploadStatus, setUploadStatus] = useState('');
   const homeworkId = detailValue(initial, ['id', 'homework_id', 'homeworkId']);
   const initialTitle = String(detailValue(initial, ['title', 'homework_title'], '') ?? '');
   const initialDescription = String(detailValue(initial, ['description', 'desc', 'homework_description'], '') ?? '');
@@ -1527,7 +1701,6 @@ function EditAssignmentView({
   const initialStatus = initial?.status === 'unpublish' ? 'unpublish' : 'publish';
   const existingFile = String(detailValue(initial, ['document', 'file', 'attachment', 'document_path'], '') ?? '');
   const initialFiles = splitFileCsv(existingFile);
-  const [busy, setBusy] = useState(false);
   const [fileError, setFileError] = useState(null);
   const [fileList, setFileList] = useState(() => initialFiles);
   const [activeFile, setActiveFile] = useState(() => initialFiles[0] ?? '');
@@ -1584,7 +1757,6 @@ function EditAssignmentView({
       }).catch(() => {});
     } else {
       setSubjects([]);
-      setSubjectOpt(null);
     }
   }, [api, classOpt?.value, initialSectionId, initialSubjectId, sessionId]);
   const viewAttachment = useCallback(async rawFile => {
@@ -1701,20 +1873,28 @@ function EditAssignmentView({
       type: asset.type ?? 'image/jpeg'
     };
     setFileError(null);
-    setBusy(true);
+    setUploadStatus('Uploading image...');
+    setIsUploading(true);
     try {
-      const uploaded = await uploadAssignmentFile(api, file);
+      const uploaded = await uploadAssignmentFile(api, file, schoolCode);
       if (uploaded?.Status === 'Success' && uploaded.data) {
         const nextPath = String(uploaded.data);
         setFileList(prev => [...prev, nextPath]);
         setActiveFile(prev => prev || nextPath);
+        setUploadStatus('Image uploaded successfully');
       } else {
         setFileError('File upload failed');
+        setUploadStatus('Image upload failed');
+        Alert.alert('Error', String(uploaded?.msg ?? 'File not uploaded'));
       }
+    } catch (error) {
+      setFileError('File upload failed');
+      setUploadStatus('Image upload failed');
+      Alert.alert('Error', String(error?.message ?? 'File not uploaded'));
     } finally {
-      setBusy(false);
+      setIsUploading(false);
     }
-  }, [api]);
+  }, [api, schoolCode]);
   const pickFiles = useCallback(async () => {
     let dp = null;
     try {
@@ -1744,53 +1924,68 @@ function EditAssignmentView({
       return;
     }
     setFileError(null);
-    setBusy(true);
+    setUploadStatus(`Uploading ${files.length} file(s)...`);
+    setIsUploading(true);
     try {
-      const uploaded = [];
-      for (const f of files) {
-        const res = await uploadAssignmentFile(api, f);
-        if (res?.Status === 'Success' && res.data) {
-          uploaded.push(String(res.data));
-        }
-      }
+      const {
+        uploaded,
+        failedCount
+      } = await uploadAssignmentFilesBatch({
+        api,
+        files,
+        schoolCode
+      });
       if (!uploaded.length) {
         setFileError('File upload failed');
+        setUploadStatus('File upload failed');
+        Alert.alert('Error', 'File not uploaded');
         return;
       }
       setFileList(prev => [...prev, ...uploaded]);
       setActiveFile(prev => prev ? prev : uploaded[0] ?? '');
+      if (failedCount > 0) {
+        setFileError(`${failedCount} file(s) failed to upload`);
+        setUploadStatus(`${uploaded.length} file(s) uploaded, ${failedCount} failed`);
+        Alert.alert('Upload Incomplete', `${uploaded.length} file(s) uploaded and ${failedCount} failed.`);
+        return;
+      }
+      setFileError(null);
+      setUploadStatus(`${uploaded.length} file(s) uploaded successfully`);
+    } catch (error) {
+      setFileError('File upload failed');
+      setUploadStatus('File upload failed');
+      Alert.alert('Error', String(error?.message ?? 'File not uploaded'));
     } finally {
-      setBusy(false);
+      setIsUploading(false);
     }
-  }, [api]);
+  }, [api, schoolCode]);
   const submit = useCallback(async () => {
+    const selectedClassId = classOpt?.value ?? initialClassId;
+    const selectedSectionId = sectionOpt?.value ?? initialSectionId;
+    const selectedSubjectId = subjectOpt?.value ?? initialSubjectId;
     const fileToSend = fileList.length ? fileList.join(',') : undefined;
     const missing = [];
     if (!homeworkId) missing.push('homework id');
     if (!title) missing.push('title');
     if (!description) missing.push('description');
-    if (!classOpt?.value) missing.push('class');
-    if (!sectionOpt?.value) missing.push('section');
-    if (!subjectOpt?.value) missing.push('subject');
+    if (!selectedClassId) missing.push('class');
+    if (!selectedSectionId) missing.push('section');
+    if (!selectedSubjectId) missing.push('subject');
     if (!homewDate) missing.push('homework date');
     if (!submissionDate) missing.push('submission date');
-    if (!fileToSend) missing.push('file');
     if (missing.length) {
-      if (!fileToSend) {
-        setFileError('File is required');
-      }
       Alert.alert('Missing Fields', `Please fill: ${missing.join(', ')}`);
       return;
     }
-    setBusy(true);
+    setIsSubmitting(true);
     try {
       const res = await updateAssignment(api, {
         id: homeworkId,
         title,
         description,
-        class_id: classOpt.value,
-        section_id: sectionOpt.value,
-        sub_id: subjectOpt.value,
+        class_id: selectedClassId,
+        section_id: selectedSectionId,
+        sub_id: selectedSubjectId,
         homew_date: homewDate,
         submission_date: submissionDate,
         status,
@@ -1806,11 +2001,11 @@ function EditAssignmentView({
     } catch (error) {
       Alert.alert('Update Failed', String(error?.message ?? 'Could not update assignment'));
     } finally {
-      setBusy(false);
+      setIsSubmitting(false);
     }
-  }, [api, classOpt?.value, description, fileList, homewDate, homeworkId, onDone, sectionOpt?.value, status, subjectOpt?.value, submissionDate, title]);
+  }, [api, description, fileList, homewDate, homeworkId, initialClassId, initialSectionId, initialSubjectId, onDone, status, submissionDate, title, classOpt?.value, sectionOpt?.value, subjectOpt?.value]);
   const canPickSubject = sessionId !== undefined;
-  const canSubmit = canPickSubject && fileList.length > 0 && !busy;
+  const canSubmit = !isSubmitting && !isUploading;
   return /*#__PURE__*/_jsxs(SafeAreaView, {
     style: styles.root,
     children: [/*#__PURE__*/_jsxs(View, {
@@ -1938,7 +2133,7 @@ function EditAssignmentView({
             onPress: () => {
               pickFiles().catch(() => {});
             },
-            disabled: busy,
+            disabled: isUploading || isSubmitting,
             children: /*#__PURE__*/_jsx(Text, {
               style: styles.secondaryBtnText,
               children: "Add More Files"
@@ -1948,13 +2143,19 @@ function EditAssignmentView({
             onPress: () => {
               pickFromCamera().catch(() => {});
             },
-            disabled: busy,
+            disabled: isUploading || isSubmitting,
             children: /*#__PURE__*/_jsx(Text, {
               style: styles.secondaryBtnText,
               children: "Camera"
             })
           })]
-        }), fileList.length ? /*#__PURE__*/_jsxs(Text, {
+        }), isUploading ? /*#__PURE__*/_jsx(StatusBanner, {
+          text: uploadStatus || 'Uploading file...',
+          busy: true
+        }) : uploadStatus ? /*#__PURE__*/_jsx(StatusBanner, {
+          text: uploadStatus,
+          tone: fileError ? 'error' : 'success'
+        }) : null, fileList.length ? /*#__PURE__*/_jsxs(Text, {
           style: styles.fileSelectedText,
           children: ["Selected: ", fileList.length, " files"]
         }) : null, fileList.length ? /*#__PURE__*/_jsx(View, {
@@ -2101,7 +2302,7 @@ function EditAssignmentView({
         disabled: !canSubmit,
         children: /*#__PURE__*/_jsx(Text, {
           style: styles.primaryBtnText,
-          children: busy ? 'Please wait...' : 'Update'
+          children: isSubmitting ? 'Updating...' : isUploading ? 'Uploading...' : 'Update'
         })
       }), !canPickSubject ? /*#__PURE__*/_jsx(Text, {
         style: styles.helperText,
@@ -2605,5 +2806,20 @@ const styles = StyleSheet.create({
     marginTop: 6,
     fontSize: 12,
     color: '#6B7280'
+  },
+  statusBanner: {
+    marginTop: 10,
+    paddingHorizontal: 12,
+    paddingVertical: 10,
+    borderRadius: 12,
+    borderWidth: 1,
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: 10
+  },
+  statusBannerText: {
+    flex: 1,
+    fontSize: 12,
+    fontWeight: '700'
   }
 });

package/lib/module/modules/assignment/services/assignmentService.js

@@ -29,14 +29,14 @@ export async function createAssignment(api, payload) {
   const res = await api.post(endpoints.assignment.add, payload);
   return res.data;
 }
-export async function uploadAssignmentFile(api, file) {
+export async function uploadAssignmentFile(api, file, _schoolCode) {
   const formData = new FormData();
   formData.append('file', {
     uri: file.uri,
     name: file.name,
     type: file.type
   });
-  formData.append('filepath', 'uploads/student/homework/');
+  formData.append('filepath', 'student/homework/');
   const res = await api.post(endpoints.assignment.uploadFile, formData, {
     headers: {
       'Content-Type': 'multipart/form-data'