@@ -66,7 +66,6 @@ public static ExcelPackage Generate(
6666            var  rowsNumber  =  3  +  courseMatesModels . Count ; 
6767            var  position  =  new  Position ( 1 ,  1 ) ; 
6868
69-             worksheet . Cells [ position . Row ,  position . Column ] . Value  =  "ÔÈÎ" ; 
7069            worksheet . Cells [ position . Row ,  position . Column ,  position . Row  +  2 ,  position . Column ] . Merge  =  true ; 
7170            ++ position . Column ; 
7271
@@ -115,7 +114,7 @@ private static void AddHomeworksHeaders(ExcelWorksheet worksheet, CourseDTO cour
115114            { 
116115                var  numberCellsToMerge  =  course . Homeworks [ i ] . Tasks . Count  *  3 ; 
117116                worksheet . Cells [ position . Row ,  position . Column ] . Value 
118-                     =  $ "ä/ç  { homeworkNumber . ToString ( ) } : { course . Homeworks [ i ] . Title } , { course . Homeworks [ i ] . Date . ToString ( "dd.MM" ) } "; 
117+                     =  $ "h/w  { homeworkNumber . ToString ( ) } : { course . Homeworks [ i ] . Title } , { course . Homeworks [ i ] . Date . ToString ( "dd.MM" ) } "; 
119118                worksheet . Cells [ position . Row ,  position . Column ,  position . Row ,  position . Column  +  numberCellsToMerge  -  1 ] 
120119                    . Merge  =  true ; 
121120                position . Column  +=  numberCellsToMerge ; 
@@ -210,7 +209,8 @@ private static void AddCourseMatesInfo(
210209                        var  solutions  =  allSolutions 
211210                            . Where ( solution => 
212211                                solution . State  ==  SolutionState . Rated  ||  solution . State  ==  SolutionState . Final ) ; 
213-                         var  min  =  solutions . Max ( solution =>  solution . Rating )  ??  0 ; 
212+                         var  min  =  solutions 
213+                             . Where ( solution =>  solution . State  ==  SolutionState . Final ) ; 
214214                        var  cnt  =  solutions . Count ( ) ; 
215215                        worksheet . Cells [ position . Row ,  position . Column ] . Value  =  min ; 
216216                        worksheet . Cells [ position . Row ,  position . Column  +  2 ] . Value  =  cnt ; 
0 commit comments