added functions to edit hours in hh:mm and save them in decimal

[wfpl.git] / format.php

diff --git a/format.php b/format.php
index f395491..8035be4 100644 (file)
--- a/format.php
+++ b/format.php
@@ -45,19 +45,32 @@ function format_int($str) {
        return ereg_replace('^0*([0-9])', '\1', $str);
 }
 
-function format_positive_decimal($str) {
+function format_decimals($str) {
+       $str = ereg_replace('[^0-9]', '', $str);
+       return ereg_replace('^([0-9])0*', '\1', $str);
+}
+
+function _format_positive_decimal($str) {
        $str = ereg_replace('[^0-9.]', '', $str);
        $pos = strpos($str, '.');
        if($pos !== false) {
                $str = str_replace('.', '', $str);
                if($pos == 0) {
-                       return '0.' . $str;
+                       return '0.' . format_decimals($str);
                } elseif($pos == strlen($str)) {
-                       return $str;
+                       return format_int($str);
                } else {
-                       return substr($str, 0, $pos) . '.' . substr($str, $pos);
+                       return format_int(substr($str, 0, $pos)) . '.' . format_decimals(substr($str, $pos));
                }
        }
+       return format_int($str);
+}
+
+function format_positive_decimal($str) {
+       $str = _format_positive_decimal($str);
+       if($str === '0.0') {
+               $str = '0';
+       }
        return $str;
 }
 
@@ -65,7 +78,7 @@ function format_decimal($str) {
        $str = ereg_replace('[^0-9.-]', '', $str);
        if(substr($str, 0, 1) == '-') {
                $str = format_positive_decimal(substr($str, 1));
-               if($str !== '' && $str !== '0' && $str != '0.0') {
+               if($str !== '' && $str !== '0') {
                        $str = '-' . $str;
                }
                return $str;
@@ -205,6 +218,42 @@ function format_mdy_to_ymd($str) {
        return mdy_to_ymd(format_oneline($str));
 }
 
+# takes any of: HH  :MM  HH:MM
+# returns decimal number of hours
+#
+# You probably want to use format_hours() instead because it handles hours with a decimal point.
+function format_hours_minutes($str) {
+       if(strlen($str) == 0) {
+               return $str;
+       }
+       $pos = strpos($str, ':');
+       if($pos === false) {
+               $hours = format_int_0($str);
+               $minutes = 0;
+       } elseif($pos == 0) {
+               $hours = 0;
+               $minutes = format_int_0($str);
+       } else {
+               $hours = format_int_0(substr($str, 0, $pos));
+               $minutes = format_int_0(substr($str, $pos + 1));
+       }
+       return $hours + ($minutes / 60.0);
+}
+
+# takes any of: HH  :MM  HH:MM  HH.hh(decimal hours)
+# returns decimal number of hours
+function format_hours($str) {
+       if(strlen($str) == 0) {
+               return $str;
+       }
+       if(strpos($str, ':') !== false) {
+               return format_hours_minutes($str);
+       } else {
+               return format_decimal($str);
+       }
+}
+
+
 function format_phone($str) {
        $str = ereg_replace('[^0-9]', '', $str);
        $str = ereg_replace('^1*', '', $str);