Skip to content

I
intranet-csv-import
Commit e0a8a9b2 authored by Frank Bergmann's avatar Frank Bergmann
Browse files
Options

-- Extensions and improvements im_hours

parent f21860dc
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 15 deletions
tcl/intranet-csv-import-procs.tcl
View file @ e0a8a9b2
......@@ -332,6 +332,7 @@ ad_proc -public im_csv_import_guess_im_conf_item { } {} {
ad_proc -public im_csv_import_guess_im_hour { } {} {
set mapping {
{project_id "Project Nr Path " project_parent_nrs ""}
{project_id "Parent Nrs" project_parent_nrs ""}
{project_id "Project Parent Nrs" project_parent_nrs ""}
{user_id "User Email" user_name ""}
......@@ -340,6 +341,11 @@ ad_proc -public im_csv_import_guess_im_hour { } {} {
{day "Day" date ""}
{hours "Hours" number ""}
{note "Note" no_change ""}
{billing_rate "Billing Rate" number ""}
{invoice_id "Invoice Id" no_change ""}
{invoice_nr "Invoice Nr" hard_coded ""}
{days "Days" number ""}
{manually_updated_p "Manually Updated" boolean ""}
}
return $mapping
}
......@@ -428,7 +434,7 @@ ad_proc -public im_csv_import_object_fields {
} {
# Special case: im_hour is not an object
if { "im_hour" == $object_type } {
return "project_id project_nr project_nr_path user_id day hours note"
return "project_id project_nr project_nr_path user_id day hours note billing_rate invoice_id days manually_updated_p invoice_nr"
}
# Special case: membership is not an object
......
www/import-im_hour.tcl
View file @ e0a8a9b2
......@@ -158,12 +158,13 @@ foreach csv_line_fields $values_list_of_lists {
set note ""
set cost_id ""
set invoice_id ""
set invoice_nr ""
set internal_note ""
set material_id ""
set days ""
set hour_id ""
set conf_object_id ""
set manually_updated_p ""
foreach j [array names column] {
......@@ -305,17 +306,34 @@ foreach csv_line_fields $values_list_of_lists {
continue
}
# Find invoice_id
if { "" != $invoice_nr } {
set invoice_id [db_string sql "select cost_id from im_costs where cost_name =:invoice_nr" -default ""]
if { "" eq $invoice_id } {
im_write_log $output_device_log $write_log_p "<li><font color=brown>Warning: Error parsing field='invoice_nr'. Did not find invoice for invoive_nr: $invoice_nr. Will </font></li>\n"
} else {
im_write_log $output_device_log $write_log_p "<li><span style='color:green'>Found matching invoice for invoive_nr($invoice_nr): $invoice_id </span></li>\n"
}
} else {
im_write_log $output_device_log $write_log_p "<li>No invoice_nr found</li>\n"
}
# -------------------------------------------------------
# Check if there is a conf object
#
set conf_object_id_exist_p [db_string get_conf_object_id "
select count(conf_object_id)
from im_hours h
where h.day = :day and
h.user_id = :user_id and
h.project_id = :target_project_id
if {[catch {
set conf_object_id_exist_p [db_string get_conf_object_id "
select count(conf_object_id)
from im_hours h
where h.day = :day and
h.user_id = :user_id and
h.project_id = :target_project_id
" -default 0]
} err_msg]} {
# Quite likely no column im_hours::conf_object_id
set conf_object_id_exist_p 0
}
if {$conf_object_id_exist_p} {
im_write_log $output_device_log $write_log_p "<li>Merging hours: <font color=red>Timesheet hours already approved, skipping project_id: $target_project_id, user_id: $user_id, day: $day</font></li>\n"
continue
......@@ -334,17 +352,19 @@ foreach csv_line_fields $values_list_of_lists {
if { $hours_before > 0 && [info exists merge_p] } {
# Update
im_write_log $output_device_log $write_log_p "<li>Merging hours: project_id: $target_project_id, user_id: $user_id, day: $day</li>\n"
if { !$test_run_p } {
im_write_log $output_device_log $write_log_p "<li>No test run - Merging ...</li>\n"
im_write_log $output_device_log $write_log_p "<li>No test run - Merging hours: project_id: $target_project_id, user_id: $user_id, day: $day</li>\n"
db_dml sql "update im_hours h set (hours, note) = (to_number('$hours','999999.99') + :hours_before, h.note || ', ' || :note) where h.project_id = :target_project_id and h.user_id = :user_id and h.day = :day"
} else {
im_write_log $output_device_log $write_log_p "<li>Test run: Did not MERGE: project_id: $target_project_id, user_id: $user_id, day: $day</li>\n"
}
} elseif { $hours_before > 0 && ![info exists merge_p] } {
# Overwrite
im_write_log $output_device_log $write_log_p "<li>Overwrite hours: project_id: $target_project_id, user_id: $user_id, day: $day</li>\n"
if { !$test_run_p } {
im_write_log $output_device_log $write_log_p "<li>No test run: Overwriting ...</li>\n"
im_write_log $output_device_log $write_log_p "<li>No test run - Overwrite hours and note, keep other attributes.<br/>project_id: $target_project_id, user_id: $user_id, day: $day</li>\n"
db_dml sql "update im_hours h set (hours, note) = (:hours, :note) where h.project_id = :target_project_id and h.user_id = :user_id and h.day = :day"
} else {
im_write_log $output_device_log $write_log_p "<li>Test run: Did not OVERWRITE: project_id: $target_project_id, user_id: $user_id, day: $day</li>\n"
}
} elseif { $hours_before == 0 } {
# create im_hours record
......@@ -352,17 +372,33 @@ foreach csv_line_fields $values_list_of_lists {
if {[catch {
im_write_log $output_device_log $write_log_p "<li>No test run: Create new hour record: project_id: $target_project_id, user_id: $user_id, day: $day</li>\n"
db_dml insert_hour "insert into im_hours (user_id,project_id,day,hours,note) values (:user_id,:target_project_id,:day,:hours,:note)"
# Add additional attributes
set invoice_line "";
if { "" != $invoice_id } { set invoice_line "invoice_id = :invoice_id," }
set sql "
update im_hours h
set
$invoice_line
billing_rate = :billing_rate,
days = :days
where
h.project_id = :target_project_id and h.user_id = :user_id and h.day = :day
"
db_dml update_hour_attributes $sql
} err_msg]} {
global errorInfo
ns_log Error $errorInfo
im_write_log $output_device_log $write_log_p "<li>Create hour record: <font color=red>Error: insert failed for $target_project_id, user_id: $user_id, day: $day - $errorInfo</font></li>\n"
}
} else {
im_write_log $output_device_log $write_log_p "<li>Test run: Did not CREATE new hour record: project_id: $target_project_id, user_id: $user_id, day: $day</li>\n"
}
} else {
im_write_log $output_device_log $write_log_p "<li><font color=red>Error: not writing anything for: $target_project_id, user_id: $user_id, day: $day, hours_before: '$hours_before'</font></li>\n"
continue
}
if {$sync_cost_item_immediately_p} {
# Update the affected project's cost_hours_cache and cost_days_cache fields,
# so that the numbers will appear correctly in the TaskListPage
......@@ -380,7 +416,7 @@ foreach csv_line_fields $values_list_of_lists {
im_write_log $output_device_log $write_log_p "</ul>\n"
im_write_log $output_device_log $write_log_p "<p>\n"
im_write_log $output_device_log $write_log_p "<p>List of missing projects:<br/>$missing_project_list</p>"
im_write_log $output_device_log $write_log_p "<p>List of projects not found:<br/>$missing_project_list</p>"
im_write_log $output_device_log $write_log_p "<br/>"
im_write_log $output_device_log $write_log_p "<A HREF=$return_url>Return</A>\n"
......
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