fic/server
2
0
Fork 0
Code Issues Pull Requests 2 Releases Wiki Activity

Store exercice title XML in DB

Browse Source
This commit is contained in:
nemunaire 2014-12-14 11:04:17 +01:00 committed by Némunaire
parent 3f773dffb0
commit b81af5aa90
10 changed files with 69 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
db/feed.sql
View File

@ -128,49 +128,50 @@ INSERT INTO `exercices` (
`require` , `require` ,
`level` , `level` ,
`points` , `points` ,
`title`,
`statement` `statement`
) )
VALUES VALUES
('1', '1', '', '1', '1', 'Description 1'), ('1', '1', '', '1', '1', 'Title X', 'Description 1'),
('2', '1', '1', '2', '5', 'Description 2'), ('2', '1', '1', '2', '5', 'Title X', 'Description 2'),
('3', '1', '2', '3', '10', 'Description 3'), ('3', '1', '2', '3', '10', 'Title X', 'Description 3'),
('4', '1', '3', '4', '20', 'Description 4'), ('4', '1', '3', '4', '20', 'Title X', 'Description 4'),
('5', '1', '4', '5', '40', 'Description 5'), ('5', '1', '4', '5', '40', 'Title X', 'Description 5'),
('6', '2', '', '1', '1', 'Description 6'), ('6', '2', '', '1', '1', 'Title X', 'Description 6'),
('7', '2', '6', '2', '5', 'Description 7'), ('7', '2', '6', '2', '5', 'Title X', 'Description 7'),
('8', '2', '7', '3', '10', 'Description 8'), ('8', '2', '7', '3', '10', 'Title X', 'Description 8'),
('9', '2', '8', '4', '20', 'Description 9'), ('9', '2', '8', '4', '20', 'Title X', 'Description 9'),
('10', '2', '9', '5', '40', 'Description 10'), ('10', '2', '9', '5', '40', 'Title X', 'Description 10'),
('11', '3', '', '1', '1', 'Description 11'), ('11', '3', '', '1', '1', 'Title X', 'Description 11'),
('12', '3', '11', '2', '5', 'Description 12'), ('12', '3', '11', '2', '5', 'Title X', 'Description 12'),
('13', '3', '12', '3', '10', 'Description 13'), ('13', '3', '12', '3', '10', 'Title X', 'Description 13'),
('14', '3', '13', '4', '20', 'Description 14'), ('14', '3', '13', '4', '20', 'Title X', 'Description 14'),
('15', '3', '14', '5', '40', 'Description 15'), ('15', '3', '14', '5', '40', 'Title X', 'Description 15'),
('16', '4', '', '1', '1', 'Description 16'), ('16', '4', '', '1', '1', 'Title X', 'Description 16'),
('17', '4', '16', '2', '5', 'Description 17'), ('17', '4', '16', '2', '5', 'Title X', 'Description 17'),
('18', '4', '17', '3', '10', 'Description 18'), ('18', '4', '17', '3', '10', 'Title X', 'Description 18'),
('19', '4', '18', '4', '20', 'Description 19'), ('19', '4', '18', '4', '20', 'Title X', 'Description 19'),
('20', '4', '19', '5', '40', 'Description 20'), ('20', '4', '19', '5', '40', 'Title X', 'Description 20'),
('21', '5', '', '1', '1', 'Description 21'), ('21', '5', '', '1', '1', 'Title X', 'Description 21'),
('22', '5', '23', '2', '5', 'Description 22'), ('22', '5', '23', '2', '5', 'Title X', 'Description 22'),
('23', '5', '25', '3', '10', 'Description 23'), ('23', '5', '25', '3', '10', 'Title X', 'Description 23'),
('24', '5', '21', '4', '20', 'Description 24'), ('24', '5', '21', '4', '20', 'Title X', 'Description 24'),
('25', '5', '24', '5', '40', 'Description 25'), ('25', '5', '24', '5', '40', 'Title X', 'Description 25'),
('26', '6', '', '1', '1', 'Description 26'), ('26', '6', '', '1', '1', 'Title X', 'Description 26'),
('27', '6', '26', '2', '5', 'Description 27'), ('27', '6', '26', '2', '5', 'Title X', 'Description 27'),
('28', '6', '28', '3', '10', 'Description 28'), ('28', '6', '28', '3', '10', 'Title X', 'Description 28'),
('29', '6', '27', '4', '20', 'Description 29'), ('29', '6', '27', '4', '20', 'Title X', 'Description 29'),
('30', '6', '29', '5', '40', 'Description 30'), ('30', '6', '29', '5', '40', 'Title X', 'Description 30'),
('31', '7', '', '1', '1', 'Description 31'), ('31', '7', '', '1', '1', 'Title X', 'Description 31'),
('32', '7', '35', '2', '5', 'Description 32'), ('32', '7', '35', '2', '5', 'Title X', 'Description 32'),
('33', '7', '31', '3', '10', 'Description 33'), ('33', '7', '31', '3', '10', 'Title X', 'Description 33'),
('34', '7', '32', '4', '20', 'Description 34'), ('34', '7', '32', '4', '20', 'Title X', 'Description 34'),
('35', '7', '33', '5', '40', 'Description 35'), ('35', '7', '33', '5', '40', 'Title X', 'Description 35'),
('36', '8', '', '1', '1', 'Description 36'), ('36', '8', '', '1', '1', 'Title X', 'Description 36'),
('37', '8', '40', '2', '5', 'Description 37'), ('37', '8', '40', '2', '5', 'Title X', 'Description 37'),
('38', '8', '36', '3', '10', 'Description 38'), ('38', '8', '36', '3', '10', 'Title X', 'Description 38'),
('39', '8', '37', '4', '20', 'Description 39'), ('39', '8', '37', '4', '20', 'Title X', 'Description 39'),
('40', '8', '38', '5', '40', 'Description 40'); ('40', '8', '38', '5', '40', 'Title X', 'Description 40');
INSERT INTO `solved` ( INSERT INTO `solved` (
`id` , `id` ,

1
db/fic2014.sql
View File

@ -26,6 +26,7 @@ CREATE TABLE IF NOT EXISTS `exercices` (
`require` varchar(100) COLLATE utf8_unicode_ci NULL, `require` varchar(100) COLLATE utf8_unicode_ci NULL,
`level` tinyint(4) NOT NULL, `level` tinyint(4) NOT NULL,
`points` smallint(6) NOT NULL, `points` smallint(6) NOT NULL,
`title` varchar(255) COLLATE utf8_unicode_ci NULL,
`statement` text COLLATE utf8_unicode_ci NOT NULL, `statement` text COLLATE utf8_unicode_ci NOT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

1
onyx/include/admin/exercice.php
View File

@ -26,6 +26,7 @@ try
if (!empty($_POST)) if (!empty($_POST))
{ {
$exercice->points = intval($_POST["points"]); $exercice->points = intval($_POST["points"]);
$exercice->title = $_POST["title"];
$exercice->statement = $_POST["desc"]; $exercice->statement = $_POST["desc"];
$exercice->require = $_POST["require"]; $exercice->require = $_POST["require"];
$exercice->level = intval($_POST["level"]); $exercice->level = intval($_POST["level"]);

21
onyx/include/common/Exercice.class.php
View File

@ -10,6 +10,7 @@ class Exercice
var $require; var $require;
var $level; var $level;
var $points; var $points;
var $title;
var $statement; var $statement;
var $files = array(); var $files = array();
var $keys = array(); var $keys = array();
@ -24,7 +25,7 @@ class Exercice
$db->escape($id); $db->escape($id);
$res = $db->unique_query("SELECT `id`, `id_theme`, `require`, `level`, $res = $db->unique_query("SELECT `id`, `id_theme`, `require`, `level`,
`points`, `statement` `points`, `title`, `statement`
FROM exercices WHERE id = '$id'"); FROM exercices WHERE id = '$id'");
if (!empty($res)) if (!empty($res))
@ -64,6 +65,7 @@ class Exercice
$this->require = $res['require']; $this->require = $res['require'];
$this->level = $res['level']; $this->level = $res['level'];
$this->points = $res['points']; $this->points = $res['points'];
$this->title = $res['title'];
$this->statement = $res['statement']; $this->statement = $res['statement'];
$this->set_number(); $this->set_number();
@ -86,6 +88,7 @@ class Exercice
$tmp->require = $array["require"]; $tmp->require = $array["require"];
$tmp->level = $array["level"]; $tmp->level = $array["level"];
$tmp->points = $array["points"]; $tmp->points = $array["points"];
$tmp->title = $array["title"];
$tmp->statement = $array["statement"]; $tmp->statement = $array["statement"];
$tmp->files = $array["files"]; $tmp->files = $array["files"];
$tmp->keys = $array["keys"]; $tmp->keys = $array["keys"];
@ -98,9 +101,12 @@ class Exercice
return $this->id; return $this->id;
} }
function get_name() function get_title($menu=false)
{ {
return "Exercice ".$this->number; if ($menu || empty($this->title))
return "Exercice ".$this->number;
else
return $this->title;
} }
function get_statement() function get_statement()
@ -108,8 +114,7 @@ class Exercice
return $this->statement; return $this->statement;
} }
// retourne le nombre d'equipes qui ont résolues l'exercice // retourne les équipes qui ont résolues l'exercice triées par date
// trié par date
function get_solved() function get_solved()
{ {
$id = $this->id; $id = $this->id;
@ -209,6 +214,7 @@ class Exercice
$require = $this->require; $require = $this->require;
$level = intval($this->level); $level = intval($this->level);
$points = intval($this->points); $points = intval($this->points);
$title = $this->title;
$statement = $this->statement; $statement = $this->statement;
$files = $this->files; $files = $this->files;
$keys = $this->keys; $keys = $this->keys;
@ -217,17 +223,18 @@ class Exercice
$db->escape($id); $db->escape($id);
$db->escape($theme); $db->escape($theme);
$db->escape($require); $db->escape($require);
$db->escape($title);
$db->escape($statement); $db->escape($statement);
if ($create) if ($create)
{ {
$db->query("INSERT INTO exercices $db->query("INSERT INTO exercices
VALUES ('".$id."', '".$theme."', '".$require."', '".$level."', '".$points."','".$statement."');"); VALUES ('".$id."', '".$theme."', '".$require."', '".$level."', '".$points."','".$title."','".$statement."');");
} }
else else
{ {
$db->query("UPDATE exercices $db->query("UPDATE exercices
SET `id_theme` = '".$theme."', `require` = '".$require."', `level` = '".$level."', `points` = '".$points."', `statement` = '".$statement."' SET `id_theme` = '".$theme."', `require` = '".$require."', `level` = '".$level."', `points` = '".$points."', `title` = '".$title."', `statement` = '".$statement."'
WHERE id = '$id'"); WHERE id = '$id'");
$aff = $db->affected(); $aff = $db->affected();

6
onyx/tpl/bootstrap/admin/exercice.tpl
View File

@ -3,6 +3,10 @@
{if isset($ex)} {if isset($ex)}
<h2>{$theme->name} <small>{$ex->id}</small></h2> <h2>{$theme->name} <small>{$ex->id}</small></h2>
<form role="form" method="post" action="/{$SALT_ADMIN}/ex/{$theme->id}-{$theme->name}/{$ex->id}"> <form role="form" method="post" action="/{$SALT_ADMIN}/ex/{$theme->id}-{$theme->name}/{$ex->id}">
<div class="form-group">
<label for="title">Titre</label>
<input type="text" class="form-control" value="{$ex->title|escape}" name="title" id="title">
</div>
<div class="form-group"> <div class="form-group">
<label for="desc">Description</label> <label for="desc">Description</label>
<textarea class="form-control" name="desc" id="desc">{$ex->statement|escape}</textarea> <textarea class="form-control" name="desc" id="desc">{$ex->statement|escape}</textarea>
@ -85,7 +89,7 @@
<p> <p>
<ul> <ul>
{foreach from=$theme->get_exercices_ordered() item=ex} {foreach from=$theme->get_exercices_ordered() item=ex}
<li><a href="/{$SALT_ADMIN}/ex/{$theme->id}-{$theme->name}/{$ex->id}">{$ex->get_name()}</a></li> <li><a href="/{$SALT_ADMIN}/ex/{$theme->id}-{$theme->name}/{$ex->id}">{$ex->get_title()}</a></li>
{/foreach} {/foreach}
</ul> </ul>
</p> </p>

2
onyx/tpl/bootstrap/admin/export_theme.tpl
View File

@ -4,7 +4,7 @@
{if $theme->get_exercices_ordered()} {if $theme->get_exercices_ordered()}
{foreach from=$theme->get_exercices_ordered() item=e} {foreach from=$theme->get_exercices_ordered() item=e}
<exercice id="{$e->id}" level="{$e->level}"{if $e->require} depends="{$e->require}"{/if}> <exercice id="{$e->id}" level="{$e->level}"{if $e->require} depends="{$e->require}"{/if}>
<title>{$e->get_name()}</title> <title>{$e->get_title()}</title>
<points>{$e->points}</points> <points>{$e->points}</points>
<statement>{$e->statement}</statement> <statement>{$e->statement}</statement>
{if $e->keys} {if $e->keys}

2
onyx/tpl/bootstrap/admin/layout.tpl
View File

@ -39,7 +39,7 @@
{link href_prefix="/{$SALT_ADMIN}/" href="ex/{$t->get_id()}-{$t->get_name()}" class="dropdown-toggle" data-toggle="dropdown" label="{$t->get_name()} <b class=\"caret\"></b>"} {link href_prefix="/{$SALT_ADMIN}/" href="ex/{$t->get_id()}-{$t->get_name()}" class="dropdown-toggle" data-toggle="dropdown" label="{$t->get_name()} <b class=\"caret\"></b>"}
<ul class="dropdown-menu"> <ul class="dropdown-menu">
{foreach from=$t->get_exercices_ordered() item=e} {foreach from=$t->get_exercices_ordered() item=e}
<li>{link href_prefix="/{$SALT_ADMIN}/" href="ex/{$t->get_id()}-{$t->get_name()}/{$e->get_id()}" label="{$e->get_name()}"}</li> <li>{link href_prefix="/{$SALT_ADMIN}/" href="ex/{$t->get_id()}-{$t->get_name()}/{$e->get_id()}" label="{$e->get_title(true)}"}</li>
{/foreach} {/foreach}
</ul> </ul>
</li> </li>

2
onyx/tpl/bootstrap/admin/themes.tpl
View File

@ -22,7 +22,7 @@
<td><a href="/{$SALT_ADMIN}/ex/{$t->id}-{$t->name}">{$t->name}</a></td> <td><a href="/{$SALT_ADMIN}/ex/{$t->id}-{$t->name}">{$t->name}</a></td>
<td><ul> <td><ul>
{foreach from=$t->get_exercices_ordered() item=e} {foreach from=$t->get_exercices_ordered() item=e}
<li><a href="/{$SALT_ADMIN}/ex/{$t->id}-{$t->name}/{$e->id}">{$e->get_name()}</a></li> <li><a href="/{$SALT_ADMIN}/ex/{$t->id}-{$t->name}/{$e->id}">{$e->get_title()}</a></li>
{/foreach} {/foreach}
</ul></td> </ul></td>
<td> <td>

2
onyx/tpl/bootstrap/teams/exercice.tpl
View File

@ -3,7 +3,7 @@
{block name=exercices} {block name=exercices}
<div class="panel panel-info"> <div class="panel panel-info">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">Exercice {$cur_exercice->number} <small>{$solved} équipe{if $solved > 1}s ont{else} a{/if} résolu cet exercice</small></h3> <h3 class="panel-title">{$cur_exercice->get_title()} <small>{$solved} équipe{if $solved > 1}s ont{else} a{/if} résolu cet exercice</small></h3>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<ul> <ul>

6
onyx/tpl/bootstrap/teams/theme.tpl
View File

@ -6,11 +6,11 @@
<p> <p>
{foreach from=$cur_theme->get_exercices_ordered() item=exercice} {foreach from=$cur_theme->get_exercices_ordered() item=exercice}
{if $exercice->has_solved($my_team)} {if $exercice->has_solved($my_team)}
{link class="btn btn-success" role="button" href_prefix="/{$SALT_USER}/{$my_team->get_id()}/" href="{$cur_theme->get_id()}-{$cur_theme->get_name_url()}/{$exercice->get_id()}/" label="{$exercice->get_name()}"} {link class="btn btn-success" role="button" href_prefix="/{$SALT_USER}/{$my_team->get_id()}/" href="{$cur_theme->get_id()}-{$cur_theme->get_name_url()}/{$exercice->get_id()}/" label="{$exercice->get_title(true)}"}
{elseif $exercice->is_unlocked($my_team)} {elseif $exercice->is_unlocked($my_team)}
{link class="btn btn-primary" role="button" href_prefix="/{$SALT_USER}/{$my_team->get_id()}/" href="{$cur_theme->get_id()}-{$cur_theme->get_name_url()}/{$exercice->get_id()}/" label="{$exercice->get_name()}"} {link class="btn btn-primary" role="button" href_prefix="/{$SALT_USER}/{$my_team->get_id()}/" href="{$cur_theme->get_id()}-{$cur_theme->get_name_url()}/{$exercice->get_id()}/" label="{$exercice->get_title(true)}"}
{else} {else}
<a class="btn btn-danger" disabled="disabled">{$exercice->get_name()}</a> <a class="btn btn-danger" disabled="disabled">{$exercice->get_title(true)}</a>
{/if} {/if}
{/foreach} {/foreach}
</p> </p>