MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

chg: [decaying:simulation] Improved feedback on how default_base_score 

is set
pull/5032/head
mokaddem 2019-07-23 11:56:35 +02:00
parent 1fa049b8b8
commit 8e8c9c8c2e
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Model/DecayingModel.php
View File

@ -297,7 +297,8 @@ class DecayingModel extends AppModel
$tags = $temp['tags'];
$overridden_tags = $temp['overridden'];
$taxonomy_effective_ratios = $this->_getRatioScore($model, $tags);
$base_score = isset($model['DecayingModel']['parameters']['default_base_score']) ? $model['DecayingModel']['parameters']['default_base_score'] : 0 ;
$default_base_score = isset($model['DecayingModel']['parameters']['default_base_score']) ? $model['DecayingModel']['parameters']['default_base_score'] : 0 ;
$base_score = $default_base_score;
if (!empty($taxonomy_effective_ratios)) {
foreach ($tags as $k => $tag) {
$taxonomy = explode(':', $tag['Tag']['name'])[0];
@ -306,7 +307,7 @@ class DecayingModel extends AppModel
}
}
}
return array('base_score' => $base_score, 'overridden' => $overridden_tags, 'tags' => $tags, 'taxonomy_effective_ratios' => $taxonomy_effective_ratios);
return array('base_score' => $base_score, 'overridden' => $overridden_tags, 'tags' => $tags, 'taxonomy_effective_ratios' => $taxonomy_effective_ratios, 'default_base_score' => $default_base_score);
}
// compute the current score for the provided atribute with the provided model

21
app/View/DecayingModel/decaying_tool_simulation.ctp
View File

@ -58,6 +58,9 @@
<div id="basescore-simulation-container" style="width: 30%; height: 100%;">
<h5 style="display: inline-block;"><?php echo __('Base score') ?></h5>
<div id="alert-basescore-not-set" class="alert alert-warning" style="display: inline-block; margin-bottom: auto; margin-left: 5px; padding: 4px 8px;">
<strong><?php echo __('Base score configuration'); ?></strong> <?php echo __('not set. But default value sets.') ?>
</div>
<div id="alert-basescore-not-set" class="alert alert-error" style="display: inline-block; margin-bottom: auto; margin-left: 5px; padding: 4px 8px;">
<strong><?php echo __('Base score configuration'); ?></strong> <?php echo __('not set') ?>
</div>
<div style="overflow: auto; position: relative;">
@ -88,6 +91,8 @@
<script>
var model_list = <?php echo json_encode($all_models); ?>;
var models = {};
$('#alert-basescore-not-set').hide();
$('#alert-basescore-not-set.alert-error').hide();
$(document).ready(function() {
model_list.forEach(function(m) {
models[m.DecayingModel.id] = m.DecayingModel;
@ -167,11 +172,19 @@ function doSimulation(clicked, attribute_id) {
simulation_chart.update(data, models[model_id]);
simulation_table.update(data, models[model_id]);
if (Object.keys(data.base_score_config.taxonomy_effective_ratios).length > 0) { // show alert base_score not set
$('#alert-basescore-not-set').hide('fade', {}, 250);
$('#basescore-simulation-container #computation_help_container_body tr').removeClass('warning');
$('#alert-basescore-not-set').hide();
$('#alert-basescore-not-set.alert-error').hide();
$('#basescore-simulation-container #computation_help_container_body tr').removeClass('warning').removeClass('error');
} else {
$('#alert-basescore-not-set').show('fade', {}, 250);
$('#basescore-simulation-container #computation_help_container_body tr').addClass('warning');
if (data.base_score_config.default_base_score == 0) { // show alert base_score not set
$('#alert-basescore-not-set.alert-error').show('fade', {}, 250);
$('#alert-basescore-not-set').hide();
$('#basescore-simulation-container #computation_help_container_body tr').removeClass('warning').addClass('error');
} else {
$('#alert-basescore-not-set').show('fade', {}, 250);
$('#alert-basescore-not-set.alert-error').hide();
$('#basescore-simulation-container #computation_help_container_body tr').removeClass('error').addClass('warning');
}
}
$('#simulation-sighting')
.text(