Change the XSLT to use the duration format instead of "logic"

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Miika Turkia 2014-12-31 18:27:31 +02:00 committed by Dirk Hohndel
parent 65ee482adb
commit d70a6f23ed
2 changed files with 2 additions and 1 deletions

View file

@ -133,6 +133,7 @@ void DiveLogImportDialog::on_buttonBox_accepted()
ui->ManualSeparator->currentIndex(), ui->ManualSeparator->currentIndex(),
ui->Units->currentIndex(), ui->Units->currentIndex(),
ui->DateFormat->currentIndex(), ui->DateFormat->currentIndex(),
ui->DurationFormat->currentIndex(),
VALUE_IF_CHECKED(DiveNumber), VALUE_IF_CHECKED(DiveNumber),
VALUE_IF_CHECKED(Date), VALUE_IF_CHECKED(Time), VALUE_IF_CHECKED(Date), VALUE_IF_CHECKED(Time),
VALUE_IF_CHECKED(Duration), VALUE_IF_CHECKED(Location), VALUE_IF_CHECKED(Duration), VALUE_IF_CHECKED(Location),

View file

@ -164,7 +164,7 @@
</xsl:variable> </xsl:variable>
<xsl:attribute name="duration"> <xsl:attribute name="duration">
<xsl:choose> <xsl:choose>
<xsl:when test="substring-before($duration, ':') = '' and $duration &lt; 600"> <xsl:when test="$durationfmt = 1">
<xsl:value-of select="$duration * 60"/> <xsl:value-of select="$duration * 60"/>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>