Author: timopollmeier
Date: 2016-09-21 11:04:30 +0200 (Wed, 21 Sep 2016)
New Revision: 26240
Modified:
trunk/gsa/ChangeLog
trunk/gsa/src/html/classic/omp.xsl
Log:
* src/html/classic/omp.xsl (date-diff-text): New function. Text
generator from date-diff.
(date-diff): Move text generation to new function date-diff-text.
(task [details]): Add duration of last scan and average scan duration.
Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog 2016-09-21 09:03:46 UTC (rev 26239)
+++ trunk/gsa/ChangeLog 2016-09-21 09:04:30 UTC (rev 26240)
@@ -1,3 +1,10 @@
+2016-09-21 Timo Pollmeier <timo.pollme...@greenbone.net>
+
+ * src/html/classic/omp.xsl (date-diff-text): New function. Text
+ generator from date-diff.
+ (date-diff): Move text generation to new function date-diff-text.
+ (task [details]): Add duration of last scan and average scan duration.
+
2016-09-15 Timo Pollmeier <timo.pollme...@greenbone.net>
* src/gsad.c (handle_request): Add "guest" element to help page XML.
Modified: trunk/gsa/src/html/classic/omp.xsl
===================================================================
--- trunk/gsa/src/html/classic/omp.xsl 2016-09-21 09:03:46 UTC (rev 26239)
+++ trunk/gsa/src/html/classic/omp.xsl 2016-09-21 09:04:30 UTC (rev 26240)
@@ -626,11 +626,9 @@
</func:result>
</func:function>
-<func:function name="gsa:date-diff">
- <xsl:param name="start"/>
- <xsl:param name="end"/>
+<func:function name="gsa:date-diff-text">
+ <xsl:param name="difference"/>
- <xsl:variable name="difference" select="date:difference ($start, $end)"/>
<xsl:variable name="fromepoch"
select="date:add ('1970-01-01T00:00:00Z', $difference)"/>
<xsl:variable name="seconds"
@@ -641,6 +639,7 @@
select="date:hour-in-day($fromepoch)"/>
<xsl:variable name="days"
select="date:day-in-year($fromepoch) - 1"/>
+
<func:result>
<xsl:if test="$days">
<xsl:value-of select="concat (gsa-i18n:strformat (gsa:n-i18n ('%1
day', '%1 days', $days, ''), $days), ' ')"/>
@@ -657,6 +656,16 @@
</func:result>
</func:function>
+<func:function name="gsa:date-diff">
+ <xsl:param name="start"/>
+ <xsl:param name="end"/>
+
+ <xsl:variable name="difference" select="date:difference ($start, $end)"/>
+ <func:result>
+ <xsl:value-of select="gsa:date-diff-text ($difference)"/>
+ </func:result>
+</func:function>
+
<func:function name="gsa:report-host-has-os">
<xsl:param name="report"/>
<xsl:param name="ip"/>
@@ -4984,7 +4993,23 @@
</td>
</tr>
<tr>
+ <td><xsl:value-of select="gsa:i18n ('Duration of last scan')"/>:</td>
<td>
+ <xsl:choose>
+ <xsl:when test="last_report/report/scan_end">
+ <xsl:value-of select="gsa:date-diff
(last_report/report/scan_start, last_report/report/scan_end)"/>
+ </xsl:when>
+ </xsl:choose>
+ </td>
+ </tr>
+ <tr>
+ <td><xsl:value-of select="gsa:i18n ('Average scan duration')"/>:</td>
+ <td>
+ <xsl:value-of select="gsa:date-diff-text (date:duration
(average_duration))"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
<xsl:value-of select="gsa:i18n ('Reports')"/>:
</td>
<td>
_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits
