@ubkinfotech/tecaher-erp 0.1.0 → 0.1.2

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

@@ -10,8 +10,7 @@ var _useERP = require("../../../core/provider/useERP");
 var _EmptyState = require("../../../shared/empty-states/EmptyState");
 var _leaveRequestService = require("../services/leaveRequestService");
 var _jsxRuntime = require("react/jsx-runtime");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function normalizeLeaveItems(result) {
   if (Array.isArray(result)) {
     return result;
@@ -238,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)('');
@@ -276,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 {
@@ -292,7 +292,7 @@ function ApplyLeaveView({
       setBusy(false);
       setUploadOpen(false);
     }
-  }, [api]);
+  }, [api, schoolCode]);
   const pickCamera = (0, _react.useCallback)(async () => {
     let picker = null;
     try {
@@ -322,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 {
@@ -338,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'

package/lib/commonjs/modules/marks/screens/MarksScreen.js

@@ -11,8 +11,7 @@ var _EmptyState = require("../../../shared/empty-states/EmptyState");
 var _LoadingState = require("../../../shared/loaders/LoadingState");
 var _marksService = require("../services/marksService");
 var _jsxRuntime = require("react/jsx-runtime");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const REMARK_OPTIONS = ['Good in studies. Needs to put in a little more effort in oral work.', 'Needs to work hard for better marks. Needs practice in both writing and oral work', 'Has shown considerable improvement b needs to pay more attention to conversation skills.', 'Needs systematic and regular follow up at home with regard to studies.', 'Can do better with some help at home. Oral work needs brushing up', 'promising child who needs to put in a little more effort', 'Has the potential to do very well but needs more focused attention.', 'Good in studies. Can be excellent with a little extra care.', 'Has shown good improvement. Has the potential to do even better.', 'Extra care can bring improvement in performance. All round improvement required.', 'Has not yet become familiar with the school atmosphere. No amount of coaxing can make him write.', 'Has performed below ability. Needs special care, time and encouragement to do better.', 'Has not yet become familiar with the school atmosphere. No amount of coaxing can make him write.', 'Needs to be more patient with written work. More practice in conversation is also required.', 'Has shown no improvement. Parents are requested to give special care at home.', 'Finishes the given work but is very talkative and disturbing in class.', 'Handwriting needs to improve. Proper guidance at home can bring good results.', 'Weak in studies. Does not respond in class. Needs to work much harder in order to get promotion.', 'An average child who can improve with a little more care and attention at home.', 'Inattentive in class. Does not follow class room instructions. Needs to pay attention to his studies.', 'Others'];
 function normalizeList(result) {
   if (Array.isArray(result)) {

package/lib/commonjs/modules/myAttendance/screens/MyAttendanceScreen.js

@@ -11,8 +11,7 @@ var _ErrorState = require("../../../shared/empty-states/ErrorState");
 var _LoadingState = require("../../../shared/loaders/LoadingState");
 var _useMyAttendance = require("../hooks/useMyAttendance");
 var _jsxRuntime = require("react/jsx-runtime");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function padMonth(value) {
   const asNumber = Number(value);
   if (Number.isFinite(asNumber)) {