feat: add callback

fix: values in fieldgroups are now accessable
CUBUS-mc · May 23, 2024 · 2d1be38 · 2d1be38
1 parent b9defda
commit 2d1be38
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 6 deletions.
diff --git a/gui/setupDialog.go b/gui/setupDialog.go
@@ -4,6 +4,7 @@ import (
 	"CUBUS-core/shared/forms"
 	"CUBUS-core/shared/translation"
 	"CUBUS-core/shared/types"
+	"fmt"
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/container"
 	"fyne.io/fyne/v2/dialog"
@@ -23,9 +24,15 @@ func setupDialog(window fyne.Window) types.CubeConfig { // TODO: use onSubmit of
 	cubeSetupForm := forms.GetCubeSetupForm()
 	box := container.New(layout.NewVBoxLayout())
 
+	formSubmitCallback := func(values map[string]string) {
+		for key, value := range values {
+			fmt.Printf("%s: %s \n", key, value)
+		}
+	}
+
 	formPopup := dialog.NewCustomWithoutButtons(T("Setup"), box, window)
 	formPopup.Resize(fyne.NewSize(700, 400))
-	forms.FormToFyneForm(cubeSetupForm, box, formPopup, window)
+	forms.FormToFyneForm(cubeSetupForm, box, formPopup, window, formSubmitCallback)
 	formPopup.Show()
 
 	return cubeConfig

diff --git a/shared/forms/forms.go b/shared/forms/forms.go
@@ -2,6 +2,7 @@ package forms
 
 import (
 	"CUBUS-core/shared/types"
+	"encoding/json"
 	"net"
 	"regexp"
 	"strconv"
@@ -397,7 +398,8 @@ func (m *MultipleChoiceField) IsValid() bool {
 
 type FieldGroup struct {
 	*FieldBaseType
-	Fields []Field
+	Fields  []Field
+	heading string
 }
 
 func (f *FieldGroup) GetFieldsToDisplay() []Field {
@@ -419,6 +421,34 @@ func (f *FieldGroup) GetFieldById(id string) Field {
 	return nil
 }
 
+func (f *FieldGroup) GetValue() string {
+	fieldValues := make(map[string]string)
+	for _, field := range f.Fields {
+		fieldValues[field.GetId()] = field.GetValue()
+	}
+	jsonFieldValues, _ := json.Marshal(fieldValues)
+	return string(jsonFieldValues)
+}
+
+func (f *FieldGroup) GetHeading() string {
+	return f.heading
+}
+
+func (f *FieldGroup) SetValue(value string) {
+	var fieldValues map[string]string
+	err := json.Unmarshal([]byte(value), &fieldValues)
+	if err != nil {
+		return
+	}
+	for _, field := range f.Fields {
+		field.SetValue(fieldValues[field.GetId()])
+	}
+}
+
+func (f *FieldGroup) SetHeading(heading string) {
+	f.heading = heading
+}
+
 // Defining the Form Type
 
 type Form struct {
@@ -497,7 +527,7 @@ func NewForm(fields ...Field) *Form {
 }
 
 func NewFieldGroup(id string, displayConditions []DisplayCondition, validators []Validator, heading string, fields ...Field) *FieldGroup {
-	return &FieldGroup{FieldBaseType: &FieldBaseType{Id: id, DisplayConditions: displayConditions, Validators: validators, Value: heading}, Fields: fields}
+	return &FieldGroup{FieldBaseType: &FieldBaseType{Id: id, DisplayConditions: displayConditions, Validators: validators}, Fields: fields, heading: heading}
 }
 
 func NewTextField(id string, displayConditions []DisplayCondition, validators []Validator, placeholder string, prompt string, defaultValue string) *TextField {

diff --git a/shared/forms/gui.go b/shared/forms/gui.go
@@ -69,8 +69,8 @@ func fieldsToFyneForm(fields []Field, form *Form, box *fyne.Container, fyneForm
 			}
 			formItems = append(formItems, widget.NewFormItem(field.GetPrompt(), entry))
 		case *FieldGroup:
-			if field.GetValue() != "" {
-				formItems = append(formItems, widget.NewFormItem(field.GetValue(), widget.NewLabel("")))
+			if field.GetHeading() != "" {
+				formItems = append(formItems, widget.NewFormItem(field.GetHeading(), widget.NewLabel("")))
 			}
 			formItems = append(formItems, fieldsToFyneForm(field.GetFieldsToDisplay(), form, box, fyneForm)...)
 		default:
@@ -80,12 +80,13 @@ func fieldsToFyneForm(fields []Field, form *Form, box *fyne.Container, fyneForm
 	return formItems
 }
 
-func FormToFyneForm(form *Form, box *fyne.Container, parentDialog *dialog.CustomDialog, window fyne.Window) {
+func FormToFyneForm(form *Form, box *fyne.Container, parentDialog *dialog.CustomDialog, window fyne.Window, onSubmit func(map[string]string)) {
 	fields := form.GetFieldsToDisplay()
 	fyneForm := widget.NewForm()
 	fyneForm.Items = fieldsToFyneForm(fields, form, box, fyneForm)
 	fyneForm.OnSubmit = func() {
 		if form.IsValid() {
+			onSubmit(form.GetFieldValues())
 			parentDialog.Hide()
 		} else {
 			dialog.ShowError(form.GetError(), window)