Skip to content

Commit

Permalink
update v1.3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Medialoha committed Jul 8, 2014
1 parent 254cda1 commit 5c12fcb
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 7 deletions.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ Check Git hub repository [here](https://github.com/Medialoha/ACRA-Backend-Tester

## Change Log ##

**Version 1.3.4-Helen**

- *Fixed issues #77 #78 and #79*

Special thanks to **xeno010** and **asylume** !

**Version 1.3.3-Helen**

- *Currency support for sales report added*
Expand Down
2 changes: 1 addition & 1 deletion includes/charthelper.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public static function convertMySQLArrToPieChartJSON($arr, $appendValueToLabel=f
$arr = $arr===null?array():$arr;

foreach($arr as $row) {
$json .= $sep.'{"label":"'.$row[0].($appendValueToLabel?' ('.$row[1].')':'').'","data":'.$row[1].', color:"'.self::$COLORS[$c].'"}'; $sep = ',';
$json .= $sep.'{"label":"'.$row[0].($appendValueToLabel?' ('.$row[1].')':'').'","data":'.$row[1].', "color":"'.self::$COLORS[$c].'"}'; $sep = ',';

$c = (++$c)%self::$COLOR_COUNT;
}
Expand Down
4 changes: 2 additions & 2 deletions includes/define.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
*/

define('_APPLICATION_NAME_', 'MABL');
define('_APPLICATION_VERSION_NAME_', '1.3.3-Helen');
define('_APPLICATION_VERSION_CODE_', 9);
define('_APPLICATION_VERSION_NAME_', '1.3.4-Helen');
define('_APPLICATION_VERSION_CODE_', 10);

define('LOG_SEVERITY', 0); // could be 0=>DEBUG, 1=>INFO, 2=>WARNING, 3=>ERROR

Expand Down
14 changes: 10 additions & 4 deletions includes/reporthelper.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,12 @@ public static function displayObjectValuesToHTMLArray($obj, $formatKeyFunction=0

?><table class="table table-condensed table-hover" ><tr><th style="min-width:370px; border:0 none;" ></th><th></th></tr><?php
foreach($values as $key=>$value) {
if (is_array($value))
if (is_array($value)) {
$value = print_r($value, true);
else if (is_bool($value))

} else if (is_bool($value)) {
$value = '<input type="checkbox" '.($value?'checked="checked"':'').' />';
}

switch ($formatKeyFunction) {
case FORMAT_ENV_KEY :
Expand Down Expand Up @@ -152,12 +154,16 @@ public static function displayPreferences($prefs) {

$values = get_object_vars($prefObj);
foreach($values as $key=>$value) {
if (is_array($value))
if (is_array($value)) {
$value = print_r($value, true);
else if(is_bool($value))

} else if(is_bool($value)) {
$value = '<input type="checkbox" '.($value ? 'checked="checked"' : '').'>';

}

echo '<tr><td>'.$key.'</td><td>'.$value.'</td></tr>';

}
}

Expand Down
5 changes: 5 additions & 0 deletions pages/report_details.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,11 @@
if (strcmp($initialValue, $crashValue)!=0)
$diff = true;

if (is_bool($initialValue)) {
$initialValue = '<input type="checkbox" '.($initialValue?'checked="checked"':'').'>';
$crashValue = '<input type="checkbox" '.($crashValue?'checked="checked"':'').'>';
}

echo '<tr><td>'.$key.'</td><td style="width:200px;" >'.
str_replace('+', '<br/>', $initialValue).'</td><td style="width:200px;" class="'.($diff?'text-error':'').'" >'.
str_replace('+', '<br/>', $crashValue).'</td></tr>';
Expand Down

0 comments on commit 5c12fcb

Please sign in to comment.