@@ -91,7 +93,7 @@ js::set('isCNLang', !$this->loadModel('common')->checkNotCN())
assignedTo])) printf($lang->execution->memberHours, zget($users, $task->assignedTo), $members[$task->assignedTo]->totalHours);?>
+ assignedTo and !isset($members[$task->assignedTo])) printf($lang->execution->memberHours, zget($users, $task->assignedTo), '0.0');?>
assignedTo)):?>
diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js
index 7e39e60137..5bec4a50a1 100644
--- a/module/kanban/js/view.js
+++ b/module/kanban/js/view.js
@@ -407,7 +407,7 @@ function renderKanbanItem(item, $item)
$user.html(renderUsersAvatar(assignedTo, item.id)).attr('title', title);
}
- if(kanban.performable == 1)
+ if(kanban.performable == 1 && (item.fromType == '' || item.fromType == 'execution'))
{
var $progress = $item.children('.progress-box');
if(!$progress.length) $progress = $('').appendTo($item);
@@ -1189,7 +1189,7 @@ function createCardMenu(options)
var items = [];
if(privs.includes('editCard') && card.fromType == '') items.push({label: kanbanLang.editCard, icon: 'edit', url: createLink('kanban', 'editCard', 'cardID=' + card.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
if(privs.includes('deleteCard')) items.push({label: card.fromType == '' ? kanbanLang.deleteCard : kanbanLang.removeCard, icon: card.fromType == '' ? 'trash' : 'unlink', url: createLink('kanban', 'deleteCard', 'cardID=' + card.id), attrs: {'target': 'hiddenwin'}});
- if(kanban.performable == 1)
+ if(kanban.performable == 1 && card.fromType == '')
{
if(card.status == 'done')
{
diff --git a/module/kanban/model.php b/module/kanban/model.php
index f4c67e50d7..e95c66f0b8 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1207,6 +1207,10 @@ class kanbanModel extends model
->andWhere('action')->eq('opened')
->fetchPairs();
}
+ elseif($fromType == 'execution')
+ {
+ $executionProgress = $this->loadModel('project')->computerProgress($objects);
+ }
/* Data for constructing the card. */
foreach($objectCards as $objectID => $cardsInfo)
@@ -1231,6 +1235,7 @@ class kanbanModel extends model
if($delay > 0) $objectCard->delay = $delay;
}
$objectCard->execType = $object->type;
+ $objectCard->progress = isset($executionProgress[$objectID]->progress) ? $executionProgress[$objectID]->progress : 0;
}
$objectCard->desc = strip_tags(htmlspecialchars_decode($object->desc));
diff --git a/module/kanban/view/viewarchivedcard.html.php b/module/kanban/view/viewarchivedcard.html.php
index 74a334d0c1..d12d129862 100644
--- a/module/kanban/view/viewarchivedcard.html.php
+++ b/module/kanban/view/viewarchivedcard.html.php
@@ -47,7 +47,12 @@
#archivedCards .card-item .has-color .info > .label-pri {border-color: #FFFFFF;}
#archivedCards .card-item .has-color .progress-box > .progress-number {color: #FFFFFF;}
#archivedCards .progress-box {width: 97%;}
-#performable {padding: 25px 10px !important;}
+#archivedCards .no-progress {padding: 7px 10px !important;}
+#archivedCards .has-progress {padding: 21px 10px !important;}
+#archivedCards .has-desc.has-progress {padding: 26px 10px !important;}
+#archivedCards .has-desc.no-progress {padding: 19px 10px !important;}
+#archivedCards .has-avatar.has-progress {padding: 24px 10px !important;}
+#archivedCards .has-avatar.no-progress {padding: 9px 10px !important;}
loadLang('execution');
@@ -71,6 +76,7 @@ js::set('systemMode', $this->config->systemMode);
' + item.progress + '%
color == '#b10b0b') $color = 'has-color red';
if($card->color == '#cfa227') $color = 'has-color yellow';
@@ -98,7 +104,11 @@ js::set('systemMode', $this->config->systemMode);
$name = isset($card->title) ? $card->title : $card->name;
if(common::hasPriv($card->fromType, 'view')) echo html::a($this->createLink($card->fromType, 'view', "id=$card->fromID"), $name, '', "class='cardName' title='$name'");
if(!common::hasPriv($card->fromType, 'view')) echo "
-
$name
";
- if($card->fromType == 'productplan' or $card->fromType == 'build') echo "$card->desc
";
+ if($card->fromType == 'productplan' or $card->fromType == 'build')
+ {
+ echo "$card->desc
";
+ if(!empty($card->desc)) $class .= ' has-desc';
+ }
echo "";
if(isset($lang->{$card->fromType}->statusList[$card->objectStatus])) echo "" . $lang->{$card->fromType}->statusList[$card->objectStatus] . '';
if(isset($card->date) and !helper::isZeroDate($card->date)) echo "" . date("Y-m-d", strtotime($card->date)) . ""
@@ -147,6 +157,7 @@ js::set('systemMode', $this->config->systemMode);
if($count > 2) continue;
echo html::smallAvatar(array('avatar' => $usersAvatar[$account], 'account' => $account, 'name' => $users[$account]), 'avatar-circle');
$count ++;
+ $class .= ' has-avatar';
}
?>
2) echo "...";?>
@@ -159,11 +170,12 @@ js::set('systemMode', $this->config->systemMode);
echo "
- performable):?>
+ performable and ($card->fromType == 'execution' or empty($card->fromType))):?>
";
echo html::smallAvatar(array('avatar' => $usersAvatar[$assignedToList], 'account' => $assignedToList, 'name' => $users[$assignedToList]), 'avatar-circle');
echo "
";
+ $class .= ' has-avatar';
}
?>
@@ -173,7 +185,8 @@ js::set('systemMode', $this->config->systemMode);
performable) echo "id='performable'";?>>
+ performable) and ($card->fromType == 'execution' or empty($card->fromType))) ? ' has-progress' : ' no-progress';?>
+
config->CRKanban) and $this->config->CRKanban == '0' and $kanban->status == 'closed');
$canRestore = (commonModel::hasPriv('kanban', 'restoreCard') and $CRKanban);
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 64e329c22f..815900cdc4 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -189,7 +189,7 @@
parent > 0) echo "story->children}>{$lang->story->childrenAB}";
- echo html::a($viewLink , $story->title);
+ echo html::a($viewLink , $story->title, '', "style='color: $story->color'");
?>
openedBy);?>
diff --git a/module/project/js/execution.js b/module/project/js/execution.js
index 43337d4ee6..2d050e7b6e 100644
--- a/module/project/js/execution.js
+++ b/module/project/js/execution.js
@@ -180,7 +180,7 @@ function showEditCheckbox(show)
executionID = $tr.attr('data-id');
if(show)
{
- var marginLeft = $tr.find('td:first').find('span.table-nest-icon').css('margin-left');
+ var marginLeft = '7px';
$tr.find('td:first').prepend("");
$tr.find('td:first').find('.checkbox-primary').css('margin-left', marginLeft).css('width', '14');
diff --git a/module/project/model.php b/module/project/model.php
index ae369657db..6ca006a7df 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2329,17 +2329,48 @@ class projectModel extends model
* @param int $projectID
* @param string $status
* @param int $productID
+ * @param int $branch
* @param int $itemCounts
* @param string $orderBy
* @param object $pager
+ * @param bool $withTasks
+ * @param int $queryID
* @access public
* @return array
*/
- public function getStats($projectID = 0, $status = 'undone', $productID = 0, $branch = 0, $itemCounts = 30, $orderBy = 'id_asc', $pager = null, $withTasks = false)
+ public function getStats($projectID = 0, $status = 'undone', $productID = 0, $branch = 0, $itemCounts = 30, $orderBy = 'id_asc', $pager = null, $withTasks = false, $queryID = 0)
{
if(empty($productID))
{
$myExecutionIDList = array();
+ $query = '';
+ if($status == 'bySearch')
+ {
+ $status = 'all';
+ if($queryID)
+ {
+ $query = $this->loadModel('search')->getQuery($queryID);
+ if($query)
+ {
+ $this->session->set('executionQuery', $query->sql);
+ $this->session->set('executionForm', $query->form);
+ }
+ else
+ {
+ $this->session->set('executionQuery', ' 1 = 1');
+ }
+ }
+ else
+ {
+ if($this->session->executionQuery == false) $this->session->set('executionQuery', ' 1 = 1');
+ }
+ $query = $this->session->executionQuery;
+ $allProject = "`project` = 'all'";
+
+ if(strpos($query, $allProject) !== false) $query = str_replace($allProject, '1', $query);
+ $query = preg_replace('/(`\w*`)/', 't1.$1',$query);
+ }
+
if($status == 'involved')
{
$myExecutionIDList = $this->dao->select('root')->from(TABLE_TEAM)
@@ -2351,6 +2382,7 @@ class projectModel extends model
$executions = $this->dao->select('t1.*,t2.name projectName, t2.model as projectModel')->from(TABLE_EXECUTION)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
->where('t1.type')->in('sprint,stage,kanban')
+ ->beginIF(!empty($query))->andWhere($query)->fi()
->beginIF($projectID != 0)->andWhere('t1.project')->eq($projectID)->fi()
->beginIF($projectID == 0 and $this->config->vision)->andWhere('t1.vision')->eq($this->config->vision)->fi()
->beginIF(!empty($myExecutionIDList))->andWhere('t1.id')->in(array_keys($myExecutionIDList))->fi()
diff --git a/module/story/model.php b/module/story/model.php
index 7a6f038151..bcbcbbfb42 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -1841,15 +1841,20 @@ class storyModel extends model
if($oldStory->branch) $story->plan = $planID;
/* Append the plan id to plan field if product is multi and story is all branch. */
- if($this->session->currentProductType != 'normal' and empty($story->branch) and $planID != 0)
+ if($this->session->currentProductType != 'normal' and empty($story->branch))
{
$branchPlanPairs = $this->dao->select('branch, id as plan')->from(TABLE_PRODUCTPLAN)
->where('product')->eq($oldStory->product)
->andWhere('id')->in($oldStory->plan)
->fetchPairs();
- if(isset($branchPlanPairs[$plan->branch])) $branchPlanPairs[$plan->branch] = $planID;
-
- $story->plan = $oldStory->plan ? ',' . implode(',', $branchPlanPairs) : ",$planID";
+ if($planID == 0 and !empty($oldStory->plan) and isset($branchPlanPairs[0]) and $branchPlanPairs[0] != $planID) $unlinkPlans[$branchPlanPairs[0]] = empty($unlinkPlans[$branchPlanPairs[0]]) ? $storyID : "{$unlinkPlans[$branchPlanPairs[0]]},$storyID";
+ if($planID != 0)
+ {
+ if(!empty($oldStory->plan) and isset($branchPlanPairs[$plan->branch]) and $branchPlanPairs[$plan->branch] != $planID) $unlinkPlans[$branchPlanPairs[$plan->branch]] = empty($unlinkPlans[$branchPlanPairs[$plan->branch]]) ? $storyID : "{$unlinkPlans[$branchPlanPairs[$plan->branch]]},$storyID";
+ if(isset($branchPlanPairs[$plan->branch])) $branchPlanPairs[$plan->branch] = $planID;
+ $story->plan = $oldStory->plan ? ',' . implode(',', $branchPlanPairs) : ",$planID";
+ if($story->plan != $oldStory->plan and !empty($planID)) $link2Plans[$planID] = empty($link2Plans[$planID]) ? $storyID : "{$link2Plans[$planID]},$storyID";
+ }
}
/* Change stage. */
@@ -1878,8 +1883,8 @@ class storyModel extends model
if(!dao::isError())
{
$allChanges[$storyID] = common::createChanges($oldStory, $story);
- if($story->plan != $oldStory->plan and !empty($oldStory->plan)) $unlinkPlans[$oldStory->plan] = empty($unlinkPlans[$oldStory->plan]) ? $storyID : "{$unlinkPlans[$oldStory->plan]},$storyID";
- if($story->plan != $oldStory->plan and !empty($story->plan)) $link2Plans[$story->plan] = empty($link2Plans[$story->plan]) ? $storyID : "{$link2Plans[$story->plan]},$storyID";
+ if($story->plan != $oldStory->plan and !empty($oldStory->plan) and strpos($story->plan, ',') === false) $unlinkPlans[$oldStory->plan] = empty($unlinkPlans[$oldStory->plan]) ? $storyID : "{$unlinkPlans[$oldStory->plan]},$storyID";
+ if($story->plan != $oldStory->plan and !empty($story->plan) and strpos($story->plan, ',') === false) $link2Plans[$story->plan] = empty($link2Plans[$story->plan]) ? $storyID : "{$link2Plans[$story->plan]},$storyID";
}
}
diff --git a/module/task/model.php b/module/task/model.php
index f8001be55f..12455fedf8 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -63,6 +63,7 @@ class taskModel extends model
$requiredFields = str_replace(",story,", ',', "$requiredFields");
$requiredFields = str_replace(",estStarted,", ',', "$requiredFields");
$requiredFields = str_replace(",deadline,", ',', "$requiredFields");
+ $requiredFields = str_replace(",module,", ',', "$requiredFields");
}
$this->loadModel('file');
@@ -3626,6 +3627,18 @@ class taskModel extends model
public function printAssignedHtml($task, $users)
{
$btnTextClass = '';
+ if(!empty($task->team) and $task->mode == 'multi' and $task->status != 'closed')
+ {
+ $assignedToText = $this->lang->task->team;
+
+ $teamMembers = array();
+ foreach($task->team as $teamMember) $teamMembers[] = zget($users, $teamMember->account);
+ $assignedToTitle = implode($this->lang->comma, $teamMembers);
+ }
+ else
+ {
+ $assignedToText = $assignedToTitle = zget($users, $task->assignedTo);
+ }
$assignedToText = (!empty($task->team) and $task->mode == 'multi' and $task->status != 'closed') ? $this->lang->task->team : zget($users, $task->assignedTo);
if(empty($task->assignedTo))
@@ -3638,7 +3651,7 @@ class taskModel extends model
$btnClass = $task->assignedTo == 'closed' ? ' disabled' : '';
$btnClass = "iframe btn btn-icon-left btn-sm {$btnClass}";
$assignToLink = $task->assignedTo == 'closed' ? '#' : helper::createLink('task', 'assignTo', "executionID=$task->execution&taskID=$task->id", '', true);
- $assignToHtml = html::a($assignToLink, " {$assignedToText}", '', "class='$btnClass'");
+ $assignToHtml = html::a($assignToLink, " {$assignedToText}", '', "class='$btnClass'");
echo !common::hasPriv('task', 'assignTo', $task) ? "{$assignedToText}" : $assignToHtml;
}
diff --git a/module/user/js/login.js b/module/user/js/login.js
index 31fe0854f2..9349326727 100644
--- a/module/user/js/login.js
+++ b/module/user/js/login.js
@@ -3,6 +3,8 @@ if(window.self !== window.top) window.top.location.href = window.location.href;
$(document).ready(function()
{
+ timeoutID = null;
+
/* Fix bug for misc-ping */
$('#hiddenwin').removeAttr('id');
@@ -33,10 +35,19 @@ $(document).ready(function()
var link = createLink('user', 'login');
var keepLogin = $('#keepLoginon').attr('checked') == 'checked' ? 1 : 0;
var captcha = $('#captcha').length == 1 ? $('#captcha').val() : '';
+ var timeout = true;
+
+ clearTimeout(timeoutID);
+ timeoutID = setTimeout(function()
+ {
+ if(timeout) alert(loginTimeoutTip);
+ }, 4000);
$.get(createLink('user', 'refreshRandom'), function(data)
{
var rand = data;
+ timeout = false;
+
$.ajax
({
url: link,
diff --git a/module/user/lang/de.php b/module/user/lang/de.php
index d52a0e5dc7..33808bfb72 100644
--- a/module/user/lang/de.php
+++ b/module/user/lang/de.php
@@ -251,6 +251,7 @@ $lang->user->error->noEmail = 'The user does not register email. Please
$lang->user->error->errorEmail = 'The account does not match the email. Please enter a new one.';
$lang->user->error->emailSetting = 'No email is configured in the system. Contact the admin to reset the email.';
$lang->user->error->sendMailFail = 'Message sending failed, please try again!';
+$lang->user->error->loginTimeoutTip = 'Login failed, please check if the proxy service is normal.';
$lang->user->contactFieldList['phone'] = $lang->user->phone;
$lang->user->contactFieldList['mobile'] = $lang->user->mobile;
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index f1460a4f46..0f314ec1c6 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -251,6 +251,7 @@ $lang->user->error->noEmail = 'The user does not register email. Please
$lang->user->error->errorEmail = 'The account does not match the email. Please enter a new one.';
$lang->user->error->emailSetting = 'No email is configured in the system. Contact the admin to reset the email.';
$lang->user->error->sendMailFail = 'Message sending failed, please try again!';
+$lang->user->error->loginTimeoutTip = 'Login failed, please check if the proxy service is normal.';
$lang->user->contactFieldList['phone'] = $lang->user->phone;
$lang->user->contactFieldList['mobile'] = $lang->user->mobile;
diff --git a/module/user/lang/fr.php b/module/user/lang/fr.php
index 4df771cfe6..622a42e2b3 100644
--- a/module/user/lang/fr.php
+++ b/module/user/lang/fr.php
@@ -251,6 +251,7 @@ $lang->user->error->noEmail = 'The user does not register email. Please
$lang->user->error->errorEmail = 'The account does not match the email. Please enter a new one.';
$lang->user->error->emailSetting = 'No email is configured in the system. Contact the admin to reset the email.';
$lang->user->error->sendMailFail = 'Message sending failed, please try again!';
+$lang->user->error->loginTimeoutTip = 'Échec de la connexion, veuillez vérifier si le service proxy est activé.';
$lang->user->contactFieldList['phone'] = $lang->user->phone;
$lang->user->contactFieldList['mobile'] = $lang->user->mobile;
diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php
index 74af4e7151..37cafcb434 100644
--- a/module/user/lang/zh-cn.php
+++ b/module/user/lang/zh-cn.php
@@ -251,6 +251,7 @@ $lang->user->error->noEmail = '该用户未绑定邮箱，请联系管
$lang->user->error->errorEmail = '用户名和邮箱不匹配，请重新输入。';
$lang->user->error->emailSetting = '系统未配置发信邮箱，请联系管理员重置。';
$lang->user->error->sendMailFail = '邮件发送失败，请重试！';
+$lang->user->error->loginTimeoutTip = '系统登录失败，请检查代理服务是否正常';
$lang->user->contactFieldList['phone'] = $lang->user->phone;
$lang->user->contactFieldList['mobile'] = $lang->user->mobile;
diff --git a/module/user/view/login.html.php b/module/user/view/login.html.php
index 8490a2a58d..0530a028ad 100644
--- a/module/user/view/login.html.php
+++ b/module/user/view/login.html.php
@@ -11,6 +11,7 @@
include '../../common/view/header.lite.html.php';
if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js');
?>
+user->error->loginTimeoutTip);?>
diff --git a/test/model/todo/createbycycle.php b/test/model/todo/createbycycle.php
index a1639b9ed8..959f65f5d6 100755
--- a/test/model/todo/createbycycle.php
+++ b/test/model/todo/createbycycle.php
@@ -2,6 +2,7 @@
switchDB();
su('admin');
/**
@@ -12,25 +13,28 @@ pid=1
测试创建周期日待办 >> 11
测试创建周期周待办 >> 9
-测试创建周期月待办 >> 70
+测试创建周期月待办 >> `%d`
*/
+$days = 31;
+$begin = call_user_func_array('date', array('Y-m-d'));
+$end = call_user_func_array('date', array('Y-m-d', strtotime("+$days days")));
$todo1 = new stdclass();
$todo1->name = 'cycle生成的待办1';
-$todo1->config = '{"specify":{"month":"0","day":"1"},"day":"1","type":"day","beforeDays":11,"end":"","begin":"2022-03-23"}';
+$todo1->config = '{"specify":{"month":"0","day":"1"},"day":"1","type":"day","beforeDays":11,"end":"' . $end . '","begin":"' . $begin . '"}';
$todo2 = new stdclass();
$todo2->name = 'cycle生成的待办2';
-$todo2->config = '{"specify":{"month":"0","day":"1"},"week":"2,4,7","type":"week","beforeDays":31,"end":"","begin":"2022-03-23"}';
+$todo2->config = '{"specify":{"month":"0","day":"1"},"week":"2,4,7","type":"week","beforeDays":31,"end":"' . $end . '","begin":"' . $begin . '"}';
$todo3 = new stdclass();
$todo3->name = 'cycle生成的待办3';
-$todo3->config = '{"specify":{"month":"0","day":"1"},"month":"1,8,13,15,27,29,30","type":"month","beforeDays":301,"end":"","begin":"2022-03-23"}';
+$todo3->config = '{"specify":{"month":"0","day":"1"},"month":"1,8,13,15,27,29,30","type":"month","beforeDays":301,"end":"' . $end . '","begin":"' . $begin . '"}';
$todo = new todoTest();
-r($todo->createByCycleTest($todo1)) && p() && e('11'); // 测试创建周期日待办
-r($todo->createByCycleTest($todo2)) && p() && e('9'); // 测试创建周期周待办
-r($todo->createByCycleTest($todo3)) && p() && e('70'); // 测试创建周期月待办
-system("./ztest init");
+r($todo->createByCycleTest($todo1)) && p() && e('11'); // 测试创建周期日待办
+r($todo->createByCycleTest($todo2)) && p() && e('9'); // 测试创建周期周待办
+r($todo->createByCycleTest($todo3)) && p() && e('`%d`'); // 测试创建周期月待办
+$db->restoreDB();