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

* adjust for my audit.

Browse Source
This commit is contained in:
wangyidong
2022-10-19 17:27:09 +08:00
parent 58c2a977e0
commit 9719597cbf
7 changed files with 73 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/lang/resource.php
+2
View File
@@ -88,6 +88,7 @@ $lang->resource->my->index = 'indexAction';
$lang->resource->my->todo = 'todo';
$lang->resource->my->calendar = 'calendarAction';
$lang->resource->my->work = 'workAction';
$lang->resource->my->audit = 'audit';
$lang->resource->my->contribute = 'contributeAction';
$lang->resource->my->project = 'project';
$lang->resource->my->profile = 'profileAction';
@@ -121,6 +122,7 @@ $lang->my->methodOrder[70] = 'unbind';
$lang->my->methodOrder[75] = 'team';
$lang->my->methodOrder[80] = 'execution';
$lang->my->methodOrder[85] = 'doc';
$lang->my->methodOrder[90] = 'audit';
/* Todo. */
$lang->resource->todo = new stdclass();
module/my/lang/de.php
+13 -6
View File
@@ -17,6 +17,7 @@ $lang->my->doc = "My Docs";
$lang->my->createProgram = 'Create Program';
$lang->my->project = "My Projects";
$lang->my->execution = "My {$lang->executionCommon}s";
$lang->my->audit = 'Review';
$lang->my->issue = 'My Issues';
$lang->my->risk = 'My Risks';
$lang->my->profile = 'My Profile';
@@ -80,11 +81,17 @@ $lang->my->storyMenu->reviewedByMe = 'ReviewedByMe';
$lang->my->storyMenu->closedByMe = 'ClosedByMe';
$lang->my->storyMenu->assignedByMe = 'AssignedByMe';
$lang->my->audit = new stdclass();
$lang->my->audit->title = 'Title';
$lang->my->audit->time = 'Time';
$lang->my->audit->type = 'Type';
$lang->my->audit->status = 'Status';
$lang->my->auditField = new stdclass();
$lang->my->auditField->title = 'Title';
$lang->my->auditField->time = 'Time';
$lang->my->auditField->type = 'Type';
$lang->my->auditField->status = 'Status';
$lang->my->auditField->oaTitle['attend'] = '%s application for attend: %s';
$lang->my->auditField->oaTitle['leave'] = '%s application for leave: %s';
$lang->my->auditField->oaTitle['makeup'] = '%s application for makeup:%s';
$lang->my->auditField->oaTitle['overtime'] = '%s application for overtime: %s';
$lang->my->auditField->oaTitle['lieu'] = '%s application for lieu: %s';
$lang->my->auditMenu = new stdclass();
$lang->my->auditMenu->audit = new stdclass();
@@ -140,7 +147,7 @@ $lang->my->executionLinkList['execution-all'] = 'Enter the execution
$lang->my->executionLinkList['execution-task'] = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration';
$lang->my->executionLinkList['execution-executionkanban'] = 'By default, you can enter the execution Kanban to view the execution status of projects in progress';
$lang->my->confirmReview = 'Do you want to pass it?';
$lang->my->confirmReview['pass'] = 'Do you want to pass it?';
$lang->my->guideChangeTheme = <<<EOT
<p class='theme-title'><span style='color: #0c60e1'>"Young Blue"</span> theme is available now!</p>
<div>
module/my/lang/en.php
+13 -6
View File
@@ -17,6 +17,7 @@ $lang->my->doc = "My Docs";
$lang->my->createProgram = 'Create Program';
$lang->my->project = "My Projects";
$lang->my->execution = "My {$lang->executionCommon}s";
$lang->my->audit = 'Review';
$lang->my->issue = 'My Issues';
$lang->my->risk = 'My Risks';
$lang->my->profile = 'My Profile';
@@ -80,11 +81,17 @@ $lang->my->storyMenu->reviewedByMe = 'ReviewedByMe';
$lang->my->storyMenu->closedByMe = 'ClosedByMe';
$lang->my->storyMenu->assignedByMe = 'AssignedByMe';
$lang->my->audit = new stdclass();
$lang->my->audit->title = 'Title';
$lang->my->audit->time = 'Time';
$lang->my->audit->type = 'Type';
$lang->my->audit->status = 'Status';
$lang->my->auditField = new stdclass();
$lang->my->auditField->title = 'Title';
$lang->my->auditField->time = 'Time';
$lang->my->auditField->type = 'Type';
$lang->my->auditField->status = 'Status';
$lang->my->auditField->oaTitle['attend'] = '%s application for attend: %s';
$lang->my->auditField->oaTitle['leave'] = '%s application for leave: %s';
$lang->my->auditField->oaTitle['makeup'] = '%s application for makeup:%s';
$lang->my->auditField->oaTitle['overtime'] = '%s application for overtime: %s';
$lang->my->auditField->oaTitle['lieu'] = '%s application for lieu: %s';
$lang->my->auditMenu = new stdclass();
$lang->my->auditMenu->audit = new stdclass();
@@ -140,7 +147,7 @@ $lang->my->executionLinkList['execution-all'] = 'Enter the execution
$lang->my->executionLinkList['execution-task'] = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration';
$lang->my->executionLinkList['execution-executionkanban'] = 'By default, you can enter the execution Kanban to view the execution status of projects in progress';
$lang->my->confirmReview = 'Do you want to pass it?';
$lang->my->confirmReview['pass'] = 'Do you want to pass it?';
$lang->my->guideChangeTheme = <<<EOT
<p class='theme-title'><span style='color: #0c60e1'>"Young Blue"</span> theme is available now!</p>
<div>
module/my/lang/fr.php
+13 -6
View File
@@ -17,6 +17,7 @@ $lang->my->doc = "My Docs";
$lang->my->createProgram = 'Create Program';
$lang->my->project = "My Projects";
$lang->my->execution = "My {$lang->executionCommon}s";
$lang->my->audit = 'Review';
$lang->my->issue = 'My Issues';
$lang->my->risk = 'My Risks';
$lang->my->profile = 'My Profile';
@@ -80,11 +81,17 @@ $lang->my->storyMenu->reviewedByMe = 'ReviewedByMe';
$lang->my->storyMenu->closedByMe = 'ClosedByMe';
$lang->my->storyMenu->assignedByMe = 'AssignedByMe';
$lang->my->audit = new stdclass();
$lang->my->audit->title = 'Title';
$lang->my->audit->time = 'Time';
$lang->my->audit->type = 'Type';
$lang->my->audit->status = 'Status';
$lang->my->auditField = new stdclass();
$lang->my->auditField->title = 'Title';
$lang->my->auditField->time = 'Time';
$lang->my->auditField->type = 'Type';
$lang->my->auditField->status = 'Status';
$lang->my->auditField->oaTitle['attend'] = '%s application for attend: %s';
$lang->my->auditField->oaTitle['leave'] = '%s application for leave: %s';
$lang->my->auditField->oaTitle['makeup'] = '%s application for makeup:%s';
$lang->my->auditField->oaTitle['overtime'] = '%s application for overtime: %s';
$lang->my->auditField->oaTitle['lieu'] = '%s application for lieu: %s';
$lang->my->auditMenu = new stdclass();
$lang->my->auditMenu->audit = new stdclass();
@@ -140,7 +147,7 @@ $lang->my->executionLinkList['execution-all'] = 'Enter the execution
$lang->my->executionLinkList['execution-task'] = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration';
$lang->my->executionLinkList['execution-executionkanban'] = 'By default, you can enter the execution Kanban to view the execution status of projects in progress';
$lang->my->confirmReview = 'Do you want to pass it?';
$lang->my->confirmReview['pass'] = 'Do you want to pass it?';
$lang->my->guideChangeTheme = <<<EOT
<p class='theme-title'><span style='color: #0c60e1'>"Young Blue"</span> theme is available now!</p>
<div>
module/my/lang/zh-cn.php
+13 -6
View File
@@ -17,6 +17,7 @@ $lang->my->doc = "我的文档";
$lang->my->createProgram = '添加项目';
$lang->my->project = "我的项目";
$lang->my->execution = "我的{$lang->executionCommon}";
$lang->my->audit = '评审';
$lang->my->issue = '我的问题';
$lang->my->risk = '我的风险';
$lang->my->profile = '我的档案';
@@ -80,11 +81,17 @@ $lang->my->storyMenu->reviewedByMe = '由我评审';
$lang->my->storyMenu->closedByMe = '由我关闭';
$lang->my->storyMenu->assignedByMe = '由我指派';
$lang->my->audit = new stdclass();
$lang->my->audit->title = '评审标题';
$lang->my->audit->time = '提交时间';
$lang->my->audit->type = '评审对象';
$lang->my->audit->status = '状态';
$lang->my->auditField = new stdclass();
$lang->my->auditField->title = '评审标题';
$lang->my->auditField->time = '提交时间';
$lang->my->auditField->type = '评审对象';
$lang->my->auditField->status = '状态';
$lang->my->auditField->oaTitle['attend'] = '%s的考勤申请：%s';
$lang->my->auditField->oaTitle['leave'] = '%s的请假申请：%s';
$lang->my->auditField->oaTitle['makeup'] = '%s的补班申请：%s';
$lang->my->auditField->oaTitle['overtime'] = '%s的加班申请：%s';
$lang->my->auditField->oaTitle['lieu'] = '%s的调休申请：%s';
$lang->my->auditMenu = new stdclass();
$lang->my->auditMenu->audit = new stdclass();
@@ -140,7 +147,7 @@ $lang->my->executionLinkList['execution-all'] = '默认进入执行
$lang->my->executionLinkList['execution-task'] = '默认进入最近一个执行的任务列表，可以查看当前迭代下的任务信息';
$lang->my->executionLinkList['execution-executionkanban'] = '默认进入执行看板，可以查看进行中项目的执行情况';
$lang->my->confirmReview = '您确定要执行通过操作吗？';
$lang->my->confirmReview['pass'] = '您确定要执行通过操作吗？';
$lang->my->guideChangeTheme = <<<EOT
<p class='theme-title'>全新<span style='color: #0c60e1'>“青春蓝”</span>主题上线了！</p>
<div>
module/my/model.php
+8 -6
View File
@@ -1188,13 +1188,14 @@ class myModel extends model
$review->type = $type;
$review->time = $type == 'attend' ? $object->date : $object->createdDate;
$review->status = $type == 'attend' ? $object->reviewStatus : $object->status;
$review->title = '';
if($type == 'attend')
{
$review->title = zget($users, $object->account) . ': ' . $object->date . ' ' . $this->lang->attend->statusList[$object->status];
$review->title = sprintf($this->lang->my->auditField->oaTitle[$type], zget($users, $object->account), $object->date);
}
else
elseif(isset($this->lang->my->auditField->oaTitle[$type]))
{
$review->title = zget($users, $object->createdBy) . ': ' . $object->begin . ' ' . substr($object->start, 0, 5) . ' ~ ' . $object->end . ' ' . substr($object->finish, 0, 5);
$review->title = sprintf($this->lang->my->auditField->oaTitle[$type], zget($users, $object->createdBy), $object->begin . ' ' . substr($object->start, 0, 5) . ' ~ ' . $object->end . ' ' . substr($object->finish, 0, 5));
}
$reviewList[] = $review;
}
@@ -1277,17 +1278,18 @@ class myModel extends model
$review->status = $objectType == 'attend' ? $object->reviewStatus : $object->status;
if($review->type == 'review') $review->type = 'project';
$review->title = '';
if(isset($object->title))
{
$review->title = $object->title;
}
elseif($objectType == 'attend')
{
$review->title = zget($users, $object->account) . ': ' . $object->date . ' ' . $this->lang->attend->statusList[$object->status];
$review->title = sprintf($this->lang->my->auditField->oaTitle[$objectType], zget($users, $object->account), $object->date);
}
else
elseif(isset($this->lang->my->auditField->oaTitle[$objectType]))
{
$review->title = zget($users, $object->createdBy) . ': ' . $object->begin . ' ' . substr($object->start, 0, 5) . ' ~ ' . $object->end . ' ' . substr($object->finish, 0, 5);
$review->title = sprintf($this->lang->my->auditField->oaTitle[$objectType], zget($users, $object->createdBy), $object->begin . ' ' . substr($object->start, 0, 5) . ' ~ ' . $object->end . ' ' . substr($object->finish, 0, 5));
}
$reviewList[] = $review;
module/my/view/audit.html.php
+11 -6
View File
@@ -37,10 +37,10 @@
?>
<tr>
<th class='c-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th class='c-title'> <?php $rawMethod == 'contribute' ? print($lang->my->audit->title) : common::printOrderLink('title', $orderBy, $vars, $lang->my->audit->title);?></th>
<th class='c-type'> <?php common::printOrderLink('type', $orderBy, $vars, $lang->my->audit->type);?></th>
<th class='c-date w-150px'> <?php common::printOrderLink('time', $orderBy, $vars, $lang->my->audit->time);?></th>
<th class='c-status w-80px'><?php $rawMethod == 'contribute' ? print($lang->my->audit->status) : common::printOrderLink('status', $orderBy, $vars, $lang->my->audit->status);?></th>
<th class='c-title'> <?php $rawMethod == 'contribute' ? print($lang->my->auditField->title) : common::printOrderLink('title', $orderBy, $vars, $lang->my->auditField->title);?></th>
<th class='c-type w-120px'> <?php common::printOrderLink('type', $orderBy, $vars, $lang->my->auditField->type);?></th>
<th class='c-date w-150px'> <?php common::printOrderLink('time', $orderBy, $vars, $lang->my->auditField->time);?></th>
<th class='c-status w-110px'><?php $rawMethod == 'contribute' ? print($lang->my->auditField->status) : common::printOrderLink('status', $orderBy, $vars, $lang->my->auditField->status);?></th>
<?php if($rawMethod == 'audit'):?>
<th class='c-actions-2'><?php echo $lang->actions?></th>
<?php endif;?>
@@ -61,7 +61,12 @@
<td class='c-title' title='<?php echo $review->title?>'>
<?php
$titleHtml = $review->title;
if(strpos(",{$config->my->oaObjectType},", ",$type,") === false) $titleHtml = html::a($this->createLink($type, 'view', "objectID=$review->id", 'html', true), $review->title, '', "class='iframe' data-width='90%'");
if($type != 'attend')
{
$class = "class='iframe' data-width='90%'";
if(strpos(",{$config->my->oaObjectType},", ",{$type},") !== false) $class = "data-toggle='modal'";
$titleHtml = html::a($this->createLink($type, 'view', "objectID=$review->id", 'html', true), $review->title, '', $class);
}
echo $titleHtml;
?>
</td>
@@ -124,7 +129,7 @@ $(function()
{
if($(this).hasClass('disabled')) return false;
var status = $(this).data('status');
if(status == 'undefined' || confirm(confirmReview))
if(status == 'undefined' || confirm(confirmReview.pass))
{
$.get($(this).prop('href'), function(response)
{