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

* code for task #72991.

Browse Source
This commit is contained in:
wangyidong
2022-10-24 17:22:00 +08:00
parent 2651502b2c
commit f19271b276
6 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
module/my/lang/de.php
View File

@@ -85,6 +85,7 @@ $lang->my->auditField = new stdclass();
$lang->my->auditField->title = 'Title';
$lang->my->auditField->time = 'Time';
$lang->my->auditField->type = 'Type';
$lang->my->auditField->result = 'Result';
$lang->my->auditField->status = 'Status';
$lang->my->auditField->oaTitle['attend'] = '%s application for attend: %s';

1
module/my/lang/en.php
View File

@@ -85,6 +85,7 @@ $lang->my->auditField = new stdclass();
$lang->my->auditField->title = 'Title';
$lang->my->auditField->time = 'Time';
$lang->my->auditField->type = 'Type';
$lang->my->auditField->result = 'Result';
$lang->my->auditField->status = 'Status';
$lang->my->auditField->oaTitle['attend'] = '%s application for attend: %s';

1
module/my/lang/fr.php
View File

@@ -85,6 +85,7 @@ $lang->my->auditField = new stdclass();
$lang->my->auditField->title = 'Title';
$lang->my->auditField->time = 'Time';
$lang->my->auditField->type = 'Type';
$lang->my->auditField->result = 'Result';
$lang->my->auditField->status = 'Status';
$lang->my->auditField->oaTitle['attend'] = '%s application for attend: %s';

1
module/my/lang/zh-cn.php
View File

@@ -85,6 +85,7 @@ $lang->my->auditField = new stdclass();
$lang->my->auditField->title = '评审标题';
$lang->my->auditField->time = '提交时间';
$lang->my->auditField->type = '评审对象';
$lang->my->auditField->result = '评审结果';
$lang->my->auditField->status = '状态';
$lang->my->auditField->oaTitle['attend'] = '%s的考勤申请：%s';

3
module/my/model.php
View File

@@ -1235,7 +1235,7 @@ class myModel extends model
$condition = "($condition)";
}
$actions = $this->dao->select('objectType,objectID,actor,action,MAX(`date`) as `date`')->from(TABLE_ACTION)
$actions = $this->dao->select('objectType,objectID,actor,action,MAX(`date`) as `date`,extra')->from(TABLE_ACTION)
->where('actor')->eq($this->app->user->account)
->andWhere('objectType')->in($this->config->my->reviewObjectType)
->andWhere($condition)
@@ -1274,6 +1274,7 @@ class myModel extends model
$review->id = $object->id;
$review->type = $objectType;
$review->time = $action->date;
$review->result = strtolower($action->extra);
$review->status = $objectType == 'attend' ? $object->reviewStatus : $object->status;
if($review->type == 'review') $review->type = 'project';

10
module/my/view/audit.html.php
View File

@@ -40,6 +40,9 @@
<th class='c-title text-left'><?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>
<?php if($rawMethod == 'contribute'):?>
<th class='c-status w-150px'> <?php print($lang->my->auditField->result);?></th>
<?php endif;?>
<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-1'><?php echo $lang->actions?></th>
@@ -78,6 +81,13 @@
</td>
<td class='c-type'><?php echo $typeName;?></td>
<td class='c-time text-left'><?php echo $review->time?></td>
<?php if($rawMethod == 'contribute'):?>
<?php
$reviewResultList = zget($lang->$type, 'reviewResultList', array());
if(strpos(",{$config->my->oaObjectType},", ",$type,") !== false) $reviewResultList = zget($lang->$type, 'reviewStatusList', array());
?>
<td class='c-status'><?php echo zget($reviewResultList, $review->result);?></td>
<?php endif;?>
<td class='c-status'><?php echo zget($statusList, $review->status, '')?></td>
<?php if($rawMethod == 'audit'):?>
<td class='c-actions text-left'>