From f3cef4ca66a6bf8389296340626dade9133ed9ae Mon Sep 17 00:00:00 2001 From: "Pierre Habouzit (MadCoder" Date: Sat, 15 Jan 2005 22:42:11 +0000 Subject: [PATCH] you can now add decorations, medals and stuff in the profile git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-348 --- htdocs/images/medals/croix_cc.jpg | Bin 0 -> 6269 bytes include/profil/assign_deco.inc.php | 43 ++++++++++++++ include/profil/get_deco.inc.php | 45 +++++++++++++++ include/profil/update_deco.inc.php | 22 +++++++ include/profil/verif_deco.inc.php | 21 +++++++ include/tabs.inc.php | 1 + templates/profil.tpl | 4 -- templates/profil/deco.tpl | 115 +++++++++++++++++++++++++++++++++++++ templates/profil/poly.tpl | 4 ++ upgrade/0.9.4/80_medals.sql | 8 +++ 10 files changed, 259 insertions(+), 4 deletions(-) create mode 100644 htdocs/images/medals/croix_cc.jpg create mode 100644 include/profil/assign_deco.inc.php create mode 100644 include/profil/get_deco.inc.php create mode 100644 include/profil/update_deco.inc.php create mode 100644 include/profil/verif_deco.inc.php create mode 100644 templates/profil/deco.tpl diff --git a/htdocs/images/medals/croix_cc.jpg b/htdocs/images/medals/croix_cc.jpg new file mode 100644 index 0000000000000000000000000000000000000000..3d16ef25de6b704076af820b233abfa1b95a59b1 GIT binary patch literal 6269 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 literal 0 HcmV?d00001 diff --git a/include/profil/assign_deco.inc.php b/include/profil/assign_deco.inc.php new file mode 100644 index 0000000..fc1cdc2 --- /dev/null +++ b/include/profil/assign_deco.inc.php @@ -0,0 +1,43 @@ +xdb->iterator("SELECT * FROM profile_medals_grades ORDER BY mid, pos"); +$grades = Array(); +while ($tmp = $res->next()) { + $grades[$tmp['mid']][] = $tmp; +} + +$res = $globals->xdb->iterator("SELECT * FROM profile_medals ORDER BY type, text"); +$mlist = Array(); +while ($tmp = $res->next()) { + $mlist[$tmp['type']][] = $tmp; +} + +$trad = Array('ordre' => 'Ordres ...', 'croix' => 'Croix ...', 'militaire' => 'Médailles militaires ...', + 'honneur' => 'Médailles d\'honneur', 'resistance' => 'Médailles de la résistance ...'); + +$page->gassign('grades'); +$page->gassign('medals'); +$page->gassign('trad'); +$page->assign('medal_list', $mlist); + +?> diff --git a/include/profil/get_deco.inc.php b/include/profil/get_deco.inc.php new file mode 100644 index 0000000..01853a2 --- /dev/null +++ b/include/profil/get_deco.inc.php @@ -0,0 +1,45 @@ +xdb->execute("DELETE FROM profile_medals_sub WHERE uid = {?} AND mid = {?}", Session::getInt('uid', -1), Env::getInt('medal_id', -1)); + } + + if (Env::get('medal_op')=='ajouter' && Env::getInt('medal_id')) { + $globals->xdb->execute("INSERT INTO profile_medals_sub (uid,mid) VALUES ({?}, {?})", Session::getInt('uid', -1), Env::getInt('medal_id')); + } +} + +foreach (Post::getMixed('grade') as $mid=>$gid) { + $globals->xdb->execute('UPDATE profile_medals_sub SET gid={?} WHERE uid={?} AND mid={?}', $gid, Session::getInt('uid'), $mid); +} + + +$res = $globals->xdb->query( + "SELECT m.id, m.text AS medal, m.type, m.img, s.gid + FROM profile_medals_sub AS s + INNER JOIN profile_medals AS m ON ( s.mid = m.id ) + WHERE s.uid = {?}", Session::getInt('uid', -1)); + +$medals = $res->fetchAllAssoc(); + +?> diff --git a/include/profil/update_deco.inc.php b/include/profil/update_deco.inc.php new file mode 100644 index 0000000..330b130 --- /dev/null +++ b/include/profil/update_deco.inc.php @@ -0,0 +1,22 @@ + diff --git a/include/profil/verif_deco.inc.php b/include/profil/verif_deco.inc.php new file mode 100644 index 0000000..85452e9 --- /dev/null +++ b/include/profil/verif_deco.inc.php @@ -0,0 +1,21 @@ + diff --git a/include/tabs.inc.php b/include/tabs.inc.php index 81f2a58..559179f 100644 --- a/include/tabs.inc.php +++ b/include/tabs.inc.php @@ -24,6 +24,7 @@ $tabname_array = Array( "general" => "Informations\ngénérales", "adresses" => "Adresses\npersonnelles", "poly" => "Informations\npolytechniciennes", + "deco" => "Décorations\nMédailles", "emploi" => "Informations\nprofessionnelles", "skill" => "Compétences\ndiverses", "mentor" => "Mentoring" diff --git a/templates/profil.tpl b/templates/profil.tpl index 538bdd4..5f30478 100644 --- a/templates/profil.tpl +++ b/templates/profil.tpl @@ -43,10 +43,6 @@ tel qu'elle appara {/if} {/foreach} - - - - diff --git a/templates/profil/deco.tpl b/templates/profil/deco.tpl new file mode 100644 index 0000000..aa575d9 --- /dev/null +++ b/templates/profil/deco.tpl @@ -0,0 +1,115 @@ +{*************************************************************************** + * Copyright (C) 2003-2004 Polytechnique.org * + * http://opensource.polytechnique.org/ * + * * + * 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 * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the Free Software * + * Foundation, Inc., * + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + ***************************************************************************} + + +{literal} + +{/literal} + +
+ + + + + + + + + + {foreach from=$medals item=m} + + + + + + {/foreach} + + + + + +
+ Médailles, Décorations, Prix, ... +
+ + + + + +
+ + + ne peut être ni public ni transmis à l'AX +
+
+ {$m.medal} + + {$m.medal}
+ {if $grades[$m.id]|@count} + + {else} + -- non précisé -- + {/if} + 		+ + retirer + +
+   + + + + + ajouter + +
+
+ +{* vim:set et sw=2 sts=2 sws=2: *} diff --git a/templates/profil/poly.tpl b/templates/profil/poly.tpl index 9d9ba73..d7aebc5 100644 --- a/templates/profil/poly.tpl +++ b/templates/profil/poly.tpl @@ -81,6 +81,10 @@ {/literal}
+ + + + diff --git a/upgrade/0.9.4/80_medals.sql b/upgrade/0.9.4/80_medals.sql index 8e36a07..d48ccbe 100644 --- a/upgrade/0.9.4/80_medals.sql +++ b/upgrade/0.9.4/80_medals.sql @@ -20,6 +20,14 @@ create table profile_medals_grades ( primary key (mid, gid) ); +drop table if exists profile_medals_sub; +create table profile_medals_sub ( + uid int not null, + mid int not null, + gid int not null, + primary key (uid,mid) +); + insert into profile_medals (type, text, img) values ('ordre', 'Ordre Nationnal de la Legion d\'Honneur', 'ordre_onlh.jpg'), ('ordre', 'Ordre de la libération', 'ordre_lib.jpg'), -- 2.1.4