Merge branch 'sprint/244_tianshujie_71890' into 'master'
Sprint/244 tianshujie 71890 See merge request easycorp/zentaopms!5721
This commit is contained in:
李玉春
@@ -21,4 +21,22 @@ $(function()
|
||||
type: 'iframe'
|
||||
}).trigger('click');
|
||||
}
|
||||
|
||||
$('#todoForm').table(
|
||||
{
|
||||
replaceId: 'todoIDList',
|
||||
statisticCreator: function(table)
|
||||
{
|
||||
var $table = table.getTable();
|
||||
var $checkedRows = $table.find('tbody>tr.checked');
|
||||
var checkedTotal = $checkedRows.length;
|
||||
var checkedWait = $checkedRows.filter("[data-status=wait]").length;
|
||||
var checkedDoing = $checkedRows.filter("[data-status=doing]").length;
|
||||
var checkedStatistics = checkedSummary.replace('%total%', checkedTotal)
|
||||
.replace('%wait%', checkedWait)
|
||||
.replace('%doing%', checkedDoing);
|
||||
|
||||
return checkedTotal ? checkedStatistics : pageSummary;
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
@@ -126,11 +126,6 @@
|
||||
<?php $storyChanged = (!empty($task->storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion and !in_array($task->status, array('cancel', 'closed')));?>
|
||||
<?php $storyChanged ? print("<span class='status-story status-changed'>{$this->lang->my->storyChanged}</span>") : print("<span class='status-task status-{$task->status}'> " . $this->processStatus('task', $task) . "</span>");?>
|
||||
</td>
|
||||
<td class="c-pri"><span class='label-pri <?php echo 'label-pri-' . $task->pri;?>' title='<?php echo zget($lang->task->priList, $task->pri);?>'><?php echo zget($lang->task->priList, $task->pri);?></span></td>
|
||||
<td class='c-status'>
|
||||
<?php $storyChanged = (!empty($task->storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion and !in_array($task->status, array('cancel', 'closed')));?>
|
||||
<?php !empty($storyChanged) ? print("<span class='status-story status-changed'>{$this->lang->my->storyChanged}</span>") : print("<span class='status-task status-{$task->status}'> " . $this->processStatus('task', $task) . "</span>");?>
|
||||
</td>
|
||||
<?php if($config->systemMode == 'new'):?>
|
||||
<?php $projectName = isset($projects[$task->execution]->name) ? $projects[$task->execution]->name : '';?>
|
||||
<?php $projectID = isset($projects[$task->execution]->id) ? $projects[$task->execution]->id : 0;?>
|
||||
|
||||
@@ -56,6 +56,10 @@
|
||||
<?php endif;?>
|
||||
</div>
|
||||
</div>
|
||||
<?php
|
||||
$waitCount = 0;
|
||||
$doingCount = 0;
|
||||
?>
|
||||
<div id="mainContent">
|
||||
<?php if(empty($todos)):?>
|
||||
<div class="table-empty-tip">
|
||||
@@ -67,7 +71,7 @@
|
||||
</p>
|
||||
</div>
|
||||
<?php else:?>
|
||||
<form class="main-table table-todo" data-ride="table" method="post">
|
||||
<form class="main-table table-todo" method="post" id='todoForm'>
|
||||
<?php
|
||||
$canBatchEdit = common::hasPriv('todo', 'batchEdit');
|
||||
$canBatchFinish = common::hasPriv('todo', 'batchFinish');
|
||||
@@ -105,7 +109,9 @@
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach($todos as $todo):?>
|
||||
<tr>
|
||||
<?php if($todo->status == 'wait') $waitCount ++;?>
|
||||
<?php if($todo->status == 'doing') $doingCount ++;?>
|
||||
<tr data-status='<?php echo $todo->status;?>'>
|
||||
<td class="c-id">
|
||||
<?php if($canbatchAction):?>
|
||||
<div class="checkbox-primary">
|
||||
@@ -192,10 +198,13 @@
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
<div class="table-statistic"><?php echo sprintf($lang->todo->summary, count($todos), $waitCount, $doingCount);?></div>
|
||||
<?php $pager->show('right', 'pagerjs');?>
|
||||
</div>
|
||||
</form>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
<?php js::set('listName', 'todoList');?>
|
||||
<?php js::set('pageSummary', sprintf($lang->todo->summary, count($todos), $waitCount, $doingCount));?>
|
||||
<?php js::set('checkedSummary', $lang->todo->checkedSummary);?>
|
||||
<?php include '../../common/view/footer.html.php';?>
|
||||
|
||||
@@ -56,6 +56,12 @@
|
||||
<?php endif;?>
|
||||
</div>
|
||||
</div>
|
||||
<?php
|
||||
$waitCount = 0;
|
||||
$doingCount = 0;
|
||||
$suspendedCount = 0;
|
||||
$closedCount = 0;
|
||||
?>
|
||||
<div id='mainContent' class="main-row fade">
|
||||
<?php if($this->config->systemMode == 'new'):?>
|
||||
<div id="sidebar" class="side-col">
|
||||
@@ -94,10 +100,6 @@
|
||||
$useDatatable = (!commonModel::isTutorialMode() and (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable'));
|
||||
$setting = $this->datatable->getSetting('project');
|
||||
$fixedFieldsWidth = $this->datatable->setFixedFieldWidth($setting);
|
||||
$waitCount = 0;
|
||||
$doingCount = 0;
|
||||
$suspendedCount = 0;
|
||||
$closedCount = 0;
|
||||
|
||||
if($useDatatable) include dirname(dirname(dirname(__FILE__))) . '/common/view/datatable.html.php';
|
||||
?>
|
||||
|
||||
@@ -83,10 +83,12 @@ $lang->todo->beforeDays = "%s<span class='input-group-addon'>early in advance
|
||||
$lang->todo->dayNames = array(1 => 'Monday', 2 => 'Tuesday', 3 => 'Wednesday', 4 => 'Thursday', 5 => 'Friday', 6 => 'Saturday', 0 => 'Sunday');
|
||||
$lang->todo->specifiedDay = array(1 => 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31);
|
||||
|
||||
$lang->todo->confirmBug = 'Dieser Todo steht in Beziehung mit Bug #%s. Möchten Sie das bearbeiten?';
|
||||
$lang->todo->confirmTask = 'Dieser Todo steht in Beziehung mit Task #%s， Möchten Sie das bearbeiten?';
|
||||
$lang->todo->confirmStory = 'Dieser Todo steht in Beziehung mit Story #%s， Möchten Sie das bearbeiten?';
|
||||
$lang->todo->noOptions = 'You have no %s todo at the moment. Please reselect the Todo type.';
|
||||
$lang->todo->confirmBug = 'Dieser Todo steht in Beziehung mit Bug #%s. Möchten Sie das bearbeiten?';
|
||||
$lang->todo->confirmTask = 'Dieser Todo steht in Beziehung mit Task #%s， Möchten Sie das bearbeiten?';
|
||||
$lang->todo->confirmStory = 'Dieser Todo steht in Beziehung mit Story #%s， Möchten Sie das bearbeiten?';
|
||||
$lang->todo->noOptions = 'You have no %s todo at the moment. Please reselect the Todo type.';
|
||||
$lang->todo->summary = 'Total todos: <strong>%s</strong>, Wait: <strong>%s</strong>, Doing: <strong>%s</strong>.';
|
||||
$lang->todo->checkedSummary = 'Seleted: <strong>%total%</strong>, Wait: <strong>%wait%</strong>, Doing: <strong>%doing%</strong>.';
|
||||
|
||||
$lang->todo->statusList['wait'] = 'Wartend';
|
||||
$lang->todo->statusList['doing'] = 'In Arbeit';
|
||||
|
||||
@@ -83,10 +83,12 @@ $lang->todo->beforeDays = "<span class='input-group-addon'>Auto create the tod
|
||||
$lang->todo->dayNames = array(1 => 'Monday', 2 => 'Tuesday', 3 => 'Wednesday', 4 => 'Thursday', 5 => 'Friday', 6 => 'Saturday', 0 => 'Sunday');
|
||||
$lang->todo->specifiedDay = array(1 => 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31);
|
||||
|
||||
$lang->todo->confirmBug = 'This Todo is linked to Bug #%s. Do you want to edit it?';
|
||||
$lang->todo->confirmTask = 'This Todo is linked to Task #%s，Do you want to edit it?';
|
||||
$lang->todo->confirmStory = 'This Todo is linked to Story #%s，Do you want to edit it?';
|
||||
$lang->todo->noOptions = 'You have no %s todo at the moment. Please reselect the Todo type.';
|
||||
$lang->todo->confirmBug = 'This Todo is linked to Bug #%s. Do you want to edit it?';
|
||||
$lang->todo->confirmTask = 'This Todo is linked to Task #%s，Do you want to edit it?';
|
||||
$lang->todo->confirmStory = 'This Todo is linked to Story #%s，Do you want to edit it?';
|
||||
$lang->todo->noOptions = 'You have no %s todo at the moment. Please reselect the Todo type.';
|
||||
$lang->todo->summary = 'Total todos: <strong>%s</strong>, Wait: <strong>%s</strong>, Doing: <strong>%s</strong>.';
|
||||
$lang->todo->checkedSummary = 'Seleted: <strong>%total%</strong>, Wait: <strong>%wait%</strong>, Doing: <strong>%doing%</strong>.';
|
||||
|
||||
$lang->todo->statusList['wait'] = 'Waiting';
|
||||
$lang->todo->statusList['doing'] = 'Doing';
|
||||
|
||||
@@ -83,10 +83,12 @@ $lang->todo->beforeDays = "<span class='input-group-addon'>Créer automatiquem
|
||||
$lang->todo->dayNames = array(1 => 'Lundi', 2 => 'Mardi', 3 => 'Mercredi', 4 => 'Jeudi', 5 => 'Vendredi', 6 => 'Samedi', 0 => 'Dimanche');
|
||||
$lang->todo->specifiedDay = array(1 => 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31);
|
||||
|
||||
$lang->todo->confirmBug = "Cette action est liée au Bug #%s. Voulez-vous l'éditer ?";
|
||||
$lang->todo->confirmTask = "Cette action est liée à la Tâche #%s. Voulez-vous l'éditer ?";
|
||||
$lang->todo->confirmStory = "Cette action est liée à la Story #%s. Voulez-vous l'éditer ?";
|
||||
$lang->todo->noOptions = 'Vous n\'avez pas de %s en attente pour le moment. Veuillez sélectionner le type de Todo.';
|
||||
$lang->todo->confirmBug = "Cette action est liée au Bug #%s. Voulez-vous l'éditer ?";
|
||||
$lang->todo->confirmTask = "Cette action est liée à la Tâche #%s. Voulez-vous l'éditer ?";
|
||||
$lang->todo->confirmStory = "Cette action est liée à la Story #%s. Voulez-vous l'éditer ?";
|
||||
$lang->todo->noOptions = 'Vous n\'avez pas de %s en attente pour le moment. Veuillez sélectionner le type de Todo.';
|
||||
$lang->todo->summary = 'Total todos: <strong>%s</strong>, Wait: <strong>%s</strong>, Doing: <strong>%s</strong>.';
|
||||
$lang->todo->checkedSummary = 'Seleted: <strong>%total%</strong>, Wait: <strong>%wait%</strong>, Doing: <strong>%doing%</strong>.';
|
||||
|
||||
$lang->todo->statusList['wait'] = 'En Attente';
|
||||
$lang->todo->statusList['doing'] = 'En cours';
|
||||
|
||||
@@ -83,10 +83,12 @@ $lang->todo->beforeDays = "<span class='input-group-addon'>提前</span>%s<spa
|
||||
$lang->todo->dayNames = array(1 => '星期一', 2 => '星期二', 3 => '星期三', 4 => '星期四', 5 => '星期五', 6 => '星期六', 0 => '星期日');
|
||||
$lang->todo->specifiedDay = array(1 => 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31);
|
||||
|
||||
$lang->todo->confirmBug = '该待办关联的是Bug #%s，需要修改它吗？';
|
||||
$lang->todo->confirmTask = '该待办关联的是Task #%s，需要修改它吗？';
|
||||
$lang->todo->confirmStory = '该待办关联的是Story #%s，需要修改它吗？';
|
||||
$lang->todo->noOptions = '您暂时没有待处理的%s，请重新选择待办类型。';
|
||||
$lang->todo->confirmBug = '该待办关联的是Bug #%s，需要修改它吗？';
|
||||
$lang->todo->confirmTask = '该待办关联的是Task #%s，需要修改它吗？';
|
||||
$lang->todo->confirmStory = '该待办关联的是Story #%s，需要修改它吗？';
|
||||
$lang->todo->noOptions = '您暂时没有待处理的%s，请重新选择待办类型。';
|
||||
$lang->todo->summary = '本页共 <strong>%s</strong> 项待办，未开始 <strong>%s</strong>，进行中 <strong>%s</strong>。';
|
||||
$lang->todo->checkedSummary = '共选择 <strong>%total%</strong> 项待办，未开始 <strong>%wait%</strong>，进行中 <strong>%doing%</strong>。';
|
||||
|
||||
$lang->todo->statusList['wait'] = '未开始';
|
||||
$lang->todo->statusList['doing'] = '进行中';
|
||||
|
||||
@@ -36,28 +36,28 @@
|
||||
<thead>
|
||||
<tr class='colhead'>
|
||||
<th class='c-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
|
||||
<th class='c-date'> <?php common::printOrderLink('date', $orderBy, $vars, $lang->todo->date);?></th>
|
||||
<th class='c-type'> <?php common::printOrderLink('type', $orderBy, $vars, $lang->todo->type);?></th>
|
||||
<th class='c-pri' title='<?php echo $lang->pri;?>'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
|
||||
<th> <?php common::printOrderLink('name', $orderBy, $vars, $lang->todo->name);?></th>
|
||||
<th class='c-pri'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
|
||||
<th class='c-date'> <?php common::printOrderLink('date', $orderBy, $vars, $lang->todo->date);?></th>
|
||||
<th class='c-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->todo->status);?></th>
|
||||
<th class='c-type'> <?php common::printOrderLink('type', $orderBy, $vars, $lang->todo->type);?></th>
|
||||
<th class='c-date'> <?php common::printOrderLink('begin', $orderBy, $vars, $lang->todo->beginAB);?></th>
|
||||
<th class='c-date'> <?php common::printOrderLink('end', $orderBy, $vars, $lang->todo->endAB);?></th>
|
||||
<th class='c-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->todo->status);?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach($todos as $todo):?>
|
||||
<tr class='text-left'>
|
||||
<td><?php echo $todo->id;?></td>
|
||||
<td><?php echo $todo->date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?></td>
|
||||
<td><?php echo $lang->todo->typeList[$todo->type];?></td>
|
||||
<td><span class='<?php echo 'pri' . zget($lang->todo->priList, $todo->pri, $todo->pri);?>'><?php echo zget($lang->todo->priList, $todo->pri, $todo->pri);?></span></td>
|
||||
<td class='text-left'>
|
||||
<?php echo ($todo->private and $this->app->user->account != $todo->account) ? $todo->name : html::a($this->createLink('todo', 'view', "id=$todo->id&from=company", '', true), $todo->name, '', "class='iframe'");?>
|
||||
</td>
|
||||
<td><span class='<?php echo 'pri' . zget($lang->todo->priList, $todo->pri, $todo->pri);?>'><?php echo zget($lang->todo->priList, $todo->pri, $todo->pri);?></span></td>
|
||||
<td><?php echo $todo->date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?></td>
|
||||
<td class='<?php echo $todo->status;?>'><?php echo $lang->todo->statusList[$todo->status];?></td>
|
||||
<td><?php echo $lang->todo->typeList[$todo->type];?></td>
|
||||
<td><?php echo $todo->begin;?></td>
|
||||
<td><?php echo $todo->end;?></td>
|
||||
<td class='<?php echo $todo->status;?>'><?php echo $lang->todo->statusList[$todo->status];?></td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
|
||||
Reference in New Issue
Block a user