lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Bug sur sauvegarde/affichage droit de vote et cotisation

Browse Source
This commit is contained in:
Laurent Destailleur 2005-04-16 13:30:36 +00:00
parent a11322eb05
commit a13a4a4299
3 changed files with 76 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
htdocs/adherents/adherent_type.class.php
View File

@ -1,5 +1,6 @@
<?php
/* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
/* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -20,14 +21,16 @@
*
*/
/** \file htdocs/adherents/adherent_type.class.php
/**
\file htdocs/adherents/adherent_type.class.php
\ingroup adherent
\brief Fichier de la classe gérant les types d'adhérents
\author Rodolphe Quiedeville
\version $Revision$
*/
/** \class AdherentType
/**
\class AdherentType
\brief Classe gérant les types d'adhérents
*/
@ -41,7 +44,8 @@ class AdherentType
var $errorstr;
var $mail_valid; /**< mail envoye lors de la validation */
var $commentaire; /**< commentaire */
var $vote; /** droit de vote ? */
var $vote; /** droit de vote ? */
/**
\brief AdherentType
@ -54,6 +58,7 @@ class AdherentType
$this->statut = 1;
}
/**
\brief print_error_list
*/
@ -67,16 +72,16 @@ class AdherentType
}
}
/**
\brief fonction qui permet de créer le status de l'adhérent
\param userid userid de l'adhérent
\brief Fonction qui permet de créer le status de l'adhérent
\param userid userid de l'adhérent
\return > 0 si ok, < 0 si ko
*/
function create($userid)
{
/*
* Insertion dans la base
*/
$this->statut=trim($this->statut);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."adherent_type (statut)";
$sql .= " VALUES ($this->statut)";
@ -90,12 +95,18 @@ class AdherentType
}
else
{
return 0;
return -1;
}
}
/**
\brief Met a jour en base données du type
\return > 0 si ok, < 0 si ko
*/
function update()
{
$this->libelle=trim($this->libelle);
$sql = "UPDATE ".MAIN_DB_PREFIX."adherent_type SET ";
$sql .= "libelle = '".$this->libelle ."'";
@ -115,15 +126,14 @@ class AdherentType
}
else
{
print $this->db->error();
print "<h2><br>$sql<br></h2>";
return 0;
$error=$this->db->error();
return -1;
}
}
/**
\brief fonction qui permet de supprimer le status de l'adhérent
\param rowid
\brief Fonction qui permet de supprimer le status de l'adhérent
\param rowid
*/
function delete($rowid)
@ -156,30 +166,29 @@ class AdherentType
function fetch($rowid)
{
$sql = "SELECT *";
$sql = "SELECT d.rowid, d.libelle, d.statut, d.cotisation, d.mail_valid, d.note, d.vote";
$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as d";
$sql .= " WHERE d.rowid = $rowid";
if ( $this->db->query( $sql) )
{
if ($this->db->num_rows())
{
$obj = $this->db->fetch_object();
$this->id = $obj->rowid;
$this->libelle = $obj->libelle;
$this->statut = $obj->statut;
$this->cotisation = $obj->cotisation;
$this->mail_valid = $obj->mail_valid;
$this->commentaire = $obj->note;
$this->vote = $obj->vote;
}
}
{
if ($this->db->num_rows())
{
$obj = $this->db->fetch_object();
$this->id = $obj->rowid;
$this->libelle = $obj->libelle;
$this->statut = $obj->statut;
$this->cotisation = $obj->cotisation;
$this->mail_valid = $obj->mail_valid;
$this->commentaire = $obj->note;
$this->vote = $obj->vote;
}
}
else
{
print $this->db->error();
}
{
print $this->db->error();
}
}

24
htdocs/adherents/type.php
View File

@ -41,15 +41,21 @@ if ($_POST["action"] == 'add' && $user->admin)
if ($_POST["button"] != $langs->trans("Cancel")) {
$adht = new AdherentType($db);
$adht->libelle = $_POST["libelle"];
$adht->libelle = trim($_POST["libelle"]);
$adht->cotisation = $yesno[$_POST["cotisation"]];
$adht->commentaire = $_POST["comment"];
$adht->mail_valid = $_POST["mail_valid"];
$adht->commentaire = trim($_POST["comment"]);
$adht->mail_valid = trim($_POST["mail_valid"]);
$adht->vote = $yesno[$_POST["vote"]];
if ($_POST["libelle"]) { $adht->create($user->id); }
if ($adht->libelle)
{
$id=$adht->create($user->id);
if ($id > 0)
{
Header("Location: type.php");
}
}
}
Header("Location: type.php");
}
if ($_POST["action"] == 'update' && $user->admin)
@ -170,11 +176,11 @@ if ($_GET["action"] == 'create') {
print '<tr><td>'.$langs->trans("Label").'</td><td><input type="text" name="libelle" size="40"></td></tr>';
print '<tr><td>'.$langs->trans("SubscriptionRequired").'</td><td>';
$htmls->selectyesno("cotisation","");
$htmls->selectyesnonum("cotisation","");
print '</tr>';
print '<tr><td>'.$langs->trans("VoteAllowed").'</td><td>';
$htmls->selectyesno("vote","");
$htmls->selectyesnonum("vote","");
print '</tr>';
print '<tr><td valign="top">'.$langs->trans("Comments").'</td><td>';
@ -215,11 +221,11 @@ if ($_GET["rowid"] > 0 && $_GET["action"] == 'edit')
print '<tr><td>'.$langs->trans("Label").'</td><td><input type="text" name="libelle" size="40" value="'.$adht->libelle.'"></td></tr>';
print '<tr><td>'.$langs->trans("SubscriptionRequired").'</td><td>';
$htmls->selectyesno("cotisation",$adht->cotisation);
$htmls->selectyesnonum("cotisation",$adht->cotisation);
print '</tr>';
print '<tr><td>'.$langs->trans("VoteAllowed").'</td><td>';
$htmls->selectyesno("vote",$adht->vote);
$htmls->selectyesnonum("vote",$adht->vote);
print '</tr>';
print '<tr><td valign="top">'.$langs->trans("Comments").'</td><td>';

34
htdocs/html.form.class.php
View File

@ -847,27 +847,27 @@ class Form
function selectyesno($name,$value='',$option=0)
{
global $langs;
$yes="yes"; $no="no";
if ($option)
{
$yes="1";
$no="0";
}
if ($option)
{
$yes="1";
$no="0";
}
print '<select class="flat" name="'.$name.'">'."\n";
if ($value == 'no' || $value == 0)
{
print '<option value="'.$yes.'">'.$langs->trans("yes").'</option>'."\n";
print '<option value="'.$no.'" selected>'.$langs->trans("no").'</option>'."\n";
}
if ($value == 'yes' || $value == 1)
{
print '<option value="'.$yes.'" selected>'.$langs->trans("yes").'</option>'."\n";
print '<option value="'.$no.'">'.$langs->trans("no").'</option>'."\n";
}
else
{
print '<option value="'.$yes.'" selected>'.$langs->trans("yes").'</option>'."\n";
print '<option value="'.$no.'">'.$langs->trans("no").'</option>'."\n";
}
{
print '<option value="'.$yes.'">'.$langs->trans("yes").'</option>'."\n";
print '<option value="'.$no.'" selected>'.$langs->trans("no").'</option>'."\n";
}
print '</select>'."\n";
}