Merge pull request #190 from Evarisk/7.6.1

7.6.1

Author: nicolas-eoxia

digirisk.config.json

@@ -1,7 +1,7 @@
 {
 	"name": "Digirisk",
 	"slug": "digirisk",
-	"version": "7.6.0",
+	"version": "7.6.1",
 	"description": "L'application Digirisk",
 	"insert_scripts_pages_js": [
       "digirisk-welcome",

digirisk.php

@@ -3,7 +3,7 @@
  * Plugin Name: Digirisk
  * Plugin URI:  http://www.evarisk.com/document-unique-logiciel
  * Description: Avec le plugin Digirisk vous pourrez réaliser, de façon simple et intuitive, le ou les documents uniques de vos entreprises et gérer toutes les données liées à la sécurité de votre personnel.
- * Version:     7.6.0
+ * Version:     7.6.1
  * Author:      Evarisk
  * Author URI:  http://www.evarisk.com
  * License:     AGPLv3

modules/causerie/class/sheet-intervention-causerie.class.php

@@ -113,11 +113,6 @@ public function generate( $causerie_id ) {
 			'nombreUtilisateur'   => $causerie->number_participants
 		);
 
-		echo '<pre>';
-		print_r( $causerie_intervention->data );
-		echo '</pre>';
-		exit;
-
 
 		$sheet_details = wp_parse_args( $sheet_details, $this->set_medias( $causerie_intervention ) );
 		$sheet_details = wp_parse_args( $sheet_details, $this->set_users( $causerie_intervention ) );

modules/document/class/class-document-util.php

@@ -112,7 +112,10 @@ public function get_picture( $id, $size_odt, $size = 'thumbnail' ) {
 
 		$picture_final_path = str_replace( '\\', '/', str_replace( site_url( '/', 'http' ), ABSPATH, $picture_definition[0] ) );
 		$picture_final_path = str_replace( '\\', '/', str_replace( site_url( '/', 'https' ), ABSPATH, $picture_final_path ) );
-		$picture_final_path = preg_replace( '/\pM+/u', $picture_final_path);
+		if ( preg_match( '/\pM+/u', $picture_final_path ) ) {
+			return 'Erreur : Le nom de cette image contient des accents et/ou des caractères spéciaux';
+		}
+		
 		$picture = array();
 
 		if ( is_file( $picture_final_path ) ) {

modules/evaluator/action/class-evaluator-action.php

@@ -66,18 +66,19 @@ public function callback_edit_evaluator_assign() {
 
 		$affected_evaluator[] = Evaluator_Class::g()->affect_user( $element, $user_id, $evaluator_infos );
 		$affected_evaluator = Evaluator_Class::g()->get_list_affected_evaluator( $element );
+		$new_evaluator = end($affected_evaluator[$affectation_date]);
 
 		Society_Class::g()->update($element->data);
 		User_Class::g()->update($evaluator->data);
 
 		ob_start();
 		\eoxia\View_Util::exec( 'digirisk', 'evaluator', 'list-item', array(
 			'default_duration' => $default_duration,
-      'element'          => $element,
-			'evaluator'        => end($affected_evaluator[$affectation_date]),
+      		'element'          => $element,
+			'evaluator'        => $new_evaluator,
 
 		) );
-
+		
 		$view = ob_get_clean();
 
 		wp_send_json_success( array(

modules/evaluator/class/evaluator.class.php

@@ -76,7 +76,7 @@ public function render( $element, $current_page = 1 ) {
 			'class'        => 'evaluator',
 		);
 		$list_affected_evaluator = $this->get_list_affected_evaluator( $element );
-
+	
 		$eo_search->register_search( 'evaluator', $args_where_evaluator );
 		$args_where_evaluator['fields'] = array( 'ID' );
 		$eo_search->register_search( 'item-edit', array(
@@ -120,11 +120,12 @@ public function get_list_affected_evaluator( $society ) {
 		foreach ( $list_evaluator as $evaluator_id => $array_evaluator ) {
 			if ( ! empty( $array_evaluator ) ) {
 				foreach ( $array_evaluator as $index => $evaluator ) {
+					$evaluator['affectation_info']['start']['date'] = str_replace('/', '-', $evaluator['affectation_info']['start']['date']);
 					$list_evaluator_affected[ $evaluator['affectation_info']['start']['date'] ][] = $evaluator;
 				}
 			}
 		}
-
+		
 		krsort( $list_evaluator_affected );
 
 		return $list_evaluator_affected;
@@ -173,7 +174,7 @@ public function affect_user( $society, $user_id, $data ) {
 		$end_date = new \DateTime(date('Y-m-d', strtotime( $start_date ) ) );
 		$end_date->add( new \DateInterval( 'PT' . $data['affectation_duration'] . 'M' ) );
 		$formated_end_date = $end_date->format('Y-m-d H:i:s');
-		
+				
 		$society->data['user_info']['affected_id']['evaluator'][ $user_id ][] = array(
 			'status' => 'valid',
 			'duration' => $data['affectation_duration'] ,

modules/evaluator/view/item-edit.view.php

@@ -37,8 +37,8 @@
 			<div class="form-element group-date">
 				<label class="form-field-container">
 					<span class="form-field-icon-prev"><i class="fas fa-calendar-alt"></i></span>
-					<input type="hidden" class="mysql-date" value="">
-					<input type="text" class="form-field date" name="affectation_date" value="<?php echo date('d/m/Y', time( ) )?>" >
+					<input type="hidden" class="mysql-date" name="affectation_date" value="<?php echo date('d-m-Y', time( ) )?>">
+					<input type="text" class="form-field date" value="<?php echo date('d/m/Y', time( ) )?>" >
 				</label>
 			</div>
 		</div>

modules/evaluator/view/list-item.view.php

@@ -28,7 +28,7 @@
 		<div class="avatar" style="background-color: #<?php echo esc_attr( $evaluator['user_info']->data['avatar_color'] ); ?>;"><span><?php echo esc_html( $evaluator['user_info']->data['initial'] ); ?></span></div>
 			<?php echo esc_html( $evaluator['user_info']->data['displayname'] ); ?>
 		</div>
-		<div class="table-cell table-125"><?php echo esc_html( date( $evaluator['affectation_info']['start']['date'] ) ); ?></div>
+		<div class="table-cell table-125"><?php echo esc_html( mysql2date( 'd/m/Y', $evaluator['affectation_info']['start']['date'], true ) ); ?></div>
 		<div class="table-cell table-50"><?php echo esc_html( Evaluator_Class::g()->get_duration($evaluator['affectation_info']) ); ?></div>
 		<div class="table-cell table-50 table-end">
 			<div 	class="action-delete wpeo-button button-square-50 button-grey delete"

readme.txt

@@ -3,8 +3,8 @@ Contributors: Evarisk
 Tags: Evaluation des risques, document unique, risques professionnels, audit risques, risques humains, digirisk, digi risk, evarisk, eva risk, risk, risks, risque, risques
 Donate link: http://www.evarisk.com/document-unique-logiciel
 Requires at least: 4.4
-Tested up to: 5.4
-Stable tag: 7.6.0
+Tested up to: 5.5.1
+Stable tag: 7.6.1
 License: AGPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -77,6 +77,12 @@ Lors de l'installation de l'extension Digirisk si vous aviez déjà installé la
 
 * Veillez à bien sauvegarder vos données avant d'effectuer une mise à jour du plugin
 
+= Version 7.6.1 =
+
+- Autres : Corrections sur le logo des protections.
+- Evaluatuer : Corrections sur la date de l'évaluation.
+- GP/UT : Corrections sur les photos qui ne s'afficher plus.
+
 = Version 7.6.0 =
 
 - Autres: Corrections orthographiques, ajout du picto Digirisk au menu de WordPress