RecentRunner/group-2-threaded-project-petshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #296 from RecentRunner/easy-fixes

Browse Source 
Logs folder and activity log defaults
This commit was merged in pull request #296.
This commit is contained in:
Harkamal
2026-04-14 20:50:14 -06:00
committed by GitHub
parent 572461b179 92e5919c23
commit aa9f3ad444
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/resources/application.yml
View File

@@ -69,7 +69,7 @@ openrouter:
logging: logging:
file: file:
name: ${LOG_FILE:log.txt} name: ${LOG_FILE:logs/app.log}
level: level:
com.petshop: ${LOG_LEVEL:INFO} com.petshop: ${LOG_LEVEL:INFO}
org.springframework.security: ${LOG_LEVEL_SECURITY:WARN} org.springframework.security: ${LOG_LEVEL_SECURITY:WARN}

3
desktop/src/main/java/org/example/petshopdesktop/controllers/ActivityLogController.java
View File

@@ -17,6 +17,7 @@ import org.example.petshopdesktop.api.endpoints.ActivityLogApi;
import org.example.petshopdesktop.util.ActivityLogger; import org.example.petshopdesktop.util.ActivityLogger;
import org.example.petshopdesktop.util.TableViewSupport; import org.example.petshopdesktop.util.TableViewSupport;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.List; import java.util.List;
@@ -86,6 +87,8 @@ public class ActivityLogController {
filteredLogs = new FilteredList<>(activityLogs, a -> true); filteredLogs = new FilteredList<>(activityLogs, a -> true);
TableViewSupport.bindSortedItems(tvActivityLogs, filteredLogs); TableViewSupport.bindSortedItems(tvActivityLogs, filteredLogs);
dpStart.setValue(LocalDate.now().minusDays(30));
dpEnd.setValue(LocalDate.now());
loadLogs(); loadLogs();
} }

2
desktop/src/main/resources/org/example/petshopdesktop/modelviews/activity-log-view.fxml
View File

@@ -40,7 +40,7 @@
</children> </children>
</HBox> </HBox>
<Label text="Showing most recent 2000 activity records" textFill="#64748b" /> <Label text="Showing activity for the selected date range" textFill="#64748b" />
<TableView fx:id="tvActivityLogs" style="-fx-background-color: white; -fx-background-radius: 12;" VBox.vgrow="ALWAYS"> <TableView fx:id="tvActivityLogs" style="-fx-background-color: white; -fx-background-radius: 12;" VBox.vgrow="ALWAYS">
<columns> <columns>