From c8e660380a190ac8583bfdcb0abd201e8d5c8623 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Wed, 26 Aug 2020 10:20:32 +0800
Subject: [PATCH]  * Fix bug #3397,3398,3399.

---
 module/risk/js/common.js              | 26 ++++++++++++++++++++++++++
 module/risk/view/batchcreate.html.php |  2 +-
 module/risk/view/view.html.php        |  6 +++---
 3 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 module/risk/js/common.js

diff --git a/module/risk/js/common.js b/module/risk/js/common.js
new file mode 100644
index 0000000000..f315512f29
--- /dev/null
+++ b/module/risk/js/common.js
@@ -0,0 +1,26 @@
+$(function()
+{
+    $('#riskindex').attr('readonly', true);
+    $('#pri').attr('disabled', true);
+    computeIndex();
+    function computeIndex()
+    {
+        var impact      = $('#impact').val();
+        var probability = $('#probability').val();
+        var riskindex = parseInt(impact * probability);
+        var pri = ''; 
+        if(0 < riskindex && riskindex <= 5)    pri = 'low';
+        if(5 < riskindex && riskindex <= 12)   pri = 'middle';
+        if(15 <= riskindex && riskindex <= 25) pri = 'high';
+
+        $('#riskindex').val(riskindex);
+        $('#pri').val(pri);
+        $('#pri').trigger("chosen:updated")
+        $('#pri').chosen();
+        $('#pri').attr('disabled', true);
+        $('input[name="pri"]').remove();
+        $('#pri').after("<input type='hidden' name='pri' value='" + pri + "'/>");
+    }
+
+    $('#impact, #probability').change(function(){computeIndex()});
+})
diff --git a/module/risk/view/batchcreate.html.php b/module/risk/view/batchcreate.html.php
index 454bc77718..22a2e0af8e 100644
--- a/module/risk/view/batchcreate.html.php
+++ b/module/risk/view/batchcreate.html.php
@@ -8,7 +8,7 @@
       <thead>
         <tr>
           <th class='w-50px'><?php echo $lang->risk->id;?></th>
-          <th><?php echo $lang->risk->name;?></th>
+          <th class='required'><?php echo $lang->risk->name;?></th>
           <th class='w-200px'><?php echo $lang->risk->source;?></th>
           <th class='w-200px'><?php echo $lang->risk->category;?></th>
           <th class='w-200px'><?php echo $lang->risk->strategy;?></th>
diff --git a/module/risk/view/view.html.php b/module/risk/view/view.html.php
index f80420bd91..e0af11b318 100644
--- a/module/risk/view/view.html.php
+++ b/module/risk/view/view.html.php
@@ -78,7 +78,7 @@
                 </tr>
                 <tr>
                   <th><?php echo $lang->risk->strategy;?></th>
-                  <td><?php echo zget($lang->risk->strategy, $risk->strategy);?></td>
+                  <td><?php echo zget($lang->risk->strategyList, $risk->strategy);?></td>
                 </tr>
                 <tr>
                   <th><?php echo $lang->risk->status;?></th>
@@ -86,11 +86,11 @@
                 </tr>
                 <tr>
                   <th><?php echo $lang->risk->impact;?></th>
-                  <td><?php echo zget($lang->risk->impact, $risk->impact);?></td>
+                  <td><?php echo zget($lang->risk->impactList, $risk->impact);?></td>
                 </tr>
                 <tr>
                   <th><?php echo $lang->risk->probability;?></th>
-                  <td><?php echo zget($lang->risk->probability, $risk->probability);?></td>
+                  <td><?php echo zget($lang->risk->probabilityList, $risk->probability);?></td>
                 </tr>
                 <tr>
                   <th><?php echo $lang->risk->riskindex;?></th>