-
-
-
- <% reportDataArr.forEach(reportData => { %>
-
-
-
- <% var reports = reportData.reports %>
-
- <% if (reports.length > 0) { %>
-
- | מקצוע |
- שם המורה |
- <% if (reportParams.grades) { %>
- ציון |
- <% } %>
- אחוז נוכחות |
-
- <% reports.forEach((report, index) => { %>
- <% if (
- (!reportParams.forceGrades || (report.grade != undefined && report.grade != null)) &&
- (!reportParams.forceAtt || (report.lessonsCount))
- ) { %>
-
- | <%= report.lesson && report.lesson.name %> |
- <%= report.teacher && report.teacher.name %> |
-
- <% var att_percents = Math.round((((report.lessonsCount ?? 1) - (report.absCount ?? 0)) / (report.lessonsCount ?? 1)) * 100) %>
-
- <% if (report.lessonsCount && report.lessonsCount * 2 == report.absCount) { %>
- <%= report.grade %> |
- |
- <% } else { %>
- <% if (reportParams.grades) { %>
-
- <% if (report.grade != undefined && report.grade != null) { %>
- <% var grade_effect = att_grade_effect?.find(item => item.percents <= att_percents || item.count >= report.absCount)?.effect ?? 0 %>
- <% var isOriginalGrade = report.grade > 100 || report.grade == 0 %>
- <% var affected_grade = isOriginalGrade ? report.grade : Math.min(100, report.grade + grade_effect) %>
- <% var matching_grade_name = grade_names?.find(item => item.key <= affected_grade)?.name %>
-
- <% if (matching_grade_name) { %>
- <%= matching_grade_name %>
- <% } else { %>
- <%= affected_grade %>%
- <% } %>
- <% } else { %>
-
- <% } %>
- |
- <% } %>
- <%= att_percents %>% |
- <% } %>
-
- <% } %>
- <% }) %>
- <% if (!reportParams.hideAbsTotal) { %>
-
- | אחוז נוכחות כללי |
- |
- <% if (reportParams.grades) { %>
- |
- <% } %>
-
- <% var reportsNoSpecial = reports.filter(item => item.lessonsCount * 2 != item.absCount) %>
- <% var total_lesson_count = reportsNoSpecial.reduce((a, b) => a + b.lessonsCount, 0) %>
- <% var total_abs_count = reportsNoSpecial.reduce((a, b) => a + b.absCount, 0) %>
- <% var total_att_count = total_lesson_count - total_abs_count %>
-
-
- <%=
- Math.round(((total_att_count) / total_lesson_count) * 100)
- %>%
- |
-
-
- | נוכחות בקיזוז חיסורים מאושרים |
- |
- <% if (reportParams.grades) { %>
- |
- <% } %>
-
- <% var approved_abs_value = approved_abs_count?.[reportData.id] %>
- <% if (!reportParams.groupByKlass) { %>
- <% approved_abs_value = Object.values(approved_abs_count)[0] %>
- <% } %>
- <%=
- Math.round(
- (
- (
- total_att_count + (approved_abs_value || 0)
- ) / total_lesson_count
- ) * 100
- )
- %>%
- |
-
- <% } %>
- <% } %>
-
-
- <% }) %>
-
- <% if (reportParams.personalNote) { %>
-
- <%= reportParams.personalNote %>
-
- <% } %>
-
-
- <% /* %>
- <%- include('image', { img: footerImage }); %>
- <% */ %>
-
-
-
-`;
-
-const reportOptions: ejs.Options = {
- compileDebug: true,
-};
-
-export default new EjsToPdfReportGenerator(getReportName, getReportData, reportTemplate, reportOptions);
diff --git a/server/src/reports/studentReportCardReact.tsx b/server/src/reports/studentReportCardReact.tsx
index 80e8a680..dd788a58 100644
--- a/server/src/reports/studentReportCardReact.tsx
+++ b/server/src/reports/studentReportCardReact.tsx
@@ -483,6 +483,7 @@ export interface IReportParams {
endDate?: string;
globalLessonReferenceIds?: string;
denyLessonReferenceIds?: string;
+ denyKlassReferenceIds?: string;
klassTypeReferenceId?: string;
attendance: boolean;
grades: boolean;
@@ -507,7 +508,7 @@ export const getReportData: IGetReportDataFunction