Skip to content

I
intranet-timesheet2
Commit d7fb3484 authored by Frank Bergmann's avatar Frank Bergmann
Browse files
Options

- Gustaf changes

parent 18b7705a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 445 additions and 445 deletions
tcl/intranet-absences-procs.tcl
View file @ d7fb3484
......@@ -235,7 +235,7 @@ ad_proc im_timesheet_absences_sum {
and a.end_date >= d.d
"]
return [expr $num_absences * $hours_per_absence]
return [expr {$num_absences * $hours_per_absence}]
}
......@@ -318,7 +318,7 @@ ad_proc im_absence_new_page_wf_perm_edit_button {
]
ns_log Notice "im_absence_new_page_wf_perm_edit_button absence_id=$absence_id => $perm_set"
return [expr [lsearch $perm_set "w"] > -1]
return [expr {[lsearch $perm_set "w"] > -1}]
}
ad_proc im_absence_new_page_wf_perm_delete_button {
......@@ -339,7 +339,7 @@ ad_proc im_absence_new_page_wf_perm_delete_button {
ns_log Notice "im_absence_new_page_wf_perm_delete_button absence_id=$absence_id => $perm_set"
return [expr [lsearch $perm_set "d"] > -1]
return [expr {[lsearch $perm_set "d"] > -1}]
}
......@@ -455,18 +455,18 @@ ad_proc im_absence_mix_colors {
}
# Calculate the median
set r [expr $r / $len]
set g [expr $g / $len]
set b [expr $b / $len]
set r [expr {$r / $len}]
set g [expr {$g / $len}]
set b [expr {$b / $len}]
# Convert the RGB values back into a hex color string
set color ""
append color [lindex $hex_list [expr $r / 16]]
append color [lindex $hex_list [expr $r % 16]]
append color [lindex $hex_list [expr $g / 16]]
append color [lindex $hex_list [expr $g % 16]]
append color [lindex $hex_list [expr $b / 16]]
append color [lindex $hex_list [expr $b % 16]]
append color [lindex $hex_list [expr {$r / 16}]]
append color [lindex $hex_list [expr {$r % 16}]]
append color [lindex $hex_list [expr {$g / 16}]]
append color [lindex $hex_list [expr {$g % 16}]]
append color [lindex $hex_list [expr {$b / 16}]]
append color [lindex $hex_list [expr {$b % 16}]]
return $color
}
......@@ -604,7 +604,7 @@ ad_proc im_absence_cube {
}
}
set where_clause [join $criteria " and\n "]
if {![empty_string_p $where_clause]} {
if {$where_clause ne ""} {
set where_clause " and $where_clause"
}
......@@ -629,7 +629,7 @@ ad_proc im_absence_cube {
set date_month [lang::message::lookup "" intranet-timesheet2.$date_month $date_month]
if {$date_weekday == "Sat" || $date_weekday == "Sun"} { set holiday_hash($date_date) 5 }
if {$date_weekday eq "Sat" || $date_weekday eq "Sun"} { set holiday_hash($date_date) 5 }
lappend day_list [list $date_date $date_day_of_month $date_month $date_year]
}
......@@ -749,7 +749,7 @@ ad_proc im_absence_cube {
set row_ctr 0
set table_body ""
foreach user_tuple $user_list {
append table_body "<tr $bgcolor([expr $row_ctr % 2])>\n"
append table_body "<tr $bgcolor([expr {$row_ctr % 2}])>\n"
set user_id [lindex $user_tuple 0]
set user_name [lindex $user_tuple 1]
append table_body "<td><nobr><a href='[export_vars -base $user_url {user_id}]'>$user_name</a></td></nobr>\n"
......
tcl/intranet-calendar-procs.tcl
View file @ d7fb3484
This diff is collapsed.
tcl/intranet-timesheet2-procs.tcl
View file @ d7fb3484
......@@ -211,7 +211,7 @@ ad_proc -public im_timesheet_home_component {user_id} {
set expected_hours [parameter::get -package_id [im_package_timesheet2_id] -parameter "TimesheetRedirectNumHoursInDays" -default 32]
set available_perc [util_memoize [list db_string percent_available "select availability from im_employees where employee_id = $user_id" -default 100] 60]
if {"" == $available_perc} { set available_perc 100 }
set expected_hours [expr $expected_hours * $available_perc / 100]
set expected_hours [expr {$expected_hours * $available_perc / 100}]
set hours_html ""
set log_them_now_link "<a href=/intranet-timesheet2/hours/index>"
......@@ -225,7 +225,7 @@ ad_proc -public im_timesheet_home_component {user_id} {
}
set absences_hours_message ""
if { [expr $num_hours + $absences_hours] < $expected_hours && $add_hours } {
if { [expr {$num_hours + $absences_hours}] < $expected_hours && $add_hours } {
if {$absences_hours > 0} {
set absences_hours_message [lang::message::lookup "" \
......@@ -249,11 +249,11 @@ ad_proc -public im_timesheet_home_component {user_id} {
if {[im_permission $user_id view_hours_all]} {
append hours_html "
<ul>
<li><a href=/intranet-timesheet2/hours/projects?[export_vars -url {user_id}]>
<li><a href=/intranet-timesheet2/hours/[export_vars -base projects {user_id}]>
[_ intranet-timesheet2.lt_View_your_hours_on_al]</a>
<li><a href=/intranet-timesheet2/hours/total?[export_vars -url {}]>
<li><a href=/intranet-timesheet2/hours/[export_vars -base total {}]>
[_ intranet-timesheet2.lt_View_time_spent_on_al]</a>
<li><a href=/intranet-timesheet2/hours/projects?[export_vars -url {}]>
<li><a href=/intranet-timesheet2/hours/[export_vars -base projects {}]>
[_ intranet-timesheet2.lt_View_the_hours_logged]</a>
<li><a href=\"/intranet-timesheet2/weekly_report\">
[_ intranet-timesheet2.lt_View_hours_logged_dur]</a>
......@@ -347,7 +347,7 @@ ad_proc -public im_timesheet_project_component {user_id project_id} {
set expected_hours [parameter::get -package_id [im_package_timesheet2_id] -parameter "TimesheetRedirectNumHoursInDays" -default 32]
set available_perc [util_memoize [list db_string percent_available "select availability from im_employees where employee_id = $user_id" -default 100]]
if {"" == $available_perc} { set available_perc 100 }
set expected_hours [expr $expected_hours * $available_perc / 100]
set expected_hours [expr {$expected_hours * $available_perc / 100}]
set num_hours [im_timesheet_hours_sum -user_id $user_id -number_days $num_days]
if { $redirect_p && $num_hours < $expected_hours && $add_hours } {
......@@ -380,7 +380,7 @@ ad_proc -public im_timesheet_project_component {user_id project_id} {
}
if {![string equal "" $hours_logged]} {
if {$hours_logged ne ""} {
append hours_logged "</ul>\n"
}
append info_html "$hours_logged</ul>"
......@@ -530,7 +530,7 @@ ad_proc im_force_user_to_log_hours { conn args why } {
intranet. Sets state in session so user is only asked once
per session.
} {
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
if { ![im_enabled_p] || ![im_parameter TrackHours "" 0] } {
# intranet or hours-logging not turned on. Do nothing
......@@ -544,8 +544,8 @@ ad_proc im_force_user_to_log_hours { conn args why } {
set last_prompted_time [ad_get_client_property intranet user_asked_to_log_hours_p]
if { ![empty_string_p $last_prompted_time] && \
$last_prompted_time > [expr [ns_time] - 60*60*24] } {
if { $last_prompted_time ne "" && \
$last_prompted_time > [expr {[ns_time] - 60*60*24}] } {
# We have already asked the user in this session, within the last 24 hours,
# to log their hours
return filter_ok
......@@ -584,7 +584,7 @@ ad_proc im_force_user_to_log_hours { conn args why } {
# Pull up the screen to log hours for yesterday
set return_url [im_url_with_query]
ad_returnredirect "/intranet-timesheet2/hours/new?[export_vars -url {return_url julian_date}]"
ad_returnredirect [export_vars -base /intranet-timesheet2/hours/new {return_url julian_date}]
return filter_return
}
......@@ -633,7 +633,7 @@ ad_proc im_hours_for_user { user_id { html_p t } { number_days 7 } } {
}
append html_string " <li>$nice_day ($hours hours): &nbsp; <i>$note</i>\n"
append text_string " * $nice_day ($hours hours): $note\n"
set num_hours [expr $num_hours + $hours]
set num_hours [expr {$num_hours + $hours}]
}
# Let's get the punctuation right on days
......@@ -654,7 +654,7 @@ $text_string"
}
set ret $text_string
if {[string equal $html_p t]} { set ret $html_string }
if {$html_p == "t"} { set ret $html_string }
return $ret
}
......@@ -666,8 +666,8 @@ ad_proc -public im_hours_verify_user_id { { user_id "" } } {
} {
# Let's make sure the
set caller_id [ad_verify_and_get_user_id]
if { [empty_string_p $user_id] || $caller_id == $user_id } {
set caller_id [ad_conn user_id]
if { $user_id eq "" || $caller_id == $user_id } {
return $caller_id
}
# Only administrators can edit someone else's hours
......@@ -700,9 +700,9 @@ ad_proc -public calculate_absence_days {
if { ![string is double -strict $number_quarters] && ![string is integer -strict $number_quarters] } \
{ad_return_complaint 1 [lang::message::lookup "" intranet-timesheet2.numeric-validate_numeric_minutes "Invalid numeric value: Minutes"]}
set minutes_in_days [expr $number_quarters / ($hours_per_day*4.0) ]
set minutes_in_days [expr {$number_quarters / ($hours_per_day*4.0) }]
set hours_in_days [expr ($hours+0.0)/($hours_per_day+0.0)]
return [expr $days + $hours_in_days + $minutes_in_days]
return [expr {$days + $hours_in_days + $minutes_in_days}]
}
......@@ -717,9 +717,9 @@ ad_proc -public calculate_dd_hh_mm_from_day {
if { ![string is double -strict $hours_per_day] && ![string is integer -strict $hours_per_day] } \
{ad_return_complaint 1 [lang::message::lookup "" intranet-timesheet2.numeric-validate_numeric_hours "Invalid numeric value: Hours"]}
set number_days [expr int ($days)]
set number_days [expr {int ($days)}]
set number_hours [expr int ([expr ($days-$number_days+0.0)/(1.0/$hours_per_day)])]
set number_quarters [expr int ([expr [expr $days-$number_days-((1.0/$hours_per_day+0.0)*$number_hours)]/(1.0/($hours_per_day*4.0))])]
set number_quarters [expr int ([expr {[expr {$days-$number_days-((1.0/$hours_per_day+0.0)*$number_hours)}]/(1.0/($hours_per_day*4.0))}])]
set return_list [list]
lappend return_list $number_days
......
www/absences/capacity-planning-2.tcl
View file @ d7fb3484
......@@ -24,7 +24,7 @@ ad_page_contract {
set floating_point_helper ".0"
# Check Start & End-Date for correct format
if { ("" != $cap_month && ![regexp {^[0-9][0-9]$} $cap_month] && ![regexp {^[0-9]$} $cap_month]) || ("" != $cap_month && [lindex [split [expr $cap_month$floating_point_helper] "." ] 0 ] > 12) } {
if { ("" != $cap_month && ![regexp {^[0-9][0-9]$} $cap_month] && ![regexp {^[0-9]$} $cap_month]) || ("" != $cap_month && [lindex [split [expr {$cap_month$floating_point_helper}] "." ] 0 ] > 12) } {
ad_return_complaint 1 "Month doesn't have the right format.<br>
Current value: '$cap_month'<br>
Expected format: 'MM'"
......
www/absences/capacity-planning.adp
View file @ d7fb3484
<master src="/packages/intranet-core/www/master">
<property name="title">@page_title@</property>
<property name="context">@context@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="context">@context;literal@</property>
<property name="main_navbar_label">absences</property>
<property name="show_context_help_p">@show_context_help_p;noquote@</property>
<property name="show_context_help_p">@show_context_help_p;literal@</property>
<%= $table_header_html %>
<%= $table_body_html %>
......
www/absences/capacity-planning.tcl
View file @ d7fb3484
......@@ -34,7 +34,7 @@ ad_page_contract {
# Label: Provides the security context for this report
# because it identifies unquely the report's Menu and
# its permissions.
set current_user_id [ad_maybe_redirect_for_registration]
set current_user_id [auth::require_login]
set menu_label "capacity-planning"
set read_p [db_string report_perms "
......@@ -43,7 +43,7 @@ set read_p [db_string report_perms "
where m.label = :menu_label
" -default 'f']
if {![string equal "t" $read_p]} {
if {"t" ne $read_p } {
ad_return_complaint 1 "<li>
[lang::message::lookup "" intranet-reporting.You_dont_have_permissions "You don't have the necessary permissions to view this page"]"
return
......@@ -51,13 +51,13 @@ if {![string equal "t" $read_p]} {
proc round_down {val rounder} {
set nval [expr floor($val*$rounder) /$rounder]
set nval [expr {floor($val*$rounder) /$rounder}]
return $nval
}
# General settings
set show_context_help_p 1
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set page_title "Capacity Planning"
set context [list "Permissions"]
set subsite_id [ad_conn subsite_id]
......@@ -81,9 +81,9 @@ from dual
if { "" == $cap_month } {
if { 12 == $todays_month} {
set cap_month 1
set todays_year [expr $todays_year + 1]
set todays_year [expr {$todays_year + 1}]
} else {
set cap_month "[lindex [split [expr $todays_month$floating_point_helper + 1] "." ] 0 ]"
set cap_month "[lindex [split [expr {$todays_month$floating_point_helper + 1}] "." ] 0 ]"
}
}
......@@ -276,9 +276,9 @@ append table_main_html "</tbody></table></td>"
db_foreach projects_info_query $title_sql {
if { ![empty_string_p $workload] } {
set workload_formatted [expr [round_down [expr $workload / [concat $work_days$floating_point_helper]] 100 ] * 100]
set workload_formatted [string range $workload_formatted 0 [expr [string length $workload_formatted] - 3 ] ]
if { $workload ne "" } {
set workload_formatted [expr [round_down [expr {$workload / [concat $work_days$floating_point_helper]}] 100 ] * 100]
set workload_formatted [string range $workload_formatted 0 [string length $workload_formatted]-3]
} else {
set workload_formatted 0
set workload 0
......@@ -289,10 +289,10 @@ db_foreach projects_info_query $title_sql {
set workload_formatted "$workload_formatted%"
}
if { [expr $work_days-$workload] < 0} {
set capacity_formatted "<span style='color:red;font-weight:bold'>[expr $work_days-$workload]</span>"
if { [expr {$work_days-$workload}] < 0} {
set capacity_formatted "<span style='color:red;font-weight:bold'>[expr {$work_days-$workload}]</span>"
} else {
set capacity_formatted [expr $work_days-$workload]
set capacity_formatted [expr {$work_days-$workload}]
}
append table_main_html "<td valign='top'><table border=0 style='margin:3px' class='table_fixed_height'><tbody>\n"
......@@ -302,25 +302,25 @@ db_foreach projects_info_query $title_sql {
append table_main_html "<tr><td>$work_days</td></tr>\n"
append table_main_html "<tr><td>$vacation_days</td></tr>\n"
append table_main_html "<tr><td>$training_days</td></tr>\n"
append table_main_html "<tr><td>[expr $travel_days+$sick_days + $personal_days]</td></tr>\n"
append table_main_html "<tr><td><b>[expr $travel_days+$sick_days + $personal_days + $vacation_days + $training_days]</b></td></tr>\n"
append table_main_html "<tr><td>[expr {$travel_days+$sick_days + $personal_days}]</td></tr>\n"
append table_main_html "<tr><td><b>[expr {$travel_days+$sick_days + $personal_days + $vacation_days + $training_days}]</b></td></tr>\n"
append table_main_html "<tr><td>$workload</td></tr>\n"
append table_main_html "<tr><td><b>$capacity_formatted</b></td></tr>\n"
append table_main_html "<tbody></table></td>\n"
set employee_array($ctr_employees) $person_id
incr ctr_employees
set sum_workdays [expr $sum_workdays + $work_days ]
set sum_workload [expr $sum_workload + $workload ]
set sum_workdays [expr {$sum_workdays + $work_days }]
set sum_workload [expr {$sum_workload + $workload }]
}
append table_main_html "</tr>"
if { ![empty_string_p $sum_workload] && "0" != $sum_workdays } {
set sum_workload_ratio [expr [round_down [expr $sum_workload / [concat $sum_workdays$floating_point_helper]] 100 ] * 100]
set sum_workload_ratio [string range $sum_workload_ratio 0 [expr [string length $sum_workload_ratio] - 3 ] ]
if { $sum_workload ne "" && "0" != $sum_workdays } {
set sum_workload_ratio [expr [round_down [expr {$sum_workload / [concat $sum_workdays$floating_point_helper]}] 100 ] * 100]
set sum_workload_ratio [string range $sum_workload_ratio 0 [string length $sum_workload_ratio]-3]
} else {
set sum_workload_ratio 0
}
......@@ -492,9 +492,9 @@ set list_sort_order [parameter::get_from_package_key -package_key "intranet-time
set days_current_month [db_string days_current_month "SELECT date_part('day', '$cap_year-$cap_month-01' ::date + '1 month'::interval - '1 day'::interval)" -default 0]
if { "1" == $cap_month } {
set cap_month 12
set cap_year [expr $cap_year-1]
set cap_year [expr {$cap_year-1}]
} else {
set cap_month [expr $cap_month-1]
set cap_month [expr {$cap_month-1}]
}
set first_day_of_month ""
......@@ -508,7 +508,7 @@ set list_sort_order [parameter::get_from_package_key -package_key "intranet-time
# Compose the SQL
set where_clause [join $p_criteria " and\n\t\t\t\t\t"]
if { ![empty_string_p $where_clause] } {
if { $where_clause ne "" } {
set where_clause " and $where_clause"
}
......@@ -594,18 +594,18 @@ set list_sort_order [parameter::get_from_package_key -package_key "intranet-time
append table_body_html "<td colspan='1000'>&nbsp;</td></tr>\n"
db_foreach project_name $sql {
append table_body_html "<tr$bgcolor([expr $ctr % 2])>\n"
append table_body_html "<tr$bgcolor([expr {$ctr % 2}])>\n"
append table_body_html "<td><a href='$project_url$project_id'>$project_name_shortened</a></td>\n"
append table_body_html "<td>$lead_name</td>\n"
append table_body_html "<td>$start_date</td>\n"
append table_body_html "<td>$end_date</td>\n"
if { [empty_string_p $sum_planned_units] } { set sum_planned_units 0}
if { [empty_string_p $sum_logged_units] } { set sum_logged_units 0}
append table_body_html "<td align='center'>[format "%.2f" [expr {double(round(100*[expr $sum_planned_units - $sum_logged_units]))/100}]]</td>\n"
if { $sum_planned_units eq "" } { set sum_planned_units 0}
if { $sum_logged_units eq "" } { set sum_logged_units 0}
append table_body_html "<td align='center'>[format "%.2f" [expr {double(round(100*[expr {$sum_planned_units - $sum_logged_units}]))/100}]]</td>\n"
for { set i 1 } { $i <= $ctr_employees } { incr i } {
set cap_array_index [concat $employee_array([expr $i-1]).$project_id]
set cap_array_index [concat $employee_array([expr {$i-1}]).$project_id]
if { [info exists cap_array($cap_array_index)] } {
set cap_textbox_value $cap_array($cap_array_index)
} else {
......
www/absences/index.adp
View file @ d7fb3484
<master src="../../../intranet-core/www/master">
<property name="title">@page_title@</property>
<property name="context">@context@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="context">@context;literal@</property>
<property name="main_navbar_label">timesheet2_absences</property>
<property name="left_navbar">@left_navbar_html;noquote@</property>
<property name="left_navbar">@left_navbar_html;literal@</property>
<script type="text/javascript">
......
www/absences/index.tcl
View file @ d7fb3484
......@@ -49,15 +49,15 @@ ad_page_contract {
# 2. Defaults & Security
# ---------------------------------------------------------------
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
set current_user_id $user_id
set subsite_id [ad_conn subsite_id]
set add_absences_for_group_p [im_permission $user_id "add_absences_for_group"]
set add_absences_all_p [im_permission $user_id "add_absences_all"]
set view_absences_all_p [expr [im_permission $user_id "view_absences_all"] || $add_absences_all_p]
set view_absences_all_p [expr {[im_permission $user_id "view_absences_all"] || $add_absences_all_p}]
set add_absences_direct_reports_p [im_permission $user_id "add_absences_direct_reports"]
set view_absences_direct_reports_p [expr [im_permission $user_id "view_absences_direct_reports"] || $add_absences_direct_reports_p]
set view_absences_direct_reports_p [expr {[im_permission $user_id "view_absences_direct_reports"] || $add_absences_direct_reports_p}]
set add_absences_p [im_permission $user_id "add_absences"]
set org_absence_type_id $absence_type_id
set show_context_help_p 1
......@@ -153,12 +153,12 @@ foreach { value text } $timescale_types {
lappend timescale_type_list [list $text $value]
}
if { ![exists_and_not_null absence_type_id] } {
if { (![info exists absence_type_id] || $absence_type_id eq "") } {
# Default type is "all" == -1 - select the id once and memoize it
set absence_type_id -1;
}
set end_idx [expr $start_idx + $how_many - 1]
set end_idx [expr {$start_idx + $how_many - 1}]
set date_format "YYYY-MM-DD"
set date_time_format "YYYY-MM-DD HH24:MI"
......@@ -187,7 +187,7 @@ set column_sql "
"
db_foreach column_list_sql $column_sql {
if {$visible_for == "" || [eval $visible_for]} {
if {$visible_for eq "" || [eval $visible_for]} {
lappend column_headers "$column_name"
lappend column_vars "$column_render_tcl"
......@@ -278,7 +278,7 @@ switch $user_selection {
}
}
if { ![empty_string_p $absence_type_id] && $absence_type_id != -1 } {
if { $absence_type_id ne "" && $absence_type_id != -1 } {
lappend criteria "a.absence_type_id = :absence_type_id"
}
......@@ -344,7 +344,7 @@ switch $order_by {
}
set where_clause [join $criteria " and\n "]
if { ![empty_string_p $where_clause] } {
if { $where_clause ne "" } {
set where_clause " and $where_clause"
}
......@@ -475,7 +475,7 @@ append admin_html "<table cellpadding='5' cellspacing='5'>\n"
set index 0
db_foreach cols $col_sql {
if { "" == $aux_string2 } {
# set index [expr $category_id - 5000]
# set index [expr {$category_id - 5000}]
set col [lindex $color_list $index]
incr index
} else {
......@@ -503,7 +503,7 @@ db_foreach cols $col_sql {
}
# calculate a brightness-value for the color
# if brightness > 127 the foreground color is black, if < 127 the foreground color is white
set brightness [expr $r_bg * 0.2126 + $g_bg * 0.7152 + $b_bg * 0.0722]
set brightness [expr {$r_bg * 0.2126 + $g_bg * 0.7152 + $b_bg * 0.0722}]
set col_fg "fff"
if {$brightness >= 127} {set col_fg "000"}
set category_l10n [lang::message::lookup "" intranet-core.$category_key $category]
......@@ -518,7 +518,7 @@ append admin_html "</table>\n"
# ---------------------------------------------------------------
# Set up colspan to be the number of headers + 1 for the # column
set colspan [expr [llength $column_headers] + 1]
set colspan [expr {[llength $column_headers] + 1}]
# Format the header names with links that modify the
# sort order of the SQL query.
......@@ -526,7 +526,7 @@ set colspan [expr [llength $column_headers] + 1]
set table_header_html ""
set url "index?"
set query_string [export_ns_set_vars url [list order_by]]
if { ![empty_string_p $query_string] } {
if { $query_string ne "" } {
append url "$query_string&"
}
......@@ -537,7 +537,7 @@ foreach col $column_headers {
set wrench_html [lindex $column_headers_admin $ctr]
regsub -all " " $col "_" col_key
set col_txt [lang::message::lookup "" intranet-core.$col_key $col]
if { [string equal $order_by $col] } {
if {$order_by eq $col} {
append table_header_html " <td class=rowtitle>$col_txt$wrench_html</td>\n"
} else {
append table_header_html " <td class=rowtitle><a href=\"${url}order_by=[ns_urlencode $col]\">$col_txt</a>$wrench_html</td>\n"
......@@ -579,7 +579,7 @@ db_foreach absences_list $selection {
}
#Append together a line of data based on the "column_vars" parameter list
append table_body_html "<tr $bgcolor([expr $ctr % 2])>\n"
append table_body_html "<tr $bgcolor([expr {$ctr % 2}])>\n"
foreach column_var $column_vars {
append table_body_html "\t<td valign=top>"
set cmd "append table_body_html $column_var"
......@@ -596,7 +596,7 @@ db_foreach absences_list $selection {
}
# Show a reasonable message when there are no result rows:
if { [empty_string_p $table_body_html] } {
if { $table_body_html eq "" } {
set table_body_html "
<tr><td colspan=$colspan><ul><li><b>
[_ intranet-timesheet2.lt_There_are_currently_n]
......@@ -606,7 +606,7 @@ if { [empty_string_p $table_body_html] } {
if { $ctr == $how_many && $end_idx < $total_in_limited } {
# This means that there are rows that we decided not to return
# Include a link to go to the next page
set next_start_idx [expr $end_idx + 1]
set next_start_idx [expr {$end_idx + 1}]
set next_page_url "index?start_idx=$next_start_idx&[export_ns_set_vars url [list start_i\
dx]]"
} else {
......@@ -616,7 +616,7 @@ dx]]"
if { $start_idx > 0 } {
# This means we didn't start with the first row - there is
# at least 1 previous row. add a previous page link
set previous_start_idx [expr $start_idx - $how_many]
set previous_start_idx [expr {$start_idx - $how_many}]
if { $previous_start_idx < 0 } { set previous_start_idx 1 }
set previous_page_url "index?start_idx=$previous_start_idx&[export_ns_set_vars url [list start_idx]]"
} else {
......
www/absences/new.adp
View file @ d7fb3484
<if @enable_master_p@>
<master src="../../../intranet-core/www/master">
<property name="title">@page_title@</property>
<property name="@context@">@context;noquote@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="@context@">@context;literal@</property>
<property name="main_navbar_label">timesheet2_absences</property>
</if>
......
www/absences/new.tcl
View file @ d7fb3484
......@@ -29,7 +29,7 @@ if {![info exists enable_master_p]} { set enable_master_p 1}
# Default & Security
# ------------------------------------------------------------------
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set current_user_id $user_id
set action_url "/intranet-timesheet2/absences/new"
set cancel_url "/intranet-timesheet2/absences/index"
......@@ -67,8 +67,8 @@ if {[info exists absence_id]} {
"]
}
if {![exists_and_not_null absence_owner_id]} { set absence_owner_id $user_id_from_search }
if {![exists_and_not_null absence_owner_id]} { set absence_owner_id $current_user_id }
if {(![info exists absence_owner_id] || $absence_owner_id eq "")} { set absence_owner_id $user_id_from_search }
if {(![info exists absence_owner_id] || $absence_owner_id eq "")} { set absence_owner_id $current_user_id }
if {![info exists absence_id]} {
set page_title [lang::message::lookup "" intranet-timesheet2.New_Absence_Type "%absence_type%"]
......@@ -76,7 +76,7 @@ if {![info exists absence_id]} {
set page_title [lang::message::lookup "" intranet-timesheet2.Absence_absence_type "%absence_type%"]
}
if {[exists_and_not_null user_id_from_search]} {
if {([info exists user_id_from_search] && $user_id_from_search ne "")} {
set user_from_search_name [db_string name "select im_name_from_user_id(:user_id_from_search)" -default ""]
append page_title " "
append page_title [lang::message::lookup "" intranet-timesheet2.for_username " for %user_from_search_name%"]
......@@ -252,7 +252,7 @@ ad_form \
-cancel_url $cancel_url \
-action $action_url \
-actions $actions \
-has_edit [expr !$write] \
-has_edit [expr {!$write}] \
-mode $form_mode \
-export $hidden_field_list \
-form $form_fields
......@@ -336,7 +336,7 @@ ad_form -extend -name absence -on_request {
# Check the number of absence days per interval
set date_range_days [db_string date_range "select date($end_date_sql) - date($start_date_sql) + 1"]
if {$duration_days > [expr $date_range_days+1]} {
if {$duration_days > [expr {$date_range_days+1}]} {
ad_return_complaint 1 "<b>Date Range Error</b>:<br>Duration is longer then date interval."
ad_script_abort
}
......
www/absences/vacation-balance-component.adp
View file @ d7fb3484
......@@ -3,7 +3,7 @@
<table>
<!--
<tr class=rowtitle>
<td colspan=2 class=rowtitle><%= [lang::message::lookup "" intranet-timesheet2.Vacation_Balance "Vacation Balance"] %></td>
<td colspan="2" class=rowtitle><%= [lang::message::lookup "" intranet-timesheet2.Vacation_Balance "Vacation Balance"] %></td>
</tr>
-->
<tr class=roweven>
......
www/absences/vacation-balance-component.tcl
View file @ d7fb3484
......@@ -28,7 +28,7 @@
# 2. Defaults & Security
# ---------------------------------------------------------------
set current_user_id [ad_maybe_redirect_for_registration]
set current_user_id [auth::require_login]
set date_format "YYYY-MM-DD"
set package_key "intranet-timesheet2"
set view_absences_p [im_permission $current_user_id "view_absences"]
......@@ -119,7 +119,7 @@ set vacation_sql "
if {![info exists vacation_balance] || "" == $vacation_balance} { set vacation_balance 0 }
if {"" == $vacation_days_per_year} { set vacation_days_per_year 0 }
set vacation_days_left [expr $vacation_balance + $vacation_days_per_year]
set vacation_days_left [expr {$vacation_balance + $vacation_days_per_year}]
set vacation_days_taken 0
db_multirow -extend { absence_url absence_type } vacation_balance_multirow vacation_balance $vacation_sql {
......@@ -127,8 +127,8 @@ db_multirow -extend { absence_url absence_type } vacation_balance_multirow vacat
set absence_url [export_vars -base "$absence_base_url/new" {{form_mode display} absence_id}]
set absence_type [im_category_from_id $absence_type_id]
set vacation_days_taken [expr $vacation_days_taken + $duration_days]
set vacation_days_left [expr $vacation_days_left - $duration_days]
set vacation_days_taken [expr {$vacation_days_taken + $duration_days}]
set vacation_days_left [expr {$vacation_days_left - $duration_days}]
set duration_days [format "%.2f" $duration_days]
}
......@@ -167,8 +167,8 @@ list::create \
}
}
set start_of_next_year "[expr $current_year + 1]-01-01"
set end_of_next_year "[expr $current_year + 1]-12-31"
set start_of_next_year "[expr {$current_year + 1}]-01-01"
set end_of_next_year "[expr {$current_year + 1}]-12-31"
set vacation_days_next_year_sql "
......
www/absences/xhtml-vacation-balance-component.adp
View file @ d7fb3484
......@@ -3,7 +3,7 @@
<table>
<!--
<tr class=rowtitle>
<td colspan=2 class=rowtitle><%= [lang::message::lookup "" intranet-timesheet2.Vacation_Balance "Vacation Balance"] %></td>
<td colspan="2" class=rowtitle><%= [lang::message::lookup "" intranet-timesheet2.Vacation_Balance "Vacation Balance"] %></td>
</tr>
-->
<tr class=roweven>
......
www/absences/xhtml-vacation-balance-component.tcl
View file @ d7fb3484
......@@ -60,12 +60,12 @@ set current_year [db_string current_year "select to_char(now(), 'YYYY')"]
switch $period {
last_year {
set start_of_year "[expr $current_year - 1]-01-01"
set end_of_year "[expr $current_year - 1]-12-31"
set start_of_year "[expr {$current_year - 1}]-01-01"
set end_of_year "[expr {$current_year - 1}]-12-31"
}
next_year {
set start_of_year "[expr $current_year + 1]-01-01"
set end_of_year "[expr $current_year + 1]-12-31"
set start_of_year "[expr {$current_year + 1}]-01-01"
set end_of_year "[expr {$current_year + 1}]-12-31"
}
default {
set start_of_year "$current_year-01-01"
......@@ -144,7 +144,7 @@ set vacation_sql "
if {![info exists vacation_balance] || "" == $vacation_balance} { set vacation_balance 0 }
if {"" == $vacation_days_per_year} { set vacation_days_per_year 0 }
set vacation_days_left [expr $vacation_balance + $vacation_days_per_year]
set vacation_days_left [expr {$vacation_balance + $vacation_days_per_year}]
set vacation_days_taken 0
db_multirow -extend { absence_url absence_type } vacation_balance_multirow vacation_balance $vacation_sql {
......@@ -152,8 +152,8 @@ db_multirow -extend { absence_url absence_type } vacation_balance_multirow vacat
set absence_url [export_vars -base "$absence_base_url/new" {{form_mode display} absence_id}]
set absence_type [im_category_from_id $absence_type_id]
set vacation_days_taken [expr $vacation_days_taken + $duration_days]
set vacation_days_left [expr $vacation_days_left - $duration_days]
set vacation_days_taken [expr {$vacation_days_taken + $duration_days}]
set vacation_days_left [expr {$vacation_days_left - $duration_days}]
set duration_days [format "%.2f" $duration_days]
}
......
www/dedication_days_em.tcl
View file @ d7fb3484
......@@ -24,26 +24,26 @@ ad_page_contract {
{employee ""}
}
# user_id already validated by /intranet filters
set user_id [ad_verify_and_get_user_id]
set user_id [ad_conn user_id]
set user_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
set date_format "YYYY-MM-DD"
set form [ns_conn form]
if {[empty_string_p $form]} {
if {$form eq ""} {
set form [ns_set new]
}
set start [validate_ad_dateentrywidget from_date from_date $form allownull]
if { [empty_string_p $start] } {
if { $start eq "" } {
set start "2000-01-01"
}
set end [validate_ad_dateentrywidget to_date to_date $form allownull]
if { [empty_string_p $end] } {
if { $end eq "" } {
set end [db_string sysdate \
"select to_char(sysdate,'YYYY-MM-DD') from dual"]
}
if { ![empty_string_p $employee] } {
if { $employee ne "" } {
append sql_employee " select u.user_id as employee_id, \
SUBSTR(u.email, 0, INSTR(u.email,'@')-1) as name \
from USERS u \
......@@ -115,10 +115,10 @@ db_foreach employees $sql_employee {
db_foreach get_user_projects $sql_query {
append page_body "<tr>"
if { $rownum == "1" } {
append page_body "<td class=row[expr $rownum%2]><b>$name</b></td>"
if { $rownum == 1 } {
append page_body "<td class=row[expr {$rownum%2}]><b>$name</b></td>"
} else {
append page_body "<td class=row[expr $rownum%2]>&nbsp;</td>"
append page_body "<td class=row[expr {$rownum%2}]>&nbsp;</td>"
}
set days [db_string g_days "select TO_CHAR(NVL(field_value,0),'999990D9') \
......@@ -137,10 +137,10 @@ db_foreach employees $sql_employee {
and user_id=:employee_id \
and day between to_date('$start',:date_format)
and to_date('$end',:date_format)" -default "0.0"]
set days_diff [expr $days - $real_days]
set cost [format "%0.0f" [expr $days * $day_cost]]
set real_cost [format "%0.0f" [expr $real_days * $day_cost]]
set cost_diff [format "%0.0f" [expr $cost - $real_cost]]
set days_diff [expr {$days - $real_days}]
set cost [format "%0.0f" [expr {$days * $day_cost}]]
set real_cost [format "%0.0f" [expr {$real_days * $day_cost}]]
set cost_diff [format "%0.0f" [expr {$cost - $real_cost}]]
if { $days_diff < 0 } {
set days_diff_color " style=\"color:red\" "
} else {
......@@ -151,38 +151,38 @@ db_foreach employees $sql_employee {
} else {
set cost_diff_color " style=\"color:blue\" "
}
if { $days == "0" } {
if { $days == 0 } {
set per_days "NaN"
} else {
set per_days [format "%0.2f" [expr [expr $days_diff / $days] * 100]]%
set per_days [format "%0.2f" [expr {[expr {$days_diff / $days}] * 100}]]%
}
if { $cost == "0" } {
if { $cost == 0 } {
set per_cost "NaN"
} else {
set per_cost [format "%0.2f" [expr [expr $cost_diff.0 / $cost] * 100]]%
set per_cost [format "%0.2f" [expr {[expr {$cost_diff.0 / $cost}] * 100}]]%
}
append page_body "
<td class=row[expr $rownum%2]>$pr_name</td>
<td class=row[expr $rownum%2] align=right>$days</td>
<td class=row[expr $rownum%2] align=right>$real_days</td>
<td class=row[expr $rownum%2] align=right $days_diff_color>$days_diff</td>
<td class=row[expr $rownum%2] align=right $days_diff_color>$per_days</td>
<td class=row[expr $rownum%2]>&nbsp;</td>
<td class=row[expr $rownum%2] align=right>$cost</td>
<td class=row[expr $rownum%2] align=right>$real_cost</td>
<td class=row[expr $rownum%2] align=right $cost_diff_color>$cost_diff</td>
<td class=row[expr $rownum%2] align=right $cost_diff_color>$per_cost</td>
<td class=row[expr {$rownum%2}]>$pr_name</td>
<td class=row[expr {$rownum%2}] align=right>$days</td>
<td class=row[expr {$rownum%2}] align=right>$real_days</td>
<td class=row[expr {$rownum%2}] align=right $days_diff_color>$days_diff</td>
<td class=row[expr {$rownum%2}] align=right $days_diff_color>$per_days</td>
<td class=row[expr {$rownum%2}]>&nbsp;</td>
<td class=row[expr {$rownum%2}] align=right>$cost</td>
<td class=row[expr {$rownum%2}] align=right>$real_cost</td>
<td class=row[expr {$rownum%2}] align=right $cost_diff_color>$cost_diff</td>
<td class=row[expr {$rownum%2}] align=right $cost_diff_color>$per_cost</td>
</tr>"
set sum_days [expr $sum_days + $days]
set sum_cost [expr $sum_cost + $cost]
set sum_real_days [expr $sum_real_days + $real_days]
set sum_real_cost [expr $sum_real_cost + $real_cost]
set sum_days [expr {$sum_days + $days}]
set sum_cost [expr {$sum_cost + $cost}]
set sum_real_days [expr {$sum_real_days + $real_days}]
set sum_real_cost [expr {$sum_real_cost + $real_cost}]
}
set sum_days_diff [expr $sum_days - $sum_real_days]
set sum_cost_diff [expr $sum_cost - $sum_real_cost]
set sum_days_diff [expr {$sum_days - $sum_real_days}]
set sum_cost_diff [expr {$sum_cost - $sum_real_cost}]
if { $sum_days_diff < 0 } {
set sum_days_color " style=\"color:red\" "
} else {
......@@ -193,15 +193,15 @@ db_foreach employees $sql_employee {
} else {
set sum_cost_color ""
}
if { $sum_days == "0" } {
if { $sum_days == 0 } {
set per_sum_days "NaN"
} else {
set per_sum_days [format "%0.2f" [expr [expr $sum_days_diff / $sum_days] * 100]]%
set per_sum_days [format "%0.2f" [expr {[expr {$sum_days_diff / $sum_days}] * 100}]]%
}
if { $sum_cost == "0" } {
if { $sum_cost == 0 } {
set per_sum_cost "NaN"
} else {
set per_sum_cost [format "%0.2f" [expr [expr $sum_cost_diff.0 / $sum_cost] * 100]]%
set per_sum_cost [format "%0.2f" [expr {[expr {$sum_cost_diff.0 / $sum_cost}] * 100}]]%
}
append page_body "
......
www/dedication_days_pr.tcl
View file @ d7fb3484
......@@ -26,27 +26,27 @@ ad_page_contract {
{ report_pr_p "" }
}
# user_id already validated by /intranet filters
set user_id [ad_verify_and_get_user_id]
set user_id [ad_conn user_id]
set user_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
set date_format "YYYY-MM-DD"
set form [ns_conn form]
if {[empty_string_p $form]} {
if {$form eq ""} {
set form [ns_set new]
}
set start [validate_ad_dateentrywidget from_date from_date $form allownull]
if { [empty_string_p $start] } {
if { $start eq "" } {
set start "2000-01-01"
}
set end [validate_ad_dateentrywidget to_date to_date $form allownull]
if { [empty_string_p $end] } {
if { $end eq "" } {
set end [db_string sysdate \
"select to_char(sysdate,'YYYY-MM-DD') from dual"]
}
# Default status is OPEN - with the id '77'
if { $report_pr_p == "y" } {
if { $report_pr_p eq "y" } {
set sql_filters " and pr.project_status_id = '77' \
and pr.requires_report_p = 't'"
set check "checked"
......@@ -99,7 +99,7 @@ $pr_filter <br>
db_release_unused_handles
if { ![empty_string_p $project] } {
if { $project ne "" } {
set sql_filters " and pr.group_id=:project"
set project_id $project
}
......@@ -128,10 +128,10 @@ db_foreach projects $sql_projects {
db_foreach get_user_projects $sql_query {
append page_body "<tr>"
if { $rownum == "1" } {
append page_body "<td class=row[expr $rownum%2]><b>$project_name</b></td>"
if { $rownum == 1 } {
append page_body "<td class=row[expr {$rownum%2}]><b>$project_name</b></td>"
} else {
append page_body "<td class=row[expr $rownum%2]>&nbsp;</td>"
append page_body "<td class=row[expr {$rownum%2}]>&nbsp;</td>"
}
set days [db_string g_days "select TO_CHAR(NVL(field_value,0),'999990D9') \
......@@ -151,10 +151,10 @@ db_foreach projects $sql_projects {
and day between to_date('$start',:date_format)
and to_date('$end',:date_format)" -default "0.0"]
set days_diff [expr $days - $real_days]
set cost [format "%0.0f" [expr $days * $day_cost]]
set real_cost [format "%0.0f" [expr $real_days * $day_cost]]
set cost_diff [format "%0.0f" [expr $cost - $real_cost]]
set days_diff [expr {$days - $real_days}]
set cost [format "%0.0f" [expr {$days * $day_cost}]]
set real_cost [format "%0.0f" [expr {$real_days * $day_cost}]]
set cost_diff [format "%0.0f" [expr {$cost - $real_cost}]]
if { $days_diff < 0 } {
set days_diff_color " style=\"color:red\" "
......@@ -166,38 +166,38 @@ db_foreach projects $sql_projects {
} else {
set cost_diff_color " style=\"color:blue\" "
}
if { $days == "0" } {
if { $days == 0 } {
set per_days "NaN"
} else {
set per_days [format "%0.2f" [expr [expr $days_diff / $days] * 100]]%
set per_days [format "%0.2f" [expr {[expr {$days_diff / $days}] * 100}]]%
}
if { $cost == "0" } {
if { $cost == 0 } {
set per_cost "NaN"
} else {
set per_cost [format "%0.2f" [expr [expr $cost_diff.0 / $cost] * 100]]%
set per_cost [format "%0.2f" [expr {[expr {$cost_diff.0 / $cost}] * 100}]]%
}
append page_body "
<td class=row[expr $rownum%2]>$emp_name</td>
<td class=row[expr $rownum%2] align=right>$days</td>
<td class=row[expr $rownum%2] align=right>$real_days</td>
<td class=row[expr $rownum%2] align=right $days_diff_color>$days_diff</td>
<td class=row[expr $rownum%2] align=right $days_diff_color>$per_days</td>
<td class=row[expr $rownum%2]>&nbsp;</td>
<td class=row[expr $rownum%2] align=right>$cost</td>
<td class=row[expr $rownum%2] align=right>$real_cost</td>
<td class=row[expr $rownum%2] align=right $cost_diff_color>$cost_diff</td>
<td class=row[expr $rownum%2] align=right $cost_diff_color>$per_cost</td>
<td class=row[expr {$rownum%2}]>$emp_name</td>
<td class=row[expr {$rownum%2}] align=right>$days</td>
<td class=row[expr {$rownum%2}] align=right>$real_days</td>
<td class=row[expr {$rownum%2}] align=right $days_diff_color>$days_diff</td>
<td class=row[expr {$rownum%2}] align=right $days_diff_color>$per_days</td>
<td class=row[expr {$rownum%2}]>&nbsp;</td>
<td class=row[expr {$rownum%2}] align=right>$cost</td>
<td class=row[expr {$rownum%2}] align=right>$real_cost</td>
<td class=row[expr {$rownum%2}] align=right $cost_diff_color>$cost_diff</td>
<td class=row[expr {$rownum%2}] align=right $cost_diff_color>$per_cost</td>
</tr>"
set sum_days [expr $sum_days + $days]
set sum_cost [expr $sum_cost + $cost]
set sum_real_days [expr $sum_real_days + $real_days]
set sum_real_cost [expr $sum_real_cost + $real_cost]
set sum_days [expr {$sum_days + $days}]
set sum_cost [expr {$sum_cost + $cost}]
set sum_real_days [expr {$sum_real_days + $real_days}]
set sum_real_cost [expr {$sum_real_cost + $real_cost}]
}
set sum_days_diff [expr $sum_days - $sum_real_days]
set sum_cost_diff [expr $sum_cost - $sum_real_cost]
set sum_days_diff [expr {$sum_days - $sum_real_days}]
set sum_cost_diff [expr {$sum_cost - $sum_real_cost}]
if { $sum_days_diff < 0 } {
set sum_days_color " style=\"color:red\" "
} else {
......@@ -208,15 +208,15 @@ db_foreach projects $sql_projects {
} else {
set sum_cost_color ""
}
if { $sum_days == "0" } {
if { $sum_days == 0 } {
set per_sum_days "NaN"
} else {
set per_sum_days [format "%0.2f" [expr [expr $sum_days_diff / $sum_days] * 100]]%
set per_sum_days [format "%0.2f" [expr {[expr {$sum_days_diff / $sum_days}] * 100}]]%
}
if { $sum_cost == "0" } {
if { $sum_cost == 0 } {
set per_sum_cost "NaN"
} else {
set per_sum_cost [format "%0.2f" [expr [expr $sum_cost_diff.0 / $sum_cost] * 100]]%
set per_sum_cost [format "%0.2f" [expr {[expr {$sum_cost_diff.0 / $sum_cost}] * 100}]]%
}
append page_body "
......
www/hours/full.adp
View file @ d7fb3484
<master src="../../../intranet-core/www/master">
<property name="title">@page_title;noquote@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="context">#intranet-timesheet2.context#</property>
<property name="main_navbar_label">timesheet2_timesheet</property>
......
www/hours/full.tcl
View file @ d7fb3484
......@@ -30,7 +30,7 @@ ad_page_contract {
}
set current_user_id [ad_maybe_redirect_for_registration]
set current_user_id [auth::require_login]
# Has the current user the right to edit all timesheet information?
set edit_timesheet_p [im_permission $current_user_id "add_hours_all"]
......@@ -45,7 +45,7 @@ if {!$view_ours_all_p} {
set return_url [im_url_with_query]
if { [empty_string_p $user_id] && ($current_user_id != 0) } {
if { $user_id eq "" && ($current_user_id != 0) } {
set looking_at_self_p 1
set user_id $current_user_id
} else {
......@@ -58,7 +58,7 @@ if { [empty_string_p $user_id] && ($current_user_id != 0) } {
set user_name [db_string user_name "select im_name_from_user_id(:user_id) from dual"]
if { ![empty_string_p $item] } {
if { $item ne "" } {
set page_title "[_ intranet-timesheet2.lt_Units_on_item_by_user]"
} else {
set page_title "[_ intranet-timesheet2.Units_by_user_name]"
......@@ -118,19 +118,19 @@ db_foreach hours_on_project $sql {
}
append page_body "<p><li>$pretty_day <br><em>$hours_units</em>\n"
set total_hours_on_project [expr $total_hours_on_project + $hours]
set total_hours_on_project [expr {$total_hours_on_project + $hours}]
if {$view_finance_p && ![empty_string_p $amount_earned]} {
if {$view_finance_p && $amount_earned ne ""} {
append page_body " (${currency} [format %4.2f $billing_rate]/hour = ${currency} [format %4.2f $amount_earned])"
set hourly_bill [expr $hourly_bill + $amount_earned]
set total_hours_billed_hourly [expr $total_hours_billed_hourly + $hours]
set hourly_bill [expr {$hourly_bill + $amount_earned}]
set total_hours_billed_hourly [expr {$total_hours_billed_hourly + $hours}]
}
if {$edit_timesheet_p} {
set note "<a href=\"[export_vars -base "/intranet-timesheet2/hours/one" {{julian_date $j_day} user_id {project_id $hours_project_id} return_url}]\">$note</a>\n"
}
if ![empty_string_p $note] {
if {$note ne ""} {
append page_body "<blockquote>$note</blockquote>"
}
}
......
www/hours/history.tcl
View file @ d7fb3484
......@@ -38,18 +38,18 @@ ad_page_contract {
}
set form [ns_conn form]
if {[empty_string_p $form]} {
if {$form eq ""} {
set form [ns_set new]
}
set from [validate_ad_dateentrywidget "" from_date $form allownull]
if { [empty_string_p $from] } {
if { $from eq "" } {
set from [db_string sysdate \
"select to_char(add_months(sysdate,-3),'YYYY-MM-DD') from dual"]
}
set ending [validate_ad_dateentrywidget "" to_date $form allownull]
if { [empty_string_p $ending] } {
if { $ending eq "" } {
set ending [db_string sysdate \
"select to_char(sysdate,'YYYY-MM-DD') from dual"]
}
......@@ -115,7 +115,7 @@ function prj_List() {
# append project_select "<input type=radio name=on_what_id value=$group_id>$group_name\n"
# }
# incr colno
# if {[expr $colno % $columns]==0} {
# if {[expr {$colno % $columns}]==0} {
# append project_select "<br>"
# }
# }
......@@ -156,10 +156,10 @@ set selection_block "
</form>"
doc_body_append $selection_block
doc_set_property author "koljalehmann@uni.de"
doc_set_property navbar [list [list index?[export_vars -url {on_which_table}] "[_ intranet-timesheet2.Your_hours]"] "[_ intranet-timesheet2.Project_History]"]
doc_set_property navbar [list [[export_vars -base index -url {on_which_table}] "[_ intranet-timesheet2.Your_hours]"] "[_ intranet-timesheet2.Project_History]"]
doc_set_property title "[_ intranet-timesheet2.View_History]"
if {[empty_string_p [ns_conn form]] || [empty_string_p $on_what_id]} {
if {[ns_conn form] eq "" || $on_what_id eq ""} {
return
} else {
doc_body_append "
......@@ -208,7 +208,7 @@ while {$inter_date<$ending} {
}
}
set last_date [lindex $inter_dates [expr [llength $inter_dates] - 1]]
set last_date [lindex $inter_dates [llength $inter_dates]-1]
db_1row pretty_start_end_time "select to_char(to_date(:last_date,'YYYY-MM-DD'),'DD. Mon YY') as pretty_start,
to_char(to_date(:ending,'YYYY-MM-DD'),'DD. Mon YY') as pretty_end,
(to_date(:ending,'YYYY-MM-DD')-to_date(:last_date,'YYYY-MM-DD')+1) as days from dual"
......@@ -229,7 +229,7 @@ foreach end_time $inter_dates {
h.day >= to_date('$begin_time','YYYY-MM-DD') and
h.day < to_date('$end_time','YYYY-MM-DD')
group by user_id" {
if {[lsearch -exact $user_id_list $user_id]==-1} {
if {$user_id ni $user_id_list} {
lappend user_id_list $user_id
}
set table_data($end_time.$user_id) $hours
......@@ -237,7 +237,7 @@ foreach end_time $inter_dates {
set begin_time $end_time
}
if {[empty_string_p $user_id_list]} {
if {$user_id_list eq ""} {
doc_body_append "[_ intranet-timesheet2.lt_No_hours_logged_on_pr]"
return
}
......@@ -268,8 +268,8 @@ foreach user_id $user_id_list {
foreach end_time $inter_dates {
doc_body_append "
<td align=right>[export_var table_data($end_time.$user_id) "0"]"
set rowsum [expr $rowsum + [export_var table_data($end_time.$user_id) 0]]
set colsum($end_time) [expr $colsum($end_time) + [export_var table_data($end_time.$user_id) 0]]
set rowsum [expr {$rowsum + [export_var table_data($end_time.$user_id) 0]}]
set colsum($end_time) [expr {$colsum($end_time) + [export_var table_data($end_time.$user_id) 0]}]
}
doc_body_append "<th align=right>$rowsum</tr>"
}
......@@ -279,7 +279,7 @@ doc_body_append "<tr><th>[_ intranet-timesheet2.lt_Full_Time_Equivalents]"
foreach end_time $inter_dates {
doc_body_append "<th>[format "%4.0f"\
[expr ($colsum($end_time) * 700) / ($interval_length($end_time) * $based)]]% </th>"
set total [expr $total + $colsum($end_time)]
set total [expr {$total + $colsum($end_time)}]
}
doc_body_append "<th>$total</tr></table>"
......
www/hours/index.adp
View file @ d7fb3484
<master src="../../../intranet-core/www/master">
<property name="title">@page_title;noquote@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="context">#intranet-timesheet2.context#</property>
<property name="main_navbar_label">timesheet2_timesheet</property>
<property name="left_navbar">@left_navbar_html;noquote@</property>
<property name="left_navbar">@left_navbar_html;literal@</property>
<if "" ne @message@>
<h1>@header@</h1>
......
www/hours/index.tcl
View file @ d7fb3484
......@@ -44,7 +44,7 @@ ad_page_contract {
# Security & Defaults
# ---------------------------------------------------------------
set current_user_id [ad_maybe_redirect_for_registration]
set current_user_id [auth::require_login]
set add_hours_all_p [im_permission $current_user_id "add_hours_all"]
set add_hours_direct_reports_p [im_permission $current_user_id "add_hours_direct_reports"]
......@@ -80,7 +80,7 @@ if {[string is integer $user_id_from_search]} {
if {"" == $return_url} {
set return_url [ns_conn url]
set query [export_ns_set_vars url {header message}]
if {![empty_string_p $query]} {
if {$query ne ""} {
append return_url "?$query"
}
}
......@@ -236,10 +236,10 @@ for { set current_date $first_julian_date} { $current_date <= $last_julian_date
# User's hours for the day
set hours ""
if { [info exists users_hours($current_date)] && ![empty_string_p $users_hours($current_date)] } {
if { [info exists users_hours($current_date)] && $users_hours($current_date) ne "" } {
set hours "$users_hours($current_date) [lang::message::lookup "" intranet-timesheet2.hours "hours"]"
set hours_for_this_week [expr $hours_for_this_week + $users_hours($current_date)]
set hours_for_this_month [expr $hours_for_this_month + $users_hours($current_date)]
set hours_for_this_week [expr {$hours_for_this_week + $users_hours($current_date)}]
set hours_for_this_month [expr {$hours_for_this_month + $users_hours($current_date)}]
} else {
if { $timesheet_entry_blocked_p } {
set hours "<span class='log_hours'>[lang::message::lookup "" intranet-timesheet2.Nolog_Workflow_In_Progress "0 hours"]</span>"
......@@ -255,8 +255,8 @@ for { set current_date $first_julian_date} { $current_date <= $last_julian_date
if {![info exists unconfirmed_hours($current_date)]} { set unconfirmed_hours($current_date) "" }
if {"" == $unconfirmed_hours($current_date)} { set unconfirmed_hours($current_date) 0 }
set unconfirmed_hours_for_this_week [expr $unconfirmed_hours_for_this_week + $unconfirmed_hours($current_date)]
set unconfirmed_hours_for_this_month [expr $unconfirmed_hours_for_this_month + $unconfirmed_hours($current_date)]
set unconfirmed_hours_for_this_week [expr {$unconfirmed_hours_for_this_week + $unconfirmed_hours($current_date)}]
set unconfirmed_hours_for_this_month [expr {$unconfirmed_hours_for_this_month + $unconfirmed_hours($current_date)}]
# User's Absences for the day
set curr_absence [lindex $absence_list $absence_index]
......@@ -325,13 +325,13 @@ for { set current_date $first_julian_date} { $current_date <= $last_julian_date
# Include link for weekly TS confirmation
# Monthly confirmation_period not supported yet, always assume weekly
# if { [string equal $confirmation_period "weekly"] && $confirm_timesheet_hours_p } {}
# if { $confirmation_period eq "weekly" && $confirm_timesheet_hours_p } {}
if {$confirm_timesheet_hours_p} {
if { !$fill_up_first_last_row_p } {
set start_date_julian_wf [eval_wf_start_date $current_date $column_ctr]
set end_date_julian_wf $current_date
} else {
set start_date_julian_wf [expr $current_date - 6]
set start_date_julian_wf [expr {$current_date - 6}]
set end_date_julian_wf $current_date
}
......@@ -371,11 +371,11 @@ for { set current_date $first_julian_date} { $current_date <= $last_julian_date
set prev_month_template "
<font color=white>&lt;</font>
<a href=\"index?[export_vars -url {user_id_from_search}]&date=\$ansi_date\">
<a href=\"[export_vars -base index {user_id_from_search}]&date=\$ansi_date\">
<font color=white>\[_ intranet-timesheet2.$prev_month_name] </font>
</a>"
set next_month_template "
<a href=\"index?[export_vars -url {user_id_from_search}]&date=\$ansi_date\">
<a href=\"[export_vars -base index {user_id_from_search}]&date=\$ansi_date\">
<font color=white>\[_ intranet-timesheet2.$next_month_name]</font>
</a>
<font color=white>&gt;</font>"
......@@ -475,7 +475,7 @@ if {$add_absences_p} {
"
}
if {![empty_string_p $return_url] && ![regexp {^/intranet-timesheet2/hours/index} $return_url]} {
if {$return_url ne "" && ![regexp {^/intranet-timesheet2/hours/index} $return_url]} {
append left_navbar_html "
<li><a href='$return_url'>#intranet-timesheet2.lt_Return_to_previous_pa#</a></li>
"
......
www/hours/new-2.tcl
View file @ d7fb3484
......@@ -53,7 +53,7 @@ ad_page_contract {
# Security / setting user
# ----------------------------------------------------------
set current_user_id [ad_maybe_redirect_for_registration]
set current_user_id [auth::require_login]
set add_hours_p [im_permission $current_user_id "add_hours"]
set add_hours_all_p [im_permission $current_user_id "add_hours_all"]
set add_hours_direct_reports_p [im_permission $current_user_id "add_hours_direct_reports"]
......@@ -92,7 +92,7 @@ set max_hours_per_day [parameter::get_from_package_key -package_key intranet-tim
# Conversion factor to calculate days from hours. Make sure it's a float number.
set hours_per_day [parameter::get_from_package_key -package_key intranet-timesheet2 -parameter TimesheetHoursPerDay -default 10]
set hours_per_day [expr $hours_per_day * 1.0]
set hours_per_day [expr {$hours_per_day * 1.0}]
# Other
set limit_to_one_day_per_main_project_p [parameter::get_from_package_key -package_key intranet-timesheet2 -parameter TimesheetLimitToOneDayPerUserAndMainProjectP -default 1]
......@@ -198,7 +198,7 @@ if {!$show_week_p} { set weekly_logging_days [list 0]}
set i 0
foreach j $weekly_logging_days {
set day_julian [expr $julian_date+$i]
set day_julian [expr {$julian_date+$i}]
ns_log Notice "hours/new2: day=$i: ----------- day_julian=$day_julian -----------"
array unset database_hours_hash
......@@ -307,14 +307,14 @@ foreach j $weekly_logging_days {
"]"
ad_script_abort
}
set total_screen_hours [expr $total_screen_hours + $screen_hours]
set total_screen_hours [expr {$total_screen_hours + $screen_hours}]
}
# Determine the action to take on the database items from comparing database vs. screen
set action error
if {$db_hours == "" && $screen_hours != ""} { set action insert }
if {$db_hours != "" && $screen_hours == ""} { set action delete }
if {$db_hours != "" && $screen_hours != ""} { set action update }
if {$db_hours eq "" && $screen_hours ne ""} { set action insert }
if {$db_hours ne "" && $screen_hours eq ""} { set action delete }
if {$db_hours ne "" && $screen_hours ne ""} { set action update }
if {$db_hours == $screen_hours} { set action skip }
......@@ -395,7 +395,7 @@ foreach j $weekly_logging_days {
# Calculate worked days based on worked hours
set days_worked ""
if {"" != $hours_worked} {
set days_worked [expr $hours_worked / $hours_per_day]
set days_worked [expr {$hours_worked / $hours_per_day}]
}
set action $action_hash($project_id)
......@@ -501,7 +501,7 @@ foreach j $weekly_logging_days {
# We now need to cut all logged _days_ (not hours...) by
# the factor sum(hour)/$hours_per_day so that at the end we
# will get exactly one day logged to the main project.
set correction_factor [expr $hours_per_day/$correction_hours]
set correction_factor [expr {$hours_per_day/$correction_hours}]
db_dml appy_correction_factor "
update im_hours set days = days * :correction_factor
......@@ -530,7 +530,7 @@ foreach j $weekly_logging_days {
# Notify supervisor about modified hours in the past
# ----------------------------------------------------------
if {$wf_installed_p && [llength [array names modified_projects_hash]] > 0} {
if {$wf_installed_p && [array size modified_projects_hash] > 0} {
set notify_supervisor_p [parameter::get_from_package_key -package_key intranet-timesheet2-workflow -parameter "NotifySupervisorDeleteConfObjectP" -default 0]
if {$notify_supervisor_p} {
set uid $user_id_from_search
......@@ -606,10 +606,10 @@ if {$sync_cost_item_immediately_p} {
# Where to go from here?
# ----------------------------------------------------------
if { ![empty_string_p $return_url] } {
if { $return_url ne "" } {
ns_log Notice "ad_returnredirect $return_url"
ad_returnredirect $return_url
} else {
ns_log Notice "ad_returnredirect index?[export_vars -url {julian_date}]"
ad_returnredirect index?[export_vars -url {julian_date}]
ns_log Notice "ad_returnredirect [export_vars -base index {julian_date}]"
ad_returnredirect [export_vars -base index {julian_date}]
}
www/hours/new.adp
View file @ d7fb3484
<master>
<property name="title">@page_title@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="context">#intranet-timesheet2.context#</property>
<property name="main_navbar_label">timesheet2_timesheet</property>
<property name="left_navbar">@left_navbar_html;noquote@</property>
<property name="show_context_help_p">@show_context_help_p;noquote@</property>
<property name="left_navbar">@left_navbar_html;literal@</property>
<property name="show_context_help_p">@show_context_help_p;literal@</property>
<%= [im_box_header $page_title] %>
......@@ -13,7 +13,7 @@
<table>
<if @edit_hours_p@ eq "f">
<tr>
<td colspan=7>
<td colspan="7">
<font color=red>
<h3>@edit_hours_closed_message;noquote@</h3>
</font>
......@@ -46,7 +46,7 @@
@results;noquote@
<tr>
<td></td>
<td colspan=99>
<td colspan="99">
<if @edit_hours_p@ eq "t">
<INPUT TYPE=Submit VALUE="#intranet-timesheet2.Add_hours#">
</if>
......
www/hours/new.tcl
View file @ d7fb3484
This diff is collapsed.
www/hours/one-project.adp
View file @ d7fb3484
<master src="../../../intranet-core/www/master">
<property name="title">@page_title;noquote@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="context">#intranet-timesheet2.context#</property>
<property name="main_navbar_label">timesheet2_timesheet</property>
......
www/hours/one-project.tcl
View file @ d7fb3484
......@@ -28,7 +28,7 @@ ad_page_contract {
}
set current_user_id [ad_maybe_redirect_for_registration]
set current_user_id [auth::require_login]
set view_ours_all_p [im_permission $current_user_id "view_hours_all"]
if {!$view_ours_all_p} {
ad_return_complaint 1 "<li>[_ intranet-core.lt_You_have_insufficient_6]"
......@@ -39,7 +39,7 @@ if {!$view_ours_all_p} {
set show_notes_p 1
set page_title "[_ intranet-timesheet2.Units]"
if { ![empty_string_p $item] } {
if { $item ne "" } {
append page_title " on $item"
}
set context_bar [im_context_bar [list total "[_ intranet-timesheet2.Project_units]"] "[_ intranet-timesheet2.Units_on_one_project]"]
......@@ -86,7 +86,7 @@ set sql "
db_foreach hours_on_one_projects $sql {
set first_day_str "[util_AnsiDatetoPrettyDate $first_day]"
set last_day_str "[util_AnsiDatetoPrettyDate $last_day]"
append page_body "<li><a href='/intranet/users/view?user_id=$user_id'>$user_name</a>,<a href=full?[export_vars -url {project_id user_id}]&date=$last_day>[_ intranet-timesheet2.lt_total_hours_units_bet]</a>\n"
append page_body "<li><a href='/intranet/users/view?user_id=$user_id'>$user_name</a>,<a href=[export_vars -base full {project_id user_id}]&date=$last_day>[_ intranet-timesheet2.lt_total_hours_units_bet]</a>\n"
} if_no_rows {
append page_body "<li>[_ intranet-timesheet2.lt_No_units_have_been_lo]\n"
}
......
www/hours/one.adp
View file @ d7fb3484
<master>
<property name="title">@page_title@</property>
<property name="context">@context;noquote@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="context">@context;literal@</property>
<property name="admin_navbar_label">admin_views</property>
<h2>@page_title@</h2>
......
www/hours/one.tcl
View file @ d7fb3484
......@@ -26,7 +26,7 @@ ad_page_contract {
# Default & Security
# ------------------------------------------------------------------
set current_user_id [ad_maybe_redirect_for_registration]
set current_user_id [auth::require_login]
if {![im_permission $current_user_id "add_hours_all"]} {
ad_return_complaint 1 "You have insufficient privileges to use this page"
return
......
www/hours/other-projects.adp
View file @ d7fb3484
<master src="../../../intranet-core/www/master">
<property name="title">@page_title;noquote@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="context">#intranet-timesheet2.context#</property>
<property name="main_navbar_label">timesheet2_timesheet</property>
......
www/hours/other-projects.tcl
View file @ d7fb3484
......@@ -32,7 +32,7 @@ ad_page_contract {
#
# ---------------------------------------------------------
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
if {"" == $user_id_from_search || ![im_permission $user_id "add_hours_all"]} { set user_id_from_search $user_id }
set user_name_from_search [db_string uname "select im_name_from_user_id(:user_id_from_search)"]
set subsite_id [ad_conn subsite_id]
......
www/hours/projects.adp
View file @ d7fb3484
<master src="../../../intranet-core/www/master">
<property name="title">@page_title;noquote@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="context">#intranet-timesheet2.context#</property>
<property name="main_navbar_label">timesheet2_timesheet</property>
......
www/hours/projects.tcl
View file @ d7fb3484
......@@ -32,7 +32,7 @@ ad_page_contract {
# Security & Defaults
# ---------------------------------------------------------------
set current_user_id [ad_maybe_redirect_for_registration]
set current_user_id [auth::require_login]
if {![im_permission $current_user_id "view_hours_all"]} {
ad_return_complaint 1 [lang::message::lookup "" intranet-timesheet2.Not_Allowed_to_see_hours "
You are not allowed to see all timesheet hours in the system"]
......@@ -44,7 +44,7 @@ if {![im_permission $current_user_id "view_hours_all"]} {
# ---------------------------------------------------------------
if { [empty_string_p $user_id] } {
if { $user_id eq "" } {
# send them a list of users
set page_title "[_ intranet-timesheet2.View_employees_hours]"
set context_bar [im_context_bar "[_ intranet-timesheet2.View_employees_hours]"]
......@@ -63,7 +63,7 @@ if { [empty_string_p $user_id] } {
"
db_foreach users_who_logged_hours $sql {
append page_body "<li><a href=projects?[export_vars -url {user_id}]>$user_name</a>\n"
append page_body "<li><a href=[export_vars -base projects {user_id}]>$user_name</a>\n"
} if_no_rows {
append page_body "<em>[_ intranet-timesheet2.No_users_found]</em>"
}
......@@ -104,7 +104,7 @@ if { [empty_string_p $user_id] } {
db_foreach hours_on_project $sql {
set first_day_str "[util_AnsiDatetoPrettyDate $first_day]"
set last_day_str "[util_AnsiDatetoPrettyDate $last_day]"
append page_body "<li><a href=full?project_id=$project_id&[export_vars -url {user_id}]&date=$last_day&item=[ad_urlencode $project_name]>$project_name</a>, [_ intranet-timesheet2.lt_total_hours_hours_bet]</em>"
append page_body "<li><a href=full?project_id=$project_id&[export_vars {user_id}]&date=$last_day&item=[ad_urlencode $project_name]>$project_name</a>, [_ intranet-timesheet2.lt_total_hours_hours_bet]</em>"
} if_no_rows {
append page_body "<em>[_ intranet-timesheet2.lt_No_time_logged_on_any]</em>"
}
......
www/hours/send_pr_info-2.tcl
View file @ d7fb3484
......@@ -74,10 +74,10 @@ foreach project_id $projects {
db_foreach get_user_projects $sql_query {
append page_body "<tr>"
if { $rownum == "1" } {
append mail_content "<tr><td class=row[expr $rownum%2]><b>$project_name</b></td>"
if { $rownum == 1 } {
append mail_content "<tr><td class=row[expr {$rownum%2}]><b>$project_name</b></td>"
} else {
append mail_content "<tr><td class=row[expr $rownum%2]>&nbsp;</td>"
append mail_content "<tr><td class=row[expr {$rownum%2}]>&nbsp;</td>"
}
set days [db_string g_days "select TO_CHAR(NVL(field_value,0),'999990D9') \
......@@ -95,10 +95,10 @@ foreach project_id $projects {
where on_what_id=:project_id \
and user_id=:employee_id" -default "0.0"]
set days_diff [expr $days - $real_days]
set cost [format "%0.0f" [expr $days * $day_cost]]
set real_cost [format "%0.0f" [expr $real_days * $day_cost]]
set cost_diff [format "%0.0f" [expr $cost - $real_cost]]
set days_diff [expr {$days - $real_days}]
set cost [format "%0.0f" [expr {$days * $day_cost}]]
set real_cost [format "%0.0f" [expr {$real_days * $day_cost}]]
set cost_diff [format "%0.0f" [expr {$cost - $real_cost}]]
if { $days_diff < 0 } {
set days_diff_color " style=\"color:red\" "
......@@ -111,37 +111,37 @@ foreach project_id $projects {
} else {
set cost_diff_color " style=\"color:blue\" "
}
if { $days == "0" } {
if { $days == 0 } {
set per_days "NaN"
} else {
set per_days [format "%0.2f" [expr [expr $days_diff / $days] * 100]]%
set per_days [format "%0.2f" [expr {[expr {$days_diff / $days}] * 100}]]%
}
if { $cost == "0" } {
if { $cost == 0 } {
set per_cost "NaN"
} else {
set per_cost [format "%0.2f" [expr [expr $cost_diff.0 / $cost] * 100]]%
set per_cost [format "%0.2f" [expr {[expr {$cost_diff.0 / $cost}] * 100}]]%
}
append mail_content "
<td class=row[expr $rownum%2]>$emp_name</td>
<td class=row[expr $rownum%2] align=right>$days</td>
<td class=row[expr $rownum%2] align=right>$real_days</td>
<td class=row[expr $rownum%2] align=right $days_diff_color>$days_diff</td>
<td class=row[expr $rownum%2] align=right $days_diff_color>$per_days</td>
<td class=row[expr $rownum%2]>&nbsp;</td>
<td class=row[expr $rownum%2] align=right>$cost</td>
<td class=row[expr $rownum%2] align=right>$real_cost</td>
<td class=row[expr $rownum%2] align=right $cost_diff_color>$cost_diff</td>
<td class=row[expr $rownum%2] align=right $cost_diff_color>$per_cost</td>
<td class=row[expr {$rownum%2}]>$emp_name</td>
<td class=row[expr {$rownum%2}] align=right>$days</td>
<td class=row[expr {$rownum%2}] align=right>$real_days</td>
<td class=row[expr {$rownum%2}] align=right $days_diff_color>$days_diff</td>
<td class=row[expr {$rownum%2}] align=right $days_diff_color>$per_days</td>
<td class=row[expr {$rownum%2}]>&nbsp;</td>
<td class=row[expr {$rownum%2}] align=right>$cost</td>
<td class=row[expr {$rownum%2}] align=right>$real_cost</td>
<td class=row[expr {$rownum%2}] align=right $cost_diff_color>$cost_diff</td>
<td class=row[expr {$rownum%2}] align=right $cost_diff_color>$per_cost</td>
</tr>"
set sum_days [expr $sum_days + $days]
set sum_cost [expr $sum_cost + $cost]
set sum_real_days [expr $sum_real_days + $real_days]
set sum_real_cost [expr $sum_real_cost + $real_cost]
set sum_days [expr {$sum_days + $days}]
set sum_cost [expr {$sum_cost + $cost}]
set sum_real_days [expr {$sum_real_days + $real_days}]
set sum_real_cost [expr {$sum_real_cost + $real_cost}]
}
set sum_days_diff [expr $sum_days - $sum_real_days]
set sum_cost_diff [expr $sum_cost - $sum_real_cost]
set sum_days_diff [expr {$sum_days - $sum_real_days}]
set sum_cost_diff [expr {$sum_cost - $sum_real_cost}]
if { $sum_days_diff < 0 } {
set sum_days_color " style=\"color:red\" "
} else {
......@@ -152,15 +152,15 @@ foreach project_id $projects {
} else {
set sum_cost_color ""
}
if { $sum_days == "0" } {
if { $sum_days == 0 } {
set per_sum_days "NaN"
} else {
set per_sum_days [format "%0.2f" [expr [expr $sum_days_diff / $sum_days] * 100]]%
set per_sum_days [format "%0.2f" [expr {[expr {$sum_days_diff / $sum_days}] * 100}]]%
}
if { $sum_cost == "0" } {
if { $sum_cost == 0 } {
set per_sum_cost "NaN"
} else {
set per_sum_cost [format "%0.2f" [expr [expr $sum_cost_diff.0 / $sum_cost] * 100]]%
set per_sum_cost [format "%0.2f" [expr {[expr {$sum_cost_diff.0 / $sum_cost}] * 100}]]%
}
append mail_content "
......@@ -214,9 +214,9 @@ ns_set cput $myheaders "Content-Type" "text/html; charset=\"us-ascii\""
set subject "\[cIntranet\] Projects budget details."
if [ catch {
if {[ catch {
ns_sendmail $to $from $subject $mail_html $myheaders
} errmsg ] {
} errmsg ]} {
set page_body "<li>There was an error sending the email:<br><code>$errmsg</code> \n"
ns_log Notice "\n-------------> Error in 'send_pr_info-2.tcl' : $errmsg \n"
} else {
......
www/hours/total.adp
View file @ d7fb3484
<master src="../../../intranet-core/www/master">
<property name="title">@page_title;noquote@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="context">#intranet-timesheet2.context#</property>
<property name="main_navbar_label">timesheet2_timesheet</property>
......
www/hours/total.tcl
View file @ d7fb3484
......@@ -28,7 +28,7 @@ ad_page_contract {
# Security & Defaults
# ---------------------------------------------------------------
set current_user_id [ad_maybe_redirect_for_registration]
set current_user_id [auth::require_login]
if {![im_permission $current_user_id "view_hours_all"]} {
ad_return_complaint 1 [lang::message::lookup "" intranet-timesheet2.Not_Allowed_to_see_hours "
You are not allowed to see all timesheet hours in the system"]
......
www/hours/week.adp
View file @ d7fb3484
<master src="../../../intranet-core/www/master">
<property name="title">@page_title;noquote@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="context">#intranet-timesheet2.context#</property>
<property name="main_navbar_label">timesheet2_timesheet</property>
......
www/hours/week.tcl
View file @ d7fb3484
......@@ -28,10 +28,10 @@ ad_page_contract {
{ user_id_from_search:integer "" }
}
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
if { [empty_string_p $user_id_from_search] } {
set user_id_from_search [ad_maybe_redirect_for_registration]
if { $user_id_from_search eq "" } {
set user_id_from_search [auth::require_login]
}
# Permissions - limit view to the user himself,
......@@ -42,7 +42,7 @@ if {"" == $user_id_from_search || ![im_permission $user_id "add_hours_all"]} {
if { [empty_string_p $julian_date] } {
if { $julian_date eq "" } {
set julian_date [db_string sysdate_as_julian "select to_char(sysdate,'J') from dual"]
}
......@@ -77,7 +77,7 @@ set grand_total 0
db_foreach hour_select $sql {
if {"" == $total} { set total 0 }
set grand_total [expr $grand_total+$total]
set grand_total [expr {$grand_total+$total}]
lappend items [list $project_id $project_name $total]
}
......@@ -103,7 +103,7 @@ set pcount 0
set notes "<hr>\n<h2>[_ intranet-timesheet2.Daily_project_notes]</h2>\n"
db_foreach hours_daily_project_notes $sql {
if {[empty_string_p $note]} {
if {$note eq ""} {
set note "<i>[_ intranet-timesheet2.none]</i>"
}
if { $last_id != $project_id } {
......@@ -141,11 +141,11 @@ if {[llength $items] > 0 } {
set project_name [lindex $row 1]
set total [lindex $row 2]
append hour_table "<tr bgcolor=#efefef>
<td><a href=/intranet/projects/view?[export_vars -url {project_id}]>
<td><a href=/intranet/projects/[export_vars -base view {project_id}]>
$project_name</a></td>
<td align=right>[format "%0.02f" $total]</td>
<td align=right>[format "%0.02f%%" \
[expr double($total)/$grand_total*100]]</td>
[expr {double($total)/$grand_total*100}]]</td>
</tr>
"
}
......
www/index.adp
View file @ d7fb3484
<master>
<property name="title">Companies</property>
<property name="doc(title)">Companies</property>
<property name="context">context</property>
<property name="main_navbar_label">finance</property>
......
www/reports/details_monthly.tcl
View file @ d7fb3484
......@@ -23,7 +23,7 @@ ad_page_contract {
{ month "" }
}
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
if {"" == $year} { set year [db_string current_year "select to_char(sysdate, 'yyyy') from dual"] }
if {"" == $month} { set month [db_string current_month "select to_char(sysdate, 'mm') from dual"] }
......
www/resource-report.tcl
View file @ d7fb3484
......@@ -12,7 +12,7 @@ ad_page_contract {
}
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set user_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
if {!$user_admin_p} {
ad_return_complaint 1 "<li>You have insufficient privileges to see this page"
......
www/send_pr_info-2.tcl
View file @ d7fb3484
......@@ -74,10 +74,10 @@ foreach project_id $projects {
db_foreach get_user_projects $sql_query {
append page_body "<tr>"
if { $rownum == "1" } {
append mail_content "<tr><td class=row[expr $rownum%2]><b>$project_name</b></td>"
if { $rownum == 1 } {
append mail_content "<tr><td class=row[expr {$rownum%2}]><b>$project_name</b></td>"
} else {
append mail_content "<tr><td class=row[expr $rownum%2]>&nbsp;</td>"
append mail_content "<tr><td class=row[expr {$rownum%2}]>&nbsp;</td>"
}
set days [db_string g_days "select TO_CHAR(NVL(field_value,0),'999990D9') \
......@@ -95,10 +95,10 @@ foreach project_id $projects {
where on_what_id=:project_id \
and user_id=:employee_id" -default "0.0"]
set days_diff [expr $days - $real_days]
set cost [format "%0.0f" [expr $days * $day_cost]]
set real_cost [format "%0.0f" [expr $real_days * $day_cost]]
set cost_diff [format "%0.0f" [expr $cost - $real_cost]]
set days_diff [expr {$days - $real_days}]
set cost [format "%0.0f" [expr {$days * $day_cost}]]
set real_cost [format "%0.0f" [expr {$real_days * $day_cost}]]
set cost_diff [format "%0.0f" [expr {$cost - $real_cost}]]
if { $days_diff < 0 } {
set days_diff_color " style=\"color:red\" "
......@@ -111,37 +111,37 @@ foreach project_id $projects {
} else {
set cost_diff_color " style=\"color:blue\" "
}
if { $days == "0" } {
if { $days == 0 } {
set per_days "NaN"
} else {
set per_days [format "%0.2f" [expr [expr $days_diff / $days] * 100]]%
set per_days [format "%0.2f" [expr {[expr {$days_diff / $days}] * 100}]]%
}
if { $cost == "0" } {
if { $cost == 0 } {
set per_cost "NaN"
} else {
set per_cost [format "%0.2f" [expr [expr $cost_diff.0 / $cost] * 100]]%
set per_cost [format "%0.2f" [expr {[expr {$cost_diff.0 / $cost}] * 100}]]%
}
append mail_content "
<td class=row[expr $rownum%2]>$emp_name</td>
<td class=row[expr $rownum%2] align=right>$days</td>
<td class=row[expr $rownum%2] align=right>$real_days</td>
<td class=row[expr $rownum%2] align=right $days_diff_color>$days_diff</td>
<td class=row[expr $rownum%2] align=right $days_diff_color>$per_days</td>
<td class=row[expr $rownum%2]>&nbsp;</td>
<td class=row[expr $rownum%2] align=right>$cost</td>
<td class=row[expr $rownum%2] align=right>$real_cost</td>
<td class=row[expr $rownum%2] align=right $cost_diff_color>$cost_diff</td>
<td class=row[expr $rownum%2] align=right $cost_diff_color>$per_cost</td>
<td class=row[expr {$rownum%2}]>$emp_name</td>
<td class=row[expr {$rownum%2}] align=right>$days</td>
<td class=row[expr {$rownum%2}] align=right>$real_days</td>
<td class=row[expr {$rownum%2}] align=right $days_diff_color>$days_diff</td>
<td class=row[expr {$rownum%2}] align=right $days_diff_color>$per_days</td>
<td class=row[expr {$rownum%2}]>&nbsp;</td>
<td class=row[expr {$rownum%2}] align=right>$cost</td>
<td class=row[expr {$rownum%2}] align=right>$real_cost</td>
<td class=row[expr {$rownum%2}] align=right $cost_diff_color>$cost_diff</td>
<td class=row[expr {$rownum%2}] align=right $cost_diff_color>$per_cost</td>
</tr>"
set sum_days [expr $sum_days + $days]
set sum_cost [expr $sum_cost + $cost]
set sum_real_days [expr $sum_real_days + $real_days]
set sum_real_cost [expr $sum_real_cost + $real_cost]
set sum_days [expr {$sum_days + $days}]
set sum_cost [expr {$sum_cost + $cost}]
set sum_real_days [expr {$sum_real_days + $real_days}]
set sum_real_cost [expr {$sum_real_cost + $real_cost}]
}
set sum_days_diff [expr $sum_days - $sum_real_days]
set sum_cost_diff [expr $sum_cost - $sum_real_cost]
set sum_days_diff [expr {$sum_days - $sum_real_days}]
set sum_cost_diff [expr {$sum_cost - $sum_real_cost}]
if { $sum_days_diff < 0 } {
set sum_days_color " style=\"color:red\" "
} else {
......@@ -152,15 +152,15 @@ foreach project_id $projects {
} else {
set sum_cost_color ""
}
if { $sum_days == "0" } {
if { $sum_days == 0 } {
set per_sum_days "NaN"
} else {
set per_sum_days [format "%0.2f" [expr [expr $sum_days_diff / $sum_days] * 100]]%
set per_sum_days [format "%0.2f" [expr {[expr {$sum_days_diff / $sum_days}] * 100}]]%
}
if { $sum_cost == "0" } {
if { $sum_cost == 0 } {
set per_sum_cost "NaN"
} else {
set per_sum_cost [format "%0.2f" [expr [expr $sum_cost_diff.0 / $sum_cost] * 100]]%
set per_sum_cost [format "%0.2f" [expr {[expr {$sum_cost_diff.0 / $sum_cost}] * 100}]]%
}
append mail_content "
......@@ -214,9 +214,9 @@ ns_set cput $myheaders "Content-Type" "text/html; charset=\"us-ascii\""
set subject "\[cIntranet\] Projects budget details."
if [ catch {
if {[ catch {
ns_sendmail $to $from $subject $mail_html $myheaders
} errmsg ] {
} errmsg ]} {
set page_body "<li>There was an error sending the email:<br><code>$errmsg</code> \n"
ns_log Notice "\n-------------> Error in 'send_pr_info-2.tcl' : $errmsg \n"
} else {
......
www/weekly_report.adp
View file @ d7fb3484
<master src="../../intranet-core/www/master">
<property name="title">Weekly Hours</property>
<property name="doc(title)">Weekly Hours</property>
<property name="context">context</property>
<property name="main_navbar_label">finance</property>
<property name="left_navbar">@left_navbar_html;noquote@</property>
<property name="left_navbar">@left_navbar_html;literal@</property>
<table>
<%= $table_continuation_html %>
......
www/weekly_report.tcl
View file @ d7fb3484
......@@ -15,7 +15,7 @@
proc stripzeros {value} {
set retval [string trimleft $value 0]
if { ![string length $retval] } { return 0 }
if { $retval eq "" } { return 0 }
return $retval
}
......@@ -158,7 +158,7 @@ ad_proc im_do_row {
# Write HEADER
append html "
<tr$bgcolor([expr $ctr % 2])>
<tr$bgcolor([expr {$ctr % 2}])>
<td>
<a href=\"$user_view_page?user_id=$curr_owner_id\">$owner_name</a>
</td>
......@@ -264,7 +264,7 @@ ad_page_contract {
# Defaults & Security
# ---------------------------------------------------------------
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set subsite_id [ad_conn subsite_id]
set site_url "/intranet-timesheet2"
set return_url "$site_url/weekly_report"
......@@ -276,7 +276,7 @@ if { $owner_id != $user_id && ![im_permission $user_id "view_hours_all"] } {
}
if { $start_at == "" && $project_id != 0 } {
if { $start_at eq "" && $project_id != 0 } {
set hours_start_date [db_string get_new_start_at "
select to_char(max(day), :date_format)
......@@ -308,12 +308,12 @@ if { $start_at == "" && $project_id != 0 } {
return
}
ad_returnredirect "$return_url?[export_vars -url {start_at duration project_id owner_id workflow_key}]"
ad_returnredirect [export_vars -base $return_url {start_at duration project_id owner_id workflow_key}]
return
}
if { $start_at == "" } {
if { $start_at eq "" } {
set start_at [db_string get_today "select to_char(next_day(to_date(to_char(sysdate,:date_format),:date_format)+1, 'sun'), :date_format) from dual"]
} else {
set start_at [db_string get_today "select to_char(next_day(to_date(:start_at, :date_format), 'sun'), :date_format) from dual"]
......@@ -332,8 +332,8 @@ if { $project_id != 0 } {
set sel_all ""
set sel_pro ""
if { $display == "all" } { set sel_all "selected" }
if { $display == "project" } { set sel_pro "selected" }
if { $display eq "all" } { set sel_all "selected" }
if { $display eq "project" } { set sel_pro "selected" }
if { $project_id != 0 } {
set filter_form_html "
......@@ -411,7 +411,7 @@ if { [im_permission $user_id "add_hours"] } {
# 2010-12-10: Links should no more appear on this report, moved to /intranet-timesheet2/absences/index
#
# if { $admin_html != "" } {
# if { $admin_html ne "" } {
# set filter_html [append filter_form_html "<ul>$admin_html</ul>"]
# } else {
set filter_html $filter_form_html
......@@ -427,7 +427,7 @@ set holydays [list]
set sql_from [list]
set sql_from2 [list]
for { set i [expr $duration - 1] } { $i >= 0 } { incr i -1 } {
for { set i [expr {$duration - 1}] } { $i >= 0 } { incr i -1 } {
set col_sql "
select
to_char(sysdate, :date_format) as today_date,
......@@ -441,7 +441,7 @@ for { set i [expr $duration - 1] } { $i >= 0 } { incr i -1 } {
db_1row get_date $col_sql
lappend days $i_date
if { $h_date == "SAT" || $h_date == "SUN" } {
if { $h_date eq "SAT" || $h_date eq "SUN" } {
lappend holydays $i_date
}
#prepare the data to UNION
......@@ -464,7 +464,7 @@ for { set i [expr $duration - 1] } { $i >= 0 } { incr i -1 } {
if { 1 == [stripzeros $f_date_mon] } {
set f_date_mon_index 0
} else {
set f_date_mon_index [expr [stripzeros $f_date_mon]-1]
set f_date_mon_index [expr {[stripzeros $f_date_mon]-1}]
}
set f_date "[_ intranet-timesheet2.[string trim $f_date_day]] <br> $f_date_dd. [lindex [_ acs-lang.localization-mon] $f_date_mon_index] <br>$f_date_yyyy"
......@@ -477,16 +477,16 @@ append table_header_html "</tr>"
# Get the Data and fill it up into lists
# ---------------------------------------------------------------
if { $owner_id == "" && $project_id == 0 } {
if { $owner_id eq "" && $project_id == 0 } {
set mode 1
set sql_where ""
} elseif { $owner_id == "" && $project_id != 0 } {
} elseif { $owner_id eq "" && $project_id != 0 } {
set mode 2
set sql_where "and u.user_id in (select object_id_two from acs_rels where object_id_one=:project_id)"
} elseif { $owner_id != "" && $project_id == 0 } {
} elseif { $owner_id ne "" && $project_id == 0 } {
set mode 3
set sql_where "and u.user_id = :owner_id"
} elseif { $owner_id != "" && $project_id != 0 } {
} elseif { $owner_id ne "" && $project_id != 0 } {
set mode 4
set sql_where "and u.user_id in (select object_id_two from acs_rels where object_id_one=:project_id) and u.user_id = :owner_id"
} else {
......@@ -496,7 +496,7 @@ if { $owner_id == "" && $project_id == 0 } {
set sql_from_joined [join $sql_from " UNION "]
set sql_from2_joined [join $sql_from2 " UNION "]
if { $project_id != 0 && $display == "project"} {
if { $project_id != 0 && $display eq "project"} {
set sql_from_imhours "select day, user_id, sum(hours) as val, 'h' as type, '' as descr from im_hours where project_id = :project_id group by user_id, day"
} else {
set sql_from_imhours "select day, user_id, sum(hours) as val, 'h' as type, '' as descr from im_hours group by user_id, day"
......@@ -637,12 +637,12 @@ db_foreach get_hours $sql {
}
# Set hours
if { $type == "h" } {
if { $type eq "h" } {
set user_days($curr_day) $val
}
# Set absences
if { $type == "a" } {
if { $type eq "a" } {
set user_absences($curr_day) $val
set user_ab_descr($val) $descr
}
......@@ -650,14 +650,14 @@ db_foreach get_hours $sql {
incr ctr
}
set colspan [expr [llength $days]+1]
set colspan [expr {[llength $days]+1}]
if { $ctr > 0 } {
# Writing last record
ns_log notice "weekly_report: left loop, now writing last record"
append table_body_html [im_do_row [array get bgcolor] $ctr $curr_owner_id $owner_name $days [array get user_days] [array get user_absences] $holydays $today_date [array get user_ab_descr] $workflow_key ]
} elseif { [empty_string_p $table_body_html] } {
} elseif { $table_body_html eq "" } {
# Show a reasonable message when there are no result rows:
set table_body_html "
<tr><td colspan=$colspan><ul><li><b>
......@@ -677,7 +677,7 @@ set navig_sql "
dual"
db_1row get_navig_dates $navig_sql
set switch_link_html "<a href=\"weekly_report?[export_vars -url {owner_id project_id duration display}]"
set switch_link_html "<a href=\[export_vars -base weekly_report {owner_id project_id duration display}]
set switch_past_html "$switch_link_html&start_at=$past_date&cost_center_id=$cost_center_id&department_id=$department_id&workflow_key=$workflow_key\">&laquo;</a>"
set switch_future_html "$switch_link_html&start_at=$future_date&cost_center_id=$cost_center_id&department_id=$department_id&workflow_key=$workflow_key\">&raquo;"
......@@ -691,7 +691,7 @@ set table_continuation_html "
<td align='left'>
<span class='backward_smaller_than'>$switch_past_html</span>
</td>
<td colspan=[expr $colspan - 2]></td>
<td colspan=[expr {$colspan - 2}]></td>
<td align='right'>
<span class='forward_greater_than'>$switch_future_html</span>
</td>
......@@ -699,7 +699,7 @@ set table_continuation_html "
set page_title "[_ intranet-timesheet2.Timesheet_Summary]"
set context_bar [im_context_bar $page_title]
if { $owner_id != "" && [info exists owner_name] } {
if { $owner_id ne "" && [info exists owner_name] } {
append page_title " of $owner_name"
}
if { $project_id != 0 && [info exists project_name] } {
......
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