Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
timesheet
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dotproject
timesheet
Commits
15ee5557
Commit
15ee5557
authored
Sep 07, 2008
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added year to period column in timesheet overview page.
parent
99a941fd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
vw_idx_inc.php
vw_idx_inc.php
+4
-3
No files found.
vw_idx_inc.php
View file @
15ee5557
...
@@ -107,8 +107,9 @@ function timesheets($type)
...
@@ -107,8 +107,9 @@ function timesheets($type)
$q
->
addTable
(
'contacts'
);
$q
->
addTable
(
'contacts'
);
$q
->
addWhere
(
'user_contact = contact_id'
);
$q
->
addWhere
(
'user_contact = contact_id'
);
$q
->
addOrder
(
'contact_last_name, contact_first_name'
);
$q
->
addOrder
(
'contact_last_name, contact_first_name'
);
if
(
!
$q
->
exec
())
if
(
!
$q
->
exec
())
{
db_error
();
db_error
();
}
$users
=
array
();
$users
=
array
();
while
(
$row
=
$q
->
fetchRow
())
{
while
(
$row
=
$q
->
fetchRow
())
{
$users
[
$row
[
'user_id'
]]
=
$row
[
'contact_last_name'
]
.
', '
.
$row
[
'contact_first_name'
];
$users
[
$row
[
'user_id'
]]
=
$row
[
'contact_last_name'
]
.
', '
.
$row
[
'contact_first_name'
];
...
@@ -155,8 +156,8 @@ function timesheets($type)
...
@@ -155,8 +156,8 @@ function timesheets($type)
}
}
else
else
$period
->
setDate
(
$row
[
"timesheet_period"
],
DATE_FORMAT_UNIXTIME
);
$period
->
setDate
(
$row
[
"timesheet_period"
],
DATE_FORMAT_UNIXTIME
);
/*debug >>*/
echo
"("
.
$row
[
"timesheet_period"
]
.
","
.
$period
->
getMonth
()
.
") "
;
//<< debug
/
/ /
*debug >>*/echo "(". $row["timesheet_period"] . "," . $period->getMonth() . ") " ; //<< debug
echo
getMonthByName
(
$period
->
getMonth
());
echo
getMonthByName
(
$period
->
getMonth
())
.
" "
.
$period
->
getYear
()
;
echo
"
\n
</a>"
;
echo
"
\n
</a>"
;
echo
"</td>"
;
echo
"</td>"
;
echo
"<td>"
.
$period
->
getYear
()
.
"</td>"
;
echo
"<td>"
.
$period
->
getYear
()
.
"</td>"
;
...
...
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