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

Merge branch 'max_45' into 'master'

Browse Source 
* Finish task #67793.

See merge request easycorp/zentaopms!5282
This commit is contained in:
王怡栋
2022-09-07 02:32:06 +00:00
parent b389d7ea97 a2946b28af
commit 9be46b416f
2 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/control.php
+50 -1
View File
@@ -189,6 +189,11 @@ class my extends control
$ncList = $this->my->getNcList('assignedToMe', 'id_desc', $pager, 'active');
$ncCount = $pager->recTotal;
/* Get the number of nc assigned to me. */
$auditplanList = $this->loadModel('auditplan')->getList(0, 'mychecking', '', 'id_desc', $pager);
$auditplanCount = $pager->recTotal;
$qaCount = $ncCount + $auditplanCount;
/* Get the number of meetings assigned to me. */
$meetings = $this->meeting->getListByUser('futureMeeting', 'id_desc', 0, $pager);
$meetingCount = $pager->recTotal;
@@ -215,7 +220,7 @@ if(isMax !== 0)
var issueCount = $issueCount;
var riskCount = $riskCount;
var reviewCount = $reviewCount;
var ncCount = $ncCount;
var qaCount = $qaCount;
var meetingCount = $meetingCount;
}
</script>
@@ -986,6 +991,50 @@ EOF;
$this->display();
}
/**
* My auditplans.
*
* @param string $browseType
* @param int $param
* @param string $orderBy
* @param int $recTotal
* @param int $recPerPage
* @param int $pageID
* @access public
* @return void
*/
public function auditplan($browseType = 'myChecking', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
$this->loadModel('auditplan');
$this->loadModel('process');
$this->loadModel('pssp');
$this->session->set('auditplanList', $this->app->getURI(true));
/* Set the pager. */
$this->app->loadClass('pager', $static = true);
if($this->app->getViewType() == 'mhtml') $recPerPage = 10;
$pager = pager::init($recTotal, $recPerPage, $pageID);
$auditplans = $this->auditplan->getList(0, $browseType, $param, $orderBy, $pager);
$this->view->executions = $this->loadModel('execution')->getPairs();
$this->view->processTypeList = $this->lang->process->classify;
$this->view->processes = $this->pssp->getProcesses();
$this->view->activities = $this->pssp->getActivityPairs();
$this->view->outputs = $this->pssp->getOutputPairs();
$this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->auditplan;
$this->view->position[] = $this->lang->my->auditplan;
$this->view->browseType = $browseType;
$this->view->auditplans = $auditplans;
$this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter');
$this->view->pager = $pager;
$this->view->orderBy = $orderBy;
$this->view->param = $param;
$this->view->mode = 'auditplan';
$this->display();
}
/**
* My ncs.
*
module/my/js/common.js
+1 -1
View File
@@ -19,7 +19,7 @@ $(function()
$("#subNavbar li[data-id='issue'] a").append('<span class="label label-light label-badge">' + issueCount + '</span>');
$("#subNavbar li[data-id='risk'] a").append('<span class="label label-light label-badge">' + riskCount + '</span>');
$("#subNavbar li[data-id='audit'] a").append('<span class="label label-light label-badge">' + reviewCount + '</span>');
$("#subNavbar li[data-id='nc'] a").append('<span class="label label-light label-badge">' + ncCount + '</span>');
$("#subNavbar li[data-id='nc'] a").append('<span class="label label-light label-badge">' + qaCount + '</span>');
$("#subNavbar li[data-id='myMeeting'] a").append('<span class="label label-light label-badge">' + meetingCount + '</span>');
}
}