diff --git a/hwe/a_bestGeneral.php b/hwe/a_bestGeneral.php index bb24239f..2ae7ebc4 100644 --- a/hwe/a_bestGeneral.php +++ b/hwe/a_bestGeneral.php @@ -179,10 +179,13 @@ for ($i=0; $i < 21; $i++) { echo ""; for ($k=0; $k < 10; $k++) { - if ($i == 5 || $i == 7 || $i == 20) { + if($data[$k] === '-'){ + //do Nothing + } + else if ($i == 5 || $i == 7 || $i == 20) { $data[$k] = intdiv($data[$k], 100).".".($data[$k]%100)." %"; } - if ($i >= 13 && $i <= 16) { + else if ($i >= 13 && $i <= 16) { $data[$k] = intdiv($data[$k], 100).".".($data[$k]%100)." %"; } echo "{$data[$k]}"; diff --git a/src/sammo/StringUtil.php b/src/sammo/StringUtil.php index 81d2a1f1..7b0ce9c2 100644 --- a/src/sammo/StringUtil.php +++ b/src/sammo/StringUtil.php @@ -103,6 +103,9 @@ class StringUtil } $textLen = mb_strwidth($str, 'UTF-8'); + if($maxsize <= $textLen){ + return $str; + } $fillTextCnt = intdiv($maxsize - $textLen, $chLen);