From 51a59b9696755196c0047585bac22f0dd64dc69f Mon Sep 17 00:00:00 2001 From: Brian Read Date: Mon, 20 Jan 2025 16:27:26 +0000 Subject: [PATCH] Update nutups and js file into generated mix --- Targets/Nutups/Nutups-Custom.pm | 12 ++++++- Targets/Nutups/Nutups.pm | 6 ++-- Targets/Nutups/_nut_CONFIG.html.ep | 56 ++++++++++++++++++++++++----- Targets/Nutups/_nut_STATUS.html.ep | 2 +- Targets/Nutups/nutups.css | 53 ++++++++++++++++++++++++--- Targets/Nutups/nutups.html.ep | 3 +- Targets/Nutups/nutups.js | 20 +++++++++++ Targets/Nutups/nutups_en.lex | 44 ++++++++++++----------- Templates/html_controls.html.ep.xml | 2 +- Templates/layout.html.ep.tem | 1 + json5/Nutups.json5 | 55 +++++++++++++++++++++------- sm2gen.py | 14 ++++++-- 12 files changed, 212 insertions(+), 56 deletions(-) create mode 100644 Targets/Nutups/nutups.js diff --git a/Targets/Nutups/Nutups-Custom.pm b/Targets/Nutups/Nutups-Custom.pm index 1e1beaf..00f5bfe 100644 --- a/Targets/Nutups/Nutups-Custom.pm +++ b/Targets/Nutups/Nutups-Custom.pm @@ -1,5 +1,5 @@ # -# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 12:01:10 +# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33 # # # Routines to be edited by the developer to provide content and validation for parameters @@ -50,6 +50,8 @@ our $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db"); {$ret .= 'Validation for Nutmode failed';} if (! TRUE) #validate $c->param('SlaveUPS_Name') {$ret .= 'Validation for SlaveUPS_Name failed';} + if (! TRUE) #validate $c->param('MasterUPS_Name') + {$ret .= 'Validation for MasterUPS_Name failed';} if (! TRUE) #validate $c->param('UPS_Model') {$ret .= 'Validation for UPS_Model failed';} if (! TRUE) #validate $c->param('UPS_Device') @@ -88,6 +90,7 @@ our $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db"); 'status'=>'status contents', 'Nutmode'=>'Nutmode contents', 'SlaveUPS_Name'=>'SlaveUPS_Name contents', + 'MasterUPS_Name'=>'MasterUPS_Name contents', 'UPS_Model'=>'UPS_Model contents', 'UPS_Device'=>'UPS_Device contents', 'UPS_gen_Type'=>'UPS_gen_Type contents', @@ -153,6 +156,8 @@ our $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db"); {$ret .= 'Perform/save failed for Nutmode';} if (! TRUE) #copy or perform with value: SlaveUPS_Name e.g. $db->set_prop($dbkey,'SlaveUPS_Name',$c->param('SlaveUPS_Name'),type=>'service')) {$ret .= 'Perform/save failed for SlaveUPS_Name';} + if (! TRUE) #copy or perform with value: MasterUPS_Name e.g. $db->set_prop($dbkey,'MasterUPS_Name',$c->param('MasterUPS_Name'),type=>'service')) + {$ret .= 'Perform/save failed for MasterUPS_Name';} if (! TRUE) #copy or perform with value: UPS_Model e.g. $db->set_prop($dbkey,'UPS_Model',$c->param('UPS_Model'),type=>'service')) {$ret .= 'Perform/save failed for UPS_Model';} if (! TRUE) #copy or perform with value: UPS_Device e.g. $db->set_prop($dbkey,'UPS_Device',$c->param('UPS_Device'),type=>'service')) @@ -174,4 +179,9 @@ sub create_link{ my $link = "$route?trt=$panel&Selected=$index"; return $link; } + +sub get_model_options{ + return []; +} + 1; \ No newline at end of file diff --git a/Targets/Nutups/Nutups.pm b/Targets/Nutups/Nutups.pm index 4255cef..1c6dae7 100644 --- a/Targets/Nutups/Nutups.pm +++ b/Targets/Nutups/Nutups.pm @@ -1,11 +1,11 @@ package SrvMngr::Controller::Nutups; # -# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 12:01:10 +# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33 # #---------------------------------------------------------------------- -# heading : Network +# heading : System # description : NutUPS configuration -# navigation : 6000 6700 +# navigation : 4000 700 # # name : nutups, method : get, url : /nutups, ctlact : Nutups#main # name : nutupsu, method : post, url : /nutupsu, ctlact : Nutups#do_update diff --git a/Targets/Nutups/_nut_CONFIG.html.ep b/Targets/Nutups/_nut_CONFIG.html.ep index 3d29f46..ea0b580 100644 --- a/Targets/Nutups/_nut_CONFIG.html.ep +++ b/Targets/Nutups/_nut_CONFIG.html.ep @@ -1,5 +1,5 @@ %# -%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 12:01:10 +%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33 %#