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

* add project doc to product tree.

Browse Source 
* finish browse page.
This commit is contained in:
wangchunsheng
2010-07-31 03:39:17 +00:00
parent 6586f03071
commit 2bc5449816
4 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/control.php
+6 -4
View File
@@ -35,8 +35,9 @@ class doc extends control
}
/* 浏览某一个产品。*/
public function browse($libID = 'product', $moduleID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
public function browse($libID = 'product', $moduleID = 0, $productID = 0, $projectID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
$this->loadModel('tree');
$this->doc->setMenu($this->libs, $libID, 'doc');
$this->session->set('docList', $this->app->getURI(true));
@@ -47,16 +48,17 @@ class doc extends control
/* 加载分页类，并查询docs列表。*/
$this->app->loadClass('pager', $static = true);
$pager = new pager($recTotal, $recPerPage, $pageID);
$docs = $this->doc->getDocs($libID, $moduleID, $orderBy, $pager);
if($moduleID) $moduleID = $this->tree->getAllChildID($moduleID);
$docs = $this->doc->getDocs($libID, $productID, $projectID, $moduleID, $orderBy, $pager);
/* 获得树状列表。*/
if($libID == 'product' or $libID == 'project')
{
$moduleTree = $this->loadModel('tree')->getSystemDocTreeMenu($libID);
$moduleTree = $this->tree->getSystemDocTreeMenu($libID);
}
else
{
$moduleTree = $this->loadModel('tree')->getTreeMenu($libID, $viewType = 'customdoc', $startModuleID = 0, array('treeModel', 'createDocLink'));
$moduleTree = $this->tree->getTreeMenu($libID, $viewType = 'customdoc', $startModuleID = 0, array('treeModel', 'createDocLink'));
}
$this->view->libID = $libID;
module/doc/model.php
+9 -3
View File
@@ -85,11 +85,17 @@ class docModel extends model
}
/* 获得文档列表。*/
public function getDocs($lib, $module, $orderBy, $pager)
public function getDocs($libID, $productID, $projectID, $module, $orderBy, $pager)
{
return $this->dao->select('*')->from(TABLE_DOC)
->where('lib')->eq($lib)
->andWhere('module')->eq($module)
->where('deleted')->eq(0)
->beginIF(is_numeric($libID))->andWhere('lib')->eq($libID)->fi()
->beginIF($libID == 'product')->andWhere('product')->gt(0)->fi()
->beginIF($libID == 'project')->andWhere('project')->gt(0)->fi()
->beginIF($productID > 0)->andWhere('product')->eq($productID)->fi()
->beginIF($projectID > 0)->andWhere('project')->eq($projectID)->fi()
->beginIF((string)$projectID == 'int')->andWhere('project')->gt(0)->fi()
->beginIF($module)->andWhere('module')->in($module)->fi()
->orderBy($orderBy)
->page($pager)
->fetchAll();
module/doc/view/browse.html.php
+3 -9
View File
@@ -64,20 +64,14 @@ $(document).ready(function()
?>
<tr class='a-center'>
<td><?php if($canView) echo html::a($viewLink, sprintf('%03d', $doc->id)); else printf('%03d', $doc->id);?></td>
<td><?php echo $doc->pri;?></td>
<td class='a-left nobr'><nobr><?php echo html::a($viewLink, $doc->title);?></nobr></td>
<td class='nobr'><?php echo $doc->planTitle;?></td>
<td><?php echo $users[$doc->openedBy];?></td>
<td><?php echo $users[$doc->assignedTo];?></td>
<td><?php echo $doc->estimate;?></td>
<td class='<?php echo $doc->status;?>'><?php echo $lang->doc->statusList[$doc->status];?></td>
<td><?php echo $lang->doc->stageList[$doc->stage];?></td>
<td><?php echo $users[$doc->addedBy];?></td>
<td><?php echo $doc->addedDate;?></td>
<td>
<?php
$vars = "doc={$doc->id}";
if(!($doc->status != 'closed' and common::printLink('doc', 'change', $vars, $lang->doc->change))) echo $lang->doc->change . ' ';
if(!(($doc->status == 'draft' or $doc->status == 'changed') and common::printLink('doc', 'review', $vars, $lang->doc->review))) echo $lang->doc->review . ' ';
if(!common::printLink('doc', 'edit', $vars, $lang->edit)) echo $lang->edit;
if(!common::printLink('doc', 'delete', $vars, $lang->delete)) echo $lang->delete;
?>
</td>
</tr>
module/tree/model.php
+3 -3
View File
@@ -166,7 +166,7 @@ class treeModel extends model
if($projectModules)
{
$menu .= '<li>';
$menu .= html::a(helper::createLink('doc', 'browse', "libID=product&module=0&productID=$productID&projectID=all"), $this->lang->tree->projectDoc);
$menu .= html::a(helper::createLink('doc', 'browse', "libID=product&module=0&productID=$productID&projectID=int"), $this->lang->tree->projectDoc);
$menu .= '<ul>';
foreach($projectModules as $module)
{
@@ -188,13 +188,13 @@ class treeModel extends model
foreach($projects as $projectID =>$projectName)
{
$menu .= '<li>';
$menu .= html::a(helper::createLink('doc', 'browse', "libID=project&moduleID=0&projectID=$projectID"), $projectName);
$menu .= html::a(helper::createLink('doc', 'browse', "libID=project&moduleID=0&productID=0&projectID=$projectID"), $projectName);
if($modules)
{
$menu .= '<ul>';
foreach($modules as $module)
{
$menu .= '<li>' . html::a(helper::createLink('doc', 'browse', "libID=project&module=$module->id&projectID=$projectID"), $module->name) . '</li>';
$menu .= '<li>' . html::a(helper::createLink('doc', 'browse', "libID=project&module=$module->id&productID=0&projectID=$projectID"), $module->name) . '</li>';
}
$menu .= '</ul>';
}