|
|
|
@ -18,7 +18,7 @@ public class TimetableService {
|
|
|
|
|
private static final String TIMETABLE_URL = "http://timetable.athene.tech/api/1.0/timetable?filter=%s";
|
|
|
|
|
private SimpleDateFormat lessonTimeFormat = new SimpleDateFormat("hh:mm");
|
|
|
|
|
|
|
|
|
|
private long[] lessonsStarts = new long[] {
|
|
|
|
|
private long[] lessonsStarts = new long[]{
|
|
|
|
|
lessonTimeFormat.parse("8:00:00").getTime(),
|
|
|
|
|
lessonTimeFormat.parse("9:40:00").getTime(),
|
|
|
|
|
lessonTimeFormat.parse("11:30:00").getTime(),
|
|
|
|
@ -58,8 +58,8 @@ public class TimetableService {
|
|
|
|
|
firstJan.set(Calendar.MONTH, 0);
|
|
|
|
|
firstJan.set(Calendar.DAY_OF_MONTH, 1);
|
|
|
|
|
|
|
|
|
|
return (int) Math.round(Math.ceil((((currentDate.getTime() - firstJan.getTime().getTime()) / 86400000)
|
|
|
|
|
+ DateUtils.addDays(firstJan.getTime(), 1).getTime() / 7) % 2));
|
|
|
|
|
return (int) Math.round(Math.ceil((((currentDate.getTime() - firstJan.getTime().getTime()) / 86400000)
|
|
|
|
|
+ DateUtils.addDays(firstJan.getTime(), 1).getTime() / 7) % 2));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private TimetableResponse getTimetableForUser(String userFIO) throws RestClientException {
|
|
|
|
@ -67,7 +67,7 @@ public class TimetableService {
|
|
|
|
|
return restTemplate.getForObject(String.format(TIMETABLE_URL, userFIO), TimetableResponse.class);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public Lesson getCurrentLesson(String userFio) {
|
|
|
|
|
public Lesson getCurrentLesson(String userFio) {
|
|
|
|
|
TimetableResponse response;
|
|
|
|
|
try {
|
|
|
|
|
response = getTimetableForUser(userFio);
|
|
|
|
|