Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug

Browse Source
This commit is contained in:
滔哥
2017-11-09 10:51:03 +08:00
parent 2799322a63
commit 2f2c99f346
18 changed files with 53 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/base/pager/pager.class.php
-1
View File
@@ -545,7 +545,6 @@ class basePager
vars = vars.replace('_recTotal_', recTotal)
vars = vars.replace('_recPerPage_', recPerPage)
vars = vars.replace('_pageID_', pageID);
$.get(createLink('score', 'ajax', "method=submitPage"));
location.href=createLink('$this->moduleName', '$this->methodName', vars);
}
</script>
module/custom/lang/en.php
+2 -2
View File
@@ -124,8 +124,8 @@ $lang->custom->workingList['onlyTask'] = 'Task';
$lang->custom->menuTip = 'Click to show/hide navigation bar. Drag to swtich display order.';
$lang->custom->saveFail = 'Failed to save!';
$lang->custom->scoreList[0] = 'Off';
$lang->custom->scoreList[1] = 'On';
$lang->custom->scoreStatus[0] = 'Off';
$lang->custom->scoreStatus[1] = 'On';
$lang->custom->moduleName['product'] = $lang->productCommon;
$lang->custom->moduleName['productplan'] = 'Plan';
module/custom/lang/zh-cn.php
+2 -2
View File
@@ -124,8 +124,8 @@ $lang->custom->workingList['onlyTask'] = '任务管理工具';
$lang->custom->menuTip = '点击显示或隐藏导航条目，拖拽来更改显示顺序。';
$lang->custom->saveFail = '保存失败！';
$lang->custom->scoreList[0] = '关闭';
$lang->custom->scoreList[1] = '开启';
$lang->custom->scoreStatus[0] = '关闭';
$lang->custom->scoreStatus[1] = '开启';
$lang->custom->moduleName['product'] = $lang->productCommon;
$lang->custom->moduleName['productplan'] = '计划';
module/custom/lang/zh-tw.php
+2 -2
View File
@@ -124,8 +124,8 @@ $lang->custom->workingList['onlyTask'] = '任務管理工具';
$lang->custom->menuTip = '點擊顯示或隱藏導航條目，拖拽來更改顯示順序。';
$lang->custom->saveFail = '保存失敗！';
$lang->custom->scoreList[0] = '關閉';
$lang->custom->scoreList[1] = '開啟';
$lang->custom->scoreStatus[0] = '關閉';
$lang->custom->scoreStatus[1] = '開啟';
$lang->custom->moduleName['product'] = $lang->productCommon;
$lang->custom->moduleName['productplan'] = '計劃';
module/custom/model.php
+1 -1
View File
@@ -286,7 +286,7 @@ class customModel extends model
$customMenu = isset($config->customMenu->$flowModule) ? $config->customMenu->$flowModule : array();
if(commonModel::isTutorialMode() && $module === 'main')$customMenu = 'my,product,project,qa,company';
if(!empty($customMenu) && is_string($customMenu) && substr($customMenu, 0, 1) === '[') $customMenu = json_decode($customMenu);
if($module == 'my' && empty($config->global->score)) unset($allMenu->score);
if($module == 'my' && empty($config->global->scoreStatus)) unset($allMenu->score);
$menu = self::setMenuByConfig($allMenu, $customMenu, $module);
return $menu;
}
module/custom/view/score.html.php
+1 -1
View File
@@ -15,7 +15,7 @@
<table class='table table-form'>
<tr>
<th class='w-100px text-top'><?php echo $lang->custom->score;?></th>
<td><?php echo html::radio('score', $lang->custom->scoreList, isset($config->global->score) ? $config->global->score : 0, '', 'block');?></td>
<td><?php echo html::radio('score', $lang->custom->scoreStatus, isset($config->global->scoreStatus) ? $config->global->scoreStatus : 0, '', 'block');?></td>
</tr>
<tr>
<td></td>
module/score/model.php
+2 -2
View File
@@ -37,7 +37,7 @@ class scoreModel extends model
*/
public function create($module = '', $method = '', $param = '', $account = '', $time = '')
{
if(empty($this->config->score->$module->$method)) return true;
if(empty($this->config->score->$module->$method) || empty($this->config->global->scoreStatus)) return true;
$rule = $this->config->score->$module->$method;
$desc = $this->lang->score->models[$module];
@@ -281,7 +281,7 @@ class scoreModel extends model
*/
public function getNotice()
{
if(!isset($this->config->global->score) || empty($this->config->global->score)) return '';
if(empty($this->config->global->scoreStatus)) return '';
if(date('Y-m-d', $this->app->user->lastTime) == helper::today()) return '';
$this->app->user->lastTime = time();
module/score/view/reset.html.php
+11 -11
View File
@@ -10,31 +10,31 @@
*/
?>
<?php include '../../common/view/header.html.php'; ?>
<div class="alert with-icon" id="score_start">
<div class="alert with-icon" id="scoreStart">
<i class="icon-inbox"></i>
<div class="content">
<p><?php echo $lang->score->resetTips; ?></p>
<p><button class="btn btn-primary" id="score_reset"><?php echo $lang->score->resetStart; ?></button></p>
<p><button class="btn btn-primary" id="scoreReset"><?php echo $lang->score->resetStart; ?></button></p>
</div>
</div>
<div class="alert alert-info with-icon hidden" id="score_loading">
<div class="alert with-icon hidden" id="scoreLoading">
<i class="icon-info-sign"></i>
<div class="content">
<p><?php echo $lang->score->resetTips; ?></p>
<p id="loading_content"></p>
<p id="loadingContent"></p>
</div>
</div>
<div class="alert alert-success with-icon hidden" id="score_finish">
<div class="alert with-icon hidden" id="scoreFinish">
<i class="icon-ok-sign"></i>
<div class="content">
<strong><?php echo $lang->score->resetFinish; ?></strong>
</div>
</div>
<script>
$("#score_reset").on('click', function()
$("#scoreReset").on('click', function()
{
$("#score_start").addClass('hidden');
$("#score_loading").removeClass('hidden');
$("#scoreStart").addClass('hidden');
$("#scoreLoading").removeClass('hidden');
scoreReset(0);
});
var total = 0;
@@ -44,15 +44,15 @@ function scoreReset(lastID)
{
if(response.result == 'finished')
{
$("#score_loading").addClass('hidden');
$("#score_finish").removeClass('hidden');
$("#scoreLoading").addClass('hidden');
$("#scoreFinish").removeClass('hidden');
setTimeout(function(){parent.location.reload();}, 2000);
return false;
}
else
{
total = total + response.total;
$('#loading_content').html("<li class='text-success'>" + response.message + total + "</li>");
$('#loadingContent').html("<p>" + response.message + total + "</p>");
setTimeout(function(){scoreReset(response.lastID);}, 500);
}
});
module/task/control.php
+2 -2
View File
@@ -539,7 +539,7 @@ class task extends control
$task->storyFiles = $this->loadModel('file')->getByObject('story', $task->story);
}
if($task->team) $this->lang->task->assign = $this->lang->task->transmit;
if($task->team) $this->lang->task->assign = $this->lang->task->transfer;
/* Update action. */
if($task->assignedTo == $this->app->user->account) $this->loadModel('action')->read('task', $taskID);
@@ -1216,7 +1216,7 @@ class task extends control
{
foreach($children[$task->id] as $child)
{
$child->name = $taskLang->childrenAB . ') ' . $child->name;
$child->name = '[' . $taskLang->childrenAB . '] ' . $child->name;
$tasks[$child->id] = $child;
}
}
module/task/lang/en.php
+3 -4
View File
@@ -96,11 +96,10 @@ $lang->task->colorTag = 'Color Tag';
$lang->task->files = 'Files';
$lang->task->hasConsumed = 'Consumed';
$lang->task->multiple = 'Multiple Tasks';
$lang->task->multipleAB = 'Multi';
$lang->task->multipleABP = 'Multiple';
$lang->task->multipleAB = 'M';
$lang->task->team = 'Team';
$lang->task->transmit = 'Transfer';
$lang->task->transmitTo = 'Transfer To';
$lang->task->transfer = 'Transfer';
$lang->task->transferTo = 'Transfer To';
$lang->task->children = 'Child';
$lang->task->childrenAB = 'Child';
$lang->task->parent = 'Parent Task';
module/task/lang/zh-cn.php
+3 -4
View File
@@ -96,11 +96,10 @@ $lang->task->colorTag = '颜色标签';
$lang->task->files = '附件';
$lang->task->hasConsumed = '已消耗';
$lang->task->multiple = '多人任务';
$lang->task->multipleAB = '多';
$lang->task->multipleABP = '多人';
$lang->task->multipleAB = '多人';
$lang->task->team = '团队';
$lang->task->transmit = '转交';
$lang->task->transmitTo = '转交给';
$lang->task->transfer = '转交';
$lang->task->transferTo = '转交给';
$lang->task->children = '子任务';
$lang->task->childrenAB = '子';
$lang->task->parent = '父任务';
module/task/lang/zh-tw.php
+3 -4
View File
@@ -96,11 +96,10 @@ $lang->task->colorTag = '顏色標籤';
$lang->task->files = '附件';
$lang->task->hasConsumed = '已消耗';
$lang->task->multiple = '多人任務';
$lang->task->multipleAB = '多';
$lang->task->multipleABP = '多人';
$lang->task->multipleAB = '多人';
$lang->task->team = '團隊';
$lang->task->transmit = '轉交';
$lang->task->transmitTo = '轉交給';
$lang->task->transfer = '轉交';
$lang->task->transferTo = '轉交給';
$lang->task->children = '子任務';
$lang->task->childrenAB = '子';
$lang->task->parent = '父任務';
module/task/model.php
+15 -15
View File
@@ -236,20 +236,20 @@ class taskModel extends model
$mails[$i]->actionID = $actionID;
}
$this->countTime($tasks->parent[0]);
$this->computeWorkingHours($tasks->parent[0]);
$this->loadModel('score')->create('ajax', 'batchCreate');
return $mails;
}
/**
* count parent task estimate and left value
* Compute parent task working hours.
*
* @param $taskID
*
* @access public
* @return bool
*/
public function countTime($taskID)
public function computeWorkingHours($taskID)
{
if(!$taskID) return true;
@@ -284,7 +284,7 @@ class taskModel extends model
* @access public
* @return bool
*/
public function parentStatus($parentID, $status = 'done')
public function updateParentStatus($parentID, $status = 'done')
{
if(!$parentID) return true;
$children = $this->dao->select('id,status')->from(TABLE_TASK)->where('parent')->eq($parentID)->fetchPairs('id', 'status');
@@ -414,7 +414,7 @@ class taskModel extends model
->batchCheckIF($task->closedReason == 'cancel', 'finishedBy, finishedDate', 'empty')
->where('id')->eq((int)$taskID)->exec();
$this->countTime($oldTask->parent);
$this->computeWorkingHours($oldTask->parent);
/* Save team. */
$this->dao->delete()->from(TABLE_TEAM)->where('task')->eq($taskID)->exec();
@@ -585,7 +585,7 @@ class taskModel extends model
if($oldTask->story != false) $this->loadModel('story')->setStage($oldTask->story);
if(!dao::isError())
{
$this->countTime($oldTask->parent);
$this->computeWorkingHours($oldTask->parent);
if($task->status == 'done') $this->loadModel('score')->create('task', 'finish', $taskID);
if($task->status == 'closed') $this->loadModel('score')->create('task', 'close', $taskID);
$allChanges[$taskID] = common::createChanges($oldTask, $task);
@@ -732,11 +732,11 @@ class taskModel extends model
}
elseif($task->status == 'done')
{
$this->parentStatus($oldTask->parent, 'done');
$this->updateParentStatus($oldTask->parent, 'done');
}
}
$this->countTime($oldTask->parent);
$this->computeWorkingHours($oldTask->parent);
if($oldTask->story) $this->loadModel('story')->setStage($oldTask->story);
if(!dao::isError()) return common::createChanges($oldTask, $task);
@@ -887,10 +887,10 @@ class taskModel extends model
if($task->status == 'done')
{
$this->parentStatus($task->parent, 'done');
$this->updateParentStatus($task->parent, 'done');
$this->loadModel('score')->create('task', 'finish', $taskID);
}
$this->countTime($task->parent);
$this->computeWorkingHours($task->parent);
return $changes;
}
@@ -972,8 +972,8 @@ class taskModel extends model
->where('id')->eq((int)$taskID)
->exec();
if($task->status == 'done') $this->parentStatus($oldTask->parent, 'done');
$this->countTime($oldTask->parent);
if($task->status == 'done') $this->updateParentStatus($oldTask->parent, 'done');
$this->computeWorkingHours($oldTask->parent);
if($oldTask->story) $this->loadModel('story')->setStage($oldTask->story);
if($task->status == 'done') $this->loadModel('score')->create('task', 'finish', $taskID);
@@ -1028,8 +1028,8 @@ class taskModel extends model
->get();
$this->dao->update(TABLE_TASK)->data($task)->autoCheck()->where('id')->eq((int)$taskID)->exec();
$this->parentStatus($oldTask->parent, 'closed');
$this->countTime($oldTask->parent);
$this->updateParentStatus($oldTask->parent, 'closed');
$this->computeWorkingHours($oldTask->parent);
$this->dao->update(TABLE_TASK)->set('status')->eq('closed')->where('parent')->eq($taskID)->exec();
@@ -1100,7 +1100,7 @@ class taskModel extends model
->where('id')->eq((int)$taskID)
->exec();
$this->countTime($oldTask->parent);
$this->computeWorkingHours($oldTask->parent);
$this->dao->update(TABLE_TASK)->set('status')->eq('doing')->where('parent')->eq($taskID)->exec();
if($oldTask->parent) $this->dao->update(TABLE_TASK)->set('status')->eq('doing')->where('id')->eq((int)$oldTask->parent)->exec();
module/task/view/assignto.html.php
+2 -2
View File
@@ -16,13 +16,13 @@
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['task']);?> <strong><?php echo $task->id;?></strong></span>
<strong><?php echo html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name, '_blank');?></strong>
<small class='text-muted'> <?php echo empty($task->team) ? $lang->task->assign : $lang->task->transmit;?></small>
<small class='text-muted'> <?php echo empty($task->team) ? $lang->task->assign : $lang->task->transfer;?></small>
</div>
</div>
<form class='form-condensed' method='post' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo empty($task->team) ? $lang->task->assign : $lang->task->transmitTo;?></th>
<th class='w-80px'><?php echo empty($task->team) ? $lang->task->assign : $lang->task->transferTo;?></th>
<td class='w-p25-f'><?php echo html::select('assignedTo', $users, $task->assignedTo, "class='form-control chosen'");?></td><td></td>
</tr>
<tr>
module/task/view/create.html.php
+1 -1
View File
@@ -43,7 +43,7 @@
<?php echo html::select('assignedTo[]', $members, $task->assignedTo, "class='form-control chosen'");?>
<?php echo html::input('teamMember', '', "class='form-control team-group fix-border hidden' readonly='readonly'");?>
<span class="input-group-addon team-group hidden" data-toggle='modalTeam'><?php echo $lang->task->team;?></span>
<label class='input-group-addon affair'><input type='checkBox' name='multiple' id="multipleBox" value='1'/><?php echo $lang->task->multipleABP;?></label>
<label class='input-group-addon affair'><input type='checkBox' name='multiple' id="multipleBox" value='1'/><?php echo $lang->task->multipleAB;?></label>
</div>
</td>
<td>
module/task/view/edit.html.php
+1 -1
View File
@@ -39,7 +39,7 @@
<span class='input-group-addon'>
<label class='checkbox-inline'>
<input type='checkBox' name='multiple' value='1' <?php echo empty($task->team) ? '' : 'checked';?> />
<?php echo $lang->task->multipleABP;?>
<?php echo $lang->task->multipleAB;?>
</label>
</span>
<?php endif;?>
module/task/view/finish.html.php
+1 -1
View File
@@ -37,7 +37,7 @@
<td><div class='input-group'><?php echo html::input('consumed', $task->consumed, "class='form-control' autocomplete='off'");?> <span class='input-group-addon'><?php echo $lang->task->hour;?></span></div></td>
</tr>
<tr>
<th><?php echo empty($task->team) ? $lang->task->assign : $lang->task->transmitTo;?></th>
<th><?php echo empty($task->team) ? $lang->task->assign : $lang->task->transferTo;?></th>
<td><?php echo html::select('assignedTo', $members, $task->openedBy, "class='form-control chosen'");?></td><td></td>
</tr>
<tr>
module/task/view/view.html.php
+1 -1
View File
@@ -223,7 +223,7 @@
</tr>
<?php endif;?>
<tr>
<th><?php echo empty($task->team) ? $lang->task->assignTo : $lang->task->transmitTo;?></th>
<th><?php echo empty($task->team) ? $lang->task->assignTo : $lang->task->transferTo;?></th>
<td><?php echo $task->assignedTo ? $task->assignedToRealName . $lang->at . $task->assignedDate : '';?></td>
</tr>
<tr>