From d5aed3394dea03d152db518a6d96547b82b176c1 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Mon, 20 Aug 2018 09:52:59 +0200 Subject: [PATCH 1/4] fix duration display for service in list.php --- htdocs/product/list.php | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/htdocs/product/list.php b/htdocs/product/list.php index 593711290d3..f46767c8969 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -744,22 +744,28 @@ if ($resql) if (! $i) $totalarray['nbfield']++; } - // Duration - if (! empty($arrayfields['p.duration']['checked'])) - { - print ''; - if (preg_match('/([^a-z]+)[a-z]/i',$obj->duration)) + // Duration + if (! empty($arrayfields['p.duration']['checked'])) { - if (preg_match('/([^a-z]+)y/i',$obj->duration,$regs)) print $regs[1].' '.$langs->trans("DurationYear"); - elseif (preg_match('/([^a-z]+)m/i',$obj->duration,$regs)) print $regs[1].' '.$langs->trans("DurationMonth"); - elseif (preg_match('/([^a-z]+)w/i',$obj->duration,$regs)) print $regs[1].' '.$langs->trans("DurationWeek"); - elseif (preg_match('/([^a-z]+)d/i',$obj->duration,$regs)) print $regs[1].' '.$langs->trans("DurationDay"); - //elseif (preg_match('/([^a-z]+)h/i',$obj->duration,$regs)) print $regs[1].' '.$langs->trans("DurationHour"); - else print $obj->duration; + print ''; + + $obj->duration_value = substr($obj->duration,0,dol_strlen($obj->duration)-1); + $obj->duration_unit = substr($obj->duration,-1); + + if ($obj->duration_value > 1) + { + $dur=array("i"=>$langs->trans("Minutes"),"h"=>$langs->trans("Hours"),"d"=>$langs->trans("Days"),"w"=>$langs->trans("Weeks"),"m"=>$langs->trans("Months"),"y"=>$langs->trans("Years")); + } + else if ($obj->duration_value > 0) + { + $dur=array("i"=>$langs->trans("Minute"),"h"=>$langs->trans("Hour"),"d"=>$langs->trans("Day"),"w"=>$langs->trans("Week"),"m"=>$langs->trans("Month"),"y"=>$langs->trans("Year")); + } + print $obj->duration_value." "; + print (! empty($obj->duration_unit) && isset($dur[$obj->duration_unit]) ? $langs->trans($dur[$obj->duration_unit]) : ''); + + print ''; + if (! $i) $totalarray['nbfield']++; } - print ''; - if (! $i) $totalarray['nbfield']++; - } // Sell price if (! empty($arrayfields['p.sellprice']['checked'])) From a73d2447d989ce73a9bd63feebf73efd17bacacb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 21 Aug 2018 12:10:05 +0200 Subject: [PATCH 2/4] Update list.php --- htdocs/product/list.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/htdocs/product/list.php b/htdocs/product/list.php index f46767c8969..279f96882b7 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -749,19 +749,19 @@ if ($resql) { print ''; - $obj->duration_value = substr($obj->duration,0,dol_strlen($obj->duration)-1); - $obj->duration_unit = substr($obj->duration,-1); + $duration_value = substr($obj->duration,0,dol_strlen($obj->duration)-1); + $duration_unit = substr($obj->duration,-1); - if ($obj->duration_value > 1) - { - $dur=array("i"=>$langs->trans("Minutes"),"h"=>$langs->trans("Hours"),"d"=>$langs->trans("Days"),"w"=>$langs->trans("Weeks"),"m"=>$langs->trans("Months"),"y"=>$langs->trans("Years")); - } - else if ($obj->duration_value > 0) - { - $dur=array("i"=>$langs->trans("Minute"),"h"=>$langs->trans("Hour"),"d"=>$langs->trans("Day"),"w"=>$langs->trans("Week"),"m"=>$langs->trans("Month"),"y"=>$langs->trans("Year")); - } - print $obj->duration_value." "; - print (! empty($obj->duration_unit) && isset($dur[$obj->duration_unit]) ? $langs->trans($dur[$obj->duration_unit]) : ''); + if ($duration_value > 1) + { + $dur=array("i"=>$langs->trans("Minutes"),"h"=>$langs->trans("Hours"),"d"=>$langs->trans("Days"),"w"=>$langs->trans("Weeks"),"m"=>$langs->trans("Months"),"y"=>$langs->trans("Years")); + } + else if ($duration_value > 0) + { + $dur=array("i"=>$langs->trans("Minute"),"h"=>$langs->trans("Hour"),"d"=>$langs->trans("Day"),"w"=>$langs->trans("Week"),"m"=>$langs->trans("Month"),"y"=>$langs->trans("Year")); + } + print $duration_value." "; + print (! empty($duration_unit) && isset($dur[$duration_unit]) ? $langs->trans($dur[$duration_unit]) : ''); print ''; if (! $i) $totalarray['nbfield']++; From a10b4da6acaba6b7dba86f4dae19584d4c72f027 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 21 Aug 2018 12:13:07 +0200 Subject: [PATCH 3/4] Update list.php --- htdocs/product/list.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/product/list.php b/htdocs/product/list.php index 279f96882b7..1fa96a91f37 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -752,16 +752,16 @@ if ($resql) $duration_value = substr($obj->duration,0,dol_strlen($obj->duration)-1); $duration_unit = substr($obj->duration,-1); - if ($duration_value > 1) + if ((float) $duration_value > 1) { $dur=array("i"=>$langs->trans("Minutes"),"h"=>$langs->trans("Hours"),"d"=>$langs->trans("Days"),"w"=>$langs->trans("Weeks"),"m"=>$langs->trans("Months"),"y"=>$langs->trans("Years")); } - else if ($duration_value > 0) + else if ((float) $duration_value > 0) { $dur=array("i"=>$langs->trans("Minute"),"h"=>$langs->trans("Hour"),"d"=>$langs->trans("Day"),"w"=>$langs->trans("Week"),"m"=>$langs->trans("Month"),"y"=>$langs->trans("Year")); } - print $duration_value." "; - print (! empty($duration_unit) && isset($dur[$duration_unit]) ? $langs->trans($dur[$duration_unit]) : ''); + print $duration_value; + print (! empty($duration_unit) && isset($dur[$duration_unit]) ? ' '.$langs->trans($dur[$duration_unit]) : ''); print ''; if (! $i) $totalarray['nbfield']++; From c25a968c72a64c032b320a256da4f498fe1a7518 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 21 Aug 2018 12:15:47 +0200 Subject: [PATCH 4/4] Update list.php --- htdocs/product/list.php | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/htdocs/product/list.php b/htdocs/product/list.php index 1fa96a91f37..9b26eecc426 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -749,20 +749,26 @@ if ($resql) { print ''; - $duration_value = substr($obj->duration,0,dol_strlen($obj->duration)-1); - $duration_unit = substr($obj->duration,-1); - - if ((float) $duration_value > 1) + if (preg_match('/([^a-z]+)[a-z]$/i',$obj->duration)) { - $dur=array("i"=>$langs->trans("Minutes"),"h"=>$langs->trans("Hours"),"d"=>$langs->trans("Days"),"w"=>$langs->trans("Weeks"),"m"=>$langs->trans("Months"),"y"=>$langs->trans("Years")); + $duration_value = substr($obj->duration,0,dol_strlen($obj->duration)-1); + $duration_unit = substr($obj->duration,-1); + + if ((float) $duration_value > 1) + { + $dur=array("i"=>$langs->trans("Minutes"),"h"=>$langs->trans("Hours"),"d"=>$langs->trans("Days"),"w"=>$langs->trans("Weeks"),"m"=>$langs->trans("Months"),"y"=>$langs->trans("Years")); + } + else if ((float) $duration_value > 0) + { + $dur=array("i"=>$langs->trans("Minute"),"h"=>$langs->trans("Hour"),"d"=>$langs->trans("Day"),"w"=>$langs->trans("Week"),"m"=>$langs->trans("Month"),"y"=>$langs->trans("Year")); + } + print $duration_value; + print (! empty($duration_unit) && isset($dur[$duration_unit]) ? ' '.$langs->trans($dur[$duration_unit]) : ''); } - else if ((float) $duration_value > 0) + else { - $dur=array("i"=>$langs->trans("Minute"),"h"=>$langs->trans("Hour"),"d"=>$langs->trans("Day"),"w"=>$langs->trans("Week"),"m"=>$langs->trans("Month"),"y"=>$langs->trans("Year")); + print $obj->duration; } - print $duration_value; - print (! empty($duration_unit) && isset($dur[$duration_unit]) ? ' '.$langs->trans($dur[$duration_unit]) : ''); - print ''; if (! $i) $totalarray['nbfield']++; }