Skip to content

Commit

Permalink
[Notice] add: anchor & href on object ref in notice
Browse files Browse the repository at this point in the history
  • Loading branch information
Théo David committed Jan 3, 2022
1 parent fd8f78c commit 0a2c771
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 18 deletions.
44 changes: 32 additions & 12 deletions core/tpl/digiriskdolibarr_risklist_view.tpl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
<div class="wpeo-notice notice-success riskassessment-create-success-notice">
<div class="notice-content">
<div class="notice-title"><?php echo $langs->trans('RiskAssessmentWellCreated') ?></div>
<div class="notice-subtitle"><?php echo $langs->trans('TheRiskAssessment') . ' ' . $refEvaluationMod->getLastValue($evaluation) . ' ' . $langs->trans('HasBeenCreatedF') ?></div>
<a href="">
<div class="notice-subtitle"><?php echo $langs->trans('TheRiskAssessment') . ' ' . $refEvaluationMod->getLastValue($evaluation) . ' ' . $langs->trans('HasBeenCreatedF') ?></div>
</a>
</div>
<div class="notice-close"><i class="fas fa-times"></i></div>
</div>
Expand All @@ -26,7 +28,9 @@
<div class="wpeo-notice notice-warning riskassessment-create-error-notice">
<div class="notice-content">
<div class="notice-title"><?php echo $langs->trans('RiskAssessmentNotCreated') ?></div>
<div class="notice-subtitle"><?php echo $langs->trans('TheRiskAssessment') . ' ' . $refEvaluationMod->getLastValue($evaluation) . ' ' . $langs->trans('HasNotBeenCreatedF') ?></div>
<a href="">
<div class="notice-subtitle"><?php echo $langs->trans('TheRiskAssessment') . ' ' . $refEvaluationMod->getLastValue($evaluation) . ' ' . $langs->trans('HasNotBeenCreatedF') ?></div>
</a>
</div>
<div class="notice-close"><i class="fas fa-times"></i></div>
</div>
Expand All @@ -38,7 +42,9 @@
<div class="notice-content">
<div class="notice-title"><?php echo $langs->trans('RiskAssessmentWellEdited') ?></div>
<div class="notice-subtitle">
<span class="text"></span>
<a href="">
<span class="text"></span>
</a>
</div>
</div>
<div class="notice-close"><i class="fas fa-times"></i></div>
Expand All @@ -51,7 +57,9 @@
<div class="notice-content">
<div class="notice-title"><?php echo $langs->trans('RiskAssessmentNotEdited') ?></div>
<div class="notice-subtitle">
<span class="text"></span>
<a href="">
<span class="text"></span>
</a>
</div>
</div>
<div class="notice-close"><i class="fas fa-times"></i></div>
Expand All @@ -64,7 +72,9 @@
<div class="notice-content">
<div class="notice-title"><?php echo $langs->trans('RiskAssessmentWellDeleted') ?></div>
<div class="notice-subtitle">
<span class="text"></span>
<a href="">
<span class="text"></span>
</a>
</div>
</div>
<div class="notice-close"><i class="fas fa-times"></i></div>
Expand All @@ -77,7 +87,9 @@
<div class="notice-content">
<div class="notice-title"><?php echo $langs->trans('RiskAssessmentNotDeleted') ?></div>
<div class="notice-subtitle">
<span class="text"></span>
<a href="">
<span class="text"></span>
</a>
</div>
</div>
<div class="notice-close"><i class="fas fa-times"></i></div>
Expand All @@ -91,7 +103,7 @@
<div class="notice-title"><?php echo $langs->trans('RiskWellCreated') ?></div>
<div class="notice-subtitle">
<a href="#<?php echo $refRiskMod->getLastValue($evaluation) ?>">
<?php echo $langs->trans('TheRisk') . ' ' . $refRiskMod->getLastValue($risk) . ' ' . $langs->trans('HasBeenCreatedM') ?>
<?php echo $langs->trans('TheRisk') . ' <strong><u> ' . $refRiskMod->getLastValue($risk) . ' </u></strong> ' . $langs->trans('HasBeenCreatedM') ?>
</a>
</div>
</div>
Expand All @@ -102,7 +114,7 @@
<div class="wpeo-notice notice-warning risk-create-error-notice">
<div class="notice-content">
<div class="notice-title"><?php echo $langs->trans('RiskNotCreated') ?></div>
<div class="notice-subtitle"><?php echo $langs->trans('TheRisk') . ' ' . $refRiskMod->getLastValue($risk) . ' ' . $langs->trans('HasNotBeenCreatedM') ?></div>
<div class="notice-subtitle"><?php echo $langs->trans('TheRisk') . $langs->trans('HasNotBeenCreatedM') ?></div>
</div>
<div class="notice-close"><i class="fas fa-times"></i></div>
</div>
Expand All @@ -115,7 +127,9 @@
<div class="notice-content">
<div class="notice-title"><?php echo $langs->trans('RiskWellEdited') ?></div>
<div class="notice-subtitle">
<span class="text"></span>
<a href="">
<span class="text"></span>
</a>
</div>
</div>
<div class="notice-close"><i class="fas fa-times"></i></div>
Expand All @@ -128,7 +142,9 @@
<div class="notice-content">
<div class="notice-title"><?php echo $langs->trans('RiskNotEdited') ?></div>
<div class="notice-subtitle">
<span class="text"></span>
<a href="">
<span class="text"></span>
</a>
</div>
</div>
<div class="notice-close"><i class="fas fa-times"></i></div>
Expand Down Expand Up @@ -163,7 +179,9 @@
<div class="notice-content">
<div class="notice-title"><?php echo $langs->trans('TaskWellEdited') ?></div>
<div class="notice-subtitle">
<span class="text"></span>
<a href="">
<span class="text"></span>
</a>
</div>
</div>
<div class="notice-close"><i class="fas fa-times"></i></div>
Expand All @@ -186,7 +204,9 @@
<div class="notice-content">
<div class="notice-title"><?php echo $langs->trans('TaskWellDeleted') ?></div>
<div class="notice-subtitle">
<span class="text"></span>
<a href="">
<span class="text"></span>
</a>
</div>
</div>
<div class="notice-close"><i class="fas fa-times"></i></div>
Expand Down
42 changes: 36 additions & 6 deletions js/digiriskdolibarr.js.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1727,6 +1727,7 @@
textToShow += actionContainerSuccess.find('.valueForEditRisk1').val()
textToShow += riskRef
textToShow += actionContainerSuccess.find('.valueForEditRisk2').val()
actionContainerSuccess.find('a').attr('href', '#risk_row_'+editedRiskId)

