Skip to content

Commit

Permalink
[RiskSign] fix: search category error picto
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicolas-eoxia
nicolas-eoxia committed Jul 5, 2022
1 parent b3fb122 commit 26753d6
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 6 deletions.
36 changes: 36 additions & 0 deletions class/riskanalysis/risksign.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,42 @@ public function get_risksign_category_position_by_name($name)
return -1;
}

/**
* Get risksign category picto path
*
* @param int $position
* @return string $category['name_thumbnail'] path to danger category picto, -1 if don't exist
*/
public function get_risksign_category_by_position($position)
{
$risksign_categories = $this->get_risksign_categories();
foreach ($risksign_categories as $category) {
if ($category['position'] == $position) {
return $category['name_thumbnail'];
}
}

return -1;
}

/**
* Get risksign category picto name
*
* @param int $position
* @return string $category['name'] path to risksign category picto, -1 if don't exist
*/
public function get_risksign_category_name_by_position($position)
{
$risksign_categories = $this->get_risksign_categories();
foreach ($risksign_categories as $category) {
if ($category['position'] == $position) {
return $category['name'];
}
}

return -1;
}

/**
* Load object in memory from the database
*
Expand Down
4 changes: 2 additions & 2 deletions core/tpl/digiriskdolibarr_inheritedrisksignlist_view.tpl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@
<img class="danger-category-pic wpeo-tooltip-event hidden" src="" aria-label=""/>
</div>
<?php else : ?>
<div class="dropdown-toggle dropdown-add-button wpeo-tooltip-event" aria-label="<?php echo (empty(dol_escape_htmltag($search[$key]))) ? $risksign->get_risksign_category_name($risksign) : $risksign->get_risksign_category_position_by_name($search[$key]); ?>">
<img class="danger-category-pic tooltip hover" src="<?php echo DOL_URL_ROOT . '/custom/digiriskdolibarr/img/' . ((empty(dol_escape_htmltag($search[$key]))) ? $risksign->get_risksign_category($risksign) : $risksign->get_risksign_category_position_by_name($search[$key])) ?>" />
<div class="dropdown-toggle dropdown-add-button wpeo-tooltip-event" aria-label="<?php echo (empty(dol_escape_htmltag($search[$key]))) ? $risksign->get_risksign_category_name($risksign) : $risksign->get_risksign_category_name_by_position($search[$key]); ?>">
<img class="danger-category-pic tooltip hover" src="<?php echo DOL_URL_ROOT . '/custom/digiriskdolibarr/img/' . ((empty(dol_escape_htmltag($search[$key]))) ? $risksign->get_risksign_category($risksign) : $risksign->get_risksign_category_by_position($search[$key])) ?>" />
</div>
<?php endif; ?>
<ul class="dropdown-content wpeo-gridlayout grid-5 grid-gap-0">
Expand Down
4 changes: 2 additions & 2 deletions core/tpl/digiriskdolibarr_risksignlist_view.tpl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,8 @@
<img class="danger-category-pic wpeo-tooltip-event hidden" src="" aria-label=""/>
</div>
<?php else : ?>
<div class="dropdown-toggle dropdown-add-button wpeo-tooltip-event" aria-label="<?php echo (empty(dol_escape_htmltag($search[$key]))) ? $risksign->get_risksign_category_name($risksign) : $risksign->get_risksign_category_position_by_name($search[$key]); ?>">
<img class="danger-category-pic tooltip hover" src="<?php echo DOL_URL_ROOT . '/custom/digiriskdolibarr/img/' . ((empty(dol_escape_htmltag($search[$key]))) ? $risksign->get_risksign_category($risksign) : $risksign->get_risksign_category_position_by_name($search[$key])) ?>" />
<div class="dropdown-toggle dropdown-add-button wpeo-tooltip-event" aria-label="<?php echo (empty(dol_escape_htmltag($search[$key]))) ? $risksign->get_risksign_category_name($risksign) : $risksign->get_risksign_category_name_by_position($search[$key]); ?>">
<img class="danger-category-pic tooltip hover" src="<?php echo DOL_URL_ROOT . '/custom/digiriskdolibarr/img/' . ((empty(dol_escape_htmltag($search[$key]))) ? $risksign->get_risksign_category($risksign) : $risksign->get_risksign_category_by_position($search[$key])) ?>" />
</div>
<?php endif; ?>
<ul class="dropdown-content wpeo-gridlayout grid-5 grid-gap-0">
Expand Down
4 changes: 2 additions & 2 deletions core/tpl/digiriskdolibarr_sharedrisksignlist_view.tpl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,8 @@
<img class="danger-category-pic wpeo-tooltip-event hidden" src="" aria-label=""/>
</div>
<?php else : ?>
<div class="dropdown-toggle dropdown-add-button wpeo-tooltip-event" aria-label="<?php echo (empty(dol_escape_htmltag($search[$key]))) ? $risksign->get_risksign_category_name($risksign) : $risksign->get_risksign_category_position_by_name($search[$key]); ?>">
<img class="danger-category-pic tooltip hover" src="<?php echo DOL_URL_ROOT . '/custom/digiriskdolibarr/img/' . ((empty(dol_escape_htmltag($search[$key]))) ? $risksign->get_risksign_category($risksign) : $risksign->get_risksign_category_position_by_name($search[$key])) ?>" />
<div class="dropdown-toggle dropdown-add-button wpeo-tooltip-event" aria-label="<?php echo (empty(dol_escape_htmltag($search[$key]))) ? $risksign->get_risksign_category_name($risksign) : $risksign->get_risksign_category_name_by_position($search[$key]); ?>">
<img class="danger-category-pic tooltip hover" src="<?php echo DOL_URL_ROOT . '/custom/digiriskdolibarr/img/' . ((empty(dol_escape_htmltag($search[$key]))) ? $risksign->get_risksign_category($risksign) : $risksign->get_risksign_category_by_position($search[$key])) ?>" />
</div>
<?php endif; ?>
<ul class="dropdown-content wpeo-gridlayout grid-5 grid-gap-0">
Expand Down

0 comments on commit 26753d6

Please sign in to comment.