Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
intranet-timesheet2-workflow
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
0
Merge Requests
0
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-workflow
Commits
0e453c31
Commit
0e453c31
authored
Jan 16, 2008
by
Frank Bergmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- (preliminarily) finisched timesheet new-2 logic
- fixed absences bug with duration_days
parent
bcea1eba
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
new.adp
www/conf-objects/new.adp
+2
-3
new.tcl
www/conf-objects/new.tcl
+8
-1
No files found.
www/conf-objects/new.adp
View file @
0e453c31
...
@@ -8,8 +8,7 @@
...
@@ -8,8 +8,7 @@
<formtemplate id=form></formtemplate>
<formtemplate id=form></formtemplate>
<br>
<br>
<h2>@included_hours_msg@</h2>
<!-- @modify_hours_link;noquote@ -->
<h2>@included_hours_msg@</h2>
@modify_hours_link;noquote@
<listtemplate name=@list_id@></listtemplate>
<listtemplate name=@list_id@></listtemplate>
www/conf-objects/new.tcl
View file @
0e453c31
...
@@ -150,8 +150,15 @@ set modify_hours_link ""
...
@@ -150,8 +150,15 @@ set modify_hours_link ""
if
{[
info
exists conf_id
]}
{
if
{[
info
exists conf_id
]}
{
set conf_user_id
[
db_string conf_user
"select conf_user_id from im_timesheet_conf_objects where conf_id = :conf_id"
-default 0
]
set conf_user_id
[
db_string conf_user
"select conf_user_id from im_timesheet_conf_objects where conf_id = :conf_id"
-default 0
]
if
{
$conf
_user_id ==
$user
_id
}
{
if
{
$conf
_user_id ==
$user
_id
}
{
set julian_date
[
db_string ts_date
"
select to_char(co.start_date, 'J')
from im_timesheet_conf_objects co
where conf_id = :conf_id
"
-default
""
]
set modify_hours_msg
[
lang::message::lookup
""
intranet-timesheet2-workflow.Modify_Included_Hours
"Modify Included Hours"
]
set modify_hours_msg
[
lang::message::lookup
""
intranet-timesheet2-workflow.Modify_Included_Hours
"Modify Included Hours"
]
set modify_hours_url
[
export_vars -base
"/intranet-timesheet2/hours/new"
{
julian_date
}]
set modify_hours_url
[
export_vars -base
"/intranet-timesheet2/hours/new"
{
julian_date
{
show_week_p 1
}
}]
set modify_hours_link
"<a href='
$modify
_hours_url'>
$modify
_hours_msg</a>"
set modify_hours_link
"<a href='
$modify
_hours_url'>
$modify
_hours_msg</a>"
set modify_hours_link
"<ul>
\n
<li>
$modify
_hours_link</li>
\n
</ul><br>
\n
"
set modify_hours_link
"<ul>
\n
<li>
$modify
_hours_link</li>
\n
</ul><br>
\n
"
}
}
...
...
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