[MediaGallery] fix: actions

Evarisk · Oct 8, 2021 · 86223a5 · 86223a5
1 parent ef6a7a6
commit 86223a5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/core/tpl/digiriskdolibarr_photo_view.tpl.php b/core/tpl/digiriskdolibarr_photo_view.tpl.php
@@ -46,7 +46,7 @@
 				if (count($filearray)) {
 					?>
 					<span class="floatleft inline-block valignmiddle divphotoref risk-evaluation-photo-single">
-						<input class="filepath-to-riskassessment" type="hidden" value="<?php echo $pathToThumb ?>">
+						<input class="filepath-to-riskassessment filepath-to-riskassessment-<?php echo $risk->id > 0 ? $risk->id : 'new' ?>" type="hidden" value="<?php echo $pathToThumb ?>">
 						<input class="filename" type="hidden" value="">
 						 <?php 	print '<img height="40" width="100%" class="photo clicked-photo-preview" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=digiriskdolibarr&entity='.$conf->entity.'&file='.urlencode($cotation->element.'/'.$cotation->ref . '/thumbs/'. preg_replace('/\./', '_small.', $cotation->photo)).'" >';
 						 ?>
@@ -55,7 +55,7 @@
 				} else {
 					$nophoto = '/public/theme/common/nophoto.png'; ?>
 					<span class="floatleft inline-block valignmiddle divphotoref risk-evaluation-photo-single">
-						<input class="filepath-to-riskassessment" type="hidden" value="<?php echo $pathToThumb ?>">
+						<input class="filepath-to-riskassessment filepath-to-riskassessment-<?php echo $risk->id > 0 ? $risk->id : 'new' ?>" type="hidden" value="<?php echo $pathToThumb ?>">
 						<input class="filename" type="hidden" value="">
 						<img class="photodigiriskdolibarr clicked-photo-preview" alt="No photo" src="<?php echo $pathToThumb ?>">
 					</span>

diff --git a/core/tpl/digiriskdolibarr_riskassessment_view.tpl.php b/core/tpl/digiriskdolibarr_riskassessment_view.tpl.php
@@ -8,9 +8,10 @@
 		<div class="risk-evaluation-single-content risk-evaluation-single-content-<?php echo $risk->id ?>">
 			<div class="risk-evaluation-single risk-evaluation-single-<?php echo $risk->id ?>">
 				<div class="risk-evaluation-cotation risk-evaluation-list modal-open" value="<?php echo $risk->id ?>" data-scale="<?php echo $lastEvaluation->get_evaluation_scale() ?>">
-					<span><?php echo $lastEvaluation->cotation; ?></span>
+					<span><?php echo $lastEvaluation->cotation ?: 0; ?></span>
 				</div>
-				<div class="risk-evaluation-photo risk-evaluation-photo-<?php echo $lastEvaluation->id > 0 ?  $lastEvaluation->id :  0 ; echo $risk->id > 0 ? ' risk-'.$risk->id : ' risk-new' ?>  modal-open open-medias-linked" value="<?php echo $lastEvaluation->id ?>">
+<!--				@todo mettre le modal open ici si on veut la modal-->
+				<div class="risk-evaluation-photo risk-evaluation-photo-<?php echo $lastEvaluation->id > 0 ?  $lastEvaluation->id :  0 ; echo $risk->id > 0 ? ' risk-'.$risk->id : ' risk-new' ?> open-medias-linked" value="<?php echo $lastEvaluation->id ?>">
 					<?php $filearray = dol_dir_list($conf->digiriskdolibarr->multidir_output[$conf->entity].'/'.$lastEvaluation->element.'/'.$lastEvaluation->ref, "files", 0, '', '(\.odt|_preview.*\.png)$', 'position_name', 'asc', 1);
 					if (count($filearray)) {
 						print '<img height="40" width="100%" class="photo clicked-photo-preview" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=digiriskdolibarr&entity='.$conf->entity.'&file='.urlencode($lastEvaluation->element.'/'.$lastEvaluation->ref . '/thumbs/'. preg_replace('/\./', '_small.', $lastEvaluation->photo)).'" >';
@@ -74,13 +75,13 @@
 					<?php $cotation = $lastEvaluation;
 					include DOL_DOCUMENT_ROOT . '/custom/digiriskdolibarr/core/tpl/digiriskdolibarr_photo_view.tpl.php'; ?>
 
-					<!-- Modal EDIT Evaluation Content-->
+					<!-- Modal Content-->
 					<div class="modal-content" id="#modalContent<?php echo $lastEvaluation->id ?>">
 						<div class="risk-evaluation-container <?php echo $lastEvaluation->method; ?>">
 							<div class="risk-evaluation-header">
 
 							</div>
-							<div class="risk-evaluation-medias risk-evaluation-medias-<?php echo $lastEvaluation->id ?>">
+							<div class="risk-evaluation-medias risk-evaluation-medias-<?php echo $lastEvaluation->id ?> modal-media-linked">
 								<div class="medias"><i class="fas fa-picture-o"></i><?php echo $langs->trans('Medias'); ?></div>
 								<?php
 								$relativepath = 'digiriskdolibarr/medias/thumbs';

diff --git a/js/digiriskdolibarr.js.php b/js/digiriskdolibarr.js.php
@@ -1023,6 +1023,7 @@
 	let modalFrom = $('.modal-risk.modal-active')
 	let riskId = modalFrom.attr('value')
 	let mediaLinked = modalFrom.find('.risk-evaluation-medias')
+//	let modalMediaLinked = $('.risk-evaluation-medias-'+idToSave+'.modal-media-linked')
 
 	window.eoxiaJS.loader.display(mediaLinked);
 
@@ -1055,7 +1056,7 @@
 			});
 
 			mediaLinked.load(document.URL + ' .risk-evaluation-medias-'+idToSave+'.risk-'+riskId)
