2 Commits

Author SHA1 Message Date
7e4ab54b55 * Fri Jun 13 2025 Brian Read <brianr@koozali.org> 11.0.0-18.sme
- Adjust call from Custom to be emtpy hash not hashref [SME: 13042]
2025-06-13 15:51:19 +01:00
32cfcf5ed3 * Fri Jun 13 2025 Brian Read <brianr@koozali.org> 11.0.0-17.sme
- Fix return from function in Nutups-custom [SME: 13042]
- Check Seconds left for zero before dividing by 60
2025-06-13 11:46:19 +01:00
3 changed files with 26 additions and 9 deletions

View File

@@ -116,16 +116,16 @@ our $cdb;
my $c = shift;
my $selected = shift; #Parameter is name of selected row.
my $is_new_record = shift; #Indicates new record required (defaults)
my %ret = {};
return $ret;
my %ret = ();
return %ret;
}
sub get_selected_CONFIG {
my $c = shift;
my $selected = shift; #Parameter is name of selected row.
my $is_new_record = shift; #Indicates new record required (defaults)
my %ret = {};
return $ret;
my %ret = ();
return %ret;
}
@@ -279,4 +279,4 @@ sub get_status_from_device {
}
1;
1;

View File

@@ -16,7 +16,17 @@
<h2>Battery Status</h2>
<table>
<tr><td>Charge:</td><td><%= $nut_data->{'ups_data'}->{'battery.charge'} %>%</td></tr>
<tr><td>Runtime:</td><td><%= sprintf("%.2f", $nut_data->{'ups_data'}->{'battery.runtime'} / 60) %> minutes</td></tr>
%#<tr><td>Runtime:</td><td><%= sprintf("%.2f", $nut_data->{'ups_data'}->{'battery.runtime'} / 60) %> minutes</td></tr>
<td>Runtime:</td>
<td>
<%
my $runtime = $nut_data->{'ups_data'}->{'battery.runtime'};
my $runtime_minutes = (defined $runtime && $runtime =~ /^\d+(\.\d+)?$/)
? sprintf("%.2f", $runtime / 60)
: 'N/A';
%>
<%= $runtime_minutes %> minutes
</td>
<tr><td>Voltage:</td><td><%= $nut_data->{'ups_data'}->{'battery.voltage'} %>V</td></tr>
<tr><td>Type:</td><td><%= $nut_data->{'ups_data'}->{'battery.type'} %></td></tr>
</table>

View File

@@ -4,7 +4,7 @@ Summary: SME server - nut UPS interaction module
%define name smeserver-nutUPS
Name: %{name}
%define version 11.0.0
%define release 16
%define release 18
Version: %{version}
Release: %{release}%{?dist}
License: GPL
@@ -26,6 +26,13 @@ A module which configures the Network UPS Tools suite for operation with
the SME server software.
%changelog
* Fri Jun 13 2025 Brian Read <brianr@koozali.org> 11.0.0-18.sme
- Adjust call from Custom to be emtpy hash not hashref [SME: 13042]
* Fri Jun 13 2025 Brian Read <brianr@koozali.org> 11.0.0-17.sme
- Fix return from function in Nutups-custom [SME: 13042]
- Check Seconds left for zero before dividing by 60 [SME: 13042]
* Fri Jun 13 2025 Brian Read <brianr@koozali.org> 11.0.0-16.sme
- Change Navigation weighting for SM2 [SME: 12996]
@@ -123,9 +130,9 @@ the SME server software.
* Thu Jan 22 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 2.4.0-3.sme
- Remove obsolete directives {ACL,ACCEPT,REJECT} and switch to LISTEN
- in /etc/ups/upsd.conf
in /etc/ups/upsd.conf
- Allow NUT in /etc/hosts.allow and in /etc/services [SME: 8793]
- Code change from Daniel B.<daniel@firewall-services.com>
Code change from Daniel B.<daniel@firewall-services.com>
* Thu Jan 31 2013 Shad L. Lords <slords@mail.com> 2.4.0-2.sme
- Obsolete el5 packages that used to be required [SME: 7273]