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

Merge branch 'master' of https://git.zcorp.cc/zentaopms

Browse Source
This commit is contained in:
tianshujie98
2021-01-15 10:19:35 +08:00
parent 857a41c3f1 4428e6443c
commit 0f2a7bce1b
12 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module/issue/control.php
View File

@@ -25,15 +25,17 @@ class issue extends control
*/
public function browse($browseType = 'all', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
$browseType = strtolower($browseType);
$uri = $this->app->getURI(true);
$this->session->set('issueList', $uri);
/* Load pager */
$this->app->loadClass('pager', true);
$pager = pager::init($recTotal, $recPerPage, $pageID);
/* Build the search form. */
$queryID = ($browseType == 'bysearch') ? (int)$param : 0;
$actionURL = $this->createLink('issue', 'browse', "browseType=bysearch&queryID=myQueryID");
$browseType = strtolower($browseType);
$queryID = ($browseType == 'bysearch') ? (int)$param : 0;
$actionURL = $this->createLink('issue', 'browse', "browseType=bysearch&queryID=myQueryID");
$this->issue->buildSearchForm($actionURL, $queryID);
$this->view->title = $this->lang->issue->common . $this->lang->colon . $this->lang->issue->browse;

2
module/issue/view/view.html.php
View File

@@ -13,7 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<?php
$browseLink = $this->createLink('issue', 'browse');
$browseLink = $app->session->issueList != false ? $app->session->issueList : $this->createLink('issue', 'browse');
$createLink = $this->createLink('issue', 'create');
$dateFiled = array('deadline', 'resolvedDate', 'createdDate', 'editedDate', 'activateDate', 'closedDate', 'assignedDate');

2
module/my/view/team.html.php
View File

@@ -43,7 +43,7 @@ include '../../common/view/header.html.php';
<td class="c-url" title="<?php echo $user->email;?>"><?php echo html::mailto($user->email);?></td>
<td class="c-type"><?php echo zget($lang->user->genderList, $user->gender, $user->gender);?></td>
<td><?php echo $user->phone;?></td>
<td><?php echo !empty($this->config->isINT) ? $user->skype : ($user->qq ? html::a("tencent://message/?uin=$user->qq", $user->qq) : '');?></td>
<td><?php echo !empty($this->config->isINT) ? $user->skype : ($user->qq ? html::a("tencent://message/?uin=$user->qq#open=my", $user->qq) : '');?></td>
<td class='c-date'><?php if($user->last) echo date('Y-m-d', $user->last);?></td>
<td class='c-num text-center'><?php echo $user->visits;?></td>
</tr>

3
module/programplan/view/create.html.php
View File

@@ -16,7 +16,8 @@
<div class='btn-toolbar pull-left'>
<span class='btn btn-link btn-active-text'>
<?php
$title = $programPlan->name . $lang->project->statge . '（' . $programPlan->begin . $lang->project->to . $programPlan->end . '）';
$title = $lang->programplan->create;
if($planID) $title = $programPlan->name . $lang->project->statge . '（' . $programPlan->begin . $lang->project->to . $programPlan->end . '）';
echo "<span class='text'>{$title}</span>";
?>
</span>

9
module/user/control.php
View File

@@ -368,6 +368,9 @@ class user extends control
*/
public function execution($userID, $fromModule = 'user', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
$uri = $this->app->getURI(true);
$this->session->set('projectList', $uri);
$user = $this->user->getById($userID, 'id');
$account = $user->account;
$users = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
@@ -410,6 +413,9 @@ class user extends control
*/
public function issue($userID, $fromModule = 'user', $type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
$uri = $this->app->getURI(true);
$this->session->set('issueList', $uri);
$user = $this->user->getById($userID, 'id');
$account = $user->account;
$users = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
@@ -453,6 +459,9 @@ class user extends control
*/
public function risk($userID, $fromModule = 'user', $type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
$uri = $this->app->getURI(true);
$this->session->set('riskList', $uri);
$user = $this->user->getById($userID, 'id');
$account = $user->account;
$users = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');

3
module/user/lang/de.php
View File

@@ -207,6 +207,9 @@ $lang->user->contactFieldList['skype'] = $lang->user->skype;
$lang->user->contactFieldList['slack'] = $lang->user->slack;
$lang->user->contactFieldList['whatsapp'] = $lang->user->whatsapp;
$lang->user->executionTypeList['stage'] = 'Stage';
$lang->user->executionTypeList['sprint'] = 'Iteration';
$lang->user->contacts = new stdclass();
$lang->user->contacts->common = 'Kontakt';
$lang->user->contacts->listName = 'Namensliste';

3
module/user/lang/en.php
View File

@@ -207,6 +207,9 @@ $lang->user->contactFieldList['skype'] = $lang->user->skype;
$lang->user->contactFieldList['slack'] = $lang->user->slack;
$lang->user->contactFieldList['whatsapp'] = $lang->user->whatsapp;
$lang->user->executionTypeList['stage'] = 'Stage';
$lang->user->executionTypeList['sprint'] = 'Iteration';
$lang->user->contacts = new stdclass();
$lang->user->contacts->common = 'Contacts';
$lang->user->contacts->listName = 'List Name';

3
module/user/lang/fr.php
View File

@@ -207,6 +207,9 @@ $lang->user->contactFieldList['skype'] = $lang->user->skype;
$lang->user->contactFieldList['slack'] = $lang->user->slack;
$lang->user->contactFieldList['whatsapp'] = $lang->user->whatsapp;
$lang->user->executionTypeList['stage'] = 'Stage';
$lang->user->executionTypeList['sprint'] = 'Iteration';
$lang->user->contacts = new stdclass();
$lang->user->contacts->common = 'Contacts';
$lang->user->contacts->listName = 'Nom de la Liste';

3
module/user/lang/vi.php
View File

@@ -207,6 +207,9 @@ $lang->user->contactFieldList['skype'] = $lang->user->skype;
$lang->user->contactFieldList['slack'] = $lang->user->slack;
$lang->user->contactFieldList['whatsapp'] = $lang->user->whatsapp;
$lang->user->executionTypeList['stage'] = 'Stage';
$lang->user->executionTypeList['sprint'] = 'Iteration';
$lang->user->contacts = new stdclass();
$lang->user->contacts->common = 'Liên lạc';
$lang->user->contacts->listName = 'Tên danh sách';

3
module/user/lang/zh-cn.php
View File

@@ -207,6 +207,9 @@ $lang->user->contactFieldList['skype'] = $lang->user->skype;
$lang->user->contactFieldList['slack'] = $lang->user->slack;
$lang->user->contactFieldList['whatsapp'] = $lang->user->whatsapp;
$lang->user->executionTypeList['stage'] = '阶段';
$lang->user->executionTypeList['sprint'] = '迭代';
$lang->user->contacts = new stdclass();
$lang->user->contacts->common = '联系人';
$lang->user->contacts->listName = '列表名称';

3
module/user/lang/zh-tw.php
View File

@@ -198,6 +198,9 @@ $lang->user->contactFieldList['skype'] = $lang->user->skype;
$lang->user->contactFieldList['slack'] = $lang->user->slack;
$lang->user->contactFieldList['whatsapp'] = $lang->user->whatsapp;
$lang->user->executionTypeList['stage'] = '階段';
$lang->user->executionTypeList['sprint'] = '迭代';
$lang->user->contacts = new stdclass();
$lang->user->contacts->common = '聯繫人';
$lang->user->contacts->listName = '列表名稱';

4
module/user/view/execution.html.php
View File

@@ -30,11 +30,11 @@
</thead>
<tbody>
<?php foreach($executions as $execution):?>
<?php $executionLink = $this->createLink('project', 'view', "projectID=$execution->id");?>
<?php $executionLink = $this->createLink('project', 'view', "projectID=$execution->id", '', false, $execution->project);?>
<tr>
<td><?php echo html::a($executionLink, $execution->id);?></td>
<td>
<span class='project-type-label label label-info label-outline'><?php echo zget($lang->project->typeList, $execution->type);?></span>
<span class='project-type-label label label-info label-outline'><?php echo zget($lang->user->executionTypeList, $execution->type);?></span>
<?php echo html::a($executionLink, $execution->name);?>
</td>
<td><?php echo $execution->begin;?></td>