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

* Finish task#55172

Browse Source
This commit is contained in:
zenggang
2022-05-25 02:51:17 +00:00
parent 5b623fa3c4
commit 33a23e09c5
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/control.php
+7 -2
View File
@@ -695,10 +695,11 @@ EOF;
* @param int $recTotal
* @param int $recPerPage
* @param int $pageID
* @param string $orderBy
* @access public
* @return void
*/
public function project($status = 'doing', $recTotal = 0, $recPerPage = 15, $pageID = 1)
public function project($status = 'doing', $recTotal = 0, $recPerPage = 15, $pageID = 1, $orderBy = 'id_desc')
{
$this->loadModel('program');
$this->app->loadLang('project');
@@ -713,7 +714,7 @@ EOF;
/* Get PM id list. */
$accounts = array();
$projects = $this->user->getObjects($this->app->user->account, 'project', $status, 'id_desc', $pager);
$projects = $this->user->getObjects($this->app->user->account, 'project', $status, $orderBy, $pager);
foreach($projects as $project)
{
if(!empty($project->PM) and !in_array($project->PM, $accounts)) $accounts[] = $project->PM;
@@ -727,6 +728,10 @@ EOF;
$this->view->PMList = $PMList;
$this->view->pager = $pager;
$this->view->status = $status;
$this->view->recTotal = $recTotal;
$this->view->recPerPage = $recPerPage;
$this->view->pageID = $pageID;
$this->view->orderBy = $orderBy;
$this->display();
}
module/my/view/project.html.php
+9 -8
View File
@@ -30,18 +30,19 @@
</div>
<?php else:?>
<form class='main-table' id='projectForm' method='post' data-ride='table' data-checkable='false'>
<table class='table table-fixed' id='projectList'>
<table class='table has-sort-head table-fixed' id='projectList'>
<?php $vars = "status=$status&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID&orderBy=%s"; ?>
<thead>
<tr>
<th class='c-id'><?php echo $lang->idAB;?></th>
<th><?php echo $lang->project->name;?></th>
<th class='c-id'><?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th><?php common::printOrderLink('name', $orderBy, $vars, $lang->project->name);?></th>
<?php if($status == 'openedbyme'):?>
<th class='c-status'> <?php echo $lang->project->status;?></th>
<th class='c-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->project->status);?></th>
<?php endif;?>
<th class='c-date'><?php echo $lang->project->begin;?></th>
<th class='c-date'><?php echo $lang->project->end;?></th>
<th class='text-right c-budget'><?php echo $lang->project->budget;?></th>
<th class='c-user'><?php echo $lang->project->PM;?></th>
<th class='c-date'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->project->begin);?></th>
<th class='c-date'><?php common::printOrderLink('end', $orderBy, $vars, $lang->project->end);?></th>
<th class='text-right c-budget'><?php common::printOrderLink('budget', $orderBy, $vars, $lang->project->budget);?></th>
<th class='c-user'><?php common::printOrderLink('PM', $orderBy, $vars, $lang->project->PM);?></th>
<th class='text-center c-actions-6'><?php echo $lang->actions;?></th>
</tr>
</thead>