efim
/
some-automoderation
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: raised&mark brick logic

This commit is contained in:
efim 2023-11-25 08:57:50 +00:00
parent 85b3a3f89e
commit a091a26d0d
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
routes/room_page_templates_preview.go
View File

@ -13,19 +13,18 @@ import (
type brickState struct { type brickState struct {
TemplateType string TemplateType string
Gesture rooms.HandGesture Gesture rooms.HandGesture
} }
type personData struct { type personData struct {
Name string Name string
IsSpeaker bool IsSpeaker bool
IsMark bool IsMark bool // to distinguish Mark from HandGesture(0)
IsRaised bool IsRaised bool // to distinguish Raised from HandGesture(0)
Raised rooms.HandGesture Raised rooms.HandGesture
Mark rooms.HandGesture Mark rooms.HandGesture
Index int Index int
} }
// data to be passed to "roomPeople" template // data to be passed to "roomPeople" template
type roomTableData struct { type roomTableData struct {
*rooms.Room *rooms.Room
@ -176,7 +175,7 @@ func (pData personData) BricksForPerson() []brickState {
// this results in iteration 4,3,2,1,0,255 wow // this results in iteration 4,3,2,1,0,255 wow
templateType := "inactiveBrick" templateType := "inactiveBrick"
switch { switch {
case pData.IsRaised && pData.IsMark && gesture == pData.Raised: case pData.IsRaised && pData.IsMark && gesture == pData.Raised && gesture == pData.Mark:
templateType = "markAndRaisedBrick" templateType = "markAndRaisedBrick"
case pData.IsMark && gesture == pData.Mark: case pData.IsMark && gesture == pData.Mark:
templateType = "markBrick" templateType = "markBrick"
@ -188,7 +187,7 @@ func (pData personData) BricksForPerson() []brickState {
result[gesture] = brickState{ result[gesture] = brickState{
TemplateType: templateType, TemplateType: templateType,
Gesture: gesture, Gesture: gesture,
} }
} }
@ -252,19 +251,19 @@ func roomTemplatesPreview(
} }
contentData := struct { contentData := struct {
DefaultColor template.CSS DefaultColor template.CSS
GesturePreviews []rooms.HandGesture GesturePreviews []rooms.HandGesture
ABrick brickState ABrick brickState
TestPerson personData TestPerson personData
ARoom *roomTableData ARoom *roomTableData
}{ }{
DefaultColor: "--expand-color", DefaultColor: "--expand-color",
ABrick: brickState{ ABrick: brickState{
TemplateType: "raisedBrick", TemplateType: "raisedBrick",
Gesture: rooms.Expand, Gesture: rooms.Expand,
}, },
GesturePreviews: rooms.GesturesHighToLow[:], GesturePreviews: rooms.GesturesHighToLow[:],
TestPerson: testPersonData, TestPerson: testPersonData,
ARoom: &roomTableData{ ARoom: &roomTableData{
Room: &aRoom, Room: &aRoom,
currentPerson: aRoom.Paricipants[0], currentPerson: aRoom.Paricipants[0],