diff --git a/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js b/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js
index c696101..1f6292d 100644
--- a/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js
+++ b/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js
@@ -39,10 +39,10 @@ const LatestBandiTableInstructorManagerAsync = () => {
name: { value: null, matchMode: 'contains' },
startDate: { value: null, matchMode: 'dateIs' },
endDate: { value: null, matchMode: 'dateIs' },
- status: { value: null, matchMode: 'equals' }
+ status: { value: 'PUBLISH', matchMode: 'equals' }
}
});
- const statuses = ['PUBLISH', 'EXPIRED'];
+ const statuses = ['PUBLISH'];
const getPaginationQuery = useCallback(() => getQueryParamsForPaginatedEndpoint(lazyState, statuses, 'id'), [lazyState]);
@@ -128,23 +128,23 @@ const LatestBandiTableInstructorManagerAsync = () => {
return
}
- const exportToCSV = (applicationId) => {
+ const handleDownloadRanking = (callId) => {
setLocalAsyncRequest(true);
- ApplicationService.downloadCsvReport(
- applicationId,
- (resp) => getCsvReportback(resp, applicationId),
- errCsvReportCallback
- )
+ ApplicationService.downloadRanking(callId,
+ (resp) => downloadSuccessCallback(resp, callId),
+ downloadErrorCallback)
}
- const getCsvReportback = (resp, applicationId) => {
+ const downloadSuccessCallback = (resp, applicationId) => {
const file = new Blob([resp], { type: 'text/csv' });
const url = window.URL.createObjectURL(file);
const link = document.createElement('a');
@@ -156,7 +156,7 @@ const LatestBandiTableInstructorManagerAsync = () => {
setLocalAsyncRequest(false);
}
- const errCsvReportCallback = (resp) => {
+ const downloadErrorCallback = (resp) => {
set404FromErrorResponse(resp);
setLocalAsyncRequest(false);
}
@@ -172,7 +172,7 @@ const LatestBandiTableInstructorManagerAsync = () => {
name: { value: null, matchMode: 'contains' },
startDate: { value: null, matchMode: 'dateIs' },
endDate: { value: null, matchMode: 'dateIs' },
- status: { value: null, matchMode: 'equals' }
+ status: { value: 'PUBLISH', matchMode: 'equals' }
}
});
};
@@ -192,7 +192,7 @@ const LatestBandiTableInstructorManagerAsync = () => {
const paginationQuery = getPaginationQuery();
BandoService.getBandiPaginated(paginationQuery, getCallback, errGetCallbacks);
- }, [lazyState]);
+ }, [lazyState, getPaginationQuery]);
return (
diff --git a/src/pages/DomandaEditInstructorManager/index.js b/src/pages/DomandaEditInstructorManager/index.js
index 0a70d10..f1c63ba 100644
--- a/src/pages/DomandaEditInstructorManager/index.js
+++ b/src/pages/DomandaEditInstructorManager/index.js
@@ -940,13 +940,17 @@ const DomandaEditInstructorManager = () => {
const formula = head(o.settings.filter(o => o.name === 'formula'));
if (formula && !isEmpty(formula.value)) {
- context = getTokens(formula.value)
- .filter(v => !['false', 'null', 'true'].includes(v))
- .reduce((acc, cur) => {
- acc[cur] = isNil(context[cur]) ? 0 : parseCommaDecimal(context[cur]);
- return acc;
- }, context);
-
+ try {
+ context = getTokens(formula.value)
+ .filter(v => !['false', 'null', 'true'].includes(v))
+ .reduce((acc, cur) => {
+ acc[cur] = isNil(context[cur]) ? 0 : parseCommaDecimal(context[cur]);
+ return acc;
+ }, context);
+ } catch {
+ console.error('Error in formula', formula)
+ context = {}
+ }
const mathFormula = renderWithDataVars(formula.value, context);
try {
updatedFormValues[o.id] = evaluate(mathFormula);
diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index 2d0604c..80be4b7 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -940,12 +940,17 @@ const DomandaEditPreInstructor = () => {
const formula = head(o.settings.filter(o => o.name === 'formula'));
if (formula && !isEmpty(formula.value)) {
- context = getTokens(formula.value)
- .filter(v => !['false', 'null', 'true'].includes(v))
- .reduce((acc, cur) => {
- acc[cur] = isNil(context[cur]) ? 0 : parseCommaDecimal(context[cur]);
- return acc;
- }, context);
+ try {
+ context = getTokens(formula.value)
+ .filter(v => !['false', 'null', 'true'].includes(v))
+ .reduce((acc, cur) => {
+ acc[cur] = isNil(context[cur]) ? 0 : parseCommaDecimal(context[cur]);
+ return acc;
+ }, context);
+ } catch {
+ console.error('Error in formula', formula)
+ context = {}
+ }
const mathFormula = renderWithDataVars(formula.value, context);
try {