diff --git a/include/class_user.php b/include/class_user.php index 9da5ee2d1..a88789ba3 100644 --- a/include/class_user.php +++ b/include/class_user.php @@ -249,10 +249,27 @@ function set_periode($p_periode) { } private function set_default_periode() { + echo 'set_default_periode'; + /* get the first periode */ + $sql='select min(p_id) as pid from parm_periode where p_closed = false and p_start = (select min(p_start) from parm_periode)'; + $Res=ExecSql($this->db,$sql); + + $pid=pg_fetch_result($Res,0,0); + /* if all the periode are closed, then we use the last closed period */ + if ( $pid == null ) { + $sql='select min(p_id) as pid from parm_periode where p_start = (select max(p_start) from parm_periode)'; + $Res2=ExecSql($this->db,$sql); + if ( $pid == null ) { + echo "Aucune periode trouvable !!!"; + exit(1); + } + + $pid=pg_fetch_result($Res2,0,0); + } + $sql=sprintf("insert into user_local_pref (user_id,parameter_value,parameter_type) - select '%s',min(p_id),'PERIODE' from parm_periode where p_closed=false - and p_start = (select min(p_start) from parm_periode);", - $this->id); + values ('%s','%d','PERIODE')", + $this->id,$pid); $Res=ExecSql($this->db,$sql); } diff --git a/include/class_widget.php b/include/class_widget.php index 6e7293037..d48d18a61 100644 --- a/include/class_widget.php +++ b/include/class_widget.php @@ -157,6 +157,7 @@ class widget { $disabled=($this->disabled==true)?"disabled":""; //echo "Selected ".$this->selected; $r="