X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttFavReportHelper.class.php;h=305a4fc8c2187c7a037abffc02928d23cbb91f62;hb=5f56885676a5004de82919add3d309575514be1b;hp=069ecbb5f33afe6f5f015dad1c6d5e6750c0c3e1;hpb=34627c08c23651305a94e9e533249cc1d3472685;p=timetracker.git diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php index 069ecbb5..305a4fc8 100644 --- a/WEB-INF/lib/ttFavReportHelper.class.php +++ b/WEB-INF/lib/ttFavReportHelper.class.php @@ -84,7 +84,7 @@ class ttFavReportHelper { show_client, show_invoice, show_paid, show_ip, show_project, show_start, show_duration, show_cost, show_task, show_end, show_note, show_custom_field_1, show_work_units, - group_by, show_totals_only) + group_by1, group_by2, group_by3, show_totals_only) values(". $mdb2->quote($fields['name']).", ".$fields['user_id'].", ". $mdb2->quote($fields['client']).", ".$mdb2->quote($fields['option']).", ". @@ -96,7 +96,8 @@ class ttFavReportHelper { $fields['chclient'].", ".$fields['chinvoice'].", ".$fields['chpaid'].", ".$fields['chip'].", ". $fields['chproject'].", ".$fields['chstart'].", ".$fields['chduration'].", ".$fields['chcost'].", ". $fields['chtask'].", ".$fields['chfinish'].", ".$fields['chnote'].", ".$fields['chcf_1'].", ".$fields['chunits'].", ". - $mdb2->quote($fields['group_by']).", ".$fields['chtotalsonly'].")"; + $mdb2->quote($fields['group_by1']).", ".$mdb2->quote($fields['group_by2']).", ". + $mdb2->quote($fields['group_by3']).", ".$fields['chtotalsonly'].")"; $affected = $mdb2->exec($sql); if (is_a($affected, 'PEAR_Error')) return false; @@ -139,7 +140,9 @@ class ttFavReportHelper { "show_note = ".$fields['chnote'].", ". "show_custom_field_1 = ".$fields['chcf_1'].", ". "show_work_units = ".$fields['chunits'].", ". - "group_by = ".$mdb2->quote($fields['group_by']).", ". + "group_by1 = ".$mdb2->quote($fields['group_by1']).", ". + "group_by2 = ".$mdb2->quote($fields['group_by2']).", ". + "group_by3 = ".$mdb2->quote($fields['group_by3']).", ". "show_totals_only = ".$fields['chtotalsonly']. " where id = ".$fields['id']; $affected = $mdb2->exec($sql); @@ -209,7 +212,9 @@ class ttFavReportHelper { 'chnote'=>$bean->getAttribute('chnote'), 'chcf_1'=>$bean->getAttribute('chcf_1'), 'chunits'=>$bean->getAttribute('chunits'), - 'group_by'=>$bean->getAttribute('group_by'), + 'group_by1'=>$bean->getAttribute('group_by1'), + 'group_by2'=>$bean->getAttribute('group_by2'), + 'group_by3'=>$bean->getAttribute('group_by3'), 'chtotalsonly'=>$bean->getAttribute('chtotalsonly')); $id = false; @@ -270,7 +275,9 @@ class ttFavReportHelper { $bean->setAttribute('chnote', $val['show_note']); $bean->setAttribute('chcf_1', $val['show_custom_field_1']); $bean->setAttribute('chunits', $val['show_work_units']); - $bean->setAttribute('group_by', $val['group_by']); + $bean->setAttribute('group_by1', $val['group_by1']); + $bean->setAttribute('group_by2', $val['group_by2']); + $bean->setAttribute('group_by3', $val['group_by3']); $bean->setAttribute('chtotalsonly', $val['show_totals_only']); $bean->setAttribute('new_fav_report', $val['name']); } else { @@ -295,7 +302,9 @@ class ttFavReportHelper { 'chnote'=>'1', 'chcf_1'=>'', 'chunits'=>'', - 'group_by'=>'', + 'group_by1'=>'', + 'group_by2'=>'', + 'group_by3'=>'', 'chtotalsonly'=>'', 'new_fav_report'=>'')); $bean->setAttributes($attrs);