projects
/
timetracker.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e11d527
)
Some more renaming.
author
anuko
<support@anuko.com>
Sun, 23 Oct 2016 16:02:16 +0000
(16:02 +0000)
committer
anuko
<support@anuko.com>
Sun, 23 Oct 2016 16:02:16 +0000
(16:02 +0000)
WEB-INF/lib/ttUser.class.php
patch
|
blob
|
history
WEB-INF/templates/mobile/users.tpl
patch
|
blob
|
history
WEB-INF/templates/users.tpl
patch
|
blob
|
history
mobile/users.php
patch
|
blob
|
history
profile_edit.php
patch
|
blob
|
history
users.php
patch
|
blob
|
history
diff --git
a/WEB-INF/lib/ttUser.class.php
b/WEB-INF/lib/ttUser.class.php
index
51e844b
..
3f26962
100644
(file)
--- a/
WEB-INF/lib/ttUser.class.php
+++ b/
WEB-INF/lib/ttUser.class.php
@@
-43,7
+43,7
@@
class ttUser {
var $week_start = 0; // Week start day.
var $tracking_mode = 0; // Tracking mode.
var $record_type = 0; // Record type (duration vs start and finish, or both).
var $week_start = 0; // Week start day.
var $tracking_mode = 0; // Tracking mode.
var $record_type = 0; // Record type (duration vs start and finish, or both).
- var $uncompleted_
entries = 0; // Uncompleted entrie
s (show nowhere or on users page).
+ var $uncompleted_
indicators = 0; // Uncompleted time entry indicator
s (show nowhere or on users page).
var $currency = null; // Currency.
var $plugins = null; // Comma-separated list of enabled plugins.
var $team = null; // Team name.
var $currency = null; // Currency.
var $plugins = null; // Comma-separated list of enabled plugins.
var $team = null; // Team name.
@@
-93,7
+93,7
@@
class ttUser {
$this->week_start = $val['week_start'];
$this->tracking_mode = $val['tracking_mode'];
$this->record_type = $val['record_type'];
$this->week_start = $val['week_start'];
$this->tracking_mode = $val['tracking_mode'];
$this->record_type = $val['record_type'];
- $this->uncompleted_
entrie
s = $val['uncompleted_indicators'];
+ $this->uncompleted_
indicator
s = $val['uncompleted_indicators'];
$this->team = $val['team_name'];
$this->address = $val['address'];
$this->currency = $val['currency'];
$this->team = $val['team_name'];
$this->address = $val['address'];
$this->currency = $val['currency'];
diff --git
a/WEB-INF/templates/mobile/users.tpl
b/WEB-INF/templates/mobile/users.tpl
index
e43f0f6
..
202e018
100644
(file)
--- a/
WEB-INF/templates/mobile/users.tpl
+++ b/
WEB-INF/templates/mobile/users.tpl
@@
-19,7
+19,7
@@
{foreach $active_users as $u}
<tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
<td>
{foreach $active_users as $u}
<tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
<td>
- {if $smarty.const.UNCOMPLETED_INDICATORS == $user->uncompleted_
entrie
s}
+ {if $smarty.const.UNCOMPLETED_INDICATORS == $user->uncompleted_
indicator
s}
<span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
{/if}
{if $user->isManager()}
<span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
{/if}
{if $user->isManager()}
diff --git
a/WEB-INF/templates/users.tpl
b/WEB-INF/templates/users.tpl
index
84e3d0e
..
99d617b
100644
(file)
--- a/
WEB-INF/templates/users.tpl
+++ b/
WEB-INF/templates/users.tpl
@@
-21,7
+21,7
@@
{foreach $active_users as $u}
<tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
<td>
{foreach $active_users as $u}
<tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
<td>
- {if $smarty.const.UNCOMPLETED_INDICATORS == $user->uncompleted_
entrie
s}
+ {if $smarty.const.UNCOMPLETED_INDICATORS == $user->uncompleted_
indicator
s}
<span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
{/if}
{$u.name|escape:'html'}
<span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
{/if}
{$u.name|escape:'html'}
diff --git
a/mobile/users.php
b/mobile/users.php
index
0023154
..
d565fc6
100644
(file)
--- a/
mobile/users.php
+++ b/
mobile/users.php
@@
-45,7
+45,7
@@
if($user->canManageTeam()) {
}
// Check if the team is set to show indicators for uncompleted time entries.
}
// Check if the team is set to show indicators for uncompleted time entries.
-if (UNCOMPLETED_INDICATORS == $user->uncompleted_
entrie
s) {
+if (UNCOMPLETED_INDICATORS == $user->uncompleted_
indicator
s) {
// Check each active user if they have an uncompleted time entry.
foreach ($active_users as $key => $user) {
$active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($user['id']);
// Check each active user if they have an uncompleted time entry.
foreach ($active_users as $key => $user) {
$active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($user['id']);
diff --git
a/profile_edit.php
b/profile_edit.php
index
09e9110
..
546d634
100644
(file)
--- a/
profile_edit.php
+++ b/
profile_edit.php
@@
-87,7
+87,7
@@
if ($request->isPost()) {
$cl_start_week = $user->week_start;
$cl_tracking_mode = $user->tracking_mode;
$cl_record_type = $user->record_type;
$cl_start_week = $user->week_start;
$cl_tracking_mode = $user->tracking_mode;
$cl_record_type = $user->record_type;
- $cl_uncompleted_entries = $user->uncompleted_
entrie
s;
+ $cl_uncompleted_entries = $user->uncompleted_
indicator
s;
// Which plugins do we have enabled?
$plugins = explode(',', $user->plugins);
// Which plugins do we have enabled?
$plugins = explode(',', $user->plugins);
diff --git
a/users.php
b/users.php
index
ce29132
..
da57040
100644
(file)
--- a/
users.php
+++ b/
users.php
@@
-45,7
+45,7
@@
if($user->canManageTeam()) {
}
// Check if the team is set to show indicators for uncompleted time entries.
}
// Check if the team is set to show indicators for uncompleted time entries.
-if (UNCOMPLETED_INDICATORS == $user->uncompleted_
entrie
s) {
+if (UNCOMPLETED_INDICATORS == $user->uncompleted_
indicator
s) {
// Check each active user if they have an uncompleted time entry.
foreach ($active_users as $key => $user) {
$active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($user['id']);
// Check each active user if they have an uncompleted time entry.
foreach ($active_users as $key => $user) {
$active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($user['id']);