Merge branch 'main' of git.ebene.ovh:ebene/radiantrh

Controleur/ControleurAjaxuserrhclient.php

@@ -65,23 +65,20 @@ class ControleurAjaxuserrhclient extends Controleur {
 		$email 					= $this->requete->getParametreFormulaire("email");
 		$motPass 				= $this->requete->getParametreFormulaire("motPass");
 		$codeLangue 			= $this->requete->getParametreFormulaire("codeLangue");
-		$actVisible 			= $this->requete->getParametreFormulaire("actVisible");
-		$AffectionVisible 		= $this->requete->getParametreFormulaire("AffectionVisible");
 		
 		$codeModeGenerationPass	= $this->requete->getParametreFormulaire("codeModeGenerationPass");
 		$codeModeEnvoiPass		= $this->requete->getParametreFormulaire("codeModeEnvoiPass");
 		
 		$codeProfil				= $this->requete->getParametreFormulaire("codeProfil");
 
-
 		if($this->client->existelogin($codeUtilisateur))
 		{
 			$this->genererVueAjax(array('uniciteLogin' => "0", 'msgErreur' => "Login $codeUtilisateur déjà utilisé!"));
 		}
 		else
 		{
-			$this->client->creeruser($codeUtilisateur, $nom, $prenoms, $telephone, $email, $motPass, $codeLangue, $actVisible, 
+			$this->client->creeruser($codeUtilisateur, $nom, $prenoms, $telephone, $email, $motPass, $codeLangue, 
-			$AffectionVisible, $codeModeGenerationPass, $codeModeEnvoiPass, $codeProfil); 
+			$codeModeGenerationPass, $codeModeEnvoiPass, $codeProfil); 
 			
 			$this->genererVueAjax(array('uniciteLogin' => "1", 'msgErreur' => "Utlisateur $codeUtilisateur créé avec succès!"));
 		}

Controleur/ControleurConnexion.php

@@ -325,16 +325,6 @@ require_once 'Framework/Localisation.php';
                 $this->requete->getSession()->setAttribut("nomClient_C", $utilisateur['nomClient']);
 				$this->requete->getSession()->setAttribut("prenomClient_C", $utilisateur['prenomClient']);
 
-                $this->requete->getSession()->setAttribut("adresseGeoClient_C", $utilisateur['adresseGeoClient']);
-                $this->requete->getSession()->setAttribut("boitepostaleClient_C", $utilisateur['boitepostaleClient']);
-                $this->requete->getSession()->setAttribut("telephoneBureauClient_C", $utilisateur['telephoneBureauClient']);
-                $this->requete->getSession()->setAttribut("telephonePortableClient_C", $utilisateur['telephonePortableClient']);
-                $this->requete->getSession()->setAttribut("faxClient_C", $utilisateur['faxClient']);
-                $this->requete->getSession()->setAttribut("emailClient_C", $utilisateur['emailClient']);
-
-				$this->requete->getSession()->setAttribut("villeClient_C", $utilisateur['villeClient']);
-				$this->requete->getSession()->setAttribut("paysClient_C", $utilisateur['paysClient']);
-
 				$this->requete->getSession()->setAttribut("idPolice_C", "");
 				$this->requete->getSession()->setAttribut("numeroPolice_C", "");
 				$this->requete->getSession()->setAttribut("codeGcAssureur_C", "");
@@ -520,7 +510,6 @@ require_once 'Framework/Localisation.php';
 
 				$this->requete->getSession()->setAttribut("largeurPhoto", $utilisateur['largeurPhoto']);
 				$this->requete->getSession()->setAttribut("longueurPhoto", $utilisateur['longueurPhoto']);
-				$this->requete->getSession()->setAttribut("assureAjoutPhoto", $utilisateur['assureAjoutPhoto']);
 				
 				$_SESSION['fingerActif'] 	= '0';
 				$_SESSION['faceActif'] 	= '0';
@@ -531,8 +520,8 @@ require_once 'Framework/Localisation.php';
 				$logo = 'Societes/'.$_SESSION['codeSociete'].'/images/logo_etat.png';
 				$this->requete->getSession()->setAttribut("lienLogo", $logo);
 
-				$this->requete->getSession()->setAttribut("dossierAssure", $utilisateur['dossierAssure']);
+				$this->requete->getSession()->setAttribut("dossierRh", $utilisateur['dossierRh']);
-				$dossierLogo=$_SESSION['dossierAssure']."/images/logo_etat.png";
+				$dossierLogo=$_SESSION['dossierRh']."/images/logo_etat.png";
 				$this->requete->getSession()->setAttribut("dossierLogo", $dossierLogo);
 
 				$_SESSION['idLogapiface'] = "0";
@@ -544,6 +533,32 @@ require_once 'Framework/Localisation.php';
 
 				$_SESSION['superUser'] = '0';
 
+				$passExpired = ( ($dureeViePassWord>"0") && ($agePass>$dureeViePassWord) );
+				$_SESSION['passExpired']	= $passExpired;
+
+				/*
+				var_dump(
+					array(
+						"verifierLongueurPass" => $_SESSION['verifierLongueurPass'],
+						"longueurPassWord"	=> $longueurPassWord,
+						"motCourt"	=> $motCourt,
+						"motCourt"	=> $changerMotPassDefaut,
+						"dureeViePassWord"	=> $dureeViePassWord,
+						"agePass"	=> $agePass,
+						"agePass"	=> $agePass,
+						"passExpired"	=> $passExpired,
+						"dossierRh" => $_SESSION['dossierRh'],
+						"dossierLogo" => $_SESSION['dossierLogo'],
+					)
+				);
+				exit();
+				*/
+				
+				$this->requete->getSession()->setAttribut("dossierRh", $utilisateur['dossierRh']);
+				$dossierLogo=$_SESSION['dossierRh']."/images/logo_etat.png";
+				$this->requete->getSession()->setAttribut("dossierLogo", $dossierLogo);
+
+				
 				
 				if(($motCourt===true) or ($changerMotPassDefaut===true) or ($passExpired===true))
 				{

Js/fonctions.js

@@ -4383,8 +4383,6 @@ function creer_user_rh_client()
 	codeProfil 				= $("#codeProfil").val();
 	
 	codeLangue				= $("#codeLangueUser").val();
-	actVisible				= "0";
-	AffectionVisible		= "0";
 
 	nvmdp 					= $("#nvmdp").val();
 	cfnvmdp 				= $("#cfnvmdp").val();
@@ -4491,8 +4489,7 @@ function creer_user_rh_client()
 	donnees = 'codeUtilisateur='+codeUtilisateur;
 	donnees += '&nom='+nom+'&prenoms='+prenoms;
 	donnees += '&telephone='+telephone+'&email='+email+'&motPass='+motPass;
-	donnees += '&codeLangue='+codeLangue+'&actVisible='+actVisible;
+	donnees += '&codeLangue='+codeLangue,
-	donnees += '&AffectionVisible='+AffectionVisible;
 	donnees += '&codeModeGenerationPass='+codeModeGenerationPass;
 	donnees += '&codeModeEnvoiPass='+codeModeEnvoiPass;
 	donnees += '&codeProfil=' + codeProfil;

Modele/Client.php

@@ -1,5 +1,6 @@
 <?php
 require_once 'Framework/Modele.php';
+
 class Client extends Modele {
 	
     public function getClients($nomsearch=null, $prenomsearch=null, $telsearch=null, $numeroPolicesearch=null) 
@@ -356,7 +357,7 @@ class Client extends Modele {
     }
 
 	public function creeruser($codeUtilisateur, $nom, $prenoms, $telephone, $email, $motPass, $codeLangue, 
-	$actVisible, $AffectionVisible, $codeModeGenerationPass, $codeModeEnvoiPass, $codeProfil)
+	$codeModeGenerationPass, $codeModeEnvoiPass, $codeProfil)
 	{
 		$codeSociete 		= $_SESSION['codeSociete'];
 		$user 				= $_SESSION['login'];
@@ -382,11 +383,35 @@ class Client extends Modele {
 			   $hash = password_hash($motPass, PASSWORD_DEFAULT);
 		}
 
-		$sql = 'call sp_c_creer_user_rh_client(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);';
+		$sql = 'call sp_c_creer_user_rh_client(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);';
+		
+		/*
+		var_dump(
+			array(
+				"codeSociete"		=> $codeSociete, 
+				"idClient" 			=> $idClient, 
+				"numeroClient"		=> $numeroClient, 
+				"codeUtilisateur"	=> $codeUtilisateur, 
+				"nom"				=> $nom, 
+				"prenoms"			=> $prenoms, 
+				"telephone"			=> $telephone, 
+				"email"				=> $email, 
+				"hash" 				=> $hash, 
+				"codeLangue" 		=> $codeLangue, 
+				"user" 				=> $user, 
+				"user" 				=> $user, 
+				"codeModeGenerationPass" => $codeModeGenerationPass, 
+				"passAutoGen" 		=> $passAutoGen, 
+				"codeModeEnvoiPass" => $codeModeEnvoiPass,
+				"motPass" 			=> $motPass,
+				"codeProfil" 			=> $codeProfil,
+			)
+		);
+		exit();
+		*/
 
 		$this->executerRequete($sql, array($codeSociete, $idClient, $numeroClient, $codeUtilisateur, $nom, $prenoms, $telephone, 
-		$email, $hash, $codeLangue, $actVisible, $AffectionVisible, $user, $codeModeGenerationPass, 
+		$email, $hash, $codeLangue, $user, $codeModeGenerationPass, $passAutoGen, $codeModeEnvoiPass, $motPass, $codeProfil));
-		$passAutoGen, $codeModeEnvoiPass, $motPass, $codeProfil));
     }
 
 }

Vue/gabarit.php

@@ -665,7 +665,7 @@ $photoAssureCrypte = $_SESSION['photoAssureCrypte'];
         <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
 
         <!-- Application Scripts -->
-        <script src="/Js/fonctions.js?ver=2026.01.17.01"></script>
+        <script src="/Js/fonctions.js?ver=2026.01.18.03"></script>
 
         <script type="text/javascript">
             raffraichier_gabarit();