* Code for risk.

db/update20.0.sql

@@ -161,7 +161,7 @@ CREATE TABLE `zt_risk` (
   `cancelDate` date NOT NULL,
   `cancelReason` char(30) NOT NULL,
   `hangupBy` varchar(30) NOT NULL,
-  `hangupdDate` date NOT NULL,
+  `hangupDate` date NOT NULL,
   `trackedBy` varchar(30) NOT NULL,
   `trackedDate` date NOT NULL,
   `assignedDate` date NOT NULL,

module/risk/config.php

@@ -12,11 +12,11 @@ $config->risk->create = new stdclass();
 $config->risk->create->requiredFields = 'name';
 
 global $lang;
-$config->risk->search['module']                      = 'bug';
+$config->risk->search['module']                      = 'risk';
 $config->risk->search['fields']['id']                = $lang->risk->id;
 $config->risk->search['fields']['name']              = $lang->risk->name;
 $config->risk->search['fields']['source']            = $lang->risk->source;
-$config->risk->search['fields']['categroy']          = $lang->risk->category;
+$config->risk->search['fields']['category']          = $lang->risk->category;
 $config->risk->search['fields']['strategy']          = $lang->risk->strategy;
 $config->risk->search['fields']['status']            = $lang->risk->status;
 $config->risk->search['fields']['impact']            = $lang->risk->impact;
@@ -36,13 +36,13 @@ $config->risk->search['fields']['activateBy']        = $lang->risk->activateBy;
 $config->risk->search['fields']['assignedTo']        = $lang->risk->assignedTo;
 $config->risk->search['fields']['cancelBy']          = $lang->risk->cancelBy;
 $config->risk->search['fields']['hangupBy']          = $lang->risk->hangupBy;
-$config->risk->search['fields']['trackedBy']         = $lang->risk->trackedDate;
+$config->risk->search['fields']['trackedBy']         = $lang->risk->trackedBy;
 
 $config->risk->search['params']['name']              = array('operator' => 'include', 'control' => 'input',  'values' => '');
 $config->risk->search['params']['source']            = array('operator' => '=', 'control' => 'select',  'values' => $lang->risk->sourceList);
 $config->risk->search['params']['category']          = array('operator' => '=', 'control' => 'select',  'values' => $lang->risk->categoryList);
 $config->risk->search['params']['strategy']          = array('operator' => '=', 'control' => 'select',  'values' => $lang->risk->strategyList);
-$config->risk->search['params']['status']            = array('operator' => '=', 'control' => 'select',  'values' => $lang->risk->status);
+$config->risk->search['params']['status']            = array('operator' => '=', 'control' => 'select',  'values' => $lang->risk->statusList);
 $config->risk->search['params']['impact']            = array('operator' => '=', 'control' => 'select',  'values' => $lang->risk->impactList);
 $config->risk->search['params']['probability']       = array('operator' => '=', 'control' => 'select',  'values' => $lang->risk->probabilityList);
 $config->risk->search['params']['riskindex']         = array('operator' => '=', 'control' => 'input',  'values' => '');

module/risk/control.php

@@ -1,7 +1,7 @@
 <?php 
 class risk extends control
 {
-    public function browse($browseType = 'browse', $param = '', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function browse($browseType = 'all', $param = '', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         $queryID   = ($browseType == 'bysearch') ? (int)$param : 0;
         /* Build the search form. */
@@ -16,7 +16,7 @@ class risk extends control
 
         $this->view->title       = $this->lang->risk->common . $this->lang->colon . $this->lang->risk->browse;
         $this->view->position[]  = $this->lang->risk->browse;
-        $this->view->risks       = $this->risk->getList($orderBy, $pager);
+        $this->view->risks       = $this->risk->getList($browseType, $param, $orderBy, $pager);
         $this->view->browseType  = $browseType;
         $this->view->param       = $param;
         $this->view->orderBy     = $orderBy;

module/risk/lang/zh-cn.php

@@ -11,6 +11,7 @@ $lang->risk->cancel      = '取消';
 $lang->risk->track       = '跟踪';
 $lang->risk->assignTo    = '指派';
 $lang->risk->deleted     = '删除';
+$lang->risk->byQuery     = '搜索';
 
 $lang->risk->legendBasicInfo = '基本信息';
 $lang->risk->legendLifeTime  = '风险的一生';
@@ -109,3 +110,10 @@ $lang->risk->isChangeList[1] = '是';
 $lang->risk->cancelReasonList[''] = '';
 $lang->risk->cancelReasonList['disappeared'] = '风险自行消失';
 $lang->risk->cancelReasonList['mistake']     = '识别错误';
+
+$lang->risk->featureBar['browse']['all']      = '所有';
+$lang->risk->featureBar['browse']['active']   = '开放';
+$lang->risk->featureBar['browse']['assignTo'] = '指派给我';
+$lang->risk->featureBar['browse']['closed']   = '已关闭';
+$lang->risk->featureBar['browse']['hangup']   = '已挂起';
+$lang->risk->featureBar['browse']['canceled'] = '已取消';

module/risk/model.php

@@ -78,10 +78,46 @@ class riskModel extends model
         return false;
     }
 
-    public function getList($orderBy = 'id_desc', $pager = null)
+    public function getList($browseType = '', $param = '', $orderBy = 'id_desc', $pager = null)
     {
+        if($browseType == 'bySearch') return $this->getBySearch($param, $orderBy, $pager);
+
         return $this->dao->select('*')->from(TABLE_RISK)
             ->where('deleted')->eq(0)
+            ->beginIF($browseType != 'all' and $browseType != 'assignTo')->andWhere('status')->eq($browseType)->fi()
+            ->beginIF($browseType == 'assignTo')->andWhere('assignedTo')->eq($this->app->user->account)->fi()
+            ->andWhere('program')->eq($this->session->program)
+            ->orderBy($orderBy)
+            ->page($pager)
+            ->fetchAll('id');
+    }
+
+    public function getBySearch($queryID = '', $orderBy = 'id_desc', $pager = null)
+    {
+        if($queryID)
+        {
+            $query = $this->loadModel('search')->getQuery($queryID);
+            if($query)
+            {
+                $this->session->set('riskQuery', $query->sql);
+                $this->session->set('riskForm', $query->form);
+            }
+            else
+            {
+                $this->session->set('riskQuery', ' 1 = 1');
+            }
+        }
+        else
+        {
+            if($this->session->riskQuery == false) $this->session->set('riskQuery', ' 1 = 1');
+        }
+        a($this->session->riskQuery);die;
+
+        $riskQuery   = $this->session->riskQuery;
+
+        return $this->dao->select('*')->from(TABLE_RISK)
+            ->where($riskQuery)
+            ->andWhere('deleted')->eq('0')
             ->andWhere('program')->eq($this->session->program)
             ->orderBy($orderBy)
             ->page($pager)
@@ -231,6 +267,6 @@ class riskModel extends model
         $this->config->risk->search['actionURL'] = $actionURL;
         $this->config->risk->search['queryID']   = $queryID;
         
-        $this->loadModel('search')->setSearchParams($this->config->bug->search);
+        $this->loadModel('search')->setSearchParams($this->config->risk->search);
     }
 }

module/risk/view/browse.html.php

@@ -1,16 +1,27 @@
 <?php include "../../common/view/header.html.php"?>
+<style>
+#querybox #searchform{border-bottom: 1px solid #ddd; margin-bottom: 20px;}
+</style>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toobar pull-left">
-    <a href="" class="btn btn-link btn-active-text">
-    <span class="text"><?php echo $lang->risk->browse;?></span>
+    <?php
+    $menus = customModel::getFeatureMenu($this->moduleName, $this->methodName);
+    foreach($menus as $menuItem)
+    {
+        $active = $menuItem->name == $browseType ? ' btn-active-text' : '';
+        echo html::a($this->createLink('risk', 'browse', "browseType=$menuItem->name"), "<span class='text'>{$menuItem->text}</span>", '', "class='btn btn-link $active'");
+    }
+    ?>
+    <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->risk->byQuery;?></a>
   </div>
   <div class="btn-toolbar pull-right">
     <?php common::printLink('risk', 'batchCreate', "", "<i class='icon icon-plus'></i>" . $lang->risk->batchCreate, '', "class='btn btn-primary'");?>
     <?php common::printLink('risk', 'create', "", "<i class='icon icon-plus'></i>" . $lang->risk->create, '', "class='btn btn-primary'");?>
   </div>
 </div>
+<div class="cell<?php if($browseType == 'bysearch') echo ' show';?>" id="queryBox" data-module='risk'></div>
 <div id="mainContent" class="main-table">
-<?php if(empty($risks)):?>
+  <?php if(empty($risks)):?>
   <div class="table-empty-tip">
     <p> 
       <span class="text-muted"><?php echo $lang->noData;?></span>
@@ -21,7 +32,7 @@
   </div>
   <?php else:?>
   <table class="table has-sort-head" id='riskList'>
-    <?php $vars = "orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";?>
+    <?php $vars = "browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";?>
     <thead>
       <tr>
         <th class='text-left w-60px'><?php common::printOrderLink('id', $orderBy, $vars, $lang->risk->id);?></th>