Skip to content

Commit

Permalink
[JS] fix: Loader for all elements
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicolas-eoxia
nicolas-eoxia committed Sep 28, 2021
1 parent e7f7f35 commit dd8a097
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 44 deletions.
2 changes: 1 addition & 1 deletion core/tpl/digiriskdolibarr_riskassessment_view.tpl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ class="risk-evaluation-cotation cotation"><?php echo $request; ?></div>
<!-- Modal-Footer -->
<div class="modal-footer">
<?php if ($permissiontoadd) : ?>
<div class="risk-evaluation-create wpeo-button button-blue button-disable modal-close" value="<?php echo $risk->id ?>">
<div class="risk-evaluation-create wpeo-button button-blue button-disable" value="<?php echo $risk->id ?>">
<i class="fas fa-plus"></i> <?php echo $langs->trans('Add'); ?>
</div>
<?php else : ?>
Expand Down
4 changes: 2 additions & 2 deletions core/tpl/digiriskdolibarr_risklist_view.tpl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ class="risk-evaluation-cotation cotation"><?php echo $request; ?></div>
if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
elseif ($key == 'category') $cssforfield .= ($cssforfield ? ' ' : '').'risk-category';
elseif ($key == 'description') $cssforfield .= ($cssforfield ? ' ' : '').'risk-description';
elseif ($key == 'description') $cssforfield .= ($cssforfield ? ' ' : '').'risk-description-'.$risk->id;
if (!empty($arrayfields['t.'.$key]['checked']))
{
print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').' style="width:2%">';
Expand Down Expand Up @@ -878,7 +878,7 @@ class="risk-evaluation-cotation cotation"><?php echo $request; ?></div>
<!-- Modal-Footer -->
<div class="modal-footer">
<?php if ($permissiontoadd) : ?>
<div class="risk-save wpeo-button button-green save modal-close" value="<?php echo $risk->id ?>">
<div class="risk-save wpeo-button button-green save" value="<?php echo $risk->id ?>">
<span><i class="fas fa-save"></i> <?php echo $langs->trans('UpdateData'); ?></span>
</div>
<?php else : ?>
Expand Down
36 changes: 19 additions & 17 deletions core/tpl/digiriskdolibarr_task_view.tpl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
$related_tasks = $risk->get_related_tasks($risk); ?>
<div class="riskassessment-tasks riskassessment-tasks<?php echo $risk->id ?>" value="<?php echo $risk->id ?>">
<?php if (!empty($related_tasks) && $related_tasks > 0) : ?>
<div class="riskassessment-task-listing-wrapper">
<div class="riskassessment-task-listing-wrapper riskassessment-task-listing-wrapper-<?php echo $risk->id ?>">
<?php foreach ($related_tasks as $related_task) : ?>
<?php if ($related_task->progress < 100) : ?>
<div class="table-cell riskassessment-task-container riskassessment-task-container-<?php echo $related_task->id ?>" value="<?php echo $related_task->ref ?>">
Expand Down Expand Up @@ -126,24 +126,26 @@
<?php endif; ?>
</div>
<?php else : ?>
<div class="riskassessment-task-container riskassessment-no-task">
<div class="riskassessment-task-single-content riskassessment-task-single-content-<?php echo $risk->id ?>">
<div class="riskassessment-task-single riskassessment-task-single-<?php echo $risk->id ?>">
<div class="riskassessment-task-content">
<div class="riskassessment-task-data">
<span class="name"><?php echo $langs->trans('NoTaskLinked'); ?></span>
<div class="riskassessment-task-listing-wrapper riskassessment-task-listing-wrapper-<?php echo $risk->id ?>">
<div class="riskassessment-task-container riskassessment-no-task">
<div class="riskassessment-task-single-content riskassessment-task-single-content-<?php echo $risk->id ?>">
<div class="riskassessment-task-single riskassessment-task-single-<?php echo $risk->id ?>">
<div class="riskassessment-task-content">
<div class="riskassessment-task-data">
<span class="name"><?php echo $langs->trans('NoTaskLinked'); ?></span>
</div>
</div>
<!-- BUTTON MODAL RISK ASSESSMENT TASK ADD -->
<?php if ($permissiontoadd) : ?>
<div class="riskassessment-task-add wpeo-button button-square-50 button-primary wpeo-tooltip-event modal-open" aria-label="<?php echo $langs->trans('AddRiskAssessmentTask') ?>" value="<?php echo $risk->id;?>">
<i class="fas fa-plus button-icon"></i>
</div>
<?php else : ?>
<div class="wpeo-button button-square-50 button-grey wpeo-tooltip-event" aria-label="<?php echo $langs->trans('PermissionDenied') ?>" value="<?php echo $risk->id;?>">
<i class="fas fa-plus button-icon"></i>
</div>
<?php endif; ?>
</div>
<!-- BUTTON MODAL RISK ASSESSMENT TASK ADD -->
<?php if ($permissiontoadd) : ?>
<div class="riskassessment-task-add wpeo-button button-square-50 button-primary wpeo-tooltip-event modal-open" aria-label="<?php echo $langs->trans('AddRiskAssessmentTask') ?>" value="<?php echo $risk->id;?>">
<i class="fas fa-plus button-icon"></i>
</div>
<?php else : ?>
<div class="wpeo-button button-square-50 button-grey wpeo-tooltip-event" aria-label="<?php echo $langs->trans('PermissionDenied') ?>" value="<?php echo $risk->id;?>">
<i class="fas fa-plus button-icon"></i>
</div>
<?php endif; ?>
</div>
</div>
</div>
Expand Down
42 changes: 18 additions & 24 deletions js/digiriskdolibarr.js.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1307,18 +1307,16 @@
}

