Merge pull request #6 from webability-go/late-night

patch v0.0.5

README.md

@@ -14,13 +14,20 @@ Manuals are available on godoc.org [![GoDoc](https://godoc.org/github.com/webabi
 
 TO DO:
 ======
-XML to Application decoder
-Application to XML and JSON encoders
-Tests
+- Adds local specific functions to all the Containers, Elements, Zones, etc to improve tree programmation.
+- Tests
 
 Version Changes Control
 =======================
 
+v0.0.5 - 2020-03-07
+-----------------------
+- Added UnmarshalXML
+- Added MarshalJSON
+- Added basic functions AddMessage, AddHelp, AddEvent to a Node, with auto creation of children nodes
+- Removed messages, events, help attributes of Node
+- Added AddZone() to SeparatorContainer as a new struct extended from DomDef interface to build upon specific functions for specific nodes (it works)
+
 v0.0.4 - 2020-03-06
 -----------------------
 - All structures and Application tree implemented in GO

accordioncontainer.go

@@ -8,7 +8,7 @@ func NewAccordionContainer(id string) AccordionContainer {
 	c.SetID(id)
 
 	c.RegisterKnownAttributes([]string{"display", "style", "classname", "classnamezone", "left", "width", "right", "top", "height", "bottom", "haslistener"})
-	c.RegisterKnownChildren([]string{"zone"})
+	c.RegisterKnownChildren([]string{"zone", "event", "help", "message"})
 
 	return c
 }

application.go

@@ -0,0 +1,14 @@
+package wajaf
+
+type Application NodeDef
+
+func NewApplication(id string) Application {
+
+	app := NewNode("application", "")
+	app.SetID(id)
+
+	app.RegisterKnownAttributes([]string{"id", "enforce", "style"})
+	app.RegisterKnownChildren([]string{"container", "element"})
+
+	return app
+}

buttonelement.go

@@ -9,7 +9,7 @@ func NewButtonElement(id string) ButtonElement {
 
 	e.RegisterKnownAttributes([]string{"display", "style", "classname", "left", "width", "right", "top", "height", "bottom",
 		"visible", "action", "status", "extra"})
-	e.RegisterKnownMessages([]string{"titleinsert", "titleupdate", "titledelete", "titleview"})
+	//	e.RegisterKnownMessages([]string{"titleinsert", "titleupdate", "titledelete", "titleview"})
 
 	return e
 }

event.go

@@ -0,0 +1,11 @@
+package wajaf
+
+type Event NodeDef
+
+func NewEvent(name string, value string) Event {
+
+	e := NewNode("event", name)
+	e.SetData(value)
+
+	return e
+}

groupcontainer.go

@@ -9,7 +9,7 @@ func NewGroupContainer(id string) GroupContainer {
 
 	c.RegisterKnownAttributes([]string{"display", "style", "classname", "classnamezone", "left", "width", "right", "top", "height", "bottom", "haslistener",
 		"mode", "authmodes", "varkey", "key", "varorder", "varmode"})
-	c.RegisterKnownMessages([]string{"alertmessage", "servermessage", "titleinsert", "titleupdate", "titledelete", "titleview", "insertok", "updateok", "deleteok"})
+	//	c.RegisterKnownMessages([]string{"alertmessage", "servermessage", "titleinsert", "titleupdate", "titledelete", "titleview", "insertok", "updateok", "deleteok"})
 	c.RegisterKnownChildren([]string{"zone", "dataset"})
 
 	return c

help.go

@@ -0,0 +1,13 @@
+package wajaf
+
+type Help NodeDef
+
+func NewHelp(tooltip string, title string, description string) Help {
+
+	e := NewNode("help", "")
+	e.AddMessage("summary", tooltip)
+	e.AddMessage("title", title)
+	e.AddMessage("description", description)
+
+	return e
+}

htmlelement.go

@@ -1,10 +1,10 @@
 package wajaf
 
-type HTMLFieldElement NodeDef
+type HTMLElement NodeDef
 
-func NewHTMLFieldElement(id string, data string) HTMLFieldElement {
+func NewHTMLElement(id string, data string) HTMLElement {
 
-	e := NewNode("element", "htlmelement")
+	e := NewNode("element", "htmlelement")
 	e.SetID(id)
 	e.SetData(data)
 

lovfieldelement.go

@@ -10,7 +10,7 @@ func NewLOVFieldElement(id string, data string) LOVFieldElement {
 
 	e.RegisterKnownAttributes([]string{"display", "style", "classname", "left", "width", "right", "top", "height", "bottom",
 		"size", "visible", "info", "disabled", "readonly", "notnull", "helpmode"})
-	e.RegisterKnownMessages([]string{"defaultvalue", "helpdescription", "statusnotnull", "statuscheck"})
+	//	e.RegisterKnownMessages([]string{"defaultvalue", "helpdescription", "statusnotnull", "statuscheck"})
 
 	return e
 }

message.go

@@ -0,0 +1,11 @@
+package wajaf
+
+type Message NodeDef
+
+func NewMessage(name string, value string) Message {
+
+	e := NewNode(name, "")
+	e.SetData(value)
+
+	return e
+}