Added number locale to report

www/timesheet-monthly-hours-absences2.tcl

@@ -12,6 +12,7 @@ ad_page_contract {
     { report_year_month "" }
     { level_of_detail 3 }
     { output_format "html" }
+    { number_locale "" }
     { report_user_id 0 }
     { daily_hours 0 }
     { different_from_project_p "" }
@@ -37,6 +38,9 @@ if {"t" ne $read_p } {
     return
 }
 
+set locale [lang::user::locale]
+if {"" == $number_locale} { set number_locale $locale }
+
 
 # ------------------------------------------------------------
 # Validate 
@@ -292,7 +296,7 @@ set user_footer {
 set counters [list]
 for {set d 1} {$d <= $report_year_month_days_in_month} {incr d} {
     lappend header0 "Day $d"
-    lappend project_vars "\$hours_$d"
+    lappend project_vars "#align=right \$hours_${d}_formatted"
 
     set counter [list \
     	pretty_name "Hours day_$d" \
@@ -301,7 +305,7 @@ for {set d 1} {$d <= $report_year_month_days_in_month} {incr d} {
 	expr "\$hours_${d}+0" \
     ]
     lappend counters $counter
-    lappend user_footer "<b>\$hours_${d}_subtotal</b>"
+    lappend user_footer "#align=right <b>\$hours_${d}_subtotal_formatted</b>"
 }
 
 
@@ -372,7 +376,14 @@ switch $output_format {
                     [im_report_output_format_select output_format "" $output_format]
                   </td>
                 </tr>
-  		 <tr>
+
+                <tr>
+		  <td class=form-label>[lang::message::lookup "" intranet-reporting.Number_Format "Number Format"]</td>
+                  <td>[im_report_number_locale_select number_locale $number_locale]</td>
+                  </td>
+                </tr>
+
+ 		<tr>
 		  <td class=form-label></td>
 		  <td class=form-widget><input type=submit value=Submit></td>
 		</tr>
@@ -416,37 +427,47 @@ set class "rowodd"
 #------------------------ 
 
 db_foreach sql $sql {
+    
+    for {set d 1} {$d <= $report_year_month_days_in_month} {incr d} {
+	set val [set "hours_$d"]
+	if {"" eq $val} { set val 0.00 }
+	set "hours_${d}_formatted" [im_report_format_number [expr round(100.0 * $val) / 100.0] $output_format $number_locale]
+    }
 
     if {"" eq $object_name} { set object_name "undefined" }
+    im_report_display_footer \
+	-output_format $output_format \
+	-group_def $report_def \
+	-footer_array_list $footer_array_list \
+	-last_value_array_list $last_value_list \
+	-level_of_detail $level_of_detail \
+	-row_class $class \
+	-cell_class $class
+
+    im_report_update_counters -counters $counters
+
+    for {set d 1} {$d <= $report_year_month_days_in_month} {incr d} {
+	set val [set "hours_${d}_subtotal"]
+	set "hours_${d}_subtotal_formatted" [im_report_format_number [expr round(100.0 * $val) / 100.0] $output_format $number_locale]
+    }
 
-	im_report_display_footer \
-	    -output_format $output_format \
-	    -group_def $report_def \
-	    -footer_array_list $footer_array_list \
-	    -last_value_array_list $last_value_list \
-	    -level_of_detail $level_of_detail \
-	    -row_class $class \
-	    -cell_class $class
-
-	im_report_update_counters -counters $counters
-
-	set last_value_list [im_report_render_header \
-	    -output_format $output_format \
-	    -group_def $report_def \
-	    -last_value_array_list $last_value_list \
-	    -level_of_detail $level_of_detail \
-	    -row_class $class \
-	    -cell_class $class
-        ]
-	
-        set footer_array_list [im_report_render_footer \
-	    -output_format $output_format \
-	    -group_def $report_def \
-	    -last_value_array_list $last_value_list \
-	    -level_of_detail $level_of_detail \
-	    -row_class $class \
-	    -cell_class $class 
-        ]
+    set last_value_list [im_report_render_header \
+			     -output_format $output_format \
+			     -group_def $report_def \
+			     -last_value_array_list $last_value_list \
+			     -level_of_detail $level_of_detail \
+			     -row_class $class \
+			     -cell_class $class
+			]
+    
+    set footer_array_list [im_report_render_footer \
+			       -output_format $output_format \
+			       -group_def $report_def \
+			       -last_value_array_list $last_value_list \
+			       -level_of_detail $level_of_detail \
+			       -row_class $class \
+			       -cell_class $class 
+			  ]
 }
 
 im_report_display_footer \