@ubkinfotech/tecaher-erp 0.1.1 → 0.1.2

package/lib/commonjs/modules/notes/screens/NotesScreen.js

@@ -31,7 +31,22 @@ function resolveNoteUrl(baseUrl, file) {
   if (!file) return '';
   if (/^https?:\/\//i.test(file)) return file;
   const base = String(baseUrl ?? '').replace(/\/?$/, '/');
-  const normalized = String(file).replace(/^\/+/, '');
+  const normalized = String(file).replace(/\\/g, '/').replace(/^\/+/, '');
+  const uploadsIndex = base.toLowerCase().indexOf('uploads/');
+  const uploadsBase = uploadsIndex >= 0 ? base.slice(0, uploadsIndex + 'uploads/'.length) : base;
+  const uploadsRoot = uploadsIndex >= 0 ? base.slice(0, uploadsIndex) : base;
+  if (normalized.startsWith('uploads/')) {
+    return `${uploadsRoot}${normalized}`;
+  }
+  if (normalized.startsWith('school_')) {
+    return `${uploadsBase}${normalized}`;
+  }
+  if (normalized.startsWith('student/note/')) {
+    return `${base}${normalized}`;
+  }
+  if (normalized.includes('/')) {
+    return `${base}${normalized}`;
+  }
   return `${base}student/note/${normalized}`;
 }
 function isImageUrl(file) {
@@ -47,6 +62,10 @@ function fileBaseName(path) {
 function ensureFileUri(path) {
   return path.startsWith('file://') ? path : `file://${path}`;
 }
+function splitFileCsv(raw) {
+  if (!raw) return [];
+  return String(raw).split(',').map(item => item.trim()).filter(Boolean);
+}
 function tryGetImageViewer() {
   try {
     const mod = require('react-native-image-viewing');
@@ -94,6 +113,68 @@ async function downloadPdfToLocal(args) {
   }
   return ensureFileUri(target);
 }
+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'
+  } : tone === 'warning' ? {
+    backgroundColor: '#FFF7ED',
+    borderColor: '#FED7AA',
+    textColor: '#C2410C',
+    spinnerColor: '#EA580C'
+  } : {
+    backgroundColor: '#EFF6FF',
+    borderColor: '#BFDBFE',
+    textColor: '#1D4ED8',
+    spinnerColor: '#2563EB'
+  };
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
+    style: [styles.statusBanner, {
+      backgroundColor: palette.backgroundColor,
+      borderColor: palette.borderColor
+    }],
+    children: [busy ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.ActivityIndicator, {
+      size: "small",
+      color: palette.spinnerColor
+    }) : null, /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
+      style: [styles.statusBannerText, {
+        color: palette.textColor
+      }],
+      children: text
+    })]
+  });
+}
+async function uploadNoteFilesBatch(args) {
+  const uploaded = [];
+  let failedCount = 0;
+  await Promise.all(args.files.map(async file => {
+    try {
+      const response = await (0, _notesService.uploadNoteFile)(args.api, file, args.schoolCode);
+      if (response?.Status === 'Success' && response?.data) {
+        uploaded.push(String(response.data));
+        return;
+      }
+    } catch {
+      // Keep partial success behavior for multi-file uploads.
+    }
+    failedCount += 1;
+  }));
+  return {
+    uploaded,
+    failedCount
+  };
+}
 function SelectField({
   label,
   value,
@@ -166,7 +247,10 @@ function NoteEditor(props) {
   const RNFS = (0, _react.useMemo)(() => tryGetRNFS(), []);
   const FileViewer = (0, _react.useMemo)(() => tryGetFileViewer(), []);
   const [loading, setLoading] = (0, _react.useState)(props.mode === 'edit');
-  const [saving, setSaving] = (0, _react.useState)(false);
+  const [isUploading, setIsUploading] = (0, _react.useState)(false);
+  const [isSubmitting, setIsSubmitting] = (0, _react.useState)(false);
+  const [uploadStatus, setUploadStatus] = (0, _react.useState)('');
+  const [uploadTone, setUploadTone] = (0, _react.useState)('info');
   const [classes, setClasses] = (0, _react.useState)([]);
   const [sections, setSections] = (0, _react.useState)([]);
   const [subjects, setSubjects] = (0, _react.useState)([]);
@@ -176,8 +260,12 @@ function NoteEditor(props) {
   const [classOpt, setClassOpt] = (0, _react.useState)(null);
   const [sectionOpt, setSectionOpt] = (0, _react.useState)(null);
   const [subjectOpt, setSubjectOpt] = (0, _react.useState)(null);
-  const [file, setFile] = (0, _react.useState)('');
+  const [fileList, setFileList] = (0, _react.useState)([]);
+  const [activeFile, setActiveFile] = (0, _react.useState)('');
+  const [fileError, setFileError] = (0, _react.useState)(null);
   const [viewerOpen, setViewerOpen] = (0, _react.useState)(false);
+  const [viewerIndex, setViewerIndex] = (0, _react.useState)(0);
+  const [viewerImages, setViewerImages] = (0, _react.useState)([]);
   const [pdfVisible, setPdfVisible] = (0, _react.useState)(false);
   const [pdfUri, setPdfUri] = (0, _react.useState)('');
   const [pdfHeaders, setPdfHeaders] = (0, _react.useState)({});
@@ -230,7 +318,9 @@ function NoteEditor(props) {
         setTitle(String(data?.title ?? ''));
         setDescription(String(data?.description ?? data?.remark ?? ''));
         setStatus(String(data?.status ?? 'publish').toLowerCase() === 'unpublish' ? 'unpublish' : 'publish');
-        setFile(String(data?.file ?? ''));
+        const noteFiles = splitFileCsv(data?.file ?? '');
+        setFileList(noteFiles);
+        setActiveFile(noteFiles[0] ?? '');
         const classId = data?.class_id ?? props.defaults.classId;
         const sectionId = data?.section_id ?? props.defaults.sectionId;
         const subjectId = data?.sub_id ?? data?.subject_id ?? props.defaults.subjectId;
@@ -280,27 +370,51 @@ function NoteEditor(props) {
       dp = require('react-native-document-picker');
     } catch {}
     if (!dp) return;
-    const selected = await dp.pickSingle({
+    const selected = await dp.pick({
       presentationStyle: 'fullScreen',
+      allowMultiSelection: true,
       type: [dp.types.pdf, dp.types.images]
     });
-    const upload = {
-      uri: selected.uri,
-      name: selected.name ?? 'file',
-      type: selected.type ?? 'application/octet-stream'
-    };
-    setSaving(true);
+    const picks = Array.isArray(selected) ? selected : [selected];
+    const uploads = picks.map(item => ({
+      uri: item.uri,
+      name: item.name ?? 'file',
+      type: item.type ?? 'application/octet-stream'
+    })).filter(item => !!item.uri);
+    if (!uploads.length) return;
+    setFileError(null);
+    setUploadStatus(`Uploading ${uploads.length} file(s)...`);
+    setUploadTone('info');
+    setIsUploading(true);
     try {
-      const res = await (0, _notesService.uploadNoteFile)(api, upload);
-      if (res?.Status === 'Success' && res?.data) {
-        setFile(String(res.data));
-      } else {
-        _reactNative.Alert.alert('Error', 'File not uploaded');
+      const {
+        uploaded,
+        failedCount
+      } = await uploadNoteFilesBatch({
+        api,
+        files: uploads,
+        schoolCode
+      });
+      if (!uploaded.length) {
+        setFileError('File upload failed');
+        setUploadStatus('File upload failed');
+        setUploadTone('error');
+        return;
+      }
+      setFileList(prev => [...prev, ...uploaded]);
+      setActiveFile(prev => prev || uploaded[0] || '');
+      if (failedCount > 0) {
+        setFileError(`${failedCount} file(s) failed to upload`);
+        setUploadStatus(`${uploaded.length} file(s) uploaded and ${failedCount} failed.`);
+        setUploadTone('warning');
+        return;
       }
+      setUploadStatus(`${uploaded.length} file(s) uploaded successfully.`);
+      setUploadTone('success');
     } finally {
-      setSaving(false);
+      setIsUploading(false);
     }
-  }, [api]);
+  }, [api, schoolCode]);
   const pickCamera = (0, _react.useCallback)(async () => {
     let picker = null;
     try {
@@ -321,30 +435,51 @@ function NoteEditor(props) {
       name: asset.fileName ?? 'camera.jpg',
       type: asset.type ?? 'image/jpeg'
     };
-    setSaving(true);
+    setFileError(null);
+    setUploadStatus('Uploading image...');
+    setUploadTone('info');
+    setIsUploading(true);
     try {
-      const response = await (0, _notesService.uploadNoteFile)(api, upload);
+      const response = await (0, _notesService.uploadNoteFile)(api, upload, schoolCode);
       if (response?.Status === 'Success' && response?.data) {
-        setFile(String(response.data));
+        const nextFile = String(response.data);
+        setFileList(prev => [...prev, nextFile]);
+        setActiveFile(prev => prev || nextFile);
+        setUploadStatus('Image uploaded successfully.');
+        setUploadTone('success');
       } else {
-        _reactNative.Alert.alert('Error', 'File not uploaded');
+        setFileError('Image upload failed');
+        setUploadStatus(String(response?.msg ?? 'Image upload failed'));
+        setUploadTone('error');
       }
     } finally {
-      setSaving(false);
+      setIsUploading(false);
     }
-  }, [api]);
-  const viewAttachment = (0, _react.useCallback)(async () => {
-    if (!file) {
+  }, [api, schoolCode]);
+  const viewAttachment = (0, _react.useCallback)(async selectedFile => {
+    const targetFile = String(selectedFile ?? activeFile ?? fileList[0] ?? '');
+    if (!targetFile) {
       _reactNative.Alert.alert('No Attachment');
       return;
     }
-    const url = resolveNoteUrl(fileBaseUrl, file);
+    const url = resolveNoteUrl(fileBaseUrl, targetFile);
     const headers = await resolveHeaders();
-    if (ImageView && isImageUrl(file)) {
+    const targetIsImage = isImageUrl(targetFile) || isImageUrl(url);
+    if (ImageView && targetIsImage) {
+      const imageFiles = fileList.filter(currentFile => {
+        const currentUrl = resolveNoteUrl(fileBaseUrl, currentFile);
+        return isImageUrl(currentFile) || isImageUrl(currentUrl);
+      });
+      const nextIndex = Math.max(0, imageFiles.findIndex(currentFile => String(currentFile) === String(targetFile)));
+      setViewerImages(imageFiles.map(currentFile => ({
+        uri: resolveNoteUrl(fileBaseUrl, currentFile),
+        headers: Object.keys(headers).length ? headers : undefined
+      })));
+      setViewerIndex(nextIndex);
       setViewerOpen(true);
       return;
     }
-    const isPdf = String(file).toLowerCase().endsWith('.pdf') || url.toLowerCase().endsWith('.pdf');
+    const isPdf = String(targetFile).toLowerCase().endsWith('.pdf') || url.toLowerCase().endsWith('.pdf');
     if (Pdf && isPdf) {
       if (!RNFS) {
         setPdfHeaders(headers);
@@ -358,7 +493,7 @@ function NoteEditor(props) {
         const local = await downloadPdfToLocal({
           RNFS,
           url,
-          fileName: fileBaseName(file),
+          fileName: fileBaseName(targetFile),
           headers
         });
         setPdfHeaders({});
@@ -378,7 +513,7 @@ function NoteEditor(props) {
     }
     setDownloading(true);
     try {
-      const localFile = `${RNFS.DocumentDirectoryPath}/${fileBaseName(file)}`;
+      const localFile = `${RNFS.DocumentDirectoryPath}/${fileBaseName(targetFile)}`;
       await RNFS.downloadFile({
         fromUrl: url,
         toFile: localFile,
@@ -392,10 +527,23 @@ function NoteEditor(props) {
     } finally {
       setDownloading(false);
     }
-  }, [FileViewer, ImageView, Pdf, RNFS, file, fileBaseUrl, resolveHeaders]);
+  }, [FileViewer, ImageView, Pdf, RNFS, activeFile, fileBaseUrl, fileList, resolveHeaders]);
   const submit = (0, _react.useCallback)(async () => {
-    if (!title || !description || !classOpt?.value || !sectionOpt?.value || !subjectOpt?.value || !file) {
-      _reactNative.Alert.alert('Error', 'Please enter all the details');
+    const selectedClassId = classOpt?.value;
+    const selectedSectionId = sectionOpt?.value;
+    const selectedSubjectId = subjectOpt?.value;
+    const missing = [];
+    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 (props.mode === 'edit' && !fileList.length) missing.push('file');
+    if (missing.length) {
+      if (props.mode === 'edit' && !fileList.length) {
+        setFileError('File is required');
+      }
+      _reactNative.Alert.alert('Error', `Please fill: ${missing.join(', ')}`);
       return;
     }
     const payload = {
@@ -403,13 +551,13 @@ function NoteEditor(props) {
       title,
       description,
       remark: description,
-      class_id: classOpt.value,
-      section_id: sectionOpt.value,
-      sub_id: subjectOpt.value,
-      file,
+      class_id: selectedClassId,
+      section_id: selectedSectionId,
+      sub_id: selectedSubjectId,
+      file: fileList.join(','),
       status
     };
-    setSaving(true);
+    setIsSubmitting(true);
     try {
       const res = props.mode === 'create' ? await (0, _notesService.createNote)(api, payload) : await (0, _notesService.updateNote)(api, {
         ...payload,
@@ -425,13 +573,13 @@ function NoteEditor(props) {
     } catch (e) {
       _reactNative.Alert.alert('Error', String(e?.message ?? 'Could not save note'));
     } finally {
-      setSaving(false);
+      setIsSubmitting(false);
     }
-  }, [api, classOpt?.value, description, file, props, sectionOpt?.value, status, subjectOpt?.value, title]);
+  }, [api, classOpt?.value, description, fileList, props, sectionOpt?.value, status, subjectOpt?.value, title]);
   if (loading) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_LoadingState.LoadingState, {});
   }
-  const fileUrl = file ? resolveNoteUrl(fileBaseUrl, file) : '';
+  const fileUrl = activeFile ? resolveNoteUrl(fileBaseUrl, activeFile) : '';
   const headers = authToken || schoolCode ? {
     ...(authToken ? {
       Authorization: authToken
@@ -489,7 +637,11 @@ function NoteEditor(props) {
           value: classOpt,
           options: classes,
           placeholder: "Select class",
-          onChange: setClassOpt
+          onChange: next => {
+            setClassOpt(next);
+            setSectionOpt(null);
+            setSubjectOpt(null);
+          }
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(SelectField, {
           label: "Section",
           value: sectionOpt,
@@ -535,24 +687,69 @@ function NoteEditor(props) {
             children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TouchableOpacity, {
               style: styles.secondaryBtn,
               onPress: () => pickDocument().catch(() => {}),
+              disabled: isUploading || isSubmitting,
               children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
                 style: styles.secondaryBtnText,
-                children: file ? 'Change File' : 'Upload File'
+                children: fileList.length ? 'Add More Files' : 'Upload File'
               })
             }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TouchableOpacity, {
               style: styles.secondaryBtn,
               onPress: () => pickCamera().catch(() => {}),
+              disabled: isUploading || isSubmitting,
               children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
                 style: styles.secondaryBtnText,
                 children: "Camera"
               })
             })]
-          }), file ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.Text, {
+          }), isUploading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(StatusBanner, {
+            text: uploadStatus || 'Uploading file...',
+            busy: true,
+            tone: uploadTone
+          }) : uploadStatus ? /*#__PURE__*/(0, _jsxRuntime.jsx)(StatusBanner, {
+            text: uploadStatus,
+            tone: uploadTone
+          }) : null, fileList.length ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.Text, {
             style: styles.fileText,
-            children: ["Selected: ", fileBaseName(file)]
-          }) : null, file ? isImageUrl(file) ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TouchableOpacity, {
+            children: ["Selected: ", fileList.length, " file", fileList.length > 1 ? 's' : '']
+          }) : null, fileList.length ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+            style: styles.attachmentList,
+            children: fileList.map((currentFile, index) => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
+              style: styles.attachmentRow,
+              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
+                style: styles.attachmentName,
+                numberOfLines: 1,
+                children: fileBaseName(currentFile)
+              }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
+                style: styles.attachmentActions,
+                children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TouchableOpacity, {
+                  style: styles.inlineActionBtn,
+                  onPress: () => {
+                    setActiveFile(currentFile);
+                    viewAttachment(currentFile).catch(() => {});
+                  },
+                  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
+                    style: styles.inlineActionText,
+                    children: "View"
+                  })
+                }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TouchableOpacity, {
+                  style: styles.inlineRemoveBtn,
+                  onPress: () => {
+                    setFileList(prev => {
+                      const next = prev.filter((_, itemIndex) => itemIndex !== index);
+                      setActiveFile(current => current === currentFile ? next[0] ?? '' : current);
+                      return next;
+                    });
+                  },
+                  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
+                    style: styles.inlineRemoveText,
+                    children: "Remove"
+                  })
+                })]
+              })]
+            }, `${currentFile}-${index}`))
+          }) : null, activeFile ? isImageUrl(activeFile) || isImageUrl(fileUrl) ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TouchableOpacity, {
             style: styles.previewWrap,
-            onPress: () => setViewerOpen(true),
+            onPress: () => viewAttachment(activeFile).catch(() => {}),
             activeOpacity: 0.9,
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Image, {
               source: {
@@ -564,31 +761,37 @@ function NoteEditor(props) {
             })
           }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TouchableOpacity, {
             style: styles.documentBtn,
-            onPress: () => viewAttachment().catch(() => {}),
+            onPress: () => viewAttachment(activeFile).catch(() => {}),
             disabled: downloading,
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
               style: styles.documentBtnText,
               children: downloading ? 'Opening Document...' : 'View Document'
             })
