brianr/SM2Gen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refine and re-write table data interface to contain the custom code in one place

Browse Source
This commit is contained in:
Brian Read
2024-11-16 16:18:26 +00:00
parent 5205daf7ed
commit c8b109378c
3 changed files with 226 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Templates/controller.pm.tem
View File

@@ -35,7 +35,7 @@ use SrvMngr qw(theme_list init_session);
use Data::Dumper;
use esmith::util;
use esmith::util::network ;
use esmith::util::network;
use esmith::ConfigDB;
use esmith::AccountsDB;
use esmith::NetworksDB;
@@ -83,7 +83,7 @@ sub main {
#pickup any other contents needed and load them into hash shared with panel
my %returned_hash;
# subroutine returns a hash directly
%returned_hash = get_data_for_panel_${firstPanel}();
%returned_hash = $c->get_data_for_panel_${firstPanel}();
# Copy each key-value pair from the returned hash to the prefix data hash
while (my ($key, $value) = each %returned_hash) {
$$${prefix}_data{$key} = $value;
@@ -253,7 +253,7 @@ sub do_display {
# pickup any other contents needed and load them into hash shared with panel
my %returned_hash;
# subroutine returns a hash directly
%returned_hash = get_data_for_panel_${panel}();
%returned_hash = $c->get_data_for_panel_${panel}();
# Copy each key-value pair from the returned hash to the prefix data hash
while (my ($key, $value) = each %returned_hash) {
$$${prefix}_data{$key} = $value;

61
Templates/custom.pm.tem
View File

@@ -32,9 +32,8 @@ our $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db");
# Validation for each field
my $ret = "";
<tal:block tal:repeat="field fields[panel]">
if (! TRUE) #validate $c->param('${field}')
{$ret .= 'Validation for ${field} failed';}
</tal:block>
if (! TRUE) #validate $c->param('${field}')
{$ret .= 'Validation for ${field} failed';} </tal:block>
if ($ret eq "") {$ret = 'ok';}
return $ret;
}
@@ -48,28 +47,51 @@ our $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db");
my %ret = (
'Data1'=>'Data for ${panel}', #Example
# fields from Inputs in ${panel} $fields['${panel}']
<tal:block tal:repeat="field fields[panel]">
'${field}'=>'${field} contents',
<tal:block tal:repeat="field fields[panel]">'${field}'=>'${field} contents',
</tal:block>
);
return %ret;
}
</tal:block>
Get control data for table(s)
# Get control data for table(s)
<tal:block repeat="tablecontrol tablecontrols">
# Define a constant hash for field name mapping
use constant ${tablecontrol[0]}_FIELD_MAPPING => (
<tal:block repeat="col tablecontrol[1]['columns']">'${col}' => 'Source-for-${col}'<tal:condition condition="not: repeat['col'].end">,
</tal:condition></tal:block>
#'target_field2' => 'source_field2',
# Add more mappings as needed
);
sub actual_${tablecontrol[0]} {
my @ret = ();
# Actual code for extracting ${tablecontrol[0]}
return @ret;
}
sub get_${tablecontrol[0]} {
# Return an array of hashes of the contents for each row and column for ${tablecontrol[0]}
# Cols/fields in hash needed are:
# <tal:block repeat="col tablecontrol[1]['columns']">${col}<tal:condition condition="not: repeat['col'].end">,
# </tal:condition></tal:block>
my $c = shift;
my @ret = {};
return \@ret;
my $c = shift;
my @source_records = $c->actual_${tablecontrol[0]}();
my @transformed_records;
my %Field_Mapping = ${tablecontrol[0]}_FIELD_MAPPING;
# Iterate over each record in the source array
for my $source_record (@$source_records) {
my %transformed_record;
# Iterate over each key-value pair in the $Field_Mapping constant
while (my ($target, $source) = each %Field_Mapping) {
# Check if the source field exists in the source record
if (exists $source_record->{$source}) {
# Assign the source field value to the target field in the transformed record
$transformed_record{$target} = $source_record->{$source};
}
}
# Add transformed record to the array if it's not empty
push @transformed_records, \%transformed_record if %transformed_record;
}
return \@transformed_records;
}
</tal:block>
@@ -92,9 +114,8 @@ sub get_${tablecontrol[0]} {
my $prefix_data = shift; #Data hash as parameter
my $ret = "";
<tal:block tal:repeat="field fields[panel]">
if (! TRUE) #copy or perform with value: ${field} e.g. $c->setprop(dbentry,dbkey,$c->param('${field}')
{$ret .= 'Perform failed for ${field} failed';}
</tal:block>
if (! TRUE) #copy or perform with value: ${field} e.g. $c->setprop(dbentry,dbkey,$c->param('${field}')
{$ret .= 'Perform failed for ${field} failed';}</tal:block>
if ($ret eq "") {$ret = 'ok';}
return $ret;
}
@@ -102,7 +123,7 @@ sub get_${tablecontrol[0]} {
sub create_link{
# WIP
my ($c,$route, $panel, $index) = shift;
my ($c,$route, $panel, $index) = @_;
my $link = "$route?trt=$panel&Selected=$index";
return $link;
}