Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions client/src/reports/studentReportCardReactButton.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ export default ({ defaultRequestValues }) => {
<CommonReferenceInput source="klassTypeReferenceId" reference="klass_type" label="שיוך כיתה" />
<TextInput source="personalNote" label="הערה לתלמידה" defaultValue="" />
<NumberInput source="attendanceLessThan" label="הצג רק שורות עם נוכחות נמוכה מ (%)" />
<NumberInput
source="gradesLessThan"
label="הצג רק שורות עם ציון נמוך מ (%)"
helperText="הסינון מתבצע לפי הציון המקורי, לפני התאמה לפי אחוזי נוכחות"
/>
</BulkReportButton>
);
};
1 change: 1 addition & 0 deletions client/src/roadmapFeatures.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export default [
{ html: 'הוספת סינון לפי תאריכים בתעודה', status: 'בוצע', statusColor: 'success' },
{ html: 'מילוי אוטומטי של קבצי מכלול', status: 'בוצע', statusColor: 'success' },
{ html: 'הצגת ציון אחרון במקום ממוצע', status: 'בוצע', statusColor: 'success' },
{ html: 'הוספת סינון לפי ציון נמוך מ בתעודה', status: 'בוצע', statusColor: 'success' },

// { html: 'הגדרת תקופת זמן לפי תאריכים', status: 'בקרוב', statusColor: 'warning' },
// { html: 'הגדרת תקופת זמן לפי יום בשבוע', status: 'בוצע', statusColor: 'success' },
Expand Down
13 changes: 7 additions & 6 deletions server/src/reports/reportGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ export function generateStudentReportCard(userId: any, reqExtra: any, generator:
downComment: getAsBoolean(reqExtra.downComment),
lastGrade: getAsBoolean(reqExtra.lastGrade),
debug: getAsBoolean(reqExtra.debug),
attendanceLessThan: getAttPercentLessThanParam(reqExtra.attendanceLessThan),
attendanceLessThan: getPercentLessThanParam(reqExtra.attendanceLessThan),
gradesLessThan: getPercentLessThanParam(reqExtra.gradesLessThan),
};
console.log('student report card extra params: ', extraParams);
const params = getAsArray(reqExtra.ids)?.map((id) => ({
Expand All @@ -45,11 +46,11 @@ export function generateStudentReportCard(userId: any, reqExtra: any, generator:
};
}

function getAttPercentLessThanParam(attendanceLessThanStr: string): number {
if (attendanceLessThanStr) {
const attLessThanNum = parseInt(attendanceLessThanStr);
if (!isNaN(attLessThanNum)) {
return attLessThanNum / 100;
function getPercentLessThanParam(lessThanStr: string): number {
if (lessThanStr) {
const lessThanNum = parseInt(lessThanStr);
if (!isNaN(lessThanNum)) {
return lessThanNum / 100;
}
}
return undefined;
Expand Down
4 changes: 4 additions & 0 deletions server/src/reports/studentReportCardReact.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,7 @@ export interface IReportParams {
lastGrade?: boolean;
debug?: boolean;
attendanceLessThan?: number;
gradesLessThan?: number;
}
export const getReportData: IGetReportDataFunction<IReportParams, AppProps> = async (params, dataSource) => {
const reportDate = getReportDateFilter(dateFromString(params.startDate), dateFromString(params.endDate));
Expand Down Expand Up @@ -615,6 +616,9 @@ function filterReports(reports: IExtenedStudentPercentReport[], reportParams: IR
if (reportParams.attendanceLessThan && (report.attPercents >= reportParams.attendanceLessThan)) {
return false;
}
if (reportParams.gradesLessThan && (report.gradeAvg >= reportParams.gradesLessThan)) {
return false;
}
return !(
(reportParams.forceGrades && (report.gradeAvg === undefined || report.gradeAvg === null)) ||
(reportParams.forceAtt && !report.lessonsCount)
Expand Down
Loading