+          }) : null, fileError ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
+            style: styles.errorText,
+            children: fileError
           }) : null]
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TouchableOpacity, {
           style: styles.primaryBtn,
           onPress: () => submit().catch(() => {}),
-          disabled: saving,
-          children: saving ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.ActivityIndicator, {
-            color: "#FFFFFF"
+          disabled: isUploading || isSubmitting,
+          children: isSubmitting ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
+            style: styles.loadingRow,
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.ActivityIndicator, {
+              color: "#FFFFFF"
+            }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
+              style: styles.primaryBtnText,
+              children: props.mode === 'create' ? 'Creating...' : 'Updating...'
+            })]
           }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
             style: styles.primaryBtnText,
             children: props.mode === 'create' ? 'Create Note' : 'Update Note'
           })
         })]
       })]
-    }), ImageView && file && isImageUrl(file) ? /*#__PURE__*/(0, _jsxRuntime.jsx)(ImageView, {
-      images: [{
-        uri: fileUrl,
-        headers
-      }],
-      imageIndex: 0,
+    }), ImageView && viewerImages.length ? /*#__PURE__*/(0, _jsxRuntime.jsx)(ImageView, {
+      images: viewerImages,
+      imageIndex: viewerIndex,
       visible: viewerOpen,
       onRequestClose: () => setViewerOpen(false)
     }) : null, /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Modal, {
@@ -657,7 +860,10 @@ function NotesScreen(props) {
   const [loadingMore, setLoadingMore] = (0, _react.useState)(false);
   const [error, setError] = (0, _react.useState)(null);
   const [selectedNote, setSelectedNote] = (0, _react.useState)(null);
+  const [selectedActiveFile, setSelectedActiveFile] = (0, _react.useState)('');
   const [viewerOpen, setViewerOpen] = (0, _react.useState)(false);
+  const [viewerIndex, setViewerIndex] = (0, _react.useState)(0);
+  const [viewerImages, setViewerImages] = (0, _react.useState)([]);
   const [pdfVisible, setPdfVisible] = (0, _react.useState)(false);
   const [pdfUri, setPdfUri] = (0, _react.useState)('');
   const [pdfHeaders, setPdfHeaders] = (0, _react.useState)({});
@@ -739,15 +945,26 @@ function NotesScreen(props) {
     if (mode !== 'list') return;
     loadList(props.page ?? 1, true).catch(() => {});
   }, [loadList, mode, props.page]);
-  const viewNoteAttachment = (0, _react.useCallback)(async () => {
-    const file = String(selectedNote?.file ?? '');
+  const selectedNoteFiles = (0, _react.useMemo)(() => splitFileCsv(selectedNote?.file ?? ''), [selectedNote?.file]);
+  const viewNoteAttachment = (0, _react.useCallback)(async selectedFile => {
+    const file = String(selectedFile ?? selectedActiveFile ?? selectedNoteFiles[0] ?? '');
     if (!file) {
       _reactNative.Alert.alert('No Attachment');
       return;
     }
     const url = resolveNoteUrl(fileBaseUrl, file);
     const headers = await resolveHeaders();
-    if (ImageView && isImageUrl(file)) {
+    if (ImageView && (isImageUrl(file) || isImageUrl(url))) {
+      const imageFiles = selectedNoteFiles.filter(currentFile => {
+        const currentUrl = resolveNoteUrl(fileBaseUrl, currentFile);
+        return isImageUrl(currentFile) || isImageUrl(currentUrl);
+      });
+      const nextIndex = Math.max(0, imageFiles.findIndex(currentFile => String(currentFile) === String(file)));
+      setViewerImages(imageFiles.map(currentFile => ({
+        uri: resolveNoteUrl(fileBaseUrl, currentFile),
+        headers: Object.keys(headers).length ? headers : undefined
+      })));
+      setViewerIndex(nextIndex);
       setViewerOpen(true);
       return;
     }
@@ -799,7 +1016,7 @@ function NotesScreen(props) {
     } finally {
       setDownloading(false);
     }
-  }, [FileViewer, ImageView, Pdf, RNFS, fileBaseUrl, resolveHeaders, selectedNote?.file]);
+  }, [FileViewer, ImageView, Pdf, RNFS, fileBaseUrl, resolveHeaders, selectedActiveFile, selectedNoteFiles]);
   if (mode === 'create') {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(NoteEditor, {
       mode: "create",
@@ -924,7 +1141,10 @@ function NotesScreen(props) {
           style: styles.row,
           children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TouchableOpacity, {
             style: styles.secondaryBtn,
-            onPress: () => setSelectedNote(item),
+            onPress: () => {
+              setSelectedNote(item);
+              setSelectedActiveFile(splitFileCsv(item?.file ?? '')[0] ?? '');
+            },
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
               style: styles.secondaryBtnText,
               children: "View"
@@ -987,42 +1207,65 @@ function NotesScreen(props) {
             }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
               style: styles.noteDescFull,
               children: String(selectedNote?.description ?? selectedNote?.remark ?? '-')
-            }), selectedNote?.file ? isImageUrl(String(selectedNote.file)) ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TouchableOpacity, {
-              style: styles.previewWrap,
-              onPress: () => setViewerOpen(true),
-              activeOpacity: 0.9,
-              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Image, {
-                source: {
-                  uri: resolveNoteUrl(fileBaseUrl, String(selectedNote.file)),
-                  headers: authToken || schoolCode ? {
-                    ...(authToken ? {
-                      Authorization: authToken
-                    } : {}),
-                    ...(schoolCode ? {
-                      school_code: schoolCode
-                    } : {})
-                  } : undefined
-                },
-                style: styles.previewImage,
-                resizeMode: "contain"
-              })
-            }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TouchableOpacity, {
-              style: styles.documentBtn,
-              onPress: () => viewNoteAttachment().catch(() => {}),
-              disabled: downloading,
-              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
-                style: styles.documentBtnText,
-                children: downloading ? 'Opening Document...' : 'View Document'
-              })
+            }), selectedNoteFiles.length ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+              children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.Text, {
+                style: styles.fileText,
+                children: ["Selected: ", selectedNoteFiles.length, " file", selectedNoteFiles.length > 1 ? 's' : '']
+              }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+                style: styles.attachmentList,
+                children: selectedNoteFiles.map((currentFile, index) => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
+                  style: styles.attachmentRow,
+                  children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
+                    style: styles.attachmentName,
+                    numberOfLines: 1,
+                    children: fileBaseName(currentFile)
+                  }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TouchableOpacity, {
+                    style: styles.inlineActionBtn,
+                    onPress: () => {
+                      setSelectedActiveFile(currentFile);
+                      viewNoteAttachment(currentFile).catch(() => {});
+                    },
+                    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
+                      style: styles.inlineActionText,
+                      children: "View"
+                    })
+                  })]
+                }, `${currentFile}-${index}`))
+              }), selectedActiveFile ? isImageUrl(selectedActiveFile) || isImageUrl(resolveNoteUrl(fileBaseUrl, selectedActiveFile)) ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TouchableOpacity, {
+                style: styles.previewWrap,
+                onPress: () => viewNoteAttachment(selectedActiveFile).catch(() => {}),
+                activeOpacity: 0.9,
+                children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Image, {
+                  source: {
+                    uri: resolveNoteUrl(fileBaseUrl, selectedActiveFile),
+                    headers: authToken || schoolCode ? {
+                      ...(authToken ? {
+                        Authorization: authToken
+                      } : {}),
+                      ...(schoolCode ? {
+                        school_code: schoolCode
+                      } : {})
+                    } : undefined
+                  },
+                  style: styles.previewImage,
+                  resizeMode: "contain"
+                })
+              }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TouchableOpacity, {
+                style: styles.documentBtn,
+                onPress: () => viewNoteAttachment(selectedActiveFile).catch(() => {}),
+                disabled: downloading,
+                children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
+                  style: styles.documentBtnText,
+                  children: downloading ? 'Opening Document...' : 'View Document'
+                })
+              }) : null]
             }) : null]
           }) : null]
         })
       })
