dredgy/DredgePos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Load Room Now Sets Button Status

Browse Source
This commit is contained in:
Josh
2021-11-11 19:29:29 +10:00
parent cfef916092
commit e2c3a2e6ed
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -6,5 +6,5 @@
/tables/* /tables/*
/Properties/ /Properties/
/.idea/ /.idea/
/wwwroot/scripts/js/*.js /wwwroot/scripts/js/*
/wwwroot/styles/css/* /wwwroot/styles/css/*

5
wwwroot/scripts/js/dredgepos.floorplan.js
View File

@@ -35,8 +35,6 @@ const setupFloorplanEvents = () => {
}; };
const roomButtonClicked = (e) => { const roomButtonClicked = (e) => {
const button = $(e.target); const button = $(e.target);
$('.roomButton').removeClass('active');
button.addClass('active');
const roomId = button.data('value'); const roomId = button.data('value');
loadRoom(getRoomById(roomId)); loadRoom(getRoomById(roomId));
}; };
@@ -69,6 +67,9 @@ const setupFloorplan = (floorplanData) => {
const loadRoom = (roomToLoad) => { const loadRoom = (roomToLoad) => {
setRoomBackground(roomToLoad); setRoomBackground(roomToLoad);
setupKonva(); setupKonva();
$('.roomButton').removeClass('active');
let button = $(`.roomButton[data-value=${roomToLoad.id}]`);
button.addClass('active');
const tablesInRoom = Floorplan.tables.filter(table => table.room_id == roomToLoad.id); const tablesInRoom = Floorplan.tables.filter(table => table.room_id == roomToLoad.id);
const decorationsInRoom = Floorplan.decorations.filter(decoration => decoration.decoration_room == roomToLoad.id); const decorationsInRoom = Floorplan.decorations.filter(decoration => decoration.decoration_room == roomToLoad.id);
decorationsInRoom.forEach(decoration => createDecorationShape(decoration, false)); decorationsInRoom.forEach(decoration => createDecorationShape(decoration, false));

2
wwwroot/scripts/js/dredgepos.floorplan.js.map
View File

File diff suppressed because one or more lines are too long

6
wwwroot/scripts/ts/dredgepos.floorplan.ts
View File

@@ -72,8 +72,6 @@ const setupFloorplanEvents = () => {
const roomButtonClicked = (e: Event) => { const roomButtonClicked = (e: Event) => {
const button = $(e.target) const button = $(e.target)
$('.roomButton').removeClass('active')
button.addClass('active')
const roomId = button.data('value') const roomId = button.data('value')
loadRoom(getRoomById(roomId)) loadRoom(getRoomById(roomId))
} }
@@ -114,6 +112,10 @@ const loadRoom = (roomToLoad: room) => {
setRoomBackground(roomToLoad) setRoomBackground(roomToLoad)
setupKonva() setupKonva()
$('.roomButton').removeClass('active')
let button = $(`.roomButton[data-value=${roomToLoad.id}]`)
button.addClass('active')
const tablesInRoom = Floorplan.tables.filter(table => table.room_id == roomToLoad.id) const tablesInRoom = Floorplan.tables.filter(table => table.room_id == roomToLoad.id)
const decorationsInRoom = Floorplan.decorations.filter(decoration => decoration.decoration_room == roomToLoad.id) const decorationsInRoom = Floorplan.decorations.filter(decoration => decoration.decoration_room == roomToLoad.id)
decorationsInRoom.forEach(decoration => createDecorationShape(decoration, false)) decorationsInRoom.forEach(decoration => createDecorationShape(decoration, false))

1
wwwroot/styles/sass/dredgepos.floorplan.sass
View File

@@ -76,6 +76,7 @@
#decorator #decorator
@include flex-column @include flex-column
@include absoluteCenter @include absoluteCenter
display: none
border: solid 3px var(--global-border-color) border: solid 3px var(--global-border-color)
background-color: var(--global-bgcolor) background-color: var(--global-bgcolor)
width: 30vw width: 30vw