* Adjust some view file of user module.
This commit is contained in:
chenfeiCF
+15
-9
@@ -898,7 +898,7 @@ class user extends control
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
public function dynamic($period = 'today', $account = '', $orderBy = 'date_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
|
||||
public function dynamic($period = 'today', $account = '', $recTotal = 0, $direction = 'next')
|
||||
{
|
||||
/* set menus. */
|
||||
$this->lang->set('menugroup.user', 'company');
|
||||
@@ -919,19 +919,25 @@ class user extends control
|
||||
|
||||
/* Set the pager. */
|
||||
$this->app->loadClass('pager', $static = true);
|
||||
$pager = pager::init($recTotal, $recPerPage, $pageID);
|
||||
$this->view->orderBy = $orderBy;
|
||||
$this->view->pager = $pager;
|
||||
$pager = pager::init($recTotal, $recPerPage = 50, $pageID = 1);
|
||||
|
||||
/* Append id for secend sort. */
|
||||
$orderBy = $direction == 'next' ? 'date_desc' : 'date_asc';
|
||||
$sort = $this->loadModel('common')->appendOrder($orderBy);
|
||||
|
||||
$actions = $this->loadModel('action')->getDynamic($account, $period, $orderBy, $pager);
|
||||
|
||||
$this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->dynamic;
|
||||
$this->view->position[] = $this->lang->user->dynamic;
|
||||
|
||||
/* Assign. */
|
||||
$this->view->period = $period;
|
||||
$this->view->users = $this->loadModel('user')->getPairs('noletter');
|
||||
$this->view->account = $account;
|
||||
$this->view->user = $this->user->getById($account);
|
||||
$this->view->actions = $this->loadModel('action')->getDynamic($account, $period, $orderBy, $pager);
|
||||
$this->view->type = $period;
|
||||
$this->view->users = $this->loadModel('user')->getPairs('noletter');
|
||||
$this->view->account = $account;
|
||||
$this->view->pager = $pager;
|
||||
$this->view->user = $this->user->getById($account);
|
||||
$this->view->dateGroups = $this->action->buildDateGroup($actions, $direction);
|
||||
$this->view->direction = $direction;
|
||||
$this->display();
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
#dynamics {padding: 10px 0;}
|
||||
.dynamic {position: relative; padding-left: 170px;}
|
||||
.dynamic-date {position: absolute; left: 0; top: 0; width: 150px; border: 2px solid #eee; border-radius: 4px; padding: 14px 20px; height: 58px;}
|
||||
.dynamic-date:before {content: ' '; display: block; position: absolute; right: -22px; top: 26px; height: 2px; width: 20px; background-color: #eee;}
|
||||
.dynamic-date > .date-label,
|
||||
.dynamic-date > .date-text {font-size: 18px; display: block;}
|
||||
.dynamic-date > .date-label + .date-text {font-size: 14px; line-height: 14px;}
|
||||
.dynamic-date > .date-label {margin-top: -8px;}
|
||||
.dynamic-date > .btn {position: absolute; right: 10px; top: 15px;}
|
||||
.dynamic .timeline {border: 2px solid #eee; border-radius: 4px; margin-bottom: 20px; padding: 10px 20px 10px 100px; max-height: 800px; transition: max-height .2s; overflow: hidden;}
|
||||
.dynamic .timeline-tag {left: -75px; font-size: 14px; color: #838A9D;}
|
||||
.dynamic .timeline-text {color: #3C4353;}
|
||||
.dynamic .text-muted {color: #838A9D;}
|
||||
.dynamic .label-id {top: -1px;}
|
||||
.dynamic.active .timeline,
|
||||
.dynamic.active .dynamic-date {border-color: #00a9fc;}
|
||||
.dynamic.active .dynamic-date:before {background-color: #00a9fc;}
|
||||
.dynamic.collapsed .timeline {max-height: 58px;}
|
||||
.dynamic.collapsed .timeline > li + li:after {display: none;}
|
||||
.dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d7';}
|
||||
@@ -23,34 +23,38 @@
|
||||
?>
|
||||
</ul>
|
||||
</div>
|
||||
<table class='table tablesorter table-fixed'>
|
||||
<thead>
|
||||
<tr class='colhead'>
|
||||
<th class='w-id'><?php echo $lang->idAB;?></th>
|
||||
<th class='w-severity'><?php echo $lang->bug->severityAB;?></th>
|
||||
<th class='w-pri'><?php echo $lang->priAB;?></th>
|
||||
<th class='w-type'><?php echo $lang->typeAB;?></th>
|
||||
<th><?php echo $lang->bug->title;?></th>
|
||||
<th class='w-user'><?php echo $lang->openedByAB;?></th>
|
||||
<th class='w-user'><?php echo $lang->bug->resolvedBy;?></th>
|
||||
<th class='w-resolution'><?php echo $lang->bug->resolutionAB;?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach($bugs as $bug):?>
|
||||
<tr class='text-center'>
|
||||
<td><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->id, '_blank');?></td>
|
||||
<td><span class='<?php echo 'severity' . zget($lang->bug->severityList, $bug->severity, $bug->severity)?>'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity)?></span></td>
|
||||
<td><span class='<?php echo 'pri' . zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
|
||||
<td><?php echo $lang->bug->typeList[$bug->type]?></td>
|
||||
<td class='text-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
|
||||
<td><?php echo $users[$bug->openedBy];?></td>
|
||||
<td><?php echo $users[$bug->resolvedBy];?></td>
|
||||
<td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
<tfoot><tr><td colspan='8'><?php echo $pager->show();?></td></tr></tfoot>
|
||||
</table>
|
||||
<div id='mainContent'>
|
||||
<table class='table has-sort-head table-fixed'>
|
||||
<thead>
|
||||
<tr class='colhead'>
|
||||
<th class='w-id'><?php echo $lang->idAB;?></th>
|
||||
<th class='w-severity'><?php echo $lang->bug->severityAB;?></th>
|
||||
<th class='w-pri'><?php echo $lang->priAB;?></th>
|
||||
<th class='w-type'><?php echo $lang->typeAB;?></th>
|
||||
<th><?php echo $lang->bug->title;?></th>
|
||||
<th class='w-user'><?php echo $lang->openedByAB;?></th>
|
||||
<th class='w-user'><?php echo $lang->bug->resolvedBy;?></th>
|
||||
<th class='w-resolution'><?php echo $lang->bug->resolutionAB;?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach($bugs as $bug):?>
|
||||
<tr class='text-center'>
|
||||
<td><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->id, '_blank');?></td>
|
||||
<td><span class='<?php echo 'severity' . zget($lang->bug->severityList, $bug->severity, $bug->severity)?>'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity)?></span></td>
|
||||
<td><span class='<?php echo 'pri' . zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
|
||||
<td><?php echo $lang->bug->typeList[$bug->type]?></td>
|
||||
<td class='text-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
|
||||
<td><?php echo $users[$bug->openedBy];?></td>
|
||||
<td><?php echo $users[$bug->resolvedBy];?></td>
|
||||
<td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
</table>
|
||||
<?php if($bugs):?>
|
||||
<div class="table-footer"><?php $pager->show('right', 'pagerjs');?></div>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
<script language='javascript'>$("#<?php echo $type;?>Tab").addClass('active');</script>
|
||||
<?php include '../../common/view/footer.html.php';?>
|
||||
|
||||
@@ -13,47 +13,93 @@
|
||||
<?php include '../../common/view/header.html.php';?>
|
||||
<?php include '../../common/view/tablesorter.html.php';?>
|
||||
<?php include './featurebar.html.php';?>
|
||||
<div class='sub-featurebar'>
|
||||
<ul class='nav'>
|
||||
<?php
|
||||
echo "<li id='today'>" . html::a(inLink('dynamic', "period=today&account=$account"), $lang->action->dynamic->today) . '</li>';
|
||||
echo "<li id='yesterday'>" . html::a(inLink('dynamic', "period=yesterday&account=$account"), $lang->action->dynamic->yesterday) . '</li>';
|
||||
echo "<li id='twodaysago'>" . html::a(inLink('dynamic', "period=twodaysago&account=$account"), $lang->action->dynamic->twoDaysAgo) . '</li>';
|
||||
echo "<li id='thisweek'>" . html::a(inLink('dynamic', "period=thisweek&account=$account"), $lang->action->dynamic->thisWeek) . '</li>';
|
||||
echo "<li id='lastweek'>" . html::a(inLink('dynamic', "period=lastweek&account=$account"), $lang->action->dynamic->lastWeek) . '</li>';
|
||||
echo "<li id='thismonth'>" . html::a(inLink('dynamic', "period=thismonth&account=$account"), $lang->action->dynamic->thisMonth) . '</li>';
|
||||
echo "<li id='lastmonth'>" . html::a(inLink('dynamic', "period=lastmonth&account=$account"), $lang->action->dynamic->lastMonth) . '</li>';
|
||||
echo "<li id='all'>" . html::a(inLink('dynamic', "period=all&account=$account"), $lang->action->dynamic->all) . '</li>';
|
||||
<div id="mainMenu" class="clearfix">
|
||||
<div class="btn-toolbar pull-left">
|
||||
<?php foreach($lang->action->periods as $period => $label):?>
|
||||
<?php
|
||||
$label = "<span class='text'>$label</span>";
|
||||
$active = '';
|
||||
if($period == $type)
|
||||
{
|
||||
$active = 'btn-active-text';
|
||||
$label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
|
||||
}
|
||||
echo html::a(inlink('dynamic', "type=$period&account=$account"), $label, '', "class='btn btn-link $active' id='{$period}'")
|
||||
?>
|
||||
</ul>
|
||||
<?php endforeach;?>
|
||||
</div>
|
||||
</div>
|
||||
<div id="mainContent" class="main-content">
|
||||
<div id="dynamics">
|
||||
<?php $firstAction = '';?>
|
||||
<?php foreach($dateGroups as $date => $actions):?>
|
||||
<?php $isToday = date(DT_DATE4) == $date;?>
|
||||
<div class="dynamic <?php if($isToday) echo 'active';?>">
|
||||
<div class="dynamic-date">
|
||||
<?php if($isToday):?>
|
||||
<span class="date-label"><?php echo $lang->action->dynamic->today;?></span>
|
||||
<?php endif;?>
|
||||
<span class="date-text"><?php echo $date;?></span>
|
||||
<button type="button" class="btn btn-info btn-icon btn-sm dynamic-btn"><i class="icon icon-caret-up"></i></button>
|
||||
</div>
|
||||
<ul class="timeline timeline-tag-left">
|
||||
<?php if($direction == 'next') $actions = array_reverse($actions);?>
|
||||
<?php foreach($actions as $i => $action):?>
|
||||
<?php if(empty($firstAction)) $firstAction = $action;?>
|
||||
<li <?php if($action->actor == $this->app->user->account) echo "class='active'";?>>
|
||||
<div>
|
||||
<span class="timeline-tag"><?php echo $action->time?></span>
|
||||
<span class="timeline-text">
|
||||
<?php echo $app->user->realname . ' ' . $action->actionLabel;?>
|
||||
<span class="text-muted"><?php echo $action->objectLabel;?></span>
|
||||
<span class="label label-id"><?php echo $action->objectID;?></span>
|
||||
<?php echo html::a($action->objectLink, $action->objectName);?>
|
||||
</span>
|
||||
</div>
|
||||
</li>
|
||||
<?php endforeach;?>
|
||||
</ul>
|
||||
</div>
|
||||
<?php endforeach;?>
|
||||
</div>
|
||||
<?php if(!empty($firstAction)):?>
|
||||
<?php
|
||||
$firstDate = date('Y-m-d', strtotime($firstAction->originalDate) + 24 * 3600);
|
||||
$lastDate = substr($action->originalDate, 0, 10);
|
||||
$hasPre = $this->action->hasPreOrNext($firstDate, 'pre');
|
||||
$hasNext = $this->action->hasPreOrNext($lastDate, 'next');
|
||||
?>
|
||||
<?php if($hasPre or $hasNext):?>
|
||||
<div class='table-footer'>
|
||||
<ul class='pager'>
|
||||
<?php $class = $hasPre ? '' : 'disabled';?>
|
||||
<li class='<?php echo $class;?> pager-item-left'>
|
||||
<?php
|
||||
$link = '###';
|
||||
if($hasPre) $link = inlink('dynamic', "type=$type&recTotal={$pager->recTotal}&date=" . strtotime($firstDate) . '&direction=pre');
|
||||
echo html::a($link, '<i class="icon icon-angle-left"></i>', '', "class='pager-item'");
|
||||
?>
|
||||
</li>
|
||||
<?php $class = $hasNext ? '' : 'disabled';?>
|
||||
<li class='<?php echo $class;?> pager-item-left'>
|
||||
<?php
|
||||
$link = '###';
|
||||
if($hasNext) $link = inlink('dynamic', "type=$type&recTotal={$pager->recTotal}&date=" . strtotime($lastDate) . '&direction=next');
|
||||
echo html::a($link, '<i class="icon icon-angle-right"></i>', '', "class='pager-item'");
|
||||
?>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<?php endif;?>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
<table class='table tablesorter table-fixed'>
|
||||
<thead>
|
||||
<tr class='colhead'>
|
||||
<th class='w-150px'><?php echo $lang->action->date;?></th>
|
||||
<th class='w-user'> <?php echo $lang->action->actor;?></th>
|
||||
<th class='w-100px'><?php echo $lang->action->action;?></th>
|
||||
<th class='w-80px'> <?php echo $lang->action->objectType;?></th>
|
||||
<th class='w-id'> <?php echo $lang->idAB;?></th>
|
||||
<th><?php echo $lang->action->objectName;?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach($actions as $action):?>
|
||||
<?php $module = $action->objectType == 'case' ? 'testcase' : $action->objectType;?>
|
||||
<tr class='text-center'>
|
||||
<td><?php echo $action->date;?></td>
|
||||
<td><?php echo $users[$action->actor];?></td>
|
||||
<td><?php echo $action->actionLabel;?></td>
|
||||
<td><?php echo $lang->action->objectTypes[$action->objectType];?></td>
|
||||
<td><?php echo $action->objectID;?></td>
|
||||
<td class='text-left'><?php echo html::a($action->objectLink, $action->objectName);?></td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
<tfoot><tr><td colspan='6'><?php $pager->show();?></td></tr></tfoot>
|
||||
</table>
|
||||
<script type='text/javascript'>
|
||||
$(function(){$('#<?php echo $period?>').addClass('active');})
|
||||
$(function()
|
||||
{
|
||||
$('#dynamics').on('click', '.dynamic-btn', function()
|
||||
{
|
||||
$(this).closest('.dynamic').toggleClass('collapsed');
|
||||
});
|
||||
})
|
||||
</script>
|
||||
<?php include '../../common/view/footer.html.php';?>
|
||||
|
||||
@@ -2,47 +2,58 @@
|
||||
<div id="mainMenu" class="clearfix">
|
||||
<div class="btn-toolbar pull-left">
|
||||
<?php
|
||||
if(!isset($type)) $type = 'today';
|
||||
if(!isset($period)) $period = 'today';
|
||||
$date = isset($date) ? $date : helper::today();
|
||||
|
||||
echo "<li class='w-150px'>" . $userList . '</li>';
|
||||
echo "<div class='input-control space w-150px'>" . $userList . "</div>";
|
||||
|
||||
$methodName = $this->app->getMethodName();
|
||||
|
||||
if($config->global->flow == 'full')
|
||||
{
|
||||
$label = "<span class='text'>{$lang->user->todo}</span>";
|
||||
echo html::a($this->createLink('user', 'todo', "account=$account"), $label);
|
||||
$active = $methodName == 'todo' ? ' btn-active-text' : '';
|
||||
echo html::a($this->createLink('user', 'todo', "account=$account"), $label, '', "class='btn btn-link $active'");
|
||||
}
|
||||
|
||||
if($config->global->flow != 'onlyTask' and $config->global->flow != 'onlyTest')
|
||||
{
|
||||
echo html::a($this->createLink('user', 'story', "account=$account"), $lang->user->story);
|
||||
$label = "<span class='text'>{$lang->user->story}</span>";
|
||||
$active = $methodName == 'story' ? ' btn-active-text' : '';
|
||||
echo html::a($this->createLink('user', 'story', "account=$account"), $label, '', "class='btn btn-link $active'");
|
||||
}
|
||||
|
||||
if($config->global->flow == 'full' or $config->global->flow == 'onlyTask')
|
||||
{
|
||||
echo html::a($this->createLink('user', 'task', "account=$account"), $lang->user->task);
|
||||
$label = "<span class='text'>{$lang->user->task}</span>";
|
||||
$active = $methodName == 'task' ? ' btn-active-text' : '';
|
||||
echo html::a($this->createLink('user', 'task', "account=$account"), $label, '', "class='btn btn-link $active'");
|
||||
}
|
||||
|
||||
if($config->global->flow == 'full' or $config->global->flow == 'onlyTest')
|
||||
{
|
||||
echo html::a($this->createLink('user', 'bug', "account=$account"), $lang->user->bug);
|
||||
echo html::a($this->createLink('user', 'testtask', "account=$account"), $lang->user->test);
|
||||
$label = "<span class='text'>{$lang->user->bug}</span>";
|
||||
$active = $methodName == 'bug' ? ' btn-active-text' : '';
|
||||
echo html::a($this->createLink('user', 'bug', "account=$account"), $label, '', "class='btn btn-link $active'");
|
||||
|
||||
$label = "<span class='text'>{$lang->user->test}</span>";
|
||||
$active = $methodName == 'testtask' ? ' btn-active-text' : '';
|
||||
echo html::a($this->createLink('user', 'testtask', "account=$account"), $label, '', "class='btn btn-link $active'");
|
||||
}
|
||||
echo html::a($this->createLink('user', 'dynamic', "type=today&account=$account"), $lang->user->dynamic);
|
||||
|
||||
$label = "<span class='text'>{$lang->user->dynamic}</span>";
|
||||
$active = $methodName == 'dynamic' ? ' btn-active-text' : '';
|
||||
echo html::a($this->createLink('user', 'dynamic', "type=today&account=$account"), $label, '', "class='btn btn-link $active'");
|
||||
|
||||
if($config->global->flow == 'full' or $config->global->flow == 'onlyTask')
|
||||
{
|
||||
echo html::a($this->createLink('user', 'project', "account=$account"), $lang->user->project);
|
||||
$label = "<span class='text'>{$lang->user->project}</span>";
|
||||
$active = $methodName == 'project' ? ' btn-active-text' : '';
|
||||
echo html::a($this->createLink('user', 'project', "account=$account"), $label, '', "class='btn btn-link $active'");
|
||||
}
|
||||
echo html::a($this->createLink('user', 'profile', "account=$account"), $lang->user->profile);
|
||||
|
||||
$activedSpan = $this->app->getMethodName() . 'Tab';
|
||||
echo "<script>$('#$activedSpan').addClass('active')</script>";
|
||||
$label = "<span class='text'>{$lang->user->profile}</span>";
|
||||
$active = $methodName == 'profile' ? ' btn-active-text' : '';
|
||||
echo html::a($this->createLink('user', 'profile', "account=$account"), $label, '', "class='btn btn-link $active'");
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
var type = '<?php echo $type;?>';
|
||||
var period = '<?php echo $period;?>';
|
||||
</script>
|
||||
|
||||
@@ -13,17 +13,17 @@
|
||||
<?php include '../../common/view/header.html.php';?>
|
||||
<?php include '../../common/view/tablesorter.html.php';?>
|
||||
<?php include './featurebar.html.php';?>
|
||||
<div class='container mw-600px'>
|
||||
<div id='titlebar'>
|
||||
<div class='heading'>
|
||||
<div id='mainContent' class='main-content'>
|
||||
<div class='main-header'>
|
||||
<h2>
|
||||
<span class='prefix' title='USER'><?php echo html::icon($lang->icons['user']);?> <strong><?php echo $user->id;?></strong></span>
|
||||
<strong><?php echo $user->realname;?> (<small><?php echo $user->account;?></small>)</strong>
|
||||
<small class='text-muted'> <?php echo $lang->user->profile;?> <?php echo html::icon('eye-open');?></small>
|
||||
</div>
|
||||
<div class='actions'>
|
||||
<?php echo html::a($this->createLink('user', 'edit', "userID=$user->id"), html::icon('pencil') . ' ' . $lang->user->editProfile, '', "class='btn btn-primary'"); ?>
|
||||
</div>
|
||||
</h2>
|
||||
<div class='actions'>
|
||||
<?php echo html::a($this->createLink('user', 'edit', "userID=$user->id"), html::icon('pencil') . ' ' . $lang->user->editProfile, '', "class='btn btn-primary'"); ?>
|
||||
</div>
|
||||
|
||||
<table class='table table-borderless table-data'>
|
||||
<tr>
|
||||
<th class='w-100px'><?php echo $lang->user->dept;?></th>
|
||||
|
||||
@@ -13,39 +13,41 @@
|
||||
<?php include '../../common/view/header.html.php';?>
|
||||
<?php include '../../common/view/tablesorter.html.php';?>
|
||||
<?php include './featurebar.html.php';?>
|
||||
<table class='table tablesorter'>
|
||||
<thead>
|
||||
<tr class='colhead'>
|
||||
<th class='w-id'><?php echo $lang->idAB;?></th>
|
||||
<th class='w-100px'><?php echo $lang->project->code;?></th>
|
||||
<th class="text-left"><?php echo $lang->project->name;?></th>
|
||||
<th class='w-date'><?php echo $lang->project->begin;?></th>
|
||||
<th class='w-date'><?php echo $lang->project->end;?></th>
|
||||
<th class='w-status'><?php echo $lang->statusAB;?></th>
|
||||
<th class='w-user'><?php echo $lang->team->role;?></th>
|
||||
<th class='w-date'><?php echo $lang->team->join;?></th>
|
||||
<th class='w-110px'><?php echo $lang->team->hours;?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach($projects as $project):?>
|
||||
<?php $projectLink = $this->createLink('project', 'browse', "projectID=$project->id");?>
|
||||
<tr class='text-center'>
|
||||
<td><?php echo html::a($projectLink, $project->id);?></td>
|
||||
<td><?php echo $project->code;?></td>
|
||||
<td class="text-left"><?php echo html::a($projectLink, $project->name);?></td>
|
||||
<td><?php echo $project->begin;?></td>
|
||||
<td><?php echo $project->end;?></td>
|
||||
<?php if(isset($project->delay)):?>
|
||||
<td class='project-delay'><?php echo $lang->project->delayed;?></td>
|
||||
<?php else:?>
|
||||
<td class='project-<?php echo $project->status?>'><?php echo $lang->project->statusList[$project->status];?></td>
|
||||
<?php endif;?>
|
||||
<td><?php echo $project->role;?></td>
|
||||
<td><?php echo $project->join;?></td>
|
||||
<td><?php echo $project->hours;?></td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
</table>
|
||||
<div id='mainContent'>
|
||||
<table class='table has-sort-head table-fixed'>
|
||||
<thead>
|
||||
<tr class='colhead'>
|
||||
<th class='w-id'><?php echo $lang->idAB;?></th>
|
||||
<th class='w-100px'><?php echo $lang->project->code;?></th>
|
||||
<th class="text-left"><?php echo $lang->project->name;?></th>
|
||||
<th class='w-date'><?php echo $lang->project->begin;?></th>
|
||||
<th class='w-date'><?php echo $lang->project->end;?></th>
|
||||
<th class='w-status'><?php echo $lang->statusAB;?></th>
|
||||
<th class='w-user'><?php echo $lang->team->role;?></th>
|
||||
<th class='w-date'><?php echo $lang->team->join;?></th>
|
||||
<th class='w-110px'><?php echo $lang->team->hours;?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach($projects as $project):?>
|
||||
<?php $projectLink = $this->createLink('project', 'browse', "projectID=$project->id");?>
|
||||
<tr class='text-center'>
|
||||
<td><?php echo html::a($projectLink, $project->id);?></td>
|
||||
<td><?php echo $project->code;?></td>
|
||||
<td class="text-left"><?php echo html::a($projectLink, $project->name);?></td>
|
||||
<td><?php echo $project->begin;?></td>
|
||||
<td><?php echo $project->end;?></td>
|
||||
<?php if(isset($project->delay)):?>
|
||||
<td class='project-delay'><?php echo $lang->project->delayed;?></td>
|
||||
<?php else:?>
|
||||
<td class='project-<?php echo $project->status?>'><?php echo $lang->project->statusList[$project->status];?></td>
|
||||
<?php endif;?>
|
||||
<td><?php echo $project->role;?></td>
|
||||
<td><?php echo $project->join;?></td>
|
||||
<td><?php echo $project->hours;?></td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<?php include '../../common/view/footer.html.php';?>
|
||||
|
||||
@@ -24,36 +24,40 @@
|
||||
?>
|
||||
</ul>
|
||||
</div>
|
||||
<table class='table tablesorter' id='tasktable'>
|
||||
<thead>
|
||||
<tr class='colhead'>
|
||||
<th class='w-id'><?php echo $lang->idAB;?></th>
|
||||
<th class='w-pri'><?php echo $lang->priAB;?></th>
|
||||
<th><?php echo $lang->task->project;?></th>
|
||||
<th><?php echo $lang->task->name;?></th>
|
||||
<th class='w-hour'><?php echo $lang->task->estimateAB;?></th>
|
||||
<th class='w-70px'><?php echo $lang->task->consumedAB;?></th>
|
||||
<th class='w-hour'><?php echo $lang->task->leftAB;?></th>
|
||||
<th class='w-date'><?php echo $lang->task->deadlineAB;?></th>
|
||||
<th class='w-70px'><?php echo $lang->statusAB;?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach($tasks as $task):?>
|
||||
<tr class='text-center'>
|
||||
<td><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
|
||||
<td><span class='<?php echo 'pri' . zget($lang->task->priList, $task->pri, $task->pri);?>'><?php echo $task->pri == '0' ? '' : zget($lang->task->priList, $task->pri, $task->pri)?></span></td>
|
||||
<td class='nobr'><?php echo html::a($this->createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?></td>
|
||||
<td class='text-left nobr'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name);?></td>
|
||||
<td><?php echo $task->estimate;?></td>
|
||||
<td><?php echo $task->consumed;?></td>
|
||||
<td><?php echo $task->left;?></td>
|
||||
<td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
|
||||
<td class='<?php echo $task->status;?>'><?php echo $lang->task->statusList[$task->status];?></td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
<tfoot><tr><td colspan='9'><?php $pager->show();?></td></tr></tfoot>
|
||||
</table>
|
||||
<div id='mainContent'>
|
||||
<table class='table has-sort-head table-fixed' id='tasktable'>
|
||||
<thead>
|
||||
<tr class='colhead'>
|
||||
<th class='w-id'><?php echo $lang->idAB;?></th>
|
||||
<th class='w-pri'><?php echo $lang->priAB;?></th>
|
||||
<th><?php echo $lang->task->project;?></th>
|
||||
<th><?php echo $lang->task->name;?></th>
|
||||
<th class='w-hour'><?php echo $lang->task->estimateAB;?></th>
|
||||
<th class='w-70px'><?php echo $lang->task->consumedAB;?></th>
|
||||
<th class='w-hour'><?php echo $lang->task->leftAB;?></th>
|
||||
<th class='w-date'><?php echo $lang->task->deadlineAB;?></th>
|
||||
<th class='w-70px'><?php echo $lang->statusAB;?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach($tasks as $task):?>
|
||||
<tr class='text-center'>
|
||||
<td><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
|
||||
<td><span class='<?php echo 'pri' . zget($lang->task->priList, $task->pri, $task->pri);?>'><?php echo $task->pri == '0' ? '' : zget($lang->task->priList, $task->pri, $task->pri)?></span></td>
|
||||
<td class='nobr'><?php echo html::a($this->createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?></td>
|
||||
<td class='text-left nobr'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name);?></td>
|
||||
<td><?php echo $task->estimate;?></td>
|
||||
<td><?php echo $task->consumed;?></td>
|
||||
<td><?php echo $task->left;?></td>
|
||||
<td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
|
||||
<td class='<?php echo $task->status;?>'><?php echo $lang->task->statusList[$task->status];?></td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
</table>
|
||||
<?php if($tasks):?>
|
||||
<div class="table-footer"><?php $pager->show('right', 'pagerjs');?></div>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
<script language='javascript'>$("#<?php echo $type;?>Tab").addClass('active');</script>
|
||||
<?php include '../../common/view/footer.html.php';?>
|
||||
|
||||
@@ -21,33 +21,37 @@
|
||||
?>
|
||||
</ul>
|
||||
</div>
|
||||
<table class='table tablesorter table-fixed'>
|
||||
<?php $vars = "account=$account&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
|
||||
<thead>
|
||||
<tr class='colhead'>
|
||||
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
|
||||
<th> <?php common::printOrderLink('name', $orderBy, $vars, $lang->testtask->name);?></th>
|
||||
<th> <?php common::printOrderLink('project', $orderBy, $vars, $lang->testtask->project);?></th>
|
||||
<th> <?php common::printOrderLink('build', $orderBy, $vars, $lang->testtask->build);?></th>
|
||||
<th class='w-80px'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->testtask->begin);?></th>
|
||||
<th class='w-80px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->testtask->end);?></th>
|
||||
<th class='w-50px'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach($tasks as $task):?>
|
||||
<tr class='text-center'>
|
||||
<td><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
|
||||
<td class='text-left nobr'><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), $task->name);?></td>
|
||||
<td class='nobr'><?php echo $task->projectName?></td>
|
||||
<td class='nobr'><?php $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?></td>
|
||||
<td><?php echo $task->begin?></td>
|
||||
<td><?php echo $task->end?></td>
|
||||
<td class='task-<?php echo $task->status?>'><?php echo $lang->testtask->statusList[$task->status];?></td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
<tfoot><tr><td colspan='7'><?php $pager->show();?></td></tr></tfoot>
|
||||
</table>
|
||||
<div id='mainContent'>
|
||||
<table class='table has-sort-head table-fixed'>
|
||||
<?php $vars = "account=$account&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
|
||||
<thead>
|
||||
<tr class='colhead'>
|
||||
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
|
||||
<th> <?php common::printOrderLink('name', $orderBy, $vars, $lang->testtask->name);?></th>
|
||||
<th> <?php common::printOrderLink('project', $orderBy, $vars, $lang->testtask->project);?></th>
|
||||
<th> <?php common::printOrderLink('build', $orderBy, $vars, $lang->testtask->build);?></th>
|
||||
<th class='w-80px'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->testtask->begin);?></th>
|
||||
<th class='w-80px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->testtask->end);?></th>
|
||||
<th class='w-50px'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach($tasks as $task):?>
|
||||
<tr class='text-center'>
|
||||
<td><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
|
||||
<td class='text-left nobr'><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), $task->name);?></td>
|
||||
<td class='nobr'><?php echo $task->projectName?></td>
|
||||
<td class='nobr'><?php $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?></td>
|
||||
<td><?php echo $task->begin?></td>
|
||||
<td><?php echo $task->end?></td>
|
||||
<td class='task-<?php echo $task->status?>'><?php echo $lang->testtask->statusList[$task->status];?></td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
</table>
|
||||
<?php if($tasks):?>
|
||||
<div class="table-footer"><?php $pager->show('right', 'pagerjs');?></div>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
<script language="Javascript">$("#testTab").addClass('active'); $("#testtaskTab").addClass('active');</script>
|
||||
<?php include '../../common/view/footer.html.php';?>
|
||||
|
||||
Reference in New Issue
Block a user