-
+		//	modalMediaLinked.load(document.URL + ' .risk-evaluation-medias-'+idToSave+'.modal-media-linked')
 		}
 	});
 };
@@ -1141,9 +1142,11 @@
 	let riskassessment_id = $(this).find('.riskassessment-id').val()
 	let filename = $(this).find('.filename').val()
 	let querySeparator = '?'
-	let mediaContainer = $(this).closest('.media-container')
 	let riskId = $(this).closest('.modal-risk').attr('value')
-	document.URL.match('/?/') ? querySeparator = '&' : 1
+
+	let mediaContainer = $(this).closest('.media-container')
+	//let editModal = $('#risk_evaluation_edit'+riskassessment_id)
+	//let mediaLinkedModal = $('.risk-evaluation-medias-'+riskassessment_id+'.modal-media-linked')
 
 	let previousPhoto = $(this).closest('.modal-container').find('.risk-evaluation-photo .clicked-photo-preview')
 	let previousName = previousPhoto[0].src.trim().split(/thumbs%2F/)[1].split(/"/)[0]
@@ -1156,8 +1159,9 @@
 		newPhoto = previousPhoto[0].src
 	}
 
-	window.eoxiaJS.loader.display(mediaContainer);
+	window.eoxiaJS.loader.display($(this).closest('.media-container'));
 
+	document.URL.match('/?/') ? querySeparator = '&' : 1
 	$.ajax({
 		url: document.URL + querySeparator + "action=unlinkFile&risk_id="+riskId+"&riskassessment_id="+riskassessment_id+"&filename="+filename,
 		type: "POST",
@@ -1168,6 +1172,9 @@
 				$(this).find('.clicked-photo-preview').attr('src',newPhoto )
 			});
 			mediaContainer.hide()
+			//editModal.find('.media-gallery-favorite :input[value="'+filename+'"]').closest('.media-container').hide()
+			//mediaLinkedModal.find('.media-gallery-favorite :input[value="'+filename+'"]').closest('.media-container').hide()
+//			modalMediaLinked.load(document.URL + ' .risk-evaluation-medias-'+riskassessment_id+'.modal-media-linked')
 		}
 	});
 };
@@ -1192,6 +1199,8 @@
 	//crée un sélecteur générique à l'évaluation risk-evaluation-photo-id et en le $() on itère sur ceux qui possèdent cette classe et on change la src de leur image
 	let riskAssessmentPhoto = ''
 	riskAssessmentPhoto = $('.risk-evaluation-photo-'+riskassessment_id+'.risk-'+riskId)
+//	let modalMediaLinked = $('.risk-evaluation-medias-'+riskassessment_id+'.modal-media-linked')
+
 
 	let saveButton = $(this).closest('.modal-container').find('.risk-evaluation-save')
 
@@ -1228,6 +1237,7 @@
 			riskAssessmentPhoto.each( function() {
 				$(this).find('.clicked-photo-preview').attr('src',newPhoto )
 			});
+			//modalMediaLinked.load(document.URL + ' .risk-evaluation-medias-'+riskassessment_id+'.modal-media-linked')
 			saveButton.removeClass('button-disable')
 			$('.wpeo-loader').removeClass('wpeo-loader')
 		}