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