Fix teacherName

kontur-edu · Jul 1, 2021 · bf03335 · bf03335
1 parent 37e132b
commit bf03335
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/src/apis/BrsApi.ts b/src/apis/BrsApi.ts
@@ -525,7 +525,7 @@ export interface Discipline {
   disciplineLoad: string;
   groupHistoryId: string;
   isModule: boolean;
-  teacherName: string;
+  teacherName?: string;
 }
 
 // eslint-disable-next-line

diff --git a/src/components/work/WorkerDialog/index.tsx b/src/components/work/WorkerDialog/index.tsx
@@ -67,7 +67,11 @@ export default class WorkerDialog extends React.Component<Props, State> {
   reportToNestedListItems(report: Report): Promise<NestedItem[]> {
     const logItems = this.state.logItems;
     return new Promise((resolve) => {
-      let title = `Группа ${report.group}, преподаватель ${report.teacher}`;
+      let title =
+        `Группа ${report.group}` +
+        (report.teacher !== undefined
+          ? `, преподаватель ${report.teacher}`
+          : "");
       const nestedItems: NestedItem[] = [];
       const mainItem: NestedItem = { title, collapsed: true, nestedItems };
 

diff --git a/src/managers/MarksManager.ts b/src/managers/MarksManager.ts
@@ -285,7 +285,10 @@ export default class MarksManager {
 
     if (suitableControlActions.length === 0) {
       errorMessages.push(
-        `Группа ${discipline.group}, преподаватель ${discipline.teacherName}`
+        `Группа ${discipline.group}` +
+          (discipline.teacherName !== undefined
+            ? `, преподаватель ${discipline.teacherName}`
+            : "")
       );
       errorMessages.push(
         `- контрольное мероприятие «${config.controlAction}» не сопоставлено с БРС`
@@ -453,14 +456,10 @@ export default class MarksManager {
     report.merge.succeed = mergedStudents.length;
 
     if (skippedActualStudents.length > 0)
-      report.merge.failedActual = skippedActualStudents.map(
-        (s) => s.fullName
-      );
+      report.merge.failedActual = skippedActualStudents.map((s) => s.fullName);
 
     if (skippedBrsStudents.length > 0) {
-      report.merge.failedBrs = skippedBrsStudents.map(
-        (s) => s.studentFio
-      );
+      report.merge.failedBrs = skippedBrsStudents.map((s) => s.studentFio);
     }
   }
 }

diff --git a/src/managers/ReportManager.ts b/src/managers/ReportManager.ts
@@ -18,7 +18,7 @@ export default class ReportManager {
     return this._currentReport;
   }
 
-  newReport(group: string, teacher: string) {
+  newReport(group: string, teacher?: string) {
     this.finishReport();
     this._currentReport = {
       group,
@@ -41,7 +41,7 @@ export default class ReportManager {
 
 export interface Report {
   group: string;
-  teacher: string;
+  teacher?: string;
   merge: {
     succeed: number;
     failedActual?: string[];