44
55import java .io .IOException ;
66import java .time .LocalDate ;
7- import java .time .LocalDateTime ;
87import java .time .ZoneOffset ;
98import java .time .ZonedDateTime ;
109import java .util .Arrays ;
2928import me .vinceh121 .jskolengo .JSkolengo ;
3029import me .vinceh121 .jskolengo .entities .StudentUserInfo ;
3130import me .vinceh121 .jskolengo .entities .agenda .Homework ;
32- import me .vinceh121 .jskolengo .entities .evaluation .EvaluationDetail ;
31+ import me .vinceh121 .jskolengo .entities .evaluation .Evaluation ;
3332import me .vinceh121 .jskolengo .entities .info .News ;
3433import net .dv8tion .jda .api .EmbedBuilder ;
3534import net .dv8tion .jda .api .entities .Activity ;
@@ -117,7 +116,7 @@ public void execute(final JobExecutionContext context) throws JobExecutionExcept
117116 private void processGrades (final Knb knb , final JSkolengo sko , final StudentUserInfo info ,
118117 final SkolengoUserInstance ui ) {
119118 final TextChannel chan = knb .getJda ().getTextChannelById (ui .getChannelId ());
120- final List <EvaluationDetail > grades ;
119+ final List <Evaluation > grades ;
121120
122121 try {
123122 grades = sko .fetchEvaluationsSetting ()
@@ -126,8 +125,7 @@ private void processGrades(final Knb knb, final JSkolengo sko, final StudentUser
126125 .flatMap (period -> sko .fetchEvaluations (period .getId ()).stream ())
127126 .flatMap (eval -> eval .getEvaluations ().stream ())
128127 .filter (detail -> detail .getDateTime ()
129- .toInstant (ZoneOffset .UTC )
130- .isAfter (ui .getLastCheck ().toInstant ()))
128+ .isAfter (ui .getLastCheck ().toInstant ().atZone (detail .getDateTime ().getZone ())))
131129 .collect (Collectors .toList ());
132130 } catch (final Exception e ) {
133131 SkolengoCheckingJob .LOG
@@ -144,7 +142,7 @@ private void processGrades(final Knb knb, final JSkolengo sko, final StudentUser
144142
145143 final String estabName = info .getSchool ().getName ();
146144
147- final LocalDateTime oldest
145+ final ZonedDateTime oldest
148146 = Collections .min (grades , (o1 , o2 ) -> o1 .getDateTime ().compareTo (o2 .getDateTime ())).getDateTime ();
149147
150148 final EmbedBuilder embBuild = new EmbedBuilder ();
@@ -156,7 +154,7 @@ private void processGrades(final Knb knb, final JSkolengo sko, final StudentUser
156154 embBuild .setTitle ("Nouvelles notes" );
157155 embBuild .setFooter (estabName );
158156
159- for (final EvaluationDetail n : grades ) {
157+ for (final Evaluation n : grades ) {
160158 final Field f = new Field (n .getTopic () + " : " + n .getTitle (),
161159 n .getEvaluationResult ().getMark () + "/" + n .getScale () + "\n Coef: " + n .getCoefficient (), true );
162160 embBuild .addField (f );
0 commit comments