actionContainerSuccess.find('.notice-subtitle .text').text(textToShow)
actionContainerSuccess.removeClass('hidden');
Expand Down Expand Up @@ -1929,6 +1930,8 @@
$('#risk_row_' + riskToAssign).fadeIn(400);
actionContainerSuccess.empty()
actionContainerSuccess.html($(resp).find('.riskassessment-create-success-notice'))
actionContainerSuccess.find('a').attr('href', '#risk_row_'+riskToAssign)

actionContainerSuccess.removeClass('hidden');
},
error: function ( resp ) {
Expand Down Expand Up @@ -2024,13 +2027,11 @@
window.eoxiaJS.evaluation.saveEvaluation = function ( event ) {
let element = $(this).closest('.risk-evaluation-edit-modal');
let evaluationID = element.attr('value');
let actionContainerSuccess = $('.messageSuccessEvaluationEdit');
let actionContainerError = $('.messageErrorEvaluationEdit');

let evaluationText = element.find('.risk-evaluation-comment textarea').val()

let elementParent = $(this).closest('.risk-evaluation-container').find('.risk-evaluations-list-content');
let riskId = elementParent.attr('value');
let evaluationSingle = $(this).closest('.risk-evaluation-container').find('.risk-evaluation-single-content');
let evaluationRef = $('.risk-evaluation-ref-'+evaluationID).attr('value');
let listModalContainer = $('.risk-evaluation-list-modal-'+riskId)
let listModal = $('#risk_evaluation_list'+riskId)
Expand Down Expand Up @@ -2081,21 +2082,25 @@
$('.fichecenter').html($(resp).find('#searchFormList'))
$('#risk_row_' + riskId).fadeOut(400);
$('#risk_row_' + riskId).fadeIn(400);

}
$('.wpeo-loader').removeClass('wpeo-loader')

let actionContainerSuccess = $('.messageSuccessEvaluationEdit');

element.find('#risk_evaluation_edit'+evaluationID).removeClass('modal-active');

let textToShow = '';
textToShow += actionContainerSuccess.find('.valueForEditEvaluation1').val()
textToShow += evaluationRef
textToShow += actionContainerSuccess.find('.valueForEditEvaluation2').val()
actionContainerSuccess.find('a').attr('href', '#risk_row_'+riskId)

actionContainerSuccess.find('.notice-subtitle .text').text(textToShow)
actionContainerSuccess.removeClass('hidden');
},
error: function ( ) {
let actionContainerError = $('.messageErrorEvaluationEdit');

let textToShow = '';
textToShow += actionContainerError.find('.valueForEditEvaluation1').val()
textToShow += evaluationRef
Expand Down Expand Up @@ -2287,10 +2292,12 @@
$('.riskassessment-tasks' + riskToAssign).fadeOut(400);
$('.riskassessment-tasks' + riskToAssign).fadeIn(400);

actionContainerSuccess.find('a').attr('href', '#risk_row_'+riskToAssign)

actionContainerSuccess.html($(resp).find('.task-create-success-notice'))
actionContainerSuccess.removeClass('hidden');
},
error: function ( ) {
error: function ( resp ) {
$(this).closest('.risk-row-content-' + riskToAssign).removeClass('wpeo-loader');
let actionContainerError = $('.messageErrorTaskCreate');
actionContainerError.html($(resp).find('.task-create-error-notice'))
Expand Down Expand Up @@ -2335,6 +2342,8 @@
textToShow += riskAssessmentTaskRef
textToShow += actionContainerSuccess.find('.valueForDeleteTask2').val()

actionContainerSuccess.find('a').attr('href', '#risk_row_'+riskId)

actionContainerSuccess.find('.notice-subtitle .text').text(textToShow)
actionContainerSuccess.removeClass('hidden');
},
Expand Down Expand Up @@ -2396,6 +2405,8 @@
textToShow += taskRef
textToShow += actionContainerSuccess.find('.valueForEditTask2').val()

actionContainerSuccess.find('a').attr('href', '#risk_row_'+riskId)

actionContainerSuccess.find('.notice-subtitle .text').text(textToShow)
actionContainerSuccess.removeClass('hidden');
},
Expand Down Expand Up @@ -2789,12 +2800,13 @@
* La méthode contenant tous les événements pour l'évaluateur.
*
* @since 1.0.0
* @version 1.0.0
* @version 9.0.0
*
* @return {void}
*/
window.eoxiaJS.notice.event = function() {
$( document ).on( 'click', '.notice-close', window.eoxiaJS.notice.closeNotice );
$( document ).on( 'click', '.notice-subtitle', window.eoxiaJS.notice.lineBlink );
};

/**
Expand All @@ -2810,6 +2822,24 @@
$(this).closest('.notice').addClass("hidden");
};

/**
* Fais disparaître & réapparaître la ligne du risque concerné par l'action
*
* @since 9.0.0
* @version 9.0.0
*
* @param {ClickEvent} event L'état du clic.
* @return {void}
*/
window.eoxiaJS.notice.lineBlink = function( event ) {
var jquerySelector = $(this).closest('.notice-content').find('a').attr('href');
if (jquerySelector.match(/RK/)) {
jquerySelector = '#risk_row_' + jquerySelector.split(/RK/)[1]
}
$(jquerySelector).fadeOut(200)
$(jquerySelector).fadeIn(200)
};


/**
* Initialise l'objet "ticket" ainsi que la méthode "init" obligatoire pour la bibliothèque EoxiaJS.
Expand Down

0 comments on commit 0a2c771

Please sign in to comment.