Commit 18b7705a authored by Frank Bergmann's avatar Frank Bergmann

- Fixed ns_log Notice

parent 3bb832e0
...@@ -760,7 +760,7 @@ ad_proc im_absence_cube { ...@@ -760,7 +760,7 @@ ad_proc im_absence_cube {
if {[info exists absence_hash($key)]} { set value $absence_hash($key) } if {[info exists absence_hash($key)]} { set value $absence_hash($key) }
if {[info exists holiday_hash($date_date)]} { append value $holiday_hash($date_date) } if {[info exists holiday_hash($date_date)]} { append value $holiday_hash($date_date) }
append table_body [im_absence_cube_render_cell $value] append table_body [im_absence_cube_render_cell $value]
ns_log NOTICE "intranet-absences-procs::im_absence_cube_render_cell: $value" ns_log Notice "intranet-absences-procs::im_absence_cube_render_cell: $value"
} }
append table_body "</tr>\n" append table_body "</tr>\n"
incr row_ctr incr row_ctr
......
...@@ -229,7 +229,7 @@ for { set current_date $first_julian_date} { $current_date <= $last_julian_date ...@@ -229,7 +229,7 @@ for { set current_date $first_julian_date} { $current_date <= $last_julian_date
" "
set no_ts_approval_wf [db_string workflow_started_p $no_ts_approval_wf_sql -default "0"] set no_ts_approval_wf [db_string workflow_started_p $no_ts_approval_wf_sql -default "0"]
if { $confirm_timesheet_hours_p && ("monthly" == $confirmation_period || "weekly" == $confirmation_period) && 0 != $no_ts_approval_wf } { if { $confirm_timesheet_hours_p && ("monthly" == $confirmation_period || "weekly" == $confirmation_period) && 0 != $no_ts_approval_wf } {
ns_log NOTICE "TS: Entry blocked: Date: $current_date_ansi; Number: $no_ts_approval_wf; $no_ts_approval_wf_sql" ns_log Notice "TS: Entry blocked: Date: $current_date_ansi; Number: $no_ts_approval_wf; $no_ts_approval_wf_sql"
set timesheet_entry_blocked_p 1 set timesheet_entry_blocked_p 1
} }
} }
...@@ -244,7 +244,7 @@ for { set current_date $first_julian_date} { $current_date <= $last_julian_date ...@@ -244,7 +244,7 @@ for { set current_date $first_julian_date} { $current_date <= $last_julian_date
if { $timesheet_entry_blocked_p } { if { $timesheet_entry_blocked_p } {
set hours "<span class='log_hours'>[lang::message::lookup "" intranet-timesheet2.Nolog_Workflow_In_Progress "0 hours"]</span>" set hours "<span class='log_hours'>[lang::message::lookup "" intranet-timesheet2.Nolog_Workflow_In_Progress "0 hours"]</span>"
} else { } else {
ns_log NOTICE "TS: Not Blocked: $current_date" ns_log Notice "TS: Not Blocked: $current_date"
if { [string first $week_day $weekly_logging_days] != -1 } { if { [string first $week_day $weekly_logging_days] != -1 } {
set hours "<span class='log_hours'>[_ intranet-timesheet2.log_hours]</span>" set hours "<span class='log_hours'>[_ intranet-timesheet2.log_hours]</span>"
} }
...@@ -337,7 +337,7 @@ for { set current_date $first_julian_date} { $current_date <= $last_julian_date ...@@ -337,7 +337,7 @@ for { set current_date $first_julian_date} { $current_date <= $last_julian_date
set no_unconfirmed_hours [get_unconfirmed_hours_for_period $user_id_from_search $start_date_julian_wf $end_date_julian_wf] set no_unconfirmed_hours [get_unconfirmed_hours_for_period $user_id_from_search $start_date_julian_wf $end_date_julian_wf]
# ns_log NOTICE "Create weekly CONFIRM button: start: $start_date_julian_wf, end: $start_date_julian_wf, No. unconfirmed Hours $no_unconfirmed_hours, confirm: $confirm_timesheet_hours_p" # ns_log Notice "Create weekly CONFIRM button: start: $start_date_julian_wf, end: $start_date_julian_wf, No. unconfirmed Hours $no_unconfirmed_hours, confirm: $confirm_timesheet_hours_p"
if {$confirm_timesheet_hours_p && (0 < $no_unconfirmed_hours || "" != $no_unconfirmed_hours) } { if {$confirm_timesheet_hours_p && (0 < $no_unconfirmed_hours || "" != $no_unconfirmed_hours) } {
set base_url_confirm_wf "/intranet-timesheet2-workflow/conf-objects/new-timesheet-workflow" set base_url_confirm_wf "/intranet-timesheet2-workflow/conf-objects/new-timesheet-workflow"
set conf_url [export_vars -base $base_url_confirm_wf { {user_id $user_id_from_search} {start_date_julian $start_date_julian_wf} {end_date_julian $end_date_julian_wf } return_url}] set conf_url [export_vars -base $base_url_confirm_wf { {user_id $user_id_from_search} {start_date_julian $start_date_julian_wf} {end_date_julian $end_date_julian_wf } return_url}]
......
...@@ -836,7 +836,7 @@ template::multirow foreach hours_multirow { ...@@ -836,7 +836,7 @@ template::multirow foreach hours_multirow {
set last_level_shown $subproject_level set last_level_shown $subproject_level
} else { } else {
if { $level_entered_in_showing_child_elements >= $subproject_level} { if { $level_entered_in_showing_child_elements >= $subproject_level} {
# ns_log NOTICE "/intranet-timesheet2/www/hours/new:: Check for searchstring" # ns_log Notice "/intranet-timesheet2/www/hours/new:: Check for searchstring"
if { [string first [string tolower $search_task] [string tolower $project_name]] == -1 } { if { [string first [string tolower $search_task] [string tolower $project_name]] == -1 } {
set showing_child_elements_p 0 set showing_child_elements_p 0
set filter_surpress_output_p 1 set filter_surpress_output_p 1
...@@ -1190,7 +1190,7 @@ if { [empty_string_p results] } { ...@@ -1190,7 +1190,7 @@ if { [empty_string_p results] } {
</tr>\n" </tr>\n"
} }
set export_form_vars [export_vars -form {return_url julian_date user_id_from_search show_week_p}] set export_vars [export_vars -form {return_url julian_date user_id_from_search show_week_p}]
# --------------------------------------------------------- # ---------------------------------------------------------
...@@ -1224,7 +1224,7 @@ set left_navbar_html " ...@@ -1224,7 +1224,7 @@ set left_navbar_html "
</div> </div>
<form action=new method=GET> <form action=new method=GET>
<!-- don't include return_url in the export_form_vars, as it includes the old user --> <!-- don't include return_url in the export_vars, as it includes the old user -->
[export_vars -form {julian_date show_week_p}] [export_vars -form {julian_date show_week_p}]
<table border=0 cellpadding=1 cellspacing=1> <table border=0 cellpadding=1 cellspacing=1>
<tr> <tr>
......
...@@ -169,7 +169,7 @@ ad_proc im_do_row { ...@@ -169,7 +169,7 @@ ad_proc im_do_row {
set wf_status_list [wf_status_list $curr_owner_id $days $workflow_key] set wf_status_list [wf_status_list $curr_owner_id $days $workflow_key]
# wf_status_list list of lists {ansi-date status} # wf_status_list list of lists {ansi-date status}
# Example: {20120720 2} {20120719 2} {20120721 1} # Example: {20120720 2} {20120719 2} {20120721 1}
ns_log NOTICE "KHD: wf_status_list: $wf_status_list" ns_log Notice "KHD: wf_status_list: $wf_status_list"
foreach rec $wf_status_list { foreach rec $wf_status_list {
set wf_status_array([lindex [split $rec " "] 0]) [lindex [split $rec " "] 1] set wf_status_array([lindex [split $rec " "] 0]) [lindex [split $rec " "] 1]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment