Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
intranet-timesheet2-tasks
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-tasks
Commits
8b4c30c9
Commit
8b4c30c9
authored
Jan 22, 2007
by
Christof Damian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- use my own query instead of the view to include "note" field
- prepare for components
parent
a7ff982e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
4 deletions
+23
-4
new.tcl
www/new.tcl
+23
-4
No files found.
www/new.tcl
View file @
8b4c30c9
...
...
@@ -32,6 +32,9 @@ set context [list $page_title]
set
normalize_project_nr_p
[
parameter::get_from_package_key -package_key
"intranet-core"
-parameter
"NormalizeProjectNrP"
-default 1
]
set
current_user_id
$user
_id
set
user_admin_p
[
im_is_user_site_wide_or_intranet_admin
$user
_id
]
# Check the case if there is no project specified.
# This is only OK if there is a task_id specified (new task for project
)
.
if
{
0 ==
$project
_id
}
{
...
...
@@ -157,7 +160,7 @@ ad_form \
{
uom_id:text
(
select
)
{
label
"UoM<br>(Unit of Measure)"
}
{
options
$uom
_options
}
}
{
planned_units:float
(
text
)
,optional
{
label
"Planned Units"
}
{
html
{
size 10
}}}
{
billable_units:float
(
text
)
,optional
{
label
"Billable Units"
}
{
html
{
size 10
}}}
{
description
:text
(
textarea
)
,optional
{
label Description
}
{
html
{
cols 40
}}}
{
note
:text
(
textarea
)
,optional
{
label Description
}
{
html
{
cols 40
}}}
}
...
...
@@ -184,9 +187,25 @@ ad_form -extend -name task -on_request {
}
-select_query
{
select m.*
from im_timesheet_tasks_view m
where m.task_id = :task_id
select t.*,
p.parent_id as project_id,
p.project_name as task_name,
p.project_nr as task_nr,
p.percent_completed,
p.project_type_id as task_type_id,
p.project_status_id as task_status_id,
p.start_date,
p.end_date,
p.reported_hours_cache,
p.reported_hours_cache as reported_units_cache,
p.note
from
im_projects p,
im_timesheet_tasks t
where
t.task_id = :task_id
and p.project_id = :task_id
}
-new_data
{
...
...
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