Skip to content

Bitmag 723 #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Bohlski merged 8 commits into from
Aug 22, 2022
Merged

Bitmag 723 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
02632de
Now has a 'show more' option. Also keeps a state of which texts has b…
m-atlantis Jun 27, 2022
7c1b19d
Tested for multiple alarms. Added a fixed size for the <td> that cont…
m-atlantis Jun 28, 2022
279f262
Changed the logo to better fit the dark theme.
m-atlantis Jun 29, 2022
112ec1f
Fix camelCase in alarm-service.html
Bohlski Aug 22, 2022
b203f41
Small adjustment to webGUI logo placement
Bohlski Aug 22, 2022
71c73c6
Review changes to enableClickFunctionality()
Bohlski Aug 22, 2022
68b3ff5
Merge branch 'master' into BITMAG-723
Bohlski Aug 22, 2022
00a6cf5
Trivial IntelliJ warning fixes
Bohlski Aug 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions ...ry-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/RestAlarmService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@

@Path("/AlarmService")
public class RestAlarmService {
private AlarmService alarmService;
private CalendarUtils calendarUtils = CalendarUtils.getInstance(TimeZone.getDefault());
private final AlarmService alarmService;
private final CalendarUtils calendarUtils = CalendarUtils.getInstance(TimeZone.getDefault());

public RestAlarmService() {
alarmService = AlarmServiceFactory.getAlarmService();
Expand All @@ -63,9 +63,8 @@ public RestAlarmService() {
@Path("/getShortAlarmList/")
@Produces("application/json")
public List<Alarm> getShortAlarmList() {
List<Alarm> alarmList = new ArrayList<>(alarmService.extractAlarms(null, null, null, null,
return new ArrayList<>(alarmService.extractAlarms(null, null, null, null,
null, null, 10, false));
return alarmList;
}

/**
Expand All @@ -77,9 +76,8 @@ public List<Alarm> getShortAlarmList() {
@Path("/getFullAlarmList/")
@Produces("application/json")
public List<Alarm> getFullAlarmList() {
List<Alarm> alarmList = new ArrayList<>(alarmService.extractAlarms(null, null, null, null,
return new ArrayList<>(alarmService.extractAlarms(null, null, null, null,
null, null, null, true));
return alarmList;
}

@POST
Expand Down
Loading