[Fusionforge-commits] r17920 - trunk/src/common/reporting

Marc-Etienne VARGENAU vargenau at fusionforge.org
Tue Sep 10 13:44:57 CEST 2013


Author: vargenau
Date: 2013-09-10 13:44:57 +0200 (Tue, 10 Sep 2013)
New Revision: 17920

Modified:
   trunk/src/common/reporting/report_utils.php
Log:
Better init arrays

Modified: trunk/src/common/reporting/report_utils.php
===================================================================
--- trunk/src/common/reporting/report_utils.php	2013-09-10 11:43:05 UTC (rev 17919)
+++ trunk/src/common/reporting/report_utils.php	2013-09-10 11:44:57 UTC (rev 17920)
@@ -58,24 +58,11 @@
 	return html_build_select_box_from_arrays ($arr,$arr2,$name,$selected,false);
 }
 
-function report_day_adjust_box($Report, $name='days_adjust', $selected=false) {
-	$days[]='0';
-	$days[]='1';
-	$days[]='2';
-	$days[]='3';
-	$days[]='4';
-	$days[]='5';
-	$days[]='6';
-	$names[]=_('Sunday');
-	$names[]=_('Monday');
-	$names[]=_('Tuesday');
-	$names[]=_('Wednesday');
-	$names[]=_('Thursday');
-	$names[]=_('Friday');
-	$names[]=_('Saturday');
-	return html_build_select_box_from_arrays ($days,$names,$name,$selected,false);
-
-//	return html_build_select_box_from_arrays (array_reverse(array_values($Report->adjust_days)),array_reverse(array_keys($Report->adjust_days)),$name,$selected,false);
+function report_day_adjust_box() {
+	$days = array('0', '1', '2', '3', '4', '5', '6');
+	$names = array(_('Sunday'), _('Monday'), _('Tuesday'),
+				   _('Wednesday'), _('Thursday'), _('Friday'), _('Saturday'));
+	return html_build_select_box_from_arrays($days, $names, 'days_adjust', false, false);
 }
 
 function report_months_box($Report, $name='month', $selected=false) {
@@ -93,8 +80,8 @@
 	if ($start_with) {
 		$res = db_query_params ('SELECT user_id,realname FROM users WHERE status=$1 AND (exists (SELECT user_id FROM rep_user_act_daily WHERE user_id=users.user_id)) AND (lower(lastname) LIKE $2 OR lower(user_name) LIKE $3) ORDER BY lastname',
 					array ('A',
-					       strtolower("$start_with%"),
-					       strtolower("$start_with%"))) ;
+							strtolower("$start_with%"),
+							strtolower("$start_with%"))) ;
 	} else {
 		$res = db_query_params ('SELECT user_id,realname FROM users WHERE status=$1 AND (exists (SELECT user_id FROM rep_user_act_daily WHERE user_id=users.user_id)) ORDER BY lastname',
 					array ('A')) ;
@@ -106,8 +93,8 @@
 	if ($start_with) {
 		$res = db_query_params ('SELECT user_id,realname FROM users WHERE status=$1 AND (exists (SELECT user_id FROM rep_time_tracking WHERE user_id=users.user_id)) AND (lower(lastname) LIKE $2 OR lower(user_name) LIKE $3) ORDER BY lastname',
 					array ('A',
-					       strtolower("$start_with%"),
-					       strtolower("$start_with%"))) ;
+							strtolower("$start_with%"),
+							strtolower("$start_with%"))) ;
 	} else {
 		$res = db_query_params ('SELECT user_id,realname FROM users WHERE status=$1 AND (exists (SELECT user_id FROM rep_time_tracking WHERE user_id=users.user_id)) ORDER BY lastname',
 					array ('A')) ;
@@ -210,8 +197,7 @@
 function report_time_category_box($name='category',$selected=false) {
 	global $report_time_category_res;
 	if (!$report_time_category_res) {
-		$report_time_category_res = db_query_params ('SELECT * FROM rep_time_category',
-							     array()) ;
+		$report_time_category_res = db_query_params ('SELECT * FROM rep_time_category', array());
 	}
 	return html_build_select_box($report_time_category_res,$name,$selected,false);
 }




More information about the Fusionforge-commits mailing list