Merge branch 'master' of https://github.com/easysoft/zentaopms
This commit is contained in:
tengfei
@@ -34,7 +34,7 @@ $lang->admin->info->account = 'Your ZenTao account is %s.';
|
||||
$lang->admin->info->log = 'The logs older than save days will be deleted, need to run cron.';
|
||||
|
||||
$lang->admin->notice = new stdclass();
|
||||
$lang->admin->notice->register = "Note: You haven't registered in ZenTao(www.zentao.net), register %s and get the latest ZenTao news.";
|
||||
$lang->admin->notice->register = "Note: You haven't registered in ZenTao(www.zentao.pm), register %s and get the latest ZenTao news.";
|
||||
$lang->admin->notice->ignore = "Ignore";
|
||||
$lang->admin->notice->int = "『%s』should be a positive integer.";
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ $lang->productplan->edit = "Edit";
|
||||
$lang->productplan->delete = "Delete";
|
||||
$lang->productplan->view = "Details";
|
||||
$lang->productplan->bugSummary = "<strong>%s</strong> Bugs in total on this page.";
|
||||
$lang->productplan->basicInfo = 'Basic Info';
|
||||
$lang->productplan->info = 'Info';
|
||||
$lang->productplan->batchEdit = 'Batch Edit';
|
||||
|
||||
$lang->productplan->batchUnlink = "Batch Unlink";
|
||||
|
||||
@@ -17,7 +17,7 @@ $lang->productplan->edit = "编辑计划";
|
||||
$lang->productplan->delete = "删除计划";
|
||||
$lang->productplan->view = "计划详情";
|
||||
$lang->productplan->bugSummary = "本页共 <strong>%s</strong> 个Bug";
|
||||
$lang->productplan->basicInfo = '基本信息';
|
||||
$lang->productplan->info = '信息';
|
||||
$lang->productplan->batchEdit = '批量编辑';
|
||||
|
||||
$lang->productplan->batchUnlink = "批量移除";
|
||||
|
||||
@@ -370,35 +370,39 @@
|
||||
</form>
|
||||
</div>
|
||||
<div id='planInfo' class='tab-pane'>
|
||||
<div>
|
||||
<fieldset>
|
||||
<legend><?php echo $lang->productplan->basicInfo?></legend>
|
||||
<table class='table table-data table-condensed table-borderless'>
|
||||
<tr>
|
||||
<th class='w-80px strong'><?php echo $lang->productplan->title;?></th>
|
||||
<td><?php echo $plan->title;?></td>
|
||||
</tr>
|
||||
<?php if($product->type != 'normal'):?>
|
||||
<tr>
|
||||
<th><?php echo $lang->product->branch;?></th>
|
||||
<td><?php echo $branches[$plan->branch];?></td>
|
||||
</tr>
|
||||
<?php endif;?>
|
||||
<tr>
|
||||
<th><?php echo $lang->productplan->begin;?></th>
|
||||
<td><?php echo $plan->begin;?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->productplan->end;?></th>
|
||||
<td><?php echo $plan->end;?></td>
|
||||
</tr>
|
||||
</table>
|
||||
</fieldset>
|
||||
<fieldset>
|
||||
<legend><?php echo $lang->productplan->desc;?></legend>
|
||||
<div class='article-content'><?php echo $plan->desc;?></div>
|
||||
</fieldset>
|
||||
<?php include '../../common/view/action.html.php';?>
|
||||
<div class="row-table">
|
||||
<div class="col-main">
|
||||
<fieldset>
|
||||
<legend><?php echo $lang->productplan->info?></legend>
|
||||
<table class='table table-data table-condensed table-borderless'>
|
||||
<tr>
|
||||
<th class='w-80px strong'><?php echo $lang->productplan->title;?></th>
|
||||
<td><?php echo $plan->title;?></td>
|
||||
</tr>
|
||||
<?php if($product->type != 'normal'):?>
|
||||
<tr>
|
||||
<th><?php echo $lang->product->branch;?></th>
|
||||
<td><?php echo $branches[$plan->branch];?></td>
|
||||
</tr>
|
||||
<?php endif;?>
|
||||
<tr>
|
||||
<th><?php echo $lang->productplan->begin;?></th>
|
||||
<td><?php echo $plan->begin;?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->productplan->end;?></th>
|
||||
<td><?php echo $plan->end;?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->productplan->desc;?></th>
|
||||
<td><?php echo $plan->desc;?></td>
|
||||
</tr>
|
||||
</table>
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="col-side">
|
||||
<?php include '../../common/view/action.html.php';?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -252,67 +252,68 @@
|
||||
</div>
|
||||
|
||||
<div class='tab-pane <?php if($type == 'releaseInfo') echo 'active'?>' id='releaseInfo'>
|
||||
<div>
|
||||
<fieldset>
|
||||
<legend><?php echo $lang->release->desc;?></legend>
|
||||
<div class='article-content'><?php echo $release->desc;?></div>
|
||||
</fieldset>
|
||||
<fieldset>
|
||||
<legend><?php echo $lang->release->basicInfo?></legend>
|
||||
<table class='table table-data table-condensed table-borderless table-fixed'>
|
||||
<tr>
|
||||
<th class='w-80px'><?php echo $lang->release->product;?></th>
|
||||
<td><?php echo $release->productName;?></td>
|
||||
</tr>
|
||||
<?php if($release->productType != 'normal'):?>
|
||||
<tr>
|
||||
<th><?php echo $lang->product->branch;?></th>
|
||||
<td><?php echo $branchName;?></td>
|
||||
</tr>
|
||||
<?php endif;?>
|
||||
<tr>
|
||||
<th><?php echo $lang->release->name;?></th>
|
||||
<td><?php echo $release->name;?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->release->build;?></th>
|
||||
<td title='<?php echo $release->buildName?>'>
|
||||
<?php echo ($release->project) ? html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName, '_blank') : $release->buildName;?>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->release->status;?></th>
|
||||
<td><?php echo $lang->release->statusList[$release->status];?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->release->date;?></th>
|
||||
<td><?php echo $release->date;?></td>
|
||||
</tr>
|
||||
</table>
|
||||
</fieldset>
|
||||
<fieldset>
|
||||
<legend><?php echo $lang->files?></legend>
|
||||
<div class='article-content'>
|
||||
<?php
|
||||
if($release->files)
|
||||
{
|
||||
echo $this->fetch('file', 'printFiles', array('files' => $release->files, 'fieldset' => 'false'));
|
||||
}
|
||||
elseif($release->filePath)
|
||||
{
|
||||
echo $lang->release->filePath . html::a($release->filePath, $release->filePath, '_blank');
|
||||
}
|
||||
elseif($release->scmPath)
|
||||
{
|
||||
echo $lang->release->scmPath . html::a($release->scmPath, $release->scmPath, '_blank');
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
</fieldset>
|
||||
<?php include '../../common/view/action.html.php';?>
|
||||
<div class="row-table">
|
||||
<div class="col-main">
|
||||
<fieldset>
|
||||
<legend><?php echo $lang->release->basicInfo?></legend>
|
||||
<table class='table table-data table-condensed table-borderless table-fixed'>
|
||||
<tr>
|
||||
<th class='w-80px'><?php echo $lang->release->product;?></th>
|
||||
<td><?php echo $release->productName;?></td>
|
||||
</tr>
|
||||
<?php if($release->productType != 'normal'):?>
|
||||
<tr>
|
||||
<th><?php echo $lang->product->branch;?></th>
|
||||
<td><?php echo $branchName;?></td>
|
||||
</tr>
|
||||
<?php endif;?>
|
||||
<tr>
|
||||
<th><?php echo $lang->release->name;?></th>
|
||||
<td><?php echo $release->name;?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->release->build;?></th>
|
||||
<td title='<?php echo $release->buildName?>'>
|
||||
<?php echo ($release->project) ? html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName, '_blank') : $release->buildName;?>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->release->status;?></th>
|
||||
<td><?php echo $lang->release->statusList[$release->status];?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->release->date;?></th>
|
||||
<td><?php echo $release->date;?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->release->desc;?></th>
|
||||
<td><?php echo $release->desc;?></td>
|
||||
</tr>
|
||||
</table>
|
||||
</fieldset>
|
||||
<fieldset>
|
||||
<legend><?php echo $lang->files?></legend>
|
||||
<div class='article-content'>
|
||||
<?php
|
||||
if($release->files)
|
||||
{
|
||||
echo $this->fetch('file', 'printFiles', array('files' => $release->files, 'fieldset' => 'false'));
|
||||
}
|
||||
elseif($release->filePath)
|
||||
{
|
||||
echo $lang->release->filePath . html::a($release->filePath, $release->filePath, '_blank');
|
||||
}
|
||||
elseif($release->scmPath)
|
||||
{
|
||||
echo $lang->release->scmPath . html::a($release->scmPath, $release->scmPath, '_blank');
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="col-side"><?php include '../../common/view/action.html.php';?></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -51,13 +51,13 @@
|
||||
<table class='table table-condensed table-striped table-bordered table-fixed active-disabled' id="workload">
|
||||
<thead>
|
||||
<tr class='colhead'>
|
||||
<th><?php echo $lang->report->user;?></th>
|
||||
<th class="w-200px"><?php echo $lang->report->user;?></th>
|
||||
<th><?php echo $lang->report->project;?></th>
|
||||
<th><?php echo $lang->report->task;?></th>
|
||||
<th><?php echo $lang->report->remain;?></th>
|
||||
<th><?php echo $lang->report->taskTotal;?></th>
|
||||
<th><?php echo $lang->report->manhourTotal;?></th>
|
||||
<th><?php echo $lang->report->workloadAB;?></th>
|
||||
<th class="w-100px"><?php echo $lang->report->task;?></th>
|
||||
<th class="w-100px"><?php echo $lang->report->remain;?></th>
|
||||
<th class="w-100px"><?php echo $lang->report->taskTotal;?></th>
|
||||
<th class="w-100px"><?php echo $lang->report->manhourTotal;?></th>
|
||||
<th class="w-100px"><?php echo $lang->report->workloadAB;?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -71,16 +71,16 @@
|
||||
<?php $class = $color ? 'rowcolor' : '';?>
|
||||
<?php if($id != 1) echo '<tr class="a-center">';?>
|
||||
<td class="<?php echo $class;?>"><?php echo html::a($this->createLink('project', 'view', "projectID={$info['projectID']}"), $project);?></td>
|
||||
<td class="<?php echo $class;?>"><?php echo $info['count'];?></td>
|
||||
<td class="<?php echo $class;?>"><?php echo $info['manhour'];?></td>
|
||||
<td class="<?php echo $class;?> text-center"><?php echo $info['count'];?></td>
|
||||
<td class="<?php echo $class;?> text-center"><?php echo $info['manhour'];?></td>
|
||||
<?php if($id == 1):?>
|
||||
<td rowspan="<?php echo count($load['task']);?>">
|
||||
<td rowspan="<?php echo count($load['task']);?>" class="text-center">
|
||||
<?php echo $load['total']['count'];?>
|
||||
</td>
|
||||
<td rowspan="<?php echo count($load['task']);?>">
|
||||
<td rowspan="<?php echo count($load['task']);?>" class="text-center">
|
||||
<?php echo $load['total']['manhour'];?>
|
||||
</td>
|
||||
<td rowspan="<?php echo count($load['task']);?>">
|
||||
<td rowspan="<?php echo count($load['task']);?>" class="text-center">
|
||||
<?php echo round($load['total']['manhour'] / $allHour * 100, 2) . '%';?>
|
||||
</td>
|
||||
<?php endif;?>
|
||||
|
||||
@@ -1225,7 +1225,11 @@ class taskModel extends model
|
||||
|
||||
$taskList = array_keys($tasks);
|
||||
$taskTeam = $this->dao->select('*')->from(TABLE_TEAM)->where('task')->in($taskList)->fetchGroup('task');
|
||||
foreach($taskTeam as $taskID => $team) $tasks[$taskID]->team = $team;
|
||||
if(!empty($taskTeam))
|
||||
{
|
||||
foreach($taskTeam as $taskID => $team) $tasks[$taskID]->team = $team;
|
||||
}
|
||||
|
||||
foreach($tasks as $taskID => $task)
|
||||
{
|
||||
if($task->parent and isset($tasks[$task->parent]))
|
||||
@@ -1235,8 +1239,7 @@ class taskModel extends model
|
||||
}
|
||||
}
|
||||
|
||||
if($tasks) return $this->processTasks($tasks);
|
||||
return array();
|
||||
return $this->processTasks($tasks);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user