let elementParent = $('.fichecenter').find('.div-table-responsive');
window.eoxiaJS.loader.display($(this).closest('.risk-row-content-' + editedRiskId));
window.eoxiaJS.loader.display($(this));
window.eoxiaJS.loader.display($(this).closest('.risk-row-content-' + editedRiskId).find('.risk-description-'+editedRiskId));

$.ajax({
url: document.URL + '&action=saveRisk&riskID=' + editedRiskId + categoryPost + descriptionPost,
type: "POST",
processData: false,
contentType: false,
success: function ( ) {

elementParent.empty()
elementParent.load( document.URL + ' .tagtable.liste');
$(this).closest('.risk-row-content-' + editedRiskId).removeClass('wpeo-loader');
elementParent.load(document.URL + ' .div-table-responsive')

actionContainerSuccess.empty()
actionContainerSuccess.load(' .risk-edit-success-notice')
Expand Down Expand Up @@ -1511,6 +1509,7 @@
})

let elementParent = $('.fichecenter').find('.div-table-responsive');
window.eoxiaJS.loader.display($(this));
window.eoxiaJS.loader.display($('.risk-evaluation-container-' + riskToAssign));

$.ajax({
Expand All @@ -1519,16 +1518,14 @@
processData: false,
contentType: false,
success: function( ) {
elementParent.load( document.URL + ' .div-table-responsive');
elementParent.load( document.URL + ' .div-table-responsive');
element.find('#risk_evaluation_add'+riskToAssign).removeClass('modal-active');

$(this).closest('.risk-row-content-' + riskToAssign).removeClass('wpeo-loader');

actionContainerSuccess.empty()
actionContainerSuccess.load(' .riskassessment-create-success-notice')
actionContainerSuccess.removeClass('hidden');
actionContainerSuccess.empty()
actionContainerSuccess.load(' .riskassessment-create-success-notice')
actionContainerSuccess.removeClass('hidden');
},
error: function ( ) {

$(this).closest('.risk-row-content-' + riskToAssign).removeClass('wpeo-loader');

actionContainerError.empty()
Expand Down Expand Up @@ -1658,17 +1655,15 @@
let evaluationSingle = $(this).closest('.risk-evaluation-container').find('.risk-evaluation-single-content');
let evaluationRef = $('.risk-evaluation-ref-'+evaluationID).attr('value');

window.eoxiaJS.loader.display($(this));
window.eoxiaJS.loader.display($('.risk-evaluation-single-' + riskId));
window.eoxiaJS.loader.display($(this));
window.eoxiaJS.loader.display($('.risk-evaluation-single-' + riskId));

$.ajax({
url: document.URL + '&action=saveEvaluation&evaluationID=' + evaluationID + methodPost + cotationPost + criteres + photoPost + commentPost,
type: "POST",
processData: false,
contentType: false,
success: function ( ) {
$('.risk-evaluation-save').removeClass('wpeo-loader')

$('.div-table-responsive').load(document.URL + ' .div-table-responsive')
elementParent.removeClass('wpeo-loader');
$(this).closest('.risk-evaluation-container').removeClass('wpeo-loader');
Expand Down Expand Up @@ -1871,16 +1866,16 @@
taskPost = '&tasktitle=' + encodeURI(task);
}

window.eoxiaJS.loader.display($(this));
window.eoxiaJS.loader.display($('.riskassessment-task-listing-wrapper-'+ riskToAssign));

$.ajax({
url: document.URL + '&action=addRiskAssessmentTask' + riskToAssignPost + taskPost,
type: "POST",
processData: false,
contentType: false,
success: function ( ) {
$(this).closest('.risk-row-content-' + riskToAssign).removeClass('wpeo-loader');
elementToRefresh.load( document.URL + ' .riskassessment-tasks'+riskToAssign);

$('.div-table-responsive').load(document.URL + ' .div-table-responsive')

actionContainerSuccess.empty()
actionContainerSuccess.load(' .task-create-success-notice')
Expand Down Expand Up @@ -1925,8 +1920,8 @@
processData: false,
contentType: false,
success: function ( ) {

element.load( document.URL + ' .riskassessment-tasks'+riskId);
$('.div-table-responsive').load(document.URL + ' .div-table-responsive')
//element.load( document.URL + ' .riskassessment-tasks'+riskId);

let textToShow = '';
textToShow += actionContainerSuccess.find('.valueForDeleteTask1').val()
Expand Down Expand Up @@ -1983,16 +1978,15 @@
let taskRef = $('.riskassessment-task-ref-'+editedRiskAssessmentTaskId).attr('value');

window.eoxiaJS.loader.display($(this));
window.eoxiaJS.loader.display($('.riskassessment-task-single-'+ editedRiskAssessmentTaskId));

$.ajax({
url: document.URL + '&action=saveRiskAssessmentTask&riskAssessmentTaskID=' + editedRiskAssessmentTaskId + taskPost,
type: "POST",
processData: false,
contentType: false,
success: function ( ) {

element.load( document.URL + ' .riskassessment-tasks'+riskId);
elementRiskAssessmentTask.removeClass('wpeo-loader');
$('.div-table-responsive').load(document.URL + ' .div-table-responsive')

textToShow += actionContainerSuccess.find('.valueForEditTask1').val()
textToShow += taskRef
Expand Down

0 comments on commit dd8a097

Please sign in to comment.