Skip to content

I
intranet-resource-management
Commit 83c4f8f0 authored by Frank Bergmann's avatar Frank Bergmann
Browse files
Options

- Gustaf changes

parent ce615303
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 145 deletions
lib/employee-assignment-pie-chart.tcl
View file @ 83c4f8f0
......@@ -23,7 +23,7 @@ set company_department_id [im_cost_center_company]
# ----------------------------------------------------
# Create a random ID for the diagram
set diagram_rand [expr round(rand() * 100000000.0)]
set diagram_rand [expr {round(rand() * 100000000.0)}]
set diagram_id "employee_assignment_pie_chart_$diagram_rand"
#ToDo: Eliminate deleted employees
......@@ -47,7 +47,7 @@ db_foreach departments $department_sql {
}
if {"" != $employee_id} {
multirow append departments $employee_id [expr 1+$indent] $employee_name
multirow append departments $employee_id [expr {1+$indent}] $employee_name
}
}
......
tcl/intranet-resource-management-procs.tcl
View file @ 83c4f8f0
This diff is collapsed.
www/employee-assignment-pie-chart.json.tcl
View file @ 83c4f8f0
......@@ -80,10 +80,10 @@ db_foreach employee_assignments $employee_assignments_sql {
for {set i 0} {$i < $len} {incr i} {
set workday [lindex $workday_list $i]
if {100 != $workday} { continue }
set workday_sum [expr $workday_sum + $workday]
set absence_sum [expr $absence_sum + [lindex $absence_list $i]]
set billable_sum [expr $billable_sum + [lindex $billable_list $i]]
set nonbillable_sum [expr $nonbillable_sum + [lindex $nonbillable_list $i]]
set workday_sum [expr {$workday_sum + $workday}]
set absence_sum [expr {$absence_sum + [lindex $absence_list $i]}]
set billable_sum [expr {$billable_sum + [lindex $billable_list $i]}]
set nonbillable_sum [expr {$nonbillable_sum + [lindex $nonbillable_list $i]}]
}
}
......@@ -98,11 +98,11 @@ multirow create mr name value
if {0.0 == $workday_sum} {
multirow append mr $invalid_data_l10n 1
} else {
if {$billable_sum > 0} { multirow append mr $billable_l10n [expr 100.0 * $billable_sum / $workday_sum] }
if {$nonbillable_sum > 0} { multirow append mr $nonbillable_l10n [expr 100.0 * $nonbillable_sum / $workday_sum] }
if {$absence_sum > 0} { multirow append mr $absences_l10n [expr 100.0 * $absence_sum / $workday_sum] }
if {$billable_sum > 0} { multirow append mr $billable_l10n [expr {100.0 * $billable_sum / $workday_sum}] }
if {$nonbillable_sum > 0} { multirow append mr $nonbillable_l10n [expr {100.0 * $nonbillable_sum / $workday_sum}] }
if {$absence_sum > 0} { multirow append mr $absences_l10n [expr {100.0 * $absence_sum / $workday_sum}] }
set not_assigned_sum [expr 100.0 - 100.0 * $absence_sum / $workday_sum - 100.0 * $billable_sum / $workday_sum - 100.0 * $nonbillable_sum / $workday_sum]
set not_assigned_sum [expr {100.0 - 100.0 * $absence_sum / $workday_sum - 100.0 * $billable_sum / $workday_sum - 100.0 * $nonbillable_sum / $workday_sum}]
if {$not_assigned_sum > 0} { multirow append mr $not_assigned_l10n $not_assigned_sum }
}
......
www/index.adp
View file @ 83c4f8f0
<master>
<property name="title">@page_title;noquote@</property>
<property name="main_navbar_label">@main_navbar_label@</property>
<property name="sub_navbar">@sub_navbar;noquote@</property>
<property name="left_navbar">@left_navbar_html;noquote@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="main_navbar_label">@main_navbar_label;literal@</property>
<property name="sub_navbar">@sub_navbar;literal@</property>
<property name="left_navbar">@left_navbar_html;literal@</property>
<table cellpadding=0 cellspacing=0 border=0 width="100%">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tr><td>
<%= [im_component_bay top] %>
</td></tr>
</table>
<table cellpadding=0 cellspacing=0 border=0 width="100%">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tr>
<td valign=top>
<td valign="top">
<%= [im_component_bay left] %>
</td>
<td valign=top>
<td valign="top">
<%= [im_component_bay right] %>
</td>
</tr>
</table>
<table cellpadding=0 cellspacing=0 border=0 width="100%">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tr><td>
<%= [im_component_bay bottom] %>
</td></tr>
......
www/index.tcl
View file @ 83c4f8f0
......@@ -11,7 +11,7 @@ ad_page_contract {
} {
}
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
set page_title [lang::message::lookup "" intranet-resource-management.Resource_Management_Home "Resource Management Home"]
set context_bar [im_context_bar $page_title]
set return_url [im_url_with_query]
......
www/resources-planning-advanced.adp
View file @ 83c4f8f0
<master>
<property name="title">@page_title@</property>
<property name="main_navbar_label">@main_navbar_label@</property>
<property name="sub_navbar">@sub_navbar;noquote@</property>
<property name="show_context_help">@show_context_help_p;noquote@</property>
<property name="left_navbar">@left_navbar_html;noquote@</property>
<property name="show_context_help">@show_context_help_p;noquote@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="main_navbar_label">@main_navbar_label;literal@</property>
<property name="sub_navbar">@sub_navbar;literal@</property>
<property name="show_context_help">@show_context_help_p;literal@</property>
<property name="left_navbar">@left_navbar_html;literal@</property>
<property name="show_context_help">@show_context_help_p;literal@</property>
@html;noquote@
www/resources-planning-advanced.tcl
View file @ 83c4f8f0
......@@ -41,7 +41,7 @@ ad_page_contract {
im_permission_flush
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
if {![im_permission $user_id "view_projects_all"]} {
ad_return_complaint 1 "You don't have permissions to see this page"
ad_script_abort
......@@ -135,7 +135,7 @@ if {0} {
"
}
if { [empty_string_p $customer_id] } {
if { $customer_id eq "" } {
set customer_id 0
}
......@@ -307,7 +307,7 @@ append absence_color_codes "<div class=filter-title>&nbsp;[lang::message::lookup
append absence_color_codes "<table cellpadding='5' cellspacing='5'>\n"
append absence_color_codes "<tr><td>&nbsp;&nbsp;&nbsp;</td><td bgcolor='\#666699' style='padding:3px'>Planned hours</td></tr>\n"
db_foreach cols $col_sql {
set index [expr $category_id - 5000]
set index [expr {$category_id - 5000}]
set col [lindex $color_list $index]
regsub -all " " $category "_" category_key
set category_l10n [lang::message::lookup "" intranet-core.$category_key $category]
......
www/resources-planning-liwo.adp
View file @ 83c4f8f0
<master>
<property name="title">@page_title@</property>
<property name="main_navbar_label">@main_navbar_label@</property>
<property name="sub_navbar">@sub_navbar;noquote@</property>
<property name="show_context_help">@show_context_help_p;noquote@</property>
<property name="left_navbar">@left_navbar_html;noquote@</property>
<property name="show_context_help">@show_context_help_p;noquote@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="main_navbar_label">@main_navbar_label;literal@</property>
<property name="sub_navbar">@sub_navbar;literal@</property>
<property name="show_context_help">@show_context_help_p;literal@</property>
<property name="left_navbar">@left_navbar_html;literal@</property>
<property name="show_context_help">@show_context_help_p;literal@</property>
@html;noquote@
www/resources-planning-liwo.tcl
View file @ 83c4f8f0
......@@ -43,7 +43,7 @@ ad_page_contract {
im_permission_flush
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
if {![im_permission $user_id "view_projects_all"]} {
ad_return_complaint 1 "You don't have permissions to see this page"
ad_script_abort
......@@ -140,7 +140,7 @@ if {0} {
"
}
if { [empty_string_p $customer_id] } {
if { $customer_id eq "" } {
set customer_id 0
}
......@@ -335,7 +335,7 @@ append absence_color_codes "<div class=filter-title>&nbsp;[lang::message::lookup
append absence_color_codes "<table cellpadding='5' cellspacing='5'>\n"
append absence_color_codes "<tr><td>&nbsp;&nbsp;&nbsp;</td><td bgcolor='\#666699' style='padding:3px'>Planned hours</td></tr>\n"
db_foreach cols $col_sql {
set index [expr $category_id - 5000]
set index [expr {$category_id - 5000}]
set col [lindex $color_list $index]
regsub -all " " $category "_" category_key
set category_l10n [lang::message::lookup "" intranet-core.$category_key $category]
......
www/resources-planning-planned-hours.adp
View file @ 83c4f8f0
<master>
<property name="title">@page_title@</property>
<property name="main_navbar_label">@main_navbar_label@</property>
<property name="sub_navbar">@sub_navbar;noquote@</property>
<property name="show_context_help">@show_context_help_p;noquote@</property>
<property name="left_navbar">@left_navbar_html;noquote@</property>
<property name="show_context_help">@show_context_help_p;noquote@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="main_navbar_label">@main_navbar_label;literal@</property>
<property name="sub_navbar">@sub_navbar;literal@</property>
<property name="show_context_help">@show_context_help_p;literal@</property>
<property name="left_navbar">@left_navbar_html;literal@</property>
<property name="show_context_help">@show_context_help_p;literal@</property>
@html;noquote@
www/resources-planning-planned-hours.tcl
View file @ 83c4f8f0
......@@ -43,7 +43,7 @@ ad_page_contract {
im_permission_flush
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
if {![im_permission $user_id "view_projects_all"]} {
ad_return_complaint 1 "You don't have permissions to see this page"
ad_script_abort
......@@ -138,7 +138,7 @@ if {0} {
"
}
if { [empty_string_p $customer_id] } {
if { $customer_id eq "" } {
set customer_id 0
}
......@@ -303,7 +303,7 @@ append absence_color_codes "<div class=filter-title>&nbsp;[lang::message::lookup
append absence_color_codes "<table cellpadding='5' cellspacing='5'>\n"
append absence_color_codes "<tr><td>&nbsp;&nbsp;&nbsp;</td><td bgcolor='\#666699' style='padding:3px'>Planned hours</td></tr>\n"
db_foreach cols $col_sql {
set index [expr $category_id - 5000]
set index [expr {$category_id - 5000}]
set col [lindex $color_list $index]
regsub -all " " $category "_" category_key
set category_l10n [lang::message::lookup "" intranet-core.$category_key $category]
......
www/resources-planning.adp
View file @ 83c4f8f0
<master>
<property name="title">@page_title@</property>
<property name="main_navbar_label">@main_navbar_label@</property>
<property name="sub_navbar">@sub_navbar;noquote@</property>
<property name="show_context_help">@show_context_help_p;noquote@</property>
<property name="left_navbar">@left_navbar_html;noquote@</property>
<property name="show_context_help">@show_context_help_p;noquote@</property>
<property name="doc(title)">@page_title;literal@</property>
<property name="main_navbar_label">@main_navbar_label;literal@</property>
<property name="sub_navbar">@sub_navbar;literal@</property>
<property name="show_context_help">@show_context_help_p;literal@</property>
<property name="left_navbar">@left_navbar_html;literal@</property>
<property name="show_context_help">@show_context_help_p;literal@</property>
@html;noquote@
www/resources-planning.tcl
View file @ 83c4f8f0
......@@ -41,7 +41,7 @@ ad_page_contract {
im_permission_flush
set user_id [ad_maybe_redirect_for_registration]
set user_id [auth::require_login]
if {![im_permission $user_id "view_projects_all"]} {
ad_return_complaint 1 "You don't have permissions to see this page"
ad_script_abort
......@@ -133,7 +133,7 @@ if {0} {
"
}
if { [empty_string_p $customer_id] } {
if { $customer_id eq "" } {
set customer_id 0
}
......
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