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

* Finish task#8455.

Browse Source
This commit is contained in:
hufangzhou
2020-11-25 09:15:28 +08:00
parent 9a20bab153
commit 37f8d75f1e
15 changed files with 103 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/lang/de.php
+5
View File
@@ -27,6 +27,11 @@ $lang->my->score = 'Meine Wertung';
$lang->my->scoreRule = 'Wertungs regeln';
$lang->my->noTodo = 'Keine toDos. ';
$lang->my->myExecutions = 'My Stage/Sprint/Kanban';
$lang->my->name = 'Name';
$lang->my->code = 'Code';
$lang->my->projects = 'Project';
$lang->my->taskMenu = new stdclass();
$lang->my->taskMenu->assignedToMe = 'Mir zuweisen';
$lang->my->taskMenu->openedByMe = 'Von mir angelegt';
module/my/lang/en.php
+5
View File
@@ -27,6 +27,11 @@ $lang->my->score = 'My Points';
$lang->my->scoreRule = 'Point Rules';
$lang->my->noTodo = 'No todos yet. ';
$lang->my->myExecutions = 'My Stage/Sprint/Kanban';
$lang->my->name = 'Name';
$lang->my->code = 'Code';
$lang->my->projects = 'Project';
$lang->my->taskMenu = new stdclass();
$lang->my->taskMenu->assignedToMe = 'AssignedToMe';
$lang->my->taskMenu->openedByMe = 'CreatedByMe';
module/my/lang/fr.php
+5
View File
@@ -27,6 +27,11 @@ $lang->my->score = 'Mes Points';
$lang->my->scoreRule = 'Règles Point';
$lang->my->noTodo = "Je n'ai rien à faire pour l'instant.";
$lang->my->myExecutions = 'My Stage/Sprint/Kanban';
$lang->my->name = 'Name';
$lang->my->code = 'Code';
$lang->my->projects = 'Project';
$lang->my->taskMenu = new stdclass();
$lang->my->taskMenu->assignedToMe = "Tâches qui me sont affectées";
$lang->my->taskMenu->openedByMe = "Tâches que j'ai créées";
module/my/lang/vi.php
+5
View File
@@ -27,6 +27,11 @@ $lang->my->score = 'Điểm của bạn';
$lang->my->scoreRule = 'Quy định điểm';
$lang->my->noTodo = 'Chưa có việc nào.';
$lang->my->myExecutions = 'My Stage/Sprint/Kanban';
$lang->my->name = 'Name';
$lang->my->code = 'Code';
$lang->my->projects = 'Project';
$lang->my->taskMenu = new stdclass();
$lang->my->taskMenu->assignedToMe = 'Giao cho bạn';
$lang->my->taskMenu->openedByMe = 'Tạo bởi bạn';
module/my/lang/zh-cn.php
+5
View File
@@ -27,6 +27,11 @@ $lang->my->score = '我的积分';
$lang->my->scoreRule = '积分规则';
$lang->my->noTodo = '暂时没有待办。';
$lang->my->myExecutions = '我参与的阶段/冲刺/看板';
$lang->my->name = '名称';
$lang->my->code = '代号';
$lang->my->projects = '项目';
$lang->my->taskMenu = new stdclass();
$lang->my->taskMenu->assignedToMe = '指派给我';
$lang->my->taskMenu->openedByMe = '由我创建';
module/my/lang/zh-tw.php
+5
View File
@@ -27,6 +27,11 @@ $lang->my->score = '我的積分';
$lang->my->scoreRule = '積分規則';
$lang->my->noTodo = '暫時沒有待辦。';
$lang->my->myExecutions = '我參與的階段/衝刺/看板';
$lang->my->name = '名稱';
$lang->my->code = '代號';
$lang->my->projects = '項目';
$lang->my->taskMenu = new stdclass();
$lang->my->taskMenu->assignedToMe = '指派給我';
$lang->my->taskMenu->openedByMe = '由我創建';
module/my/view/execution.html.php
+8 -4
View File
@@ -13,7 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<div id="mainMenu" class="clearfix">
<div class="btn-toolbar pull-left">
<span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->my->execution;?></span></span>
<span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->my->myExecutions;?></span></span>
</div>
</div>
<div id="mainContent" class='main-table'>
@@ -28,8 +28,10 @@
<thead>
<tr class='text-center'>
<th class='w-id'><?php echo $lang->idAB;?></th>
<th class='w-160px text-left'><?php echo $lang->project->code;?></th>
<th class='c-name text-left'><?php echo $lang->project->name;?></th>
<th class='c-name text-left'><?php echo $lang->my->name;?></th>
<th class='w-160px text-left'><?php echo $lang->my->code;?></th>
<th class='w-160px text-left'><?php echo $lang->typeAB;?></th>
<th class='w-160px'><?php echo $lang->my->projects;?></th>
<th class='c-date'><?php echo $lang->project->begin;?></th>
<th class='c-date'><?php echo $lang->project->end;?></th>
<th class='c-status'><?php echo $lang->statusAB;?></th>
@@ -43,8 +45,10 @@
<?php $link = $this->createLink('project', 'browse', "id=$execution->id", '', '', $execution->project);?>
<tr class='text-center'>
<td><?php echo html::a($link, $execution->id);?></td>
<td class='text-left'><?php echo $execution->code;?></td>
<td class='c-name text-left'><?php echo html::a($link, $execution->name);?></td>
<td class='text-left'><?php echo $execution->code;?></td>
<td class='text-left'><?php echo zget($lang->project->typeList, $execution->type);?></td>
<td><?php echo html::a($this->createLink('project', 'browse', "id=$execution->project", '', '', $execution->project), $execution->parentName);?></td>
<td><?php echo $execution->begin;?></td>
<td><?php echo $execution->end;?></td>
<td class="c-status">
module/program/model.php
+17
View File
@@ -1077,6 +1077,23 @@ class programModel extends model
->fetchPairs();
}
/**
* Get project by id list.
*
* @param array $projectIdList
* @access public
* @return object
*/
public function getPRJByIdList($projectIdList = array())
{
return $this->dao->select('*')->from(TABLE_PROJECT)
->where('type')->eq('project')
->andWhere('deleted')->eq(0)
->andWhere('id')->in($projectIdList)
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
->fetchAll('id');
}
/**
* Build the query.
*
module/project/lang/de.php
+5
View File
@@ -342,6 +342,11 @@ $lang->printKanban->taskStatus = 'Status';
$lang->printKanban->typeList['all'] = 'Alle';
$lang->printKanban->typeList['increment'] = 'Erhöhen';
$lang->project->typeList[''] = '';
$lang->project->typeList['stage'] = 'Stage';
$lang->project->typeList['sprint'] = 'Sprint';
$lang->project->typeList['kanban'] = 'Kanban';
$lang->project->featureBar['task']['all'] = $lang->project->allTasks;
$lang->project->featureBar['task']['unclosed'] = $lang->project->unclosed;
$lang->project->featureBar['task']['assignedtome'] = $lang->project->assignedToMe;
module/project/lang/en.php
+5
View File
@@ -342,6 +342,11 @@ $lang->printKanban->taskStatus = 'Status';
$lang->printKanban->typeList['all'] = 'All';
$lang->printKanban->typeList['increment'] = 'Increment';
$lang->project->typeList[''] = '';
$lang->project->typeList['stage'] = 'Stage';
$lang->project->typeList['sprint'] = 'Sprint';
$lang->project->typeList['kanban'] = 'Kanban';
$lang->project->featureBar['task']['all'] = $lang->project->allTasks;
$lang->project->featureBar['task']['unclosed'] = $lang->project->unclosed;
$lang->project->featureBar['task']['assignedtome'] = $lang->project->assignedToMe;
module/project/lang/fr.php
+5
View File
@@ -342,6 +342,11 @@ $lang->printKanban->taskStatus = 'Statut';
$lang->printKanban->typeList['all'] = 'Tout';
$lang->printKanban->typeList['increment'] = 'Incrément';
$lang->project->typeList[''] = '';
$lang->project->typeList['stage'] = 'Stage';
$lang->project->typeList['sprint'] = 'Sprint';
$lang->project->typeList['kanban'] = 'Kanban';
$lang->project->featureBar['task']['all'] = $lang->project->allTasks;
$lang->project->featureBar['task']['unclosed'] = $lang->project->unclosed;
$lang->project->featureBar['task']['assignedtome'] = $lang->project->assignedToMe;
module/project/lang/vi.php
+5
View File
@@ -342,6 +342,11 @@ $lang->printKanban->taskStatus = 'Tình trạng';
$lang->printKanban->typeList['all'] = 'Tất cả';
$lang->printKanban->typeList['increment'] = 'Tăng dần';
$lang->project->typeList[''] = '';
$lang->project->typeList['stage'] = 'Stage';
$lang->project->typeList['sprint'] = 'Sprint';
$lang->project->typeList['kanban'] = 'Kanban';
$lang->project->featureBar['task']['all'] = $lang->project->allTasks;
$lang->project->featureBar['task']['unclosed'] = $lang->project->unclosed;
$lang->project->featureBar['task']['assignedtome'] = $lang->project->assignedToMe;
module/project/lang/zh-cn.php
+5
View File
@@ -342,6 +342,11 @@ $lang->printKanban->taskStatus = '状态';
$lang->printKanban->typeList['all'] = '全部';
$lang->printKanban->typeList['increment'] = '增量';
$lang->project->typeList[''] = '';
$lang->project->typeList['stage'] = '阶段';
$lang->project->typeList['sprint'] = '冲刺';
$lang->project->typeList['kanban'] = '看板';
$lang->project->featureBar['task']['all'] = $lang->project->allTasks;
$lang->project->featureBar['task']['unclosed'] = $lang->project->unclosed;
$lang->project->featureBar['task']['assignedtome'] = $lang->project->assignedToMe;
module/project/lang/zh-tw.php
+5
View File
@@ -342,6 +342,11 @@ $lang->printKanban->taskStatus = '狀態';
$lang->printKanban->typeList['all'] = '全部';
$lang->printKanban->typeList['increment'] = '增量';
$lang->project->typeList[''] = '';
$lang->project->typeList['stage'] = '階段';
$lang->project->typeList['sprint'] = '衝刺';
$lang->project->typeList['kanban'] = '看板';
$lang->project->featureBar['task']['all'] = $lang->project->allTasks;
$lang->project->featureBar['task']['unclosed'] = $lang->project->unclosed;
$lang->project->featureBar['task']['assignedtome'] = $lang->project->assignedToMe;
module/user/model.php
+18 -8
View File
@@ -977,26 +977,36 @@ class userModel extends model
public function getProjects($account, $type = 'project', $pager = null)
{
if($type == 'execution') $type = 'sprint,stage';
$projects = $this->dao->select('t1. *,t2. *')->from(TABLE_TEAM)->alias('t1')
$myProjectsList = $this->dao->select('t1. *,t2. *')->from(TABLE_TEAM)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.root = t2.id')
->where('t1.type')->in($type)
->andWhere('t1.account')->eq($account)
->andWhere('t2.deleted')->eq(0)
->orderBy('t2.id_desc')
->page($pager)
->fetchAll();
->fetchGroup('project');
/* Judge whether the project is delayed. */
foreach($projects as $project)
$projectIdList = array_keys($myProjectsList);
$projectList = $this->loadModel('program')->getPRJByIdList($projectIdList);
$myProjects = array();
foreach($myProjectsList as $projects)
{
if($project->status != 'done' and $project->status != 'closed' and $project->status != 'suspended')
foreach($projects as $project)
{
$delay = helper::diffDate(helper::today(), $project->end);
if($delay > 0) $project->delay = $delay;
/* Judge whether the project is delayed. */
if($project->status != 'done' and $project->status != 'closed' and $project->status != 'suspended')
{
$delay = helper::diffDate(helper::today(), $project->end);
if($delay > 0) $project->delay = $delay;
}
$project->parentName = $projectList[$project->project]->name;
$myProjects[$project->id] = $project;
}
}
return $projects;
return $myProjects;
}
/**