-    }), ImageView && selectedNote?.file && isImageUrl(String(selectedNote.file)) ? /*#__PURE__*/(0, _jsxRuntime.jsx)(ImageView, {
-      images: [{
-        uri: resolveNoteUrl(fileBaseUrl, String(selectedNote.file))
-      }],
-      imageIndex: 0,
+    }), ImageView && viewerImages.length ? /*#__PURE__*/(0, _jsxRuntime.jsx)(ImageView, {
+      images: viewerImages,
+      imageIndex: viewerIndex,
       visible: viewerOpen,
       onRequestClose: () => setViewerOpen(false)
     }) : null, /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Modal, {
@@ -1194,6 +1437,51 @@ const styles = _reactNative.StyleSheet.create({
     color: '#374151',
     marginTop: 8
   },
+  attachmentList: {
+    width: '100%',
+    marginTop: 8
+  },
+  attachmentRow: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    paddingVertical: 8,
+    borderBottomWidth: 1,
+    borderBottomColor: '#E5E7EB',
+    gap: 10
+  },
+  attachmentName: {
+    flex: 1,
+    color: '#111827',
+    fontSize: 13
+  },
+  attachmentActions: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: 8
+  },
+  inlineActionBtn: {
+    paddingHorizontal: 10,
+    paddingVertical: 6,
+    borderRadius: 8,
+    backgroundColor: '#DBEAFE'
+  },
+  inlineActionText: {
+    color: '#1D4ED8',
+    fontWeight: '700',
+    fontSize: 12
+  },
+  inlineRemoveBtn: {
+    paddingHorizontal: 10,
+    paddingVertical: 6,
+    borderRadius: 8,
+    backgroundColor: '#FEE2E2'
+  },
+  inlineRemoveText: {
+    color: '#B91C1C',
+    fontWeight: '700',
+    fontSize: 12
+  },
   previewWrap: {
     marginTop: 12,
     borderWidth: 1,
@@ -1282,5 +1570,31 @@ const styles = _reactNative.StyleSheet.create({
     color: '#6B7280',
     textAlign: 'center',
     paddingVertical: 16
+  },
+  statusBanner: {
+    marginTop: 10,
+    paddingHorizontal: 12,
+    paddingVertical: 10,
+    borderRadius: 12,
+    borderWidth: 1,
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: 10
+  },
+  statusBannerText: {
+    flex: 1,
+    fontSize: 12,
+    fontWeight: '700'
+  },
+  errorText: {
+    marginTop: 6,
+    fontSize: 12,
+    color: '#DC2626',
+    fontWeight: '600'
+  },
+  loadingRow: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: 8
   }
 });