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
620d5a39
Commit
620d5a39
authored
Jan 03, 2014
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add sorting on date
parent
1e74fe2d
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
23 additions
and
8 deletions
+23
-8
addedit.php
addedit.php
+2
-1
configure.php
configure.php
+12
-1
vw_idx_approved.php
vw_idx_approved.php
+1
-1
vw_idx_inc.php
vw_idx_inc.php
+5
-2
vw_idx_open.php
vw_idx_open.php
+1
-1
vw_idx_submitted.php
vw_idx_submitted.php
+1
-1
vw_idx_timesheets.php
vw_idx_timesheets.php
+1
-1
No files found.
addedit.php
View file @
620d5a39
...
@@ -39,7 +39,8 @@ require_once( $CONFIG_FILE );
...
@@ -39,7 +39,8 @@ require_once( $CONFIG_FILE );
//Read the current config values from the config file and update the array.
//Read the current config values from the config file and update the array.
$config_options
=
array
(
$config_options
=
array
(
"approval_by"
=>
array
(
"value"
=>
''
),
"approval_by"
=>
array
(
"value"
=>
''
),
"book_year"
=>
array
(
"value"
=>
''
)
"book_year"
=>
array
(
"value"
=>
''
),
"sort_order"
=>
array
(
"value"
=>
''
)
);
);
foreach
(
$config_options
as
$key
=>
$value
){
foreach
(
$config_options
as
$key
=>
$value
){
...
...
configure.php
View file @
620d5a39
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
/*
/*
* Name: Timesheet
* Name: Timesheet
* Directory: timesheet
* Directory: timesheet
* Version: 1.0.
2
* Version: 1.0.
3
* Type: user
* Type: user
* UI Name: Timesheet
* UI Name: Timesheet
* UI Icon: timesheet.png
* UI Icon: timesheet.png
...
@@ -54,6 +54,11 @@ while ( $row = $q->fetchRow()) {
...
@@ -54,6 +54,11 @@ 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'
];
}
}
/* Sort order */
$order
=
array
();
$order
[
0
]
=
"Ascending"
;
$order
[
1
]
=
"Descending"
;
/* All config options, their descriptions and their default values are defined
/* All config options, their descriptions and their default values are defined
* here. Add new config options here. Type can be "checkbox", "text", "radio" or
* here. Add new config options here. Type can be "checkbox", "text", "radio" or
* "select". If the type is "radio," it must include a set of buttons. If it's
* "select". If the type is "radio," it must include a set of buttons. If it's
...
@@ -73,6 +78,12 @@ $config_options = array(
...
@@ -73,6 +78,12 @@ $config_options = array(
"description"
=>
$AppUI
->
_
(
'Book year'
),
"description"
=>
$AppUI
->
_
(
'Book year'
),
"value"
=>
''
,
"value"
=>
''
,
"type"
=>
'text'
"type"
=>
'text'
),
"sort_order"
=>
array
(
"description"
=>
$AppUI
->
_
(
'Sort order'
),
"value"
=>
''
,
'type'
=>
'select'
,
'list'
=>
$order
)
)
);
);
...
...
vw_idx_approved.php
View file @
620d5a39
...
@@ -21,5 +21,5 @@
...
@@ -21,5 +21,5 @@
include
(
"vw_idx_inc.php"
);
include
(
"vw_idx_inc.php"
);
echo
timesheets
(
2
);
echo
timesheets
(
2
,
"Descending"
);
?>
?>
vw_idx_inc.php
View file @
620d5a39
...
@@ -66,7 +66,7 @@ function printTableHeader()
...
@@ -66,7 +66,7 @@ function printTableHeader()
echo
"</tr>"
;
echo
"</tr>"
;
}
}
function
timesheets
(
$type
)
function
timesheets
(
$type
,
$type
)
{
{
GLOBAL
$AppUI
,
$canRead
,
$canEdit
,
$canDelete
;
GLOBAL
$AppUI
,
$canRead
,
$canEdit
,
$canDelete
;
...
@@ -123,7 +123,10 @@ function timesheets($type)
...
@@ -123,7 +123,10 @@ function timesheets($type)
}
else
{
}
else
{
$q
->
addOrder
(
'timesheet_creator'
);
$q
->
addOrder
(
'timesheet_creator'
);
}
}
$q
->
addOrder
(
'timesheet_period'
);
if
(
$sort
==
"Ascending"
)
$q
->
addOrder
(
'timesheet_period ASC'
);
else
$q
->
addOrder
(
'timesheet_period DESC'
);
if
(
$type
>=
0
)
if
(
$type
>=
0
)
$q
->
addWhere
(
'timesheet_status = '
.
$type
);
$q
->
addWhere
(
'timesheet_status = '
.
$type
);
...
...
vw_idx_open.php
View file @
620d5a39
...
@@ -21,5 +21,5 @@
...
@@ -21,5 +21,5 @@
include
(
"vw_idx_inc.php"
);
include
(
"vw_idx_inc.php"
);
echo
timesheets
(
0
);
echo
timesheets
(
0
,
"Descending"
);
?>
?>
vw_idx_submitted.php
View file @
620d5a39
...
@@ -21,5 +21,5 @@
...
@@ -21,5 +21,5 @@
include
(
"vw_idx_inc.php"
);
include
(
"vw_idx_inc.php"
);
echo
timesheets
(
1
);
echo
timesheets
(
1
,
"Descending"
);
?>
?>
vw_idx_timesheets.php
View file @
620d5a39
...
@@ -21,5 +21,5 @@
...
@@ -21,5 +21,5 @@
include
(
"vw_idx_inc.php"
);
include
(
"vw_idx_inc.php"
);
echo
timesheets
(
-
1
);
echo
timesheets
(
-
1
,
"Descending"
);
?>
?>
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