# HG changeset patch
# User Edouard Tisserant
# Date 1530706203 -7200
# Node ID 81949104291d026ae5a02c38c900a0338888af61
# Parent  ee2675e4778da58e599c222e1451bb4355e2aa60
Nevow based web interface now show simple Log message sending form for basic runtime, and allow extensions to add their own web settings.

diff -r ee2675e4778d -r 81949104291d Beremiz_service.py
--- a/Beremiz_service.py	Fri Jun 22 14:08:34 2018 +0200
+++ b/Beremiz_service.py	Wed Jul 04 14:10:03 2018 +0200
@@ -616,6 +616,7 @@
         try:
             website = NS.RegisterWebsite(webport)
             pyruntimevars["website"] = website
+            NS.SetServer(pyroserver)
             statuschange.append(NS.website_statuslistener_factory(website))
         except Exception:
             LogMessageAndException(_("Nevow Web service failed. "))
diff -r ee2675e4778d -r 81949104291d runtime/NevowServer.py
--- a/runtime/NevowServer.py	Fri Jun 22 14:08:34 2018 +0200
+++ b/runtime/NevowServer.py	Wed Jul 04 14:10:03 2018 +0200
@@ -32,9 +32,10 @@
 from formless import annotate
 from formless import webform
 from formless import configurable
-
 from twisted.internet import reactor
+
 import util.paths as paths
+from runtime.loglevels import LogLevels, LogLevelsDict
 
 PAGE_TITLE = 'Beremiz Runtime Web Interface'
 
@@ -44,6 +45,7 @@
 '''
 
 WorkingDir = None
+_PySrv = None
 
 
 class PLCHMI(athena.LiveElement):
@@ -125,22 +127,6 @@
         for child in self.liveFragmentChildren[:]:
             child.detach()
 
-lastKnownConfig = {
-    'net': {
-        'mode': 'DHCP',
-        'IP': '192.168.1.42',
-        'gateway': '192.168.1.1',
-        'mask': '255.255.255.0',
-        'DNS': '8.8.8.8'},
-    'wamp': {}
-}
-
-def defaultVal(category):
-    def _defaultVal(ctx,argument):
-        return lastKnownConfig[category].get(argument.name, None)
-    return _defaultVal
-
-
 class ConfigurableBindings(configurable.Configurable):
 
     def __init__(self):
@@ -150,8 +136,7 @@
     def getBindingNames(self, ctx):
         return self.bindingsNames
 
-    def addExtension(self, name, desc, fields, callback):
-        print(name, fields, callback)
+    def addExtension(self, name, desc, fields, btnlabel, callback):
         def _bind(ctx):
             return annotate.MethodBinding(
                 'action_'+name,
@@ -159,33 +144,26 @@
                     annotate.Argument(name, fieldtype)
                     for fieldname,fieldtype in fields],
                     label = desc),
-                action = _("Set"))
+                action = btnlabel))
         setattr(self, 'bind_'+name, _bind)
             
-        def _action(**kw):
-           callback(**kw) 
-
-        setattr(self, 'action_'+name, _action)
+        setattr(self, 'action_'+name, callback)
 
         self.bindingsNames.append(name)
 
 ConfigurableSettings = ConfigurableBindings()
 
 class ISettings(annotate.TypedInterface):
-    def networkConfig(
+    def sendLogMessage(
         ctx = annotate.Context(),
-        mode = annotate.Choice(["DHCP", "Static"],
-                               required=True, 
-                               label=_("Configuration type"), 
-                               default=defaultVal('net')),
-        IP = annotate.String(label=_("IP address"),default=defaultVal('net')),
-        gateway = annotate.String(label=_("Gateway address"),
-                                  default=defaultVal('net')),
-        mask = annotate.String(label=_("Network mask"),default=defaultVal('net')),
-        DNS = annotate.String(label=_("DNS address"),default=defaultVal('net'))):
+        level = annotate.Choice(LogLevels,
+                                required=True, 
+                                label=_("Log message level")),
+        message = annotate.String(label=_("Message text"))):
             pass
-
-    networkConfig = annotate.autocallable(networkConfig, label=_("Network settings"), action=_("Set"))
+    sendLogMessage = annotate.autocallable(sendLogMessage, 
+                                           label=_("Send a message to the log"),
+                                           action=_("Send"))
 
 
 class SettingsPage(rend.Page):
@@ -220,16 +198,11 @@
 
     def configurable_dynamicSettings(self, ctx):
         return ConfigurableSettings
-
-    def networkConfig(self, *args, **kwargs):
-        # TODO do the settings
-        print(kwargs)
-        lastKnownConfig['net'] = kwargs
-        ConfigurableSettings.addExtension(
-            "wamp", 
-            "wamp DEscription", 
-            [("Host",annotate.String(label=_("IP address")))], 
-            lambda**k:print(k))
+    
+    def sendLogMessage(self, level, message, **kwargs):
+        level = LogLevelsDict[level]
+        if _PySrv.plcobj is not None:
+            _PySrv.plcobj.LogMessage(level, "Web form log message: " + message )
 
 
 class WebInterface(athena.LivePage):
@@ -313,6 +286,7 @@
     print(_('HTTP interface port :'), port)
     return website
 
+
 class statuslistener(object):
     def __init__(self, site):
         self.oldstate = None
@@ -331,5 +305,7 @@
     return statuslistener(site).listen
 
 
-
-
+def SetServer(pysrv):
+    global _PySrv
+    _PySrv = pysrv
+