Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
intranet-timesheet2
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
project-open
intranet-timesheet2
Commits
18b7705a
Commit
18b7705a
authored
Nov 20, 2015
by
Frank Bergmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Fixed ns_log Notice
parent
3bb832e0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
intranet-absences-procs.tcl
tcl/intranet-absences-procs.tcl
+1
-1
index.tcl
www/hours/index.tcl
+3
-3
new.tcl
www/hours/new.tcl
+3
-3
weekly_report.tcl
www/weekly_report.tcl
+1
-1
No files found.
tcl/intranet-absences-procs.tcl
View file @
18b7705a
...
@@ -760,7 +760,7 @@ ad_proc im_absence_cube {
...
@@ -760,7 +760,7 @@ ad_proc im_absence_cube {
if
{[
info
exists absence_hash
(
$key
)]}
{
set value
$absence
_hash
(
$key
)
}
if
{[
info
exists absence_hash
(
$key
)]}
{
set value
$absence
_hash
(
$key
)
}
if
{[
info
exists holiday_hash
(
$date
_date
)]}
{
append value
$holiday
_hash
(
$date
_date
)
}
if
{[
info
exists holiday_hash
(
$date
_date
)]}
{
append value
$holiday
_hash
(
$date
_date
)
}
append table_body
[
im_absence_cube_render_cell
$value
]
append table_body
[
im_absence_cube_render_cell
$value
]
ns_log N
OTICE
"intranet-absences-procs::im_absence_cube_render_cell:
$value
"
ns_log N
otice
"intranet-absences-procs::im_absence_cube_render_cell:
$value
"
}
}
append table_body
"</tr>
\n
"
append table_body
"</tr>
\n
"
incr row_ctr
incr row_ctr
...
...
www/hours/index.tcl
View file @
18b7705a
...
@@ -229,7 +229,7 @@ for { set current_date $first_julian_date} { $current_date <= $last_julian_date
...
@@ -229,7 +229,7 @@ for { set current_date $first_julian_date} { $current_date <= $last_julian_date
"
"
set no_ts_approval_wf
[
db_string workflow_started_p
$no
_ts_approval_wf_sql -default
"0"
]
set no_ts_approval_wf
[
db_string workflow_started_p
$no
_ts_approval_wf_sql -default
"0"
]
if
{
$confirm
_timesheet_hours_p &&
(
"monthly"
==
$confirmation
_period ||
"weekly"
==
$confirmation
_period
)
&& 0 !=
$no
_ts_approval_wf
}
{
if
{
$confirm
_timesheet_hours_p &&
(
"monthly"
==
$confirmation
_period ||
"weekly"
==
$confirmation
_period
)
&& 0 !=
$no
_ts_approval_wf
}
{
ns_log N
OTICE
"TS: Entry blocked: Date:
$current
_date_ansi; Number:
$no
_ts_approval_wf;
$no
_ts_approval_wf_sql"
ns_log N
otice
"TS: Entry blocked: Date:
$current
_date_ansi; Number:
$no
_ts_approval_wf;
$no
_ts_approval_wf_sql"
set timesheet_entry_blocked_p 1
set timesheet_entry_blocked_p 1
}
}
}
}
...
@@ -244,7 +244,7 @@ for { set current_date $first_julian_date} { $current_date <= $last_julian_date
...
@@ -244,7 +244,7 @@ for { set current_date $first_julian_date} { $current_date <= $last_julian_date
if
{
$timesheet
_entry_blocked_p
}
{
if
{
$timesheet
_entry_blocked_p
}
{
set hours
"<span class='log_hours'>
[
lang::message::lookup
""
intranet-timesheet2.Nolog_Workflow_In_Progress
"0 hours"
]
</span>"
set hours
"<span class='log_hours'>
[
lang::message::lookup
""
intranet-timesheet2.Nolog_Workflow_In_Progress
"0 hours"
]
</span>"
}
else
{
}
else
{
ns_log N
OTICE
"TS: Not Blocked:
$current
_date"
ns_log N
otice
"TS: Not Blocked:
$current
_date"
if
{
[
string
first
$week
_day
$weekly
_logging_days
]
!= -1
}
{
if
{
[
string
first
$week
_day
$weekly
_logging_days
]
!= -1
}
{
set hours
"<span class='log_hours'>
[
_ intranet-timesheet2.log_hours
]
</span>"
set hours
"<span class='log_hours'>
[
_ intranet-timesheet2.log_hours
]
</span>"
}
}
...
@@ -337,7 +337,7 @@ for { set current_date $first_julian_date} { $current_date <= $last_julian_date
...
@@ -337,7 +337,7 @@ for { set current_date $first_julian_date} { $current_date <= $last_julian_date
set no_unconfirmed_hours
[
get_unconfirmed_hours_for_period
$user
_id_from_search
$start
_date_julian_wf
$end
_date_julian_wf
]
set no_unconfirmed_hours
[
get_unconfirmed_hours_for_period
$user
_id_from_search
$start
_date_julian_wf
$end
_date_julian_wf
]
# ns_log N
OTICE
"Create weekly CONFIRM button: start:
$start
_date_julian_wf, end:
$start
_date_julian_wf, No. unconfirmed Hours
$no
_unconfirmed_hours, confirm:
$confirm
_timesheet_hours_p"
# ns_log N
otice
"Create weekly CONFIRM button: start:
$start
_date_julian_wf, end:
$start
_date_julian_wf, No. unconfirmed Hours
$no
_unconfirmed_hours, confirm:
$confirm
_timesheet_hours_p"
if
{
$confirm
_timesheet_hours_p &&
(
0 <
$no
_unconfirmed_hours ||
""
!=
$no
_unconfirmed_hours
)
}
{
if
{
$confirm
_timesheet_hours_p &&
(
0 <
$no
_unconfirmed_hours ||
""
!=
$no
_unconfirmed_hours
)
}
{
set base_url_confirm_wf
"/intranet-timesheet2-workflow/conf-objects/new-timesheet-workflow"
set base_url_confirm_wf
"/intranet-timesheet2-workflow/conf-objects/new-timesheet-workflow"
set conf_url
[
export_vars -base
$base
_url_confirm_wf
{
{
user_id
$user
_id_from_search
}
{
start_date_julian
$start
_date_julian_wf
}
{
end_date_julian
$end
_date_julian_wf
}
return_url
}]
set conf_url
[
export_vars -base
$base
_url_confirm_wf
{
{
user_id
$user
_id_from_search
}
{
start_date_julian
$start
_date_julian_wf
}
{
end_date_julian
$end
_date_julian_wf
}
return_url
}]
...
...
www/hours/new.tcl
View file @
18b7705a
...
@@ -836,7 +836,7 @@ template::multirow foreach hours_multirow {
...
@@ -836,7 +836,7 @@ template::multirow foreach hours_multirow {
set last_level_shown
$subproject
_level
set last_level_shown
$subproject
_level
}
else
{
}
else
{
if
{
$level
_entered_in_showing_child_elements >=
$subproject
_level
}
{
if
{
$level
_entered_in_showing_child_elements >=
$subproject
_level
}
{
# ns_log N
OTICE
"/intranet-timesheet2/www/hours/new:: Check for searchstring"
# ns_log N
otice
"/intranet-timesheet2/www/hours/new:: Check for searchstring"
if
{
[
string
first
[
string
tolower
$search
_task
]
[
string
tolower
$project
_name
]]
== -1
}
{
if
{
[
string
first
[
string
tolower
$search
_task
]
[
string
tolower
$project
_name
]]
== -1
}
{
set showing_child_elements_p 0
set showing_child_elements_p 0
set filter_surpress_output_p 1
set filter_surpress_output_p 1
...
@@ -1190,7 +1190,7 @@ if { [empty_string_p results] } {
...
@@ -1190,7 +1190,7 @@ if { [empty_string_p results] } {
</tr>
\n
"
</tr>
\n
"
}
}
set
export_
form_
vars
[
export_vars -form
{
return_url julian_date user_id_from_search show_week_p
}]
set
export_vars
[
export_vars -form
{
return_url julian_date user_id_from_search show_week_p
}]
# ---------------------------------------------------------
# ---------------------------------------------------------
...
@@ -1224,7 +1224,7 @@ set left_navbar_html "
...
@@ -1224,7 +1224,7 @@ set left_navbar_html "
</div>
</div>
<form action=new method=GET>
<form action=new method=GET>
<!-- don't include return_url in the export_
form_
vars, as it includes the old user -->
<!-- don't include return_url in the export_vars, as it includes the old user -->
[
export_vars -form
{
julian_date show_week_p
}]
[
export_vars -form
{
julian_date show_week_p
}]
<table border=0 cellpadding=1 cellspacing=1>
<table border=0 cellpadding=1 cellspacing=1>
<tr>
<tr>
...
...
www/weekly_report.tcl
View file @
18b7705a
...
@@ -169,7 +169,7 @@ ad_proc im_do_row {
...
@@ -169,7 +169,7 @@ ad_proc im_do_row {
set wf_status_list
[
wf_status_list
$curr
_owner_id
$days
$workflow
_key
]
set wf_status_list
[
wf_status_list
$curr
_owner_id
$days
$workflow
_key
]
# wf_status_list list of lists
{
ansi-date status
}
# wf_status_list list of lists
{
ansi-date status
}
# Example:
{
20120720 2
}
{
20120719 2
}
{
20120721 1
}
# Example:
{
20120720 2
}
{
20120719 2
}
{
20120721 1
}
ns_log N
OTICE
"KHD: wf_status_list:
$wf
_status_list"
ns_log N
otice
"KHD: wf_status_list:
$wf
_status_list"
foreach rec
$wf
_status_list
{
foreach rec
$wf
_status_list
{
set wf_status_array
([
lindex
[
split
$rec
" "
]
0
])
[
lindex
[
split
$rec
" "
]
1
]
set wf_status_array
([
lindex
[
split
$rec
" "
]
0
])
[
lindex
[
split
$rec
" "
]
1
]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment