@ubkinfotech/tecaher-erp 0.1.1 → 0.1.2

package/lib/commonjs/modules/leaveRequest/screens/LeaveRequestScreen.js

@@ -237,7 +237,8 @@ function ApplyLeaveView({
   onSuccess
 }) {
   const {
-    api
+    api,
+    schoolCode
   } = (0, _useERP.useERP)();
   const Calendar = (0, _react.useMemo)(() => tryGetCalendar(), []);
   const [reason, setReason] = (0, _react.useState)('');
@@ -275,7 +276,7 @@ function ApplyLeaveView({
     setFileName(file.name);
     setBusy(true);
     try {
-      const res = await (0, _leaveRequestService.uploadLeaveFile)(api, file);
+      const res = await (0, _leaveRequestService.uploadLeaveFile)(api, file, schoolCode);
       if (res?.Status === 'Success' && res?.data) {
         setFilePath(res.data);
       } else {
@@ -291,7 +292,7 @@ function ApplyLeaveView({
       setBusy(false);
       setUploadOpen(false);
     }
-  }, [api]);
+  }, [api, schoolCode]);
   const pickCamera = (0, _react.useCallback)(async () => {
     let picker = null;
     try {
@@ -321,7 +322,7 @@ function ApplyLeaveView({
     setFileName(file.name);
     setBusy(true);
     try {
-      const res = await (0, _leaveRequestService.uploadLeaveFile)(api, file);
+      const res = await (0, _leaveRequestService.uploadLeaveFile)(api, file, schoolCode);
       if (res?.Status === 'Success' && res?.data) {
         setFilePath(res.data);
       } else {
@@ -337,7 +338,7 @@ function ApplyLeaveView({
       setBusy(false);
       setUploadOpen(false);
     }
-  }, [api]);
+  }, [api, schoolCode]);
   const submit = (0, _react.useCallback)(async () => {
     const missing = [];
     if (!reason) missing.push('reason');

package/lib/commonjs/modules/leaveRequest/services/leaveRequestService.js

@@ -8,6 +8,14 @@ exports.fetchLeaveRequests = fetchLeaveRequests;
 exports.fetchLeaveTypes = fetchLeaveTypes;
 exports.uploadLeaveFile = uploadLeaveFile;
 var _endpoints = require("../../../core/api/endpoints");
+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 fetchLeaveRequests(api, params) {
   const page = params.page ?? 1;
   const perPage = params.perPage ?? 10;
@@ -21,14 +29,14 @@ async function fetchLeaveTypes(api) {
   const res = await api.get(_endpoints.endpoints.leaveRequest.leaveTypes);
   return res.data;
 }
-async function uploadLeaveFile(api, file) {
+async function uploadLeaveFile(api, file, schoolCode) {
   const formData = new FormData();
   formData.append('file', {
     uri: file.uri,
     name: file.name,
     type: file.type
   });
-  formData.append('filepath', 'uploads/staff/leave/');
+  formData.append('filepath', buildUploadFilePath('uploads/staff/leave/', schoolCode));
   const res = await api.post(_endpoints.endpoints.assignment.uploadFile, formData, {
     headers: {
       'Content-Type': 'multipart/form-data'